Skip to content

Revert base fix #7717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Packs/Base/ReleaseNotes/1_0_13.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#### Scripts
##### SaneDocReports
- Reverted changes made in 1.0.12

##### SanePdfReports
- Rolled back the docker image to fix a conflict issue.
2 changes: 1 addition & 1 deletion Packs/Base/Scripts/SaneDocReportV2/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## [Unreleased]
- Updating sane doc reports and adding customer logo.
-

## [20.5.0] - 2020-05-12
-
Expand Down
15 changes: 6 additions & 9 deletions Packs/Base/Scripts/SaneDocReportV2/SaneDocReportV2.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,16 @@
try:
sane_json_b64 = demisto.args().get('sane_docx_report_base64', '').encode(
'utf-8')
orientation = demisto.args().get('orientation', 'portrait')
paper_size = demisto.args().get('paperSize', 'A4')
demistoLogo = demisto.args().get('demistoLogo', '')
customerLogo = demisto.args().get('customerLogo', '')

orientation = demisto.args().get('orientation', 'portrait').encode(
'utf-8')
paper_size = demisto.args().get('paperSize', 'A4').encode(
'utf-8')
with open('sane.json', 'wb') as f:
f.write(base64.b64decode(sane_json_b64))

run('sane.json', OUTPUT_FILE_PATH, {
'orientation': orientation,
'paper_size': paper_size,
'demistoLogo': demistoLogo,
'customerLogo': customerLogo,
'orientation': orientation.decode('utf-8', 'ignore'),
'paper_size': paper_size.decode('utf-8', 'ignore')
})

with open(OUTPUT_FILE_PATH, 'rb') as f:
Expand Down
16 changes: 2 additions & 14 deletions Packs/Base/Scripts/SaneDocReportV2/SaneDocReportV2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,6 @@ args:
name: paperSize
required: false
secret: false
- default: false
description: customer's logo
isArray: false
name: customerLogo
required: false
secret: false
- default: false
description: demito's logo
isArray: false
name: demistoLogo
required: false
secret: false
comment: Parse Sane-json-reports and export them as docx files (used internally, thus deprecated).
commonfields:
id: SaneDocReports
Expand All @@ -46,10 +34,10 @@ tags:
timeout: '0'
type: python
subtype: python3
dockerimage: demisto/sane-doc-reports:1.0.0.9308
dockerimage: demisto/sane-doc-reports:1.0.0.6861
runas: DBotWeakRole
runonce: false
tests:
- No Test
deprecated: true
fromversion: 5.5.0
fromversion: 5.5.0
2 changes: 1 addition & 1 deletion Packs/Base/Scripts/SanePdfReport/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## [Unreleased]
- Update sane-pdf-reports docker tag.
-

## [20.5.0] - 2020-05-12
- Fixed logos usage and added failure verbose output.
Expand Down
2 changes: 1 addition & 1 deletion Packs/Base/Scripts/SanePdfReport/SanePdfReport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ tags:
- pdf
timeout: '0'
type: python
dockerimage: demisto/sane-pdf-reports:1.0.0.9507
dockerimage: demisto/sane-pdf-reports:1.0.0.7031
runas: DBotWeakRole
runonce: false
tests:
Expand Down
2 changes: 1 addition & 1 deletion Packs/Base/pack_metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "Base",
"description": "The base pack for Cortex XSOAR.",
"support": "xsoar",
"currentVersion": "1.0.12",
"currentVersion": "1.0.13",
"author": "Cortex XSOAR",
"url": "https://www.paloaltonetworks.com/cortex",
"email": "",
Expand Down