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

Elasticsearch: Migrate to AWS SDK v2 #38086

Merged
merged 25 commits into from
Aug 24, 2024
Merged

Elasticsearch: Migrate to AWS SDK v2 #38086

merged 25 commits into from
Aug 24, 2024

Conversation

mattburgess
Copy link
Collaborator

@mattburgess mattburgess commented Jun 23, 2024 •
edited by ewbankkit
Loading

Description

Relations

Closes #36155.
Relates #32976.
Closes #12783.

References

Output from Acceptance Testing

% make testacc TESTS=TestAccXXX PKG=ec2

...

@mattburgess mattburgess requested a review from a team as a code owner June 23, 2024 20:40
@github-actions GitHub Actions
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 size/XL Managed by automation to categorize the size of a PR. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. service/elasticsearch Issues and PRs that pertain to the elasticsearch service. sweeper Pertains to changes to or issues with the sweeper. tags Pertains to resource tagging. client-connections Pertains to the AWS Client and service connections. generators Relates to code generators. labels Jun 23, 2024
@terraform-aws-provider terraform-aws-provider bot added needs-triage Waiting for first response or review from a maintainer. external-maintainer Contribution from a trusted external contributor. labels Jun 23, 2024
@github-actions GitHub Actions
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.

@justinretzolk justinretzolk added aws-sdk-go-migration Issues that are related to the providers migration to AWS SDK for Go v2. and removed needs-triage Waiting for first response or review from a maintainer. labels Jun 25, 2024
@ewbankkit
Merge branch 'main' into HEAD
ef552c4 
# Conflicts:
#	go.mod
#	go.sum
#	internal/conns/awsclient_gen.go
#	internal/service/elasticsearch/domain_test.go
#	internal/service/elasticsearch/service_endpoints_gen_test.go
#	internal/service/elasticsearch/service_package_gen.go
#	names/names.go
@ewbankkit ewbankkit self-assigned this Aug 21, 2024
@github-actions github-actions bot added the prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. label Aug 21, 2024
@ewbankkit ewbankkit force-pushed the elasticsearch-awssdkv2-migration branch from a86ade4 to b989b33 Compare August 23, 2024 16:59
ewbankkit
ewbankkit approved these changes Aug 24, 2024
View reviewed changes
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 🚀.

