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: Add Splunk destination… #3944

Merged
merged 1 commit into from
Apr 4, 2018
Merged

resource/aws_kinesis_firehose_delivery_stream: Add Splunk destination… #3944

merged 1 commit into from
Apr 4, 2018

Conversation

WhileLoop
Copy link
Contributor

… lambda transformation support

Partial fix for #513

@ghost ghost added the size/M Managed by automation to categorize the size of a PR. label Mar 28, 2018
@radeksimko radeksimko added enhancement Requests to existing resources that expand the functionality or scope. service/firehose Issues and PRs that pertain to the firehose service. labels Mar 28, 2018
@errriclee
Copy link
Contributor

👍

@bflad bflad mentioned this pull request Apr 4, 2018
Merged
bflad
bflad approved these changes Apr 4, 2018
View reviewed changes
Copy link
Contributor

@bflad bflad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM -- thanks! 🚀

14 tests passed (all tests)
=== RUN   TestAccAWSKinesisFirehoseDeliveryStream_ExtendedS3InvalidParameterName
--- PASS: TestAccAWSKinesisFirehoseDeliveryStream_ExtendedS3InvalidParameterName (1.75s)
=== RUN   TestAccAWSKinesisFirehoseDeliveryStream_ExtendedS3InvalidProcessorType
--- PASS: TestAccAWSKinesisFirehoseDeliveryStream_ExtendedS3InvalidProcessorType (1.87s)
=== RUN   TestAccAWSKinesisFirehoseDeliveryStream_s3KinesisStreamSource
--- PASS: TestAccAWSKinesisFirehoseDeliveryStream_s3KinesisStreamSource (100.43s)
=== RUN   TestAccAWSKinesisFirehoseDeliveryStream_s3WithCloudwatchLogging
--- PASS: TestAccAWSKinesisFirehoseDeliveryStream_s3WithCloudwatchLogging (230.40s)
=== RUN   TestAccAWSKinesisFirehoseDeliveryStream_ExtendedS3basic
--- PASS: TestAccAWSKinesisFirehoseDeliveryStream_ExtendedS3basic (237.65s)
=== RUN   TestAccAWSKinesisFirehoseDeliveryStream_importBasic
--- PASS: TestAccAWSKinesisFirehoseDeliveryStream_importBasic (248.43s)
=== RUN   TestAccAWSKinesisFirehoseDeliveryStream_s3basic
--- PASS: TestAccAWSKinesisFirehoseDeliveryStream_s3basic (250.96s)
=== RUN   TestAccAWSKinesisFirehoseDeliveryStream_ExtendedS3Updates
--- PASS: TestAccAWSKinesisFirehoseDeliveryStream_ExtendedS3Updates (254.22s)
=== RUN   TestAccAWSKinesisFirehoseDeliveryStream_missingProcessingConfiguration
--- PASS: TestAccAWSKinesisFirehoseDeliveryStream_missingProcessingConfiguration (255.13s)
=== RUN   TestAccAWSKinesisFirehoseDeliveryStream_SplunkConfigUpdates
--- PASS: TestAccAWSKinesisFirehoseDeliveryStream_SplunkConfigUpdates (262.22s)
=== RUN   TestAccAWSKinesisFirehoseDeliveryStream_ExtendedS3KmsKeyArn
--- PASS: TestAccAWSKinesisFirehoseDeliveryStream_ExtendedS3KmsKeyArn (275.95s)
=== RUN   TestAccAWSKinesisFirehoseDeliveryStream_s3ConfigUpdates
--- PASS: TestAccAWSKinesisFirehoseDeliveryStream_s3ConfigUpdates (322.40s)
=== RUN   TestAccAWSKinesisFirehoseDeliveryStream_ElasticsearchConfigUpdates
--- PASS: TestAccAWSKinesisFirehoseDeliveryStream_ElasticsearchConfigUpdates (907.89s)
=== RUN   TestAccAWSKinesisFirehoseDeliveryStream_RedshiftConfigUpdates
--- PASS: TestAccAWSKinesisFirehoseDeliveryStream_RedshiftConfigUpdates (1044.13s)

@bflad bflad added this to the v1.14.0 milestone Apr 4, 2018
@bflad bflad merged commit 1bb558a into hashicorp:master Apr 4, 2018
bflad added a commit that referenced this pull request Apr 4, 2018
@bflad
Update CHANGELOG for #3944
b634c10
bflad
bflad reviewed Apr 4, 2018
View reviewed changes
aws/resource_aws_kinesis_firehose_delivery_stream.go
@@ -321,6 +321,10 @@ func flattenKinesisFirehoseDeliveryStream(d *schema.ResourceData, s *firehose.De
"retry_duration": *destination.SplunkDestinationDescription.RetryOptions.DurationInSeconds,
}

if v := destination.SplunkDestinationDescription.ProcessingConfiguration; v != nil {
splunkConfiguration["processing_configuration"] = v
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I missed this before merging. This should be = flattenProcessingConfiguration(*v, roleArn). I will fix this in an upcoming PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was wondering about that, where is RoleArn supposed to come from in the Splunk Configuration?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Its only used as a default value to filter out a difference if it is undefined in the Terraform configuration under the parameters. In this case, passing it "" is fine. I have a PR almost ready that includes this fix.

@bflad
Copy link
Contributor

bflad commented Apr 6, 2018

This has been released in version 1.14.0 of the AWS provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

@cwiggs
Copy link

cwiggs commented Jun 27, 2018 •
edited
Loading

This PR seems to have multiple additions.

Adding transformation (more info here: #513)

and adding Splunk destination.

I'm using the aws provider version 1.25 but i'm getting this error when I try to use the "processing_configuration" option under "splunk_configuration"

Error: module.kinesis-firehose.aws_kinesis_firehose_delivery_stream.vpc_flow_logs: : invalid or unknown key: processing_configuration

It looks like processing_configuration was added in this PR around line 1178 (https://github.com/terraform-providers/terraform-provider-aws/pull/3944/files#diff-ae9cf173fd0b00ad9d1cf7d58194f5beR1178) , but it's not live?

anyone know what is wrong?

@bflad bflad mentioned this pull request Jul 4, 2018
Closed
@ghost
Copy link

ghost commented Apr 4, 2020

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. Thanks!

@ghost ghost locked and limited conversation to collaborators Apr 4, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@bflad bflad bflad approved these changes

Assignees
No one assigned
Labels
enhancement Requests to existing resources that expand the functionality or scope. service/firehose Issues and PRs that pertain to the firehose service. size/M Managed by automation to categorize the size of a PR.
Projects
None yet
Milestone
v1.14.0
Development

Successfully merging this pull request may close these issues.
6 participants
@WhileLoop @errriclee @bflad @cwiggs @radeksimko @arostamian-truecar