Bug fixes for GCP modules (#53878)

lib/ansible/modules/cloud/google/gcp_bigquery_dataset.py

@@ -151,8 +151,8 @@ EXAMPLES = '''
     name: my_example_dataset
     dataset_reference:
       dataset_id: my_example_dataset
-      project: "test_project"
+    project: test_project
-      auth_kind: "serviceaccount"
+    auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
     state: present
 '''

lib/ansible/modules/cloud/google/gcp_bigquery_dataset_facts.py

@@ -44,11 +44,12 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name:  a dataset facts
+- name: " a dataset facts"
   gcp_bigquery_dataset_facts:
     project: test_project
     auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
+    state: facts
 '''
 
 RETURN = '''

lib/ansible/modules/cloud/google/gcp_bigquery_table.py

@@ -443,10 +443,10 @@ EXAMPLES = '''
     dataset: example_dataset
     table_reference:
       dataset_id: example_dataset
-        project_id: "test_project"
+      project_id: test_project
       table_id: example_table
-      project: "test_project"
+    project: test_project
-      auth_kind: "serviceaccount"
+    auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
     state: present
 '''

lib/ansible/modules/cloud/google/gcp_bigquery_table_facts.py

@@ -48,12 +48,13 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name:  a table facts
+- name: " a table facts"
   gcp_bigquery_table_facts:
     dataset: example_dataset
     project: test_project
     auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
+    state: facts
 '''
 
 RETURN = '''

lib/ansible/modules/cloud/google/gcp_cloudbuild_trigger.py

@@ -67,6 +67,7 @@ options:
   filename:
     description:
     - Path, from the source root, to a file whose contents is used for the template.
+      Either a filename or build template must be provided.
     required: false
   ignored_files:
     description:
@@ -114,19 +115,23 @@ options:
         required: false
       branch_name:
         description:
-        - Name of the branch to build.
+        - Name of the branch to build. Exactly one a of branch name, tag, or commit
+          SHA must be provided.
         required: false
       tag_name:
         description:
-        - Name of the tag to build.
+        - Name of the tag to build. Exactly one of a branch name, tag, or commit SHA
+          must be provided.
         required: false
       commit_sha:
         description:
-        - Explicit commit SHA to build.
+        - Explicit commit SHA to build. Exactly one of a branch name, tag, or commit
+          SHA must be provided.
         required: false
   build:
     description:
-    - Contents of the build template.
+    - Contents of the build template. Either a filename or build template must be
+      provided.
     required: false
     suboptions:
       tags:
@@ -194,11 +199,11 @@ EXAMPLES = '''
   gcp_cloudbuild_trigger:
     trigger_template:
       branch_name: master
-        project_id: "test_project"
+      project_id: test_project
-        repo_name: "test_object"
+      repo_name: test_object
     filename: cloudbuild.yaml
-      project: "test_project"
+    project: test_project
-      auth_kind: "serviceaccount"
+    auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
     state: present
 '''
@@ -233,6 +238,7 @@ substitutions:
 filename:
   description:
   - Path, from the source root, to a file whose contents is used for the template.
+    Either a filename or build template must be provided.
   returned: success
   type: str
 ignoredFiles:
@@ -285,22 +291,25 @@ triggerTemplate:
       type: str
     branchName:
       description:
-      - Name of the branch to build.
+      - Name of the branch to build. Exactly one a of branch name, tag, or commit
+        SHA must be provided.
       returned: success
       type: str
     tagName:
       description:
-      - Name of the tag to build.
+      - Name of the tag to build. Exactly one of a branch name, tag, or commit SHA
+        must be provided.
       returned: success
       type: str
     commitSha:
       description:
-      - Explicit commit SHA to build.
+      - Explicit commit SHA to build. Exactly one of a branch name, tag, or commit
+        SHA must be provided.
       returned: success
       type: str
 build:
   description:
-  - Contents of the build template.
+  - Contents of the build template. Either a filename or build template must be provided.
   returned: success
   type: complex
   contains:

lib/ansible/modules/cloud/google/gcp_cloudbuild_trigger_facts.py

@@ -44,11 +44,12 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name:  a trigger facts
+- name: " a trigger facts"
   gcp_cloudbuild_trigger_facts:
     project: test_project
     auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
+    state: facts
 '''
 
 RETURN = '''
@@ -86,6 +87,7 @@ items:
     filename:
       description:
       - Path, from the source root, to a file whose contents is used for the template.
+        Either a filename or build template must be provided.
       returned: success
       type: str
     ignoredFiles:
@@ -141,22 +143,26 @@ items:
           type: str
         branchName:
           description:
-          - Name of the branch to build.
+          - Name of the branch to build. Exactly one a of branch name, tag, or commit
+            SHA must be provided.
           returned: success
           type: str
         tagName:
           description:
-          - Name of the tag to build.
+          - Name of the tag to build. Exactly one of a branch name, tag, or commit
+            SHA must be provided.
           returned: success
           type: str
         commitSha:
           description:
-          - Explicit commit SHA to build.
+          - Explicit commit SHA to build. Exactly one of a branch name, tag, or commit
+            SHA must be provided.
           returned: success
           type: str
     build:
       description:
-      - Contents of the build template.
+      - Contents of the build template. Either a filename or build template must be
+        provided.
       returned: success
       type: complex
       contains:

lib/ansible/modules/cloud/google/gcp_compute_address.py

@@ -123,8 +123,8 @@ EXAMPLES = '''
   gcp_compute_address:
     name: test-address1
     region: us-west1
-      project: "test_project"
+    project: test_project
-      auth_kind: "serviceaccount"
+    auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
     state: present
 '''

lib/ansible/modules/cloud/google/gcp_compute_address_facts.py

@@ -54,7 +54,7 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name:  a address facts
+- name: " a address facts"
   gcp_compute_address_facts:
     region: us-west1
     filters:
@@ -62,6 +62,7 @@ EXAMPLES = '''
     project: test_project
     auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
+    state: facts
 '''
 
 RETURN = '''

lib/ansible/modules/cloud/google/gcp_compute_backend_bucket.py

@@ -76,14 +76,14 @@ options:
     required: true
 extends_documentation_fragment: gcp
 notes:
-- 'API Reference: U(https://cloud.google.com/compute/docs/reference/latest/backendBuckets)'
+- 'API Reference: U(https://cloud.google.com/compute/docs/reference/v1/backendBuckets)'
 - 'Using a Cloud Storage bucket as a load balancer backend: U(https://cloud.google.com/compute/docs/load-balancing/http/backend-bucket)'
 '''
 
 EXAMPLES = '''
 - name: create a bucket
   gcp_storage_bucket:
-      name: "bucket-backendbucket"
+    name: bucket-backendbucket
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
     service_account_file: "{{ gcp_cred_file }}"
@@ -92,12 +92,12 @@ EXAMPLES = '''
 
 - name: create a backend bucket
   gcp_compute_backend_bucket:
-      name: "test_object"
+    name: test_object
     bucket_name: "{{ bucket.name }}"
     description: A BackendBucket to connect LNB w/ Storage Bucket
-      enable_cdn: true
+    enable_cdn: 'true'
-      project: "test_project"
+    project: test_project
-      auth_kind: "serviceaccount"
+    auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
     state: present
 '''

lib/ansible/modules/cloud/google/gcp_compute_backend_bucket_facts.py

@@ -49,13 +49,14 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name:  a backend bucket facts
+- name: " a backend bucket facts"
   gcp_compute_backend_bucket_facts:
     filters:
     - name = test_object
     project: test_project
     auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
+    state: facts
 '''
 
 RETURN = '''

lib/ansible/modules/cloud/google/gcp_compute_backend_service.py

@@ -229,10 +229,6 @@ options:
         description:
         - OAuth2 Client Secret for IAP.
         required: false
-      oauth2_client_secret_sha256:
-        description:
-        - OAuth2 Client Secret SHA-256 for IAP.
-        required: false
   load_balancing_scheme:
     description:
     - Indicates whether the backend service will be used with internal or external
@@ -302,7 +298,7 @@ extends_documentation_fragment: gcp
 EXAMPLES = '''
 - name: create a instance group
   gcp_compute_instance_group:
-      name: "instancegroup-backendservice"
+    name: instancegroup-backendservice
     zone: us-central1-a
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
@@ -312,7 +308,7 @@ EXAMPLES = '''
 
 - name: create a http health check
   gcp_compute_http_health_check:
-      name: "httphealthcheck-backendservice"
+    name: httphealthcheck-backendservice
     healthy_threshold: 10
     port: 8080
     timeout_sec: 2
@@ -325,14 +321,14 @@ EXAMPLES = '''
 
 - name: create a backend service
   gcp_compute_backend_service:
-      name: "test_object"
+    name: test_object
     backends:
     - group: "{{ instancegroup }}"
     health_checks:
     - "{{ healthcheck.selfLink }}"
-      enable_cdn: true
+    enable_cdn: 'true'
-      project: "test_project"
+    project: test_project
-      auth_kind: "serviceaccount"
+    auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
     state: present
 '''
@@ -655,15 +651,7 @@ def main():
             description=dict(type='str'),
             enable_cdn=dict(type='bool'),
             health_checks=dict(type='list', elements='str'),
-            iap=dict(
+            iap=dict(type='dict', options=dict(enabled=dict(type='bool'), oauth2_client_id=dict(type='str'), oauth2_client_secret=dict(type='str'))),
-                type='dict',
-                options=dict(
-                    enabled=dict(type='bool'),
-                    oauth2_client_id=dict(type='str'),
-                    oauth2_client_secret=dict(type='str'),
-                    oauth2_client_secret_sha256=dict(type='str'),
-                ),
-            ),
             load_balancing_scheme=dict(type='str', choices=['INTERNAL', 'EXTERNAL']),
             name=dict(type='str'),
             port_name=dict(type='str'),

lib/ansible/modules/cloud/google/gcp_compute_backend_service_facts.py

@@ -49,13 +49,14 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name:  a backend service facts
+- name: " a backend service facts"
   gcp_compute_backend_service_facts:
     filters:
     - name = test_object
     project: test_project
     auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
+    state: facts
 '''
 
 RETURN = '''

lib/ansible/modules/cloud/google/gcp_compute_disk.py

@@ -89,6 +89,15 @@ options:
       of sizeGb must not be less than the size of the sourceImage or the size of the
       snapshot.
     required: false
+  physical_block_size_bytes:
+    description:
+    - Physical block size of the persistent disk, in bytes. If not present in a request,
+      a default value is used. Currently supported sizes are 4096 and 16384, other
+      sizes may be added in the future.
+    - If an unsupported value is requested, the error message will list the supported
+      values for the caller's project.
+    required: false
+    version_added: 2.8
   type:
     description:
     - URL of the disk type resource describing which disk type to use to create the
@@ -124,11 +133,6 @@ options:
         - Specifies a 256-bit customer-supplied encryption key, encoded in RFC 4648
           base64 to either encrypt or decrypt this resource.
         required: false
-      sha256:
-        description:
-        - The RFC 4648 base64 encoded SHA-256 hash of the customer-supplied encryption
-          key that protects this resource.
-        required: false
       kms_key_name:
         description:
         - The name of the encryption key that is stored in Google Cloud KMS.
@@ -150,11 +154,6 @@ options:
         - Specifies a 256-bit customer-supplied encryption key, encoded in RFC 4648
           base64 to either encrypt or decrypt this resource.
         required: false
-      sha256:
-        description:
-        - The RFC 4648 base64 encoded SHA-256 hash of the customer-supplied encryption
-          key that protects this resource.
-        required: false
       kms_key_name:
         description:
         - The name of the encryption key that is stored in Google Cloud KMS.
@@ -183,27 +182,22 @@ options:
         description:
         - The name of the encryption key that is stored in Google Cloud KMS.
         required: false
-      sha256:
-        description:
-        - The RFC 4648 base64 encoded SHA-256 hash of the customer-supplied encryption
-          key that protects this resource.
-        required: false
 extends_documentation_fragment: gcp
 notes:
-- 'API Reference: U(https://cloud.google.com/compute/docs/reference/latest/disks)'
+- 'API Reference: U(https://cloud.google.com/compute/docs/reference/v1/disks)'
 - 'Adding a persistent disk: U(https://cloud.google.com/compute/docs/disks/add-persistent-disk)'
 '''
 
 EXAMPLES = '''
 - name: create a disk
   gcp_compute_disk:
-      name: "test_object"
+    name: test_object
     size_gb: 50
     disk_encryption_key:
       raw_key: SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0=
     zone: us-central1-a
-      project: "test_project"
+    project: test_project
-      auth_kind: "serviceaccount"
+    auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
     state: present
 '''
@@ -277,6 +271,15 @@ users:
     .'
   returned: success
   type: list
+physicalBlockSizeBytes:
+  description:
+  - Physical block size of the persistent disk, in bytes. If not present in a request,
+    a default value is used. Currently supported sizes are 4096 and 16384, other sizes
+    may be added in the future.
+  - If an unsupported value is requested, the error message will list the supported
+    values for the caller's project.
+  returned: success
+  type: int
 type:
   description:
   - URL of the disk type resource describing which disk type to use to create the
@@ -432,13 +435,14 @@ def main():
             licenses=dict(type='list', elements='str'),
             name=dict(required=True, type='str'),
             size_gb=dict(type='int'),
+            physical_block_size_bytes=dict(type='int'),
             type=dict(type='str'),
             source_image=dict(type='str'),
             zone=dict(required=True, type='str'),
-            source_image_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'), sha256=dict(type='str'), kms_key_name=dict(type='str'))),
+            source_image_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'), kms_key_name=dict(type='str'))),
-            disk_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'), sha256=dict(type='str'), kms_key_name=dict(type='str'))),
+            disk_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'), kms_key_name=dict(type='str'))),
             source_snapshot=dict(),
-            source_snapshot_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'), kms_key_name=dict(type='str'), sha256=dict(type='str'))),
+            source_snapshot_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'), kms_key_name=dict(type='str'))),
         )
     )
 
