diff --git a/verification/curator-service/api/src/controllers/cases.ts b/verification/curator-service/api/src/controllers/cases.ts index bada2ba2a..ccb76860b 100644 --- a/verification/curator-service/api/src/controllers/cases.ts +++ b/verification/curator-service/api/src/controllers/cases.ts @@ -23,6 +23,8 @@ const defaultOutputQuery = export default class CasesController { constructor( private readonly dataServerURL: string, + private readonly completeDataBucket: string, + private readonly countryDataBucket: string, private readonly s3Client: AWS.S3, ) {} @@ -200,7 +202,7 @@ export default class CasesController { const filename = `gh_${year}-${month}-${day}.tar`; const params = { - Bucket: 'covid-19-data-export', + Bucket: this.completeDataBucket, Key: 'latest/latestdata-csv.tar', Expires: 5 * 60, ResponseContentDisposition: @@ -248,7 +250,7 @@ export default class CasesController { const filename = `${country}.${format}.gz`; const filepath = `${format}/${filename}`; const params = { - Bucket: 'covid-19-country-export', + Bucket: this.countryDataBucket, Key: filepath, Expires: 5 * 60, ResponseContentDisposition: @@ -305,7 +307,7 @@ export default class CasesController { const filepath = `${format}/${country}.${format}.gz`; const contains = await this.s3Client .headObject({ - Bucket: 'covid-19-country-export', + Bucket: this.countryDataBucket, Key: filepath, }) .promise() diff --git a/verification/curator-service/api/src/index.ts b/verification/curator-service/api/src/index.ts index 58179f400..2a4b7ec21 100644 --- a/verification/curator-service/api/src/index.ts +++ b/verification/curator-service/api/src/index.ts @@ -240,7 +240,11 @@ async function makeApp() { ); // Configure cases controller proxying to data service. - const casesController = new CasesController(env.DATASERVER_URL, s3Client); + const casesController = new CasesController( + env.DATASERVER_URL, + env.COMPLETE_DATA_BUCKET, + env.COUNTRY_DATA_BUCKET, + s3Client); apiRouter.get( '/cases', authenticateByAPIKey, diff --git a/verification/curator-service/api/src/util/validate-env.ts b/verification/curator-service/api/src/util/validate-env.ts index d773effbc..40a26e633 100644 --- a/verification/curator-service/api/src/util/validate-env.ts +++ b/verification/curator-service/api/src/util/validate-env.ts @@ -5,6 +5,8 @@ export default function validateEnv(): Readonly<{ AWS_ACCESS_KEY_ID: string; AWS_SECRET_ACCESS_KEY: string; AWS_SERVICE_REGION: string; + COMPLETE_DATA_BUCKET: string; + COUNTRY_DATA_BUCKET: string; CURATOR_VERSION: string; DATASERVER_URL: string; DB_CONNECTION_STRING: string; @@ -44,6 +46,14 @@ export default function validateEnv(): Readonly<{ desc: 'AWS region in which to interact with services/resources', default: 'eu-central-1', }), + COMPLETE_DATA_BUCKET: str({ + desc: 'S3 bucket containing case data by country', + devDefault: 'covid-19-data-export-dev-eu', + }), + COUNTRY_DATA_BUCKET: str({ + desc: 'S3 bucket containing case data by country', + devDefault: 'covid-19-country-export-dev-eu', + }), CURATOR_VERSION: str({ desc: 'version string to display in UI for bug reports etc.', devDefault: '(local testing)',