Making data bucket an env var

globaldothealth · Apr 26, 2022 · d287e80 · d287e80
1 parent a195468
commit d287e80
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/.github/workflows/update-prod-curator-db-schema.yaml b/.github/workflows/update-prod-curator-db-schema.yaml
@@ -3,13 +3,13 @@ name: Migrate prod database schema
 on:
   push:
     # Run workflow when the schema changes. The branch name should always reflect the current release!
-    branches: [1.9-stable]
+    branches: [1.11-stable]
     paths:
       - "data-serving/scripts/setup-db/migrations/**"
       - ".github/workflows/update-prod-curator-db-schema.yaml"
   workflow_dispatch:
     # Run workflow when the schema changes. The branch name should always reflect the current release!
-    branches: [1.9-stable]
+    branches: [1.11-stable]
     paths:
       - "data-serving/scripts/setup-db/migrations/**"
       - ".github/workflows/update-prod-curator-db-schema.yaml"

diff --git a/verification/curator-service/api/src/controllers/cases.ts b/verification/curator-service/api/src/controllers/cases.ts
@@ -23,6 +23,7 @@ const defaultOutputQuery =
 export default class CasesController {
     constructor(
         private readonly dataServerURL: string,
+        private readonly dataBucket: string,
         private readonly s3Client: AWS.S3,
     ) {}
 
@@ -248,7 +249,7 @@ export default class CasesController {
         const filename = `${country}.${format}.gz`;
         const filepath = `${format}/${filename}`;
         const params = {
-            Bucket: 'covid-19-country-export',
+            Bucket: this.dataBucket,
             Key: filepath,
             Expires: 5 * 60,
             ResponseContentDisposition:
@@ -305,7 +306,7 @@ export default class CasesController {
         const filepath = `${format}/${country}.${format}.gz`;
         const contains = await this.s3Client
             .headObject({
-                Bucket: 'covid-19-country-export',
+                Bucket: this.dataBucket,
                 Key: filepath,
             })
             .promise()

diff --git a/verification/curator-service/api/src/index.ts b/verification/curator-service/api/src/index.ts
@@ -240,7 +240,7 @@ 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.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
@@ -6,6 +6,7 @@ export default function validateEnv(): Readonly<{
     AWS_SECRET_ACCESS_KEY: string;
     AWS_SERVICE_REGION: string;
     CURATOR_VERSION: string;
+    DATA_BUCKET: string;
     DATASERVER_URL: string;
     DB_CONNECTION_STRING: string;
     EMAIL_USER_ADDRESS: string;
@@ -48,6 +49,10 @@ export default function validateEnv(): Readonly<{
             desc: 'version string to display in UI for bug reports etc.',
             devDefault: '(local testing)',
         }),
+        DATA_BUCKET: str({
+            desc: 'S3 bucket containing case data',
+            devDefault: 'covid-19-country-export-dev-eu',
+        }),
         DATASERVER_URL: url({
             desc: 'URL at which to make requests to the data-service API',
             devDefault: 'http://localhost:3000',