Bug fixes for GCP modules (#60092)

lib/ansible/modules/cloud/google/gcp_pubsub_subscription_facts.py

@@ -49,7 +49,6 @@ EXAMPLES = '''
     project: test_project
     auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
-    state: facts
 '''
 
 RETURN = '''

lib/ansible/modules/cloud/google/gcp_pubsub_topic_facts.py

@@ -49,7 +49,6 @@ EXAMPLES = '''
     project: test_project
     auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
-    state: facts
 '''
 
 RETURN = '''

lib/ansible/modules/cloud/google/gcp_redis_instance_facts.py

@@ -55,7 +55,6 @@ EXAMPLES = '''
     project: test_project
     auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
-    state: facts
 '''
 
 RETURN = '''

lib/ansible/modules/cloud/google/gcp_resourcemanager_project_facts.py

@@ -49,7 +49,6 @@ EXAMPLES = '''
     project: test_project
     auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
-    state: facts
 '''
 
 RETURN = '''

lib/ansible/modules/cloud/google/gcp_sourcerepo_repository_facts.py

@@ -49,7 +49,6 @@ EXAMPLES = '''
     project: test_project
     auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
-    state: facts
 '''
 
 RETURN = '''

lib/ansible/modules/cloud/google/gcp_spanner_database.py

@@ -186,8 +186,7 @@ def create(module, link):
 
 
 def update(module, link):
-    delete(module, self_link(module))
-    create(module, collection(module))
+    module.fail_json(msg="Spanner objects can't be updated to ensure data safety")
 
 
 def delete(module, link):

lib/ansible/modules/cloud/google/gcp_spanner_database_facts.py

@@ -60,7 +60,6 @@ EXAMPLES = '''
     project: test_project
     auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
-    state: facts
 '''
 
 RETURN = '''

lib/ansible/modules/cloud/google/gcp_spanner_instance.py

@@ -202,8 +202,7 @@ def create(module, link):
 
 
 def update(module, link):
-    auth = GcpSession(module, 'spanner')
-    return wait_for_operation(module, auth.patch(link, resource_to_update(module)))
+    module.fail_json(msg="Spanner objects can't be updated to ensure data safety")
 
 
 def delete(module, link):

lib/ansible/modules/cloud/google/gcp_spanner_instance_facts.py

@@ -49,7 +49,6 @@ EXAMPLES = '''
     project: test_project
     auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
-    state: facts
 '''
 
 RETURN = '''

lib/ansible/modules/cloud/google/gcp_sql_database.py

@@ -187,8 +187,7 @@ def create(module, link, kind):
 
 
 def update(module, link, kind):
-    auth = GcpSession(module, 'sql')
-    return wait_for_operation(module, auth.put(link, resource_to_request(module)))
+    module.fail_json(msg="SQL objects can't be updated to ensure data safety")
 
 
 def delete(module, link, kind):

lib/ansible/modules/cloud/google/gcp_sql_database_facts.py

@@ -55,7 +55,6 @@ EXAMPLES = '''
     project: test_project
     auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
-    state: facts
 '''
 
 RETURN = '''

lib/ansible/modules/cloud/google/gcp_sql_instance.py

@@ -763,8 +763,7 @@ def create(module, link, kind):
 
 
 def update(module, link, kind, fetch):
-    auth = GcpSession(module, 'sql')
-    return wait_for_operation(module, auth.put(link, resource_to_request(module)))
+    module.fail_json(msg="SQL objects can't be updated to ensure data safety")
 
 
 def delete(module, link, kind, fetch):

lib/ansible/modules/cloud/google/gcp_sql_instance_facts.py

@@ -49,7 +49,6 @@ EXAMPLES = '''
     project: test_project
     auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
-    state: facts
 '''
 
 RETURN = '''

lib/ansible/modules/cloud/google/gcp_sql_user.py

@@ -215,7 +215,7 @@ def resource_to_request(module):
 
 
 def unwrap_resource_filter(module):
-    return {'host': module.params['host'], 'name': module.params['name']}
+    return {'name': module.params['name'], 'host': module.params['host']}
 
 
 def unwrap_resource(result, module):

lib/ansible/modules/cloud/google/gcp_sql_user_facts.py

@@ -60,7 +60,6 @@ EXAMPLES = '''
     project: test_project
     auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
-    state: facts
 '''
 
 RETURN = '''

test/integration/targets/gcp_sql_database/tasks/main.yml

@@ -52,7 +52,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'sql#database'"
 - name: verify that database was created
   gcp_sql_database_facts:
       instance: "{{ instance }}"
@@ -81,7 +80,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'sql#database'"
 #----------------------------------------------------------
 - name: delete a database
   gcp_sql_database:

test/integration/targets/gcp_sql_instance/tasks/main.yml

@@ -47,7 +47,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'sql#instance'"
 - name: verify that instance was created
   gcp_sql_instance_facts:
       project: "{{ gcp_project }}"
@@ -80,7 +79,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'sql#instance'"
 #----------------------------------------------------------
 - name: delete a instance
   gcp_sql_instance:

test/integration/targets/gcp_sql_user/tasks/main.yml

@@ -54,7 +54,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'sql#user'"
 - name: verify that user was created
   gcp_sql_user_facts:
       instance: "{{ instance }}"
@@ -84,7 +83,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'sql#user'"
 #----------------------------------------------------------
 - name: delete a user
   gcp_sql_user:

test/integration/targets/gcp_storage_bucket/tasks/main.yml

@@ -33,7 +33,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'storage#bucket'"
 # ----------------------------------------------------------------------------
 - name: create a bucket that already exists
   gcp_storage_bucket:
@@ -47,7 +46,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'storage#bucket'"
 #----------------------------------------------------------
 - name: delete a bucket
   gcp_storage_bucket:

test/integration/targets/gcp_storage_bucket_access_control/tasks/main.yml

@@ -45,7 +45,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'storage#bucketAccessControl'"
 # ----------------------------------------------------------------------------
 - name: create a bucket access control that already exists
   gcp_storage_bucket_access_control:
@@ -61,7 +60,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'storage#bucketAccessControl'"
 #----------------------------------------------------------
 - name: delete a bucket access control
   gcp_storage_bucket_access_control: