Update gcp_compute_disk.py

plugins/modules/gcp_appengine_firewall_rule.py

@@ -34,7 +34,6 @@
 - A single firewall rule that is evaluated against incoming traffic and provides an
   action to take on matched requests.
 short_description: Creates a GCP FirewallRule
-version_added: '2.9'
 author: Google Inc. (@googlecloudplatform)
 requirements:
 - python >= 2.6
@@ -106,6 +105,7 @@
     description:
     - Array of scopes to be used
     type: list
+    elements: str
   env_type:
     description:
     - Specifies which Ansible environment you're running this module within.

plugins/modules/gcp_appengine_firewall_rule_info.py

@@ -33,7 +33,6 @@
 description:
 - Gather info for GCP FirewallRule
 short_description: Gather info for GCP FirewallRule
-version_added: '2.9'
 author: Google Inc. (@googlecloudplatform)
 requirements:
 - python >= 2.6
@@ -71,6 +70,7 @@
     description:
     - Array of scopes to be used
     type: list
+    elements: str
   env_type:
     description:
     - Specifies which Ansible environment you're running this module within.
@@ -134,7 +134,7 @@
 ################################################################################
 # Imports
 ################################################################################
-from ansible.module_utils.gcp_utils import navigate_hash, GcpSession, GcpModule, GcpRequest
+from ansible_collections.google.cloud.plugins.module_utils.gcp_utils import navigate_hash, GcpSession, GcpModule, GcpRequest
 import json
 
 ################################################################################

plugins/modules/gcp_bigquery_dataset.py

@@ -33,7 +33,6 @@
 description:
 - Datasets allow you to organize and control access to your tables.
 short_description: Creates a GCP Dataset
-version_added: '2.8'
 author: Google Inc. (@googlecloudplatform)
 requirements:
 - python >= 2.6
@@ -167,7 +166,6 @@
       the default partition expiration time indicated by this property.'
     required: false
     type: int
-    version_added: '2.9'
   description:
     description:
     - A user-friendly description of the dataset.
@@ -208,7 +206,6 @@
       key.
     required: false
     type: dict
-    version_added: '2.10'
     suboptions:
       kms_key_name:
         description:
@@ -248,6 +245,7 @@
     description:
     - Array of scopes to be used
     type: list
+    elements: str
   env_type:
     description:
     - Specifies which Ansible environment you're running this module within.
@@ -600,11 +598,11 @@ def fetch_resource(module, link, kind, allow_not_found=True):
 
 
 def self_link(module):
-    return "https://www.googleapis.com/bigquery/v2/projects/{project}/datasets/{name}".format(**module.params)
+    return "https://bigquery.googleapis.com/bigquery/v2/projects/{project}/datasets/{name}".format(**module.params)
 
 
 def collection(module):
-    return "https://www.googleapis.com/bigquery/v2/projects/{project}/datasets".format(**module.params)
+    return "https://bigquery.googleapis.com/bigquery/v2/projects/{project}/datasets".format(**module.params)
 
 
 def return_if_object(module, response, kind, allow_not_found=False):

plugins/modules/gcp_bigquery_dataset_info.py

@@ -33,7 +33,6 @@
 description:
 - Gather info for GCP Dataset
 short_description: Gather info for GCP Dataset
-version_added: '2.8'
 author: Google Inc. (@googlecloudplatform)
 requirements:
 - python >= 2.6
@@ -71,6 +70,7 @@
     description:
     - Array of scopes to be used
     type: list
+    elements: str
   env_type:
     description:
     - Specifies which Ansible environment you're running this module within.
@@ -298,7 +298,7 @@
 ################################################################################
 # Imports
 ################################################################################
-from ansible.module_utils.gcp_utils import navigate_hash, GcpSession, GcpModule, GcpRequest
+from ansible_collections.google.cloud.plugins.module_utils.gcp_utils import navigate_hash, GcpSession, GcpModule, GcpRequest
 import json
 
 ################################################################################
@@ -317,7 +317,7 @@ def main():
 
 
 def collection(module):
-    return "https://www.googleapis.com/bigquery/v2/projects/{project}/datasets".format(**module.params)
+    return "https://bigquery.googleapis.com/bigquery/v2/projects/{project}/datasets".format(**module.params)
 
 
 def fetch_list(module, link):

