Merge 5636732 into d791a88

GoogleCloudPlatform · Jun 8, 2018 · 4c04281 · 4c04281
2 parents d791a88 + 5636732
commit 4c04281
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 5 deletions.
diff --git a/build/ansible b/build/ansible
diff --git a/build/puppet/compute b/build/puppet/compute
diff --git a/build/puppet/sql b/build/puppet/sql
diff --git a/build/puppet/storage b/build/puppet/storage
diff --git a/build/terraform b/build/terraform
diff --git a/templates/terraform/redis_operation.go b/templates/terraform/redis_operation.go
@@ -41,6 +41,13 @@ func redisOperationWait(service *redis.Service, op *redis.Operation, project, ac
 }
 
 func redisOperationWaitTime(service *redis.Service, op *redis.Operation, project, activity string, timeoutMin int) error {
+	if op.Done {
+		if op.Error != nil {
+			return fmt.Errorf("Error code %v, message: %s", op.Error.Code, op.Error.Message)
+		}
+		return nil
+	}
+
 	w := &RedisOperationWaiter{
 		Service: service.Projects.Locations,
 		Op:      op,
+12 −4		lib/ansible/module_utils/gcp_utils.py
+17 −1		lib/ansible/modules/cloud/google/gcp_compute_ssl_policy.py
+355 −0		lib/ansible/modules/cloud/google/gcp_compute_target_vpn_gateway.py
+113 −0		test/integration/targets/gcp_compute_ssl_policy/tasks/main.yml
+2 −0		test/integration/targets/gcp_compute_target_vpn_gateway/aliases
+3 −0		test/integration/targets/gcp_compute_target_vpn_gateway/defaults/main.yml
+0 −0		test/integration/targets/gcp_compute_target_vpn_gateway/meta/main.yml
+160 −0		test/integration/targets/gcp_compute_target_vpn_gateway/tasks/main.yml
+20 −14		.tools/end2end/data/database.pp
+20 −14		.tools/end2end/data/delete_database.pp
+19 −13		.tools/end2end/data/delete_instance.pp
+20 −14		.tools/end2end/data/delete_user.pp
+19 −13		.tools/end2end/data/flag.pp
+19 −13		.tools/end2end/data/instance.pp
+19 −13		.tools/end2end/data/instance~postgres.pp
+20 −14		.tools/end2end/data/ssl_cert.pp
+19 −13		.tools/end2end/data/tier.pp
+20 −14		.tools/end2end/data/user.pp
+12 −12		README.md
+20 −14		examples/database.pp
+20 −14		examples/delete_database.pp
+19 −13		examples/delete_instance.pp
+20 −14		examples/delete_user.pp
+19 −13		examples/flag.pp
+19 −13		examples/instance.pp
+19 −13		examples/instance~postgres.pp
+20 −14		examples/ssl_cert.pp
+19 −13		examples/tier.pp
+20 −14		examples/user.pp
+19 −13		.tools/end2end/data/bucket.pp
+20 −14		.tools/end2end/data/bucket_access_control.pp
+19 −13		.tools/end2end/data/bucket~acl.pp
+20 −14		.tools/end2end/data/default_object_acl.pp
+19 −13		.tools/end2end/data/delete_bucket.pp
+20 −14		.tools/end2end/data/object_access_control.pp
+8 −8		README.md
+19 −13		examples/bucket.pp
+20 −14		examples/bucket_access_control.pp
+19 −13		examples/bucket~acl.pp
+20 −14		examples/default_object_acl.pp
+19 −13		examples/delete_bucket.pp
+20 −14		examples/object_access_control.pp