Skip to content

Commit f2bbb3a

Browse files
authored
Merge pull request #4090 from nhsuk/data_replication_fix
Fix data replication workflow
2 parents b46021a + 722c1cf commit f2bbb3a

File tree

2 files changed

+20
-10
lines changed

2 files changed

+20
-10
lines changed

.github/workflows/data-replication-pipeline.yml

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,8 @@ jobs:
8787
uses: hashicorp/setup-terraform@v3
8888
with:
8989
terraform_version: 1.11.4
90-
- name: Get db secret arn
91-
id: get-db-secret-arn
92-
working-directory: terraform/app
93-
run: |
94-
terraform init -backend-config="env/${{ inputs.environment }}-backend.hcl" -upgrade
95-
DB_SECRET_ARN=$(terraform output --raw db_secret_arn)
96-
echo "DB_SECRET_ARN=$DB_SECRET_ARN" >> $GITHUB_OUTPUT
9790
outputs:
9891
SNAPSHOT_ARN: ${{ steps.get-latest-snapshot.outputs.SNAPSHOT_ARN }}
99-
DB_SECRET_ARN: ${{ steps.get-db-secret-arn.outputs.DB_SECRET_ARN }}
10092

10193
prepare-webapp:
10294
name: Prepare webapp
@@ -154,17 +146,24 @@ jobs:
154146
uses: hashicorp/setup-terraform@v3
155147
with:
156148
terraform_version: 1.11.4
149+
- name: Get db secret arn
150+
id: get-db-secret-arn
151+
working-directory: terraform/app
152+
run: |
153+
terraform init -backend-config="env/${{ inputs.environment }}-backend.hcl" -upgrade
154+
DB_SECRET_ARN=$(terraform output --raw db_secret_arn)
155+
echo "DB_SECRET_ARN=$DB_SECRET_ARN" >> $GITHUB_OUTPUT
157156
- name: Terraform Plan
158157
id: plan
159158
run: |
160159
set -eo pipefail
161160
terraform init -backend-config="env/${{ inputs.environment }}-backend.hcl" -upgrade
162-
161+
163162
CIDR_BLOCKS='${{ inputs.egress_cidr }}'
164163
PLAN_ARGS=(
165164
"plan"
166165
"-var=image_digest=${{ env.DOCKER_DIGEST }}"
167-
"-var=db_secret_arn=${{ env.DB_SECRET_ARN }}"
166+
"-var=db_secret_arn=${{ steps.get-db-secret-arn.outputs.DB_SECRET_ARN }}"
168167
"-var=imported_snapshot=${{ env.SNAPSHOT_ARN }}"
169168
"-var-file=env/${{ inputs.environment }}.tfvars"
170169
"-var=allowed_egress_cidr_blocks=$CIDR_BLOCKS"
@@ -211,3 +210,10 @@ jobs:
211210
set -e
212211
terraform init -backend-config="env/${{ inputs.environment }}-backend.hcl" -upgrade
213212
terraform apply ${{ runner.temp }}/tfplan
213+
- name: Deploy db-access-service
214+
run: |
215+
task_definition_arn=$(terraform output -raw task_definition_arn)
216+
aws ecs update-service \
217+
--cluster mavis-${{ inputs.environment }}-data-replication \
218+
--service mavis-${{ inputs.environment }}-data-replication \
219+
--task-definition $task_definition_arn
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
output "task_definition_arn" {
2+
description = "The task definition arn of the db access service"
3+
value = module.db_access_service.task_definition.arn
4+
}

0 commit comments

Comments
 (0)