Integration Test fixes for BucketAccessControl and SQL Database (#368)

Signed-off-by: Modular Magician <magic-modules@google.com>

tests/integration/gcp_sql_database/tasks/main.yml

@@ -32,7 +32,7 @@
   gcp_sql_database:
     name: "{{ resource_name }}"
     charset: utf8
-    instance: "{{ instance }}"
+    instance: "{{ instance.name }}"
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
     service_account_file: "{{ gcp_cred_file }}"
@@ -42,7 +42,7 @@
   gcp_sql_database:
     name: "{{ resource_name }}"
     charset: utf8
-    instance: "{{ instance }}"
+    instance: "{{ instance.name }}"
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
     service_account_file: "{{ gcp_cred_file }}"
@@ -54,7 +54,7 @@
       - result.changed == true
 - name: verify that database was created
   gcp_sql_database_info:
-      instance: "{{ instance }}"
+      instance: "{{ instance.name }}"
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
@@ -70,7 +70,7 @@
   gcp_sql_database:
     name: "{{ resource_name }}"
     charset: utf8
-    instance: "{{ instance }}"
+    instance: "{{ instance.name }}"
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
     service_account_file: "{{ gcp_cred_file }}"
@@ -85,7 +85,7 @@
   gcp_sql_database:
     name: "{{ resource_name }}"
     charset: utf8
-    instance: "{{ instance }}"
+    instance: "{{ instance.name }}"
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
     service_account_file: "{{ gcp_cred_file }}"
@@ -97,7 +97,7 @@
       - result.changed == true
 - name: verify that database was deleted
   gcp_sql_database_info:
-      instance: "{{ instance }}"
+      instance: "{{ instance.name }}"
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
@@ -113,7 +113,7 @@
   gcp_sql_database:
     name: "{{ resource_name }}"
     charset: utf8
-    instance: "{{ instance }}"
+    instance: "{{ instance.name }}"
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
     service_account_file: "{{ gcp_cred_file }}"

tests/integration/gcp_storage_bucket_access_control/tasks/main.yml

@@ -23,7 +23,7 @@
   register: bucket
 - name: delete a bucket access control
   gcp_storage_bucket_access_control:
-    bucket: "{{ resource_name }}"
+    bucket: "{{ bucket }}"
     entity: user-alexstephen@google.com
     role: WRITER
     project: "{{ gcp_project }}"
@@ -33,7 +33,7 @@
 #----------------------------------------------------------
 - name: create a bucket access control
   gcp_storage_bucket_access_control:
-    bucket: "{{ resource_name }}"
+    bucket: "{{ bucket }}"
     entity: user-alexstephen@google.com
     role: WRITER
     project: "{{ gcp_project }}"
@@ -48,7 +48,7 @@
 # ----------------------------------------------------------------------------
 - name: create a bucket access control that already exists
   gcp_storage_bucket_access_control:
-    bucket: "{{ resource_name }}"
+    bucket: "{{ bucket }}"
     entity: user-alexstephen@google.com
     role: WRITER
     project: "{{ gcp_project }}"
@@ -63,7 +63,7 @@
 #----------------------------------------------------------
 - name: delete a bucket access control
   gcp_storage_bucket_access_control:
-    bucket: "{{ resource_name }}"
+    bucket: "{{ bucket }}"
     entity: user-alexstephen@google.com
     role: WRITER
     project: "{{ gcp_project }}"
@@ -78,7 +78,7 @@
 # ----------------------------------------------------------------------------
 - name: delete a bucket access control that does not exist
   gcp_storage_bucket_access_control:
-    bucket: "{{ resource_name }}"
+    bucket: "{{ bucket }}"
     entity: user-alexstephen@google.com
     role: WRITER
     project: "{{ gcp_project }}"