@@ -522,6 +526,7 @@ def resource_to_request(module):
         u'licenses': module.params.get('licenses'),
         u'name': module.params.get('name'),
         u'sizeGb': module.params.get('size_gb'),
+        u'physicalBlockSizeBytes': module.params.get('physical_block_size_bytes'),
         u'type': disk_type_selflink(module.params.get('type'), module.params),
         u'sourceImage': module.params.get('source_image'),
     }
@@ -600,6 +605,7 @@ def response_to_hash(module, response):
         u'name': module.params.get('name'),
         u'sizeGb': response.get(u'sizeGb'),
         u'users': response.get(u'users'),
+        u'physicalBlockSizeBytes': response.get(u'physicalBlockSizeBytes'),
         u'type': response.get(u'type'),
         u'sourceImage': module.params.get('source_image'),
     }

lib/ansible/modules/cloud/google/gcp_compute_disk_facts.py

@@ -53,7 +53,7 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name:  a disk facts
+- name: " a disk facts"
   gcp_compute_disk_facts:
     zone: us-central1-a
     filters:
@@ -61,6 +61,7 @@ EXAMPLES = '''
     project: test_project
     auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
+    state: facts
 '''
 
 RETURN = '''
@@ -137,6 +138,15 @@ items:
         .'
       returned: success
       type: list
+    physicalBlockSizeBytes:
+      description:
+      - Physical block size of the persistent disk, in bytes. If not present in a
+        request, a default value is used. Currently supported sizes are 4096 and 16384,
+        other sizes may be added in the future.
+      - If an unsupported value is requested, the error message will list the supported
+        values for the caller's project.
+      returned: success
+      type: int
     type:
       description:
       - URL of the disk type resource describing which disk type to use to create

lib/ansible/modules/cloud/google/gcp_compute_firewall.py

@@ -214,14 +214,14 @@ options:
     required: false
 extends_documentation_fragment: gcp
 notes:
-- 'API Reference: U(https://cloud.google.com/compute/docs/reference/latest/firewalls)'
+- 'API Reference: U(https://cloud.google.com/compute/docs/reference/v1/firewalls)'
 - 'Official Documentation: U(https://cloud.google.com/vpc/docs/firewalls)'
 '''
 
 EXAMPLES = '''
 - name: create a firewall
   gcp_compute_firewall:
-      name: "test_object"
+    name: test_object
     allowed:
     - ip_protocol: tcp
       ports:
@@ -231,8 +231,8 @@ EXAMPLES = '''
     - staging-ssh-server
     source_tags:
     - test-ssh-clients