plugins/modules/gcp_bigquery_table.py

@@ -33,7 +33,6 @@
 description:
 - A Table that belongs to a Dataset .
 short_description: Creates a GCP Table
-version_added: '2.8'
 author: Google Inc. (@googlecloudplatform)
 requirements:
 - python >= 2.6
@@ -78,7 +77,6 @@
     elements: str
     required: false
     type: list
-    version_added: '2.9'
   description:
     description:
     - A user-friendly description of the dataset.
@@ -106,7 +104,6 @@
       buffer.
     required: false
     type: int
-    version_added: '2.9'
   view:
     description:
     - The view definition.
@@ -157,7 +154,6 @@
           or REQUIRED.
         required: false
         type: str
-        version_added: '2.9'
       type:
         description:
         - The only type supported is DAY, which will generate one partition per day.
@@ -497,6 +493,7 @@
     description:
     - Array of scopes to be used
     type: list
+    elements: str
   env_type:
     description:
     - Specifies which Ansible environment you're running this module within.
@@ -1195,11 +1192,11 @@ def fetch_resource(module, link, kind, allow_not_found=True):
 
 
 def self_link(module):
-    return "https://www.googleapis.com/bigquery/v2/projects/{project}/datasets/{dataset}/tables/{name}".format(**module.params)
+    return "https://bigquery.googleapis.com/bigquery/v2/projects/{project}/datasets/{dataset}/tables/{name}".format(**module.params)
 
 
 def collection(module):
-    return "https://www.googleapis.com/bigquery/v2/projects/{project}/datasets/{dataset}/tables".format(**module.params)
+    return "https://bigquery.googleapis.com/bigquery/v2/projects/{project}/datasets/{dataset}/tables".format(**module.params)
 
 
 def return_if_object(module, response, kind, allow_not_found=False):

plugins/modules/gcp_bigquery_table_info.py

@@ -33,7 +33,6 @@
 description:
 - Gather info for GCP Table
 short_description: Gather info for GCP Table
-version_added: '2.8'
 author: Google Inc. (@googlecloudplatform)
 requirements:
 - python >= 2.6
@@ -76,6 +75,7 @@
     description:
     - Array of scopes to be used
     type: list
+    elements: str
   env_type:
     description:
     - Specifies which Ansible environment you're running this module within.
@@ -574,7 +574,7 @@
 ################################################################################
 # Imports
 ################################################################################
-from ansible.module_utils.gcp_utils import navigate_hash, GcpSession, GcpModule, GcpRequest
+from ansible_collections.google.cloud.plugins.module_utils.gcp_utils import navigate_hash, GcpSession, GcpModule, GcpRequest
 import json
 
 ################################################################################
@@ -593,7 +593,7 @@ def main():
 
 
 def collection(module):
-    return "https://www.googleapis.com/bigquery/v2/projects/{project}/datasets/{dataset}/tables".format(**module.params)
+    return "https://bigquery.googleapis.com/bigquery/v2/projects/{project}/datasets/{dataset}/tables".format(**module.params)
 
 
 def fetch_list(module, link):

plugins/modules/gcp_bigtable_instance.py

@@ -34,7 +34,6 @@
 - A collection of Bigtable Tables and the resources that serve them. All tables in
   an instance are served from all Clusters in the instance.
 short_description: Creates a GCP Instance
-version_added: '2.10'
 author: Google Inc. (@googlecloudplatform)
 requirements:
 - python >= 2.6
@@ -136,6 +135,7 @@
     description:
     - Array of scopes to be used
     type: list
+    elements: str
   env_type:
     description:
     - Specifies which Ansible environment you're running this module within.

plugins/modules/gcp_bigtable_instance_info.py

@@ -33,7 +33,6 @@
 description:
 - Gather info for GCP Instance
 short_description: Gather info for GCP Instance
-version_added: '2.10'
 author: Google Inc. (@googlecloudplatform)
 requirements:
 - python >= 2.6
@@ -71,6 +70,7 @@
     description:
     - Array of scopes to be used
     type: list
+    elements: str
   env_type:
     description:
     - Specifies which Ansible environment you're running this module within.
