Skip to content

Commit

Permalink
EES-5243 Remove publicUrls from public API inf pipelines
Browse files Browse the repository at this point in the history
  • Loading branch information
ntsim committed Jun 20, 2024
1 parent ad6cfa4 commit 261f4f1
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 11 deletions.
15 changes: 7 additions & 8 deletions infrastructure/templates/public-api/deploy-stage-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ stages:
- stage: ${{parameters.stageName}}
displayName: 'Deploy ${{parameters.environment}} Infrastructure and Applications'
# 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 be queued and run sequentially in the order that their pipelines
# were triggered.
# Instead, multiple executions of this stage will be queued and run sequentially in the order that their pipelines
# were triggered.
lockBehavior: sequential
condition: ${{parameters.condition}}
variables:
Expand Down Expand Up @@ -68,7 +68,6 @@ stages:
--parameters \
subscription='$(subscription)' \
resourceTags='$(resourceTags)' \
publicUrls='$(publicUrls)' \
postgreSqlAdminName='$(postgreSqlAdminName)' \
postgreSqlAdminPassword='$(postgreSqlAdminPassword)' \
postgreSqlFirewallRules='$(maintenanceFirewallRules)' \
Expand Down Expand Up @@ -122,7 +121,7 @@ stages:
--settings \
"[email protected](VaultName=$(keyVaultName); SecretName=$(dataProcessorPsqlConnectionStringSecretKey))"
# TODO EES-5128 - add Private Endpoint to Data Processor Function App into the VMSS VNet to allow DevOps to
# TODO EES-5128 - add Private Endpoint to Data Processor Function App into the VMSS VNet to allow DevOps to
# deploy the Data Processor Function App without having to temporarily make it publicly accessible.
- task: AzureCLI@2
displayName: 'Deploy Data Processor Function App - temporarily enable public network access before deploy'
Expand All @@ -142,11 +141,11 @@ stages:
publicNetworkAccess=Enabled \
siteConfig.publicNetworkAccess=Enabled
# TODO EES-5128 - we will try several attempts to deploy the Function App in order to allow the staging
# TODO EES-5128 - we will try several attempts to deploy the Function App in order to allow the staging
# slot the time to fully restart after appsettings and network visibility settings have been updated prior to
# attempting the deploy. Deploying prematurely results in a 500 from the deployment endpoint until the
# attempting the deploy. Deploying prematurely results in a 500 from the deployment endpoint until the
# endpoint is ready to accept the deployment request. In the future it would be preferable to have a health
# check Function that we could call to establish that the site is ready, but this will require adding the
# check Function that we could call to establish that the site is ready, but this will require adding the
# Service Principal to allowed Client IDs / Identities that can access the Function App. The Service Principal
# that is performing the deploy can be accessed by using the "addSpnToEnvironment" config option in the task
# definition and using the $(servicePrincipalId) variable.
Expand All @@ -165,7 +164,7 @@ stages:
--resource-group $(resourceGroupName) \
--slot staging
# TODO EES-5128 - add Private Endpoint to Data Processor Function App into the VMSS VNet to allow DevOps to
# TODO EES-5128 - add Private Endpoint to Data Processor Function App into the VMSS VNet to allow DevOps to
# deploy the Data Processor Function App without having to temporarily make it publicly accessible.
- task: AzureCLI@2
displayName: 'Deploy Data Processor Function App - disable public network access after deploy'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ stages:
- stage: ${{parameters.stageName}}
displayName: 'Validate ${{parameters.environment}} Infrastructure'
# 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 be queued and run sequentially in the order that their pipelines
# were triggered.
# Instead, multiple executions of this stage will be queued and run sequentially in the order that their pipelines
# were triggered.
lockBehavior: sequential
condition: ${{parameters.condition}}
variables:
Expand Down Expand Up @@ -52,7 +52,6 @@ stages:
--parameters \
subscription='$(subscription)' \
resourceTags='$(resourceTags)' \
publicUrls='$(publicUrls)' \
postgreSqlAdminName='$(postgreSqlAdminName)' \
postgreSqlAdminPassword='$(postgreSqlAdminPassword)' \
postgreSqlFirewallRules='$(maintenanceFirewallRules)' \
Expand Down

0 comments on commit 261f4f1

Please sign in to comment.