-      project: "test_project"
+    project: test_project
-      auth_kind: "serviceaccount"
+    auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
     state: present
 '''

lib/ansible/modules/cloud/google/gcp_compute_firewall_facts.py

@@ -49,13 +49,14 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name:  a firewall facts
+- name: " a firewall facts"
   gcp_compute_firewall_facts:
     filters:
     - name = test_object
     project: test_project
     auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
+    state: facts
 '''
 
 RETURN = '''

lib/ansible/modules/cloud/google/gcp_compute_forwarding_rule.py

@@ -205,14 +205,14 @@ options:
     required: true
 extends_documentation_fragment: gcp
 notes:
-- 'API Reference: U(https://cloud.google.com/compute/docs/reference/latest/forwardingRule)'
+- 'API Reference: U(https://cloud.google.com/compute/docs/reference/v1/forwardingRule)'
 - 'Official Documentation: U(https://cloud.google.com/compute/docs/load-balancing/network/forwarding-rules)'
 '''
 
 EXAMPLES = '''
 - name: create a address
   gcp_compute_address:
-      name: "address-forwardingrule"
+    name: address-forwardingrule
     region: us-west1
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
@@ -222,7 +222,7 @@ EXAMPLES = '''
 
 - name: create a target pool
   gcp_compute_target_pool:
