update translator service to bclconvert manager

Makefile

@@ -34,7 +34,7 @@ test-suite:
  @(cd lib/workload/stateless/stacks/metadata-manager && $(MAKE) test)
  @(cd lib/workload/stateless/stacks/filemanager && $(MAKE) test)
  @(cd lib/workload/stateless/stacks/postgres-manager && $(MAKE) test)
- @(cd lib/workload/stateless/stacks/icav2-event-translator/translator_service && $(MAKE) test)
+ @(cd lib/workload/stateless/stacks/bclconvert-manager && $(MAKE) test)
  @(cd lib/workload/stateless/stacks/workflow-manager && $(MAKE) test)
 
 # The default outer `test` target only run the top level cdk application unit tests under `./test`

config/config.ts

@@ -18,9 +18,9 @@ import {
 import { getEventSchemaStackProps } from './stacks/schema/events';
 import { getDataSchemaStackProps } from './stacks/schema/data';
 import {
- getIcav2EventTranslatorTableStackProps,
- getIcav2EventTranslatorStackProps,
-} from './stacks/icav2EventTranslator';
+ getBclConvertManagerTableStackProps,
+ getBclConvertManagerStackProps,
+} from './stacks/bclConvertManager';
 import { getWorkflowManagerStackProps } from './stacks/workflowRunManager';
 
 interface EnvironmentConfig {
@@ -52,7 +52,7 @@ export const getEnvironmentConfig = (stage: AppStage): EnvironmentConfig | null
  tokenServiceStackProps: getTokenServiceStackProps(),
  icaEventPipeStackProps: getIcaEventPipeStackProps(),
  cttsov2Icav2PipelineTableStackProps: getCttsov2Icav2PipelineTableStackProps(),
- icav2EventTranslatorTableStackProps: getIcav2EventTranslatorTableStackProps(stage),
+ BclConvertTableStackProps: getBclConvertManagerTableStackProps(stage),
  },
  statelessConfig: {
  postgresManagerStackProps: getPostgresManagerStackProps(),
@@ -65,7 +65,7 @@ export const getEnvironmentConfig = (stage: AppStage): EnvironmentConfig | null
  cttsov2Icav2PipelineManagerStackProps: getCttsov2Icav2PipelineManagerStackProps(stage),
  eventSchemaStackProps: getEventSchemaStackProps(),
  dataSchemaStackProps: getDataSchemaStackProps(),
- icav2EventTranslatorStackProps: getIcav2EventTranslatorStackProps(),
+ bclConvertManagerStackProps: getBclConvertManagerStackProps(stage),
  workflowManagerStackProps: getWorkflowManagerStackProps(),
  },
  },
@@ -82,7 +82,7 @@ export const getEnvironmentConfig = (stage: AppStage): EnvironmentConfig | null
  tokenServiceStackProps: getTokenServiceStackProps(),
  icaEventPipeStackProps: getIcaEventPipeStackProps(),
  cttsov2Icav2PipelineTableStackProps: getCttsov2Icav2PipelineTableStackProps(),
- icav2EventTranslatorTableStackProps: getIcav2EventTranslatorTableStackProps(stage),
+ BclConvertTableStackProps: getBclConvertManagerTableStackProps(stage),
  },
  statelessConfig: {
  postgresManagerStackProps: getPostgresManagerStackProps(),
@@ -95,7 +95,7 @@ export const getEnvironmentConfig = (stage: AppStage): EnvironmentConfig | null
  cttsov2Icav2PipelineManagerStackProps: getCttsov2Icav2PipelineManagerStackProps(stage),
  eventSchemaStackProps: getEventSchemaStackProps(),
  dataSchemaStackProps: getDataSchemaStackProps(),
- icav2EventTranslatorStackProps: getIcav2EventTranslatorStackProps(),
+ bclConvertManagerStackProps: getBclConvertManagerStackProps(stage),
  workflowManagerStackProps: getWorkflowManagerStackProps(),
  },
  },
@@ -112,7 +112,7 @@ export const getEnvironmentConfig = (stage: AppStage): EnvironmentConfig | null
  tokenServiceStackProps: getTokenServiceStackProps(),
  icaEventPipeStackProps: getIcaEventPipeStackProps(),
  cttsov2Icav2PipelineTableStackProps: getCttsov2Icav2PipelineTableStackProps(),
