UML-3177 Remove hardcoded region from applications

ministryofjustice · Nov 10, 2023 · 2e30ea8 · 2e30ea8
1 parent cdc67cc
commit 2e30ea8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/service-api/app/features/bootstrap/config.php b/service-api/app/features/bootstrap/config.php
@@ -18,7 +18,7 @@
     ],
 
     'aws' => [
-        'region' => 'eu-west-1',
+        'region' => getenv('AWS_REGION') ?: null,
         'version' => 'latest',
 
         'DynamoDb' => [

diff --git a/service-api/app/src/App/src/DataAccess/ApiGateway/RequestSignerFactory.php b/service-api/app/src/App/src/DataAccess/ApiGateway/RequestSignerFactory.php
@@ -15,6 +15,6 @@ public function __invoke(ContainerInterface $container): RequestSigner
 
         $token = $config['codes_api']['static_auth_token'] ?? null;
 
-        return new RequestSigner(new SignatureV4('execute-api', 'eu-west-1'), $token);
+        return new RequestSigner(new SignatureV4('execute-api', $config['aws']['region']), $token);
     }
 }
diff --git a/service-api/app/test/BehatTest/DataAccess/ApiGateway/PactLpasFactory.php b/service-api/app/test/BehatTest/DataAccess/ApiGateway/PactLpasFactory.php
@@ -26,7 +26,7 @@ public function __invoke(ContainerInterface $container)
 
         return new Lpas(
             new HttpClient(),
-            new SignatureV4('execute-api', 'eu-west-1'),
+            new SignatureV4('execute-api', $config['aws']['region']),
             $apiHost,
             $container->get(RequestTracing::TRACE_PARAMETER_NAME),
             $container->get(SiriusLpaSanitiser::class),

diff --git a/service-front/app/config/autoload/envs.global.php b/service-front/app/config/autoload/envs.global.php
@@ -12,7 +12,7 @@
         'uri' => getenv('PDF_SERVICE_URL') ?: null,
     ],
     'aws'            => [
-        'region'  => 'eu-west-1',
+        'region'  => getenv('AWS_REGION') ?: null,
         'version' => 'latest',
         'Kms'     => [
             'endpoint' => getenv('AWS_ENDPOINT_KMS') ?: null,