-      name: "targetpool-forwardingrule"
+    name: targetpool-forwardingrule
     region: us-west1
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
@@ -232,14 +232,14 @@ EXAMPLES = '''
 
 - name: create a forwarding rule
   gcp_compute_forwarding_rule:
-      name: "test_object"
+    name: test_object
     region: us-west1
     target: "{{ targetpool }}"
     ip_protocol: TCP
     port_range: 80-80
     ip_address: "{{ address.address }}"
-      project: "test_project"
+    project: test_project
-      auth_kind: "serviceaccount"
+    auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
     state: present
 '''

lib/ansible/modules/cloud/google/gcp_compute_forwarding_rule_facts.py

@@ -54,7 +54,7 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name:  a forwarding rule facts
+- name: " a forwarding rule facts"
   gcp_compute_forwarding_rule_facts:
     region: us-west1
     filters:
@@ -62,6 +62,7 @@ EXAMPLES = '''
     project: test_project
     auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
+    state: facts
 '''
 
 RETURN = '''

lib/ansible/modules/cloud/google/gcp_compute_global_address.py

@@ -88,16 +88,16 @@ options:
     - INTERNAL
 extends_documentation_fragment: gcp
 notes:
-- 'API Reference: U(https://cloud.google.com/compute/docs/reference/latest/globalAddresses)'
+- 'API Reference: U(https://cloud.google.com/compute/docs/reference/v1/globalAddresses)'
 - 'Reserving a Static External IP Address: U(https://cloud.google.com/compute/docs/ip-addresses/reserve-static-external-ip-address)'
 '''
 
 EXAMPLES = '''
 - name: create a global address
   gcp_compute_global_address:
-      name: "test_object"
+    name: test_object
-      project: "test_project"
+    project: test_project
-      auth_kind: "serviceaccount"
+    auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
     state: present
 '''

