Skip to content

Commit

Permalink
AWS_ACCOUNT_ID et al
Browse files Browse the repository at this point in the history
  • Loading branch information
drernie committed Dec 5, 2023
1 parent 6541674 commit 9390e58
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 34 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/build.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion .projenrc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}',
});
Expand Down
22 changes: 11 additions & 11 deletions src/constants.ts
Original file line number Diff line number Diff line change
@@ -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
Expand Down
42 changes: 21 additions & 21 deletions test/constants.test.ts
Original file line number Diff line number Diff line change
@@ -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();
});
});

0 comments on commit 9390e58

Please sign in to comment.