fix: linting

UK-Export-Finance · Jan 3, 2024 · 84b936f · 84b936f
1 parent 8ff8b26
commit 84b936f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/infrastructure/resource_group_level/main.bicep b/infrastructure/resource_group_level/main.bicep
@@ -779,14 +779,11 @@ module tfmApi 'modules/webapps/trade-finance-manager-api-no-calculated-variables
     appServicePlanEgressSubnetId: vnet.outputs.appServicePlanEgressSubnetId
     appServicePlanId: appServicePlan.id
     containerRegistryName: containerRegistry.name
-    dtfsCentralApiHostname: dtfsCentralApi.outputs.defaultHostName
     environment: environment
-    externalApiHostname: externalApi.outputs.defaultHostName
     location: location
     logAnalyticsWorkspaceId: logAnalyticsWorkspace.id
     privateEndpointsSubnetId: vnet.outputs.privateEndpointsSubnetId
     azureWebsitesDnsZoneId: websitesDns.outputs.azureWebsitesDnsZoneId
-    nodeDeveloperMode: parametersMap[environment].nodeDeveloperMode
   }
 }
 
@@ -951,6 +948,10 @@ module tfmApiCalculatedVariables 'modules/webapps/trade-finance-manager-api-calc
     cosmosDbAccountName: cosmosDb.outputs.cosmosDbAccountName
     cosmosDbDatabaseName: cosmosDb.outputs.cosmosDbDatabaseName
     environment: environment
+    containerRegistryName: containerRegistry.name
+    dtfsCentralApiHostname: dtfsCentralApi.outputs.defaultHostName
+    externalApiHostname: externalApi.outputs.defaultHostName
+    nodeDeveloperMode: parametersMap[environment].nodeDeveloperMode
     numberGeneratorFunctionDefaultHostName: functionNumberGenerator.outputs.defaultHostName
     secureConnectionStrings: tfmApiSecureConnectionStrings
     additionalSecureConnectionStrings: tfmApiAdditionalSecureConnectionStrings

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
@@ -4,13 +4,18 @@
 param environment string
 param cosmosDbAccountName string
 param cosmosDbDatabaseName string
+param containerRegistryName string
+param externalApiHostname string
+param dtfsCentralApiHostname string
+param nodeDeveloperMode bool
 param numberGeneratorFunctionDefaultHostName string
 param tfmUiUrl string
 param storageAccountName string
 param settings object
 
 var tfmApiNameFragment = 'trade-finance-manager-api'
 var tfmApiName = 'tfs-${environment}-${tfmApiNameFragment}'
+var applicationInsightsName = 'tfs-${environment}-${tfmApiNameFragment}'
 
 var deployApplicationInsights = false // TODO:DTFS2-6422 enable application insights
 var selfHostnameEnvironmentVariable = ''

diff --git a/...ource_group_level/modules/webapps/trade-finance-manager-api-no-calculated-variables.bicep b/...ource_group_level/modules/webapps/trade-finance-manager-api-no-calculated-variables.bicep
@@ -14,11 +14,8 @@ param appServicePlanEgressSubnetId string
 param appServicePlanId string
 param privateEndpointsSubnetId string
 param logAnalyticsWorkspaceId string
-param externalApiHostname string
-param dtfsCentralApiHostname string
 
 param azureWebsitesDnsZoneId string
-param nodeDeveloperMode bool
 
 param resourceNameFragment string = 'trade-finance-manager-api'
 

diff --git a/infrastructure/resource_group_level/modules/webapps/webapp.bicep b/infrastructure/resource_group_level/modules/webapps/webapp.bicep
@@ -26,7 +26,7 @@ var appName = 'tfs-${environment}-${resourceNameFragment}'
 var privateEndpointName = 'tfs-${environment}-${resourceNameFragment}'
 var applicationInsightsName = 'tfs-${environment}-${resourceNameFragment}'
 
-var appSettingsWithAppInsights = if (!empty(appSettings)) {
+var appSettingsWithAppInsights = (!empty(appSettings)) ?
   union(
   appSettings, 
   deployApplicationInsights ? {
@@ -35,8 +35,7 @@ var appSettingsWithAppInsights = if (!empty(appSettings)) {
     selfHostnameEnvironmentVariable == '' ? {} : {
       '${selfHostnameEnvironmentVariable}': site.properties.defaultHostName
     }
-  )
-}
+  ) : {}
 
 resource site 'Microsoft.Web/sites@2022-09-01' = {
   name: appName