r/eks_addon: Deprecate resolve_conflicts attribute

[mattburgess]

Description

This deprecates the resolve_conflicts attribute in favour of 2 new attributes: resolve_conflicts_on_create and resolve_conflicts_on_update.

The CreateAddon API only permits values of NONE and OVERWRITE. The UpdateAddon API permits values of NONE, OVERWRITE and PRESERVE.

Therefore, when applying Terraform configuration for the first time, you're not able to specify PRESERVE, but that might well be the desired setting for ongoing updates to an addon.

By splitting the attribute into 2, a single configuration can be provided for both initial, and followup addon configurations.

Relations

Closes #27481

References

Output from Acceptance Testing

$ make testacc TESTS=TestAccEKSAddon_deprecated PKG=eks
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/eks/... -v -count 1 -parallel 20 -run='TestAccEKSAddon_deprecated'  -timeout 180m
=== RUN   TestAccEKSAddon_deprecated
=== PAUSE TestAccEKSAddon_deprecated
=== CONT  TestAccEKSAddon_deprecated
--- PASS: TestAccEKSAddon_deprecated (683.40s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/eks	683.496s

$ make testacc TESTS=TestAccEKSAddon_resolveConflicts PKG=eks
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/eks/... -v -count 1 -parallel 20 -run='TestAccEKSAddon_resolveConflicts'  -timeout 180m
=== RUN   TestAccEKSAddon_resolveConflicts
=== PAUSE TestAccEKSAddon_resolveConflicts
=== CONT  TestAccEKSAddon_resolveConflicts
--- PASS: TestAccEKSAddon_resolveConflicts (721.19s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/eks	721.282s

[github-actions]

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.

[bryantbiggs]

@ewbankkit question: If EKS were to change the API where the create operation only shows none or overwrite (removes preserve even though its not supported), does this change the PR here?

For example, if the input specification for createAddon changed from:

ResolveConflicts *string `locationName:"resolveConflicts" type:"string" enum:"ResolveConflicts"`

To

ResolveConflicts *string `locationName:"resolveConflicts" type:"string" enum:"CreateResolveConflicts"`

How would that affect the provider implementation - would we still keep one argument for the resolve_conflicts, would we split into two like this PR is adding, something else?

https://docs.aws.amazon.com/eks/latest/APIReference/API_CreateAddon.html#AmazonEKS-CreateAddon-request-resolveConflicts

[ewbankkit]

@bryantbiggs I think we'd still need this PR but we'd enhance by using the different enumeration as part of validation.

[bryantbiggs]

ok cool - so the provider arguments would stay as is (per what is added here) and therefore no breaking change, the only changes would be made to the internal implementation of the provider. thank you!

[ewbankkit]

LGTM 🚀.

% make testacc TESTARGS='-run=TestAccEKSAddon_' PKG=eks ACCTEST_PARALLELISM=2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/eks/... -v -count 1 -parallel 2  -run=TestAccEKSAddon_ -timeout 180m
=== RUN   TestAccEKSAddon_basic
=== PAUSE TestAccEKSAddon_basic
=== RUN   TestAccEKSAddon_disappears
=== PAUSE TestAccEKSAddon_disappears
=== RUN   TestAccEKSAddon_Disappears_cluster
=== PAUSE TestAccEKSAddon_Disappears_cluster
=== RUN   TestAccEKSAddon_addonVersion
=== PAUSE TestAccEKSAddon_addonVersion
=== RUN   TestAccEKSAddon_preserve
=== PAUSE TestAccEKSAddon_preserve
=== RUN   TestAccEKSAddon_deprecated
=== PAUSE TestAccEKSAddon_deprecated
=== RUN   TestAccEKSAddon_resolveConflicts
=== PAUSE TestAccEKSAddon_resolveConflicts
=== RUN   TestAccEKSAddon_serviceAccountRoleARN
=== PAUSE TestAccEKSAddon_serviceAccountRoleARN
=== RUN   TestAccEKSAddon_configurationValues
=== PAUSE TestAccEKSAddon_configurationValues
=== RUN   TestAccEKSAddon_tags
=== PAUSE TestAccEKSAddon_tags
=== CONT  TestAccEKSAddon_basic
=== CONT  TestAccEKSAddon_deprecated
--- PASS: TestAccEKSAddon_basic (745.25s)
=== CONT  TestAccEKSAddon_configurationValues
--- PASS: TestAccEKSAddon_deprecated (718.20s)
=== CONT  TestAccEKSAddon_tags
--- PASS: TestAccEKSAddon_configurationValues (646.46s)
=== CONT  TestAccEKSAddon_serviceAccountRoleARN
--- PASS: TestAccEKSAddon_tags (698.59s)
=== CONT  TestAccEKSAddon_resolveConflicts
--- PASS: TestAccEKSAddon_serviceAccountRoleARN (573.52s)
=== CONT  TestAccEKSAddon_addonVersion
--- PASS: TestAccEKSAddon_resolveConflicts (774.49s)
=== CONT  TestAccEKSAddon_preserve
--- PASS: TestAccEKSAddon_addonVersion (784.72s)
=== CONT  TestAccEKSAddon_Disappears_cluster
--- PASS: TestAccEKSAddon_preserve (758.49s)
=== CONT  TestAccEKSAddon_disappears
--- PASS: TestAccEKSAddon_Disappears_cluster (727.07s)
--- PASS: TestAccEKSAddon_disappears (730.87s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/eks	3684.993s

[github-actions]

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

[github-actions]

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.