From c255eb4493ed5401790f191f69bc87471bd6e9fe Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Wed, 16 Oct 2024 12:35:56 -0400 Subject: [PATCH 1/3] Fix egress proxy space references This changeset fixes the references to the egress proxy spaces in the demo and prod environments. Signed-off-by: Carlo Costino --- .github/workflows/deploy-demo.yml | 4 ++-- .github/workflows/deploy-prod.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy-demo.yml b/.github/workflows/deploy-demo.yml index a43b661f3..d3855d2ef 100644 --- a/.github/workflows/deploy-demo.yml +++ b/.github/workflows/deploy-demo.yml @@ -102,5 +102,5 @@ jobs: CF_PASSWORD: ${{ secrets.CLOUDGOV_PASSWORD }} with: cf_org: gsa-tts-benefits-studio - cf_space: notify-staging - app: notify-api-staging + cf_space: notify-demo + app: notify-api-demo diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index 23ef3dc6c..d01e53e0a 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -106,5 +106,5 @@ jobs: CF_PASSWORD: ${{ secrets.CLOUDGOV_PASSWORD }} with: cf_org: gsa-tts-benefits-studio - cf_space: notify-staging - app: notify-api-staging + cf_space: notify-prod + app: notify-api-prod From 430318ed582c25f144978eeaff61af7cbc890fcf Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Wed, 16 Oct 2024 14:19:57 -0400 Subject: [PATCH 2/3] Fix reference to prod space This changeset fixes the name of the prod space (notify-production). Signed-off-by: Carlo Costino --- .github/workflows/deploy-prod.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index d01e53e0a..bc4eaae74 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -106,5 +106,5 @@ jobs: CF_PASSWORD: ${{ secrets.CLOUDGOV_PASSWORD }} with: cf_org: gsa-tts-benefits-studio - cf_space: notify-prod - app: notify-api-prod + cf_space: notify-production + app: notify-api-production From 6dfeac93cd316617a2a58de8e17ff34336eb6d67 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Wed, 16 Oct 2024 13:22:36 -0700 Subject: [PATCH 3/3] fix partitioning --- app/aws/s3.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/aws/s3.py b/app/aws/s3.py index a3cd35811..d4d704632 100644 --- a/app/aws/s3.py +++ b/app/aws/s3.py @@ -295,7 +295,11 @@ def get_old_job_location(service_id, job_id): def get_job_and_metadata_from_s3(service_id, job_id): - obj = get_s3_object(*get_job_location(service_id, job_id)) + try: + obj = get_s3_object(*get_job_location(service_id, job_id)) + except botocore.exceptions.ClientError: + obj = get_s3_object(*get_old_job_location(service_id, job_id)) + return obj.get()["Body"].read().decode("utf-8"), obj.get()["Metadata"]