dcl-ops-lib 6.8.3 → 6.8.4

package/createFargateTask.js

@@ -71,7 +71,7 @@ function getFargateExecutionRole(name, policyArnNamedMap) {
     // Default execution policy
     policies.push(new aws.iam.RolePolicyAttachment(`${name}-default-execution-policy`, {
         policyArn: "arn:aws:iam::aws:policy/service-role/AmazonECSTaskExecutionRolePolicy",
-        role
+        role,
     }));
     Object.entries(policyArnNamedMap).forEach(([key, policyArn]) => {
         if (policyArn instanceof aws.iam.Policy) {
@@ -115,7 +115,7 @@ function getFargateTaskRole(name, policyArnNamedMap) {
  */
 function createFargateTask(serviceName, dockerImage, dockerListeningPort, environment, hostname, options) {
     return __awaiter(this, void 0, void 0, function* () {
-        let { healthCheck, healthCheckContainer, essential, dontExpose, securityGroups, cluster, memoryReservation, command, version, ephemeralStorageInGB, desiredCount, cpuReservation, extraPortMappings, extraALBMappings, executionRolePolicies, taskRolePolicies, ignoreServiceDiscovery, secrets, metrics, dontAssignPublicIp, dependsOn, volumes, deregistrationDelay, mountPoints, repositoryCredentials, team, appAutoscaling } = options;
+        let { healthCheck, healthCheckContainer, essential, dontExpose, securityGroups, cluster, memoryReservation, command, version, ephemeralStorageInGB, desiredCount, cpuReservation, extraPortMappings, extraALBMappings, executionRolePolicies, taskRolePolicies, ignoreServiceDiscovery, secrets, metrics, dontAssignPublicIp, dependsOn, volumes, deregistrationDelay, mountPoints, repositoryCredentials, team, appAutoscaling, } = options;
         if (undefined === essential) {
             essential = true;
         }
@@ -155,7 +155,8 @@ function createFargateTask(serviceName, dockerImage, dockerListeningPort, enviro
         dependsOn.push(...policies);
         let dockerLabels = {};
         if (metrics && (metrics.port || dockerListeningPort)) {
-            dockerLabels.ECS_PROMETHEUS_EXPORTER_PORT = "" + (metrics.port || dockerListeningPort);
+            dockerLabels.ECS_PROMETHEUS_EXPORTER_PORT =
+                "" + (metrics.port || dockerListeningPort);
             dockerLabels.ECS_PROMETHEUS_METRICS_PATH = metrics.path || "/metrics";
             if (metrics.jobName) {
                 dockerLabels.ECS_PROMETHEUS_JOB_NAME = metrics.jobName;
@@ -188,7 +189,8 @@ function createFargateTask(serviceName, dockerImage, dockerListeningPort, enviro
                     cidrBlocks: [vpc.cidrBlock],
                     securityGroupId: taskSecurityGroup.id,
                 });
-                if (!extraPortMappings.find(($) => $.hostPort != metrics.port) && (port != dockerListeningPort || dontExpose)) {
+                if (!extraPortMappings.find(($) => $.hostPort != metrics.port) &&
+                    (port != dockerListeningPort || dontExpose)) {
                     extraPortMappings.push({
                         containerPort: port,
                         hostPort: port,
@@ -230,14 +232,14 @@ function createFargateTask(serviceName, dockerImage, dockerListeningPort, enviro
                     portMappings: extraPortMappings,
                     dockerLabels,
                     mountPoints,
-                    repositoryCredentials
+                    repositoryCredentials,
                 },
                 dependsOn,
                 volumes,
                 team,
                 targetGroups,
                 runtimePlatform: options.runtimePlatform,
-                appAutoscaling
+                appAutoscaling,
             });
             return {
                 service,
@@ -257,7 +259,10 @@ function createFargateTask(serviceName, dockerImage, dockerListeningPort, enviro
                 });
             }
         }
-        const portMapping = { containerPort: dockerListeningPort, hostPort: dockerListeningPort };
+        const portMapping = {
+            containerPort: dockerListeningPort,
+            hostPort: dockerListeningPort,
+        };
         // make the service accesible by the ALB
         (0, acceptAlb_1.makeSecurityGroupAccessibleFromSharedAlb)(taskSecurityGroup);
         const service = yield createInternalService({
@@ -284,14 +289,14 @@ function createFargateTask(serviceName, dockerImage, dockerListeningPort, enviro
                 cpu: cpuReservation,
                 dockerLabels,
                 mountPoints,
-                repositoryCredentials
+                repositoryCredentials,
             },
             dependsOn,
             volumes,
             team,
             targetGroups,
             runtimePlatform: options.runtimePlatform,
-            appAutoscaling
+            appAutoscaling,
         });
         return { endpoint: `https://${hostname}/`, service, exposed };
     });
@@ -299,7 +304,7 @@ function createFargateTask(serviceName, dockerImage, dockerListeningPort, enviro
 function createInternalService(config) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
-        let { serviceName, cluster, securityGroups, ignoreServiceDiscovery, serviceDiscoveryPort, desiredCount, executionRole, taskRole, containerInfo, assignPublicIp, dependsOn, volumes, team, targetGroups, runtimePlatform, ephemeralStorageInGB, appAutoscaling } = config;
+        let { serviceName, cluster, securityGroups, ignoreServiceDiscovery, serviceDiscoveryPort, desiredCount, executionRole, taskRole, containerInfo, assignPublicIp, dependsOn, volumes, team, targetGroups, runtimePlatform, ephemeralStorageInGB, appAutoscaling, } = config;
         if (!desiredCount)
             desiredCount = 1;
         assignPublicIp = !!assignPublicIp;
@@ -314,7 +319,7 @@ function createInternalService(config) {
                         { type: "SRV", ttl: 10 },
                     ],
                     namespaceId: (0, supra_1.getInternalServiceDiscoveryNamespaceId)(),
-                }
+                },
             });
             serviceRegistries = {
                 port: serviceDiscoveryPort,
@@ -330,10 +335,14 @@ function createInternalService(config) {
             executionRoleArn: executionRole === null || executionRole === void 0 ? void 0 : executionRole.arn,
             taskRoleArn: taskRole === null || taskRole === void 0 ? void 0 : taskRole.arn,
             tags: { ServiceName: serviceName, Team: team },
-            containerDefinitions: pulumi.jsonStringify([Object.assign(Object.assign({}, containerInfo), { logConfiguration: (0, exports.getDefaultLogs)(serviceName, logGroup) })]),
-            ephemeralStorage: !!ephemeralStorageInGB ? {
-                sizeInGib: ephemeralStorageInGB
-            } : undefined,
+            containerDefinitions: pulumi.jsonStringify([
+                Object.assign(Object.assign({}, containerInfo), { logConfiguration: (0, exports.getDefaultLogs)(serviceName, logGroup) }),
+            ]),
+            ephemeralStorage: !!ephemeralStorageInGB
+                ? {
+                    sizeInGib: ephemeralStorageInGB,
+                }
+                : undefined,
             cpu: (_a = containerInfo.cpu) === null || _a === void 0 ? void 0 : _a.toString(),
             memory: (_b = containerInfo.memoryReservation) === null || _b === void 0 ? void 0 : _b.toString(),
             runtimePlatform: runtimePlatform,
@@ -359,11 +368,11 @@ function createInternalService(config) {
                 ...targetGroups.map((tg) => ({
                     targetGroupArn: tg.arn,
                     containerName: serviceName,
-                    containerPort: tg.port
-                }))
-            ]
+                    containerPort: tg.port,
+                })),
+            ],
         }, Object.assign(Object.assign({}, extraOpts), { dependsOn }));
-        console.log('Should set-up autoscaling', { should: !!appAutoscaling });
+        console.log("Should set-up autoscaling", { should: !!appAutoscaling });
         if (!!appAutoscaling) {
             setAutoscaling(service, Object.assign(Object.assign({}, appAutoscaling), { desiredCount }));
         }
@@ -373,42 +382,41 @@ function createInternalService(config) {
 function setAutoscaling(service, config) {
     const taskUniqueIdentifier = `${service.name}-${domain_1.env}`;
     // resolve the Output<string> before using it
-    config.metricDimensionValue.apply(metricValue => {
-        const ecsTarget = new aws.appautoscaling.Target(`ecs-target-${taskUniqueIdentifier}`, {
-            maxCapacity: config.maxCapacity,
-            minCapacity: config.desiredCount,
-            resourceId: pulumi.interpolate `service/${service.cluster}/${service.name}`,
-            scalableDimension: "ecs:service:DesiredCount",
-            serviceNamespace: "ecs",
-        });
-        const CSM_ApproximateNumberOfMessagesVisible = {
-            metricName: config.metricName,
-            namespace: "AWS/SQS",
-            dimensions: [
-                {
-                    name: "QueueName",
-                    value: metricValue,
-                },
-            ],
-            statistic: config.statistic,
-            unit: "Count",
-        };
-        let TTS_CustomizedMetricSpecification = undefined;
-        if (config.metricName === "ApproximateNumberOfMessagesVisible") {
-            TTS_CustomizedMetricSpecification = CSM_ApproximateNumberOfMessagesVisible;
-        }
-        return new aws.appautoscaling.Policy(`ecs-autoscaling-policy-${taskUniqueIdentifier}`, {
-            policyType: "TargetTrackingScaling",
-            resourceId: ecsTarget.resourceId,
-            scalableDimension: ecsTarget.scalableDimension,
-            serviceNamespace: ecsTarget.serviceNamespace,
-            targetTrackingScalingPolicyConfiguration: {
-                targetValue: config.targetValue,
-                customizedMetricSpecification: TTS_CustomizedMetricSpecification,
-                scaleOutCooldown: config.scaleOutCooldown,
-                scaleInCooldown: config.scaleInCooldown,
-            },
-        }, { dependsOn: [ecsTarget] });
+    const stringifiedMetricDimensionValue = config.metricDimensionValue;
+    const ecsTarget = new aws.appautoscaling.Target(`ecs-target-${taskUniqueIdentifier}`, {
+        maxCapacity: config.maxCapacity,
+        minCapacity: config.desiredCount,
+        resourceId: pulumi.interpolate `service/${service.cluster}/${service.name}`,
+        scalableDimension: "ecs:service:DesiredCount",
+        serviceNamespace: "ecs",
     });
+    const CSM_ApproximateNumberOfMessagesVisible = {
+        metricName: config.metricName,
+        namespace: "AWS/SQS",
+        dimensions: [
+            {
+                name: "QueueName",
+                value: stringifiedMetricDimensionValue,
+            },
+        ],
+        statistic: config.statistic,
+        unit: "Count",
+    };
+    let TTS_CustomizedMetricSpecification = undefined;
+    if (config.metricName === "ApproximateNumberOfMessagesVisible") {
+        TTS_CustomizedMetricSpecification = CSM_ApproximateNumberOfMessagesVisible;
+    }
+    return new aws.appautoscaling.Policy(`ecs-autoscaling-policy-${taskUniqueIdentifier}`, {
+        policyType: "TargetTrackingScaling",
+        resourceId: ecsTarget.resourceId,
+        scalableDimension: ecsTarget.scalableDimension,
+        serviceNamespace: ecsTarget.serviceNamespace,
+        targetTrackingScalingPolicyConfiguration: {
+            targetValue: config.targetValue,
+            customizedMetricSpecification: TTS_CustomizedMetricSpecification,
+            scaleOutCooldown: config.scaleOutCooldown,
+            scaleInCooldown: config.scaleInCooldown,
+        },
+    }, { dependsOn: [ecsTarget] });
 }
 //# sourceMappingURL=createFargateTask.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dcl-ops-lib",
-  "version": "6.8.3",
+  "version": "6.8.4",
   "scripts": {
     "build": "tsc && cp bin/* . && node test.js",
     "clean": "rm *.d.ts *.js *.js.map"