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

r/aws_opensearch_domain: Remove engine_version default #31568

Merged
merged 6 commits into from
May 25, 2023
Merged

r/aws_opensearch_domain: Remove engine_version default #31568

merged 6 commits into from
May 25, 2023

Conversation

jar-b
Copy link
Member

@jar-b jar-b commented May 24, 2023 •
edited by gdavison
Loading

Description

Removes the default engine_version value. When omitted, the latest OpenSearch engine version will be applied by the underlying AWS API.

Relations

Closes #29558

Output from Acceptance Testing

$ make testacc PKG=opensearch TESTS=TestAccOpenSearchDomain_

--- PASS: TestAccOpenSearchDomain_Policy_basic (1698.80s)
--- PASS: TestAccOpenSearchDomain_Policy_ignoreEquivalent (1886.91s)
--- PASS: TestAccOpenSearchDomain_AdvancedSecurityOptions_disabled (2031.17s)
--- PASS: TestAccOpenSearchDomain_LogPublishingOptions_searchSlowLogs (2100.97s)
--- PASS: TestAccOpenSearchDomain_basic (2237.72s)
--- PASS: TestAccOpenSearchDomain_Encryption_nodeToNode (2307.58s)
--- PASS: TestAccOpenSearchDomain_tags (2509.26s)
--- PASS: TestAccOpenSearchDomain_Encryption_atRestDefaultKey (2784.22s)
--- PASS: TestAccOpenSearchDomain_Encryption_atRestSpecifyKey (2787.04s)
--- PASS: TestAccOpenSearchDomain_complex (2839.57s)
--- PASS: TestAccOpenSearchDomain_disappears (2943.37s)
--- PASS: TestAccOpenSearchDomain_CognitoOptions_update (3374.31s)
--- PASS: TestAccOpenSearchDomain_duplicate (1220.57s)
--- PASS: TestAccOpenSearchDomain_LogPublishingOptions_indexSlowLogs (3902.42s)
--- PASS: TestAccOpenSearchDomain_autoTuneOptions (2151.11s)
--- PASS: TestAccOpenSearchDomain_AdvancedSecurityOptions_iam (4199.42s)
--- PASS: TestAccOpenSearchDomain_VolumeType_missing (1713.76s)
--- PASS: TestAccOpenSearchDomain_Encryption_atRestEnableLegacy (4804.27s)
--- PASS: TestAccOpenSearchDomain_AdvancedSecurityOptions_userDB (2727.99s)
--- PASS: TestAccOpenSearchDomain_VolumeType_update (5133.54s)
--- PASS: TestAccOpenSearchDomain_Cluster_warm (5501.66s)
--- PASS: TestAccOpenSearchDomain_v23 (3032.28s)
--- PASS: TestAccOpenSearchDomain_Cluster_coldStorage (4349.07s)
--- PASS: TestAccOpenSearchDomain_Encryption_atRestEnable (6311.84s)
--- PASS: TestAccOpenSearchDomain_LogPublishingOptions_auditLogs (2442.50s)
--- PASS: TestAccOpenSearchDomain_Cluster_update (3715.81s)
--- PASS: TestAccOpenSearchDomain_Encryption_nodeToNodeEnableLegacy (6684.44s)
--- PASS: TestAccOpenSearchDomain_requireHTTPS (3485.21s)
--- PASS: TestAccOpenSearchDomain_customEndpoint (3674.94s)
--- PASS: TestAccOpenSearchDomain_VPC_basic (2425.93s)
--- PASS: TestAccOpenSearchDomain_Encryption_nodeToNodeEnable (7562.81s)
--- PASS: TestAccOpenSearchDomain_LogPublishingOptions_applicationLogs (2778.65s)
--- PASS: TestAccOpenSearchDomain_AdvancedSecurityOptions_anonymousAuth (5661.35s)
--- PASS: TestAccOpenSearchDomain_versionUpdate (5282.14s)
--- PASS: TestAccOpenSearchDomain_CognitoOptions_createAndRemove (3439.65s)
--- PASS: TestAccOpenSearchDomain_VPC_update (4045.83s)
--- PASS: TestAccOpenSearchDomain_VolumeType_gp3ToGP2 (5564.56s)
--- PASS: TestAccOpenSearchDomain_Cluster_dedicatedMaster (5064.78s)
--- PASS: TestAccOpenSearchDomain_VPC_internetToVPCEndpoint (3882.96s)
--- PASS: TestAccOpenSearchDomain_Cluster_zoneAwareness (7377.95s)
$ make testacc PKG=opensearch TESTS='TestAccOpenSearchOutboundConnection_|TestAccOpenSearchInboundConnectionAccepter_|TestAccOpenSearchDomainPolicy_' 

