From e2529315fd30329fae80ec9deec353296c47691b Mon Sep 17 00:00:00 2001 From: Alex Stephen Date: Mon, 10 Dec 2018 10:50:49 -0800 Subject: [PATCH 1/4] SQL fixes --- products/sql/examples/ansible/database.yaml | 4 +++- products/sql/examples/ansible/instance.yaml | 4 +++- products/sql/examples/ansible/user.yaml | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/products/sql/examples/ansible/database.yaml b/products/sql/examples/ansible/database.yaml index 4bd48e01e1c9..2b190be60c05 100644 --- 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 index bbe480341996..4d97727123cd 100644 --- 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 index 108a54b5df70..0cf92cd213e5 100644 --- 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: From 0b0bf744c29b51dacb744b8f42f2bde5ac3ec31f Mon Sep 17 00:00:00 2001 From: Alex Stephen Date: Mon, 10 Dec 2018 10:51:02 -0800 Subject: [PATCH 2/4] bucket access and vpn tunnel fixes --- products/compute/examples/ansible/vpn_tunnel.yaml | 2 +- products/storage/examples/ansible/bucket_access_control.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/products/compute/examples/ansible/vpn_tunnel.yaml b/products/compute/examples/ansible/vpn_tunnel.yaml index 48d278b922a2..c736ea990e8f 100644 --- 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/storage/examples/ansible/bucket_access_control.yaml b/products/storage/examples/ansible/bucket_access_control.yaml index 01d5405fba55..7f749381fef8 100644 --- 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] %> From d5d8f5c9f96097d83d0d017b50841792f2e021c0 Mon Sep 17 00:00:00 2001 From: Alex Stephen Date: Mon, 10 Dec 2018 10:56:01 -0800 Subject: [PATCH 3/4] compiler fix --- products/storage/examples/ansible/bucket_access_control.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/products/storage/examples/ansible/bucket_access_control.yaml b/products/storage/examples/ansible/bucket_access_control.yaml index 7f749381fef8..49448d6d35d2 100644 --- 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: <%= ctx[:name %> + name: <%= ctx[:name] %> project: <%= ctx[:project] %> auth_kind: <%= ctx[:auth_kind] %> service_account_file: <%= ctx[:service_account_file] %> From bd351e122649cf6eb45faee7752d50db5e272de2 Mon Sep 17 00:00:00 2001 From: Alex Stephen Date: Mon, 10 Dec 2018 12:51:42 -0800 Subject: [PATCH 4/4] Better IAM Service Account name --- products/iam/examples/ansible/service_account.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/products/iam/examples/ansible/service_account.yaml b/products/iam/examples/ansible/service_account.yaml index 2dec61650aed..fecbfacd6b6a 100644 --- 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] %>