fixes a crash on updating log_bucket (GoogleCloudPlatform#6835)

Co-authored-by: Edward Sun <sunedward@google.com> Fixes hashicorp/terraform-provider-google#13038
googlerjk · Nov 25, 2022 · c285c74 · c285c74
1 parent 8d37e5b
commit c285c74
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/mmv1/third_party/terraform/resources/resource_storage_bucket.go.erb b/mmv1/third_party/terraform/resources/resource_storage_bucket.go.erb
@@ -964,7 +964,7 @@ func expandBucketDataLocations(configured interface{}) []string {
 
 func expandBucketLogging(configured interface{}) *storage.BucketLogging {
 	loggings := configured.([]interface{})
-	if len(loggings) == 0 {
+	if len(loggings) == 0 || loggings[0] == nil {
 		return nil
 	}
 

diff --git a/mmv1/third_party/validator/storage_bucket.go b/mmv1/third_party/validator/storage_bucket.go
@@ -149,7 +149,7 @@ func expandBucketEncryption(configured interface{}) *storage.BucketEncryption {
 
 func expandBucketLogging(configured interface{}) *storage.BucketLogging {
 	loggings := configured.([]interface{})
-	if len(loggings) == 0 {
+	if len(loggings) == 0 || loggings[0] == nil {
 		return nil
 	}