dcl-ops-lib 6.0.1 → 6.0.3

package/acceptDb.d.ts

@@ -1,4 +1,4 @@
 import * as aws from "@pulumi/aws";
 export declare const acceptDbSecurityGroup: () => Promise<aws.ec2.GetSecurityGroupResult>;
-export declare function acceptDbSecurityGroupId(): Promise<string>;
+export declare const acceptDbSecurityGroupId: () => Promise<string>;
 export default acceptDbSecurityGroup;

package/acceptDb.js

@@ -15,13 +15,11 @@ const values_1 = require("./values");
 const withCache_1 = require("./withCache");
 exports.acceptDbSecurityGroup = (0, withCache_1.default)(() => __awaiter(void 0, void 0, void 0, function* () {
     const config = yield (0, values_1.getEnvConfiguration)();
-    return aws.ec2.getSecurityGroup({ name: config.dbSecurity });
+    return aws.ec2.getSecurityGroup({ id: config.dbSecurity });
+}));
+exports.acceptDbSecurityGroupId = (0, withCache_1.default)(() => __awaiter(void 0, void 0, void 0, function* () {
+    const config = yield (0, values_1.getEnvConfiguration)();
+    return config.dbSecurity;
 }));
-function acceptDbSecurityGroupId() {
-    return __awaiter(this, void 0, void 0, function* () {
-        return (yield (0, exports.acceptDbSecurityGroup)()).id;
-    });
-}
-exports.acceptDbSecurityGroupId = acceptDbSecurityGroupId;
 exports.default = exports.acceptDbSecurityGroup;
 //# sourceMappingURL=acceptDb.js.map

package/alb.js

@@ -23,9 +23,9 @@ const cache = {
 };
 exports.getAlb = (0, withCache_1.default)(() => __awaiter(void 0, void 0, void 0, function* () {
     const dns = yield supra_1.supra.getOutputValue("dns");
-    const loadBalancer = yield supra_1.supra.getOutputDetails("albInstance");
+    const loadBalancer = yield supra_1.supra.getOutputValue("albInstance");
     const elbValues = yield supra_1.supra.getOutputValue("elbValues");
-    const alb = yield aws.lb.getLoadBalancer({ arn: JSON.parse(loadBalancer.value).arn });
+    const alb = yield aws.lb.getLoadBalancer({ arn: loadBalancer.arn });
     const listener = yield aws.lb.getListener({ arn: elbValues.listenerArn });
     return { dns, alb, listener };
 }));

package/createFargateTask.js

@@ -190,12 +190,12 @@ function createFargateTask(serviceName, dockerImage, dockerListeningPort, enviro
                 serviceDiscoveryPort = port;
             });
             // enable prometheus to access fromPort-toPort
-            (0, prometheus_1.makeSecurityGroupAccessibleByPrometheus)(taskSecurityGroup, fromPort, toPort);
+            (0, prometheus_1.makeSecurityGroupAccessibleByPrometheus)(taskSecurityGroup, fromPort, toPort, serviceName);
         }
         // enable egress traffic from the task to the internet
-        (0, accessTheInternet_1.makeSecurityGroupAccessTheInternetV2)(taskSecurityGroup);
+        (0, accessTheInternet_1.makeSecurityGroupAccessTheInternetV2)(taskSecurityGroup, serviceName);
         // make the container fully accessible from the bastion of the environment
-        (0, acceptBastion_1.makeSecurityGroupAccessibleFromBastion)(taskSecurityGroup);
+        (0, acceptBastion_1.makeSecurityGroupAccessibleFromBastion)(taskSecurityGroup, serviceName);
         if (dontExpose) {
             const service = yield createInternalService({
                 serviceName,

package/package.json

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