pack resubmitted

xsoar-bot · xsoar-bot · commit 1b62dbff2c64 · 2023-02-16T19:10:49.000Z
diff --git a/Packs/ContentTesting/ReleaseNotes/1_1_0.md b/Packs/ContentTesting/ReleaseNotes/1_1_0.md
@@ -1,8 +1,8 @@
 
 #### Incident Fields
+- **Content Testing Dependencies**
 - **Content Testing Coverage**
 - **Content Testing PBA Info**
-- **Content Testing Dependencies**
 
 #### Incident Types
 - **UnitTesting**
@@ -18,32 +18,32 @@
 - Updated the sub-playbook inputs
 
 #### Scripts
-##### ChangeHistory
-- Updated the timeout to 600 seconds
-- Updated the Docker image to: *demisto/python3:3.10.10.47713*.
 ##### New: UnitTestPBAStats
 - Added support for playbook analysis statistics
-##### ListPlaybookAutomationsCommands
-- Fixed an issue for playbooks referencing missing automations
-- Updated the timeout to 600 seconds
-- Updated the Docker image to: *demisto/python3:3.10.10.47713*.
+##### UpgradeCheck
+- Updated the timeout to 1200 seconds
+- Updated the Docker image to: *demisto/python3:3.10.10.48392*.
+##### UnitTestLoadFields
+- Fixed an issue to not overwrite incident type
+- Updated the Docker image to: *demisto/python3:3.10.10.48392*.
 ##### UnitTest
 - Fixed an issue so playbooks with spaces in name do not require quotes in Ad Hoc Test button
 - Fixed an issue in RunUTResults() to get arguments first in the event getting the automation ID throws an exception; uninitialized variable in the exception handler throws another exception, masking the original exception
-- Updated the Docker image to: *demisto/python3:3.10.10.47713*.
+- Updated the Docker image to: *demisto/python3:3.10.10.48392*.
 ##### New: UnitTestCoverage
 - Added support for test coverage
  (Available from Cortex XSOAR 6.5.0).
-##### UnitTestLoadFields
-- Fixed an issue to not overwrite incident type
-- Updated the Docker image to: *demisto/python3:3.10.10.47713*.
-##### UpgradeCheck
-- Updated the timeout to 1200 seconds
-- Updated the Docker image to: *demisto/python3:3.10.10.47713*.
+##### New: UnitTestPBATaskAvg
+- Added support for playbook task averages
+##### ChangeHistory
+- Updated the timeout to 600 seconds
+- Updated the Docker image to: *demisto/python3:3.10.10.48392*.
 ##### New: UnitTestPBATaskMax
 - Added support for playbook task maximum
+##### ListPlaybookAutomationsCommands
+- Fixed an issue for playbooks referencing missing automations
+- Updated the timeout to 600 seconds
+- Updated the Docker image to: *demisto/python3:3.10.10.48392*.
 ##### New: UnitTestPlaybookAnalyzer
 - Added support for playbook analysis
  (Available from Cortex XSOAR 6.5.0).
-##### New: UnitTestPBATaskAvg
-- Added support for playbook task averages
diff --git a/Packs/ContentTesting/Scripts/ChangeHistory/ChangeHistory.yml b/Packs/ContentTesting/Scripts/ChangeHistory/ChangeHistory.yml
@@ -4,7 +4,7 @@ commonfields:
 contentitemexportablefields:
   contentitemfields:
     fromServerVersion: ""
-dockerimage: demisto/python3:3.10.10.47713
+dockerimage: demisto/python3:3.10.10.48392
 enabled: true
 name: ChangeHistory
 runas: DBotWeakRole
diff --git a/Packs/ContentTesting/Scripts/ListPlaybookAutomationsCommands/ListPlaybookAutomationsCommands.yml b/Packs/ContentTesting/Scripts/ListPlaybookAutomationsCommands/ListPlaybookAutomationsCommands.yml
@@ -6,7 +6,7 @@ commonfields:
 contentitemexportablefields:
   contentitemfields:
     fromServerVersion: ""
-dockerimage: demisto/python3:3.10.10.47713
+dockerimage: demisto/python3:3.10.10.48392
 enabled: true
 name: ListPlaybookAutomationsCommands
 runas: DBotWeakRole
diff --git a/Packs/ContentTesting/Scripts/UnitTest/UnitTest.yml b/Packs/ContentTesting/Scripts/UnitTest/UnitTest.yml
@@ -19,7 +19,7 @@ commonfields:
 contentitemexportablefields:
   contentitemfields:
     fromServerVersion: ""
-dockerimage: demisto/python3:3.10.10.47713
+dockerimage: demisto/python3:3.10.10.48392
 enabled: true
 name: UnitTest
 runas: DBotWeakRole