lib/ansible/modules/cloud/google/gcp_compute_global_address_facts.py

@@ -49,13 +49,14 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name:  a global address facts
+- name: " a global address facts"
   gcp_compute_global_address_facts:
     filters:
     - name = test_object
     project: test_project
     auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
+    state: facts
 '''
 
 RETURN = '''

lib/ansible/modules/cloud/google/gcp_compute_global_forwarding_rule.py

@@ -188,7 +188,7 @@ extends_documentation_fragment: gcp
 EXAMPLES = '''
 - name: create a global address
   gcp_compute_global_address:
-      name: "globaladdress-globalforwardingrule"
+    name: globaladdress-globalforwardingrule
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
     service_account_file: "{{ gcp_cred_file }}"
@@ -197,7 +197,7 @@ EXAMPLES = '''
 
 - name: create a instance group
   gcp_compute_instance_group:
-      name: "instancegroup-globalforwardingrule"
+    name: instancegroup-globalforwardingrule
     zone: us-central1-a
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
@@ -207,7 +207,7 @@ EXAMPLES = '''
 
 - name: create a http health check
   gcp_compute_http_health_check:
-      name: "httphealthcheck-globalforwardingrule"
+    name: httphealthcheck-globalforwardingrule
     healthy_threshold: 10
     port: 8080
     timeout_sec: 2
@@ -220,12 +220,12 @@ EXAMPLES = '''
 
 - name: create a backend service
   gcp_compute_backend_service:
