From 5d412d89b11a251475e237b786783cac40f8f94e Mon Sep 17 00:00:00 2001 From: The Magician Date: Mon, 22 Jul 2019 21:28:21 -0700 Subject: [PATCH] Bug fixes for GCP (as of 2019-07-09T06:06:53Z) (#59325) * Bug fixes for GCP modules * ignore syntax --- .../modules/cloud/google/gcp_redis_instance.py | 1 + .../cloud/google/gcp_resourcemanager_project.py | 1 + .../cloud/google/gcp_sourcerepo_repository.py | 1 + .../modules/cloud/google/gcp_spanner_database.py | 1 + .../modules/cloud/google/gcp_spanner_instance.py | 1 + lib/ansible/modules/cloud/google/gcp_sql_database.py | 1 + lib/ansible/modules/cloud/google/gcp_sql_instance.py | 1 + lib/ansible/modules/cloud/google/gcp_sql_user.py | 1 + .../modules/cloud/google/gcp_storage_bucket.py | 1 + .../google/gcp_storage_bucket_access_control.py | 1 + .../modules/cloud/google/gcp_storage_object.py | 1 + lib/ansible/modules/cloud/google/gcp_tpu_node.py | 1 + test/sanity/validate-modules/ignore.txt | 12 ------------ 13 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/ansible/modules/cloud/google/gcp_redis_instance.py b/lib/ansible/modules/cloud/google/gcp_redis_instance.py index 87a3347abaa..13619dcf340 100644 --- a/lib/ansible/modules/cloud/google/gcp_redis_instance.py +++ b/lib/ansible/modules/cloud/google/gcp_redis_instance.py @@ -47,6 +47,7 @@ options: - present - absent default: present + type: str alternative_location_id: description: - Only applicable to STANDARD_HA tier which protects the instance against zonal diff --git a/lib/ansible/modules/cloud/google/gcp_resourcemanager_project.py b/lib/ansible/modules/cloud/google/gcp_resourcemanager_project.py index bf9c2556203..547bef274b7 100644 --- a/lib/ansible/modules/cloud/google/gcp_resourcemanager_project.py +++ b/lib/ansible/modules/cloud/google/gcp_resourcemanager_project.py @@ -48,6 +48,7 @@ options: - present - absent default: present + type: str name: description: - 'The user-assigned display name of the Project. It must be 4 to 30 characters. diff --git a/lib/ansible/modules/cloud/google/gcp_sourcerepo_repository.py b/lib/ansible/modules/cloud/google/gcp_sourcerepo_repository.py index cb690e9bae1..b702f28fec4 100644 --- a/lib/ansible/modules/cloud/google/gcp_sourcerepo_repository.py +++ b/lib/ansible/modules/cloud/google/gcp_sourcerepo_repository.py @@ -47,6 +47,7 @@ options: - present - absent default: present + type: str name: description: - Resource name of the repository, of the form projects/{{project}}/repos/{{repo}}. diff --git a/lib/ansible/modules/cloud/google/gcp_spanner_database.py b/lib/ansible/modules/cloud/google/gcp_spanner_database.py index e59d4c950e7..1ce4fb3dd51 100644 --- a/lib/ansible/modules/cloud/google/gcp_spanner_database.py +++ b/lib/ansible/modules/cloud/google/gcp_spanner_database.py @@ -47,6 +47,7 @@ options: - present - absent default: present + type: str name: description: - A unique identifier for the database, which cannot be changed after the instance diff --git a/lib/ansible/modules/cloud/google/gcp_spanner_instance.py b/lib/ansible/modules/cloud/google/gcp_spanner_instance.py index 8b7dd74bd5f..9cfd81b5cd3 100644 --- a/lib/ansible/modules/cloud/google/gcp_spanner_instance.py +++ b/lib/ansible/modules/cloud/google/gcp_spanner_instance.py @@ -47,6 +47,7 @@ options: - present - absent default: present + type: str name: description: - A unique identifier for the instance, which cannot be changed after the instance diff --git a/lib/ansible/modules/cloud/google/gcp_sql_database.py b/lib/ansible/modules/cloud/google/gcp_sql_database.py index 523ea834db2..398d28c1110 100644 --- a/lib/ansible/modules/cloud/google/gcp_sql_database.py +++ b/lib/ansible/modules/cloud/google/gcp_sql_database.py @@ -47,6 +47,7 @@ options: - present - absent default: present + type: str charset: description: - The MySQL charset value. diff --git a/lib/ansible/modules/cloud/google/gcp_sql_instance.py b/lib/ansible/modules/cloud/google/gcp_sql_instance.py index a3c5284c1c1..c8ba028a613 100644 --- a/lib/ansible/modules/cloud/google/gcp_sql_instance.py +++ b/lib/ansible/modules/cloud/google/gcp_sql_instance.py @@ -49,6 +49,7 @@ options: - present - absent default: present + type: str backend_type: description: - "* FIRST_GEN: First Generation instance. MySQL only." diff --git a/lib/ansible/modules/cloud/google/gcp_sql_user.py b/lib/ansible/modules/cloud/google/gcp_sql_user.py index 0c52ef27d6c..64dca81f6fc 100644 --- a/lib/ansible/modules/cloud/google/gcp_sql_user.py +++ b/lib/ansible/modules/cloud/google/gcp_sql_user.py @@ -47,6 +47,7 @@ options: - present - absent default: present + type: str host: description: - The host name from which the user can connect. For insert operations, host defaults diff --git a/lib/ansible/modules/cloud/google/gcp_storage_bucket.py b/lib/ansible/modules/cloud/google/gcp_storage_bucket.py index 58ac095b85c..243c61b4125 100644 --- a/lib/ansible/modules/cloud/google/gcp_storage_bucket.py +++ b/lib/ansible/modules/cloud/google/gcp_storage_bucket.py @@ -52,6 +52,7 @@ options: - present - absent default: present + type: str acl: description: - Access controls on the bucket. diff --git a/lib/ansible/modules/cloud/google/gcp_storage_bucket_access_control.py b/lib/ansible/modules/cloud/google/gcp_storage_bucket_access_control.py index 4dac53b42db..6d58a496bcb 100644 --- a/lib/ansible/modules/cloud/google/gcp_storage_bucket_access_control.py +++ b/lib/ansible/modules/cloud/google/gcp_storage_bucket_access_control.py @@ -56,6 +56,7 @@ options: - present - absent default: present + type: str bucket: description: - The name of the bucket. diff --git a/lib/ansible/modules/cloud/google/gcp_storage_object.py b/lib/ansible/modules/cloud/google/gcp_storage_object.py index 99b5c464f40..fc3c304733e 100644 --- a/lib/ansible/modules/cloud/google/gcp_storage_object.py +++ b/lib/ansible/modules/cloud/google/gcp_storage_object.py @@ -47,6 +47,7 @@ options: - present - absent default: present + type: str action: description: - Upload or download from the bucket. diff --git a/lib/ansible/modules/cloud/google/gcp_tpu_node.py b/lib/ansible/modules/cloud/google/gcp_tpu_node.py index afd00aceb0d..45b3e8d56fb 100644 --- a/lib/ansible/modules/cloud/google/gcp_tpu_node.py +++ b/lib/ansible/modules/cloud/google/gcp_tpu_node.py @@ -47,6 +47,7 @@ options: - present - absent default: present + type: str name: description: - The immutable name of the TPU. diff --git a/test/sanity/validate-modules/ignore.txt b/test/sanity/validate-modules/ignore.txt index 86232056bdc..9a20236869d 100644 --- a/test/sanity/validate-modules/ignore.txt +++ b/test/sanity/validate-modules/ignore.txt @@ -734,22 +734,10 @@ lib/ansible/modules/cloud/google/gcp_iam_service_account_key.py E337 lib/ansible/modules/cloud/google/gcp_iam_service_account.py E337 lib/ansible/modules/cloud/google/gcp_pubsub_subscription.py E337 lib/ansible/modules/cloud/google/gcp_pubsub_topic.py E337 -lib/ansible/modules/cloud/google/gcp_redis_instance.py E337 -lib/ansible/modules/cloud/google/gcp_resourcemanager_project.py E337 -lib/ansible/modules/cloud/google/gcp_sourcerepo_repository.py E337 -lib/ansible/modules/cloud/google/gcp_spanner_database.py E337 -lib/ansible/modules/cloud/google/gcp_spanner_instance.py E337 -lib/ansible/modules/cloud/google/gcp_sql_database.py E337 -lib/ansible/modules/cloud/google/gcp_sql_instance.py E337 -lib/ansible/modules/cloud/google/gcp_sql_user.py E337 -lib/ansible/modules/cloud/google/gcp_storage_bucket_access_control.py E337 -lib/ansible/modules/cloud/google/gcp_storage_bucket.py E337 -lib/ansible/modules/cloud/google/gcp_storage_object.py E337 lib/ansible/modules/cloud/google/_gcp_target_proxy.py E322 lib/ansible/modules/cloud/google/_gcp_target_proxy.py E326 lib/ansible/modules/cloud/google/_gcp_target_proxy.py E337 lib/ansible/modules/cloud/google/_gcp_target_proxy.py E338 -lib/ansible/modules/cloud/google/gcp_tpu_node.py E337 lib/ansible/modules/cloud/google/gcpubsub_facts.py E322 lib/ansible/modules/cloud/google/gcpubsub_facts.py E324 lib/ansible/modules/cloud/google/gcpubsub_facts.py E326