From 660603633d4cf3a56911ee3d3db2d473d25343c9 Mon Sep 17 00:00:00 2001 From: yrosenberg Date: Mon, 18 Nov 2024 17:08:53 +0200 Subject: [PATCH 01/24] rename --- .../Integrations/DemistoRESTAPI/DemistoRESTAPI.yml | 2 +- ...istoUploadFileV2-test.yml => playbook-UploadFile-test.yml} | 4 ++-- Tests/conf.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename Packs/DemistoRESTAPI/TestPlaybooks/{playbook-DemistoUploadFileV2-test.yml => playbook-UploadFile-test.yml} (99%) diff --git a/Packs/DemistoRESTAPI/Integrations/DemistoRESTAPI/DemistoRESTAPI.yml b/Packs/DemistoRESTAPI/Integrations/DemistoRESTAPI/DemistoRESTAPI.yml index cacdf168262e..dca270bda77d 100644 --- a/Packs/DemistoRESTAPI/Integrations/DemistoRESTAPI/DemistoRESTAPI.yml +++ b/Packs/DemistoRESTAPI/Integrations/DemistoRESTAPI/DemistoRESTAPI.yml @@ -136,7 +136,7 @@ script: - 'false' description: Upload packs to Demisto server from url or the marketplace. tests: -- DemistoUploadFileV2 Test +- UploadFile Test marketplaces: - xsoar fromversion: 5.0.0 diff --git a/Packs/DemistoRESTAPI/TestPlaybooks/playbook-DemistoUploadFileV2-test.yml b/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml similarity index 99% rename from Packs/DemistoRESTAPI/TestPlaybooks/playbook-DemistoUploadFileV2-test.yml rename to Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml index d8aad3f0da52..45c64650e288 100644 --- a/Packs/DemistoRESTAPI/TestPlaybooks/playbook-DemistoUploadFileV2-test.yml +++ b/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml @@ -1,6 +1,6 @@ -id: DemistoUploadFileV2 Test +id: UploadFile Test version: -1 -name: DemistoUploadFileV2 Test +name: UploadFile Test description: Test file uploading to incident with and without comments. starttaskid: "0" tasks: diff --git a/Tests/conf.json b/Tests/conf.json index bfb99d527bf2..08105ea3287d 100644 --- a/Tests/conf.json +++ b/Tests/conf.json @@ -2642,7 +2642,7 @@ "timeout": 500 }, { - "playbookID": "DemistoUploadFileV2 Test", + "playbookID": "UploadFile Test", "integrations": "Core REST API" }, { From f18c469336f99ff2c29ca23a48554a887270d0bb Mon Sep 17 00:00:00 2001 From: yrosenberg Date: Mon, 18 Nov 2024 18:16:11 +0200 Subject: [PATCH 02/24] fix --- .../playbook-UploadFile-test.yml | 140 ++++++++++++------ 1 file changed, 93 insertions(+), 47 deletions(-) diff --git a/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml b/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml index 45c64650e288..0e049a155c7f 100644 --- a/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml +++ b/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml @@ -1,24 +1,25 @@ id: UploadFile Test -version: -1 +version: 11 +vcShouldKeepItemLegacyProdMachine: false name: UploadFile Test description: Test file uploading to incident with and without comments. starttaskid: "0" tasks: "0": id: "0" - taskid: e2e243c0-7dba-4880-8ed9-542d59f39771 + taskid: 6bad2430-3999-4ce5-858a-a2034d1706ac type: start task: - id: e2e243c0-7dba-4880-8ed9-542d59f39771 + id: 6bad2430-3999-4ce5-858a-a2034d1706ac version: -1 name: "" iscommand: false brand: "" - description: '' nexttasks: '#none#': - "4" separatecontext: false + continueonerrortype: "" view: |- { "position": { @@ -35,10 +36,10 @@ tasks: isautoswitchedtoquietmode: false "1": id: "1" - taskid: 167b2a15-2ef5-497f-8f5c-3fc89fe16f2f + taskid: 0e6c28b4-80c4-49e8-84ce-03017f108f29 type: regular task: - id: 167b2a15-2ef5-497f-8f5c-3fc89fe16f2f + id: 0e6c28b4-80c4-49e8-84ce-03017f108f29 version: -1 name: Download Image and Add to Context scriptName: http @@ -60,6 +61,7 @@ tasks: url: simple: https://github.com/demisto/content/raw/master/xsoar_content_logo.png separatecontext: false + continueonerrortype: "" view: |- { "position": { @@ -76,14 +78,15 @@ tasks: isautoswitchedtoquietmode: false "2": id: "2" - taskid: af426c32-7d80-4ecf-8dcb-e968dcf708f0 + taskid: 32474d8a-9fbf-4e09-8553-41e360e33651 type: regular task: - id: af426c32-7d80-4ecf-8dcb-e968dcf708f0 + id: 32474d8a-9fbf-4e09-8553-41e360e33651 version: -1 name: Upload Downloaded File to War Room - description: Upload file from incident war room to another incident's war room - scriptName: DemistoUploadFileV2 + description: Copies a file from this incident to the specified incident. The + file is recorded as an entry in the specified incident’s War Room. + scriptName: UploadFile type: regular iscommand: false brand: "" @@ -104,15 +107,15 @@ tasks: value: simple: image.png accessor: EntryID - incidentID: - complex: - root: CreatedIncidentID + incID: + simple: ${CreatedIncidentID} separatecontext: false + continueonerrortype: "" view: |- { "position": { "x": 265, - "y": 720 + "y": 895 } } note: false @@ -124,10 +127,10 @@ tasks: isautoswitchedtoquietmode: false "3": id: "3" - taskid: 5d6925f4-2be8-42f6-88d0-79781f6257de + taskid: cdf7149e-1982-44ac-8222-9809a213b2f8 type: regular task: - id: 5d6925f4-2be8-42f6-88d0-79781f6257de + id: cdf7149e-1982-44ac-8222-9809a213b2f8 version: -1 name: createNewIncident description: Create a new incident @@ -137,11 +140,12 @@ tasks: brand: Builtin nexttasks: '#none#': - - "2" + - "12" scriptarguments: name: simple: DemistoUploadFile - test incident separatecontext: false + continueonerrortype: "" view: |- { "position": { @@ -158,10 +162,10 @@ tasks: isautoswitchedtoquietmode: false "4": id: "4" - taskid: f2955d34-c3c5-4f33-85cc-681497269e3a + taskid: 82c1c18a-4acb-482a-845a-33a80b7fe397 type: regular task: - id: f2955d34-c3c5-4f33-85cc-681497269e3a + id: 82c1c18a-4acb-482a-845a-33a80b7fe397 version: -1 name: DeleteContext description: Delete field from context @@ -176,6 +180,7 @@ tasks: all: simple: "yes" separatecontext: false + continueonerrortype: "" view: |- { "position": { @@ -192,10 +197,10 @@ tasks: isautoswitchedtoquietmode: false "5": id: "5" - taskid: 22cf566d-6872-4423-8c90-89d2daad3414 + taskid: 9b6abe42-2fdf-43c5-83f8-ab8ff4bae0d6 type: regular task: - id: 22cf566d-6872-4423-8c90-89d2daad3414 + id: 9b6abe42-2fdf-43c5-83f8-ab8ff4bae0d6 version: -1 name: getContext description: Retrieve context of another incident to be used in this script @@ -214,11 +219,12 @@ tasks: complex: root: CreatedIncidentID separatecontext: false + continueonerrortype: "" view: |- { "position": { "x": 265, - "y": 1070 + "y": 1245 } } note: false @@ -230,10 +236,10 @@ tasks: isautoswitchedtoquietmode: false "7": id: "7" - taskid: 300fe368-549c-448b-8c8c-a08a1a424642 + taskid: 10fa2f89-1377-4a86-88f4-6ec6ed3acdb3 type: condition task: - id: 300fe368-549c-448b-8c8c-a08a1a424642 + id: 10fa2f89-1377-4a86-88f4-6ec6ed3acdb3 version: -1 name: Verify upload was successful type: condition @@ -260,11 +266,12 @@ tasks: right: value: simple: Test Comment + continueonerrortype: "" view: |- { "position": { "x": 265, - "y": 1420 + "y": 1595 } } note: false @@ -276,22 +283,22 @@ tasks: isautoswitchedtoquietmode: false "8": id: "8" - taskid: f61691e3-3a54-4da3-8ea2-0a641f43d045 + taskid: 47ab951f-f906-4581-8894-2f03db7d83ab type: title task: - id: f61691e3-3a54-4da3-8ea2-0a641f43d045 + id: 47ab951f-f906-4581-8894-2f03db7d83ab version: -1 name: Done type: title iscommand: false brand: "" - description: '' separatecontext: false + continueonerrortype: "" view: |- { "position": { "x": 265, - "y": 1595 + "y": 1770 } } note: false @@ -303,14 +310,15 @@ tasks: isautoswitchedtoquietmode: false "9": id: "9" - taskid: d9164595-fd56-4046-8a5e-6f31de527050 + taskid: 09e905e7-1cfc-43af-835f-83b5021780c1 type: regular task: - id: d9164595-fd56-4046-8a5e-6f31de527050 + id: 09e905e7-1cfc-43af-835f-83b5021780c1 version: -1 name: Upload Downloaded File to War Room with a Comment - description: Upload file from incident war room to another incident's war room - scriptName: DemistoUploadFileV2 + description: Copies a file from this incident to the specified incident. The + file is recorded as an entry in the specified incident’s War Room. + scriptName: UploadFile type: regular iscommand: false brand: "" @@ -333,15 +341,15 @@ tasks: value: simple: image.png accessor: EntryID - incidentID: - complex: - root: CreatedIncidentID + incID: + simple: ${CreatedIncidentID} separatecontext: false + continueonerrortype: "" view: |- { "position": { "x": 265, - "y": 895 + "y": 1070 } } note: false @@ -353,10 +361,10 @@ tasks: isautoswitchedtoquietmode: false "10": id: "10" - taskid: e75bc7e0-d549-4632-81f2-a03312c6d601 + taskid: 6d8f77c0-901f-4f48-8ab9-29d32c0dfe92 type: regular task: - id: e75bc7e0-d549-4632-81f2-a03312c6d601 + id: 6d8f77c0-901f-4f48-8ab9-29d32c0dfe92 version: -1 name: Get File Comment (File With Comment) description: send HTTP GET requests @@ -394,11 +402,12 @@ tasks: simple: /entry/load/ suffix: {} separatecontext: false + continueonerrortype: "" view: |- { "position": { - "x": 480, - "y": 1245 + "x": 50, + "y": 1420 } } note: false @@ -410,10 +419,10 @@ tasks: isautoswitchedtoquietmode: false "11": id: "11" - taskid: 1e7a050f-e396-40a3-842f-dd7aeef10c9c + taskid: 67b6c3bb-b4fd-4f06-8247-c5695db0f2db type: regular task: - id: 1e7a050f-e396-40a3-842f-dd7aeef10c9c + id: 67b6c3bb-b4fd-4f06-8247-c5695db0f2db version: -1 name: Get File Comment (File Without Comment) description: send HTTP GET requests @@ -451,11 +460,48 @@ tasks: simple: /entry/load/ suffix: {} separatecontext: false + continueonerrortype: "" view: |- { "position": { - "x": 50, - "y": 1245 + "x": 480, + "y": 1420 + } + } + note: false + timertriggers: [] + ignoreworker: false + skipunavailable: false + quietmode: 0 + isoversize: false + isautoswitchedtoquietmode: false + "12": + id: "12" + taskid: ebdc29c5-99c1-4a4b-8d4d-141b65fde9b4 + type: regular + task: + id: ebdc29c5-99c1-4a4b-8d4d-141b65fde9b4 + version: -1 + name: Activate the incident investigation + script: investigate + type: regular + iscommand: false + brand: "" + nexttasks: + '#none#': + - "2" + scriptarguments: + id: + complex: + root: CreatedIncidentID + separatecontext: false + continueonerror: true + continueonerrortype: "" + view: |- + { + "position": { + "x": 265, + "y": 720 } } note: false @@ -470,7 +516,7 @@ view: |- "linkLabelsPosition": {}, "paper": { "dimensions": { - "height": 1610, + "height": 1785, "width": 810, "x": 50, "y": 50 @@ -479,4 +525,4 @@ view: |- } inputs: [] outputs: [] -fromversion: 6.0.0 +dirtyInputs: true From c56c236df4f2a2eeaffa98ecccb0697178877f2b Mon Sep 17 00:00:00 2001 From: yrosenberg Date: Mon, 18 Nov 2024 18:17:53 +0200 Subject: [PATCH 03/24] format --- .../TestPlaybooks/playbook-UploadFile-test.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml b/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml index 0e049a155c7f..230c1cf0df30 100644 --- a/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml +++ b/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml @@ -1,6 +1,5 @@ id: UploadFile Test -version: 11 -vcShouldKeepItemLegacyProdMachine: false +version: -1 name: UploadFile Test description: Test file uploading to incident with and without comments. starttaskid: "0" @@ -15,6 +14,7 @@ tasks: name: "" iscommand: false brand: "" + description: '' nexttasks: '#none#': - "4" @@ -84,8 +84,7 @@ tasks: id: 32474d8a-9fbf-4e09-8553-41e360e33651 version: -1 name: Upload Downloaded File to War Room - description: Copies a file from this incident to the specified incident. The - file is recorded as an entry in the specified incident’s War Room. + description: Copies a file from this incident to the specified incident. The file is recorded as an entry in the specified incident’s War Room. scriptName: UploadFile type: regular iscommand: false @@ -292,6 +291,7 @@ tasks: type: title iscommand: false brand: "" + description: '' separatecontext: false continueonerrortype: "" view: |- @@ -316,8 +316,7 @@ tasks: id: 09e905e7-1cfc-43af-835f-83b5021780c1 version: -1 name: Upload Downloaded File to War Room with a Comment - description: Copies a file from this incident to the specified incident. The - file is recorded as an entry in the specified incident’s War Room. + description: Copies a file from this incident to the specified incident. The file is recorded as an entry in the specified incident’s War Room. scriptName: UploadFile type: regular iscommand: false @@ -525,4 +524,4 @@ view: |- } inputs: [] outputs: [] -dirtyInputs: true +fromversion: 6.0.0 From 3b538e2859a195bcdfb1cc165f4a9e5d84e85903 Mon Sep 17 00:00:00 2001 From: yrosenberg Date: Mon, 18 Nov 2024 18:22:23 +0200 Subject: [PATCH 04/24] rn --- Packs/DemistoRESTAPI/ReleaseNotes/1_3_64.md | 6 ++++++ Packs/DemistoRESTAPI/pack_metadata.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 Packs/DemistoRESTAPI/ReleaseNotes/1_3_64.md diff --git a/Packs/DemistoRESTAPI/ReleaseNotes/1_3_64.md b/Packs/DemistoRESTAPI/ReleaseNotes/1_3_64.md new file mode 100644 index 000000000000..28c1446c2669 --- /dev/null +++ b/Packs/DemistoRESTAPI/ReleaseNotes/1_3_64.md @@ -0,0 +1,6 @@ + +#### Integrations + +##### Demisto REST API (Deprecated) + +Internal code improvements \ No newline at end of file diff --git a/Packs/DemistoRESTAPI/pack_metadata.json b/Packs/DemistoRESTAPI/pack_metadata.json index 7af625ab3d0d..44a174d2fb33 100644 --- a/Packs/DemistoRESTAPI/pack_metadata.json +++ b/Packs/DemistoRESTAPI/pack_metadata.json @@ -2,7 +2,7 @@ "name": "Cortex REST API", "description": "Use Demisto REST APIs", "support": "xsoar", - "currentVersion": "1.3.63", + "currentVersion": "1.3.64", "author": "Cortex XSOAR", "url": "https://www.paloaltonetworks.com/cortex", "email": "", From 78e20d5533e04058019158807baaa76fbdff1530 Mon Sep 17 00:00:00 2001 From: yrosenberg Date: Mon, 18 Nov 2024 21:21:58 +0200 Subject: [PATCH 05/24] try --- .../playbook-UploadFile-test.yml | 72 ++++++++++++++++++- 1 file changed, 71 insertions(+), 1 deletion(-) diff --git a/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml b/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml index 230c1cf0df30..1f1ce074a2f8 100644 --- a/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml +++ b/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml @@ -488,7 +488,7 @@ tasks: brand: "" nexttasks: '#none#': - - "2" + - "14" scriptarguments: id: complex: @@ -496,6 +496,41 @@ tasks: separatecontext: false continueonerror: true continueonerrortype: "" + view: |- + { + "position": { + "x": 265, + "y": 895 + } + } + note: false + timertriggers: [] + ignoreworker: false + skipunavailable: false + quietmode: 0 + isoversize: false + isautoswitchedtoquietmode: false + "13": + id: "13" + taskid: 2c33240d-d7f2-43f7-88b7-4be76c4e939f + type: regular + task: + id: 2c33240d-d7f2-43f7-88b7-4be76c4e939f + version: -1 + name: Sleep 20 sec + description: Sleep for X seconds. + scriptName: Sleep + type: regular + iscommand: false + brand: "" + nexttasks: + '#none#': + - "12" + scriptarguments: + seconds: + simple: "20" + separatecontext: false + continueonerrortype: "" view: |- { "position": { @@ -510,6 +545,41 @@ tasks: quietmode: 0 isoversize: false isautoswitchedtoquietmode: false + "14": + id: "14" + taskid: a52f0945-dd15-414f-8a74-4be252f9f878 + type: regular + task: + id: a52f0945-dd15-414f-8a74-4be252f9f878 + version: -1 + name: Sleep 20 sec + description: Sleep for X seconds. + scriptName: Sleep + type: regular + iscommand: false + brand: "" + nexttasks: + '#none#': + - "2" + scriptarguments: + seconds: + simple: "20" + separatecontext: false + continueonerrortype: "" + view: |- + { + "position": { + "x": 265, + "y": 1070 + } + } + note: false + timertriggers: [] + ignoreworker: false + skipunavailable: false + quietmode: 0 + isoversize: false + isautoswitchedtoquietmode: false view: |- { "linkLabelsPosition": {}, From 00be014ef2520fdf8b897443d9ac7450e64db1f5 Mon Sep 17 00:00:00 2001 From: yrosenberg Date: Mon, 18 Nov 2024 22:51:14 +0200 Subject: [PATCH 06/24] try --- .../playbook-UploadFile-test.yml | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml b/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml index 1f1ce074a2f8..86a305bb1265 100644 --- a/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml +++ b/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml @@ -126,10 +126,10 @@ tasks: isautoswitchedtoquietmode: false "3": id: "3" - taskid: cdf7149e-1982-44ac-8222-9809a213b2f8 + taskid: 4e80eafd-7bf1-439c-8e5e-e40ef7144461 type: regular task: - id: cdf7149e-1982-44ac-8222-9809a213b2f8 + id: 4e80eafd-7bf1-439c-8e5e-e40ef7144461 version: -1 name: createNewIncident description: Create a new incident @@ -139,7 +139,7 @@ tasks: brand: Builtin nexttasks: '#none#': - - "12" + - "13" scriptarguments: name: simple: DemistoUploadFile - test incident @@ -161,10 +161,10 @@ tasks: isautoswitchedtoquietmode: false "4": id: "4" - taskid: 82c1c18a-4acb-482a-845a-33a80b7fe397 + taskid: f5c1b3a8-15dc-4125-826e-c8662cab7e2f type: regular task: - id: 82c1c18a-4acb-482a-845a-33a80b7fe397 + id: f5c1b3a8-15dc-4125-826e-c8662cab7e2f version: -1 name: DeleteContext description: Delete field from context @@ -196,10 +196,10 @@ tasks: isautoswitchedtoquietmode: false "5": id: "5" - taskid: 9b6abe42-2fdf-43c5-83f8-ab8ff4bae0d6 + taskid: 630de333-ec32-4b9d-8168-114a6eaa4721 type: regular task: - id: 9b6abe42-2fdf-43c5-83f8-ab8ff4bae0d6 + id: 630de333-ec32-4b9d-8168-114a6eaa4721 version: -1 name: getContext description: Retrieve context of another incident to be used in this script @@ -223,7 +223,7 @@ tasks: { "position": { "x": 265, - "y": 1245 + "y": 1595 } } note: false @@ -235,10 +235,10 @@ tasks: isautoswitchedtoquietmode: false "7": id: "7" - taskid: 10fa2f89-1377-4a86-88f4-6ec6ed3acdb3 + taskid: 765a4b8a-e04c-4286-8a7e-b2695fefd2fc type: condition task: - id: 10fa2f89-1377-4a86-88f4-6ec6ed3acdb3 + id: 765a4b8a-e04c-4286-8a7e-b2695fefd2fc version: -1 name: Verify upload was successful type: condition @@ -270,7 +270,7 @@ tasks: { "position": { "x": 265, - "y": 1595 + "y": 1945 } } note: false @@ -282,23 +282,22 @@ tasks: isautoswitchedtoquietmode: false "8": id: "8" - taskid: 47ab951f-f906-4581-8894-2f03db7d83ab + taskid: add6a00a-fc13-41bb-879e-e825d394a3e2 type: title task: - id: 47ab951f-f906-4581-8894-2f03db7d83ab + id: add6a00a-fc13-41bb-879e-e825d394a3e2 version: -1 name: Done type: title iscommand: false brand: "" - description: '' separatecontext: false continueonerrortype: "" view: |- { "position": { "x": 265, - "y": 1770 + "y": 2120 } } note: false @@ -310,13 +309,14 @@ tasks: isautoswitchedtoquietmode: false "9": id: "9" - taskid: 09e905e7-1cfc-43af-835f-83b5021780c1 + taskid: d6dba1ba-4af6-41cc-8cd9-2aa3d8fe6c8c type: regular task: - id: 09e905e7-1cfc-43af-835f-83b5021780c1 + id: d6dba1ba-4af6-41cc-8cd9-2aa3d8fe6c8c version: -1 name: Upload Downloaded File to War Room with a Comment - description: Copies a file from this incident to the specified incident. The file is recorded as an entry in the specified incident’s War Room. + description: Copies a file from this incident to the specified incident. The + file is recorded as an entry in the specified incident’s War Room. scriptName: UploadFile type: regular iscommand: false @@ -348,7 +348,7 @@ tasks: { "position": { "x": 265, - "y": 1070 + "y": 1420 } } note: false @@ -360,10 +360,10 @@ tasks: isautoswitchedtoquietmode: false "10": id: "10" - taskid: 6d8f77c0-901f-4f48-8ab9-29d32c0dfe92 + taskid: b1d80a37-bd3e-4728-826c-7447425cbf5d type: regular task: - id: 6d8f77c0-901f-4f48-8ab9-29d32c0dfe92 + id: b1d80a37-bd3e-4728-826c-7447425cbf5d version: -1 name: Get File Comment (File With Comment) description: send HTTP GET requests @@ -406,7 +406,7 @@ tasks: { "position": { "x": 50, - "y": 1420 + "y": 1770 } } note: false @@ -418,10 +418,10 @@ tasks: isautoswitchedtoquietmode: false "11": id: "11" - taskid: 67b6c3bb-b4fd-4f06-8247-c5695db0f2db + taskid: ba44f3e1-3c23-4710-8591-476c81d1a27c type: regular task: - id: 67b6c3bb-b4fd-4f06-8247-c5695db0f2db + id: ba44f3e1-3c23-4710-8591-476c81d1a27c version: -1 name: Get File Comment (File Without Comment) description: send HTTP GET requests @@ -464,7 +464,7 @@ tasks: { "position": { "x": 480, - "y": 1420 + "y": 1770 } } note: false @@ -476,10 +476,10 @@ tasks: isautoswitchedtoquietmode: false "12": id: "12" - taskid: ebdc29c5-99c1-4a4b-8d4d-141b65fde9b4 + taskid: 359b53c1-e074-41a8-87cc-7b1aeaa63a21 type: regular task: - id: ebdc29c5-99c1-4a4b-8d4d-141b65fde9b4 + id: 359b53c1-e074-41a8-87cc-7b1aeaa63a21 version: -1 name: Activate the incident investigation script: investigate @@ -512,10 +512,10 @@ tasks: isautoswitchedtoquietmode: false "13": id: "13" - taskid: 2c33240d-d7f2-43f7-88b7-4be76c4e939f + taskid: c32cf7ff-a039-48ae-85f5-c75213f17f84 type: regular task: - id: 2c33240d-d7f2-43f7-88b7-4be76c4e939f + id: c32cf7ff-a039-48ae-85f5-c75213f17f84 version: -1 name: Sleep 20 sec description: Sleep for X seconds. @@ -547,10 +547,10 @@ tasks: isautoswitchedtoquietmode: false "14": id: "14" - taskid: a52f0945-dd15-414f-8a74-4be252f9f878 + taskid: 2b1b2f87-7b71-4b06-8515-1a7b20d229af type: regular task: - id: a52f0945-dd15-414f-8a74-4be252f9f878 + id: 2b1b2f87-7b71-4b06-8515-1a7b20d229af version: -1 name: Sleep 20 sec description: Sleep for X seconds. @@ -585,7 +585,7 @@ view: |- "linkLabelsPosition": {}, "paper": { "dimensions": { - "height": 1785, + "height": 2135, "width": 810, "x": 50, "y": 50 From 4e8c6b6fbdce1373397266355e3034f3f009e176 Mon Sep 17 00:00:00 2001 From: yrosenberg Date: Mon, 18 Nov 2024 22:53:29 +0200 Subject: [PATCH 07/24] fix --- .../TestPlaybooks/playbook-UploadFile-test.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml b/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml index 86a305bb1265..667c4ea98c61 100644 --- a/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml +++ b/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml @@ -6,10 +6,10 @@ starttaskid: "0" tasks: "0": id: "0" - taskid: 6bad2430-3999-4ce5-858a-a2034d1706ac + taskid: db29b3d5-bcdf-40bc-8fb8-902d43caba73 type: start task: - id: 6bad2430-3999-4ce5-858a-a2034d1706ac + id: db29b3d5-bcdf-40bc-8fb8-902d43caba73 version: -1 name: "" iscommand: false @@ -36,10 +36,10 @@ tasks: isautoswitchedtoquietmode: false "1": id: "1" - taskid: 0e6c28b4-80c4-49e8-84ce-03017f108f29 + taskid: 940b6990-2b71-448f-8f05-f46267433c55 type: regular task: - id: 0e6c28b4-80c4-49e8-84ce-03017f108f29 + id: 940b6990-2b71-448f-8f05-f46267433c55 version: -1 name: Download Image and Add to Context scriptName: http @@ -78,10 +78,10 @@ tasks: isautoswitchedtoquietmode: false "2": id: "2" - taskid: 32474d8a-9fbf-4e09-8553-41e360e33651 + taskid: 1494360f-0e1e-4495-8e11-3fc818bb98aa type: regular task: - id: 32474d8a-9fbf-4e09-8553-41e360e33651 + id: 1494360f-0e1e-4495-8e11-3fc818bb98aa version: -1 name: Upload Downloaded File to War Room description: Copies a file from this incident to the specified incident. The file is recorded as an entry in the specified incident’s War Room. @@ -114,7 +114,7 @@ tasks: { "position": { "x": 265, - "y": 895 + "y": 1245 } } note: false @@ -291,6 +291,7 @@ tasks: type: title iscommand: false brand: "" + description: '' separatecontext: false continueonerrortype: "" view: |- @@ -315,8 +316,7 @@ tasks: id: d6dba1ba-4af6-41cc-8cd9-2aa3d8fe6c8c version: -1 name: Upload Downloaded File to War Room with a Comment - description: Copies a file from this incident to the specified incident. The - file is recorded as an entry in the specified incident’s War Room. + description: Copies a file from this incident to the specified incident. The file is recorded as an entry in the specified incident’s War Room. scriptName: UploadFile type: regular iscommand: false From 4a662d44b3586939a21549eaaa178de6287e11cd Mon Sep 17 00:00:00 2001 From: yrosenberg Date: Tue, 19 Nov 2024 10:55:22 +0200 Subject: [PATCH 08/24] add comment --- Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml b/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml index 667c4ea98c61..a7d018e9a9b0 100644 --- a/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml +++ b/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml @@ -481,7 +481,7 @@ tasks: task: id: 359b53c1-e074-41a8-87cc-7b1aeaa63a21 version: -1 - name: Activate the incident investigation + name: Activate the incident investigation (allow failure) script: investigate type: regular iscommand: false From 30efaf7e76065c6fc434fb75e7d47c1008d83c94 Mon Sep 17 00:00:00 2001 From: yrosenberg Date: Wed, 20 Nov 2024 19:19:06 +0200 Subject: [PATCH 09/24] try --- .../playbook-UploadFile-test.yml | 147 +++++------------- 1 file changed, 39 insertions(+), 108 deletions(-) diff --git a/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml b/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml index a7d018e9a9b0..5040b94dd6db 100644 --- a/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml +++ b/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml @@ -6,15 +6,14 @@ starttaskid: "0" tasks: "0": id: "0" - taskid: db29b3d5-bcdf-40bc-8fb8-902d43caba73 + taskid: 59df6007-31bf-47f5-84fc-2f47f1848392 type: start task: - id: db29b3d5-bcdf-40bc-8fb8-902d43caba73 + id: 59df6007-31bf-47f5-84fc-2f47f1848392 version: -1 name: "" iscommand: false brand: "" - description: '' nexttasks: '#none#': - "4" @@ -36,10 +35,10 @@ tasks: isautoswitchedtoquietmode: false "1": id: "1" - taskid: 940b6990-2b71-448f-8f05-f46267433c55 + taskid: 9c0484b4-cfaf-4eee-88c6-ee6e3028ed15 type: regular task: - id: 940b6990-2b71-448f-8f05-f46267433c55 + id: 9c0484b4-cfaf-4eee-88c6-ee6e3028ed15 version: -1 name: Download Image and Add to Context scriptName: http @@ -78,13 +77,14 @@ tasks: isautoswitchedtoquietmode: false "2": id: "2" - taskid: 1494360f-0e1e-4495-8e11-3fc818bb98aa + taskid: 727d975a-97f7-4e65-809f-31aae5450fe4 type: regular task: - id: 1494360f-0e1e-4495-8e11-3fc818bb98aa + id: 727d975a-97f7-4e65-809f-31aae5450fe4 version: -1 name: Upload Downloaded File to War Room - description: Copies a file from this incident to the specified incident. The file is recorded as an entry in the specified incident’s War Room. + description: Copies a file from this incident to the specified incident. The + file is recorded as an entry in the specified incident’s War Room. scriptName: UploadFile type: regular iscommand: false @@ -114,7 +114,7 @@ tasks: { "position": { "x": 265, - "y": 1245 + "y": 895 } } note: false @@ -126,10 +126,10 @@ tasks: isautoswitchedtoquietmode: false "3": id: "3" - taskid: 4e80eafd-7bf1-439c-8e5e-e40ef7144461 + taskid: a24fa9ad-a067-4785-86c5-03a710f701bd type: regular task: - id: 4e80eafd-7bf1-439c-8e5e-e40ef7144461 + id: a24fa9ad-a067-4785-86c5-03a710f701bd version: -1 name: createNewIncident description: Create a new incident @@ -143,6 +143,8 @@ tasks: scriptarguments: name: simple: DemistoUploadFile - test incident + type: + simple: Hello World Alert separatecontext: false continueonerrortype: "" view: |- @@ -161,10 +163,10 @@ tasks: isautoswitchedtoquietmode: false "4": id: "4" - taskid: f5c1b3a8-15dc-4125-826e-c8662cab7e2f + taskid: 1ebafcaf-f6ef-438f-8a17-ea4010fcdc3d type: regular task: - id: f5c1b3a8-15dc-4125-826e-c8662cab7e2f + id: 1ebafcaf-f6ef-438f-8a17-ea4010fcdc3d version: -1 name: DeleteContext description: Delete field from context @@ -196,10 +198,10 @@ tasks: isautoswitchedtoquietmode: false "5": id: "5" - taskid: 630de333-ec32-4b9d-8168-114a6eaa4721 + taskid: d6301ab6-5e91-49eb-8bb8-c88c097e4165 type: regular task: - id: 630de333-ec32-4b9d-8168-114a6eaa4721 + id: d6301ab6-5e91-49eb-8bb8-c88c097e4165 version: -1 name: getContext description: Retrieve context of another incident to be used in this script @@ -223,7 +225,7 @@ tasks: { "position": { "x": 265, - "y": 1595 + "y": 1245 } } note: false @@ -235,10 +237,10 @@ tasks: isautoswitchedtoquietmode: false "7": id: "7" - taskid: 765a4b8a-e04c-4286-8a7e-b2695fefd2fc + taskid: b95f9c94-4b9e-4488-84cf-201e0f0ab7fa type: condition task: - id: 765a4b8a-e04c-4286-8a7e-b2695fefd2fc + id: b95f9c94-4b9e-4488-84cf-201e0f0ab7fa version: -1 name: Verify upload was successful type: condition @@ -270,7 +272,7 @@ tasks: { "position": { "x": 265, - "y": 1945 + "y": 1595 } } note: false @@ -282,23 +284,22 @@ tasks: isautoswitchedtoquietmode: false "8": id: "8" - taskid: add6a00a-fc13-41bb-879e-e825d394a3e2 + taskid: 6ed2b841-1259-4d02-815a-7a11ccec5e6b type: title task: - id: add6a00a-fc13-41bb-879e-e825d394a3e2 + id: 6ed2b841-1259-4d02-815a-7a11ccec5e6b version: -1 name: Done type: title iscommand: false brand: "" - description: '' separatecontext: false continueonerrortype: "" view: |- { "position": { "x": 265, - "y": 2120 + "y": 1770 } } note: false @@ -310,13 +311,14 @@ tasks: isautoswitchedtoquietmode: false "9": id: "9" - taskid: d6dba1ba-4af6-41cc-8cd9-2aa3d8fe6c8c + taskid: f208b0b8-5d70-4fa5-8393-fe513904142e type: regular task: - id: d6dba1ba-4af6-41cc-8cd9-2aa3d8fe6c8c + id: f208b0b8-5d70-4fa5-8393-fe513904142e version: -1 name: Upload Downloaded File to War Room with a Comment - description: Copies a file from this incident to the specified incident. The file is recorded as an entry in the specified incident’s War Room. + description: Copies a file from this incident to the specified incident. The + file is recorded as an entry in the specified incident’s War Room. scriptName: UploadFile type: regular iscommand: false @@ -348,7 +350,7 @@ tasks: { "position": { "x": 265, - "y": 1420 + "y": 1070 } } note: false @@ -360,10 +362,10 @@ tasks: isautoswitchedtoquietmode: false "10": id: "10" - taskid: b1d80a37-bd3e-4728-826c-7447425cbf5d + taskid: 7b98e101-3d8f-4d20-8490-227da931bf65 type: regular task: - id: b1d80a37-bd3e-4728-826c-7447425cbf5d + id: 7b98e101-3d8f-4d20-8490-227da931bf65 version: -1 name: Get File Comment (File With Comment) description: send HTTP GET requests @@ -406,7 +408,7 @@ tasks: { "position": { "x": 50, - "y": 1770 + "y": 1420 } } note: false @@ -418,10 +420,10 @@ tasks: isautoswitchedtoquietmode: false "11": id: "11" - taskid: ba44f3e1-3c23-4710-8591-476c81d1a27c + taskid: 57157ab4-6d8c-45da-892b-2956d3ab8a7e type: regular task: - id: ba44f3e1-3c23-4710-8591-476c81d1a27c + id: 57157ab4-6d8c-45da-892b-2956d3ab8a7e version: -1 name: Get File Comment (File Without Comment) description: send HTTP GET requests @@ -464,43 +466,7 @@ tasks: { "position": { "x": 480, - "y": 1770 - } - } - note: false - timertriggers: [] - ignoreworker: false - skipunavailable: false - quietmode: 0 - isoversize: false - isautoswitchedtoquietmode: false - "12": - id: "12" - taskid: 359b53c1-e074-41a8-87cc-7b1aeaa63a21 - type: regular - task: - id: 359b53c1-e074-41a8-87cc-7b1aeaa63a21 - version: -1 - name: Activate the incident investigation (allow failure) - script: investigate - type: regular - iscommand: false - brand: "" - nexttasks: - '#none#': - - "14" - scriptarguments: - id: - complex: - root: CreatedIncidentID - separatecontext: false - continueonerror: true - continueonerrortype: "" - view: |- - { - "position": { - "x": 265, - "y": 895 + "y": 1420 } } note: false @@ -512,45 +478,10 @@ tasks: isautoswitchedtoquietmode: false "13": id: "13" - taskid: c32cf7ff-a039-48ae-85f5-c75213f17f84 - type: regular - task: - id: c32cf7ff-a039-48ae-85f5-c75213f17f84 - version: -1 - name: Sleep 20 sec - description: Sleep for X seconds. - scriptName: Sleep - type: regular - iscommand: false - brand: "" - nexttasks: - '#none#': - - "12" - scriptarguments: - seconds: - simple: "20" - separatecontext: false - continueonerrortype: "" - view: |- - { - "position": { - "x": 265, - "y": 720 - } - } - note: false - timertriggers: [] - ignoreworker: false - skipunavailable: false - quietmode: 0 - isoversize: false - isautoswitchedtoquietmode: false - "14": - id: "14" - taskid: 2b1b2f87-7b71-4b06-8515-1a7b20d229af + taskid: 0df5d40a-3f2e-4d53-85b2-8e2547aaa981 type: regular task: - id: 2b1b2f87-7b71-4b06-8515-1a7b20d229af + id: 0df5d40a-3f2e-4d53-85b2-8e2547aaa981 version: -1 name: Sleep 20 sec description: Sleep for X seconds. @@ -570,7 +501,7 @@ tasks: { "position": { "x": 265, - "y": 1070 + "y": 720 } } note: false @@ -585,7 +516,7 @@ view: |- "linkLabelsPosition": {}, "paper": { "dimensions": { - "height": 2135, + "height": 1785, "width": 810, "x": 50, "y": 50 From d6a698978a28b436176cb858ac434c1b43544772 Mon Sep 17 00:00:00 2001 From: yrosenberg Date: Wed, 20 Nov 2024 19:20:21 +0200 Subject: [PATCH 10/24] add HelloWorld --- Tests/conf.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Tests/conf.json b/Tests/conf.json index 08105ea3287d..d5a60be2f464 100644 --- a/Tests/conf.json +++ b/Tests/conf.json @@ -2643,7 +2643,8 @@ }, { "playbookID": "UploadFile Test", - "integrations": "Core REST API" + "integrations": "Core REST API", + "intgration": "HelloWorld" }, { "playbookID": "MaxMind Test", From 0e928435db064f87fb664b02dddb25cd17d4a751 Mon Sep 17 00:00:00 2001 From: yrosenberg Date: Wed, 20 Nov 2024 21:19:56 +0200 Subject: [PATCH 11/24] fix --- Tests/conf.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tests/conf.json b/Tests/conf.json index d5a60be2f464..fa3e7a8282f0 100644 --- a/Tests/conf.json +++ b/Tests/conf.json @@ -2643,8 +2643,8 @@ }, { "playbookID": "UploadFile Test", - "integrations": "Core REST API", - "intgration": "HelloWorld" + "integrations": ["Core REST API", + "HelloWorld"] }, { "playbookID": "MaxMind Test", From 849ba8f1341f98c121a89d700e3db474c71de730 Mon Sep 17 00:00:00 2001 From: yrosenberg Date: Wed, 20 Nov 2024 23:15:57 +0200 Subject: [PATCH 12/24] fix --- Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml | 2 +- Tests/conf.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml b/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml index 5040b94dd6db..bf91e9ea7464 100644 --- a/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml +++ b/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml @@ -144,7 +144,7 @@ tasks: name: simple: DemistoUploadFile - test incident type: - simple: Hello World Alert + simple: Xpanse Alert separatecontext: false continueonerrortype: "" view: |- diff --git a/Tests/conf.json b/Tests/conf.json index fa3e7a8282f0..dcd7d5f78c39 100644 --- a/Tests/conf.json +++ b/Tests/conf.json @@ -2644,7 +2644,7 @@ { "playbookID": "UploadFile Test", "integrations": ["Core REST API", - "HelloWorld"] + "Cortex Xpanse"] }, { "playbookID": "MaxMind Test", From 3a66d8733f6c2c12d09b91fcf6834bb69389909a Mon Sep 17 00:00:00 2001 From: yrosenberg Date: Thu, 21 Nov 2024 09:57:05 +0200 Subject: [PATCH 13/24] fix --- Packs/DemistoRESTAPI/Integrations/CoreRESTAPI/CoreRESTAPI.yml | 1 + .../Integrations/DemistoRESTAPI/DemistoRESTAPI.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Packs/DemistoRESTAPI/Integrations/CoreRESTAPI/CoreRESTAPI.yml b/Packs/DemistoRESTAPI/Integrations/CoreRESTAPI/CoreRESTAPI.yml index adeeb20ff301..216cba6d7b28 100644 --- a/Packs/DemistoRESTAPI/Integrations/CoreRESTAPI/CoreRESTAPI.yml +++ b/Packs/DemistoRESTAPI/Integrations/CoreRESTAPI/CoreRESTAPI.yml @@ -281,4 +281,5 @@ script: contextPath: IsFileExists tests: - TestDemistoRestAPI +- UploadFile Test fromversion: 5.0.0 diff --git a/Packs/DemistoRESTAPI/Integrations/DemistoRESTAPI/DemistoRESTAPI.yml b/Packs/DemistoRESTAPI/Integrations/DemistoRESTAPI/DemistoRESTAPI.yml index dca270bda77d..5c66ce952c67 100644 --- a/Packs/DemistoRESTAPI/Integrations/DemistoRESTAPI/DemistoRESTAPI.yml +++ b/Packs/DemistoRESTAPI/Integrations/DemistoRESTAPI/DemistoRESTAPI.yml @@ -136,7 +136,7 @@ script: - 'false' description: Upload packs to Demisto server from url or the marketplace. tests: -- UploadFile Test +- No tests (auto formatted) marketplaces: - xsoar fromversion: 5.0.0 From cca6ed8833e3a3dbc55e9dca0fb4a5539a2ae7ff Mon Sep 17 00:00:00 2001 From: yrosenberg Date: Thu, 21 Nov 2024 10:28:59 +0200 Subject: [PATCH 14/24] try --- Tests/conf.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/conf.json b/Tests/conf.json index dcd7d5f78c39..59a6074fe865 100644 --- a/Tests/conf.json +++ b/Tests/conf.json @@ -2644,7 +2644,7 @@ { "playbookID": "UploadFile Test", "integrations": ["Core REST API", - "Cortex Xpanse"] + "QRadar v3"] }, { "playbookID": "MaxMind Test", From 247ba3338d6181bae195e8dde896036d17ce9727 Mon Sep 17 00:00:00 2001 From: yrosenberg Date: Thu, 21 Nov 2024 10:29:18 +0200 Subject: [PATCH 15/24] try --- Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml b/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml index bf91e9ea7464..d574e8800fe9 100644 --- a/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml +++ b/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml @@ -144,7 +144,7 @@ tasks: name: simple: DemistoUploadFile - test incident type: - simple: Xpanse Alert + simple: Qradar Generic separatecontext: false continueonerrortype: "" view: |- From bb65f08f787c1c639cc45afcacf9200cec46dbd9 Mon Sep 17 00:00:00 2001 From: yrosenberg Date: Thu, 21 Nov 2024 13:57:38 +0200 Subject: [PATCH 16/24] add instance name --- Tests/conf.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Tests/conf.json b/Tests/conf.json index 59a6074fe865..94c82eaea374 100644 --- a/Tests/conf.json +++ b/Tests/conf.json @@ -2644,7 +2644,11 @@ { "playbookID": "UploadFile Test", "integrations": ["Core REST API", - "QRadar v3"] + "QRadar v3"], + "instance_names": [ + "QRadar_20" + ] + }, { "playbookID": "MaxMind Test", From c45725d896662a0737e3da6b8435109f03c47821 Mon Sep 17 00:00:00 2001 From: yrosenberg Date: Thu, 21 Nov 2024 18:14:28 +0200 Subject: [PATCH 17/24] ido --- .../playbook-UploadFile-test.yml | 104 ++++++++++++------ Tests/conf.json | 7 +- 2 files changed, 70 insertions(+), 41 deletions(-) diff --git a/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml b/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml index d574e8800fe9..78b19bf68909 100644 --- a/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml +++ b/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml @@ -6,10 +6,10 @@ starttaskid: "0" tasks: "0": id: "0" - taskid: 59df6007-31bf-47f5-84fc-2f47f1848392 + taskid: db29b3d5-bcdf-40bc-8fb8-902d43caba73 type: start task: - id: 59df6007-31bf-47f5-84fc-2f47f1848392 + id: db29b3d5-bcdf-40bc-8fb8-902d43caba73 version: -1 name: "" iscommand: false @@ -35,10 +35,10 @@ tasks: isautoswitchedtoquietmode: false "1": id: "1" - taskid: 9c0484b4-cfaf-4eee-88c6-ee6e3028ed15 + taskid: 940b6990-2b71-448f-8f05-f46267433c55 type: regular task: - id: 9c0484b4-cfaf-4eee-88c6-ee6e3028ed15 + id: 940b6990-2b71-448f-8f05-f46267433c55 version: -1 name: Download Image and Add to Context scriptName: http @@ -77,10 +77,10 @@ tasks: isautoswitchedtoquietmode: false "2": id: "2" - taskid: 727d975a-97f7-4e65-809f-31aae5450fe4 + taskid: 1494360f-0e1e-4495-8e11-3fc818bb98aa type: regular task: - id: 727d975a-97f7-4e65-809f-31aae5450fe4 + id: 1494360f-0e1e-4495-8e11-3fc818bb98aa version: -1 name: Upload Downloaded File to War Room description: Copies a file from this incident to the specified incident. The @@ -114,7 +114,7 @@ tasks: { "position": { "x": 265, - "y": 895 + "y": 1245 } } note: false @@ -126,10 +126,10 @@ tasks: isautoswitchedtoquietmode: false "3": id: "3" - taskid: a24fa9ad-a067-4785-86c5-03a710f701bd + taskid: 4e80eafd-7bf1-439c-8e5e-e40ef7144461 type: regular task: - id: a24fa9ad-a067-4785-86c5-03a710f701bd + id: 4e80eafd-7bf1-439c-8e5e-e40ef7144461 version: -1 name: createNewIncident description: Create a new incident @@ -143,8 +143,6 @@ tasks: scriptarguments: name: simple: DemistoUploadFile - test incident - type: - simple: Qradar Generic separatecontext: false continueonerrortype: "" view: |- @@ -163,10 +161,10 @@ tasks: isautoswitchedtoquietmode: false "4": id: "4" - taskid: 1ebafcaf-f6ef-438f-8a17-ea4010fcdc3d + taskid: f5c1b3a8-15dc-4125-826e-c8662cab7e2f type: regular task: - id: 1ebafcaf-f6ef-438f-8a17-ea4010fcdc3d + id: f5c1b3a8-15dc-4125-826e-c8662cab7e2f version: -1 name: DeleteContext description: Delete field from context @@ -198,10 +196,10 @@ tasks: isautoswitchedtoquietmode: false "5": id: "5" - taskid: d6301ab6-5e91-49eb-8bb8-c88c097e4165 + taskid: 630de333-ec32-4b9d-8168-114a6eaa4721 type: regular task: - id: d6301ab6-5e91-49eb-8bb8-c88c097e4165 + id: 630de333-ec32-4b9d-8168-114a6eaa4721 version: -1 name: getContext description: Retrieve context of another incident to be used in this script @@ -225,7 +223,7 @@ tasks: { "position": { "x": 265, - "y": 1245 + "y": 1595 } } note: false @@ -237,10 +235,10 @@ tasks: isautoswitchedtoquietmode: false "7": id: "7" - taskid: b95f9c94-4b9e-4488-84cf-201e0f0ab7fa + taskid: 765a4b8a-e04c-4286-8a7e-b2695fefd2fc type: condition task: - id: b95f9c94-4b9e-4488-84cf-201e0f0ab7fa + id: 765a4b8a-e04c-4286-8a7e-b2695fefd2fc version: -1 name: Verify upload was successful type: condition @@ -272,7 +270,7 @@ tasks: { "position": { "x": 265, - "y": 1595 + "y": 1945 } } note: false @@ -284,10 +282,10 @@ tasks: isautoswitchedtoquietmode: false "8": id: "8" - taskid: 6ed2b841-1259-4d02-815a-7a11ccec5e6b + taskid: add6a00a-fc13-41bb-879e-e825d394a3e2 type: title task: - id: 6ed2b841-1259-4d02-815a-7a11ccec5e6b + id: add6a00a-fc13-41bb-879e-e825d394a3e2 version: -1 name: Done type: title @@ -299,7 +297,7 @@ tasks: { "position": { "x": 265, - "y": 1770 + "y": 2120 } } note: false @@ -311,10 +309,10 @@ tasks: isautoswitchedtoquietmode: false "9": id: "9" - taskid: f208b0b8-5d70-4fa5-8393-fe513904142e + taskid: d6dba1ba-4af6-41cc-8cd9-2aa3d8fe6c8c type: regular task: - id: f208b0b8-5d70-4fa5-8393-fe513904142e + id: d6dba1ba-4af6-41cc-8cd9-2aa3d8fe6c8c version: -1 name: Upload Downloaded File to War Room with a Comment description: Copies a file from this incident to the specified incident. The @@ -350,7 +348,7 @@ tasks: { "position": { "x": 265, - "y": 1070 + "y": 1420 } } note: false @@ -362,10 +360,10 @@ tasks: isautoswitchedtoquietmode: false "10": id: "10" - taskid: 7b98e101-3d8f-4d20-8490-227da931bf65 + taskid: b1d80a37-bd3e-4728-826c-7447425cbf5d type: regular task: - id: 7b98e101-3d8f-4d20-8490-227da931bf65 + id: b1d80a37-bd3e-4728-826c-7447425cbf5d version: -1 name: Get File Comment (File With Comment) description: send HTTP GET requests @@ -408,7 +406,7 @@ tasks: { "position": { "x": 50, - "y": 1420 + "y": 1770 } } note: false @@ -420,10 +418,10 @@ tasks: isautoswitchedtoquietmode: false "11": id: "11" - taskid: 57157ab4-6d8c-45da-892b-2956d3ab8a7e + taskid: ba44f3e1-3c23-4710-8591-476c81d1a27c type: regular task: - id: 57157ab4-6d8c-45da-892b-2956d3ab8a7e + id: ba44f3e1-3c23-4710-8591-476c81d1a27c version: -1 name: Get File Comment (File Without Comment) description: send HTTP GET requests @@ -466,7 +464,43 @@ tasks: { "position": { "x": 480, - "y": 1420 + "y": 1770 + } + } + note: false + timertriggers: [] + ignoreworker: false + skipunavailable: false + quietmode: 0 + isoversize: false + isautoswitchedtoquietmode: false + "12": + id: "12" + taskid: 359b53c1-e074-41a8-87cc-7b1aeaa63a21 + type: regular + task: + id: 359b53c1-e074-41a8-87cc-7b1aeaa63a21 + version: -1 + name: Activate the incident investigation (allow failure if already activated) + script: Builtin|||investigate + type: regular + iscommand: true + brand: "Builtin" + nexttasks: + '#none#': + - "14" + scriptarguments: + id: + complex: + root: CreatedIncidentID + separatecontext: false + continueonerror: true + continueonerrortype: "" + view: |- + { + "position": { + "x": 265, + "y": 895 } } note: false @@ -478,10 +512,10 @@ tasks: isautoswitchedtoquietmode: false "13": id: "13" - taskid: 0df5d40a-3f2e-4d53-85b2-8e2547aaa981 + taskid: c32cf7ff-a039-48ae-85f5-c75213f17f84 type: regular task: - id: 0df5d40a-3f2e-4d53-85b2-8e2547aaa981 + id: c32cf7ff-a039-48ae-85f5-c75213f17f84 version: -1 name: Sleep 20 sec description: Sleep for X seconds. @@ -491,7 +525,7 @@ tasks: brand: "" nexttasks: '#none#': - - "2" + - "12" scriptarguments: seconds: simple: "20" @@ -516,7 +550,7 @@ view: |- "linkLabelsPosition": {}, "paper": { "dimensions": { - "height": 1785, + "height": 2135, "width": 810, "x": 50, "y": 50 diff --git a/Tests/conf.json b/Tests/conf.json index 94c82eaea374..08105ea3287d 100644 --- a/Tests/conf.json +++ b/Tests/conf.json @@ -2643,12 +2643,7 @@ }, { "playbookID": "UploadFile Test", - "integrations": ["Core REST API", - "QRadar v3"], - "instance_names": [ - "QRadar_20" - ] - + "integrations": "Core REST API" }, { "playbookID": "MaxMind Test", From 136515878535061999fb9b799f6644d23df3ad2c Mon Sep 17 00:00:00 2001 From: yrosenberg Date: Thu, 21 Nov 2024 20:35:22 +0200 Subject: [PATCH 18/24] rn --- Packs/DemistoRESTAPI/ReleaseNotes/1_3_64.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Packs/DemistoRESTAPI/ReleaseNotes/1_3_64.md b/Packs/DemistoRESTAPI/ReleaseNotes/1_3_64.md index 28c1446c2669..8ad5e548b73e 100644 --- a/Packs/DemistoRESTAPI/ReleaseNotes/1_3_64.md +++ b/Packs/DemistoRESTAPI/ReleaseNotes/1_3_64.md @@ -1,6 +1,10 @@ #### Integrations +##### Core REST API + +Internal code improvements + ##### Demisto REST API (Deprecated) Internal code improvements \ No newline at end of file From 946d8692448ad659997cd8538ec313cbad16aee3 Mon Sep 17 00:00:00 2001 From: yrosenberg Date: Mon, 9 Dec 2024 15:56:26 +0200 Subject: [PATCH 19/24] fix test --- Packs/Grafana/TestPlaybooks/Grafana-Test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Packs/Grafana/TestPlaybooks/Grafana-Test.yml b/Packs/Grafana/TestPlaybooks/Grafana-Test.yml index 928d874f1e1a..817ecb3fa239 100644 --- a/Packs/Grafana/TestPlaybooks/Grafana-Test.yml +++ b/Packs/Grafana/TestPlaybooks/Grafana-Test.yml @@ -274,14 +274,14 @@ tasks: value: simple: Grafana.Alert.id iscontext: true - - - operator: isEqualString + - - operator: isNotEqualString left: value: simple: Grafana.Alert.state iscontext: true right: value: - simple: un-paused + simple: paused view: |- { "position": { From fc3aecd28ba786768858a53d8e3130cbb3c06a4d Mon Sep 17 00:00:00 2001 From: sapirshuker Date: Mon, 9 Dec 2024 18:38:15 +0200 Subject: [PATCH 20/24] Empty-Commit to trigger build From 68772ef4034d4caaa3a13ccb822a90280484d070 Mon Sep 17 00:00:00 2001 From: yrosenberg Date: Tue, 10 Dec 2024 10:15:18 +0200 Subject: [PATCH 21/24] change test playbook --- .../playbook-UploadFile-test.yml | 105 +++++++++--------- 1 file changed, 54 insertions(+), 51 deletions(-) diff --git a/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml b/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml index 78b19bf68909..7caa2f7bca3c 100644 --- a/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml +++ b/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml @@ -6,14 +6,15 @@ starttaskid: "0" tasks: "0": id: "0" - taskid: db29b3d5-bcdf-40bc-8fb8-902d43caba73 + taskid: 6e3c636b-7ccd-4725-8133-e84fa42b2a2f type: start task: - id: db29b3d5-bcdf-40bc-8fb8-902d43caba73 + id: 6e3c636b-7ccd-4725-8133-e84fa42b2a2f version: -1 name: "" iscommand: false brand: "" + description: '' nexttasks: '#none#': - "4" @@ -35,10 +36,10 @@ tasks: isautoswitchedtoquietmode: false "1": id: "1" - taskid: 940b6990-2b71-448f-8f05-f46267433c55 + taskid: 74f4c05e-1ddc-48ca-8469-938b8e3686aa type: regular task: - id: 940b6990-2b71-448f-8f05-f46267433c55 + id: 74f4c05e-1ddc-48ca-8469-938b8e3686aa version: -1 name: Download Image and Add to Context scriptName: http @@ -77,14 +78,13 @@ tasks: isautoswitchedtoquietmode: false "2": id: "2" - taskid: 1494360f-0e1e-4495-8e11-3fc818bb98aa + taskid: 4709dded-bc09-4f4d-8420-6668a0a66eb0 type: regular task: - id: 1494360f-0e1e-4495-8e11-3fc818bb98aa + id: 4709dded-bc09-4f4d-8420-6668a0a66eb0 version: -1 name: Upload Downloaded File to War Room - description: Copies a file from this incident to the specified incident. The - file is recorded as an entry in the specified incident’s War Room. + description: Copies a file from this incident to the specified incident. The file is recorded as an entry in the specified incident’s War Room. scriptName: UploadFile type: regular iscommand: false @@ -107,14 +107,15 @@ tasks: simple: image.png accessor: EntryID incID: - simple: ${CreatedIncidentID} + complex: + root: CreatedIncidentID separatecontext: false continueonerrortype: "" view: |- { "position": { "x": 265, - "y": 1245 + "y": 1070 } } note: false @@ -126,10 +127,10 @@ tasks: isautoswitchedtoquietmode: false "3": id: "3" - taskid: 4e80eafd-7bf1-439c-8e5e-e40ef7144461 + taskid: ab055dd7-b27a-4414-86ea-8be0a18ff806 type: regular task: - id: 4e80eafd-7bf1-439c-8e5e-e40ef7144461 + id: ab055dd7-b27a-4414-86ea-8be0a18ff806 version: -1 name: createNewIncident description: Create a new incident @@ -139,7 +140,7 @@ tasks: brand: Builtin nexttasks: '#none#': - - "13" + - "12" scriptarguments: name: simple: DemistoUploadFile - test incident @@ -161,10 +162,10 @@ tasks: isautoswitchedtoquietmode: false "4": id: "4" - taskid: f5c1b3a8-15dc-4125-826e-c8662cab7e2f + taskid: f09a1a3f-efb5-4b5d-82b2-8e1cb0b6d78a type: regular task: - id: f5c1b3a8-15dc-4125-826e-c8662cab7e2f + id: f09a1a3f-efb5-4b5d-82b2-8e1cb0b6d78a version: -1 name: DeleteContext description: Delete field from context @@ -196,10 +197,10 @@ tasks: isautoswitchedtoquietmode: false "5": id: "5" - taskid: 630de333-ec32-4b9d-8168-114a6eaa4721 + taskid: 5ddbdd21-1a10-477a-8b4a-195dd0f105d5 type: regular task: - id: 630de333-ec32-4b9d-8168-114a6eaa4721 + id: 5ddbdd21-1a10-477a-8b4a-195dd0f105d5 version: -1 name: getContext description: Retrieve context of another incident to be used in this script @@ -223,7 +224,7 @@ tasks: { "position": { "x": 265, - "y": 1595 + "y": 1420 } } note: false @@ -235,10 +236,10 @@ tasks: isautoswitchedtoquietmode: false "7": id: "7" - taskid: 765a4b8a-e04c-4286-8a7e-b2695fefd2fc + taskid: 76a6a3dc-e411-4962-87fe-6c43b689f1ac type: condition task: - id: 765a4b8a-e04c-4286-8a7e-b2695fefd2fc + id: 76a6a3dc-e411-4962-87fe-6c43b689f1ac version: -1 name: Verify upload was successful type: condition @@ -270,7 +271,7 @@ tasks: { "position": { "x": 265, - "y": 1945 + "y": 1770 } } note: false @@ -282,22 +283,23 @@ tasks: isautoswitchedtoquietmode: false "8": id: "8" - taskid: add6a00a-fc13-41bb-879e-e825d394a3e2 + taskid: 7b3d72d0-a26c-47b8-88bc-b58c5a7dfa2c type: title task: - id: add6a00a-fc13-41bb-879e-e825d394a3e2 + id: 7b3d72d0-a26c-47b8-88bc-b58c5a7dfa2c version: -1 name: Done type: title iscommand: false brand: "" + description: '' separatecontext: false continueonerrortype: "" view: |- { "position": { "x": 265, - "y": 2120 + "y": 1945 } } note: false @@ -309,14 +311,13 @@ tasks: isautoswitchedtoquietmode: false "9": id: "9" - taskid: d6dba1ba-4af6-41cc-8cd9-2aa3d8fe6c8c + taskid: c9afd9fb-ac4c-45af-805f-df52a93e47a8 type: regular task: - id: d6dba1ba-4af6-41cc-8cd9-2aa3d8fe6c8c + id: c9afd9fb-ac4c-45af-805f-df52a93e47a8 version: -1 name: Upload Downloaded File to War Room with a Comment - description: Copies a file from this incident to the specified incident. The - file is recorded as an entry in the specified incident’s War Room. + description: Copies a file from this incident to the specified incident. The file is recorded as an entry in the specified incident’s War Room. scriptName: UploadFile type: regular iscommand: false @@ -341,14 +342,15 @@ tasks: simple: image.png accessor: EntryID incID: - simple: ${CreatedIncidentID} + complex: + root: CreatedIncidentID separatecontext: false continueonerrortype: "" view: |- { "position": { "x": 265, - "y": 1420 + "y": 1245 } } note: false @@ -360,10 +362,10 @@ tasks: isautoswitchedtoquietmode: false "10": id: "10" - taskid: b1d80a37-bd3e-4728-826c-7447425cbf5d + taskid: fcac8c26-96d6-4511-8aa5-9ffc134a2dc4 type: regular task: - id: b1d80a37-bd3e-4728-826c-7447425cbf5d + id: fcac8c26-96d6-4511-8aa5-9ffc134a2dc4 version: -1 name: Get File Comment (File With Comment) description: send HTTP GET requests @@ -406,7 +408,7 @@ tasks: { "position": { "x": 50, - "y": 1770 + "y": 1595 } } note: false @@ -418,10 +420,10 @@ tasks: isautoswitchedtoquietmode: false "11": id: "11" - taskid: ba44f3e1-3c23-4710-8591-476c81d1a27c + taskid: 88c5c283-60a1-413c-88f8-adb3ba31f12a type: regular task: - id: ba44f3e1-3c23-4710-8591-476c81d1a27c + id: 88c5c283-60a1-413c-88f8-adb3ba31f12a version: -1 name: Get File Comment (File Without Comment) description: send HTTP GET requests @@ -464,7 +466,7 @@ tasks: { "position": { "x": 480, - "y": 1770 + "y": 1595 } } note: false @@ -476,31 +478,31 @@ tasks: isautoswitchedtoquietmode: false "12": id: "12" - taskid: 359b53c1-e074-41a8-87cc-7b1aeaa63a21 + taskid: ae7ba50c-7968-4306-8b90-e779acf83fed type: regular task: - id: 359b53c1-e074-41a8-87cc-7b1aeaa63a21 + id: ae7ba50c-7968-4306-8b90-e779acf83fed version: -1 - name: Activate the incident investigation (allow failure if already activated) + name: Begin investigating the incident + description: Start investigation of the incident, so that we can later set the right playbook to run on it. This command has to be unhidden using server configuration. script: Builtin|||investigate type: regular iscommand: true - brand: "Builtin" + brand: Builtin nexttasks: '#none#': - - "14" + - "13" scriptarguments: id: complex: root: CreatedIncidentID separatecontext: false - continueonerror: true continueonerrortype: "" view: |- { "position": { "x": 265, - "y": 895 + "y": 720 } } note: false @@ -512,30 +514,31 @@ tasks: isautoswitchedtoquietmode: false "13": id: "13" - taskid: c32cf7ff-a039-48ae-85f5-c75213f17f84 + taskid: d18b33df-6c09-45fb-87fa-3f5c2f2da841 type: regular task: - id: c32cf7ff-a039-48ae-85f5-c75213f17f84 + id: d18b33df-6c09-45fb-87fa-3f5c2f2da841 version: -1 - name: Sleep 20 sec - description: Sleep for X seconds. + name: Wait for investigation to begin + description: Sleep for X seconds scriptName: Sleep type: regular iscommand: false brand: "" nexttasks: '#none#': - - "12" + - "2" scriptarguments: seconds: - simple: "20" + simple: "10" + reputationcalc: 1 separatecontext: false continueonerrortype: "" view: |- { "position": { "x": 265, - "y": 720 + "y": 895 } } note: false @@ -550,7 +553,7 @@ view: |- "linkLabelsPosition": {}, "paper": { "dimensions": { - "height": 2135, + "height": 1960, "width": 810, "x": 50, "y": 50 From 043a34ddd20e5b54fcd9f07e73b97248ad893bfe Mon Sep 17 00:00:00 2001 From: yrosenberg Date: Tue, 10 Dec 2024 10:20:16 +0200 Subject: [PATCH 22/24] typo --- Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml b/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml index 7caa2f7bca3c..bc7fdece492c 100644 --- a/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml +++ b/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml @@ -484,7 +484,7 @@ tasks: id: ae7ba50c-7968-4306-8b90-e779acf83fed version: -1 name: Begin investigating the incident - description: Start investigation of the incident, so that we can later set the right playbook to run on it. This command has to be unhidden using server configuration. + description: Start investigation of the incident. script: Builtin|||investigate type: regular iscommand: true From 56f141b8fef9370fcd2aed68b4ccafbfaab7a62c Mon Sep 17 00:00:00 2001 From: yrosenberg Date: Tue, 10 Dec 2024 10:23:11 +0200 Subject: [PATCH 23/24] typo --- Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml b/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml index bc7fdece492c..94a275fd28ac 100644 --- a/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml +++ b/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml @@ -484,7 +484,7 @@ tasks: id: ae7ba50c-7968-4306-8b90-e779acf83fed version: -1 name: Begin investigating the incident - description: Start investigation of the incident. + description: Start the investigation of the incident to change its status to 'Active', allowing the incident to be used for uploading. script: Builtin|||investigate type: regular iscommand: true From 9c2dd3deb66afa5c06d558549a6deb0070c2b414 Mon Sep 17 00:00:00 2001 From: yrosenberg Date: Tue, 10 Dec 2024 15:09:07 +0200 Subject: [PATCH 24/24] Allow it to fail --- .../TestPlaybooks/playbook-UploadFile-test.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml b/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml index 94a275fd28ac..c231d8d70393 100644 --- a/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml +++ b/Packs/DemistoRESTAPI/TestPlaybooks/playbook-UploadFile-test.yml @@ -483,8 +483,9 @@ tasks: task: id: ae7ba50c-7968-4306-8b90-e779acf83fed version: -1 - name: Begin investigating the incident - description: Start the investigation of the incident to change its status to 'Active', allowing the incident to be used for uploading. + name: Begin investigating the incident (allow it to fail) + description: Start the investigation of the incident to change its status to + 'Active', allowing the incident to be used for uploading. script: Builtin|||investigate type: regular iscommand: true @@ -497,6 +498,7 @@ tasks: complex: root: CreatedIncidentID separatecontext: false + continueonerror: true continueonerrortype: "" view: |- {