Merge pull request #54 from nhsconnect/kb-pipeline-prod

AndyFlintNHS · web-flow · commit dfc23f13fb4a · 2024-03-20T13:49:53.000Z
EhrHardDeletion.py zip is now copied between prod plan/apply stages
diff --git a/ehr-hard-deletion-lambda/EhrHardDeletion.py b/ehr-hard-deletion-lambda/EhrHardDeletion.py
diff --git a/gocd/pipeline.gocd.yml b/gocd/pipeline.gocd.yml
@@ -8,6 +8,9 @@ common:
       - build:
           source: generate-cost-report-lambda/build/generate-cost-report-lambda.zip
           destination: generate-cost-report-lambda/build/
+      - build:
+          source: ehr-hard-deletion-lambda/build/ehr-hard-deletion-lambda.zip
+          destination: ehr-hard-deletion-lambda/build/
     resources:
       - docker
     tasks:
@@ -206,6 +209,9 @@ pipelines:
                 - build:
                     source: generate-cost-report-lambda/build/generate-cost-report-lambda.zip
                     destination: generate-cost-report-lambda/build/
+                - build:
+                    source: ehr-hard-deletion-lambda/build/ehr-hard-deletion-lambda.zip
+                    destination: ehr-hard-deletion-lambda/build/
               tasks:
                 - exec:
                     command: /bin/bash
@@ -260,6 +266,9 @@ pipelines:
                 - build:
                     source: generate-cost-report-lambda/build/generate-cost-report-lambda.zip
                     destination: generate-cost-report-lambda/build/
+                - build:
+                    source: ehr-hard-deletion-lambda/build/ehr-hard-deletion-lambda.zip
+                    destination: ehr-hard-deletion-lambda/build/
               tasks:
                 - exec:
                     command: /bin/bash
@@ -317,6 +326,12 @@ pipelines:
                     source: generate-cost-report-lambda/build/generate-cost-report-lambda.zip
                     destination: generate-cost-report-lambda/build/
                     is_file: yes
+                - fetch:
+                    stage: plan_prod
+                    job: plan
+                    source: ehr-hard-deletion-lambda/build/ehr-hard-deletion-lambda.zip
+                    destination: ehr-hard-deletion-lambda/build/
+                    is_file: yes
                 - exec:
                     command: /bin/bash
                     arguments:
diff --git a/terraform/ehr_deletion_lambda.tf b/terraform/ehr_deletion_lambda.tf
@@ -99,7 +99,7 @@ data "aws_iam_policy" "lambda_dynamodb_execution_role" {
 
 data "archive_file" "ehr_hard_deletion_lambda" {
   type             = "zip"
-  source_file      = "modules/utils/scripts/EhrHardDeletion.py"
+  source_file      = "../ehr-hard-deletion-lambda/EhrHardDeletion.py"
   output_path      = var.ehr_hard_deletion_lambda_zip
   output_file_mode = "0644"
 }

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ data "aws_iam_policy" "lambda_dynamodb_execution_role" {`
`99`	`99`
`100`	`100`	`data "archive_file" "ehr_hard_deletion_lambda" {`
`101`	`101`	`type = "zip"`
`102`		`- source_file = "modules/utils/scripts/EhrHardDeletion.py"`
	`102`	`+ source_file = "../ehr-hard-deletion-lambda/EhrHardDeletion.py"`
`103`	`103`	`output_path = var.ehr_hard_deletion_lambda_zip`
`104`	`104`	`output_file_mode = "0644"`
`105`	`105`	`}`