Skip to content

Commit

Permalink
Added bsRunsManager uploader to configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
alexiswl committed Apr 18, 2024
1 parent e711fec commit 2d99178
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 3 deletions.
6 changes: 4 additions & 2 deletions config/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { getPostgresManagerStackProps } from './stacks/postgresManager';
import { getMetadataManagerStackProps } from './stacks/metadataManager';
import { getSequenceRunManagerStackProps } from './stacks/sequenceRunManager';
import { getFileManagerStackProps } from './stacks/fileManager';
import { getBsRunsUploadManagerStackProps } from './stacks/bsRunsUploadManager';

interface EnvironmentConfig {
name: string;
Expand Down Expand Up @@ -45,10 +46,10 @@ export const getEnvironmentConfig = (
metadataManagerStackProps: getMetadataManagerStackProps(),
sequenceRunManagerStackProps: getSequenceRunManagerStackProps(),
fileManagerStackProps: getFileManagerStackProps(accountName),
bsRunsUploadManagerStackProps: getBsRunsUploadManagerStackProps(accountName),
},
},
};
break;

case 'gamma':
return {
Expand All @@ -66,10 +67,10 @@ export const getEnvironmentConfig = (
metadataManagerStackProps: getMetadataManagerStackProps(),
sequenceRunManagerStackProps: getSequenceRunManagerStackProps(),
fileManagerStackProps: getFileManagerStackProps(accountName),
bsRunsUploadManagerStackProps: getBsRunsUploadManagerStackProps(accountName),
},
},
};
break;

case 'prod':
return {
Expand All @@ -87,6 +88,7 @@ export const getEnvironmentConfig = (
metadataManagerStackProps: getMetadataManagerStackProps(),
sequenceRunManagerStackProps: getSequenceRunManagerStackProps(),
fileManagerStackProps: getFileManagerStackProps(accountName),
bsRunsUploadManagerStackProps: getBsRunsUploadManagerStackProps(accountName),
},
},
};
Expand Down
4 changes: 4 additions & 0 deletions config/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ export const devBucket = 'umccr-temp-dev';
export const stgBucket = 'umccr-temp-stg';
export const prodBucket = 'org.umccr.data.oncoanalyser';

export const devGdsBsRunsUploadLogPath = 'gds://development/primary_data/temp/bs_runs_upload_tes/';
export const stgGdsBsRunsUploadLogPath = 'gds://staging/primary_data/temp/bs_runs_upload_tes/';
export const prodGdsBsRunsUploadLogPath = 'gds://production/primary_data/temp/bs_runs_upload_tes/';

/**
* Validate the secret name so that it doesn't end with 6 characters and a hyphen.
*
Expand Down
34 changes: 34 additions & 0 deletions config/stacks/bsRunsUploadManager.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import { BsRunsUploadManagerConfig } from '../../lib/workload/stateless/bs_runs_upload_manager/deploy/lib/stacks/bs_runs_upload_manager_stack';
import {
devGdsBsRunsUploadLogPath,
stgGdsBsRunsUploadLogPath,
prodGdsBsRunsUploadLogPath,
AccountName,
} from '../constants';

export const getBsRunsUploadManagerStackProps = (n: AccountName): BsRunsUploadManagerConfig => {
const baseConfig = {
ica_token_secret_id: 'IcaSecretsPortal',
portal_token_secret_id: 'orcabus/token-service-jwt',
basespace_token_secret_id: '/manual/BaseSpaceAccessTokenSecret',
eventbus_name: '/umccr/orcabus/stateful/eventbridge',
};

switch (n) {
case 'beta':
return {
...baseConfig,
gds_system_files_path: devGdsBsRunsUploadLogPath,
};
case 'gamma':
return {
...baseConfig,
gds_system_files_path: stgGdsBsRunsUploadLogPath,
};
case 'prod':
return {
...baseConfig,
gds_system_files_path: prodGdsBsRunsUploadLogPath,
};
}
};
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import * as events from 'aws-cdk-lib/aws-events';
import * as ssm from 'aws-cdk-lib/aws-ssm';
// import * as sqs from 'aws-cdk-lib/aws-sqs';

export interface BsRunsUploadManagerStackProps extends cdk.StackProps {
export interface BsRunsUploadManagerConfig {
// Define construct properties here
ica_token_secret_id: string; // IcaSecretsPortal
portal_token_secret_id: string; // orcabus/token-service-jwt
Expand All @@ -16,6 +16,8 @@ export interface BsRunsUploadManagerStackProps extends cdk.StackProps {
eventbus_name: string; // /umccr/orcabus/stateful/eventbridge
}

export type BsRunsUploadManagerStackProps = BsRunsUploadManagerConfig & cdk.StackProps

export class BsRunsUploadManagerStack extends cdk.Stack {
constructor(scope: Construct, id: string, props: BsRunsUploadManagerStackProps) {
super(scope, id, props);
Expand Down
2 changes: 2 additions & 0 deletions lib/workload/stateless/statelessStackCollectionClass.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,14 @@ import {
SequenceRunManagerStack,
SequenceRunManagerStackProps,
} from './stacks/sequence-run-manager/deploy/component';
import { BsRunsUploadManagerStackProps } from './bs_runs_upload_manager/deploy/lib/stacks/bs_runs_upload_manager_stack';

export interface StatelessStackCollectionProps {
postgresManagerStackProps: PostgresManagerStackProps;
metadataManagerStackProps: MetadataManagerStackProps;
sequenceRunManagerStackProps: SequenceRunManagerStackProps;
fileManagerStackProps: FilemanagerProps;
bsRunsUploadManagerStackProps: BsRunsUploadManagerStackProps;
}

export class StatelessStackCollection {
Expand Down

0 comments on commit 2d99178

Please sign in to comment.