Align credentials stores part 5 (#27126)

* Align credentials stores part 5 * adding IBM * RL * checking new docker image * update * docker to fix pre-commit * fix docker * update docker in rl * add test req * old docker * rl * docker --------- Co-authored-by: ilan <[email protected]>
demisto · Jun 14, 2023 · 68633de · 68633de
1 parent 36944b3
commit 68633de
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 11 deletions.
diff --git a/Packs/IBMResilientSystems/.pack-ignore b/Packs/IBMResilientSystems/.pack-ignore
@@ -1,5 +1,5 @@
 [file:IBMResilientSystems.yml]
-ignore=IN126,IN145
+ignore=IN126
 
 [file:README.md]
 ignore=RM106

diff --git a/Packs/IBMResilientSystems/Integrations/IBMResilientSystems/IBMResilientSystems.py b/Packs/IBMResilientSystems/Integrations/IBMResilientSystems/IBMResilientSystems.py
@@ -36,8 +36,8 @@
 ORG_NAME = DEMISTO_PARAMS['org']
 USERNAME = DEMISTO_PARAMS.get('credentials', {}).get('identifier')
 PASSWORD = DEMISTO_PARAMS.get('credentials', {}).get('password')
-API_KEY_ID = DEMISTO_PARAMS.get('api_key_id')
-API_KEY_SECRET = DEMISTO_PARAMS.get('api_key_secret')
+API_KEY_ID = DEMISTO_PARAMS.get('credentials_api_key', {}).get('identifier') or DEMISTO_PARAMS.get('api_key_id')
+API_KEY_SECRET = DEMISTO_PARAMS.get('credentials_api_key', {}).get('password') or DEMISTO_PARAMS.get('api_key_secret')
 USE_SSL = not DEMISTO_PARAMS.get('insecure', False)
 FETCH_TIME = DEMISTO_PARAMS.get('fetch_time', '')
 TIME_FORMAT = '%Y-%m-%dT%H:%M:%SZ'

diff --git a/Packs/IBMResilientSystems/Integrations/IBMResilientSystems/IBMResilientSystems.yml b/Packs/IBMResilientSystems/Integrations/IBMResilientSystems/IBMResilientSystems.yml
@@ -39,10 +39,18 @@ configuration:
   name: api_key_id
   required: false
   type: 4
+  hidden: true
 - display: API key secret
   name: api_key_secret
   required: false
   type: 4
+  hidden: true
+- display: API key ID
+  name: credentials_api_key
+  required: false
+  type: 9
+  displaypassword: API key secret
+  section: Connect
 description: Case management that enables visibility across your tools for continual IR improvement.
 display: IBM Resilient Systems
 name: IBM Resilient Systems

diff --git a/Packs/IBMResilientSystems/Integrations/IBMResilientSystems/test-requirements.txt b/Packs/IBMResilientSystems/Integrations/IBMResilientSystems/test-requirements.txt
@@ -0,0 +1 @@
+urllib3
diff --git a/Packs/IBMResilientSystems/ReleaseNotes/1_1_8.md b/Packs/IBMResilientSystems/ReleaseNotes/1_1_8.md
@@ -0,0 +1,6 @@
+
+#### Integrations
+
+##### IBM Resilient Systems
+Added the *API key ID* and *API key secret* integration parameters to support credentials fetching object.
+
diff --git a/Packs/IBMResilientSystems/pack_metadata.json b/Packs/IBMResilientSystems/pack_metadata.json
@@ -2,7 +2,7 @@
     "name": "IBM Resilient Systems",
     "description": "Case management that enables visibility across your tools for continual IR improvement",
     "support": "xsoar",
-    "currentVersion": "1.1.7",
+    "currentVersion": "1.1.8",
     "author": "Cortex XSOAR",
     "url": "https://www.paloaltonetworks.com/cortex",
     "email": "",

diff --git a/Packs/Kenna/.pack-ignore b/Packs/Kenna/.pack-ignore
@@ -1,5 +1,2 @@
 [file:README.md]
 ignore=RM104
-
-[file:KennaV2.yml]
-ignore=IN145
diff --git a/Packs/Kenna/Integrations/KennaV2/KennaV2.py b/Packs/Kenna/Integrations/KennaV2/KennaV2.py
@@ -559,7 +559,9 @@ def delete_tags(client: Client, args: dict) -> Tuple[str, Dict[str, Any], List[D
 
 def main():
     params = demisto.params()
-    api = params.get('key')
+    api = params.get('credentials_key', {}).get('password') or params.get('key')
+    if not api:
+        raise DemistoException('Kenna API key must be provided.')
     # Service base URL
     base_url = params.get('url')
     # Should we use SSL

diff --git a/Packs/Kenna/Integrations/KennaV2/KennaV2.yml b/Packs/Kenna/Integrations/KennaV2/KennaV2.yml
@@ -10,8 +10,14 @@ configuration:
   type: 0
 - display: Kenna API key
   name: key
-  required: true
+  required: false
   type: 4
+  hidden: true
+- displaypassword: Kenna API key
+  name:  credentials_key
+  required: false
+  hiddenusername: true
+  type: 9
 - defaultvalue: 'false'
   display: Use system proxy settings
   name: proxy
@@ -580,7 +586,7 @@ script:
     - contextPath: Kenna.ConnectorRunsList.ReopenedVulnerabilities
       description: Amount of re-opened vulnerabilities.
       type: Number
-  dockerimage: demisto/python3:3.10.8.37233
+  dockerimage: demisto/python3:3.10.12.62631
   feed: false
   isfetch: false
   longRunning: false

diff --git a/Packs/Kenna/ReleaseNotes/1_1_17.md b/Packs/Kenna/ReleaseNotes/1_1_17.md
@@ -0,0 +1,6 @@
+
+#### Integrations
+
+##### Kenna v2
+- Added the *Kenna API key* integration parameters to support credentials fetching object.
+- Updated the Docker image to: *demisto/python3:3.10.12.62631*.
diff --git a/Packs/Kenna/pack_metadata.json b/Packs/Kenna/pack_metadata.json
@@ -2,7 +2,7 @@
     "name": "Kenna",
     "description": "Use the Kenna v2 integration to search and update vulnerabilities, schedule a run connector, and manage tags and attributes.",
     "support": "xsoar",
-    "currentVersion": "1.1.16",
+    "currentVersion": "1.1.17",
     "author": "Cortex XSOAR",
     "url": "https://www.paloaltonetworks.com/cortex",
     "email": "",