From 6ee55af0faaf2d9998296006755d33922bc281a9 Mon Sep 17 00:00:00 2001 From: Duncan Watson Date: Wed, 11 Dec 2024 15:06:39 +0000 Subject: [PATCH] EES-5446 - minor tweaks to fix pipeline after mere conflicts resolved --- .../application/public-api/publicApiDataProcessor.bicep | 2 +- .../templates/public-api/ci/jobs/deploy-infrastructure.yml | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/infrastructure/templates/public-api/application/public-api/publicApiDataProcessor.bicep b/infrastructure/templates/public-api/application/public-api/publicApiDataProcessor.bicep index 3abc099f17..9e7719ab20 100644 --- a/infrastructure/templates/public-api/application/public-api/publicApiDataProcessor.bicep +++ b/infrastructure/templates/public-api/application/public-api/publicApiDataProcessor.bicep @@ -79,7 +79,7 @@ module dataProcessorFunctionAppModule '../../components/functionApp.bicep' = { subnetId: outboundVnetSubnet.id privateEndpointSubnetId: inboundVnetSubnet.id publicNetworkAccessEnabled: true - functionAppEndpointFirewallRules: functionAppFirewallRules + functionAppFirewallRules: functionAppFirewallRules entraIdAuthentication: { appRegistrationClientId: dataProcessorAppRegistrationClientId allowedClientIds: [ diff --git a/infrastructure/templates/public-api/ci/jobs/deploy-infrastructure.yml b/infrastructure/templates/public-api/ci/jobs/deploy-infrastructure.yml index 541651a229..af0c39481d 100644 --- a/infrastructure/templates/public-api/ci/jobs/deploy-infrastructure.yml +++ b/infrastructure/templates/public-api/ci/jobs/deploy-infrastructure.yml @@ -37,9 +37,10 @@ jobs: parameterFile: $(paramFile) deploySharedPrivateDnsZones: false deployPsqlFlexibleServer: false - deployContainerApp: true + deployContainerApp: false + deployDataProcessor: false deployAlerts: false - dataProcessorExists: true + dataProcessorExists: false - task: AzureCLI@2 displayName: Check if Data Processor Function App exists @@ -66,6 +67,7 @@ jobs: deploySharedPrivateDnsZones: $(deploySharedPrivateDnsZones) deployPsqlFlexibleServer: $(deployPsqlFlexibleServer) deployContainerApp: $(deployContainerApp) + deployDataProcessor: $(deployDataProcessor) deployAlerts: $(deployAlerts) dataProcessorExists: $(dataProcessorExists)