fix 4.1.1

globaldatanet · Oct 10, 2023 · 0f558b4 · 0f558b4
1 parent cff5c44
commit 0f558b4
Show file tree

Hide file tree

Showing 5 changed files with 684 additions and 6 deletions.
diff --git a/lib/tools/helpers.ts b/lib/tools/helpers.ts
@@ -289,7 +289,7 @@ async function calculateCapacities(
         managedrule.version
       );
       managedrule.capacity = capacity;
-      managedcapacitieslog.push([managedrule.name, managedrule.capacity, managedrule.version ?? "unversioned", managedrule.enforceUpdate ?? "false"]);
+      managedcapacitieslog.push([managedrule.name, managedrule.capacity, managedrule.version !== "" ? managedrule.version : "[unversioned]", managedrule.enforceUpdate ?? "false"]);
       runtimeProperties.ManagedRuleCapacity += capacity;
       runtimeProperties.PreProcess.ManagedRuleGroupCount += 1;
       managedrule.name === "AWSManagedRulesBotControlRuleSet" ? runtimeProperties.PreProcess.ManagedRuleBotControlCount +=1 : "";
@@ -312,7 +312,7 @@ async function calculateCapacities(
         config.WebAcl.Scope,
         managedrule.version
       );
-      managedcapacitieslog.push([managedrule.name, managedrule.capacity, managedrule.version ?? "unversioned", managedrule.enforceUpdate ?? "false"]);
+      managedcapacitieslog.push([managedrule.name, managedrule.capacity, managedrule.capacity, managedrule.version !== "" ? managedrule.version : "[unversioned]", managedrule.enforceUpdate ?? "false"]);
       runtimeProperties.ManagedRuleCapacity += capacity;
       runtimeProperties.PostProcess.ManagedRuleGroupCount += 1;
       managedrule.name === "AWSManagedRulesBotControlRuleSet" ? runtimeProperties.PostProcess.ManagedRuleBotControlCount +=1 : "";

diff --git a/lib/types/config.ts b/lib/types/config.ts
@@ -44,7 +44,11 @@ export interface Prerequisites {
   readonly General: {
     readonly Prefix: string,
   },
-  readonly Logging: {
+  readonly Information?:{
+    SlackWebhook?: string,
+    TeamsWebhook?: string,
+  }
+  readonly Logging?: {
       readonly BucketProperties?: {
         readonly BucketName?: string,
         readonly KmsEncryptionKey: boolean,