diff --git a/Packs/CommonScripts/ReleaseNotes/1_11_23.md b/Packs/CommonScripts/ReleaseNotes/1_11_23.md new file mode 100644 index 000000000000..7a68d7d674ae --- /dev/null +++ b/Packs/CommonScripts/ReleaseNotes/1_11_23.md @@ -0,0 +1,4 @@ +#### Scripts +##### SearchIncidentsV2 +- Updated the Docker image to: *demisto/python3:3.10.10.47713*. +- Hid the trimevents argument. This argument is not supported in XSOAR. \ No newline at end of file diff --git a/Packs/CommonScripts/Scripts/SearchIncidentsV2/SearchIncidentsV2.py b/Packs/CommonScripts/Scripts/SearchIncidentsV2/SearchIncidentsV2.py index fba82616b810..29330897fc39 100644 --- a/Packs/CommonScripts/Scripts/SearchIncidentsV2/SearchIncidentsV2.py +++ b/Packs/CommonScripts/Scripts/SearchIncidentsV2/SearchIncidentsV2.py @@ -129,8 +129,13 @@ def search_incidents(args: Dict): # pragma: no cover to_date = todate.isoformat() args['todate'] = to_date - if args.get('trimevents') == '0': - args.pop('trimevents') + if args.get('trimevents'): + platform = demisto.demistoVersion().get('platform', 'xsoar') + if platform == 'xsoar' or platform == 'xsoar_hosted': + raise ValueError('The trimevents argument is not supported in XSOAR.') + + if args.get('trimevents') == '0': + args.pop('trimevents') platform = get_demisto_version().get('platform') diff --git a/Packs/CommonScripts/Scripts/SearchIncidentsV2/SearchIncidentsV2.yml b/Packs/CommonScripts/Scripts/SearchIncidentsV2/SearchIncidentsV2.yml index e0f6e84377ff..5d848d805c3d 100644 --- a/Packs/CommonScripts/Scripts/SearchIncidentsV2/SearchIncidentsV2.yml +++ b/Packs/CommonScripts/Scripts/SearchIncidentsV2/SearchIncidentsV2.yml @@ -109,7 +109,7 @@ args: name: trimevents required: false secret: false - defaultValue: '0' + hidden: true - default: false description: Number of incidents per page (per fetch) isArray: false @@ -202,7 +202,7 @@ tags: - Utility timeout: '0' type: python -dockerimage: demisto/python3:3.10.9.45313 +dockerimage: demisto/python3:3.10.10.47713 fromversion: 5.0.0 tests: - No tests (auto formatted) diff --git a/Packs/CommonScripts/Scripts/SearchIncidentsV2/SearchIncidentsV2_test.py b/Packs/CommonScripts/Scripts/SearchIncidentsV2/SearchIncidentsV2_test.py index d5980a3585ef..05f42213141c 100644 --- a/Packs/CommonScripts/Scripts/SearchIncidentsV2/SearchIncidentsV2_test.py +++ b/Packs/CommonScripts/Scripts/SearchIncidentsV2/SearchIncidentsV2_test.py @@ -152,6 +152,10 @@ def test_filter_events(mocker, args, filtered_args, expected_result): """ import SearchIncidentsV2 execute_mock = mocker.patch.object(SearchIncidentsV2, 'execute_command', side_effect=get_incidents_mock) + if 'trimevents' in args: + # trimevents supported only in XSIAM + mocker.patch.object(demisto, 'demistoVersion', return_value={'platform': 'xsiam'}) + _, res, _ = SearchIncidentsV2.search_incidents(args) assert res == expected_result assert execute_mock.call_count == 1 diff --git a/Packs/CommonScripts/pack_metadata.json b/Packs/CommonScripts/pack_metadata.json index 3fb196f5cd27..10d3cf040242 100644 --- a/Packs/CommonScripts/pack_metadata.json +++ b/Packs/CommonScripts/pack_metadata.json @@ -2,7 +2,7 @@ "name": "Common Scripts", "description": "Frequently used scripts pack.", "support": "xsoar", - "currentVersion": "1.11.22", + "currentVersion": "1.11.23", "author": "Cortex XSOAR", "url": "https://www.paloaltonetworks.com/cortex", "email": "",