EES-5802 - various tweaks to pipelines. mended typo around indexing, …

…removed manual trigger steps in favour of adding approvals on DevOps environments. Made creaton of Public API Container App identity independent of container app deploy flag so that it is immediately available for db permissions.
dfe-analytical-services · Jan 28, 2025 · 96664fe · 96664fe
1 parent eb81185
commit 96664fe
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 5 deletions.
diff --git a/infrastructure/templates/public-api/ci/azure-pipelines.yml b/infrastructure/templates/public-api/ci/azure-pipelines.yml
@@ -117,7 +117,6 @@ stages:
     parameters:
       stageName: DeployTest
       condition: eq(variables.isTest, true)
-      # trigger: manual
       environment: Test
       serviceConnection: $(serviceConnectionTest)
       bicepParamFile: test
@@ -126,7 +125,6 @@ stages:
     parameters:
       stageName: DeployPreProd
       condition: eq(variables.isPreProd, true)
-      # trigger: manual
       environment: Pre-Prod
       serviceConnection: $(serviceConnectionPreProd)
       bicepParamFile: preprod

diff --git a/infrastructure/templates/public-api/ci/jobs/deploy-api-docs.yml b/infrastructure/templates/public-api/ci/jobs/deploy-api-docs.yml
@@ -46,7 +46,7 @@ jobs:
               displayName: Build API docs
               env:
                 TECH_DOCS_API_URL: $(apiAppUrl)
-                TECH_DOCS_ALLOW_INDEXING: $(docsPreventIndexing)
+                TECH_DOCS_PREVENT_INDEXING: $(docsPreventIndexing)
               inputs:
                 workingDirectory: $(docsPath)
                 targetType: inline

diff --git a/infrastructure/templates/public-api/ci/stages/deploy.yml b/infrastructure/templates/public-api/ci/stages/deploy.yml
@@ -31,7 +31,6 @@ stages:
   - stage: ${{ parameters.stageName }}
     displayName: Deploy ${{ parameters.environment }}
     dependsOn: ${{ parameters.dependsOn }}
-    # environment: ${{ if(eq(parameters.approvalRequired, true), 'ApprovalRequired', 'ApprovalNotRequired') }}
     trigger: ${{ parameters.trigger }}
     # Prevent this stage from running in parallel with the same deploy stage in other
     # ongoing runs of this pipeline. Instead, multiple executions of this stage will

diff --git a/infrastructure/templates/public-api/main.bicep b/infrastructure/templates/public-api/main.bicep
@@ -342,7 +342,7 @@ module containerAppEnvironmentModule 'application/shared/containerAppEnvironment
 }
 
 // Deploy main Public API Container App.
-module apiAppIdentityModule 'application/public-api/publicApiAppIdentity.bicep' = if (deployContainerApp) {
+module apiAppIdentityModule 'application/public-api/publicApiAppIdentity.bicep' = {
   name: 'publicApiAppIdentityApplicationModuleDeploy'
   params: {
     location: location