-      name: "backendservice-globalforwardingrule"
+    name: backendservice-globalforwardingrule
     backends:
     - group: "{{ instancegroup }}"
     health_checks:
     - "{{ healthcheck.selfLink }}"
-      enable_cdn: true
+    enable_cdn: 'true'
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
     service_account_file: "{{ gcp_cred_file }}"
@@ -234,7 +234,7 @@ EXAMPLES = '''
 
 - name: create a url map
   gcp_compute_url_map:
-      name: "urlmap-globalforwardingrule"
+    name: urlmap-globalforwardingrule
     default_service: "{{ backendservice }}"
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
@@ -244,7 +244,7 @@ EXAMPLES = '''
 
 - name: create a target http proxy
   gcp_compute_target_http_proxy:
-      name: "targethttpproxy-globalforwardingrule"
+    name: targethttpproxy-globalforwardingrule
     url_map: "{{ urlmap }}"
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
@@ -254,13 +254,13 @@ EXAMPLES = '''
 
 - name: create a global forwarding rule
   gcp_compute_global_forwarding_rule:
-      name: "test_object"
+    name: test_object
     ip_address: "{{ globaladdress.address }}"
     ip_protocol: TCP
     port_range: 80-80
     target: "{{ httpproxy.selfLink }}"
-      project: "test_project"
+    project: test_project
-      auth_kind: "serviceaccount"
+    auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
     state: present
 '''

lib/ansible/modules/cloud/google/gcp_compute_global_forwarding_rule_facts.py

@@ -49,13 +49,14 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name:  a global forwarding rule facts
+- name: " a global forwarding rule facts"
   gcp_compute_global_forwarding_rule_facts:
     filters:
     - name = test_object
     project: test_project
     auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
+    state: facts
 '''
 
 RETURN = '''

lib/ansible/modules/cloud/google/gcp_compute_health_check.py

@@ -264,14 +264,14 @@ options:
         - PROXY_V1
 extends_documentation_fragment: gcp
 notes:
-- 'API Reference: U(https://cloud.google.com/compute/docs/reference/rest/latest/healthChecks)'
+- 'API Reference: U(https://cloud.google.com/compute/docs/reference/rest/v1/healthChecks)'
 - 'Official Documentation: U(https://cloud.google.com/load-balancing/docs/health-checks)'
 '''
 
 EXAMPLES = '''
 - name: create a health check
   gcp_compute_health_check:
-      name: "test_object"
+    name: test_object
     type: TCP
     tcp_health_check:
       port_name: service-health
@@ -280,8 +280,8 @@ EXAMPLES = '''
     healthy_threshold: 10
     timeout_sec: 2
     unhealthy_threshold: 5
-      project: "test_project"
+    project: test_project
-      auth_kind: "serviceaccount"
+    auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
     state: present
 '''

test/integration/targets/gcp_compute_backend_bucket/tasks/main.yml

@@ -15,7 +15,7 @@
 # Pre-test setup
 - name: create a bucket
   gcp_storage_bucket:
-      name: "bucket-backendbucket"
+    name: bucket-backendbucket
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
     service_account_file: "{{ gcp_cred_file }}"
@@ -26,7 +26,7 @@
     name: "{{ resource_name }}"
     bucket_name: "{{ bucket.name }}"
     description: A BackendBucket to connect LNB w/ Storage Bucket
-      enable_cdn: true
+    enable_cdn: 'true'
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
     service_account_file: "{{ gcp_cred_file }}"
@@ -37,7 +37,7 @@
     name: "{{ resource_name }}"
     bucket_name: "{{ bucket.name }}"
     description: A BackendBucket to connect LNB w/ Storage Bucket
-      enable_cdn: true
+    enable_cdn: 'true'
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
     service_account_file: "{{ gcp_cred_file }}"
@@ -68,7 +68,7 @@
     name: "{{ resource_name }}"
     bucket_name: "{{ bucket.name }}"
     description: A BackendBucket to connect LNB w/ Storage Bucket