% ACCTEST_TIMEOUT=720m make testacc TESTARGS='-run=TestAccElasticsearchDomainDataSource_\|TestAccElasticsearchDomainPolicy_\|TestAccElasticsearchVPCEndpoint_' PKG=elasticsearch ACCTEST_PARALLELISM=3
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.22.6 test ./internal/service/elasticsearch/... -v -count 1 -parallel 3  -run=TestAccElasticsearchDomainDataSource_\|TestAccElasticsearchDomainPolicy_\|TestAccElasticsearchVPCEndpoint_ -timeout 720m
=== RUN   TestAccElasticsearchDomainDataSource_basic
=== PAUSE TestAccElasticsearchDomainDataSource_basic
=== RUN   TestAccElasticsearchDomainDataSource_advanced
=== PAUSE TestAccElasticsearchDomainDataSource_advanced
=== RUN   TestAccElasticsearchDomainPolicy_basic
=== PAUSE TestAccElasticsearchDomainPolicy_basic
=== RUN   TestAccElasticsearchVPCEndpoint_basic
=== PAUSE TestAccElasticsearchVPCEndpoint_basic
=== RUN   TestAccElasticsearchVPCEndpoint_disappears
=== PAUSE TestAccElasticsearchVPCEndpoint_disappears
=== RUN   TestAccElasticsearchVPCEndpoint_update
=== PAUSE TestAccElasticsearchVPCEndpoint_update
=== CONT  TestAccElasticsearchDomainDataSource_basic
=== CONT  TestAccElasticsearchVPCEndpoint_basic
=== CONT  TestAccElasticsearchVPCEndpoint_update
--- PASS: TestAccElasticsearchVPCEndpoint_basic (1440.71s)
=== CONT  TestAccElasticsearchVPCEndpoint_disappears
--- PASS: TestAccElasticsearchDomainDataSource_basic (1454.00s)
=== CONT  TestAccElasticsearchDomainPolicy_basic
--- PASS: TestAccElasticsearchVPCEndpoint_update (1837.81s)
=== CONT  TestAccElasticsearchDomainDataSource_advanced
--- PASS: TestAccElasticsearchDomainPolicy_basic (1482.95s)
--- PASS: TestAccElasticsearchVPCEndpoint_disappears (1530.79s)
--- PASS: TestAccElasticsearchDomainDataSource_advanced (1901.26s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/elasticsearch	3744.036s
% ACCTEST_TIMEOUT=720m make testacc TESTARGS='-run=TestAccElasticsearchDomainSAMLOptions_' PKG=elasticsearch ACCTEST_PARALLELISM=3 
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.22.6 test ./internal/service/elasticsearch/... -v -count 1 -parallel 3  -run=TestAccElasticsearchDomainSAMLOptions_ -timeout 720m
=== RUN   TestAccElasticsearchDomainSAMLOptions_basic
=== PAUSE TestAccElasticsearchDomainSAMLOptions_basic
=== RUN   TestAccElasticsearchDomainSAMLOptions_disappears
=== PAUSE TestAccElasticsearchDomainSAMLOptions_disappears
=== RUN   TestAccElasticsearchDomainSAMLOptions_disappears_Domain
=== PAUSE TestAccElasticsearchDomainSAMLOptions_disappears_Domain
=== RUN   TestAccElasticsearchDomainSAMLOptions_Update
=== PAUSE TestAccElasticsearchDomainSAMLOptions_Update
=== RUN   TestAccElasticsearchDomainSAMLOptions_Disabled
=== PAUSE TestAccElasticsearchDomainSAMLOptions_Disabled
=== CONT  TestAccElasticsearchDomainSAMLOptions_basic
=== CONT  TestAccElasticsearchDomainSAMLOptions_Update
=== CONT  TestAccElasticsearchDomainSAMLOptions_disappears_Domain
--- PASS: TestAccElasticsearchDomainSAMLOptions_disappears_Domain (1463.81s)
=== CONT  TestAccElasticsearchDomainSAMLOptions_Disabled
--- PASS: TestAccElasticsearchDomainSAMLOptions_basic (1475.46s)
=== CONT  TestAccElasticsearchDomainSAMLOptions_disappears
--- PASS: TestAccElasticsearchDomainSAMLOptions_Update (1501.46s)
--- PASS: TestAccElasticsearchDomainSAMLOptions_disappears (1496.34s)
--- PASS: TestAccElasticsearchDomainSAMLOptions_Disabled (1536.87s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/elasticsearch	3011.885s
% ACCTEST_TIMEOUT=720m make testacc TESTARGS='-run=TestAccElasticsearchDomain_' PKG=elasticsearch ACCTEST_PARALLELISM=3
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.22.6 test ./internal/service/elasticsearch/... -v -count 1 -parallel 3  -run=TestAccElasticsearchDomain_ -timeout 720m
=== RUN   TestAccElasticsearchDomain_basic
=== PAUSE TestAccElasticsearchDomain_basic
=== RUN   TestAccElasticsearchDomain_requireHTTPS
=== PAUSE TestAccElasticsearchDomain_requireHTTPS
=== RUN   TestAccElasticsearchDomain_customEndpoint
=== PAUSE TestAccElasticsearchDomain_customEndpoint
=== RUN   TestAccElasticsearchDomain_Cluster_zoneAwareness
=== PAUSE TestAccElasticsearchDomain_Cluster_zoneAwareness
=== RUN   TestAccElasticsearchDomain_warm
=== PAUSE TestAccElasticsearchDomain_warm
=== RUN   TestAccElasticsearchDomain_withColdStorageOptions
=== PAUSE TestAccElasticsearchDomain_withColdStorageOptions
=== RUN   TestAccElasticsearchDomain_withDedicatedMaster
=== PAUSE TestAccElasticsearchDomain_withDedicatedMaster
=== RUN   TestAccElasticsearchDomain_duplicate
=== PAUSE TestAccElasticsearchDomain_duplicate
=== RUN   TestAccElasticsearchDomain_v23
=== PAUSE TestAccElasticsearchDomain_v23
=== RUN   TestAccElasticsearchDomain_complex
=== PAUSE TestAccElasticsearchDomain_complex
=== RUN   TestAccElasticsearchDomain_vpc
=== PAUSE TestAccElasticsearchDomain_vpc
=== RUN   TestAccElasticsearchDomain_VPC_update
=== PAUSE TestAccElasticsearchDomain_VPC_update
=== RUN   TestAccElasticsearchDomain_internetToVPCEndpoint
=== PAUSE TestAccElasticsearchDomain_internetToVPCEndpoint
=== RUN   TestAccElasticsearchDomain_AutoTuneOptions
=== PAUSE TestAccElasticsearchDomain_AutoTuneOptions
=== RUN   TestAccElasticsearchDomain_AdvancedSecurityOptions_userDB
=== PAUSE TestAccElasticsearchDomain_AdvancedSecurityOptions_userDB
=== RUN   TestAccElasticsearchDomain_AdvancedSecurityOptions_iam
=== PAUSE TestAccElasticsearchDomain_AdvancedSecurityOptions_iam
=== RUN   TestAccElasticsearchDomain_AdvancedSecurityOptions_disabled
=== PAUSE TestAccElasticsearchDomain_AdvancedSecurityOptions_disabled
=== RUN   TestAccElasticsearchDomain_LogPublishingOptions_indexSlowLogs
=== PAUSE TestAccElasticsearchDomain_LogPublishingOptions_indexSlowLogs
=== RUN   TestAccElasticsearchDomain_LogPublishingOptions_searchSlowLogs
=== PAUSE TestAccElasticsearchDomain_LogPublishingOptions_searchSlowLogs
=== RUN   TestAccElasticsearchDomain_LogPublishingOptions_esApplicationLogs
=== PAUSE TestAccElasticsearchDomain_LogPublishingOptions_esApplicationLogs
=== RUN   TestAccElasticsearchDomain_LogPublishingOptions_auditLogs
=== PAUSE TestAccElasticsearchDomain_LogPublishingOptions_auditLogs
=== RUN   TestAccElasticsearchDomain_cognitoOptionsCreateAndRemove
=== PAUSE TestAccElasticsearchDomain_cognitoOptionsCreateAndRemove
=== RUN   TestAccElasticsearchDomain_cognitoOptionsUpdate
=== PAUSE TestAccElasticsearchDomain_cognitoOptionsUpdate
=== RUN   TestAccElasticsearchDomain_policy
=== PAUSE TestAccElasticsearchDomain_policy
=== RUN   TestAccElasticsearchDomain_policyIgnoreEquivalent
=== PAUSE TestAccElasticsearchDomain_policyIgnoreEquivalent
=== RUN   TestAccElasticsearchDomain_Encryption_atRestDefaultKey
=== PAUSE TestAccElasticsearchDomain_Encryption_atRestDefaultKey
=== RUN   TestAccElasticsearchDomain_Encryption_atRestSpecifyKey
=== PAUSE TestAccElasticsearchDomain_Encryption_atRestSpecifyKey
=== RUN   TestAccElasticsearchDomain_Encryption_atRestEnable
=== PAUSE TestAccElasticsearchDomain_Encryption_atRestEnable
=== RUN   TestAccElasticsearchDomain_Encryption_atRestEnableLegacy
=== PAUSE TestAccElasticsearchDomain_Encryption_atRestEnableLegacy
=== RUN   TestAccElasticsearchDomain_Encryption_nodeToNode
=== PAUSE TestAccElasticsearchDomain_Encryption_nodeToNode
=== RUN   TestAccElasticsearchDomain_Encryption_nodeToNodeEnable
=== PAUSE TestAccElasticsearchDomain_Encryption_nodeToNodeEnable
=== RUN   TestAccElasticsearchDomain_Encryption_nodeToNodeEnableLegacy
=== PAUSE TestAccElasticsearchDomain_Encryption_nodeToNodeEnableLegacy
=== RUN   TestAccElasticsearchDomain_tags
=== PAUSE TestAccElasticsearchDomain_tags
=== RUN   TestAccElasticsearchDomain_update
=== PAUSE TestAccElasticsearchDomain_update
=== RUN   TestAccElasticsearchDomain_VolumeType_update
=== PAUSE TestAccElasticsearchDomain_VolumeType_update
=== RUN   TestAccElasticsearchDomain_VolumeType_gp3ToGP2
=== PAUSE TestAccElasticsearchDomain_VolumeType_gp3ToGP2
=== RUN   TestAccElasticsearchDomain_VolumeType_missing
=== PAUSE TestAccElasticsearchDomain_VolumeType_missing
=== RUN   TestAccElasticsearchDomain_Update_version
=== PAUSE TestAccElasticsearchDomain_Update_version
=== RUN   TestAccElasticsearchDomain_disappears
=== PAUSE TestAccElasticsearchDomain_disappears
=== CONT  TestAccElasticsearchDomain_basic
=== CONT  TestAccElasticsearchDomain_LogPublishingOptions_auditLogs
=== CONT  TestAccElasticsearchDomain_vpc
--- PASS: TestAccElasticsearchDomain_basic (647.61s)
=== CONT  TestAccElasticsearchDomain_LogPublishingOptions_esApplicationLogs
--- PASS: TestAccElasticsearchDomain_LogPublishingOptions_auditLogs (952.60s)
=== CONT  TestAccElasticsearchDomain_LogPublishingOptions_searchSlowLogs
--- PASS: TestAccElasticsearchDomain_vpc (1063.94s)
=== CONT  TestAccElasticsearchDomain_LogPublishingOptions_indexSlowLogs
--- PASS: TestAccElasticsearchDomain_LogPublishingOptions_esApplicationLogs (1223.70s)
=== CONT  TestAccElasticsearchDomain_AdvancedSecurityOptions_disabled
--- PASS: TestAccElasticsearchDomain_LogPublishingOptions_searchSlowLogs (1275.16s)
=== CONT  TestAccElasticsearchDomain_AdvancedSecurityOptions_iam
--- PASS: TestAccElasticsearchDomain_AdvancedSecurityOptions_iam (1350.04s)
=== CONT  TestAccElasticsearchDomain_AdvancedSecurityOptions_userDB
--- PASS: TestAccElasticsearchDomain_LogPublishingOptions_indexSlowLogs (1194.13s)
=== CONT  TestAccElasticsearchDomain_AutoTuneOptions
--- PASS: TestAccElasticsearchDomain_AdvancedSecurityOptions_disabled (638.60s)
=== CONT  TestAccElasticsearchDomain_internetToVPCEndpoint
--- PASS: TestAccElasticsearchDomain_AutoTuneOptions (261.44s)
=== CONT  TestAccElasticsearchDomain_VPC_update
--- PASS: TestAccElasticsearchDomain_AdvancedSecurityOptions_userDB (322.64s)
=== CONT  TestAccElasticsearchDomain_withColdStorageOptions
--- PASS: TestAccElasticsearchDomain_internetToVPCEndpoint (290.56s)
=== CONT  TestAccElasticsearchDomain_complex
--- PASS: TestAccElasticsearchDomain_withColdStorageOptions (319.63s)
=== CONT  TestAccElasticsearchDomain_v23
--- PASS: TestAccElasticsearchDomain_VPC_update (370.79s)
=== CONT  TestAccElasticsearchDomain_duplicate
--- PASS: TestAccElasticsearchDomain_complex (500.32s)
=== CONT  TestAccElasticsearchDomain_withDedicatedMaster
--- PASS: TestAccElasticsearchDomain_duplicate (964.12s)
=== CONT  TestAccElasticsearchDomain_Cluster_zoneAwareness
--- PASS: TestAccElasticsearchDomain_v23 (997.84s)
=== CONT  TestAccElasticsearchDomain_warm
--- PASS: TestAccElasticsearchDomain_withDedicatedMaster (863.87s)
=== CONT  TestAccElasticsearchDomain_Encryption_nodeToNodeEnable
--- PASS: TestAccElasticsearchDomain_warm (729.88s)
=== CONT  TestAccElasticsearchDomain_disappears
--- PASS: TestAccElasticsearchDomain_disappears (131.34s)
=== CONT  TestAccElasticsearchDomain_Update_version
--- PASS: TestAccElasticsearchDomain_Encryption_nodeToNodeEnable (4821.17s)
=== CONT  TestAccElasticsearchDomain_VolumeType_missing
--- PASS: TestAccElasticsearchDomain_VolumeType_missing (39.85s)
=== CONT  TestAccElasticsearchDomain_VolumeType_gp3ToGP2
--- PASS: TestAccElasticsearchDomain_Cluster_zoneAwareness (1292.02s)
=== CONT  TestAccElasticsearchDomain_VolumeType_update
--- PASS: TestAccElasticsearchDomain_VolumeType_gp3ToGP2 (556.89s)
=== CONT  TestAccElasticsearchDomain_update
--- PASS: TestAccElasticsearchDomain_Update_version (845.30s)
=== CONT  TestAccElasticsearchDomain_tags
--- PASS: TestAccElasticsearchDomain_tags (166.46s)
=== CONT  TestAccElasticsearchDomain_Encryption_nodeToNodeEnableLegacy
--- PASS: TestAccElasticsearchDomain_VolumeType_update (599.69s)
=== CONT  TestAccElasticsearchDomain_policy
--- PASS: TestAccElasticsearchDomain_policy (176.04s)
=== CONT  TestAccElasticsearchDomain_policyIgnoreEquivalent
--- PASS: TestAccElasticsearchDomain_update (473.62s)
=== CONT  TestAccElasticsearchDomain_Encryption_atRestEnableLegacy
--- PASS: TestAccElasticsearchDomain_policyIgnoreEquivalent (136.49s)
=== CONT  TestAccElasticsearchDomain_Encryption_nodeToNode
--- PASS: TestAccElasticsearchDomain_Encryption_nodeToNode (177.15s)
=== CONT  TestAccElasticsearchDomain_customEndpoint
--- PASS: TestAccElasticsearchDomain_Encryption_atRestEnableLegacy (402.88s)
=== CONT  TestAccElasticsearchDomain_Encryption_atRestDefaultKey
--- PASS: TestAccElasticsearchDomain_customEndpoint (236.75s)
=== CONT  TestAccElasticsearchDomain_Encryption_atRestEnable
--- PASS: TestAccElasticsearchDomain_Encryption_nodeToNodeEnableLegacy (833.00s)
=== CONT  TestAccElasticsearchDomain_Encryption_atRestSpecifyKey
--- PASS: TestAccElasticsearchDomain_Encryption_atRestDefaultKey (251.36s)
=== CONT  TestAccElasticsearchDomain_requireHTTPS
--- PASS: TestAccElasticsearchDomain_requireHTTPS (200.76s)
=== CONT  TestAccElasticsearchDomain_cognitoOptionsUpdate
--- PASS: TestAccElasticsearchDomain_Encryption_atRestSpecifyKey (1046.25s)
=== CONT  TestAccElasticsearchDomain_cognitoOptionsCreateAndRemove
--- PASS: TestAccElasticsearchDomain_Encryption_atRestEnable (620.36s)
--- PASS: TestAccElasticsearchDomain_cognitoOptionsUpdate (396.81s)
--- PASS: TestAccElasticsearchDomain_cognitoOptionsCreateAndRemove (378.40s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/elasticsearch	7182.528s

@ewbankkit
Copy link
Contributor

@mattburgess Thanks for the contribution 🎉 👏.

@ewbankkit ewbankkit merged commit d7faa4a into hashicorp:main Aug 24, 2024
39 checks passed
@github-actions github-actions bot added this to the v5.65.0 milestone Aug 24, 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 29, 2024
@github-actions GitHub Actions
Copy link

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ewbankkit ewbankkit ewbankkit approved these changes

Assignees

@ewbankkit ewbankkit

Labels
aws-sdk-go-migration Issues that are related to the providers migration to AWS SDK for Go v2. client-connections Pertains to the AWS Client and service connections. external-maintainer Contribution from a trusted external contributor. generators Relates to code generators. service/elasticsearch Issues and PRs that pertain to the elasticsearch service. size/XL Managed by automation to categorize the size of a PR. sweeper Pertains to changes to or issues with the sweeper. tags Pertains to resource tagging. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure.
Projects
None yet
Milestone
v5.65.0
3 participants
@mattburgess @ewbankkit @justinretzolk