- icav2EventTranslatorTableStackProps: getIcav2EventTranslatorTableStackProps(stage),
+ BclConvertTableStackProps: getBclConvertManagerTableStackProps(stage),
  },
  statelessConfig: {
  postgresManagerStackProps: getPostgresManagerStackProps(),
@@ -125,7 +125,7 @@ export const getEnvironmentConfig = (stage: AppStage): EnvironmentConfig | null
  cttsov2Icav2PipelineManagerStackProps: getCttsov2Icav2PipelineManagerStackProps(stage),
  eventSchemaStackProps: getEventSchemaStackProps(),
  dataSchemaStackProps: getDataSchemaStackProps(),
- icav2EventTranslatorStackProps: getIcav2EventTranslatorStackProps(),
+ bclConvertManagerStackProps: getBclConvertManagerStackProps(stage),
  workflowManagerStackProps: getWorkflowManagerStackProps(),
  },
  },

config/stacks/bclConvertManager.ts

@@ -0,0 +1,22 @@
+import { AppStage, vpcProps, eventBusName, icav2AccessTokenSecretName } from '../constants';
+import { RemovalPolicy } from 'aws-cdk-lib';
+import { BclConvertTableStackProps } from '../../lib/workload/stateful/stacks/bclconvert-dynamo-db/deploy/stack';
+import { BclConvertManagerStackProps } from '../../lib/workload/stateless/stacks/bclconvert-manager/deploy/stack';
+
+const dynamodbTableName = 'IcaEventTranslatorTable';
+
+export const getBclConvertManagerTableStackProps = (stage: AppStage): BclConvertTableStackProps => {
+ return {
+ dynamodbTableName: dynamodbTableName,
+ removalPolicy: stage === AppStage.PROD ? RemovalPolicy.RETAIN : RemovalPolicy.DESTROY,
+ };
+};
+export const getBclConvertManagerStackProps = (stage: AppStage): BclConvertManagerStackProps => {
+ return {
+ eventBusName,
+ icav2EventTranslatorDynamodbTableName: dynamodbTableName,
+ vpcProps: vpcProps,
+ lambdaSecurityGroupName: 'OrcaBusBclConvertManagerSecurityGroup',
+ icav2JwtSecretsManagerPath: icav2AccessTokenSecretName[stage],
+ };
+};

lib/workload/stateful/stacks/icav2-event-translator-dynamo-db/README.md → lib/workload/stateful/stacks/bclconvert-dynamo-db/README.md

@@ -1,17 +1,17 @@
-# ICA v2 Event Translator
+# BclConvert Manager DynamoDB Tables
 
-This table will record event translator process.
+### ICAv2 Event Translator DynamoDB Table
 
-The orignal input and orcabus event after translation will be saved in the dynamo db for recording of the process. 
+This table will record event translator process in BclConvert Manager.
+
+The orignal input and orcabus event after translation will be saved in the dynamo db for recording of the process.
 
 Dynamodb format:
 | id | id_type | analysis_id | analysis_status | portal_run_id | db_uuid | original_external_event | translated_internal_ica_event | timestamp |
-| -------------- | ---- | ------- | ------- | ---- | ------- | ------- | ------- |------- | 
+| -------------- | ---- | ------- | ------- | ---- | ------- | ------- | ------- |------- |
 | dxxxxx-6xxxx-fxxx-1xxx-5xxxxx | portal_run_id | dxxxxx-6xxxx-fxxx-1xxx-5xxxxx | | | dxxxxx-6xxxx-fxxx-1xxx-5xxxxx | | | |
 | dxxxxx-6xxxx-fxxx-1xxx-5xxxxx | analysis_id | | |dxxxxx-6xxxx-fxxx-1xxx-5xxxxx | dxxxxx-6xxxx-fxxx-1xxx-5xxxxx | | | |
 | dxxxxx-6xxxx-fxxx-1xxx-5xxxxx | db_uuid | dxxxxx-6xxxx-fxxx-1xxx-5xxxxx | INITIALIZING | 20xxxxxxxxxx | | {"correlationId": "",...} | {'portal_run_id': "",...} | 2024-01-01T00:11:35Z |
 |dxxxxx-6xxxx-fxxx-1xxx-5xxxxx | db_uuid | dxxxxx-6xxxx-fxxx-1xxx-5xxxxx | QUEUED | 20xxxxxxxxxx | | {"correlationId": "",...} | {'portal_run_id': "",...} | 2024-01-01T00:11:35Z |
 |dxxxxx-6xxxx-fxxx-1xxx-5xxxxx | db_uuid | dxxxxx-6xxxx-fxxx-1xxx-5xxxxx | IN_PROGRESS | 20xxxxxxxxxx | | {"correlationId": "",...} | {'portal_run_id': "",...} | 2024-01-01T00:11:35Z |
 |dxxxxx-6xxxx-fxxx-1xxx-5xxxxx | db_uuid | dxxxxx-6xxxx-fxxx-1xxx-5xxxxx | SUCCEEDED | 20xxxxxxxxxx | | {"correlationId": "",...} | {'portal_run_id': "",...} | 2024-01-01T00:11:35Z |
