Skip to content
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

Align credentials stores - part 31 #27736

Merged
merged 3 commits into from
Jun 27, 2023
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
2 changes: 1 addition & 1 deletion Packs/PagerDuty/.pack-ignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[file:PagerDuty.yml]
ignore=IN126,IN145
ignore=IN126

[file:README.md]
ignore=RM106
Expand Down
4 changes: 3 additions & 1 deletion Packs/PagerDuty/Integrations/PagerDuty/PagerDuty.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
USE_SSL = not demisto.params().get('insecure', False)

USE_PROXY = demisto.params().get('proxy', True)
API_KEY = demisto.params()['APIKey']
API_KEY = demisto.params().get("credentials_api_key", {}).get('password') or demisto.params().get('APIKey')
SERVICE_KEY = demisto.params()['ServiceKey']
FETCH_INTERVAL = demisto.params()['FetchInterval']
DEFAULT_REQUESTOR = demisto.params().get('DefaultRequestor', '')
Expand Down Expand Up @@ -820,6 +820,8 @@ def run_response_play(incident_id, from_email, response_play_uuid):


def main():
if not API_KEY:
raise DemistoException('API key must be provided.')
LOG('command is %s' % (demisto.command(),))
try:
if demisto.command() == 'test-module':
Expand Down
10 changes: 8 additions & 2 deletions Packs/PagerDuty/Integrations/PagerDuty/PagerDuty.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,14 @@ commonfields:
configuration:
- display: API Key
name: APIKey
required: true
required: false
type: 4
hidden: true
- displaypassword: API Key
name: credentials_api_key
required: false
hiddenusername: true
type: 9
- display: Service Key (for triggering, acknowledging and resolving events only)
name: ServiceKey
required: false
Expand Down Expand Up @@ -621,7 +627,7 @@ script:
script: '-'
subtype: python3
type: python
dockerimage: demisto/python3:3.10.10.48392
dockerimage: demisto/python3:3.10.12.63474
tests:
- PagerDuty Test
fromversion: 5.0.0
6 changes: 6 additions & 0 deletions Packs/PagerDuty/ReleaseNotes/1_1_7.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@

#### Integrations

##### PagerDuty v2
- Added the *API Key* integration parameters to support credentials fetching object.
- Updated the Docker image to: *demisto/python3:3.10.12.63474*.
2 changes: 1 addition & 1 deletion Packs/PagerDuty/pack_metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "PagerDuty",
"description": "Alert and notify users using PagerDuty",
"support": "xsoar",
"currentVersion": "1.1.6",
"currentVersion": "1.1.7",
"author": "Cortex XSOAR",
"url": "https://www.paloaltonetworks.com/cortex",
"email": "",
Expand Down
2 changes: 1 addition & 1 deletion Packs/Tanium/.pack-ignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ignore=BA101,BA110
ignore=RM104,RM106

[file:Tanium_v2.yml]
ignore=BA108,BA109,IN145
ignore=BA108,BA109

[file:script-TaniumFilterComputersByIndexQueryFileDetails_README.md]
ignore=RM106
Expand Down
2 changes: 1 addition & 1 deletion Packs/Tanium/Integrations/Tanium_v2/Tanium_v2.py
Original file line number Diff line number Diff line change
Expand Up @@ -1105,7 +1105,7 @@ def main():
base_url = server + '/api/v2/'
# Should we use SSL
use_ssl = not params.get('insecure', False)
api_token = params.get('api_token')
api_token = params.get('credentials_api_token', {}).get('password') or params.get('api_token')

# Remove proxy if not set to true in params
handle_proxy()
Expand Down
178 changes: 62 additions & 116 deletions Packs/Tanium/Integrations/Tanium_v2/Tanium_v2.yml

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions Packs/Tanium/ReleaseNotes/1_0_27.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@

#### Integrations

##### Tanium v2
- Added the *API Token* integration parameters to support credentials fetching object.
- Updated the Docker image to: *demisto/python3:3.10.12.63474*.
2 changes: 1 addition & 1 deletion Packs/Tanium/pack_metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "Tanium",
"description": "Tanium endpoint security and systems management",
"support": "xsoar",
"currentVersion": "1.0.26",
"currentVersion": "1.0.27",
"author": "Cortex XSOAR",
"url": "https://www.paloaltonetworks.com/cortex",
"email": "",
Expand Down