Merge pull request #4890 from dfe-analytical-services/dev

Merge dev into master
dfe-analytical-services · May 24, 2024 · d1e8b0e · d1e8b0e
2 parents fb2e052 + 3abde93
commit d1e8b0e
Show file tree

Hide file tree

Showing 373 changed files with 19,020 additions and 14,171 deletions.
diff --git a/azure-pipelines.dfe.yml b/azure-pipelines.dfe.yml
@@ -27,7 +27,7 @@ pr:
 
 jobs:
   - job: 'Backend'
-    pool: 'ees-ubuntu2204-large'
+    pool: 'ees-ubuntu2204-xlarge'
     workspace:
       clean: all
     steps:
@@ -138,7 +138,7 @@ jobs:
           repository: 'ees-public-api/api'
           command: 'push'
           tags: $(Build.BuildNumber)
-      
+
       - task: 'DotNetCoreCLI@2'
         displayName: 'Publish Public API - Data Processor Function'
         inputs:
@@ -154,7 +154,7 @@ jobs:
         inputs:
           artifactName: 'public-api-data-processor-$(Build.BuildNumber)'
           targetPath: '$(Build.ArtifactStagingDirectory)/public-api-data-processor'
-       
+
       - task: 'DotNetCoreCLI@2'
         displayName: 'Publish Notifier Function'
         inputs:
@@ -356,7 +356,7 @@ jobs:
           containerRegistry: '$(AcrServiceConnection)'
           repository: 'ees-public-frontend'
           command: 'push'
-          tags: $(Build.BuildNumber)    
+          tags: $(Build.BuildNumber)
 
   - job: 'MiscellaneousArtifacts'
     pool:

diff --git a/infrastructure/templates/public-api/deploy-stage-template.yml b/infrastructure/templates/public-api/deploy-stage-template.yml
@@ -89,6 +89,14 @@ stages:
                   --settings \
                     "[email protected](VaultName=$(keyVaultName); SecretName=$(coreStorageConnectionStringSecretKey))"
                 
+                az webapp config connection-string set \
+                  --name '$(dataProcessorFunctionAppName)' \
+                  --resource-group '$(resourceGroupName)' \
+                  --slot 'staging' \
+                  --connection-string-type 'SQLAzure' \
+                  --settings \
+                    "[email protected](VaultName=$(keyVaultName); SecretName=$(dataProcessorContentDbConnectionStringSecretKey))"
+                
                 az webapp config connection-string set \
                   --name '$(dataProcessorFunctionAppName)' \
                   --resource-group '$(resourceGroupName)' \

diff --git a/infrastructure/templates/public-api/main.bicep b/infrastructure/templates/public-api/main.bicep
@@ -337,6 +337,7 @@ module storeCoreStorageConnectionString 'components/keyVaultSecret.bicep' = {
   }
 }
 
+output dataProcessorContentDbConnectionStringSecretKey string = 'ees-publicapi-data-processor-connectionstring-contentdb'
 output dataProcessorPsqlConnectionStringSecretKey string = dataProcessorPsqlConnectionStringSecretKey
 output coreStorageConnectionStringSecretKey string = coreStorageConnectionStringSecretKey
 output keyVaultName string = keyVaultName