From f72c26f4a29f09e39563e93c5691a081620151f6 Mon Sep 17 00:00:00 2001 From: Alexis Lucattini Date: Thu, 16 Oct 2025 09:51:07 +1100 Subject: [PATCH] Drop BCLConvert manager from stateless/stateful stacks Also removed a bunch of stateful stacks that weren't taken the first time around --- .../stateful/statefulStackCollectionClass.ts | 120 ++++++++---------- .../statelessStackCollectionClass.ts | 9 +- 2 files changed, 54 insertions(+), 75 deletions(-) diff --git a/lib/workload/stateful/statefulStackCollectionClass.ts b/lib/workload/stateful/statefulStackCollectionClass.ts index 49728b559..6fc216741 100644 --- a/lib/workload/stateful/statefulStackCollectionClass.ts +++ b/lib/workload/stateful/statefulStackCollectionClass.ts @@ -2,14 +2,8 @@ import { Construct } from 'constructs'; import { Stack, Environment, StackProps } from 'aws-cdk-lib'; import { TokenServiceStackProps } from './stacks/token-service/deploy/stack'; import { IcaEventPipeStack, IcaEventPipeStackProps } from './stacks/ica-event-pipe/stack'; -import { - Cttsov2Icav2PipelineTable, - Cttsov2Icav2PipelineTableStackProps, -} from './stacks/cttso-v2-pipeline-dynamo-db/deploy/stack'; -import { - BclConvertTable, - BclConvertTableStackProps, -} from './stacks/bclconvert-dynamo-db/deploy/stack'; +import { Cttsov2Icav2PipelineTableStackProps } from './stacks/cttso-v2-pipeline-dynamo-db/deploy/stack'; +import { BclConvertTableStackProps } from './stacks/bclconvert-dynamo-db/deploy/stack'; import { BclconvertInteropQcIcav2PipelineTableStackProps } from './stacks/bclconvert-interop-qc-pipeline-dynamo-db/deploy/stack'; import { StackyStatefulTablesStack, @@ -37,23 +31,11 @@ import { RnasumIcav2PipelineTable, RnasumIcav2PipelineTableStackProps, } from './stacks/rnasum-pipeline-dynamo-db/deploy/stack'; -import { - PierianDxPipelineTable, - PierianDxPipelineTableStackProps, -} from './stacks/pieriandx-pipeline-dynamo-db/deploy'; +import { PierianDxPipelineTableStackProps } from './stacks/pieriandx-pipeline-dynamo-db/deploy'; import { AuthorizationManagerStackProps } from './stacks/authorization-manager/stack'; -import { - OncoanalyserNfPipelineTable, - OncoanalyserNfPipelineTableStackProps, -} from './stacks/oncoanalyser-dynamodb/deploy/stack'; -import { - SashNfPipelineTable, - SashNfPipelineTableStackProps, -} from './stacks/sash-dynamodb/deploy/stack'; -import { - OraCompressionIcav2PipelineTable, - OraCompressionIcav2PipelineTableStackProps, -} from './stacks/ora-decompression-dynamodb/deploy/stack'; +import { OncoanalyserNfPipelineTableStackProps } from './stacks/oncoanalyser-dynamodb/deploy/stack'; +import { SashNfPipelineTableStackProps } from './stacks/sash-dynamodb/deploy/stack'; +import { OraCompressionIcav2PipelineTableStackProps } from './stacks/ora-decompression-dynamodb/deploy/stack'; import { AccessKeySecretStackProps } from './stacks/access-key-secret'; import { FastqManagerTableStackProps } from './stacks/fastq-manager-db/deploy/stack'; import { FastqUnarchivingManagerTableStackProps } from './stacks/fastq-unarchiving-dynamodb/deploy'; @@ -206,6 +188,50 @@ export class StatefulStackCollection { // ...statefulConfiguration.dataSharingS3AndTableStackProps, // } // ); + // this.cttsov2Icav2PipelineTableStack = new Cttsov2Icav2PipelineTable( + // scope, + // 'Cttsov2Icav2PipelineTableStack', + // { + // ...this.createTemplateProps(env, 'Cttsov2Icav2PipelineTableStack'), + // ...statefulConfiguration.cttsov2Icav2PipelineTableStackProps, + // } + // ); + // this.oraCompressionIcav2PipelineTableStack = new OraCompressionIcav2PipelineTable( + // scope, + // 'OraCompressionIcav2PipelineTableStack', + // { + // ...this.createTemplateProps(env, 'OraCompressionIcav2PipelineTableStack'), + // ...statefulConfiguration.oraCompressionIcav2PipelineTableStackProps, + // } + // ); + + // this.BclConvertTableStack = new BclConvertTable(scope, 'BclConvertTableStack', { + // ...this.createTemplateProps(env, 'BclConvertTableStack'), + // ...statefulConfiguration.BclConvertTableStackProps, + // }); + // this.pierianDxPipelineTableStack = new PierianDxPipelineTable( + // scope, + // 'PierianDxPipelineTableStack', + // { + // ...this.createTemplateProps(env, 'PierianDxPipelineTableStack'), + // ...statefulConfiguration.pierianDxPipelineTableStackProps, + // } + // ); + // + // this.oncoanalyserPipelineTableStack = new OncoanalyserNfPipelineTable( + // scope, + // 'OncoanalyserNfPipelineTableStack', + // { + // ...this.createTemplateProps(env, 'OncoanalyserNfPipelineTableStack'), + // ...statefulConfiguration.oncoanalyserPipelineTableStackProps, + // } + // ); + // + // this.sashPipelineTableStack = new SashNfPipelineTable(scope, 'SashNfPipelineTableStack', { + // ...this.createTemplateProps(env, 'SashNfPipelineTableStack'), + // ...statefulConfiguration.sashPipelineTableStackProps, + // }); + // Currently this only needs to be deployed if bucketName exist as props if (statefulConfiguration.dataBucketStackProps.bucketName) { this.dataBucketStack = new DataBucketStack(scope, 'DataBucketStack', { @@ -219,15 +245,6 @@ export class StatefulStackCollection { ...statefulConfiguration.icaEventPipeStackProps, }); - this.cttsov2Icav2PipelineTableStack = new Cttsov2Icav2PipelineTable( - scope, - 'Cttsov2Icav2PipelineTableStack', - { - ...this.createTemplateProps(env, 'Cttsov2Icav2PipelineTableStack'), - ...statefulConfiguration.cttsov2Icav2PipelineTableStackProps, - } - ); - this.wgtsQcIcav2PipelineTableStack = new WgtsQcIcav2PipelineTable( scope, 'WgtsQcIcav2PipelineTableStack', @@ -269,20 +286,6 @@ export class StatefulStackCollection { } ); - this.oraCompressionIcav2PipelineTableStack = new OraCompressionIcav2PipelineTable( - scope, - 'OraCompressionIcav2PipelineTableStack', - { - ...this.createTemplateProps(env, 'OraCompressionIcav2PipelineTableStack'), - ...statefulConfiguration.oraCompressionIcav2PipelineTableStackProps, - } - ); - - this.BclConvertTableStack = new BclConvertTable(scope, 'BclConvertTableStack', { - ...this.createTemplateProps(env, 'BclConvertTableStack'), - ...statefulConfiguration.BclConvertTableStackProps, - }); - this.stackyStatefulTablesStack = new StackyStatefulTablesStack( scope, 'StackyStatefulTablesStack', @@ -291,29 +294,6 @@ export class StatefulStackCollection { ...statefulConfiguration.stackyStatefulTablesStackProps, } ); - - this.pierianDxPipelineTableStack = new PierianDxPipelineTable( - scope, - 'PierianDxPipelineTableStack', - { - ...this.createTemplateProps(env, 'PierianDxPipelineTableStack'), - ...statefulConfiguration.pierianDxPipelineTableStackProps, - } - ); - - this.oncoanalyserPipelineTableStack = new OncoanalyserNfPipelineTable( - scope, - 'OncoanalyserNfPipelineTableStack', - { - ...this.createTemplateProps(env, 'OncoanalyserNfPipelineTableStack'), - ...statefulConfiguration.oncoanalyserPipelineTableStackProps, - } - ); - - this.sashPipelineTableStack = new SashNfPipelineTable(scope, 'SashNfPipelineTableStack', { - ...this.createTemplateProps(env, 'SashNfPipelineTableStack'), - ...statefulConfiguration.sashPipelineTableStackProps, - }); } /** diff --git a/lib/workload/stateless/statelessStackCollectionClass.ts b/lib/workload/stateless/statelessStackCollectionClass.ts index c60aed28b..5d6373e5f 100644 --- a/lib/workload/stateless/statelessStackCollectionClass.ts +++ b/lib/workload/stateless/statelessStackCollectionClass.ts @@ -269,6 +269,10 @@ export class StatelessStackCollection { // ...statelessConfiguration.cttsov2Icav2PipelineManagerStackProps, // } // ); + // this.bclConvertManagerStack = new BclConvertManagerStack(scope, 'BclConvertManagerStack', { + // ...this.createTemplateProps(env, 'BclConvertManagerStack'), + // ...statelessConfiguration.bclConvertManagerStackProps, + // }); this.eventSchemaStack = new SchemaStack(scope, 'EventSchemaStack', { ...this.createTemplateProps(env, 'EventSchemaStack'), @@ -325,11 +329,6 @@ export class StatelessStackCollection { } ); - this.bclConvertManagerStack = new BclConvertManagerStack(scope, 'BclConvertManagerStack', { - ...this.createTemplateProps(env, 'BclConvertManagerStack'), - ...statelessConfiguration.bclConvertManagerStackProps, - }); - this.stackyMcStackFaceStack = new GlueStack(scope, 'StackyMcStackFaceStack', { ...this.createTemplateProps(env, 'StackyMcStackFaceStack'), ...statelessConfiguration.stackyMcStackFaceProps,