@fy-stack/task-construct 0.0.140 → 0.0.142

package/dist/lib/service-construct.d.ts

@@ -0,0 +1,18 @@
+import { Attach, Attachable, Grant, Grantable } from '@fy-stack/types';
+import * as ecs from 'aws-cdk-lib/aws-ecs';
+import * as iam from 'aws-cdk-lib/aws-iam';
+import { ITopicSubscription } from 'aws-cdk-lib/aws-sns';
+import { SubscriptionProps } from 'aws-cdk-lib/aws-sns-subscriptions';
+import { Construct } from 'constructs';
+import { TaskConstructsProps } from './types';
+export declare class ServiceConstruct extends Construct implements Grant, Attach {
+    private readonly cluster;
+    role: iam.Role;
+    taskDefinition: ecs.FargateTaskDefinition;
+    private readonly vpc;
+    constructor(scope: Construct, id: string, props: TaskConstructsProps);
+    subscription(props: SubscriptionProps): ITopicSubscription;
+    grant(...grantables: Grantable[]): void;
+    attach(attachable: Record<string, Attachable>): void;
+}
+//# sourceMappingURL=service-construct.d.ts.map

package/dist/lib/service-construct.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"service-construct.d.ts","sourceRoot":"","sources":["../../src/lib/service-construct.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,UAAU,EACV,KAAK,EACL,SAAS,EACV,MAAM,iBAAiB,CAAC;AAGzB,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAE3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAEL,iBAAiB,EAClB,MAAM,mCAAmC,CAAC;AAE3C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAE9C,qBAAa,gBACX,SAAQ,SACR,YAAW,KAAK,EAAE,MAAM;IAExB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAe;IAEhC,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC;IACf,cAAc,EAAE,GAAG,CAAC,qBAAqB,CAAC;IACjD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAW;gBAEnB,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,mBAAmB;IAkCpE,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,kBAAkB;IA0C1D,KAAK,CAAC,GAAG,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI;IAMvC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC;CAmB9C"}

package/dist/lib/service-construct.js

