UHF-9833: Added support for services

City-of-Helsinki · Apr 25, 2024 · ca8d0fb · ca8d0fb
1 parent b34e9a8
commit ca8d0fb
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 23 deletions.
diff --git a/documentation/environment-resolver.md b/documentation/environment-resolver.md
@@ -6,6 +6,7 @@
 ## Usage
 
 ### Environment resolver
+
 ```php
 // See \Drupal\helfi_api_base\Environment\Project for all available project constants.
 $projectName = \Drupal\helfi_api_base\Environment\Project::ASUMINEN;
@@ -27,7 +28,7 @@ $internalUrl = $environment->getInternalAddress('fi'); // 'https://helfi-asumine
 $path = $environment->getPath('fi'); // '/fi/dev-asuminen'.
 $domain = $environment->getDomain(); // 'nginx-asuminen-dev.agw.arodevtest.hel.fi'.
 $baseUrl = $environment->getBaseUrl(); // 'https://nginx-asuminen-dev.agw.arodevtest.hel.fi'
-/** @var \Drupal\helfi_api_base\Environment\EnvironmentMetadata $environmentMetadata */
+/** @var \Drupal\helfi_api_base\Environment\Services $environmentMetadata */
 $environmentMetadata = $environment->getMetadata();
 ```
 

diff --git a/fixtures/environments.json b/fixtures/environments.json
@@ -18,8 +18,7 @@
           "protocol": "http",
           "domain": "helfi-asuminen",
           "port": 8080
-        },
-        "meta": {}
+        }
       },
       "test": {
         "path": {
@@ -34,8 +33,7 @@
         "internal_address": {
           "protocol": "https",
           "domain": "nginx-asuminen-test.apps.arodevtest.hel.fi"
-        },
-        "meta": {}
+        }
       },
       "stage": {
         "path": {
@@ -50,8 +48,7 @@
         "internal_address": {
           "protocol": "https",
           "domain": "nginx-asuminen-staging.apps.platta.hel.fi"
-        },
-        "meta": {}
+        }
       },
       "prod": {
         "path": {
@@ -66,8 +63,7 @@
         "internal_address": {
           "protocol": "https",
           "domain": "nginx-asuminen-prod.apps.platta.hel.fi"
-        },
-        "meta": {}
+        }
       }
     }
   },
@@ -91,12 +87,10 @@
           "domain": "helfi-etusivu",
           "port": 8080
         },
-        "meta": {
-          "services": {
-            "elastic-proxy": {
-              "protocol": "http",
-              "domain": "helfi-etusivu-elastic"
-            }
+        "services": {
+          "elastic-proxy": {
+            "protocol": "http",
+            "domain": "helfi-etusivu-elastic"
           }
         }
       },

diff --git a/src/Environment/Environment.php b/src/Environment/Environment.php
@@ -22,16 +22,16 @@ final class Environment {
    *   Environment resolver identifier for the project.
    * @param \Drupal\helfi_api_base\Environment\EnvironmentEnum $environment
    *   The environment name.
-   * @param \Drupal\helfi_api_base\Environment\EnvironmentMetadata|null $environmentMetadata
-   *   The environment metadata.
+   * @param \Drupal\helfi_api_base\Environment\Services|null $services
+   *   The environment services.
    */
   public function __construct(
     private readonly Address $address,
     private readonly Address $internalAddress,
     private readonly array $paths,
     private readonly string $id,
     private readonly EnvironmentEnum $environment,
-    private readonly ?EnvironmentMetadata $environmentMetadata = NULL,
+    private readonly ?Services $services = NULL,
   ) {
   }
 

diff --git a/src/Environment/EnvironmentResolver.php b/src/Environment/EnvironmentResolver.php
@@ -94,15 +94,13 @@ private function populateEnvironments(string $pathOrJson) : void {
           throw new \InvalidArgumentException('Project missing "address", "internal_address" or "paths" setting.');
         }
 
-        $environmentMeta = !empty($settings['meta']) ? EnvironmentMetadata::createFromArray($settings['meta']) : NULL;
-
         $project->addEnvironment($environment, new Environment(
           new Address(...$settings['address']),
           new Address(...$settings['internal_address']),
           $settings['path'],
           $id,
           EnvironmentEnum::tryFrom($environment),
-          $environmentMeta,
+          Services::createFromArray($services['services'] ?? []),
         ));
       }
       $this->projects[$id] = $project;

diff --git a/src/Environment/EnvironmentMetadata.php → src/Environment/Services.php b/src/Environment/EnvironmentMetadata.php → src/Environment/Services.php
@@ -7,7 +7,7 @@
 /**
  * A value object to store environment metadata.
  */
-final class EnvironmentMetadata {
+final class Services {
 
   /**
    * Constructs a new instance.
@@ -23,7 +23,7 @@ private function __construct(
    * @param array $data
    *   The data.
    *
-   * @return \Drupal\helfi_api_base\Environment\EnvironmentMetadata|null
+   * @return \Drupal\helfi_api_base\Environment\Services|null
    *   The self or null.
    */
   public static function createFromArray(array $data) : ? self {