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: Add nil checks to fix perpetual diff of rule arg for aws_ce_cost_category #38449

Merged

Conversation

acwwat
Copy link
Contributor

@acwwat acwwat commented Jul 21, 2024

Description

This PR is to fix perpetual diff with the rule argument when updating a aws_ce_cost_category resource, because of a subtle state differences with the nested rule argument being set during flattening regardless of whether the API response value is set. For good measure, I added similar checks for other optional values in all flatten functions where appropriate.

Relations

Closes #38215

References

n/a

Output from Acceptance Testing

$ make testacc TESTS=TestAccCECostCategory_ PKG=ce
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.22.5 test ./internal/service/ce/... -v -count 1 -parallel 20 -run='TestAccCECostCategory_'  -timeout 360m
=== RUN   TestAccCECostCategory_basic
=== PAUSE TestAccCECostCategory_basic
=== RUN   TestAccCECostCategory_effectiveStart
=== PAUSE TestAccCECostCategory_effectiveStart
=== RUN   TestAccCECostCategory_disappears
=== PAUSE TestAccCECostCategory_disappears
=== RUN   TestAccCECostCategory_complete
=== PAUSE TestAccCECostCategory_complete
=== RUN   TestAccCECostCategory_notWithAnd
=== PAUSE TestAccCECostCategory_notWithAnd
=== RUN   TestAccCECostCategory_splitCharge
=== PAUSE TestAccCECostCategory_splitCharge
=== RUN   TestAccCECostCategory_tags
=== PAUSE TestAccCECostCategory_tags
=== CONT  TestAccCECostCategory_basic
=== CONT  TestAccCECostCategory_notWithAnd
=== CONT  TestAccCECostCategory_splitCharge
=== CONT  TestAccCECostCategory_tags
=== CONT  TestAccCECostCategory_disappears
=== CONT  TestAccCECostCategory_complete
=== CONT  TestAccCECostCategory_effectiveStart
--- PASS: TestAccCECostCategory_disappears (19.20s)
--- PASS: TestAccCECostCategory_notWithAnd (24.39s)
--- PASS: TestAccCECostCategory_basic (24.46s)
--- PASS: TestAccCECostCategory_effectiveStart (34.83s)
--- PASS: TestAccCECostCategory_complete (36.57s)
--- PASS: TestAccCECostCategory_splitCharge (39.05s)
--- PASS: TestAccCECostCategory_tags (44.42s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/ce 44.690s

$

@acwwat acwwat requested a review from a team as a code owner July 21, 2024 01:21
Copy link

Thank you for your contribution! 🚀

Please note that typically Go dependency changes are handled in this repository by dependabot or the maintainers. This is to prevent pull request merge conflicts and further delay reviews of contributions. Remove any changes to the go.mod or go.sum files and commit them into this pull request.

Additional details:

  • Check open pull requests with the dependencies label to view other dependency updates.
  • If this pull request includes an update the AWS Go SDK (or any other dependency) version, only updates submitted via dependabot will be merged. This pull request will need to remove these changes and will need to be rebased after the existing dependency update via dependabot has been merged for this pull request to be reviewed.
  • If this pull request is for supporting a new AWS service:
    • Ensure the new AWS service changes are following the Contributing Guide section on new services, in particular that the dependency addition and initial provider support are in a separate pull request from other changes (e.g. new resources). Contributions not following this item will not be reviewed until the changes are split.
    • If this pull request is already a separate pull request from the above item, you can ignore this message.

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.

@terraform-aws-provider terraform-aws-provider bot added service/ce Issues and PRs that pertain to the ce service. size/XS Managed by automation to categorize the size of a PR. labels Jul 21, 2024
@acwwat acwwat force-pushed the b-aws_ce_cost_category-fix_rule_perpectual_diff branch from e5835b2 to 64ee1f3 Compare July 21, 2024 01:22
Copy link

Thank you for your contribution! 🚀

Please note that typically Go dependency changes are handled in this repository by dependabot or the maintainers. This is to prevent pull request merge conflicts and further delay reviews of contributions. Remove any changes to the go.mod or go.sum files and commit them into this pull request.

Additional details:

  • Check open pull requests with the dependencies label to view other dependency updates.
  • If this pull request includes an update the AWS Go SDK (or any other dependency) version, only updates submitted via dependabot will be merged. This pull request will need to remove these changes and will need to be rebased after the existing dependency update via dependabot has been merged for this pull request to be reviewed.
  • If this pull request is for supporting a new AWS service:
    • Ensure the new AWS service changes are following the Contributing Guide section on new services, in particular that the dependency addition and initial provider support are in a separate pull request from other changes (e.g. new resources). Contributions not following this item will not be reviewed until the changes are split.
    • If this pull request is already a separate pull request from the above item, you can ignore this message.

Copy link
Member

@jar-b jar-b 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 PKG=ce TESTS=TestAccCECostCategory_
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.22.5 test ./internal/service/ce/... -v -count 1 -parallel 20 -run='TestAccCECostCategory_'  -timeout 360m

--- PASS: TestAccCECostCategory_notWithAnd (13.78s)
--- PASS: TestAccCECostCategory_disappears (17.33s)
--- PASS: TestAccCECostCategory_basic (18.43s)
--- PASS: TestAccCECostCategory_splitCharge (21.03s)
--- PASS: TestAccCECostCategory_effectiveStart (22.26s)
--- PASS: TestAccCECostCategory_complete (23.08s)
--- PASS: TestAccCECostCategory_tags (26.58s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/ce 32.334s

@jar-b
Copy link
Member

jar-b commented Jul 22, 2024

Thanks for your contribution, @acwwat! 👍

@jar-b jar-b merged commit d1218fb into hashicorp:main Jul 22, 2024
31 checks passed
@github-actions github-actions bot added this to the v5.60.0 milestone Jul 22, 2024
Copy link

This functionality has been released in v5.60.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!

@acwwat acwwat deleted the b-aws_ce_cost_category-fix_rule_perpectual_diff branch July 27, 2024 02:09
@justinretzolk justinretzolk added the external-maintainer Contribution from a trusted external contributor. label Jul 29, 2024
Copy link

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 Aug 29, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
external-maintainer Contribution from a trusted external contributor. service/ce Issues and PRs that pertain to the ce service. size/XS Managed by automation to categorize the size of a PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: Constant diff on update or error on creation of aws_ce_cost_category
3 participants