From 8241fd88de5a8150f0c2c7f3eed2cc28796d96ef Mon Sep 17 00:00:00 2001 From: The Magician Date: Mon, 5 Aug 2019 15:26:06 -0700 Subject: [PATCH] Bug fixes for GCP modules (#60090) --- .../modules/cloud/google/gcp_compute_region_disk_facts.py | 1 - lib/ansible/modules/cloud/google/gcp_compute_route_facts.py | 1 - lib/ansible/modules/cloud/google/gcp_compute_router_facts.py | 1 - .../modules/cloud/google/gcp_compute_ssl_certificate_facts.py | 1 - .../modules/cloud/google/gcp_compute_ssl_policy_facts.py | 1 - .../modules/cloud/google/gcp_compute_subnetwork_facts.py | 1 - .../modules/cloud/google/gcp_compute_target_http_proxy_facts.py | 1 - .../cloud/google/gcp_compute_target_https_proxy_facts.py | 1 - .../modules/cloud/google/gcp_compute_target_pool_facts.py | 1 - .../modules/cloud/google/gcp_compute_target_ssl_proxy_facts.py | 1 - .../modules/cloud/google/gcp_compute_target_tcp_proxy_facts.py | 1 - test/integration/targets/gcp_compute_region_disk/tasks/main.yml | 2 -- test/integration/targets/gcp_compute_route/tasks/main.yml | 2 -- test/integration/targets/gcp_compute_router/tasks/main.yml | 2 -- .../targets/gcp_compute_ssl_certificate/tasks/main.yml | 2 -- test/integration/targets/gcp_compute_ssl_policy/tasks/main.yml | 2 -- test/integration/targets/gcp_compute_subnetwork/tasks/main.yml | 2 -- .../targets/gcp_compute_target_http_proxy/tasks/main.yml | 2 -- .../targets/gcp_compute_target_https_proxy/tasks/main.yml | 2 -- test/integration/targets/gcp_compute_target_pool/tasks/main.yml | 2 -- .../targets/gcp_compute_target_ssl_proxy/tasks/main.yml | 2 -- .../targets/gcp_compute_target_tcp_proxy/tasks/main.yml | 2 -- .../targets/gcp_compute_target_vpn_gateway/tasks/main.yml | 2 -- 23 files changed, 35 deletions(-) diff --git a/lib/ansible/modules/cloud/google/gcp_compute_region_disk_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_region_disk_facts.py index 0c38e416948..5f64baab14c 100644 --- 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 = ''' diff --git a/lib/ansible/modules/cloud/google/gcp_compute_route_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_route_facts.py index 2816957d1f1..2aafad9896d 100644 --- 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 = ''' diff --git a/lib/ansible/modules/cloud/google/gcp_compute_router_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_router_facts.py index b0a62d6b0f8..733975bcd13 100644 --- 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 = ''' diff --git a/lib/ansible/modules/cloud/google/gcp_compute_ssl_certificate_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_ssl_certificate_facts.py index 840d266629a..275227e4222 100644 --- 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 = ''' diff --git a/lib/ansible/modules/cloud/google/gcp_compute_ssl_policy_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_ssl_policy_facts.py index 8ebbd8e1366..c8d8bbc1e6f 100644 --- 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 = ''' diff --git a/lib/ansible/modules/cloud/google/gcp_compute_subnetwork_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_subnetwork_facts.py index 84e5667e79f..baa697ef66d 100644 --- 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 = ''' diff --git 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 index 810d8290e73..07964a14fbe 100644 --- 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 = ''' diff --git 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 index e409708e8ea..afbb31ac8b9 100644 --- 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 = ''' diff --git a/lib/ansible/modules/cloud/google/gcp_compute_target_pool_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_target_pool_facts.py index 2d84a6410ba..540fd117dd0 100644 --- 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 = ''' diff --git 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 index 202d763806a..a1a332789f9 100644 --- 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 = ''' diff --git 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 index a2f91c6bff2..8d777a1e689 100644 --- 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 = ''' diff --git a/test/integration/targets/gcp_compute_region_disk/tasks/main.yml b/test/integration/targets/gcp_compute_region_disk/tasks/main.yml index 85d7aa3cf4c..b2cc4e626d5 100644 --- 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: diff --git a/test/integration/targets/gcp_compute_route/tasks/main.yml b/test/integration/targets/gcp_compute_route/tasks/main.yml index dbf5540f37b..ebaaa659be9 100644 --- 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: diff --git a/test/integration/targets/gcp_compute_router/tasks/main.yml b/test/integration/targets/gcp_compute_router/tasks/main.yml index eb4f89f338a..da46eb280b9 100644 --- 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: diff --git a/test/integration/targets/gcp_compute_ssl_certificate/tasks/main.yml b/test/integration/targets/gcp_compute_ssl_certificate/tasks/main.yml index c4847e7ae81..b715841cdda 100644 --- 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: diff --git a/test/integration/targets/gcp_compute_ssl_policy/tasks/main.yml b/test/integration/targets/gcp_compute_ssl_policy/tasks/main.yml index 4073a31ca5d..56d27b688b7 100644 --- 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: diff --git a/test/integration/targets/gcp_compute_subnetwork/tasks/main.yml b/test/integration/targets/gcp_compute_subnetwork/tasks/main.yml index 6a865a7fa6d..a1e8672f205 100644 --- 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: diff --git a/test/integration/targets/gcp_compute_target_http_proxy/tasks/main.yml b/test/integration/targets/gcp_compute_target_http_proxy/tasks/main.yml index 761b298a939..23bb30133c5 100644 --- 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: diff --git a/test/integration/targets/gcp_compute_target_https_proxy/tasks/main.yml b/test/integration/targets/gcp_compute_target_https_proxy/tasks/main.yml index 3ec4205abf4..ac449524fb8 100644 --- 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: diff --git a/test/integration/targets/gcp_compute_target_pool/tasks/main.yml b/test/integration/targets/gcp_compute_target_pool/tasks/main.yml index fcc07bcd175..c5e83fc5475 100644 --- 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: diff --git a/test/integration/targets/gcp_compute_target_ssl_proxy/tasks/main.yml b/test/integration/targets/gcp_compute_target_ssl_proxy/tasks/main.yml index edea932fffd..3284559036d 100644 --- 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: diff --git a/test/integration/targets/gcp_compute_target_tcp_proxy/tasks/main.yml b/test/integration/targets/gcp_compute_target_tcp_proxy/tasks/main.yml index bf531bdf438..55d72bcad83 100644 --- 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: diff --git a/test/integration/targets/gcp_compute_target_vpn_gateway/tasks/main.yml b/test/integration/targets/gcp_compute_target_vpn_gateway/tasks/main.yml index 5db4472af47..c2d2e86e64e 100644 --- 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: