fix: update bicep files for env vars

UK-Export-Finance · Dec 18, 2023 · 504c87c · 504c87c
1 parent 0e7a486
commit 504c87c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/infrastructure/resource_group_level/modules/webapps/dtfs-central-api.bicep b/infrastructure/resource_group_level/modules/webapps/dtfs-central-api.bicep
@@ -58,21 +58,17 @@ var additionalSettings = {
 
 var nodeEnv = nodeDeveloperMode ? { NODE_ENV: 'development' } : {}
 
-var appSettings = union(settings, staticSettings, secureSettings, additionalSettings, additionalSecureSettings, nodeEnv)
-
 // These have come from the CLI scripts
 var mongoDbConnectionString = replace(cosmosDbAccount.listConnectionStrings().connectionStrings[0].connectionString, '&replicaSet=globaldb', '')
-var connectionStrings = {
-  MONGO_INITDB_DATABASE: {
-    type: 'Custom'
-    value: cosmosDbDatabaseName
-  }
-  MONGODB_URI: {
-    type: 'Custom'
-    value: mongoDbConnectionString
-  }
+var calculatedSettings = {
+  MONGO_INITDB_DATABASE: cosmosDbDatabaseName
+  MONGODB_URI: mongoDbConnectionString
 }
 
+var appSettings = union(settings, staticSettings, secureSettings, additionalSettings, additionalSecureSettings, nodeEnv, calculatedSettings)
+
+var connectionStrings = { }
+
 resource cosmosDbAccount 'Microsoft.DocumentDB/databaseAccounts@2023-04-15' existing = {
   name: cosmosDbAccountName
 }

diff --git a/infrastructure/resource_group_level/modules/webapps/portal-api.bicep b/infrastructure/resource_group_level/modules/webapps/portal-api.bicep
@@ -112,7 +112,7 @@ var settingsCalculated = {
   AZURE_PORTAL_STORAGE_ACCESS_KEY: storageAccountKey
   AZURE_PORTAL_STORAGE_ACCOUNT: storageAccountName
   MONGO_INITDB_DATABASE: cosmosDbDatabaseName
-  MONGODB_URI: '${mongoDbConnectionString}'
+  MONGODB_URI: mongoDbConnectionString
 }
 
 var appSettings = union(settings, staticSettings, secureSettings, additionalSettings, additionalSecureSettings, nodeEnv, settingsCalculated)

diff --git a/...resource_group_level/modules/webapps/trade-finance-manager-api-calculated-variables.bicep b/...resource_group_level/modules/webapps/trade-finance-manager-api-calculated-variables.bicep
@@ -38,7 +38,7 @@ var mongoDbConnectionString = replace(cosmosDbAccount.listConnectionStrings().co
 
 var settingsCalculated = {  
   MONGO_INITDB_DATABASE: cosmosDbDatabaseName
-  MONGODB_URI: '${mongoDbConnectionString}'
+  MONGODB_URI: mongoDbConnectionString
   AZURE_NUMBER_GENERATOR_FUNCTION_URL: 'https://${numberGeneratorFunctionDefaultHostName}'
   TFM_UI_URL: tfmUiUrl
 }