From c1a99c390cd06212bd4f739a38b27a7260714a36 Mon Sep 17 00:00:00 2001 From: The Magician Date: Mon, 5 Aug 2019 15:16:26 -0700 Subject: [PATCH] Bug fixes for GCP modules (#60088) --- .../modules/cloud/google/gcp_appengine_firewall_rule_facts.py | 1 - lib/ansible/modules/cloud/google/gcp_bigquery_dataset_facts.py | 1 - lib/ansible/modules/cloud/google/gcp_bigquery_table_facts.py | 1 - .../modules/cloud/google/gcp_cloudbuild_trigger_facts.py | 1 - .../modules/cloud/google/gcp_cloudscheduler_job_facts.py | 1 - .../modules/cloud/google/gcp_compute_backend_bucket_facts.py | 1 - .../modules/cloud/google/gcp_compute_backend_service_facts.py | 1 - lib/ansible/modules/cloud/google/gcp_compute_disk_facts.py | 1 - lib/ansible/modules/cloud/google/gcp_compute_firewall_facts.py | 1 - .../modules/cloud/google/gcp_compute_forwarding_rule_facts.py | 1 - test/integration/targets/gcp_bigquery_dataset/tasks/main.yml | 2 -- test/integration/targets/gcp_bigquery_table/tasks/main.yml | 2 -- test/integration/targets/gcp_compute_address/tasks/main.yml | 2 -- .../targets/gcp_compute_backend_bucket/tasks/main.yml | 2 -- .../targets/gcp_compute_backend_service/tasks/main.yml | 2 -- test/integration/targets/gcp_compute_disk/tasks/main.yml | 2 -- test/integration/targets/gcp_compute_firewall/tasks/main.yml | 2 -- .../targets/gcp_compute_forwarding_rule/tasks/main.yml | 2 -- .../targets/gcp_compute_global_address/tasks/main.yml | 2 -- 19 files changed, 28 deletions(-) diff --git a/lib/ansible/modules/cloud/google/gcp_appengine_firewall_rule_facts.py b/lib/ansible/modules/cloud/google/gcp_appengine_firewall_rule_facts.py index c1e187c36c..4fe22b1e96 100644 --- a/lib/ansible/modules/cloud/google/gcp_appengine_firewall_rule_facts.py +++ b/lib/ansible/modules/cloud/google/gcp_appengine_firewall_rule_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_bigquery_dataset_facts.py b/lib/ansible/modules/cloud/google/gcp_bigquery_dataset_facts.py index c2890120dd..5b4df2379c 100644 --- a/lib/ansible/modules/cloud/google/gcp_bigquery_dataset_facts.py +++ b/lib/ansible/modules/cloud/google/gcp_bigquery_dataset_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_bigquery_table_facts.py b/lib/ansible/modules/cloud/google/gcp_bigquery_table_facts.py index eeaaa59943..8d035b2f3b 100644 --- a/lib/ansible/modules/cloud/google/gcp_bigquery_table_facts.py +++ b/lib/ansible/modules/cloud/google/gcp_bigquery_table_facts.py @@ -55,7 +55,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_cloudbuild_trigger_facts.py b/lib/ansible/modules/cloud/google/gcp_cloudbuild_trigger_facts.py index 283c943027..c3764a9198 100644 --- a/lib/ansible/modules/cloud/google/gcp_cloudbuild_trigger_facts.py +++ b/lib/ansible/modules/cloud/google/gcp_cloudbuild_trigger_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_cloudscheduler_job_facts.py b/lib/ansible/modules/cloud/google/gcp_cloudscheduler_job_facts.py index 51052c8de9..0cbd05abc0 100644 --- a/lib/ansible/modules/cloud/google/gcp_cloudscheduler_job_facts.py +++ b/lib/ansible/modules/cloud/google/gcp_cloudscheduler_job_facts.py @@ -55,7 +55,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_backend_bucket_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_backend_bucket_facts.py index d65f67b21e..53c1cce69e 100644 --- a/lib/ansible/modules/cloud/google/gcp_compute_backend_bucket_facts.py +++ b/lib/ansible/modules/cloud/google/gcp_compute_backend_bucket_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_backend_service_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_backend_service_facts.py index 1730d98ea6..1a8e192fcf 100644 --- a/lib/ansible/modules/cloud/google/gcp_compute_backend_service_facts.py +++ b/lib/ansible/modules/cloud/google/gcp_compute_backend_service_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_disk_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_disk_facts.py index 382ce991cc..8f4a73f969 100644 --- a/lib/ansible/modules/cloud/google/gcp_compute_disk_facts.py +++ b/lib/ansible/modules/cloud/google/gcp_compute_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_firewall_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_firewall_facts.py index 31a4d8fd82..e5de5037b2 100644 --- a/lib/ansible/modules/cloud/google/gcp_compute_firewall_facts.py +++ b/lib/ansible/modules/cloud/google/gcp_compute_firewall_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_forwarding_rule_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_forwarding_rule_facts.py index 15600bd57c..1cf45a5960 100644 --- a/lib/ansible/modules/cloud/google/gcp_compute_forwarding_rule_facts.py +++ b/lib/ansible/modules/cloud/google/gcp_compute_forwarding_rule_facts.py @@ -63,7 +63,6 @@ EXAMPLES = ''' project: test_project auth_kind: serviceaccount service_account_file: "/tmp/auth.pem" - state: facts ''' RETURN = ''' diff --git a/test/integration/targets/gcp_bigquery_dataset/tasks/main.yml b/test/integration/targets/gcp_bigquery_dataset/tasks/main.yml index 0eba0b4e5f..a37964fe2c 100644 --- a/test/integration/targets/gcp_bigquery_dataset/tasks/main.yml +++ b/test/integration/targets/gcp_bigquery_dataset/tasks/main.yml @@ -37,7 +37,6 @@ assert: that: - result.changed == true - - "result.kind == 'bigquery#dataset'" - name: verify that dataset was created gcp_bigquery_dataset_facts: project: "{{ gcp_project }}" @@ -65,7 +64,6 @@ assert: that: - result.changed == false - - "result.kind == 'bigquery#dataset'" #---------------------------------------------------------- - name: delete a dataset gcp_bigquery_dataset: diff --git a/test/integration/targets/gcp_bigquery_table/tasks/main.yml b/test/integration/targets/gcp_bigquery_table/tasks/main.yml index 8d454099dd..90993bedcc 100644 --- a/test/integration/targets/gcp_bigquery_table/tasks/main.yml +++ b/test/integration/targets/gcp_bigquery_table/tasks/main.yml @@ -53,7 +53,6 @@ assert: that: - result.changed == true - - "result.kind == 'bigquery#table'" - name: verify that table was created gcp_bigquery_table_facts: dataset: example_dataset @@ -85,7 +84,6 @@ assert: that: - result.changed == false - - "result.kind == 'bigquery#table'" #---------------------------------------------------------- - name: delete a table gcp_bigquery_table: diff --git a/test/integration/targets/gcp_compute_address/tasks/main.yml b/test/integration/targets/gcp_compute_address/tasks/main.yml index 71631237a4..cf6cda5566 100644 --- a/test/integration/targets/gcp_compute_address/tasks/main.yml +++ b/test/integration/targets/gcp_compute_address/tasks/main.yml @@ -35,7 +35,6 @@ assert: that: - result.changed == true - - "result.kind == 'compute#address'" - name: verify that address was created gcp_compute_address_facts: filters: @@ -65,7 +64,6 @@ assert: that: - result.changed == false - - "result.kind == 'compute#address'" #---------------------------------------------------------- - name: delete a address gcp_compute_address: diff --git a/test/integration/targets/gcp_compute_backend_bucket/tasks/main.yml b/test/integration/targets/gcp_compute_backend_bucket/tasks/main.yml index 35c452d8dd..fa7feb8cab 100644 --- a/test/integration/targets/gcp_compute_backend_bucket/tasks/main.yml +++ b/test/integration/targets/gcp_compute_backend_bucket/tasks/main.yml @@ -47,7 +47,6 @@ assert: that: - result.changed == true - - "result.kind == 'compute#backendBucket'" - name: verify that backend_bucket was created gcp_compute_backend_bucket_facts: filters: @@ -78,7 +77,6 @@ assert: that: - result.changed == false - - "result.kind == 'compute#backendBucket'" #---------------------------------------------------------- - name: delete a backend bucket gcp_compute_backend_bucket: diff --git a/test/integration/targets/gcp_compute_backend_service/tasks/main.yml b/test/integration/targets/gcp_compute_backend_service/tasks/main.yml index 8e49959e1b..5457be19bd 100644 --- a/test/integration/targets/gcp_compute_backend_service/tasks/main.yml +++ b/test/integration/targets/gcp_compute_backend_service/tasks/main.yml @@ -64,7 +64,6 @@ assert: that: - result.changed == true - - "result.kind == 'compute#backendService'" - name: verify that backend_service was created gcp_compute_backend_service_facts: filters: @@ -97,7 +96,6 @@ assert: that: - result.changed == false - - "result.kind == 'compute#backendService'" #---------------------------------------------------------- - name: delete a backend service gcp_compute_backend_service: diff --git a/test/integration/targets/gcp_compute_disk/tasks/main.yml b/test/integration/targets/gcp_compute_disk/tasks/main.yml index bc524b14f0..874176d522 100644 --- a/test/integration/targets/gcp_compute_disk/tasks/main.yml +++ b/test/integration/targets/gcp_compute_disk/tasks/main.yml @@ -41,7 +41,6 @@ assert: that: - result.changed == true - - "result.kind == 'compute#disk'" - name: verify that disk was created gcp_compute_disk_facts: filters: @@ -74,7 +73,6 @@ assert: that: - result.changed == false - - "result.kind == 'compute#disk'" #---------------------------------------------------------- - name: delete a disk gcp_compute_disk: diff --git a/test/integration/targets/gcp_compute_firewall/tasks/main.yml b/test/integration/targets/gcp_compute_firewall/tasks/main.yml index b58e1fde0c..231eb28fd8 100644 --- a/test/integration/targets/gcp_compute_firewall/tasks/main.yml +++ b/test/integration/targets/gcp_compute_firewall/tasks/main.yml @@ -51,7 +51,6 @@ assert: that: - result.changed == true - - "result.kind == 'compute#firewall'" - name: verify that firewall was created gcp_compute_firewall_facts: filters: @@ -88,7 +87,6 @@ assert: that: - result.changed == false - - "result.kind == 'compute#firewall'" #---------------------------------------------------------- - name: delete a firewall gcp_compute_firewall: diff --git a/test/integration/targets/gcp_compute_forwarding_rule/tasks/main.yml b/test/integration/targets/gcp_compute_forwarding_rule/tasks/main.yml index facd4daaa0..c0560dfe39 100644 --- a/test/integration/targets/gcp_compute_forwarding_rule/tasks/main.yml +++ b/test/integration/targets/gcp_compute_forwarding_rule/tasks/main.yml @@ -61,7 +61,6 @@ assert: that: - result.changed == true - - "result.kind == 'compute#forwardingRule'" - name: verify that forwarding_rule was created gcp_compute_forwarding_rule_facts: filters: @@ -95,7 +94,6 @@ assert: that: - result.changed == false - - "result.kind == 'compute#forwardingRule'" #---------------------------------------------------------- - name: delete a forwarding rule gcp_compute_forwarding_rule: diff --git a/test/integration/targets/gcp_compute_global_address/tasks/main.yml b/test/integration/targets/gcp_compute_global_address/tasks/main.yml index c0cc1097f6..8dbfa8b5d5 100644 --- a/test/integration/targets/gcp_compute_global_address/tasks/main.yml +++ b/test/integration/targets/gcp_compute_global_address/tasks/main.yml @@ -33,7 +33,6 @@ assert: that: - result.changed == true - - "result.kind == 'compute#address'" - name: verify that global_address was created gcp_compute_global_address_facts: filters: @@ -61,7 +60,6 @@ assert: that: - result.changed == false - - "result.kind == 'compute#address'" #---------------------------------------------------------- - name: delete a global address gcp_compute_global_address: