From 92e5d671c8381e06514d63d87180626679516a73 Mon Sep 17 00:00:00 2001 From: venky kuberan Date: Wed, 17 Feb 2021 13:43:42 -0800 Subject: [PATCH 1/3] added sensitive flag to auth_string field --- mmv1/templates/terraform/extra_schema_entry/redis_instance.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/mmv1/templates/terraform/extra_schema_entry/redis_instance.erb b/mmv1/templates/terraform/extra_schema_entry/redis_instance.erb index 42b850efd513..b097dd4e51cd 100644 --- a/mmv1/templates/terraform/extra_schema_entry/redis_instance.erb +++ b/mmv1/templates/terraform/extra_schema_entry/redis_instance.erb @@ -3,4 +3,5 @@ Description: "AUTH String set on the instance. This field will only be populated if auth_enabled is true.", Optional: true, Computed: true, + Sensitive: true, }, From a63d020404abfb12857ab380abe669eb9dcb8c6d Mon Sep 17 00:00:00 2001 From: venky kuberan Date: Wed, 17 Feb 2021 15:20:13 -0800 Subject: [PATCH 2/3] merge conflict fixed --- .../terraform/extra_schema_entry/redis_instance.erb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/mmv1/templates/terraform/extra_schema_entry/redis_instance.erb b/mmv1/templates/terraform/extra_schema_entry/redis_instance.erb index 70e043aa053d..fea34e1686d2 100644 --- a/mmv1/templates/terraform/extra_schema_entry/redis_instance.erb +++ b/mmv1/templates/terraform/extra_schema_entry/redis_instance.erb @@ -2,9 +2,5 @@ Type: schema.TypeString, Description: "AUTH String set on the instance. This field will only be populated if auth_enabled is true.", Computed: true, -<<<<<<< HEAD Sensitive: true, -}, -======= -}, ->>>>>>> e7e9cfe560dc4df4691be6965870a05299ae337b +}, \ No newline at end of file From 4f59b19b107ba8b49aee6dbad2e67a8bc1fccefe Mon Sep 17 00:00:00 2001 From: venky kuberan Date: Thu, 18 Feb 2021 12:52:08 -0800 Subject: [PATCH 3/3] test updated with beta only field --- ...s_instance_test.go => resource_redis_instance_test.go.erb} | 4 ++++ 1 file changed, 4 insertions(+) rename mmv1/third_party/terraform/tests/{resource_redis_instance_test.go => resource_redis_instance_test.go.erb} (98%) diff --git a/mmv1/third_party/terraform/tests/resource_redis_instance_test.go b/mmv1/third_party/terraform/tests/resource_redis_instance_test.go.erb similarity index 98% rename from mmv1/third_party/terraform/tests/resource_redis_instance_test.go rename to mmv1/third_party/terraform/tests/resource_redis_instance_test.go.erb index 9c4c79c5b60a..c818df900e37 100644 --- a/mmv1/third_party/terraform/tests/resource_redis_instance_test.go +++ b/mmv1/third_party/terraform/tests/resource_redis_instance_test.go.erb @@ -1,3 +1,5 @@ +<% autogen_exception -%> + package google import ( @@ -143,7 +145,9 @@ resource "google_redis_instance" "test" { maxmemory-policy = "noeviction" notify-keyspace-events = "" } + <% unless version == 'ga' -%> transit_encryption_mode = "SERVER_AUTHENTICATION" + <% end -%> } `, name) }