Ciac 6453/improve generic polling - hotfix

Packs/CommonScripts/ReleaseNotes/1_11_68.md

@@ -0,0 +1,13 @@
+
+#### Scripts
+
+##### ScheduleCommand
+
+- Added the *scheduledEntryGuid* argument to support the new ***GenericPolling*** playbook mechanism.
+
+##### GenericPollingScheduledTask
+- Added the *scheduledEntryGuid* argument to support the new ***GenericPolling*** playbook mechanism.
+- Fixed an issue where the GUID was not accessed correctly in the ***GenericPolling*** playbook context.
+
+##### ScheduleGenericPolling
+- Added the *scheduledEntryGuid* argument to support the new ***GenericPolling*** playbook mechanism.

Packs/CommonScripts/Scripts/GenericPollingScheduledTask/GenericPollingScheduledTask.js

@@ -150,19 +150,28 @@ function genericPollingScheduledTaskWithoutGuid() {
 
 function genericPollingScheduledTaskWithGuid() {
     try {
-
-        if (invContext.RemainingPollingIteration == null || invContext.RemainingPollingIteration == undefined) {
-            setContext("RemainingPollingIteration", parseInt(args.timeout));
-        }
         var guid = args.scheduledEntryGuid;
-        var timeout = invContext.RemainingPollingIteration
-        var origTimeout = (parseInt(timeout) - parseInt(args.interval))
+        var contextTimeoutKey = `GP-${guid}`;
+        var timeout = parseInt(args.timeout);
+        var interval = parseInt(args.interval);
 
-        if (origTimeout <= 0) {
-            return finish(args.playbookId, args.tag, undefined, guid);
+        if ('playbookId' in args) {
+            const subPlaybook = `subplaybook-${args.playbookId}`;
+            if ((!invContext[subPlaybook][contextTimeoutKey]) && (invContext[subPlaybook][contextTimeoutKey] !== 0)) {
+                setContext(`${subPlaybook}.${contextTimeoutKey}`, (Math.floor(timeout / interval)));
+            }
+            else{
+                timeout = invContext[subPlaybook][contextTimeoutKey];
+            }
+            var origTimeout = timeout - interval;
+            if (origTimeout <= 0) {
+                return finish(args.playbookId, args.tag, undefined, guid);
+            }
+        setContext(`${subPlaybook}.${contextTimeoutKey}`, origTimeout);
+        }
+        else{
+            logError('playbookId is not defined');
         }
-
-        setContext("RemainingPollingIteration", origTimeout);
 
         // Get ids that have not finished yet
         var ids = argToList(args.ids);
@@ -224,7 +233,7 @@ function genericPollingScheduledTaskWithGuid() {
 
 function main() {
     res = getDemistoVersion();
-    platform = res.platform
+    platform = res.platform;
     version = res.version;
     buildNumber = res.buildNumber;
 

Packs/CommonScripts/Scripts/GenericPollingScheduledTask/GenericPollingScheduledTask.yml

@@ -42,6 +42,9 @@ args:
 - name: additionalPollingCommandArgValues
   description: Commas separated arguments values of the polling command
   isArray: true
+- name: scheduledEntryGuid
+  description: The GUID of the scheduled entry that runs the polling command.
+  type: textArea
 scripttarget: 0
 runonce: false
 tests:

Packs/CommonScripts/Scripts/ScheduleCommand/ScheduleCommand.yml

@@ -22,6 +22,9 @@ args:
     not provided. Optional. Format is 'Mon, 02 Jan 2006 15:04:05 MST'
 - name: times
   description: The number of times to run. Optional.
+- name: scheduledEntryGuid
+  description: The GUID of the scheduled entry that runs the polling command.
+  type: textArea
 scripttarget: 0
 dependson: {}
 timeout: 0s

Packs/CommonScripts/Scripts/ScheduleGenericPolling/ScheduleGenericPolling.yml

@@ -46,6 +46,9 @@ args:
 - name: additionalPollingCommandArgValues
   description: Values of the additional arguments for the polling command (e.g. value1,value2,...)
   isArray: true
+- name: scheduledEntryGuid
+  description: The GUID of the scheduled entry that runs the polling command.
+  type: textArea
 scripttarget: 0
 runonce: false
 tests:

Packs/CommonScripts/pack_metadata.json

@@ -2,7 +2,7 @@
     "name": "Common Scripts",
     "description": "Frequently used scripts pack.",
     "support": "xsoar",
-    "currentVersion": "1.11.67",
+    "currentVersion": "1.11.68",
     "author": "Cortex XSOAR",
     "url": "https://www.paloaltonetworks.com/cortex",
     "email": "",