Bug fixes for GCP modules (#60090)

2019-08-05 15:26:06 -07:00 · 2019-08-05 15:26:06 -07:00 · 8241fd88de
commit 8241fd88de
parent fcc869ab7a
23 changed files with 0 additions and 35 deletions
--- a/lib/ansible/modules/cloud/google/gcp_compute_region_disk_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_region_disk_facts.py
@ -62,7 +62,6 @@ EXAMPLES = '''
    project: test_project
    auth_kind: serviceaccount
    service_account_file: "/tmp/auth.pem"
-    state: facts
 '''

 RETURN = '''
--- a/lib/ansible/modules/cloud/google/gcp_compute_route_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_route_facts.py
@ -56,7 +56,6 @@ EXAMPLES = '''
    project: test_project
    auth_kind: serviceaccount
    service_account_file: "/tmp/auth.pem"
-    state: facts
 '''

 RETURN = '''
--- a/lib/ansible/modules/cloud/google/gcp_compute_router_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_router_facts.py
@ -62,7 +62,6 @@ EXAMPLES = '''
    project: test_project
    auth_kind: serviceaccount
    service_account_file: "/tmp/auth.pem"
-    state: facts
 '''

 RETURN = '''
--- a/lib/ansible/modules/cloud/google/gcp_compute_ssl_certificate_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_ssl_certificate_facts.py
@ -56,7 +56,6 @@ EXAMPLES = '''
    project: test_project
    auth_kind: serviceaccount
    service_account_file: "/tmp/auth.pem"
-    state: facts
 '''

 RETURN = '''
--- a/lib/ansible/modules/cloud/google/gcp_compute_ssl_policy_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_ssl_policy_facts.py
@ -56,7 +56,6 @@ EXAMPLES = '''
    project: test_project
    auth_kind: serviceaccount
    service_account_file: "/tmp/auth.pem"
-    state: facts
 '''

 RETURN = '''
--- a/lib/ansible/modules/cloud/google/gcp_compute_subnetwork_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_subnetwork_facts.py
@ -62,7 +62,6 @@ EXAMPLES = '''
    project: test_project
    auth_kind: serviceaccount
    service_account_file: "/tmp/auth.pem"
-    state: facts
 '''

 RETURN = '''
--- a/lib/ansible/modules/cloud/google/gcp_compute_target_http_proxy_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_target_http_proxy_facts.py
@ -56,7 +56,6 @@ EXAMPLES = '''
    project: test_project
    auth_kind: serviceaccount
    service_account_file: "/tmp/auth.pem"
-    state: facts
 '''

 RETURN = '''
--- a/lib/ansible/modules/cloud/google/gcp_compute_target_https_proxy_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_target_https_proxy_facts.py
@ -56,7 +56,6 @@ EXAMPLES = '''
    project: test_project
    auth_kind: serviceaccount
    service_account_file: "/tmp/auth.pem"
-    state: facts
 '''

 RETURN = '''
--- a/lib/ansible/modules/cloud/google/gcp_compute_target_pool_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_target_pool_facts.py
@ -62,7 +62,6 @@ EXAMPLES = '''
    project: test_project
    auth_kind: serviceaccount
    service_account_file: "/tmp/auth.pem"
-    state: facts
 '''

 RETURN = '''
--- a/lib/ansible/modules/cloud/google/gcp_compute_target_ssl_proxy_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_target_ssl_proxy_facts.py
@ -56,7 +56,6 @@ EXAMPLES = '''
    project: test_project
    auth_kind: serviceaccount
    service_account_file: "/tmp/auth.pem"
-    state: facts
 '''

 RETURN = '''
--- a/lib/ansible/modules/cloud/google/gcp_compute_target_tcp_proxy_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_target_tcp_proxy_facts.py
@ -56,7 +56,6 @@ EXAMPLES = '''
    project: test_project
    auth_kind: serviceaccount
    service_account_file: "/tmp/auth.pem"
-    state: facts
 '''

 RETURN = '''
--- a/test/integration/targets/gcp_compute_region_disk/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_region_disk/tasks/main.yml
@ -47,7 +47,6 @@
  assert:
    that:
      - result.changed == true
-      - "result.kind == 'compute#disk'"
 - name: verify that region_disk was created
  gcp_compute_region_disk_facts:
      filters:
@ -83,7 +82,6 @@
  assert:
    that:
      - result.changed == false
-      - "result.kind == 'compute#disk'"
 #----------------------------------------------------------
 - name: delete a region disk
  gcp_compute_region_disk:
--- a/test/integration/targets/gcp_compute_route/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_route/tasks/main.yml
@ -53,7 +53,6 @@
  assert:
    that:
      - result.changed == true
-      - "result.kind == 'compute#route'"
 - name: verify that route was created
  gcp_compute_route_facts:
      filters:
@ -87,7 +86,6 @@
  assert:
    that:
      - result.changed == false
-      - "result.kind == 'compute#route'"
 #----------------------------------------------------------
 - name: delete a route
  gcp_compute_route:
--- a/test/integration/targets/gcp_compute_router/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_router/tasks/main.yml
@ -61,7 +61,6 @@
  assert:
    that:
      - result.changed == true
-      - "result.kind == 'compute#router'"
 - name: verify that router was created
  gcp_compute_router_facts:
      filters:
@ -100,7 +99,6 @@
  assert:
    that:
      - result.changed == false
-      - "result.kind == 'compute#router'"
 #----------------------------------------------------------
 - name: delete a router
  gcp_compute_router:
--- a/test/integration/targets/gcp_compute_ssl_certificate/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_ssl_certificate/tasks/main.yml
@ -83,7 +83,6 @@
  assert:
    that:
      - result.changed == true
-      - "result.kind == 'compute#sslCertificate'"
 - name: verify that ssl_certificate was created
  gcp_compute_ssl_certificate_facts:
      filters:
@ -136,7 +135,6 @@
  assert:
    that:
      - result.changed == false
-      - "result.kind == 'compute#sslCertificate'"
 #----------------------------------------------------------
 - name: delete a ssl certificate
  gcp_compute_ssl_certificate:
--- a/test/integration/targets/gcp_compute_ssl_policy/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_ssl_policy/tasks/main.yml
@ -43,7 +43,6 @@
  assert:
    that:
      - result.changed == true
-      - "result.kind == 'compute#sslPolicy'"
 - name: verify that ssl_policy was created
  gcp_compute_ssl_policy_facts:
      filters:
@ -76,7 +75,6 @@
  assert:
    that:
      - result.changed == false
-      - "result.kind == 'compute#sslPolicy'"
 #----------------------------------------------------------
 - name: delete a ssl policy
  gcp_compute_ssl_policy:
--- a/test/integration/targets/gcp_compute_subnetwork/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_subnetwork/tasks/main.yml
@ -48,7 +48,6 @@
  assert:
    that:
      - result.changed == true
-      - "result.kind == 'compute#subnetwork'"
 - name: verify that subnetwork was created
  gcp_compute_subnetwork_facts:
      filters:
@ -80,7 +79,6 @@
  assert:
    that:
      - result.changed == false
-      - "result.kind == 'compute#subnetwork'"
 #----------------------------------------------------------
 - name: delete a subnetwork
  gcp_compute_subnetwork:
--- a/test/integration/targets/gcp_compute_target_http_proxy/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_target_http_proxy/tasks/main.yml
@ -78,7 +78,6 @@
  assert:
    that:
      - result.changed == true
-      - "result.kind == 'compute#targetHttpProxy'"
 - name: verify that target_http_proxy was created
  gcp_compute_target_http_proxy_facts:
      filters:
@ -107,7 +106,6 @@
  assert:
    that:
      - result.changed == false
-      - "result.kind == 'compute#targetHttpProxy'"
 #----------------------------------------------------------
 - name: delete a target http proxy
  gcp_compute_target_http_proxy:
--- a/test/integration/targets/gcp_compute_target_https_proxy/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_target_https_proxy/tasks/main.yml
@ -115,7 +115,6 @@
  assert:
    that:
      - result.changed == true
-      - "result.kind == 'compute#targetHttpsProxy'"
 - name: verify that target_https_proxy was created
  gcp_compute_target_https_proxy_facts:
      filters:
@ -146,7 +145,6 @@
  assert:
    that:
      - result.changed == false
-      - "result.kind == 'compute#targetHttpsProxy'"
 #----------------------------------------------------------
 - name: delete a target https proxy
  gcp_compute_target_https_proxy:
--- a/test/integration/targets/gcp_compute_target_pool/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_target_pool/tasks/main.yml
@ -35,7 +35,6 @@
  assert:
    that:
      - result.changed == true
-      - "result.kind == 'compute#targetPool'"
 - name: verify that target_pool was created
  gcp_compute_target_pool_facts:
      filters:
@ -65,7 +64,6 @@
  assert:
    that:
      - result.changed == false
-      - "result.kind == 'compute#targetPool'"
 #----------------------------------------------------------
 - name: delete a target pool
  gcp_compute_target_pool:
--- a/test/integration/targets/gcp_compute_target_ssl_proxy/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_target_ssl_proxy/tasks/main.yml
@ -110,7 +110,6 @@
  assert:
    that:
      - result.changed == true
-      - "result.kind == 'compute#targetSslProxy'"
 - name: verify that target_ssl_proxy was created
  gcp_compute_target_ssl_proxy_facts:
      filters:
@ -141,7 +140,6 @@
  assert:
    that:
      - result.changed == false
-      - "result.kind == 'compute#targetSslProxy'"
 #----------------------------------------------------------
 - name: delete a target ssl proxy
  gcp_compute_target_ssl_proxy:
--- a/test/integration/targets/gcp_compute_target_tcp_proxy/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_target_tcp_proxy/tasks/main.yml
@ -75,7 +75,6 @@
  assert:
    that:
      - result.changed == true
-      - "result.kind == 'compute#targetTcpProxy'"
 - name: verify that target_tcp_proxy was created
  gcp_compute_target_tcp_proxy_facts:
      filters:
@ -105,7 +104,6 @@
  assert:
    that:
      - result.changed == false
-      - "result.kind == 'compute#targetTcpProxy'"
 #----------------------------------------------------------
 - name: delete a target tcp proxy
  gcp_compute_target_tcp_proxy:
--- a/test/integration/targets/gcp_compute_target_vpn_gateway/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_target_vpn_gateway/tasks/main.yml
@ -54,7 +54,6 @@
  assert:
    that:
      - result.changed == true
-      - "result.kind == 'compute#targetVpnGateway'"
 - name: verify that target_vpn_gateway was created
  gcp_compute_target_vpn_gateway_facts:
      filters:
@ -85,7 +84,6 @@
  assert:
    that:
      - result.changed == false
-      - "result.kind == 'compute#targetVpnGateway'"
 #----------------------------------------------------------
 - name: delete a target vpn gateway
  gcp_compute_target_vpn_gateway: