Merge pull request #23 from globaldatanet/bugfix/Outputs-in-Stack-are…

…-not-dynamic Bugfix/outputs in stack are not dynamic
globaldatanet · Mar 2, 2022 · 023f0da · 023f0da
2 parents abd5052 + 1a2ee51
commit 023f0da
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## Released
 
+## 2.1.1
+
+### Fixed
+
+- Outputs were not dynamic
+
 ## 2.1.0
 
 ### Added

diff --git a/lib/plattform-wafv2-cdk-automation-stack.ts b/lib/plattform-wafv2-cdk-automation-stack.ts
@@ -296,14 +296,16 @@ function buildServiceDataCustomRGs(scope: Construct, type: "Pre" | "Post", capac
         );
         if (
           processRuntimeProps.DeployedRuleGroupIdentifier[0] ===
-          "RuleGroup"
+          type+"RuleGroup"
         ) {
           rulegroupidentifier = type + "RG";
         }
 
         if (
           processRuntimeProps.DeployedRuleGroupNames[0] ===
           webaclName +
+            "-" +
+            type.toLowerCase() +
             "-" +
             stage +
             "-" +
@@ -651,30 +653,30 @@ function buildServiceDataCustomRGs(scope: Construct, type: "Pre" | "Post", capac
     );
     processRuntimeProps.DeployedRuleGroupNames.splice(lenght);
 
-    new cdk.CfnOutput(scope, "PreProcessDeployedRuleGroupNames", {
+    new cdk.CfnOutput(scope, type+"ProcessDeployedRuleGroupNames", {
       value:
         processRuntimeProps.DeployedRuleGroupNames.toString(),
-      description: "PreProcessDeployedRuleGroupNames",
+      description: type+"ProcessDeployedRuleGroupNames",
       exportName:
-        "PreProcessDeployedRuleGroupNames" +
+        type+"ProcessDeployedRuleGroupNames" +
         deployHash,
     });
 
-    new cdk.CfnOutput(scope, "PreProcessDeployedRuleGroupCapacities", {
+    new cdk.CfnOutput(scope, type+"ProcessDeployedRuleGroupCapacities", {
       value:
         processRuntimeProps.DeployedRuleGroupCapacities.toString(),
-      description: "PreProcessDeployedRuleGroupCapacities",
+      description: type+"ProcessDeployedRuleGroupCapacities",
       exportName:
-        "PreProcessDeployedRuleGroupCapacities" +
+        type+"ProcessDeployedRuleGroupCapacities" +
         deployHash,
     });
 
-    new cdk.CfnOutput(scope, "PreProcessDeployedRuleGroupIdentifier", {
+    new cdk.CfnOutput(scope, type+"ProcessDeployedRuleGroupIdentifier", {
       value:
         processRuntimeProps.DeployedRuleGroupIdentifier.toString(),
-      description: "PreProcessDeployedRuleGroupIdentifier",
+      description: type+"ProcessDeployedRuleGroupIdentifier",
       exportName:
-        "PreProcessDeployedRuleGroupIdentifier" +
+        type+"ProcessDeployedRuleGroupIdentifier" +
         deployHash,
     });
   }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "plattform-wafv2-cdk-automation",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "bin": {
     "plattform-wafv2-cdk-automation": "bin/plattform-wafv2-cdk-automation.js"
   },