@@ -0,0 +1,102 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ServiceConstruct = void 0;
+const tslib_1 = require("tslib");
+const ecrAssets = tslib_1.__importStar(require("aws-cdk-lib/aws-ecr-assets"));
+const ecs = tslib_1.__importStar(require("aws-cdk-lib/aws-ecs"));
+const iam = tslib_1.__importStar(require("aws-cdk-lib/aws-iam"));
+const pipes = tslib_1.__importStar(require("aws-cdk-lib/aws-pipes"));
+const aws_sns_subscriptions_1 = require("aws-cdk-lib/aws-sns-subscriptions");
+const sqs = tslib_1.__importStar(require("aws-cdk-lib/aws-sqs"));
+const constructs_1 = require("constructs");
+class ServiceConstruct extends constructs_1.Construct {
+    cluster;
+    role;
+    taskDefinition;
+    vpc;
+    constructor(scope, id, props) {
+        super(scope, id);
+        const { clusterArn, defaultImage, output, vpc, ...definitionProps } = props;
+        this.cluster = ecs.Cluster.fromClusterArn(this, 'TaskCluster', clusterArn);
+        this.vpc = vpc;
+        this.role = new iam.Role(this, 'Role', {
+            assumedBy: new iam.ServicePrincipal('pipes.amazonaws.com'),
+        });
+        this.taskDefinition = new ecs.FargateTaskDefinition(this, 'Task', {
+            cpu: 1024,
+            memoryLimitMiB: 2048,
+            runtimePlatform: {
+                cpuArchitecture: ecs.CpuArchitecture.X86_64,
+            },
+            ...definitionProps,
+        });
+        if (defaultImage) {
+            const { container: containerProps, ...imageProps } = defaultImage;
+            this.taskDefinition.addContainer('DefaultImage', {
+                image: ecs.ContainerImage.fromAsset(output, {
+                    platform: ecrAssets.Platform.LINUX_AMD64,
+                    ...containerProps,
+                }),
+                logging: new ecs.AwsLogDriver({ streamPrefix: `${id}/task-runner` }),
+                ...imageProps,
+            });
+        }
+    }
+    subscription(props) {
+        const queue = new sqs.Queue(this, 'TaskQueue');
+        const pipeRole = new iam.Role(this, 'PipeRole', {
+            assumedBy: new iam.ServicePrincipal('pipes.amazonaws.com'),
+        });
+        new pipes.CfnPipe(this, 'TaskPipe', {
+            source: queue.queueArn,
+            target: this.cluster.clusterArn,
+            roleArn: pipeRole.roleArn,
+            desiredState: 'RUNNING',
+            targetParameters: {
+                ecsTaskParameters: {
+                    taskDefinitionArn: this.taskDefinition.taskDefinitionArn,
+                    launchType: 'FARGATE',
+                    networkConfiguration: {
+                        awsvpcConfiguration: {
+                            assignPublicIp: 'ENABLED',
+                            subnets: this.vpc.publicSubnets.map((v) => v.subnetId),
+                        },
+                    },
+                    overrides: {
+                        containerOverrides: [
+                            {
+                                name: 'DefaultImage',
+                                environment: [
+                                    { name: 'TASK_NAME', value: '$.body.message' },
+                                    { name: 'PAYLOAD', value: '$.body.payload' },
+                                ],
+                            },
+                        ],
+                    },
+                },
+            },
+        });
+        queue.grantConsumeMessages(pipeRole);
+        this.taskDefinition.grantRun(pipeRole);
+        return new aws_sns_subscriptions_1.SqsSubscription(queue, { ...props, rawMessageDelivery: true });
+    }
+    grant(...grantables) {
+        for (const i in grantables) {
+            grantables[i].grantable(this.role);
+        }
+    }
+    attach(attachable) {
+        const params = {};
+        Object.assign(params, ...Object.entries(attachable).map(([key, val]) => {
+            return Object.fromEntries(Object.entries(val?.attachable() ?? {}).map(([subKey, subVal]) => [
+                `${key}_${subKey}`.toUpperCase(),
+                subVal,
+            ]));
+        }));
+        for (const i in params) {
+            const container = this.taskDefinition.defaultContainer;
+            container?.addEnvironment(i, params[i]);
+        }
+    }
+}
+exports.ServiceConstruct = ServiceConstruct;

package/dist/lib/task-construct.d.ts

@@ -1,6 +1,6 @@
 import { Attach, Attachable, EventResource, Grant, Grantable } from '@fy-stack/types';
-import * as ecs from "aws-cdk-lib/aws-ecs";
-import * as iam from "aws-cdk-lib/aws-iam";
+import * as ecs from 'aws-cdk-lib/aws-ecs';
+import * as iam from 'aws-cdk-lib/aws-iam';
 import { ITopicSubscription } from 'aws-cdk-lib/aws-sns';
 import { SubscriptionProps } from 'aws-cdk-lib/aws-sns-subscriptions';
 import { Construct } from 'constructs';

