From 6670f0ccccf62ae01e2b85e76905005d6dc9fcb2 Mon Sep 17 00:00:00 2001 From: The Magician Date: Thu, 11 Oct 2018 12:57:31 -0700 Subject: [PATCH] Fix empty TypeList expands in generated resources (#2233) /cc @rileykarson --- google/resource_compute_disk.go | 2 +- google/resource_monitoring_alert_policy.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/google/resource_compute_disk.go b/google/resource_compute_disk.go index d218c54a..fe89731f 100644 --- a/google/resource_compute_disk.go +++ b/google/resource_compute_disk.go @@ -1039,7 +1039,7 @@ func expandComputeDiskSourceImageEncryptionKeySha256(v interface{}, d *schema.Re func expandComputeDiskDiskEncryptionKey(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) { l := v.([]interface{}) - if len(l) == 0 { + if len(l) == 0 || l[0] == nil { return nil, nil } raw := l[0] diff --git a/google/resource_monitoring_alert_policy.go b/google/resource_monitoring_alert_policy.go index 1aa72ceb..10d1b4e3 100644 --- a/google/resource_monitoring_alert_policy.go +++ b/google/resource_monitoring_alert_policy.go @@ -1299,7 +1299,7 @@ func expandMonitoringAlertPolicyLabels(v interface{}, d *schema.ResourceData, co func expandMonitoringAlertPolicyDocumentation(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) { l := v.([]interface{}) - if len(l) == 0 { + if len(l) == 0 || l[0] == nil { return nil, nil } raw := l[0]