-      enable_cdn: true
+    enable_cdn: 'true'
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
     service_account_file: "{{ gcp_cred_file }}"
@@ -85,7 +85,7 @@
     name: "{{ resource_name }}"
     bucket_name: "{{ bucket.name }}"
     description: A BackendBucket to connect LNB w/ Storage Bucket
-      enable_cdn: true
+    enable_cdn: 'true'
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
     service_account_file: "{{ gcp_cred_file }}"
@@ -116,7 +116,7 @@
     name: "{{ resource_name }}"
     bucket_name: "{{ bucket.name }}"
     description: A BackendBucket to connect LNB w/ Storage Bucket
-      enable_cdn: true
+    enable_cdn: 'true'
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
     service_account_file: "{{ gcp_cred_file }}"
@@ -132,7 +132,7 @@
 # If errors happen, don't crash the playbook!
 - name: delete a bucket
   gcp_storage_bucket:
-      name: "bucket-backendbucket"
+    name: bucket-backendbucket
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
     service_account_file: "{{ gcp_cred_file }}"

test/integration/targets/gcp_compute_backend_service/tasks/main.yml

@@ -15,7 +15,7 @@
 # Pre-test setup
 - name: create a instance group
   gcp_compute_instance_group:
-      name: "instancegroup-backendservice"
+    name: instancegroup-backendservice
     zone: us-central1-a
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
@@ -24,7 +24,7 @@
   register: instancegroup
 - name: create a http health check
   gcp_compute_http_health_check:
-      name: "httphealthcheck-backendservice"
+    name: httphealthcheck-backendservice
     healthy_threshold: 10
     port: 8080
     timeout_sec: 2
@@ -41,7 +41,7 @@
     - group: "{{ instancegroup }}"
     health_checks:
     - "{{ healthcheck.selfLink }}"
-      enable_cdn: true
+    enable_cdn: 'true'
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
     service_account_file: "{{ gcp_cred_file }}"
@@ -54,7 +54,7 @@
     - group: "{{ instancegroup }}"
     health_checks:
     - "{{ healthcheck.selfLink }}"
-      enable_cdn: true
+    enable_cdn: 'true'
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
     service_account_file: "{{ gcp_cred_file }}"
@@ -87,7 +87,7 @@
     - group: "{{ instancegroup }}"
     health_checks:
     - "{{ healthcheck.selfLink }}"
-      enable_cdn: true
+    enable_cdn: 'true'
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
     service_account_file: "{{ gcp_cred_file }}"
@@ -106,7 +106,7 @@
     - group: "{{ instancegroup }}"
     health_checks:
     - "{{ healthcheck.selfLink }}"
-      enable_cdn: true
+    enable_cdn: 'true'
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
     service_account_file: "{{ gcp_cred_file }}"
@@ -139,7 +139,7 @@
     - group: "{{ instancegroup }}"
     health_checks:
     - "{{ healthcheck.selfLink }}"
-      enable_cdn: true
+    enable_cdn: 'true'
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
     service_account_file: "{{ gcp_cred_file }}"
@@ -155,7 +155,7 @@
 # If errors happen, don't crash the playbook!
 - name: delete a http health check
   gcp_compute_http_health_check:
-      name: "httphealthcheck-backendservice"
+    name: httphealthcheck-backendservice
     healthy_threshold: 10
     port: 8080
     timeout_sec: 2
@@ -168,7 +168,7 @@
   ignore_errors: true
 - name: delete a instance group
   gcp_compute_instance_group:
-      name: "instancegroup-backendservice"
+    name: instancegroup-backendservice
     zone: us-central1-a
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"

test/integration/targets/gcp_compute_forwarding_rule/tasks/main.yml

@@ -15,7 +15,7 @@
 # Pre-test setup
 - name: create a address
   gcp_compute_address:
-      name: "address-forwardingrule"
+    name: address-forwardingrule
     region: us-west1
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
@@ -24,7 +24,7 @@
   register: address
 - name: create a target pool
   gcp_compute_target_pool:
-      name: "targetpool-forwardingrule"
+    name: targetpool-forwardingrule
     region: us-west1
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
@@ -154,7 +154,7 @@
 # If errors happen, don't crash the playbook!
 - name: delete a target pool
   gcp_compute_target_pool:
