dcl-ops-lib 6.0.4 → 6.0.6

package/createFargateTask.js

@@ -26,7 +26,7 @@ const getDefaultLogs = (serviceName, logGroup) => {
     return {
         logDriver: "awslogs",
         options: {
-            "awslogs-group": logGroup.name.apply((name) => name),
+            "awslogs-group": (0, stack_1.getStackScopedName)(serviceName),
             "awslogs-region": "us-east-1",
             "awslogs-stream-prefix": serviceName,
         },
@@ -228,10 +228,10 @@ function createFargateTask(serviceName, dockerImage, dockerListeningPort, enviro
                 endpoint: "not exposed",
             };
         }
-        const exposed = yield (0, exposePublicService_1.exposePublicService)(`${serviceName}-${version}`, hostname, dockerListeningPort, healthCheck, undefined, options.extraExposedServiceOptions, deregistrationDelay);
+        const exposed = yield (0, exposePublicService_1.exposePublicService)(`${serviceName}-${version}`, hostname, dockerListeningPort, healthCheck, vpc.id, options.extraExposedServiceOptions, deregistrationDelay);
         const extraALBMappingsExposed = [];
         for (let extraALBMapping of extraALBMappings) {
-            const exposedExtra = yield (0, exposePublicService_1.exposePublicService)(`${serviceName}-${extraALBMapping.dockerListeningPort}-${version}`, extraALBMapping.domain, extraALBMapping.dockerListeningPort, extraALBMapping.healthCheck, undefined, extraALBMapping.extraExposedServiceOptions);
+            const exposedExtra = yield (0, exposePublicService_1.exposePublicService)(`${serviceName}-${extraALBMapping.dockerListeningPort}-${version}`, extraALBMapping.domain, extraALBMapping.dockerListeningPort, extraALBMapping.healthCheck, vpc.id, extraALBMapping.extraExposedServiceOptions);
             extraALBMappingsExposed.push(exposedExtra.targetGroup);
             extraPortMappings.push({
                 containerPort: extraALBMapping.dockerListeningPort,

package/exposePublicService.d.ts

@@ -22,7 +22,7 @@ export type ExtraExposedServiceOptions = CloudflareDomainOptions & {
  * @param domain
  * @param port
  */
-export declare function exposePublicService(name: string, domain: string, port: number, healthCheck?: Partial<albTypes.TargetGroupHealthCheck>, vpc?: aws.ec2.Vpc, extraOptions?: ExtraExposedServiceOptions, deregistrationDelay?: pulumi.Input<number>): Promise<{
+export declare function exposePublicService(name: string, domain: string, port: number, healthCheck?: Partial<albTypes.TargetGroupHealthCheck>, vpcId?: string, extraOptions?: ExtraExposedServiceOptions, deregistrationDelay?: pulumi.Input<number>): Promise<{
     domain: string;
     certificate: pulumi.Input<string>;
     record: import("@pulumi/aws/route53/record").Record | undefined;

package/exposePublicService.js

@@ -38,7 +38,7 @@ function isUnProxiedDomain(v) {
  * @param domain
  * @param port
  */
-function exposePublicService(name, domain, port, healthCheck = {}, vpc, extraOptions, deregistrationDelay) {
+function exposePublicService(name, domain, port, healthCheck = {}, vpcId, extraOptions, deregistrationDelay) {
     return __awaiter(this, void 0, void 0, function* () {
         const { alb, listener } = yield (0, alb_1.getAlb)();
         const healthCheckValue = Object.assign({}, DEFAULT_HEALTHCHECK_VALUES, healthCheck);
@@ -49,13 +49,14 @@ function exposePublicService(name, domain, port, healthCheck = {}, vpc, extraOpt
         const createInternalDomain = !onlyCloudflare;
         const certificate = (0, certificate_1.getCertificateFor)(domain);
         const slug = name;
-        const targetVpc = vpc ? vpc : yield aws.ec2.getVpc({ default: true }, { async: true });
+        const targetVpcId = vpcId ? vpcId : (yield aws.ec2.getVpc({ default: true }, { async: true })).id;
         const targetDeregistrationDelay = deregistrationDelay ? deregistrationDelay : 300;
         const targetGroup = new aws.alb.TargetGroup("tg-" + slug.substr(-32 + 12), {
             protocol: "HTTP",
+            targetType: "ip",
             port,
             healthCheck: healthCheckValue,
-            vpcId: targetVpc.id,
+            vpcId: targetVpcId,
             deregistrationDelay: targetDeregistrationDelay,
         });
         const domainParts = (0, getDomainAndSubdomain_1.getDomainAndSubdomain)(domain);

package/package.json

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

package/prometheus.js

@@ -28,7 +28,7 @@ function makeSecurityGroupAccessibleByPrometheus(securityGroup, fromPort = 0, to
         description: `Allow access from prometheus`,
         fromPort,
         toPort,
-        protocol: "-1",
+        protocol: "tcp",
         type: "egress",
         securityGroupId: securityGroup.id,
     }, { deleteBeforeReplace: true });