--- PASS: TestAccOpenSearchInboundConnectionAccepter_disappears (1815.86s)
--- PASS: TestAccOpenSearchOutboundConnection_disappears (1843.56s)
--- PASS: TestAccOpenSearchInboundConnectionAccepter_basic (1946.26s)
--- PASS: TestAccOpenSearchOutboundConnection_basic (2043.71s)
--- PASS: TestAccOpenSearchDomainPolicy_basic (3103.70s)

@jar-b jar-b added this to the v5.0.0 milestone May 24, 2023
@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 documentation Introduces or discusses updates to documentation. service/opensearch Issues and PRs that pertain to the opensearch service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. size/XS Managed by automation to categorize the size of a PR. labels May 24, 2023
@gdavison gdavison self-assigned this May 24, 2023
@github-actions github-actions bot added service/cognitoidp Issues and PRs that pertain to the cognitoidp service. size/M Managed by automation to categorize the size of a PR. and removed size/XS Managed by automation to categorize the size of a PR. service/cognitoidp Issues and PRs that pertain to the cognitoidp service. labels May 24, 2023
gdavison
gdavison approved these changes May 24, 2023
View reviewed changes
Copy link
Contributor

@gdavison gdavison left a comment

Choose a reason for hiding this comment

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

Looks good! 🚀

Needs a CHANGELOG entry

--- PASS: TestAccOpenSearchDomain_Policy_basic (1698.80s)
--- PASS: TestAccOpenSearchDomain_Policy_ignoreEquivalent (1886.91s)
--- PASS: TestAccOpenSearchDomain_AdvancedSecurityOptions_disabled (2031.17s)
--- PASS: TestAccOpenSearchDomain_LogPublishingOptions_searchSlowLogs (2100.97s)
--- PASS: TestAccOpenSearchDomain_basic (2237.72s)
--- PASS: TestAccOpenSearchDomain_Encryption_nodeToNode (2307.58s)
--- PASS: TestAccOpenSearchDomain_tags (2509.26s)
--- PASS: TestAccOpenSearchDomain_Encryption_atRestDefaultKey (2784.22s)
--- PASS: TestAccOpenSearchDomain_Encryption_atRestSpecifyKey (2787.04s)
--- PASS: TestAccOpenSearchDomain_complex (2839.57s)
--- PASS: TestAccOpenSearchDomain_disappears (2943.37s)
--- PASS: TestAccOpenSearchDomain_CognitoOptions_update (3374.31s)
--- PASS: TestAccOpenSearchDomain_duplicate (1220.57s)
--- PASS: TestAccOpenSearchDomain_LogPublishingOptions_indexSlowLogs (3902.42s)
--- PASS: TestAccOpenSearchDomain_autoTuneOptions (2151.11s)
--- PASS: TestAccOpenSearchDomain_AdvancedSecurityOptions_iam (4199.42s)
--- PASS: TestAccOpenSearchDomain_VolumeType_missing (1713.76s)
--- PASS: TestAccOpenSearchDomain_Encryption_atRestEnableLegacy (4804.27s)
--- PASS: TestAccOpenSearchDomain_AdvancedSecurityOptions_userDB (2727.99s)
--- PASS: TestAccOpenSearchDomain_VolumeType_update (5133.54s)
--- PASS: TestAccOpenSearchDomain_Cluster_warm (5501.66s)
--- PASS: TestAccOpenSearchDomain_v23 (3032.28s)
--- PASS: TestAccOpenSearchDomain_Cluster_coldStorage (4349.07s)
--- PASS: TestAccOpenSearchDomain_Encryption_atRestEnable (6311.84s)
--- PASS: TestAccOpenSearchDomain_LogPublishingOptions_auditLogs (2442.50s)
--- PASS: TestAccOpenSearchDomain_Cluster_update (3715.81s)
--- PASS: TestAccOpenSearchDomain_Encryption_nodeToNodeEnableLegacy (6684.44s)
--- PASS: TestAccOpenSearchDomain_requireHTTPS (3485.21s)
--- PASS: TestAccOpenSearchDomain_customEndpoint (3674.94s)
--- PASS: TestAccOpenSearchDomain_VPC_basic (2425.93s)
--- PASS: TestAccOpenSearchDomain_Encryption_nodeToNodeEnable (7562.81s)
--- PASS: TestAccOpenSearchDomain_LogPublishingOptions_applicationLogs (2778.65s)
--- PASS: TestAccOpenSearchDomain_AdvancedSecurityOptions_anonymousAuth (5661.35s)
--- PASS: TestAccOpenSearchDomain_versionUpdate (5282.14s)
--- PASS: TestAccOpenSearchDomain_CognitoOptions_createAndRemove (3439.65s)
--- PASS: TestAccOpenSearchDomain_VPC_update (4045.83s)
--- PASS: TestAccOpenSearchDomain_VolumeType_gp3ToGP2 (5564.56s)
--- PASS: TestAccOpenSearchDomain_Cluster_dedicatedMaster (5064.78s)
--- PASS: TestAccOpenSearchDomain_VPC_internetToVPCEndpoint (3882.96s)
--- PASS: TestAccOpenSearchDomain_Cluster_zoneAwareness (7377.95s)