@@ -172,7 +172,7 @@
 ################################################################################
 # Imports
 ################################################################################
-from ansible.module_utils.gcp_utils import navigate_hash, GcpSession, GcpModule, GcpRequest
+from ansible_collections.google.cloud.plugins.module_utils.gcp_utils import navigate_hash, GcpSession, GcpModule, GcpRequest
 import json
 
 ################################################################################

plugins/modules/gcp_cloudbuild_trigger.py

@@ -33,7 +33,6 @@
 description:
 - Configuration for an automated build in response to source repository changes.
 short_description: Creates a GCP Trigger
-version_added: '2.8'
 author: Google Inc. (@googlecloudplatform)
 requirements:
 - python >= 2.6
@@ -58,7 +57,6 @@
     - Name of the trigger. Must be unique within the project.
     required: false
     type: str
-    version_added: '2.10'
   description:
     description:
     - Human-readable description of the trigger.
@@ -70,7 +68,6 @@
     elements: str
     required: false
     type: list
-    version_added: '2.10'
   disabled:
     description:
     - Whether the trigger is disabled or not. If true, the trigger will never result
@@ -145,7 +142,6 @@
         - Only trigger a build if the revision regex does NOT match the revision regex.
         required: false
         type: bool
-        version_added: '2.10'
       branch_name:
         description:
         - Name of the branch to build. Exactly one a of branch name, tag, or commit
@@ -178,7 +174,6 @@
         - The location of the source files to build.
         required: false
         type: dict
-        version_added: '2.10'
         suboptions:
           storage_source:
             description:
@@ -286,7 +281,6 @@
         - Substitutions data for Build resource.
         required: false
         type: dict
-        version_added: '2.10'
       queue_ttl:
         description:
         - TTL in queue for this build. If provided and the build is enqueued longer
@@ -296,14 +290,12 @@
           ''s''. Example: "3.5s".'
         required: false
         type: str
-        version_added: '2.10'
       logs_bucket:
         description:
         - Google Cloud Storage bucket where logs should be written. Logs file names
           will be of the format ${logsBucket}/log-${build_id}.txt.
         required: false
         type: str
-        version_added: '2.10'
       timeout:
         description:
         - Amount of time that this build should be allowed to run, to second granularity.
@@ -316,14 +308,12 @@
         required: false
         default: 600s
         type: str
-        version_added: '2.10'
       secrets:
         description:
         - Secrets to decrypt using Cloud Key Management Service.
         elements: dict
         required: false
         type: list
-        version_added: '2.10'
         suboptions:
           kms_key_name:
             description:
@@ -495,6 +485,7 @@
     description:
     - Array of scopes to be used
     type: list
+    elements: str
   env_type:
     description:
     - Specifies which Ansible environment you're running this module within.

plugins/modules/gcp_cloudbuild_trigger_info.py

@@ -33,7 +33,6 @@
 description:
 - Gather info for GCP Trigger
 short_description: Gather info for GCP Trigger
-version_added: '2.8'
 author: Google Inc. (@googlecloudplatform)
 requirements:
 - python >= 2.6
@@ -71,6 +70,7 @@
     description:
     - Array of scopes to be used
     type: list
+    elements: str
   env_type:
     description:
     - Specifies which Ansible environment you're running this module within.
@@ -511,7 +511,7 @@
 ################################################################################
 # Imports
 ################################################################################
-from ansible.module_utils.gcp_utils import navigate_hash, GcpSession, GcpModule, GcpRequest
+from ansible_collections.google.cloud.plugins.module_utils.gcp_utils import navigate_hash, GcpSession, GcpModule, GcpRequest
 import json
 
 ################################################################################

plugins/modules/gcp_cloudfunctions_cloud_function.py

@@ -33,7 +33,6 @@
 description:
 - A Cloud Function that contains user computation executed in response to an event.
 short_description: Creates a GCP CloudFunction
-version_added: '2.9'
 author: Google Inc. (@googlecloudplatform)
 requirements:
 - python >= 2.6
@@ -189,6 +188,7 @@
     description:
     - Array of scopes to be used
     type: list
+    elements: str
   env_type:
     description:
     - Specifies which Ansible environment you're running this module within.