From bcb977f09574deda591f74c62705504c8d76ed91 Mon Sep 17 00:00:00 2001
From: darkushin <61732335+darkushin@users.noreply.github.com>
Date: Thu, 8 Jun 2023 08:08:41 +0300
Subject: [PATCH] Xdrir fix polling timeout (#27238)

* XDRIR fix polling timeout parameter

* Added RNs
---
 Packs/ApiModules/Scripts/CoreIRApiModule/CoreIRApiModule.py | 3 ++-
 Packs/Core/ReleaseNotes/1_4_1.md                            | 6 ++++++
 Packs/Core/pack_metadata.json                               | 2 +-
 Packs/CortexXDR/ReleaseNotes/4_11_4.md                      | 6 ++++++
 Packs/CortexXDR/pack_metadata.json                          | 2 +-
 5 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 Packs/Core/ReleaseNotes/1_4_1.md
 create mode 100644 Packs/CortexXDR/ReleaseNotes/4_11_4.md

diff --git a/Packs/ApiModules/Scripts/CoreIRApiModule/CoreIRApiModule.py b/Packs/ApiModules/Scripts/CoreIRApiModule/CoreIRApiModule.py
index 2baa2a37a66e..83338602f179 100644
--- a/Packs/ApiModules/Scripts/CoreIRApiModule/CoreIRApiModule.py
+++ b/Packs/ApiModules/Scripts/CoreIRApiModule/CoreIRApiModule.py
@@ -2990,7 +2990,8 @@ def get_script_code_command(client: CoreClient, args: Dict[str, str]) -> Tuple[s
 @polling_function(
     name=demisto.command(),
     interval=arg_to_number(demisto.args().get('polling_interval_in_seconds', 10)),
-    timeout=arg_to_number(demisto.args().get('polling_timeout', 600)),
+    # Check for both 'polling_timeout_in_seconds' and 'polling_timeout' to avoid breaking BC:
+    timeout=arg_to_number(demisto.args().get('polling_timeout_in_seconds', demisto.args().get('polling_timeout', 600))),
     requires_polling_arg=False  # means it will always be default to poll, poll=true
 )
 def script_run_polling_command(args: dict, client: CoreClient) -> PollResult:
diff --git a/Packs/Core/ReleaseNotes/1_4_1.md b/Packs/Core/ReleaseNotes/1_4_1.md
new file mode 100644
index 000000000000..65be3e6076e9
--- /dev/null
+++ b/Packs/Core/ReleaseNotes/1_4_1.md
@@ -0,0 +1,6 @@
+
+#### Integrations
+
+##### Investigation & Response
+
+- Fixed an issue in the ***CoreIRApiModule***.
diff --git a/Packs/Core/pack_metadata.json b/Packs/Core/pack_metadata.json
index 349d4952d2fa..b2ec535163d7 100644
--- a/Packs/Core/pack_metadata.json
+++ b/Packs/Core/pack_metadata.json
@@ -2,7 +2,7 @@
     "name": "Core - Investigation and Response",
     "description": "Automates incident response",
     "support": "xsoar",
-    "currentVersion": "1.4.0",
+    "currentVersion": "1.4.1",
     "author": "Cortex XSOAR",
     "url": "https://www.paloaltonetworks.com/cortex",
     "email": "",
diff --git a/Packs/CortexXDR/ReleaseNotes/4_11_4.md b/Packs/CortexXDR/ReleaseNotes/4_11_4.md
new file mode 100644
index 000000000000..5c9d800e862a
--- /dev/null
+++ b/Packs/CortexXDR/ReleaseNotes/4_11_4.md
@@ -0,0 +1,6 @@
+
+#### Integrations
+
+##### Palo Alto Networks Cortex XDR - Investigation and Response
+
+- Fixed an issue in the ***xdr-script-run*** command where the polling timeout parameter was not handled correctly.
diff --git a/Packs/CortexXDR/pack_metadata.json b/Packs/CortexXDR/pack_metadata.json
index cbd13945564c..467ba7a2e117 100644
--- a/Packs/CortexXDR/pack_metadata.json
+++ b/Packs/CortexXDR/pack_metadata.json
@@ -2,7 +2,7 @@
     "name": "Cortex XDR by Palo Alto Networks",
     "description": "Automates Cortex XDR incident response, and includes custom Cortex XDR incident views and layouts to aid analyst investigations.",
     "support": "xsoar",
-    "currentVersion": "4.11.3",
+    "currentVersion": "4.11.4",
     "author": "Cortex XSOAR",
     "url": "https://www.paloaltonetworks.com/cortex",
     "email": "",