darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-04 10:21:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

merge from main

Browse Source
This commit is contained in:
Kenneth Kehl
2024-10-17 07:36:53 -07:00
parent 965c5c9b84 2cfd1c6893
commit 50b074d137
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/deploy-demo.yml vendored
View File

@@ -102,5 +102,5 @@ jobs:
CF_PASSWORD: ${{ secrets.CLOUDGOV_PASSWORD }} CF_PASSWORD: ${{ secrets.CLOUDGOV_PASSWORD }}
with: with:
cf_org: gsa-tts-benefits-studio cf_org: gsa-tts-benefits-studio
cf_space: notify-staging cf_space: notify-demo
app: notify-api-staging app: notify-api-demo

4
.github/workflows/deploy-prod.yml vendored
View File

@@ -106,5 +106,5 @@ jobs:
CF_PASSWORD: ${{ secrets.CLOUDGOV_PASSWORD }} CF_PASSWORD: ${{ secrets.CLOUDGOV_PASSWORD }}
with: with:
cf_org: gsa-tts-benefits-studio cf_org: gsa-tts-benefits-studio
cf_space: notify-staging cf_space: notify-production
app: notify-api-staging app: notify-api-production

6
app/aws/s3.py
View File

@@ -295,7 +295,11 @@ def get_old_job_location(service_id, job_id):
def get_job_and_metadata_from_s3(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"] return obj.get()["Body"].read().decode("utf-8"), obj.get()["Metadata"]