package/dist/lib/task-construct.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"task-construct.d.ts","sourceRoot":"","sources":["../../src/lib/task-construct.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGtF,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAA;AAC1C,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAA;AAE1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAmB,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAEvF,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAE9C,qBAAa,aAAc,SAAQ,SAAU,YAAW,aAAa,EAAE,KAAK,EAAE,MAAM;IAElF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAe;IAEhC,IAAI,EAAE,GAAG,CAAC,IAAI,CAAA;IACd,cAAc,EAAE,GAAG,CAAC,qBAAqB,CAAA;IAChD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAU;gBAElB,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,mBAAmB;IAkCpE,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,kBAAkB;IA2C1D,KAAK,CAAC,GAAG,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI;IAMvC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC;CAkB9C"}
+{"version":3,"file":"task-construct.d.ts","sourceRoot":"","sources":["../../src/lib/task-construct.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,UAAU,EACV,aAAa,EACb,KAAK,EACL,SAAS,EACV,MAAM,iBAAiB,CAAC;AAGzB,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAE3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAEL,iBAAiB,EAClB,MAAM,mCAAmC,CAAC;AAE3C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAE9C,qBAAa,aACX,SAAQ,SACR,YAAW,aAAa,EAAE,KAAK,EAAE,MAAM;IAEvC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAe;IAEhC,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC;IACf,cAAc,EAAE,GAAG,CAAC,qBAAqB,CAAC;IACjD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAW;gBAEnB,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,mBAAmB;IAkCpE,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,kBAAkB;IA0C1D,KAAK,CAAC,GAAG,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI;IAMvC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC;CAmB9C"}

package/dist/lib/task-construct.js

@@ -17,25 +17,25 @@ class TaskConstruct extends constructs_1.Construct {
     constructor(scope, id, props) {
         super(scope, id);
         const { clusterArn, defaultImage, output, vpc, ...definitionProps } = props;
-        this.cluster = ecs.Cluster.fromClusterArn(this, "TaskCluster", clusterArn);
+        this.cluster = ecs.Cluster.fromClusterArn(this, 'TaskCluster', clusterArn);
         this.vpc = vpc;
         this.role = new iam.Role(this, 'Role', {
-            assumedBy: new iam.ServicePrincipal("pipes.amazonaws.com")
+            assumedBy: new iam.ServicePrincipal('pipes.amazonaws.com'),
         });
-        this.taskDefinition = new ecs.FargateTaskDefinition(this, "Task", {
+        this.taskDefinition = new ecs.FargateTaskDefinition(this, 'Task', {
             cpu: 1024,
-            memoryLimitMiB: 4096,
+            memoryLimitMiB: 2048,
             runtimePlatform: {
-                cpuArchitecture: ecs.CpuArchitecture.X86_64
+                cpuArchitecture: ecs.CpuArchitecture.X86_64,
             },
-            ...definitionProps
+            ...definitionProps,
         });
         if (defaultImage) {
             const { container: containerProps, ...imageProps } = defaultImage;
-            this.taskDefinition.addContainer("DefaultImage", {
+            this.taskDefinition.addContainer('DefaultImage', {
                 image: ecs.ContainerImage.fromAsset(output, {
                     platform: ecrAssets.Platform.LINUX_AMD64,
-                    ...containerProps
+                    ...containerProps,
                 }),
                 logging: new ecs.AwsLogDriver({ streamPrefix: `${id}/task-runner` }),
                 ...imageProps,
@@ -43,38 +43,38 @@ class TaskConstruct extends constructs_1.Construct {
         }
     }
     subscription(props) {
-        const queue = new sqs.Queue(this, "TaskQueue");
-        const pipeRole = new iam.Role(this, "PipeRole", {
-            assumedBy: new iam.ServicePrincipal("pipes.amazonaws.com")
+        const queue = new sqs.Queue(this, 'TaskQueue');
+        const pipeRole = new iam.Role(this, 'PipeRole', {
+            assumedBy: new iam.ServicePrincipal('pipes.amazonaws.com'),
         });
-        new pipes.CfnPipe(this, "TaskPipe", {
+        new pipes.CfnPipe(this, 'TaskPipe', {
             source: queue.queueArn,
             target: this.cluster.clusterArn,
             roleArn: pipeRole.roleArn,
-            desiredState: "RUNNING",
+            desiredState: 'RUNNING',
             targetParameters: {
                 ecsTaskParameters: {
                     taskDefinitionArn: this.taskDefinition.taskDefinitionArn,
-                    launchType: "FARGATE",
+                    launchType: 'FARGATE',
                     networkConfiguration: {
                         awsvpcConfiguration: {
-                            assignPublicIp: "ENABLED",
-                            subnets: this.vpc.publicSubnets.map(v => v.subnetId),
-                        }
+                            assignPublicIp: 'ENABLED',
+                            subnets: this.vpc.publicSubnets.map((v) => v.subnetId),
+                        },
                     },
                     overrides: {
                         containerOverrides: [
                             {
-                                name: "DefaultImage",
+                                name: 'DefaultImage',
                                 environment: [
-                                    { name: "TASK_NAME", value: "$.body.message" },
-                                    { name: "PAYLOAD", value: "$.body.payload" }
+                                    { name: 'TASK_NAME', value: '$.body.message' },
+                                    { name: 'PAYLOAD', value: '$.body.payload' },
                                 ],
-                            }
-                        ]
-                    }
-                }
-            }
+                            },
+                        ],
+                    },
+                },
+            },
         });
         queue.grantConsumeMessages(pipeRole);
         this.taskDefinition.grantRun(pipeRole);
@@ -87,10 +87,11 @@ class TaskConstruct extends constructs_1.Construct {
     }
     attach(attachable) {
         const params = {};
-        Object.assign(params, ...Object.entries(attachable)
-            .map(([key, val]) => {
-            return Object.fromEntries(Object.entries(val?.attachable() ?? {})
-                .map(([subKey, subVal]) => [`${key}_${subKey}`, subVal]));
+        Object.assign(params, ...Object.entries(attachable).map(([key, val]) => {
+            return Object.fromEntries(Object.entries(val?.attachable() ?? {}).map(([subKey, subVal]) => [
+                `${key}_${subKey}`.toUpperCase(),
+                subVal,
+            ]));
         }));
         for (const i in params) {
             const container = this.taskDefinition.defaultContainer;

package/dist/lib/types.d.ts

@@ -1,11 +1,19 @@
 import type { IVpc } from 'aws-cdk-lib/aws-ec2';
-import type { AssetImageProps, ContainerDefinitionOptions, FargateTaskDefinitionProps } from 'aws-cdk-lib/aws-ecs';
+import type { AssetImageProps, ContainerDefinitionOptions, Ec2TaskDefinitionProps, FargateTaskDefinitionProps } from 'aws-cdk-lib/aws-ecs';
 export type TaskConstructsProps = FargateTaskDefinitionProps & {
     vpc: IVpc;
     clusterArn: string;
     env?: Record<string, string>;
     output: string;
-    defaultImage?: Omit<ContainerDefinitionOptions, "image" | "logging"> & {
+    defaultImage?: Omit<ContainerDefinitionOptions, 'image' | 'logging'> & {
+        container: AssetImageProps;
+    };
+};
+export type ServiceConstructsProps = Ec2TaskDefinitionProps & {
+    vpc: IVpc;
+    env?: Record<string, string>;
+    output: string;
+    defaultImage?: Omit<ContainerDefinitionOptions, 'image' | 'logging'> & {
         container: AssetImageProps;
     };
 };

package/dist/lib/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/lib/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,KAAK,EAAE,eAAe,EAAE,0BAA0B,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AAEnH,MAAM,MAAM,mBAAmB,GAAG,0BAA0B,GAAG;IAC7D,GAAG,EAAE,IAAI,CAAA;IACT,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,IAAI,CAAC,0BAA0B,EAAE,OAAO,GAAG,SAAS,CAAC,GAAG;QAAE,SAAS,EAAE,eAAe,CAAA;KAAE,CAAA;CACtG,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/lib/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,KAAK,EACV,eAAe,EACf,0BAA0B,EAC1B,sBAAsB,EACtB,0BAA0B,EAC3B,MAAM,qBAAqB,CAAC;AAE7B,MAAM,MAAM,mBAAmB,GAAG,0BAA0B,GAAG;IAC7D,GAAG,EAAE,IAAI,CAAC;IACV,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,IAAI,CAAC,0BAA0B,EAAE,OAAO,GAAG,SAAS,CAAC,GAAG;QACrE,SAAS,EAAE,eAAe,CAAC;KAC5B,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,sBAAsB,GAAG;IAC5D,GAAG,EAAE,IAAI,CAAC;IACV,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,IAAI,CAAC,0BAA0B,EAAE,OAAO,GAAG,SAAS,CAAC,GAAG;QACrE,SAAS,EAAE,eAAe,CAAC;KAC5B,CAAC;CACH,CAAC"}

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@fy-stack/task-construct",
-  "version": "0.0.140",
+  "version": "0.0.142",
   "dependencies": {
-    "@fy-stack/types": "0.0.140",
+    "@fy-stack/types": "0.0.142",
     "tslib": "^2.3.0"
   },
   "peerDependencies": {