From 416603f8e8feb791c1091a86958f25c1158f8da5 Mon Sep 17 00:00:00 2001 From: Ty Larrabee Date: Tue, 13 Aug 2019 14:04:54 -0700 Subject: [PATCH] Make key_name optional in container_cluster.database_encryption (#2163) Merged PR #2163. --- build/terraform | 2 +- build/terraform-beta | 2 +- build/terraform-mapper | 2 +- .../terraform/resources/resource_container_cluster.go.erb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/terraform b/build/terraform index 6c23c8f19829..ae68ac5bf9ad 160000 --- a/build/terraform +++ b/build/terraform @@ -1 +1 @@ -Subproject commit 6c23c8f198292f338664becce2d689644cb74b6b +Subproject commit ae68ac5bf9adc8a2bdd948398b585174bb1d392b diff --git a/build/terraform-beta b/build/terraform-beta index 7ecae80e08e0..345b05d36b6f 160000 --- a/build/terraform-beta +++ b/build/terraform-beta @@ -1 +1 @@ -Subproject commit 7ecae80e08e09a486636bd4a0eb4a1e1d5e3f066 +Subproject commit 345b05d36b6fc1776a22bf7748269b88b5ca99e8 diff --git a/build/terraform-mapper b/build/terraform-mapper index 5cfe2b1e7276..298cdf9db311 160000 --- a/build/terraform-mapper +++ b/build/terraform-mapper @@ -1 +1 @@ -Subproject commit 5cfe2b1e72769138e3ff224b8f3aa9148f165677 +Subproject commit 298cdf9db31167638ff4a534e0ad3a7b8a85f91c diff --git a/third_party/terraform/resources/resource_container_cluster.go.erb b/third_party/terraform/resources/resource_container_cluster.go.erb index 9b117e9f578e..22eff50b890f 100644 --- a/third_party/terraform/resources/resource_container_cluster.go.erb +++ b/third_party/terraform/resources/resource_container_cluster.go.erb @@ -769,7 +769,7 @@ func resourceContainerCluster() *schema.Resource { "key_name": { Type: schema.TypeString, ForceNew: true, - Required: true, + Optional: true, }, }, },