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.

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

fix: Reset EventBridge pipe input template only on change detected #38598

Merged
merged 3 commits into from
Jul 31, 2024

Conversation

tfranovic
Copy link
Contributor

Description

Ensures the inputTemplate field of EventBridge pipes is reset only on change detected, so it's not removed on updates to other pipe attributes (such as filter criteria).

Relations

Closes #33938

References

Output from Acceptance Testing

tin@tin-mbp ~/D/terraform-provider-aws (fix_eventbridge_input_template) [2]> make testacc TESTS=TestAccPipesPipe_targetParameters PKG=pipes
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/pipes/... -v -count 1 -parallel 20 -run='TestAccPipesPipe_targetParameters'  -timeout 360m
=== RUN   TestAccPipesPipe_targetParameters_inputTemplate
=== PAUSE TestAccPipesPipe_targetParameters_inputTemplate
=== RUN   TestAccPipesPipe_targetParameters_inputTemplate_preserveUnchanged
=== PAUSE TestAccPipesPipe_targetParameters_inputTemplate_preserveUnchanged
=== CONT  TestAccPipesPipe_targetParameters_inputTemplate
=== CONT  TestAccPipesPipe_targetParameters_inputTemplate_preserveUnchanged
--- PASS: TestAccPipesPipe_targetParameters_inputTemplate (142.32s)
--- PASS: TestAccPipesPipe_targetParameters_inputTemplate_preserveUnchanged (204.52s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/pipes      208.257s
...

Output of current mainline code against updated tests (to confirm bug):

tin@tin-mbp ~/D/terraform-provider-aws (fix_eventbridge_input_template) [2]> make testacc TESTS=TestAccPipesPipe_targetParameters PKG=pipes
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/pipes/... -v -count 1 -parallel 20 -run='TestAccPipesPipe_targetParameters'  -timeout 360m
=== RUN   TestAccPipesPipe_targetParameters_inputTemplate
=== PAUSE TestAccPipesPipe_targetParameters_inputTemplate
=== RUN   TestAccPipesPipe_targetParameters_inputTemplate_preserveUnchanged
=== PAUSE TestAccPipesPipe_targetParameters_inputTemplate_preserveUnchanged
=== CONT  TestAccPipesPipe_targetParameters_inputTemplate
=== CONT  TestAccPipesPipe_targetParameters_inputTemplate_preserveUnchanged
    pipe_test.go:794: Step 2/6 error: Check failed: Check 2/2 error: aws_pipes_pipe.test: Attribute 'target_parameters.0.input_template' not found
--- FAIL: TestAccPipesPipe_targetParameters_inputTemplate_preserveUnchanged (105.22s)
--- PASS: TestAccPipesPipe_targetParameters_inputTemplate (142.20s)
FAIL
FAIL    github.com/hashicorp/terraform-provider-aws/internal/service/pipes      145.925s
FAIL
make: *** [testacc] Error 1

@tfranovic tfranovic requested a review from a team as a code owner July 30, 2024 15:51
Copy link

Community Note

Voting for Prioritization

  • Please vote on this pull request by adding a 👍 reaction to the original post to help the community and maintainers prioritize this pull request.
  • Please see our prioritization guide for information on how we prioritize.
  • Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for issue followers and do not help prioritize the request.

For Submitters

  • Review the contribution guide relating to the type of change you are making to ensure all of the necessary steps have been taken.
  • For new resources and data sources, use skaff to generate scaffolding with comments detailing common expectations.
  • Whether or not the branch has been rebased will not impact prioritization, but doing so is always a welcome surprise.

@github-actions github-actions bot added tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. service/pipes Issues and PRs that pertain to the pipes service. needs-triage Waiting for first response or review from a maintainer. labels Jul 30, 2024
@tfranovic tfranovic changed the title Reset EventBridge pipe input template only on change detected fix: Reset EventBridge pipe input template only on change detected Jul 30, 2024
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

Welcome @tfranovic 👋

It looks like this is your first Pull Request submission to the Terraform AWS Provider! If you haven’t already done so please make sure you have checked out our CONTRIBUTOR guide and FAQ to make sure your contribution is adhering to best practice and has all the necessary elements in place for a successful approval.

Also take a look at our FAQ which details how we prioritize Pull Requests for inclusion.

Thanks again, and welcome to the community! 😃

@ewbankkit ewbankkit added bug Addresses a defect in current functionality. and removed needs-triage Waiting for first response or review from a maintainer. labels Jul 31, 2024
@ewbankkit ewbankkit self-assigned this Jul 31, 2024
@github-actions github-actions bot added the prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. label Jul 31, 2024
Copy link
Contributor

@ewbankkit ewbankkit left a comment

Choose a reason for hiding this comment

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

LGTM 🚀.

% make testacc TESTARGS='-run=TestAccPipesPipe_targetParameters\|TestAccPipesPipe_basic' PKG=pipes ACCTEST_PARALLELISM=3
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.22.5 test ./internal/service/pipes/... -v -count 1 -parallel 3  -run=TestAccPipesPipe_targetParameters\|TestAccPipesPipe_basic -timeout 360m
=== RUN   TestAccPipesPipe_basicSQS
=== PAUSE TestAccPipesPipe_basicSQS
=== RUN   TestAccPipesPipe_targetParameters_inputTemplate
=== PAUSE TestAccPipesPipe_targetParameters_inputTemplate
=== RUN   TestAccPipesPipe_targetParameters_inputTemplate_preserveUnchanged
=== PAUSE TestAccPipesPipe_targetParameters_inputTemplate_preserveUnchanged
=== CONT  TestAccPipesPipe_basicSQS
=== CONT  TestAccPipesPipe_targetParameters_inputTemplate
=== CONT  TestAccPipesPipe_targetParameters_inputTemplate_preserveUnchanged
--- PASS: TestAccPipesPipe_basicSQS (80.13s)
--- PASS: TestAccPipesPipe_targetParameters_inputTemplate (143.68s)
--- PASS: TestAccPipesPipe_targetParameters_inputTemplate_preserveUnchanged (196.66s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/pipes	201.621s

@ewbankkit
Copy link
Contributor

@tfranovic Thanks for the contribution 🎉 👏.

@ewbankkit ewbankkit merged commit af3e17f into hashicorp:main Jul 31, 2024
34 checks passed
@github-actions github-actions bot added this to the v5.61.0 milestone Jul 31, 2024
@github-actions github-actions bot removed the prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. label Aug 2, 2024
Copy link

github-actions bot commented Aug 2, 2024

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

For further feature requests or bug reports with this functionality, please create a new GitHub issue following the template. Thank you!

Copy link

github-actions bot commented Sep 1, 2024

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 1, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bug Addresses a defect in current functionality. service/pipes Issues and PRs that pertain to the pipes service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: operation error Pipes: UpdatePipe: TF deletes input template whenever there is a modification to filter
2 participants