diff --git a/Packs/ContentTesting/Scripts/UnitTestCoverage/UnitTestCoverage.yml b/Packs/ContentTesting/Scripts/UnitTestCoverage/UnitTestCoverage.yml
@@ -8,7 +8,7 @@ commonfields:
 contentitemexportablefields:
   contentitemfields:
     fromServerVersion: ""
-dockerimage: demisto/python3:3.10.10.47713
+dockerimage: demisto/python3:3.10.10.48392
 enabled: true
 name: UnitTestCoverage
 runas: DBotWeakRole
diff --git a/Packs/ContentTesting/Scripts/UnitTestLoadFields/UnitTestLoadFields.yml b/Packs/ContentTesting/Scripts/UnitTestLoadFields/UnitTestLoadFields.yml
@@ -8,7 +8,7 @@ commonfields:
 contentitemexportablefields:
   contentitemfields:
     fromServerVersion: ""
-dockerimage: demisto/python3:3.10.10.47713
+dockerimage: demisto/python3:3.10.10.48392
 enabled: true
 name: UnitTestLoadFields
 runas: DBotWeakRole
diff --git a/Packs/ContentTesting/Scripts/UnitTestPBAStats/UnitTestPBAStats.py b/Packs/ContentTesting/Scripts/UnitTestPBAStats/UnitTestPBAStats.py
@@ -26,7 +26,9 @@ class TaskStat(TypedDict):
     count: int
     completed: int
     started: int
+    waiting: int
     notexecuted: int
+    error: int
 
 
 class WidgetStat(TypedDict):
@@ -65,14 +67,14 @@ def TaskWidget(tstat: TaskStat) -> list[WidgetGroup]:
     return group
 
 
-def WidgetStatGroup(wstats: list[WidgetStat], name: str, stat: Dict) -> list[WidgetStat]:
+def TaskWidgetGroup(wstats: list[WidgetStat], name: str, stat: list[WidgetGroup]) -> list[WidgetStat]:
     w: WidgetStat = NewWidgetStatGroup(name, stat)
     wstats.append(w)
     return wstats
 
 
-def NewWidgetStatGroup(name: str, data: list) -> WidgetStat:
-    wstat: WidgetStat = {'name': name, 'groups': data}
+def NewWidgetStatGroup(name: str, data: list[WidgetGroup]) -> WidgetStat:
+    wstat: WidgetStat = {'name': name, 'groups': data, 'data': [], 'label': "", 'color': ""}
     return wstat
 
 
@@ -93,7 +95,7 @@ def main():
         wstats: list[WidgetStat] = []
         for key, val in stats.items():
             tw = TaskWidget(val)
-            wstats = WidgetStatGroup(wstats, val['name'], tw)
+            wstats = TaskWidgetGroup(wstats, val['name'], tw)
         widget = NewWidget("bar", "vertical", wstats)
         demisto.results(widget)
     except Exception as ex:
diff --git a/Packs/ContentTesting/Scripts/UnitTestPBAStats/UnitTestPBAStats.yml b/Packs/ContentTesting/Scripts/UnitTestPBAStats/UnitTestPBAStats.yml
@@ -4,7 +4,7 @@ commonfields:
 contentitemexportablefields:
   contentitemfields:
     fromServerVersion: ""
-dockerimage: demisto/python3:3.10.10.47713
+dockerimage: demisto/python3:3.10.10.48392
 enabled: true
 name: UnitTestPBAStats
 runas: DBotWeakRole
diff --git a/Packs/ContentTesting/Scripts/UnitTestPBATaskAvg/UnitTestPBATaskAvg.py b/Packs/ContentTesting/Scripts/UnitTestPBATaskAvg/UnitTestPBATaskAvg.py
@@ -29,7 +29,7 @@ class WidgetStat(TypedDict):
 
 
 def NewWidgetStat(name: str, color: str, label: str, data: list) -> WidgetStat:
-    wstat: WidgetStat = {'name': name, 'color': color, 'data': [data], 'label': label, 'groups': None}
+    wstat: WidgetStat = {'name': name, 'color': color, 'data': [data], 'label': label, 'groups': []}
     return wstat
 
 
diff --git a/Packs/ContentTesting/Scripts/UnitTestPBATaskAvg/UnitTestPBATaskAvg.yml b/Packs/ContentTesting/Scripts/UnitTestPBATaskAvg/UnitTestPBATaskAvg.yml
@@ -4,7 +4,7 @@ commonfields:
 contentitemexportablefields:
   contentitemfields:
     fromServerVersion: ""
