Google align credentials stores - part 25 (demisto#27699)

* Google align credentials stores - part 25 * fix
xsoar-contrib · Jul 26, 2023 · 0af669e · 0af669e
1 parent 1dfc7e4
commit 0af669e
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 14 deletions.
diff --git a/Packs/GoogleCloudCompute/.pack-ignore b/Packs/GoogleCloudCompute/.pack-ignore
@@ -4,9 +4,6 @@ ignore=RM104
 [file:playbook-IP_Whitelist_-_GCP_Firewall.yml]
 ignore=PB114,PB115
 
-[file:GoogleCloudCompute.yml]
-ignore=IN145
-
 [file:GoogleCloudCompute_image.png]
 ignore=IM111
 

diff --git a/Packs/GoogleCloudCompute/Integrations/GoogleCloudCompute/GoogleCloudCompute.py b/Packs/GoogleCloudCompute/Integrations/GoogleCloudCompute/GoogleCloudCompute.py
@@ -16,7 +16,8 @@
 """ GLOBALS/PARAMS """
 
 # Params for assembling object of the Service Account Credentials File Contents
-SERVICE_ACCOUNT_FILE = demisto.params().get('service')
+SERVICE_ACCOUNT_FILE = demisto.params().get('credentials_service_account_json',
+                                            {}).get('password') or demisto.params().get('service')
 SERVICE_ACT_PROJECT_ID = None
 
 # Params for constructing googleapiclient service object
@@ -4516,6 +4517,8 @@ def add_networks_tag(args: Dict[str, Any]) -> CommandResults:
 
 
 def main():
+    if not SERVICE_ACCOUNT_FILE:
+        raise DemistoException('Service Account Private Key file contents must be provided.')
     try:
         build_and_authenticate(GSERVICE)
         command = demisto.command()

diff --git a/Packs/GoogleCloudCompute/Integrations/GoogleCloudCompute/GoogleCloudCompute.yml b/Packs/GoogleCloudCompute/Integrations/GoogleCloudCompute/GoogleCloudCompute.yml
@@ -5,8 +5,14 @@ commonfields:
 configuration:
 - display: Service Account Private Key file contents (JSON)
   name: service
-  required: true
+  required: false
   type: 4
+  hidden: true
+- displaypassword: Service Account Private Key file contents (JSON)
+  name:  credentials_service_account_json
+  required: false
+  hiddenusername: true
+  type: 9
 - display: Use system proxy settings
   name: proxy
   required: false
@@ -8412,7 +8418,7 @@ script:
     - contextPath: GoogleCloudCompute.Instances.kind
       description: '] Type of the resource. Always compute#instance for instances.'
       type: string
-  dockerimage: demisto/googleapi-python3:1.0.0.50652
+  dockerimage: demisto/googleapi-python3:1.0.0.64077
   runonce: false
   script: ''
   subtype: python3

diff --git a/Packs/GoogleCloudCompute/ReleaseNotes/1_1_3.md b/Packs/GoogleCloudCompute/ReleaseNotes/1_1_3.md
@@ -0,0 +1,6 @@
+
+#### Integrations
+
+##### Google Cloud Compute
+- Added the *Service Account Private Key file contents* integration parameters to support credentials fetching object.
+- Updated the Docker image to: *demisto/googleapi-python3:1.0.0.64077*.
diff --git a/Packs/GoogleCloudCompute/pack_metadata.json b/Packs/GoogleCloudCompute/pack_metadata.json
@@ -2,7 +2,7 @@
     "name": "Google Cloud Compute",
     "description": "Google Compute Engine delivers virtual machines running in Google's innovative data centers and worldwide fiber network. Compute Engine's tooling and workflow support enable scaling from single instances to global, load-balanced cloud computing.",
     "support": "xsoar",
-    "currentVersion": "1.1.2",
+    "currentVersion": "1.1.3",
     "author": "Cortex XSOAR",
     "url": "https://www.paloaltonetworks.com/cortex",
     "email": "",

diff --git a/Packs/GoogleCloudStorage/.pack-ignore b/Packs/GoogleCloudStorage/.pack-ignore
@@ -10,8 +10,5 @@ ignore=auto-test
 [file:playbook-GCS_Object_Policy_(ACL)_Test.yml]
 ignore=auto-test
 
-[file:GoogleCloudStorage.yml]
-ignore=IN145
-
 [file:GoogleCloudStorage_image.png]
 ignore=IM111
diff --git a/Packs/GoogleCloudStorage/Integrations/GoogleCloudStorage/GoogleCloudStorage.py b/Packs/GoogleCloudStorage/Integrations/GoogleCloudStorage/GoogleCloudStorage.py
@@ -502,7 +502,9 @@ def main():
     args = demisto.args()
     command = demisto.command()
 
-    service_account = params.get('service_account_json', '')
+    service_account = params.get('credentials_service_account_json', {}).get('password') or params.get('service_account_json', '')
+    if not service_account:
+        raise DemistoException('Service Account Private Key file contents must be provided.')
     default_bucket = params.get('default_bucket')
     insecure = params.get('insecure', False)
 

diff --git a/Packs/GoogleCloudStorage/Integrations/GoogleCloudStorage/GoogleCloudStorage.yml b/Packs/GoogleCloudStorage/Integrations/GoogleCloudStorage/GoogleCloudStorage.yml
@@ -5,8 +5,14 @@ commonfields:
 configuration:
 - display: Service Account Private Key file contents (JSON)
   name: service_account_json
-  required: true
+  required: false
   type: 4
+  hidden: true
+- displaypassword: Service Account Private Key file contents (JSON)
+  name:  credentials_service_account_json
+  required: false
+  hiddenusername: true
+  type: 9
 - display: Default Bucket
   name: default_bucket
   required: false
@@ -508,7 +514,7 @@ script:
     description: Removes an entity from an object's Access Control List.
     execution: false
     name: gcs-delete-bucket-object-policy
-  dockerimage: demisto/google-cloud-storage:1.0.0.42893
+  dockerimage: demisto/google-cloud-storage:1.0.0.63865
   isfetch: false
   longRunning: false
   longRunningPort: false

diff --git a/Packs/GoogleCloudStorage/ReleaseNotes/1_0_10.md b/Packs/GoogleCloudStorage/ReleaseNotes/1_0_10.md
@@ -0,0 +1,6 @@
+
+#### Integrations
+
+##### Google Cloud Storage
+- Added the *Service Account Private Key file contents* integration parameters to support credentials fetching object.
+- Updated the Docker image to: *demisto/google-cloud-storage:1.0.0.63865*.
diff --git a/Packs/GoogleCloudStorage/pack_metadata.json b/Packs/GoogleCloudStorage/pack_metadata.json
@@ -2,7 +2,7 @@
     "name": "Google Cloud Storage",
     "description": "Google Cloud Storage is a RESTful online file storage web service for storing and accessing data on Google Cloud Platform infrastructure.",
     "support": "xsoar",
-    "currentVersion": "1.0.9",
+    "currentVersion": "1.0.10",
     "author": "Cortex XSOAR",
     "url": "https://www.paloaltonetworks.com/cortex",
     "email": "",