patch(fix): octo-aws-cdk | image input for dockerExecutable can be co…

…mmon.
quadnix · Aug 8, 2024 · 3682a5f · 3682a5f
1 parent cc6d3d1
commit 3682a5f
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 18 deletions.
diff --git a/dictionary.dic b/dictionary.dic
@@ -8,6 +8,7 @@ arn
 ascii
 autogenerated
 automation
+automations
 aws
 awsvpc
 axios
@@ -64,6 +65,7 @@ loglayer
 lstat
 mdx
 microservice
+microservices
 mnt
 nacl
 nginx

diff --git a/packages/octo-aws-cdk/src/models/image/actions/add-image.model.action.ts b/packages/octo-aws-cdk/src/models/image/actions/add-image.model.action.ts
@@ -16,10 +16,8 @@ import { ProcessUtility } from '../../../utilities/process/process.utility.js';
 export class AddImageModelAction implements IModelAction {
   readonly ACTION_NAME: string = 'AddImageModelAction';
 
-  collectInput(diff: Diff): string[] {
-    const { imageId } = diff.model as Image;
-
-    return [`input.image.${imageId}.dockerExecutable`];
+  collectInput(): string[] {
+    return ['input.image.dockerExecutable'];
   }
 
   filter(diff: Diff): boolean {
@@ -34,7 +32,7 @@ export class AddImageModelAction implements IModelAction {
   async handle(diff: Diff, actionInputs: ActionInputs, actionOutputs: ActionOutputs): Promise<ActionOutputs> {
     const { dockerOptions, imageId } = diff.model as Image;
 
-    const dockerExec = actionInputs[`input.image.${imageId}.dockerExecutable`] as string;
+    const dockerExec = actionInputs['input.image.dockerExecutable'] as string;
 
     // Build command to build image.
     const dockerfileParts = parse(dockerOptions.dockerfilePath);

diff --git a/packages/octo-aws-cdk/src/models/image/aws.image.model.spec.ts b/packages/octo-aws-cdk/src/models/image/aws.image.model.spec.ts
@@ -22,7 +22,7 @@ describe('Image UT', () => {
     beforeEach(async () => {
       testModuleContainer = new TestModuleContainer({
         inputs: {
-          'input.image.quadnix/test:0.0.1.dockerExecutable': 'docker',
+          'input.image.dockerExecutable': 'docker',
         },
       });
       await testModuleContainer.initialize();

diff --git a/packages/octo-aws-cdk/src/models/service/ecr/actions/add-ecr-service.model.action.ts b/packages/octo-aws-cdk/src/models/service/ecr/actions/add-ecr-service.model.action.ts
@@ -16,9 +16,8 @@ import { EcrService } from '../ecr.service.model.js';
 export class AddEcrServiceModelAction implements IModelAction {
   readonly ACTION_NAME: string = 'AddEcrServiceModelAction';
 
-  collectInput(diff: Diff): string[] {
-    const imageInputs = (diff.model as EcrService).images.map((i) => `input.image.${i.imageId}.dockerExecutable`);
-    return [...imageInputs];
+  collectInput(): string[] {
+    return ['input.image.dockerExecutable'];
   }
 
   filter(diff: Diff): boolean {
@@ -35,9 +34,9 @@ export class AddEcrServiceModelAction implements IModelAction {
     const awsRegionIds = (diff.model as EcrService).awsRegionIds;
     const images = (diff.model as EcrService).images;
 
+    const dockerExec = actionInputs['input.image.dockerExecutable'] as string;
     for (const awsRegionId of awsRegionIds) {
       for (const image of images) {
-        const dockerExec = actionInputs[`input.image.${image.imageId}.dockerExecutable`] as string;
         const dockerfileParts = parse(image.dockerOptions.dockerfilePath);
 
         // Create ECR.

diff --git a/packages/octo-aws-cdk/src/models/service/ecr/actions/add-image-to-ecr.model.action.ts b/packages/octo-aws-cdk/src/models/service/ecr/actions/add-image-to-ecr.model.action.ts
@@ -17,10 +17,8 @@ import { EcrService } from '../ecr.service.model.js';
 export class AddImageToEcrModelAction implements IModelAction {
   readonly ACTION_NAME: string = 'AddImageToEcrModelAction';
 
-  collectInput(diff: Diff): string[] {
-    const { image } = diff.value as { image: Image };
-
-    return [`input.image.${image.imageId}.dockerExecutable`];
+  collectInput(): string[] {
+    return ['input.image.dockerExecutable'];
   }
 
   filter(diff: Diff): boolean {
@@ -36,7 +34,7 @@ export class AddImageToEcrModelAction implements IModelAction {
     // Get properties.
     const { awsRegionId, image } = diff.value as { awsRegionId: string; image: Image };
 
-    const dockerExec = actionInputs[`input.image.${image.imageId}.dockerExecutable`] as string;
+    const dockerExec = actionInputs['input.image.dockerExecutable'] as string;
     const dockerfileParts = parse(image.dockerOptions.dockerfilePath);
 
     // Create ECR.

diff --git a/packages/octo-aws-cdk/src/models/service/ecr/ecr.service.model.spec.ts b/packages/octo-aws-cdk/src/models/service/ecr/ecr.service.model.spec.ts
@@ -89,8 +89,7 @@ describe('EcrService UT', () => {
           },
         },
         inputs: {
-          'input.image.imageName:0.0.1.dockerExecutable': 'docker',
-          'input.image.imageName:0.0.2.dockerExecutable': 'docker',
+          'input.image.dockerExecutable': 'docker',
         },
       });
       await testModuleContainer.initialize();

diff --git a/packages/octo-aws-cdk/test/models/image/image-and-ecr-service.e2e-spec.ts b/packages/octo-aws-cdk/test/models/image/image-and-ecr-service.e2e-spec.ts
@@ -19,7 +19,7 @@ describe('Image & ECRService E2E Test', () => {
     const octoAws = new OctoAws();
     await octoAws.initialize(new LocalStateProvider(__dirname));
     octoAws.registerInputs({
-      'input.image.quadnix/test:0.0.1.dockerExecutable': 'docker',
+      'input.image.dockerExecutable': 'docker',
     });
 
     const app = new App('test');