-dockerimage: demisto/python3:3.10.10.47713
+dockerimage: demisto/python3:3.10.10.48392
 enabled: true
 name: UnitTestPBATaskAvg
 runas: DBotWeakRole
diff --git a/Packs/ContentTesting/Scripts/UnitTestPBATaskMax/UnitTestPBATaskMax.py b/Packs/ContentTesting/Scripts/UnitTestPBATaskMax/UnitTestPBATaskMax.py
@@ -29,7 +29,7 @@ class WidgetStat(TypedDict):
 
 
 def NewWidgetStat(name: str, color: str, label: str, data: list) -> WidgetStat:
-    wstat: WidgetStat = {'name': name, 'color': color, 'data': [data], 'label': label, 'groups': None}
+    wstat: WidgetStat = {'name': name, 'color': color, 'data': [data], 'label': label, 'groups': []}
     return wstat
 
 
diff --git a/Packs/ContentTesting/Scripts/UnitTestPBATaskMax/UnitTestPBATaskMax.yml b/Packs/ContentTesting/Scripts/UnitTestPBATaskMax/UnitTestPBATaskMax.yml
@@ -4,7 +4,7 @@ commonfields:
 contentitemexportablefields:
   contentitemfields:
     fromServerVersion: ""
-dockerimage: demisto/python3:3.10.10.47713
+dockerimage: demisto/python3:3.10.10.48392
 enabled: true
 name: UnitTestPBATaskMax
 runas: DBotWeakRole
diff --git a/Packs/ContentTesting/Scripts/UnitTestPlaybookAnalyzer/UnitTestPlaybookAnalyzer.py b/Packs/ContentTesting/Scripts/UnitTestPlaybookAnalyzer/UnitTestPlaybookAnalyzer.py
@@ -1,5 +1,6 @@
-from datetime import datetime
 # Final Test: 6.10
+import uuid
+from datetime import datetime
 from typing import Dict, TypedDict
 
 import demistomock as demisto  # noqa: F401
@@ -34,7 +35,7 @@ class Entity(TypedDict):
     name: str
     called: list[str]
     calls: list[str]
-    taskstats: list[TaskStat]
+    taskstats: dict[TaskStat]
 
 
 def GetTasks(incid: str) -> list[Task]:
@@ -74,45 +75,43 @@ def GetTasks(incid: str) -> list[Task]:
     return tasks
 
 
-def TaskStats(task: list[Task], taskstat: TaskStat) -> TaskStat:
+def TaskStats(task: list[Task], taskstat: dict[TaskStat]) -> dict[TaskStat]:
     for t in task:
         tid = t['tid']
         dur = t['duration']
         if tid not in taskstat:
-            taskstat[tid] = {'tid': tid, 'name': t['name'], 'mindur': None, 'maxdur': 0, 'avgdur': 0,
-                             'totdur': 0, 'count': 0, 'completed': 0, 'started': 0, 'notexecuted': 0, 'error': 0, 'waiting': 0}
+            taskstat[tid] = {'tid': tid, 'name': t['name'], 'mindur': None, 'maxdur': 0, 'avgdur': 0, 'totdur': 0,
+                             'count': 0, 'completed': 0, 'started': 0, 'notexecuted': 0, 'error': 0, 'waiting': 0}  # type: ignore
         if t['state'] == "Completed":
-            if dur > taskstat[tid]['maxdur']:
-                taskstat[tid]['maxdur'] = dur
-            if taskstat[tid]['mindur'] != None:
-                if dur < taskstat[tid]['mindur']:
-                    taskstat[tid]['mindur'] = dur
+            if dur > taskstat[tid]['maxdur']:  # type: ignore
+                taskstat[tid]['maxdur'] = dur  # type: ignore
+            if taskstat[tid]['mindur'] != None:  # type: ignore
+                if dur < taskstat[tid]['mindur']:  # type: ignore
+                    taskstat[tid]['mindur'] = dur  # type: ignore
             else:
-                taskstat[tid]['mindur'] = dur
-            taskstat[tid]['totdur'] += dur
-            taskstat[tid]['completed'] += 1
+                taskstat[tid]['mindur'] = dur  # type: ignore
+            taskstat[tid]['totdur'] += dur  # type: ignore
+            taskstat[tid]['completed'] += 1  # type: ignore
         elif t['state'] == "Error":
-            taskstat[tid]['error'] += 1
+            taskstat[tid]['error'] += 1  # type: ignore
         elif t['state'] == "Waiting":
-            taskstat[tid]['waiting'] += 1
+            taskstat[tid]['waiting'] += 1  # type: ignore
         else:
