Merge pull request #4148 from comtravo/chore/fix-firehose-terraform-c…

…rash Fixes Terraform crash for AWS Kinesis Firehose
hashicorp · Apr 10, 2018 · bc7a3cb · bc7a3cb
2 parents bc219bd + 1a39e9e
commit bc7a3cb
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/aws/resource_aws_kinesis_firehose_delivery_stream.go b/aws/resource_aws_kinesis_firehose_delivery_stream.go
@@ -176,7 +176,7 @@ func cloudwatchLoggingOptionsHash(v interface{}) int {
 
 func flattenCloudwatchLoggingOptions(clo *firehose.CloudWatchLoggingOptions) *schema.Set {
 	if clo == nil {
-		return nil
+		return schema.NewSet(cloudwatchLoggingOptionsHash, []interface{}{})
 	}
 
 	cloudwatchLoggingOptions := map[string]interface{}{