[PRMP-594] - V3 - Update script to store initial data in tf root fold…

…er (#16)
nhsconnect · Aug 19, 2024 · afe2fa7 · afe2fa7
1 parent b49f1d5
commit afe2fa7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/.github/workflows/base-gp-registrations-mi.yml b/.github/workflows/base-gp-registrations-mi.yml
@@ -81,14 +81,11 @@ jobs:
         if: github.ref == 'refs/heads/master' && inputs.is_deployment
         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 get_latest_ods_csv.py ${{ secrets.TRUD_API_KEY }} ${{ vars.TRUD_API_URL }}
-        working-directory: ./stacks/gp-registrations-mi/scripts
+          PYTHONPATH=$PYTHONPATH:. ./venv/bin/python3 -m utils.get_latest_ods_csv ${{ secrets.TRUD_API_KEY }} ${{ vars.TRUD_API_URL }}
 
       - 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
@@ -72,7 +72,7 @@ resource "aws_iam_policy" "ods_csv_files_data_policy" {
 resource "aws_s3_object" "initial_gp_ods_csv" {
   bucket = aws_s3_bucket.ods_csv_files.id
   key    = "init/initial-gps-ods-csv"
-  source = "../scripts/initial_full_gps_ods.csv"
+  source = "initial_full_gps_ods.csv"
   lifecycle {
     ignore_changes = all
   }
@@ -82,7 +82,7 @@ resource "aws_s3_object" "initial_gp_ods_csv" {
 resource "aws_s3_object" "initial_icb_ods_csv" {
   bucket = aws_s3_bucket.ods_csv_files.id
   key    = "init/initial-icb-ods-csv"
-  source = "../scripts/initial_full_icb_ods.csv"
+  source = "initial_full_icb_ods.csv"
   lifecycle {
     ignore_changes = all
   }

diff --git a/...trations-mi/scripts/get_latest_ods_csv.py → utils/get_latest_ods_csv.py b/...trations-mi/scripts/get_latest_ods_csv.py → utils/get_latest_ods_csv.py
@@ -1,9 +1,9 @@
 import csv
 import sys
 
-from utils.enums.trud import TrudItem
-from utils.services.trud_api_service import TrudApiService
-from utils.trud_files import (
+from .enums.trud import TrudItem
+from .services.trud_api_service import TrudApiService
+from .trud_files import (
     ICB_MONTHLY_FILE_PATH,
     ICB_QUARTERLY_FILE_PATH,
     ICB_MONTHLY_FILE_NAME,
@@ -24,7 +24,7 @@ def create_modify_csv(
     additional_rows=None,
 ):
     with open(file_path, newline="") as original, open(
-        modify_file_path, "w", newline=""
+        f"stacks/gp-registrations-mi/terraform/{modify_file_path}", "w", newline=""
     ) as output:
         reader = csv.DictReader(original, delimiter=",", fieldnames=headers_list)
         csv_modified_rows = [

diff --git a/utils/services/trud_api_service.py b/utils/services/trud_api_service.py
@@ -1,3 +1,4 @@
+import json
 import os
 from io import BytesIO
 from zipfile import ZipFile
@@ -31,7 +32,8 @@ def get_release_list(self, item_number: TrudItem, is_latest=False):
 
         try:
             trud_response = self.http.request("GET", url_endpoint)
-            response = trud_response.json().get("releases", [])
+            trud_data = json.loads(trud_response.data.decode())
+            response = trud_data.get("releases", [])
             trud_response.release_conn()
 
             return response