Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

resource/aws_kinesis_firehose_delivery_stream: Prevent crash on empty CW logging opts #3052

Merged
merged 1 commit into from
Jan 18, 2018
Merged

resource/aws_kinesis_firehose_delivery_stream: Prevent crash on empty CW logging opts #3052

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions aws/resource_aws_kinesis_firehose_delivery_stream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,21 +186,22 @@ func flattenCloudwatchLoggingOptions(clo firehose.CloudWatchLoggingOptions) *sch
return schema.NewSet(cloudwatchLoggingOptionsHash, []interface{}{cloudwatchLoggingOptions})
}

func flattenFirehoseS3Configuration(s3 firehose.S3DestinationDescription) []map[string]interface{} {
s3Configuration := make([]map[string]interface{}, 1)
s3Configuration[0] = 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,
"cloudwatch_logging_options": flattenCloudwatchLoggingOptions(*s3.CloudWatchLoggingOptions),
func flattenFirehoseS3Configuration(s3 firehose.S3DestinationDescription) []interface{} {
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,
}
if s3.CloudWatchLoggingOptions != nil {
s3Configuration["cloudwatch_logging_options"] = flattenCloudwatchLoggingOptions(*s3.CloudWatchLoggingOptions)
}
if s3.EncryptionConfiguration.KMSEncryptionConfig != nil {
s3Configuration[0]["kms_key_arn"] = *s3.EncryptionConfiguration.KMSEncryptionConfig
s3Configuration["kms_key_arn"] = *s3.EncryptionConfiguration.KMSEncryptionConfig
}
return s3Configuration
return []interface{}{s3Configuration}
}

func flattenProcessingConfiguration(pc firehose.ProcessingConfiguration, roleArn string) []map[string]interface{} {
Expand Down