--- PASS: TestAccOpenSearchInboundConnectionAccepter_disappears (1815.86s)
--- PASS: TestAccOpenSearchOutboundConnection_disappears (1843.56s)
--- PASS: TestAccOpenSearchInboundConnectionAccepter_basic (1946.26s)
--- PASS: TestAccOpenSearchOutboundConnection_basic (2043.71s)
--- PASS: TestAccOpenSearchDomainPolicy_basic (3103.70s)

@github-actions github-actions bot added the service/cognitoidp Issues and PRs that pertain to the cognitoidp service. label May 24, 2023
@jar-b jar-b merged commit 8599471 into main May 25, 2023
45 checks passed
@jar-b jar-b deleted the td-aws_opensearch-domain-engine_version branch May 25, 2023 14:32
github-actions bot pushed a commit that referenced this pull request May 25, 2023
Update CHANGELOG.md for #31568
d8cdf4c
@github-actions
Copy link

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!

dsturnbull
dsturnbull reviewed Jun 23, 2023
View reviewed changes
internal/service/opensearch/wait.go
@@ -82,25 +83,26 @@ func waitForDomainUpdate(ctx context.Context, conn *opensearchservice.OpenSearch

return retry.RetryableError(
fmt.Errorf("%q: Timeout while waiting for changes to be processed", domainName))
})
}, tfresource.WithDelay(10*time.Minute), tfresource.WithPollInterval(10*time.Second))
Copy link

Choose a reason for hiding this comment

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

I don't think we need to wait 10 minutes for updates. This e.g. costs me 10 minutes to simply update the domain access_policy.

@github-actions
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 Jul 24, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@dsturnbull dsturnbull dsturnbull left review comments

@gdavison gdavison gdavison approved these changes

Assignees

@gdavison gdavison

Labels
documentation Introduces or discusses updates to documentation. service/cognitoidp Issues and PRs that pertain to the cognitoidp service. service/opensearch Issues and PRs that pertain to the opensearch service. size/M Managed by automation to categorize the size of a PR. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure.
Projects
None yet
Milestone
v5.0.0
Development

Successfully merging this pull request may close these issues.

[Bug]: Unspecified aws_opensearch_domain engine_version should use latest version, not OpenSearch_1.1
3 participants
@jar-b @dsturnbull @gdavison