dcl-ops-lib 6.7.0 → 6.8.0

package/createFargateTask.d.ts

@@ -23,9 +23,7 @@ export type FargateTaskOptions = {
     cluster?: aws.ecs.Cluster | string;
     healthCheck?: Partial<aws.types.input.alb.TargetGroupHealthCheck>;
     healthCheckContainer?: HealthCheck;
-    ephemeralStorage?: {
-        sizeInGiB: number;
-    };
+    ephemeralStorageInGB?: number;
     desiredCount?: number;
     memoryReservation?: number;
     cpuReservation?: number;
@@ -104,9 +102,7 @@ export type InternalServiceOptions = {
     securityGroups?: (string | pulumi.Output<string>)[];
     ignoreServiceDiscovery?: boolean;
     serviceDiscoveryPort?: number;
-    ephemeralStorage?: {
-        sizeInGiB: number;
-    };
+    ephemeralStorageInGB?: number;
     desiredCount?: number;
     executionRole?: aws.iam.Role;
     taskRole?: aws.iam.Role;

package/createFargateTask.js

@@ -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, ephemeralStorage, desiredCount, cpuReservation, extraPortMappings, extraALBMappings, executionRolePolicies, taskRolePolicies, ignoreServiceDiscovery, secrets, metrics, dontAssignPublicIp, dependsOn, volumes, deregistrationDelay, mountPoints, repositoryCredentials, team, } = 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, } = options;
         if (undefined === essential) {
             essential = true;
         }
@@ -210,7 +210,7 @@ function createFargateTask(serviceName, dockerImage, dockerListeningPort, enviro
                 serviceName,
                 cluster,
                 desiredCount,
-                ephemeralStorage,
+                ephemeralStorageInGB,
                 executionRole,
                 taskRole,
                 assignPublicIp: !dontAssignPublicIp,
@@ -263,7 +263,7 @@ function createFargateTask(serviceName, dockerImage, dockerListeningPort, enviro
             serviceName,
             cluster,
             desiredCount,
-            ephemeralStorage,
+            ephemeralStorageInGB,
             executionRole,
             taskRole,
             assignPublicIp: !dontAssignPublicIp,
@@ -297,7 +297,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, ephemeralStorage } = 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;
@@ -329,7 +329,9 @@ function createInternalService(config) {
             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: !!ephemeralStorage ? ephemeralStorage : undefined,
+            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,8 +361,9 @@ function createInternalService(config) {
                 }))
             ]
         }, Object.assign(Object.assign({}, extraOpts), { dependsOn }));
-        if (!!config.appAutoscaling) {
-            setAutoscaling(service, Object.assign(Object.assign({}, config.appAutoscaling), { desiredCount }));
+        console.log('Should set-up autoscaling', { should: !!appAutoscaling });
+        if (!!appAutoscaling) {
+            setAutoscaling(service, Object.assign(Object.assign({}, appAutoscaling), { desiredCount }));
         }
         return service;
     });
@@ -390,7 +393,7 @@ function setAutoscaling(service, config) {
     if (config.metricName === "ApproximateNumberOfMessagesVisible") {
         TTS_CustomizedMetricSpecification = CSM_ApproximateNumberOfMessagesVisible;
     }
-    new aws.appautoscaling.Policy(`ecs-autoscaling-policy-${taskUniqueIdentifier}`, {
+    return new aws.appautoscaling.Policy(`ecs-autoscaling-policy-${taskUniqueIdentifier}`, {
         policyType: "TargetTrackingScaling",
         resourceId: ecsTarget.resourceId,
         scalableDimension: ecsTarget.scalableDimension,
@@ -401,6 +404,6 @@ function setAutoscaling(service, config) {
             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.7.0",
+  "version": "6.8.0",
   "scripts": {
     "build": "tsc && cp bin/* . && node test.js",
     "clean": "rm *.d.ts *.js *.js.map"