Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unused stacky tables #619

Merged
merged 1 commit into from
Oct 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion config/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,6 @@ export const sashPipelineVersionSSMParameterPath = '/nextflow_stack/sash/pipelin
// Stacky Stack
export const stackyEventBusName = eventBusName;
export const stackyInstrumentRunTableName = 'stacky-instrument-run-table';
export const stackyInputMakerTableName = 'stacky-input-maker-table';
export const stackyCttsov2InputGlueTableName = 'stacky-cttsov2-workflow-glue-table';
export const stackyWgtsQcGlueTableName = 'stacky-wgts-qc-glue-table';
export const stackyTnGlueTableName = 'stacky-tn-glue-table';
Expand Down
6 changes: 0 additions & 6 deletions config/stacks/stackyMcStackFace.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@ import {
stackyAnalysisOutputUriSsmParameterName,
stackyEventBusName,
stackyIcav2ProjectIdSsmParameterName,
stackyInputMakerTableName,
stackyInstrumentRunTableName,
stackyWorkflowManagerTableName,
stackyCttsov2InputGlueTableName,
icav2AccessTokenSecretName,
stackyWgtsQcGlueTableName,
Expand All @@ -31,9 +29,7 @@ export const getGlueStackProps = (stage: AppStage): GlueStackConfig => {
eventBusName: stackyEventBusName,

/* Tables */
inputMakerTableName: stackyInputMakerTableName,
instrumentRunTableName: stackyInstrumentRunTableName,
workflowManagerTableName: stackyWorkflowManagerTableName,
cttsov2GlueTableName: stackyCttsov2InputGlueTableName,
wgtsQcGlueTableName: stackyWgtsQcGlueTableName,
tnGlueTableName: stackyTnGlueTableName,
Expand Down Expand Up @@ -65,8 +61,6 @@ export const getGlueStackProps = (stage: AppStage): GlueStackConfig => {
export const getStatefulGlueStackProps = (): StackyStatefulTablesConfig => {
return {
dynamodbInstrumentRunManagerTableName: stackyInstrumentRunTableName,
dynamodbWorkflowManagerTableName: stackyWorkflowManagerTableName,
dynamodbInputGlueTableName: stackyInputMakerTableName,
dynamodbCttsov2WorkflowGlueTableName: stackyCttsov2InputGlueTableName,
dynamodbWgtsQcGlueTableName: stackyWgtsQcGlueTableName,
dynamodbTnGlueTableName: stackyTnGlueTableName,
Expand Down
24 changes: 0 additions & 24 deletions lib/workload/stateful/stacks/stacky-mcstackface-dynamodb/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ import * as cdk from 'aws-cdk-lib';

export interface StackyStatefulTablesConfig {
dynamodbInstrumentRunManagerTableName: string;
dynamodbWorkflowManagerTableName: string;
dynamodbInputGlueTableName: string;
dynamodbCttsov2WorkflowGlueTableName: string;
dynamodbWgtsQcGlueTableName: string;
dynamodbTnGlueTableName: string;
Expand All @@ -24,8 +22,6 @@ export type StackyStatefulTablesStackProps = StackyStatefulTablesConfig & cdk.St

export class StackyStatefulTablesStack extends Stack {
public readonly instrumentRunManagerTable: dynamodb.ITableV2;
public readonly workflowManagerTable: dynamodb.ITableV2;
public readonly inputGlueTable: dynamodb.ITableV2;
public readonly cttsov2WorkflowGlueTable: dynamodb.ITableV2;
public readonly wgtsQcGlueTable: dynamodb.ITableV2;
public readonly tnGlueTable: dynamodb.ITableV2;
Expand All @@ -50,26 +46,6 @@ export class StackyStatefulTablesStack extends Stack {
}
).tableObj;

/*
Initialise dynamodb table for the metadata manager
*/
this.workflowManagerTable = new DynamodbPartitionedPipelineConstruct(
this,
'workflowManagerTable',
{
tableName: props.dynamodbWorkflowManagerTableName,
removalPolicy: props.removalPolicy,
}
).tableObj;

/*
Initialise dynamodb table for the glue services
*/
this.inputGlueTable = new DynamodbPartitionedPipelineConstruct(this, 'inputGlueTable', {
tableName: props.dynamodbInputGlueTableName,
removalPolicy: props.removalPolicy,
}).tableObj;

/*
Initialise dynamodb table for the cttsov2 glue service
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ export interface GlueConstructProps {

/* Tables */
instrumentRunTableObj: dynamodb.ITableV2;
inputMakerTableObj: dynamodb.ITableV2;
workflowManagerTableObj: dynamodb.ITableV2;
cttsov2GlueTableObj: dynamodb.ITableV2;
wgtsQcGlueTableObj: dynamodb.ITableV2;
tnGlueTableObj: dynamodb.ITableV2;
Expand Down Expand Up @@ -257,8 +255,6 @@ export interface GlueStackConfig {

/* Tables */
instrumentRunTableName: string;
inputMakerTableName: string;
workflowManagerTableName: string;
cttsov2GlueTableName: string;
wgtsQcGlueTableName: string;
tnGlueTableName: string;
Expand Down Expand Up @@ -306,16 +302,6 @@ export class GlueStack extends cdk.Stack {
/*
Get the tables
*/
const workflowManagerTableObj = dynamodb.Table.fromTableName(
this,
'workflowManagerTableObj',
props.workflowManagerTableName
);
const inputMakerTableObj = dynamodb.Table.fromTableName(
this,
'inputMakerTableObj',
props.inputMakerTableName
);
const instrumentRunTableObj = dynamodb.Table.fromTableName(
this,
'instrumentRunTableObj',
Expand Down Expand Up @@ -437,8 +423,6 @@ export class GlueStack extends cdk.Stack {
eventBusObj: eventBusObj,

/* Tables */
workflowManagerTableObj: workflowManagerTableObj,
inputMakerTableObj: inputMakerTableObj,
instrumentRunTableObj: instrumentRunTableObj,
wgtsQcGlueTableObj: wgtsQcGlueTableObj,
cttsov2GlueTableObj: cttsov2GlueTableObj,
Expand Down