Merge branch 'master' into develop

Author: engel80

code-pipeline/lib/ecs-codedeploy-stack.ts

@@ -1,4 +1,4 @@
-import { Stack, StackProps, CfnOutput, Tags } from 'aws-cdk-lib';
+import { Stack, StackProps } from 'aws-cdk-lib';
 import * as cdk from 'aws-cdk-lib';
 import * as ssm from 'aws-cdk-lib/aws-ssm';
 
@@ -104,12 +104,6 @@ export class EcsCodeDeployStack extends Stack {
             output: sourceOutput
         });
 
-        // const sourceAction = new codepipeline_actions.CodeCommitSourceAction({
-        //     // account: props?.env?.account,
-        //     actionName: 'CodeCommit',
-        //     repository: repository,
-        //     output: sourceOutput,
-        // });
         const buildAction = new codepipeline_actions.CodeBuildAction({
             actionName: 'CodeBuild',
             project,
@@ -125,7 +119,7 @@ export class EcsCodeDeployStack extends Stack {
             imageFile: new codepipeline.ArtifactPath(buildOutput, `imagedefinitions.json`)
         });
 
-        const ecsPipeline = new codepipeline.Pipeline(this, 'ecs-deploy-pipeline', {
+        new codepipeline.Pipeline(this, 'ecs-deploy-pipeline', {
             pipelineName: `ecs-deploy-${service.serviceName}`,
             stages: [
                 {

ecr-codecommit/lib/ecr-codecommit-stack.ts

@@ -1,15 +1,13 @@
 import { Construct } from 'constructs';
-import * as cdk from 'aws-cdk-lib';
-import { Stack, StackProps, CfnOutput, Tags } from 'aws-cdk-lib';
+import { Stack, CfnOutput, Tags } from 'aws-cdk-lib';
 import * as path from 'path';
 import * as codecommit from 'aws-cdk-lib/aws-codecommit';
 import * as ssm from 'aws-cdk-lib/aws-ssm';
 import * as ecr from 'aws-cdk-lib/aws-ecr';
 import * as assets from 'aws-cdk-lib/aws-ecr-assets';
 import * as ecrdeploy from 'cdk-ecr-deployment';
 
-import { SSM_PREFIX } from '../../config';
-import { StackCommonProps } from '../../config';
+import { StackCommonProps, SSM_PREFIX } from '../../config';
 
 export interface EcrStackProps extends StackCommonProps {
     serviceName: string;

ecs-fargate-service-restapi/lib/ecs-fargate-service-restapi-stack.ts

@@ -1,7 +1,6 @@
 import { Construct } from 'constructs';
 import * as cdk from 'aws-cdk-lib';
 import { Stack, CfnOutput, Duration, Tags } from 'aws-cdk-lib';
-import * as path from 'path';
 import * as ecs from 'aws-cdk-lib/aws-ecs';
 import * as ec2 from 'aws-cdk-lib/aws-ec2';
 import * as elbv2 from 'aws-cdk-lib/aws-elasticloadbalancingv2';
@@ -51,6 +50,7 @@ export class FargateRestAPIServiceStack extends Stack {
             containerName,
             image: ecs.ContainerImage.fromRegistry(regUrl),
             // or build with /app folder asset
+            // import * as path from 'path';
             // image: ecs.ContainerImage.fromAsset(path.join(__dirname, "../../", "app")),
             cpu: 1024,
             memoryReservationMiB: 2048

ecs-fargatespot-service-restapi/lib/ecs-fargatespot-service-restapi-stack.ts

@@ -1,7 +1,6 @@
 import { Construct } from 'constructs';
 import * as cdk from 'aws-cdk-lib';
 import { Stack, CfnOutput, Duration, Tags } from 'aws-cdk-lib';
-import * as path from 'path';
 import * as ecs from 'aws-cdk-lib/aws-ecs';
 import * as ec2 from 'aws-cdk-lib/aws-ec2';
 import * as elbv2 from 'aws-cdk-lib/aws-elasticloadbalancingv2';
@@ -50,6 +49,7 @@ export class FargateSpotRestAPIServiceStack extends Stack {
             containerName,
             image: ecs.ContainerImage.fromRegistry(`${props.env?.account}.dkr.ecr.${props.env?.region}.amazonaws.com/fargate-restapi-${props.stage}:latest`),
             // or build with /app folder
+            // import * as path from 'path';
             // image: ecs.ContainerImage.fromAsset(path.join(__dirname, "../../", "app")),
             cpu: 1024,
             memoryReservationMiB: 2048

vpc/lib/vpc-stack.ts

@@ -1,4 +1,4 @@
-import { Stack, StackProps, CfnOutput, Tags } from 'aws-cdk-lib';
+import { Stack, StackProps, CfnOutput } from 'aws-cdk-lib';
 import { Construct } from 'constructs';
 
 import * as ec2 from 'aws-cdk-lib/aws-ec2';