From fcc869ab7a7b2e5931c78135768ce64672ceb71b Mon Sep 17 00:00:00 2001 From: The Magician Date: Mon, 5 Aug 2019 15:25:57 -0700 Subject: [PATCH] Bug fixes for GCP modules (#60091) --- .../cloud/google/gcp_compute_target_vpn_gateway_facts.py | 1 - lib/ansible/modules/cloud/google/gcp_compute_url_map_facts.py | 1 - .../modules/cloud/google/gcp_compute_vpn_tunnel_facts.py | 1 - lib/ansible/modules/cloud/google/gcp_container_cluster_facts.py | 1 - .../modules/cloud/google/gcp_container_node_pool_facts.py | 1 - lib/ansible/modules/cloud/google/gcp_dns_managed_zone_facts.py | 1 - .../modules/cloud/google/gcp_dns_resource_record_set_facts.py | 1 - lib/ansible/modules/cloud/google/gcp_iam_role_facts.py | 1 - .../modules/cloud/google/gcp_iam_service_account_facts.py | 1 - lib/ansible/modules/cloud/google/gcp_mlengine_model_facts.py | 1 - lib/ansible/modules/cloud/google/gcp_mlengine_version_facts.py | 1 - test/integration/targets/gcp_compute_url_map/tasks/main.yml | 2 -- test/integration/targets/gcp_compute_vpn_tunnel/tasks/main.yml | 2 -- test/integration/targets/gcp_dns_managed_zone/tasks/main.yml | 2 -- .../targets/gcp_dns_resource_record_set/tasks/main.yml | 2 -- 15 files changed, 19 deletions(-) diff --git a/lib/ansible/modules/cloud/google/gcp_compute_target_vpn_gateway_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_target_vpn_gateway_facts.py index 918b793b1eb..330e5ad9cca 100644 --- a/lib/ansible/modules/cloud/google/gcp_compute_target_vpn_gateway_facts.py +++ b/lib/ansible/modules/cloud/google/gcp_compute_target_vpn_gateway_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_url_map_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_url_map_facts.py index 435a5112543..4d7f534aba3 100644 --- a/lib/ansible/modules/cloud/google/gcp_compute_url_map_facts.py +++ b/lib/ansible/modules/cloud/google/gcp_compute_url_map_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_vpn_tunnel_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_vpn_tunnel_facts.py index 2d07d881ba7..cb8690442b7 100644 --- a/lib/ansible/modules/cloud/google/gcp_compute_vpn_tunnel_facts.py +++ b/lib/ansible/modules/cloud/google/gcp_compute_vpn_tunnel_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_container_cluster_facts.py b/lib/ansible/modules/cloud/google/gcp_container_cluster_facts.py index c20357092f7..207b855e784 100644 --- a/lib/ansible/modules/cloud/google/gcp_container_cluster_facts.py +++ b/lib/ansible/modules/cloud/google/gcp_container_cluster_facts.py @@ -59,7 +59,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_container_node_pool_facts.py b/lib/ansible/modules/cloud/google/gcp_container_node_pool_facts.py index a6d3c7c2a5f..5e8539df161 100644 --- a/lib/ansible/modules/cloud/google/gcp_container_node_pool_facts.py +++ b/lib/ansible/modules/cloud/google/gcp_container_node_pool_facts.py @@ -70,7 +70,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_dns_managed_zone_facts.py b/lib/ansible/modules/cloud/google/gcp_dns_managed_zone_facts.py index 7d78a4e7d56..95a9225607a 100644 --- a/lib/ansible/modules/cloud/google/gcp_dns_managed_zone_facts.py +++ b/lib/ansible/modules/cloud/google/gcp_dns_managed_zone_facts.py @@ -53,7 +53,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_dns_resource_record_set_facts.py b/lib/ansible/modules/cloud/google/gcp_dns_resource_record_set_facts.py index 15b8c9500e5..90db02420ca 100644 --- a/lib/ansible/modules/cloud/google/gcp_dns_resource_record_set_facts.py +++ b/lib/ansible/modules/cloud/google/gcp_dns_resource_record_set_facts.py @@ -60,7 +60,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_iam_role_facts.py b/lib/ansible/modules/cloud/google/gcp_iam_role_facts.py index 4f675013995..ea421bd7410 100644 --- a/lib/ansible/modules/cloud/google/gcp_iam_role_facts.py +++ b/lib/ansible/modules/cloud/google/gcp_iam_role_facts.py @@ -49,7 +49,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_iam_service_account_facts.py b/lib/ansible/modules/cloud/google/gcp_iam_service_account_facts.py index 09b417329cc..4e130b68c1c 100644 --- a/lib/ansible/modules/cloud/google/gcp_iam_service_account_facts.py +++ b/lib/ansible/modules/cloud/google/gcp_iam_service_account_facts.py @@ -49,7 +49,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_mlengine_model_facts.py b/lib/ansible/modules/cloud/google/gcp_mlengine_model_facts.py index 1e013b3513d..e23de2af248 100644 --- a/lib/ansible/modules/cloud/google/gcp_mlengine_model_facts.py +++ b/lib/ansible/modules/cloud/google/gcp_mlengine_model_facts.py @@ -49,7 +49,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_mlengine_version_facts.py b/lib/ansible/modules/cloud/google/gcp_mlengine_version_facts.py index 57a4a41dd6d..ffd5efb5c9e 100644 --- a/lib/ansible/modules/cloud/google/gcp_mlengine_version_facts.py +++ b/lib/ansible/modules/cloud/google/gcp_mlengine_version_facts.py @@ -60,7 +60,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_url_map/tasks/main.yml b/test/integration/targets/gcp_compute_url_map/tasks/main.yml index 7d8d45afb8b..e7b4ca2733d 100644 --- a/test/integration/targets/gcp_compute_url_map/tasks/main.yml +++ b/test/integration/targets/gcp_compute_url_map/tasks/main.yml @@ -69,7 +69,6 @@ assert: that: - result.changed == true - - "result.kind == 'compute#urlMap'" - name: verify that url_map was created gcp_compute_url_map_facts: filters: @@ -98,7 +97,6 @@ assert: that: - result.changed == false - - "result.kind == 'compute#urlMap'" #---------------------------------------------------------- - name: delete a url map gcp_compute_url_map: diff --git a/test/integration/targets/gcp_compute_vpn_tunnel/tasks/main.yml b/test/integration/targets/gcp_compute_vpn_tunnel/tasks/main.yml index b13d306bc41..63a964310c8 100644 --- a/test/integration/targets/gcp_compute_vpn_tunnel/tasks/main.yml +++ b/test/integration/targets/gcp_compute_vpn_tunnel/tasks/main.yml @@ -77,7 +77,6 @@ assert: that: - result.changed == true - - "result.kind == 'compute#vpnTunnel'" - name: verify that vpn_tunnel was created gcp_compute_vpn_tunnel_facts: filters: @@ -110,7 +109,6 @@ assert: that: - result.changed == false - - "result.kind == 'compute#vpnTunnel'" #---------------------------------------------------------- - name: delete a vpn tunnel gcp_compute_vpn_tunnel: diff --git a/test/integration/targets/gcp_dns_managed_zone/tasks/main.yml b/test/integration/targets/gcp_dns_managed_zone/tasks/main.yml index 3b6c1d67974..8c75d72f6d7 100644 --- a/test/integration/targets/gcp_dns_managed_zone/tasks/main.yml +++ b/test/integration/targets/gcp_dns_managed_zone/tasks/main.yml @@ -37,7 +37,6 @@ assert: that: - result.changed == true - - "result.kind == 'dns#managedZone'" - name: verify that managed_zone was created gcp_dns_managed_zone_facts: dns_name: test.somewild2.example.com. @@ -66,7 +65,6 @@ assert: that: - result.changed == false - - "result.kind == 'dns#managedZone'" #---------------------------------------------------------- - name: delete a managed zone gcp_dns_managed_zone: diff --git a/test/integration/targets/gcp_dns_resource_record_set/tasks/main.yml b/test/integration/targets/gcp_dns_resource_record_set/tasks/main.yml index cccacb6eaf4..4527d4f503c 100644 --- a/test/integration/targets/gcp_dns_resource_record_set/tasks/main.yml +++ b/test/integration/targets/gcp_dns_resource_record_set/tasks/main.yml @@ -55,7 +55,6 @@ assert: that: - result.changed == true - - "result.kind == 'dns#resourceRecordSet'" - name: verify that resource_record_set was created gcp_dns_resource_record_set_facts: managed_zone: "{{ managed_zone }}" @@ -88,7 +87,6 @@ assert: that: - result.changed == false - - "result.kind == 'dns#resourceRecordSet'" #---------------------------------------------------------- - name: delete a resource record set gcp_dns_resource_record_set: