[PRMP-594] - V2 (#15)

nhsconnect · Aug 16, 2024 · b49f1d5 · b49f1d5
1 parent 3b983d9
commit b49f1d5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/base-gp-registrations-mi.yml b/.github/workflows/base-gp-registrations-mi.yml
@@ -82,11 +82,13 @@ jobs:
         run: |
             python3 -m venv ./venv
             ./venv/bin/pip3 install --upgrade pip requests
+        working-directory: ./stacks/gp-registrations-mi/scripts
 
       - name: Get ODS CSV Files
         if: github.ref == 'refs/heads/master' && inputs.is_deployment
         run: |
-          PYTHONPATH=$PYTHONPATH:. ./venv/bin/python3 stacks/gp-registrations-mi/scripts/get_latest_ods_csv.py ${{ secrets.TRUD_API_KEY }} ${{ vars.TRUD_API_URL }}
+          PYTHONPATH=$PYTHONPATH:. ./venv/bin/python3 get_latest_ods_csv.py ${{ secrets.TRUD_API_KEY }} ${{ vars.TRUD_API_URL }}
+        working-directory: ./stacks/gp-registrations-mi/scripts
 
       - name: Setup Terraform variables
         id: vars-prod

diff --git a/stacks/gp-registrations-mi/terraform/s3-ods-csv-updates.tf b/stacks/gp-registrations-mi/terraform/s3-ods-csv-updates.tf
@@ -46,8 +46,9 @@ resource "aws_s3_bucket_ownership_controls" "ods_csv_files" {
 }
 
 resource "aws_s3_bucket_acl" "ods_csv_files" {
-  bucket = aws_s3_bucket.ods_csv_files.id
-  acl    = "private"
+  bucket     = aws_s3_bucket.ods_csv_files.id
+  acl        = "private"
+  depends_on = [aws_s3_bucket_ownership_controls.ods_csv_files]
 }
 
 resource "aws_iam_policy" "ods_csv_files_data_policy" {