Ansible integration test fixes - pt 2 (#1016)

Merged PR #1016.
GoogleCloudPlatform · Dec 14, 2018 · fd916c1 · fd916c1
1 parent 09d5132
commit fd916c1
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 9 deletions.
diff --git a/build/ansible b/build/ansible
diff --git a/build/terraform b/build/terraform
diff --git a/build/terraform-beta b/build/terraform-beta
diff --git a/products/compute/examples/ansible/vpn_tunnel.yaml b/products/compute/examples/ansible/vpn_tunnel.yaml
@@ -49,7 +49,7 @@ dependencies:
       auth_kind: <%= ctx[:auth_kind] %>
       service_account_file: <%= ctx[:service_account_file] %>
 task: !ruby/object:Provider::Ansible::Task
-  name: gcp_compute_vpn-tunnel
+  name: gcp_compute_vpn_tunnel
   code:
     name: <%= ctx[:name] %>
     region: us-west1

diff --git a/products/iam/examples/ansible/service_account.yaml b/products/iam/examples/ansible/service_account.yaml
@@ -14,7 +14,8 @@
 task: !ruby/object:Provider::Ansible::Task
   name: gcp_iam_service_account
   code:
-    name: 'test-ansible@graphite-playground.google.com.iam.gserviceaccount.com'
+    name: >
+      "{{resource_name}}@{{gcp_project}}.google.com.iam.gserviceaccount.com"
     display_name: 'My Ansible test key'
     project: <%= ctx[:project] %>
     auth_kind: <%= ctx[:auth_kind] %>

diff --git a/products/sql/examples/ansible/database.yaml b/products/sql/examples/ansible/database.yaml
@@ -15,7 +15,9 @@ dependencies:
   - !ruby/object:Provider::Ansible::Task
     name: gcp_sql_instance
     code:
-      name: <%= ctx[:name] %>
+      # resource_name shared across entire test suite.
+      # All SQL instances must have unique names
+      name: "{{resource_name}}-3"
       settings:
         ip_configuration:
           authorized_networks:

diff --git a/products/sql/examples/ansible/instance.yaml b/products/sql/examples/ansible/instance.yaml
@@ -14,7 +14,9 @@
 task: !ruby/object:Provider::Ansible::Task
   name: gcp_sql_instance
   code:
-    name: <%= ctx[:name] %>
+    # resource_name shared across entire test suite.
+    # All SQL instances must have unique names
+    name: "{{resource_name}}-2"
     settings:
       ip_configuration:
         authorized_networks:

diff --git a/products/sql/examples/ansible/user.yaml b/products/sql/examples/ansible/user.yaml
@@ -15,7 +15,9 @@ dependencies:
   - !ruby/object:Provider::Ansible::Task
     name: gcp_sql_instance
     code:
-      name: <%= ctx[:name] %>
+      # resource_name shared across entire test suite.
+      # All SQL instances must have unique names
+      name: "{{resource_name}}-1"
       settings:
         ip_configuration:
           authorized_networks:

diff --git a/products/storage/examples/ansible/bucket_access_control.yaml b/products/storage/examples/ansible/bucket_access_control.yaml
@@ -24,7 +24,7 @@ dependencies:
   - !ruby/object:Provider::Ansible::Task
     name: gcp_storage_bucket
     code:
-      name: <%= dependency_name('bucket', 'bac') %>
+      name: <%= ctx[:name] %>
       project: <%= ctx[:project] %>
       auth_kind: <%= ctx[:auth_kind] %>
       service_account_file: <%= ctx[:service_account_file] %>
+2 −2		lib/ansible/modules/cloud/google/gcp_compute_vpn_tunnel.py
+3 −1		lib/ansible/modules/cloud/google/gcp_iam_service_account.py
+1 −1		lib/ansible/modules/cloud/google/gcp_sql_database.py
+1 −1		lib/ansible/modules/cloud/google/gcp_sql_instance.py
+1 −1		lib/ansible/modules/cloud/google/gcp_sql_user.py
+1 −1		lib/ansible/modules/cloud/google/gcp_storage_bucket_access_control.py
+10 −10		test/integration/targets/gcp_compute_vpn_tunnel/tasks/main.yml
+15 −5		test/integration/targets/gcp_iam_service_account/tasks/main.yml
+2 −2		test/integration/targets/gcp_sql_database/tasks/main.yml
+5 −5		test/integration/targets/gcp_sql_instance/tasks/main.yml
+2 −2		test/integration/targets/gcp_sql_user/tasks/main.yml
+2 −2		test/integration/targets/gcp_storage_bucket_access_control/tasks/main.yml