-      name: "targetpool-forwardingrule"
+    name: targetpool-forwardingrule
     region: us-west1
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
@@ -164,7 +164,7 @@
   ignore_errors: true
 - name: delete a address
   gcp_compute_address:
-      name: "address-forwardingrule"
+    name: address-forwardingrule
     region: us-west1
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"

test/integration/targets/gcp_compute_global_forwarding_rule/tasks/main.yml

@@ -15,7 +15,7 @@
 # Pre-test setup
 - name: create a global address
   gcp_compute_global_address:
-      name: "globaladdress-globalforwardingrule"
+    name: globaladdress-globalforwardingrule
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
     service_account_file: "{{ gcp_cred_file }}"
@@ -23,7 +23,7 @@
   register: globaladdress
 - name: create a instance group
   gcp_compute_instance_group:
-      name: "instancegroup-globalforwardingrule"
+    name: instancegroup-globalforwardingrule
     zone: us-central1-a
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
@@ -32,7 +32,7 @@
   register: instancegroup
 - name: create a http health check
   gcp_compute_http_health_check:
-      name: "httphealthcheck-globalforwardingrule"
+    name: httphealthcheck-globalforwardingrule
     healthy_threshold: 10
     port: 8080
     timeout_sec: 2
@@ -44,12 +44,12 @@
   register: healthcheck
 - name: create a backend service
   gcp_compute_backend_service:
-      name: "backendservice-globalforwardingrule"
+    name: backendservice-globalforwardingrule
     backends:
     - group: "{{ instancegroup }}"
     health_checks:
     - "{{ healthcheck.selfLink }}"
-      enable_cdn: true
+    enable_cdn: 'true'
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
     service_account_file: "{{ gcp_cred_file }}"
@@ -57,7 +57,7 @@
   register: backendservice
 - name: create a url map
   gcp_compute_url_map:
-      name: "urlmap-globalforwardingrule"
+    name: urlmap-globalforwardingrule
     default_service: "{{ backendservice }}"
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
@@ -66,7 +66,7 @@
   register: urlmap
 - name: create a target http proxy
   gcp_compute_target_http_proxy:
-      name: "targethttpproxy-globalforwardingrule"
+    name: targethttpproxy-globalforwardingrule
     url_map: "{{ urlmap }}"
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
@@ -189,7 +189,7 @@
 # If errors happen, don't crash the playbook!
 - name: delete a target http proxy
   gcp_compute_target_http_proxy:
-      name: "targethttpproxy-globalforwardingrule"
+    name: targethttpproxy-globalforwardingrule
     url_map: "{{ urlmap }}"
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
@@ -199,7 +199,7 @@
   ignore_errors: true
 - name: delete a url map
   gcp_compute_url_map:
-      name: "urlmap-globalforwardingrule"
+    name: urlmap-globalforwardingrule
     default_service: "{{ backendservice }}"
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
@@ -209,12 +209,12 @@
   ignore_errors: true
 - name: delete a backend service
   gcp_compute_backend_service:
-      name: "backendservice-globalforwardingrule"
+    name: backendservice-globalforwardingrule
     backends:
     - group: "{{ instancegroup }}"
     health_checks:
     - "{{ healthcheck.selfLink }}"
-      enable_cdn: true
+    enable_cdn: 'true'
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
     service_account_file: "{{ gcp_cred_file }}"
@@ -223,7 +223,7 @@
   ignore_errors: true
 - name: delete a http health check
   gcp_compute_http_health_check:
-      name: "httphealthcheck-globalforwardingrule"
+    name: httphealthcheck-globalforwardingrule
     healthy_threshold: 10
     port: 8080
     timeout_sec: 2
@@ -236,7 +236,7 @@
   ignore_errors: true
 - name: delete a instance group
   gcp_compute_instance_group:
-      name: "instancegroup-globalforwardingrule"
+    name: instancegroup-globalforwardingrule
     zone: us-central1-a
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
@@ -246,7 +246,7 @@
   ignore_errors: true
 - name: delete a global address
   gcp_compute_global_address:
-      name: "globaladdress-globalforwardingrule"
+    name: globaladdress-globalforwardingrule
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
     service_account_file: "{{ gcp_cred_file }}"