From 9390e58f042eaaf6b163b9ff293d6b1fef20fc2b Mon Sep 17 00:00:00 2001
From: "Dr. Ernie Prabhakar" <ernest@quiltdata.io>
Date: Mon, 4 Dec 2023 16:46:30 -0800
Subject: [PATCH] AWS_ACCOUNT_ID et al

---
 .github/workflows/build.yml |  4 +++-
 .projenrc.ts                |  4 +++-
 src/constants.ts            | 22 +++++++++----------
 test/constants.test.ts      | 42 ++++++++++++++++++-------------------
 4 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bb0ad21..930566e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,10 +14,12 @@ jobs:
     env:
       CI: "true"
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+      AWS_ACCOUNT_ID: ${{ secrets.AWS_ACCOUNT_ID }}
+      AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       CDK_APP_NAME: ${{ secrets.CDK_APP_NAME }}
       CDK_DEFAULT_ACCOUNT: ${{ secrets.AWS_ACCOUNT_ID }}
-      CDK_DEFAULT_REGION: ${{ secrets.CDK_DEFAULT_REGION }}
+      CDK_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
       CDK_DEFAULT_EMAIL: ${{ secrets.CDK_DEFAULT_EMAIL }}
       QUILT_CATALOG_DOMAIN: ${{ secrets.QUILT_CATALOG_DOMAIN }}
     steps:
