dcl-ops-lib 5.23.0 → 5.23.1

package/acceptAlb.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeSecurityGroupAccessibleFromSharedAlb = exports.acceptAlbSecurityGroupId = exports.acceptAlbSecurityGroup = void 0;
 const awsx = require("@pulumi/awsx");
+const utils_1 = require("./utils");
 const values_1 = require("./values");
 const withCache_1 = require("./withCache");
 /** @deprecated use makeSecurityGroupAccessibleFromSharedAlb instead */
@@ -27,7 +28,7 @@ function acceptAlbSecurityGroupId() {
 exports.acceptAlbSecurityGroupId = acceptAlbSecurityGroupId;
 /** Makes a given securityGropup accesible by the shared supra ALB */
 function makeSecurityGroupAccessibleFromSharedAlb(securityGroup, ruleName = "") {
-    new awsx.ec2.IngressSecurityGroupRule(ruleName + "-accept-alb-ingress-rule", securityGroup, {
+    new awsx.ec2.IngressSecurityGroupRule((0, utils_1.withRuleName)("accept-alb-ingress-rule", ruleName), securityGroup, {
         sourceSecurityGroupId: (0, values_1.getEnvConfiguration)().then(($) => $.albSecurityGroupId),
         description: `Allow access from the supra ALB`,
         fromPort: 0,

package/acceptBastion.js

@@ -14,6 +14,7 @@ const awsx = require("@pulumi/awsx");
 const aws = require("@pulumi/aws");
 const values_1 = require("./values");
 const withCache_1 = require("./withCache");
+const utils_1 = require("./utils");
 /** @deprecated please use makeSecurityGroupAccessTheInternet */
 exports.acceptBastionSecurityGroup = (0, withCache_1.default)(() => __awaiter(void 0, void 0, void 0, function* () {
     const config = yield (0, values_1.getEnvConfiguration)();
@@ -30,15 +31,15 @@ const bastionSecurityGroupId = (0, withCache_1.default)(() => __awaiter(void 0,
     const config = yield (0, values_1.getEnvConfiguration)();
     return config.bastionSecurityGroupId;
 }));
-function makeSecurityGroupAccessibleFromBastion(securityGroup, ruleName = '') {
-    new aws.ec2.SecurityGroupRule(ruleName + "-accesible-from-bastion", {
+function makeSecurityGroupAccessibleFromBastion(securityGroup, ruleName = "") {
+    new aws.ec2.SecurityGroupRule((0, utils_1.withRuleName)("accesible-from-bastion", ruleName), {
         securityGroupId: securityGroup.id,
         sourceSecurityGroupId: bastionSecurityGroupId(),
         fromPort: -1,
         toPort: -1,
         type: "ingress",
         protocol: "-1",
-    });
+    }, { deleteBeforeReplace: true });
 }
 exports.makeSecurityGroupAccessibleFromBastion = makeSecurityGroupAccessibleFromBastion;
 exports.default = exports.acceptBastionSecurityGroup;

package/accessTheInternet.js

@@ -43,7 +43,7 @@ function accessFromCloudflareSecurityGroup() {
 exports.accessFromCloudflareSecurityGroup = accessFromCloudflareSecurityGroup;
 /** Enables egress traffic to 0.0.0.0/0/all */
 function makeSecurityGroupAccessTheInternet(securityGroup, ruleName = "") {
-    securityGroup.createEgressRule(ruleName + "-access-the-internet", {
+    securityGroup.createEgressRule((0, utils_1.withRuleName)("access-the-internet", ruleName), {
         cidrBlocks: ["0.0.0.0/0"],
         fromPort: -1,
         toPort: -1,

package/package.json

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

package/prometheus.js

@@ -14,6 +14,7 @@ const pulumi = require("@pulumi/pulumi");
 const awsx = require("@pulumi/awsx");
 const domain_1 = require("./domain");
 const withCache_1 = require("./withCache");
+const utils_1 = require("./utils");
 exports.prometheusStack = (0, withCache_1.default)(() => __awaiter(void 0, void 0, void 0, function* () {
     return new pulumi.StackReference(`prometheus-${domain_1.env}`);
 }));
@@ -22,7 +23,7 @@ exports.prometheusSecurityGroupId = (0, withCache_1.default)(() => __awaiter(voi
     return (yield prom.requireOutputValue("prometheusSecurityGroupId"));
 }));
 function makeSecurityGroupAccessibleByPrometheus(securityGroup, fromPort = 0, toPort = 0, ruleName = "") {
-    new awsx.ec2.IngressSecurityGroupRule(ruleName + `-accept-prom-${fromPort}-${toPort}`, securityGroup, {
+    new awsx.ec2.IngressSecurityGroupRule((0, utils_1.withRuleName)(`accept-prom-${fromPort}-${toPort}`, ruleName), securityGroup, {
         sourceSecurityGroupId: (0, exports.prometheusSecurityGroupId)(),
         description: `Allow access from prometheus`,
         fromPort,

package/utils.d.ts

@@ -1 +1,2 @@
 export declare function sha256hash(s: string): string;
+export declare function withRuleName(name: string, ruleName?: string): string;

package/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sha256hash = void 0;
+exports.withRuleName = exports.sha256hash = void 0;
 const crypto = require("crypto");
 function sha256hash(s) {
     const shasum = crypto.createHash("sha256");
@@ -8,4 +8,11 @@ function sha256hash(s) {
     return shasum.digest("hex").substring(0, 8);
 }
 exports.sha256hash = sha256hash;
+function withRuleName(name, ruleName) {
+    if (ruleName === null || ruleName === void 0 ? void 0 : ruleName.length) {
+        return `${ruleName}-${name}`;
+    }
+    return name;
+}
+exports.withRuleName = withRuleName;
 //# sourceMappingURL=utils.js.map