-
-

lib/workload/stateful/stacks/bclconvert-dynamo-db/deploy/stack.ts

@@ -0,0 +1,22 @@
+import { Stack, RemovalPolicy, StackProps } from 'aws-cdk-lib';
+import { Construct } from 'constructs';
+import { DynamodbIcav2PipelineConstruct } from '../../../../components/dynamodb-icav2-table';
+
+export interface BclConvertTableStackProps {
+ dynamodbTableName: string;
+ removalPolicy?: RemovalPolicy;
+}
+
+export class BclConvertTable extends Stack {
+ constructor(scope: Construct, id: string, props: StackProps & BclConvertTableStackProps) {
+ super(scope, id, props);
+ this.createICAv2EventTranslatorTable(props);
+ }
+
+ private createICAv2EventTranslatorTable(props: BclConvertTableStackProps) {
+ return new DynamodbIcav2PipelineConstruct(this, 'icav2_event_translator_table', {
+ tableName: props.dynamodbTableName,
+ removalPolicy: props.removalPolicy,
+ });
+ }
+}

lib/workload/stateful/statefulStackCollectionClass.ts

@@ -9,16 +9,16 @@ import {
  Cttsov2Icav2PipelineTableStackProps,
 } from './stacks/cttso-v2-pipeline-dynamo-db/deploy/stack';
 import {
- Icav2EventTranslatorTable,
- Icav2EventTranslatorTableStackProps,
-} from './stacks/icav2-event-translator-dynamo-db/deploy/stack';
+ BclConvertTable,
+ BclConvertTableStackProps,
+} from './stacks/bclconvert-dynamo-db/deploy/stack';
 
 export interface StatefulStackCollectionProps {
  sharedStackProps: SharedStackProps;
  tokenServiceStackProps: TokenServiceStackProps;
  icaEventPipeStackProps: IcaEventPipeStackProps;
  cttsov2Icav2PipelineTableStackProps: Cttsov2Icav2PipelineTableStackProps;
- icav2EventTranslatorTableStackProps: Icav2EventTranslatorTableStackProps;
+ BclConvertTableStackProps: BclConvertTableStackProps;
 }
 
 export class StatefulStackCollection {
@@ -28,7 +28,7 @@ export class StatefulStackCollection {
  readonly tokenServiceStack: Stack;
  readonly icaEventPipeStack: Stack;
  readonly cttsov2Icav2PipelineTableStack: Stack;
- readonly icav2EventTranslatorTableStack: Stack;
+ readonly BclConvertTableStack: Stack;
 
  constructor(
  scope: Construct,
@@ -58,14 +58,10 @@ export class StatefulStackCollection {
  ...statefulConfiguration.cttsov2Icav2PipelineTableStackProps,
  }
  );
- this.icav2EventTranslatorTableStack = new Icav2EventTranslatorTable(
- scope,
- 'Icav2EventTranslatorTableStack',
- {
- ...this.createTemplateProps(env, 'Icav2EventTranslatorTableStack'),
- ...statefulConfiguration.icav2EventTranslatorTableStackProps,
- }
- );
+ this.BclConvertTableStack = new BclConvertTable(scope, 'BclConvertTableStack', {
+ ...this.createTemplateProps(env, 'BclConvertTableStack'),
+ ...statefulConfiguration.BclConvertTableStackProps,
+ });
  }
 
  /**

lib/workload/stateless/stacks/bclconvert-manager/Makefile

@@ -0,0 +1,10 @@
+install:
+ @pip install -r deps/requirements-test.txt
+
+test-translator-service:
+ @echo "Running tests for translator service"
+ @PYTHONPATH=./translator_service:$$PYTHONPATH \
+ python -m unittest translator_service/tests/test_icav2_event_translator.py
+ @echo "Tests for translator service passed"
+
+test: install test-translator-service