Skip to content

Commit

Permalink
Merge pull request #3073 from terraform-providers/b-aws_kinesis_fireh…
Browse files Browse the repository at this point in the history
…ose_delivery_stream-3071

resource/aws_kinesis_firehose_delivery_stream: Prevent panic on missing S3 configuration prefix
  • Loading branch information
bflad authored Jan 22, 2018
2 parents 4326166 + ef4edcc commit 41df15e
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion aws/resource_aws_kinesis_firehose_delivery_stream.go
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,6 @@ func flattenFirehoseS3Configuration(s3 firehose.S3DestinationDescription) []inte
s3Configuration := map[string]interface{}{
"role_arn": *s3.RoleARN,
"bucket_arn": *s3.BucketARN,
"prefix": *s3.Prefix,
"buffer_size": *s3.BufferingHints.SizeInMBs,
"buffer_interval": *s3.BufferingHints.IntervalInSeconds,
"compression_format": *s3.CompressionFormat,
Expand All @@ -201,6 +200,9 @@ func flattenFirehoseS3Configuration(s3 firehose.S3DestinationDescription) []inte
if s3.EncryptionConfiguration.KMSEncryptionConfig != nil {
s3Configuration["kms_key_arn"] = *s3.EncryptionConfiguration.KMSEncryptionConfig
}
if s3.Prefix != nil {
s3Configuration["prefix"] = *s3.Prefix
}
return []interface{}{s3Configuration}
}

Expand Down

0 comments on commit 41df15e

Please sign in to comment.