Avoid crash on empty redshift's S3BackupDescription

Fixes #3006
hashicorp · Jan 17, 2018 · 126c36d · 126c36d
1 parent e4c7cc0
commit 126c36d
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/aws/resource_aws_kinesis_firehose_delivery_stream.go b/aws/resource_aws_kinesis_firehose_delivery_stream.go
@@ -241,10 +241,12 @@ func flattenKinesisFirehoseDeliveryStream(d *schema.ResourceData, s *firehose.De
 				"copy_options":               *destination.RedshiftDestinationDescription.CopyCommand.CopyOptions,
 				"data_table_columns":         *destination.RedshiftDestinationDescription.CopyCommand.DataTableColumns,
 				"s3_backup_mode":             *destination.RedshiftDestinationDescription.S3BackupMode,
-				"s3_backup_configuration":    flattenFirehoseS3Configuration(*destination.RedshiftDestinationDescription.S3BackupDescription),
 				"retry_duration":             *destination.RedshiftDestinationDescription.RetryOptions.DurationInSeconds,
 				"cloudwatch_logging_options": flattenCloudwatchLoggingOptions(*destination.RedshiftDestinationDescription.CloudWatchLoggingOptions),
 			}
+			if s3bd := destination.RedshiftDestinationDescription.S3BackupDescription; s3bd != nil {
+				redshiftConfiguration["s3_backup_configuration"] = flattenFirehoseS3Configuration(*s3bd)
+			}
 			redshiftConfList := make([]map[string]interface{}, 1)
 			redshiftConfList[0] = redshiftConfiguration
 			d.Set("redshift_configuration", redshiftConfList)