Skip to content

Commit

Permalink
EES-5446 - making data processor and PSQL deploys independent of priv…
Browse files Browse the repository at this point in the history
…ate DNS zone deployment to save lots of time during a standard deploy
  • Loading branch information
duncan-at-hiveit committed Dec 2, 2024
1 parent 6d0a77b commit 217f0e5
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 20 deletions.
Original file line number Diff line number Diff line change
@@ -1,24 +1,18 @@
parameters:

- name: serviceConnection
type: string

- name: displayName
type: string
default: Waiting for a successful response from endpoint

- name: accessTokenScope
type: string
default: null

- name: pollingDelaySeconds
type: number
default: 5

- name: maxAttempts
type: number
default: 50

- name: endpoint
type: string

Expand Down Expand Up @@ -60,4 +54,4 @@ steps:
done
echo "Timed out waiting for successful response."
exit 1
exit 1
Original file line number Diff line number Diff line change
@@ -1,30 +1,22 @@
parameters:

- name: serviceConnection
type: string

- name: displayName
type: string
default: Waiting for active orchestrations to complete

- name: condition
type: string

- name: accessTokenScope
type: string
default: null

- name: pollingDelaySeconds
type: number
default: 5

- name: maxAttempts
type: number
default: 50

- name: endpoint
type: string

- name: dependsOn
type: object
default: []
Expand Down Expand Up @@ -71,4 +63,4 @@ steps:
done
echo "Timed out waiting for active orchestrations to complete."
exit 1
exit 1
4 changes: 2 additions & 2 deletions infrastructure/templates/public-api/main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ param location string = resourceGroup().location
@description('Public API Storage : Size of the file share in GB.')
param publicApiDataFileShareQuota int = 1

@description('Firewall rules for maintenance of the service by allowing key IP ranges access to resources.')
@description('Provides access to resources for specific IP address ranges used for service maintenance.')
param maintenanceIpRanges IpRange[] = []

@description('Database : administrator login name.')
Expand Down Expand Up @@ -187,7 +187,7 @@ module coreStorage 'application/shared/coreStorage.bicep' = {
}

module privateDnsZonesModule 'application/shared/privateDnsZones.bicep' =
if (deploySharedPrivateDnsZones || deployPsqlFlexibleServer || deployDataProcessor) {
if (deploySharedPrivateDnsZones) {
name: 'privateDnsZonesApplicationModuleDeploy'
params: {
resourceNames: resourceNames
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace GovUk.Education.ExploreEducationStatistics.Public.Data.Processor.Functions;

public static class LogRunningOrchestration
public static class LongRunningOrchestration
{
[Function(nameof(ProcessLongRunningOrchestration))]
public static async Task ProcessLongRunningOrchestration(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public async Task<IActionResult> TriggerLongRunningOrchestration(
httpRequest.GetRequestParamInt(paramName: "durationSeconds", 60);

const string orchestratorName =
nameof(LogRunningOrchestration.ProcessLongRunningOrchestration);
nameof(LongRunningOrchestration.ProcessLongRunningOrchestration);

var options = new StartOrchestrationOptions { InstanceId = instanceId.ToString() };

Expand Down

0 comments on commit 217f0e5

Please sign in to comment.