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: add splunk configuration #3117

Merged
merged 3 commits into from
Feb 6, 2018
Merged

resource/aws_kinesis_firehose: add splunk configuration #3117

merged 3 commits into from
Feb 6, 2018

Conversation

WhileLoop
Copy link
Contributor

@WhileLoop WhileLoop commented Jan 23, 2018 •
edited
Loading 

==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -run=TestAccAWSKinesisFirehoseDeliveryStream_SplunkConfigUpdates -timeout 120m
=== RUN   TestAccAWSKinesisFirehoseDeliveryStream_SplunkConfigUpdates
--- PASS: TestAccAWSKinesisFirehoseDeliveryStream_SplunkConfigUpdates (131.81s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	132.360s

@WhileLoop WhileLoop changed the title resource/aws_kinesis_firehose: add splunk configuration: resource/aws_kinesis_firehose: add splunk configuration Jan 23, 2018
@WhileLoop
Copy link
Contributor Author

WhileLoop commented Jan 23, 2018 •
edited
Loading

Closes #2897

@bflad bflad added enhancement Requests to existing resources that expand the functionality or scope. service/firehose Issues and PRs that pertain to the firehose service. labels Jan 24, 2018
@scottpazelt
Copy link

Is there any ETA on the splunk destination for Firehose? Thanks.

bflad
bflad reviewed Feb 6, 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.

Thanks for adding this! Left some minor feedback below. Please let us know if you have any questions or when its good to check again.

Passes acceptance testing for me:

=== RUN   TestAccAWSKinesisFirehoseDeliveryStream_ExtendedS3InvalidParameterName
--- PASS: TestAccAWSKinesisFirehoseDeliveryStream_ExtendedS3InvalidParameterName (1.81s)
=== RUN   TestAccAWSKinesisFirehoseDeliveryStream_ExtendedS3InvalidProcessorType
--- PASS: TestAccAWSKinesisFirehoseDeliveryStream_ExtendedS3InvalidProcessorType (1.75s)
=== RUN   TestAccAWSKinesisFirehoseDeliveryStream_s3KinesisStreamSource
--- PASS: TestAccAWSKinesisFirehoseDeliveryStream_s3KinesisStreamSource (120.72s)
=== RUN   TestAccAWSKinesisFirehoseDeliveryStream_missingProcessingConfiguration
--- PASS: TestAccAWSKinesisFirehoseDeliveryStream_missingProcessingConfiguration (275.91s)
=== RUN   TestAccAWSKinesisFirehoseDeliveryStream_importBasic
--- PASS: TestAccAWSKinesisFirehoseDeliveryStream_importBasic (277.04s)
=== RUN   TestAccAWSKinesisFirehoseDeliveryStream_ExtendedS3basic
--- PASS: TestAccAWSKinesisFirehoseDeliveryStream_ExtendedS3basic (277.80s)
=== RUN   TestAccAWSKinesisFirehoseDeliveryStream_s3basic
--- PASS: TestAccAWSKinesisFirehoseDeliveryStream_s3basic (281.12s)
=== RUN   TestAccAWSKinesisFirehoseDeliveryStream_s3WithCloudwatchLogging
--- PASS: TestAccAWSKinesisFirehoseDeliveryStream_s3WithCloudwatchLogging (282.33s)
=== RUN   TestAccAWSKinesisFirehoseDeliveryStream_ExtendedS3Updates
--- PASS: TestAccAWSKinesisFirehoseDeliveryStream_ExtendedS3Updates (285.33s)
=== RUN   TestAccAWSKinesisFirehoseDeliveryStream_SplunkConfigUpdates
--- PASS: TestAccAWSKinesisFirehoseDeliveryStream_SplunkConfigUpdates (290.26s)
=== RUN   TestAccAWSKinesisFirehoseDeliveryStream_s3ConfigUpdates
--- PASS: TestAccAWSKinesisFirehoseDeliveryStream_s3ConfigUpdates (385.68s)
=== RUN   TestAccAWSKinesisFirehoseDeliveryStream_RedshiftConfigUpdates
--- PASS: TestAccAWSKinesisFirehoseDeliveryStream_RedshiftConfigUpdates (1084.68s)
=== RUN   TestAccAWSKinesisFirehoseDeliveryStream_ElasticsearchConfigUpdates
--- PASS: TestAccAWSKinesisFirehoseDeliveryStream_ElasticsearchConfigUpdates (1229.60s)

aws/resource_aws_kinesis_firehose_delivery_stream.go Outdated
Type: schema.TypeInt,
Optional: true,
Default: 180,
ValidateFunc: func(v interface{}, k string) (ws []string, errors []error) {
Copy link
Contributor

Choose a reason for hiding this comment

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

We have a function to make this easier. 😄 ValidateFunc: validateIntegerInRange(180, 600),

aws/resource_aws_kinesis_firehose_delivery_stream.go Outdated
"hec_endpoint_type": {
Type: schema.TypeString,
Optional: true,
Default: "Raw",
Copy link
Contributor

Choose a reason for hiding this comment

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

Nitpick: The SDK provides a constant for "Raw" here: firehose.HECEndpointTypeRaw

aws/resource_aws_kinesis_firehose_delivery_stream.go Outdated
Default: "Raw",
ValidateFunc: func(v interface{}, k string) (ws []string, errors []error) {
value := v.(string)
if value != "Raw" && value != "Event" {
Copy link
Contributor

Choose a reason for hiding this comment

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

Same note about SDK constants here. firehose.HECEndpointTypeRaw and firehose.HECEndpointTypeEvent

aws/resource_aws_kinesis_firehose_delivery_stream.go Outdated
"s3_backup_mode": {
Type: schema.TypeString,
Optional: true,
Default: "FailedEventsOnly",
Copy link
Contributor

Choose a reason for hiding this comment

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

Nitpick: SDK constants available for here and validation below:

  • firehose.SplunkS3BackupModeAllEvents
  • firehose.SplunkS3BackupModeFailedEventsOnly

aws/resource_aws_kinesis_firehose_delivery_stream.go Outdated
Type: schema.TypeInt,
Optional: true,
Default: 3600,
ValidateFunc: func(v interface{}, k string) (ws []string, errors []error) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Similar note as above: ValidateFunc: validateIntegerInRange(0, 7200),

aws/resource_aws_kinesis_firehose_delivery_stream.go
"hec_token": *destination.SplunkDestinationDescription.HECToken,
"s3_backup_mode": *destination.SplunkDestinationDescription.S3BackupMode,
"retry_duration": *destination.SplunkDestinationDescription.RetryOptions.DurationInSeconds,
"cloudwatch_logging_options": flattenCloudwatchLoggingOptions(*destination.SplunkDestinationDescription.CloudWatchLoggingOptions),
Copy link
Contributor

Choose a reason for hiding this comment

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

Not for this PR, but we currently are getting crashes dereferencing CloudWatch logging options for other destination types as this information is not always returned by the API. We'll probably want to fix all of them at once.

@bflad bflad added the waiting-response Maintainers are waiting on response from community or contributor. label Feb 6, 2018
@ghost ghost added the size/L Managed by automation to categorize the size of a PR. label Feb 6, 2018
@WhileLoop
Copy link
Contributor Author

@bflad ship it! :)

@bflad bflad removed the waiting-response Maintainers are waiting on response from community or contributor. label Feb 6, 2018
bflad
bflad approved these changes Feb 6, 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.

Thanks! LGTM

@bflad bflad merged commit 2710d65 into hashicorp:master Feb 6, 2018
bflad added a commit that referenced this pull request Feb 6, 2018
@bflad
Update CHANGELOG for #3117
456363a
@bflad
Copy link
Contributor

bflad commented Feb 9, 2018

This has been released in terraform-provider-aws version 1.9.0. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

@bflad bflad added this to the v1.9.0 milestone Feb 9, 2018
@connor-tyndall
Copy link
Contributor

Data transformation via Lambda is still not available for the Firehose resource. Can this be added ASAP with Splunk as a destination? #513

@ghost
Copy link

ghost commented Apr 8, 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 8, 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/L Managed by automation to categorize the size of a PR.
Projects
None yet
Milestone
v1.9.0
Development

Successfully merging this pull request may close these issues.
5 participants
@WhileLoop @scottpazelt @bflad @connor-tyndall @arostamian-truecar