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

es/domain: Enable encrypt w/o ForceNew #24222

Merged
merged 17 commits into from
Apr 21, 2022
Merged

Conversation

YakDriver
Copy link
Member

@YakDriver YakDriver commented Apr 13, 2022

Community Note

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

Closes #17330

Output from acceptance testing:

% make testacc TESTS=TestAccOpenSearchDomain_Encryption PKG=opensearch 
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/opensearch/... -v -count 1 -parallel 20 -run='TestAccOpenSearchDomain_Encryption'  -timeout 180m
--- PASS: TestAccOpenSearchDomain_Encryption_atRestSpecifyKey (1295.27s)
--- PASS: TestAccOpenSearchDomain_Encryption_nodeToNode (1330.23s)
--- PASS: TestAccOpenSearchDomain_Encryption_atRestDefaultKey (1355.97s)
--- PASS: TestAccOpenSearchDomain_Encryption_atRestEnableLegacy (2835.81s)
--- PASS: TestAccOpenSearchDomain_Encryption_nodeToNodeEnableLegacy (3934.86s)
--- PASS: TestAccOpenSearchDomain_Encryption_nodeToNodeEnable (4695.07s)
--- PASS: TestAccOpenSearchDomain_Encryption_atRestEnable (4917.17s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/opensearch	4919.873s
% make testacc TESTS=TestAccElasticsearchDomain_Encryption PKG=elasticsearch 
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/elasticsearch/... -v -count 1 -parallel 20 -run='TestAccElasticsearchDomain_Encryption'  -timeout 180m
--- PASS: TestAccElasticsearchDomain_Encryption_nodeToNode (1804.74s)
--- PASS: TestAccElasticsearchDomain_Encryption_atRestSpecifyKey (2046.07s)
--- PASS: TestAccElasticsearchDomain_Encryption_atRestDefaultKey (2514.48s)
--- PASS: TestAccElasticsearchDomain_Encryption_atRestEnableLegacy (3078.36s)
--- PASS: TestAccElasticsearchDomain_Encryption_nodeToNodeEnable (4283.36s)
--- PASS: TestAccElasticsearchDomain_Encryption_nodeToNodeEnableLegacy (4600.67s)
--- PASS: TestAccElasticsearchDomain_Encryption_atRestEnable (4977.85s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/elasticsearch	4981.626s

@github-actions github-actions bot added service/elasticsearch Issues and PRs that pertain to the elasticsearch service. size/S Managed by automation to categorize the size of a PR. labels Apr 13, 2022
@github-actions github-actions bot added size/M Managed by automation to categorize the size of a PR. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. and removed size/S Managed by automation to categorize the size of a PR. labels Apr 13, 2022
@YakDriver YakDriver marked this pull request as draft April 20, 2022 18:34
@github-actions github-actions bot added documentation Introduces or discusses updates to documentation. service/opensearch Issues and PRs that pertain to the opensearch service. size/XL Managed by automation to categorize the size of a PR. and removed size/M Managed by automation to categorize the size of a PR. labels Apr 20, 2022
@YakDriver YakDriver force-pushed the f-elasticsearch-enable-encrypt branch from e62ee5b to f81dc91 Compare April 21, 2022 16:55
@YakDriver YakDriver marked this pull request as ready for review April 21, 2022 17:49
@YakDriver YakDriver self-assigned this Apr 21, 2022
@YakDriver YakDriver merged commit 5afe231 into main Apr 21, 2022
@YakDriver YakDriver deleted the f-elasticsearch-enable-encrypt branch April 21, 2022 19:50
@github-actions github-actions bot added this to the v4.11.0 milestone Apr 21, 2022
github-actions bot pushed a commit that referenced this pull request Apr 21, 2022
Comment on lines +1066 to +1070
if strings.HasPrefix(strings.ToLower(version), "opensearch") {
return true
}

version = strings.TrimPrefix(strings.ToLower(version), "elasticsearch_")
Copy link
Contributor

Choose a reason for hiding this comment

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

FYI ParseEngineVersion was added in #24284.

@github-actions
Copy link

This functionality has been released in v4.11.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
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 May 23, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
documentation Introduces or discusses updates to documentation. service/elasticsearch Issues and PRs that pertain to the elasticsearch service. service/opensearch Issues and PRs that pertain to the opensearch service. size/XL 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
Development

Successfully merging this pull request may close these issues.

Amazon Elasticsearch Service extends encryption at rest and node-to-node encryption to existing domains
2 participants