diff --git a/.projenrc.ts b/.projenrc.ts
index 759a2b7..b373f07 100644
--- a/.projenrc.ts
+++ b/.projenrc.ts
@@ -26,10 +26,12 @@ const project = new awscdk.AwsCdkTypeScriptApp({
 project.tryFindObjectFile('.github/workflows/build.yml')!.addOverride('jobs.build.env', {
   CI: 'true',
   AWS_ACCESS_KEY_ID: '${{ secrets.AWS_ACCESS_KEY_ID }}',
+  AWS_ACCOUNT_ID: '${{ secrets.AWS_ACCOUNT_ID }}',
+  AWS_DEFAULT_REGION: '${{ secrets.AWS_DEFAULT_REGION }}',
   AWS_SECRET_ACCESS_KEY: '${{ secrets.AWS_SECRET_ACCESS_KEY }}',
   CDK_APP_NAME: '${{ secrets.CDK_APP_NAME }}',
   CDK_DEFAULT_ACCOUNT: '${{ secrets.AWS_ACCOUNT_ID }}',
-  CDK_DEFAULT_REGION: '${{ secrets.CDK_DEFAULT_REGION }}',
+  CDK_DEFAULT_REGION: '${{ secrets.AWS_DEFAULT_REGION }}',
   CDK_DEFAULT_EMAIL: '${{ secrets.CDK_DEFAULT_EMAIL }}',
   QUILT_CATALOG_DOMAIN: '${{ secrets.QUILT_CATALOG_DOMAIN }}',
 });
diff --git a/src/constants.ts b/src/constants.ts
index eb6ac44..ccd67ef 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -1,20 +1,20 @@
-import 'dotenv/config'
+import 'dotenv/config';
 
-export const AWS_ACCOUNT_ID = process.env.CDK_DEFAULT_ACCOUNT ?? ''
-export const AWS_REGION = process.env.CDK_DEFAULT_REGION ?? ''
+export const AWS_ACCOUNT_ID = process.env.CDK_DEFAULT_ACCOUNT ?? '';
+export const AWS_REGION = process.env.CDK_DEFAULT_REGION ?? '';
 
-export const APP_NAME = process.env.CDK_APP_NAME ?? 'healthomics'
+export const APP_NAME = process.env.CDK_APP_NAME ?? 'healthomics';
 export const READY2RUN_WORKFLOW_ID =
-  process.env.READY2RUN_WORKFLOW_ID ?? '9500764'
+  process.env.READY2RUN_WORKFLOW_ID ?? '9500764';
 export const DEFAULT_EMAIL =
-  process.env.CDK_DEFAULT_EMAIL ?? 'test@example.com'
+  process.env.CDK_DEFAULT_EMAIL ?? 'test@example.com';
 
-export const INPUT_BUCKET = `${APP_NAME}-cka-input-${AWS_ACCOUNT_ID}-${AWS_REGION}`
-export const OUTPUT_BUCKET = `${APP_NAME}-cka-output-${AWS_ACCOUNT_ID}-${AWS_REGION}`
+export const INPUT_BUCKET = `${APP_NAME}-cka-input-${AWS_ACCOUNT_ID}-${AWS_REGION}`;
+export const OUTPUT_BUCKET = `${APP_NAME}-cka-output-${AWS_ACCOUNT_ID}-${AWS_REGION}`;
 
-export const MANIFEST_ROOT = 'fastq'
-export const MANIFEST_PREFIX = `${MANIFEST_ROOT}/${AWS_REGION}`
-export const MANIFEST_SUFFIX = '.json'
+export const MANIFEST_ROOT = 'fastq';
+export const MANIFEST_PREFIX = `${MANIFEST_ROOT}/${AWS_REGION}`;
+export const MANIFEST_SUFFIX = '.json';
 
 /*
 // placeholders for lambda functions
diff --git a/test/constants.test.ts b/test/constants.test.ts
index 19898e4..939b969 100644
--- a/test/constants.test.ts
+++ b/test/constants.test.ts
@@ -1,40 +1,40 @@
-import * as cn from '../src/constants'
+import * as cn from '../src/constants';
 
 describe('constants', () => {
   it('should have AWS_ACCOUNT_ID defined', () => {
-    expect(cn.AWS_ACCOUNT_ID).toBeDefined()
-  })
+    expect(cn.AWS_ACCOUNT_ID).toBeDefined();
+  });
 
   it('should have AWS_REGION defined', () => {
-    expect(cn.AWS_REGION).toBeDefined()
-  })
+    expect(cn.AWS_REGION).toBeDefined();
+  });
 
   it('should have APP_NAME defined', () => {
-    expect(cn.APP_NAME).toBeDefined()
-  })
+    expect(cn.APP_NAME).toBeDefined();
+  });
 
   it('should have READY2RUN_WORKFLOW_ID defined', () => {
-    expect(cn.READY2RUN_WORKFLOW_ID).toBeDefined()
-  })
+    expect(cn.READY2RUN_WORKFLOW_ID).toBeDefined();
+  });
 
   it('should have DEFAULT_EMAIL defined', () => {
-    expect(cn.DEFAULT_EMAIL).toBeDefined()
-  })
+    expect(cn.DEFAULT_EMAIL).toBeDefined();
+  });
 
   it('should have INPUT_BUCKET defined', () => {
-    expect(cn.INPUT_BUCKET).toBeDefined()
-  })
+    expect(cn.INPUT_BUCKET).toBeDefined();
+  });
 
   it('should have OUTPUT_BUCKET defined', () => {
-    expect(cn.OUTPUT_BUCKET).toBeDefined()
-  })
+    expect(cn.OUTPUT_BUCKET).toBeDefined();
+  });
 
   it('should have MANIFEST_PREFIX defined', () => {
-    expect(cn.MANIFEST_PREFIX).toBeDefined()
-    expect(cn.MANIFEST_PREFIX).toEqual(`fastq/${cn.AWS_REGION}`)
-  })
+    expect(cn.MANIFEST_PREFIX).toBeDefined();
+    expect(cn.MANIFEST_PREFIX).toEqual(`fastq/${cn.AWS_REGION}`);
+  });
 
   it('should have MANIFEST_SUFFIX defined', () => {
-    expect(cn.MANIFEST_SUFFIX).toBeDefined()
-  })
-})
+    expect(cn.MANIFEST_SUFFIX).toBeDefined();
+  });
+});