fix: fix secret name template (dvsa/olcs-selfserve#100)

dvsa · Mar 15, 2024 · a34530b · a34530b
1 parent 6df11f8
commit a34530b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/app/selfserve/config/autoload/config-parameter.global.php b/app/selfserve/config/autoload/config-parameter.global.php
@@ -6,12 +6,19 @@
 
 $environment = getenv('ENVIRONMENT_NAME');
 
+// This logic will be moved to environment variables with the migration to ECS.
+$isProduction = strtoupper($environment) === 'APP';
+$isProductionAccount = in_array(strtoupper($environment), ['INT', 'PP', 'APP']);
+
 $providers = [];
 
 if (!empty($environment)) {
+    // The `int` environment is actually `nduint` in AWS Secrets Manager.
+    $secretsManagerEnvironmentName = ($environment === 'int' ? 'nduint' : $environment);
+
     $providers = [
         SecretsManager::class => [
-            sprintf('DEVAPP%s-BASE-SM-APPLICATION-SELFSERVE', strtoupper($environment)),
+            sprintf('%sAPP%s-BASE-SM-APPLICATION-SELFSERVE', ($isProductionAccount ? "" : "DEV"), ($isProduction ? "" : strtoupper($secretsManagerEnvironmentName))),
         ],
         ParameterStore::class => [
             sprintf('/applicationparams/%s/', strtolower($environment)),

diff --git a/app/selfserve/config/autoload/config.global.php b/app/selfserve/config/autoload/config.global.php
@@ -147,7 +147,7 @@
     ],
 
     // The domain value needed to delete GA cookies
-    'google-ga-domain' => '.ssweb.%domain%',
+    'google-ga-domain' => '.%olcs_ss_cookie%',
 
     'cache-encryption' => [
         'node_suffix' => 'ssweb',