-            taskstat[tid]['started'] += t['started']
-            taskstat[tid]['notexecuted'] += t['notexecuted']
-        taskstat[tid]['count'] += 1
+            taskstat[tid]['started'] += t['started']  # type: ignore
+            taskstat[tid]['notexecuted'] += t['notexecuted']  # type: ignore
+        taskstat[tid]['count'] += 1  # type: ignore
 
     for key, ts in taskstat.items():
         ts['avgdur'] = int(ts['totdur'] / ts['count'])
 
     return taskstat
 
 
-def GetTaskStats(playbookname: str, occurred: str) -> TaskStat:
-    #argument['fromdate'] = min_date.isoformat()
-    #argument['todate'] = max_date.isoformat()
-    argument = {'query': f'playbook:"{playbookname}" occurred:>="{occurred}"', 'size': 1000}  # , 'sort': '%s.desc' % time_field}
+def GetTaskStats(playbookname: str, occurred: str) -> (dict[TaskStat], int):
+    argument = {'query': f'playbook:"{playbookname}" occurred:>="{occurred}"', 'size': 1000}
     response = execute_command("getIncidents", argument)
-    taskstat: TaskStat = {}
-    taskstats: TaskStat = {}
+    taskstat: TaskStat = {}  # type: ignore
+    taskstats: dict[TaskStat] = {}  # type: ignore
     count = 0
     if response['data'] != None:
         for inc in response['data']:
@@ -145,12 +144,13 @@ def GetPlaybooks():
     return playbooks
 
 
-def GetEntities(playbooks: str) -> Dict[str, Entity]:
+def GetEntities(playbooks: list) -> Dict[str, Entity]:
     entities: Dict[str, Entity] = {}
 
     for p in playbooks:
-        entname = f"p.{p['name']}"
-        entities[entname] = {'name': p['name'], 'called': [], 'calls': [], 'taskstats': []}
+        rawname = p['name']
+        entname = f"p.{rawname}"
+        entities[entname] = {'name': rawname, 'called': [], 'calls': [], 'taskstats': []}
         for key, t in p['tasks'].items():
             if t['type'] == "playbook":
                 taskname = t['task']['name']
@@ -168,7 +168,7 @@ def GetEntities(playbooks: str) -> Dict[str, Entity]:
                     pass
                 autoname = f"a.{scrname}"
                 if autoname not in entities:
-                    entities[autoname] = {'name': scrname, 'called': [], 'calls': []}
+                    entities[autoname] = {'name': scrname, 'called': [], 'calls': [], 'taskstats': []}
                 entities[entname]['calls'].append(autoname)
                 entities[autoname]['called'].append(entname)
 
@@ -180,8 +180,8 @@ def PlaybookEntity(entities: Dict[str, Entity], playbook: str) -> Entity:
         if key.startswith("p."):
             if ent['name'] == playbook:
                 return ent
-
-    return {}
+    emptyent: Entity = {}  # type: ignore
+    return emptyent
 
 
 def EntityMarkdown(ent: Entity, count: int) -> str:
@@ -205,7 +205,7 @@ def EntityMarkdown(ent: Entity, count: int) -> str:
     return(output)
 
 
-def StatsInfoMarkdown(stats: TaskStat) -> str:
+def StatsInfoMarkdown(stats: dict[TaskStat]) -> str:
     markdown = "<br/>\n"
     markdown += "|Task Name|Minimum Duration(ms)|Average Duration(ms)|Maximum Duration(ms)|\n"
     markdown += "|---|:---:|:---:|:---:|\n"
diff --git a/Packs/ContentTesting/Scripts/UnitTestPlaybookAnalyzer/UnitTestPlaybookAnalyzer.yml b/Packs/ContentTesting/Scripts/UnitTestPlaybookAnalyzer/UnitTestPlaybookAnalyzer.yml
@@ -12,7 +12,7 @@ commonfields:
 contentitemexportablefields:
   contentitemfields:
     fromServerVersion: ""
-dockerimage: demisto/python3:3.10.10.47713
+dockerimage: demisto/python3:3.10.10.48392
 enabled: true
 name: UnitTestPlaybookAnalyzer
 runas: DBotWeakRole
diff --git a/Packs/ContentTesting/Scripts/UpgradeCheck/UpgradeCheck.yml b/Packs/ContentTesting/Scripts/UpgradeCheck/UpgradeCheck.yml
@@ -6,7 +6,7 @@ commonfields:
 contentitemexportablefields:
   contentitemfields:
     fromServerVersion: ""
-dockerimage: demisto/python3:3.10.10.47713
+dockerimage: demisto/python3:3.10.10.48392
 enabled: true
 name: UpgradeCheck
 runas: DBotWeakRole
