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

r/aws_elasticsearch_domain: omit iops/throughput when not supported #32659

Merged
merged 7 commits into from
Jul 25, 2023

Conversation

gracevivi523
Copy link
Contributor

@gracevivi523 gracevivi523 commented Jul 24, 2023

Description

This fix ensures that the Throughput and Iops EBS features are not incorporated when the selected volume type doesn't support them, for instance, gp2 EBS volume type.

This specifically can occur when a setup utilizes a gp3 volume type without mentioning iops or throughput, and then the volume type switches to a type that doesn't accept these parameters, like gp2. During the first terraform apply, the default values provided by AWS are written to state, and subsequent terraform apply should be excluded from the UpdateDomain request input to prevent error Error: ValidationException: Throughput is only valid when volume type is GP3.

Relations

Closes #32613.

References

Same issue raised here with opensearch #27467, and resolved here #28862.

Output from Acceptance Testing

terraform-provider-aws git:(b-elasticsearch-ebs-options) ✗ make testacc PKG=elasticsearch TESTS=TestAccElasticsearchDomain_VolumeType_
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/elasticsearch/... -v -count 1 -parallel 20 -run='TestAccElasticsearchDomain_VolumeType_'  -timeout 180m
=== RUN   TestAccElasticsearchDomain_VolumeType_update
=== PAUSE TestAccElasticsearchDomain_VolumeType_update
=== RUN   TestAccElasticsearchDomain_VolumeType_gp3ToGP2
=== PAUSE TestAccElasticsearchDomain_VolumeType_gp3ToGP2
=== RUN   TestAccElasticsearchDomain_VolumeType_missing
=== PAUSE TestAccElasticsearchDomain_VolumeType_missing
=== CONT  TestAccElasticsearchDomain_VolumeType_update
=== CONT  TestAccElasticsearchDomain_VolumeType_missing
=== CONT  TestAccElasticsearchDomain_VolumeType_gp3ToGP2
--- PASS: TestAccElasticsearchDomain_VolumeType_missing (1396.16s)
--- PASS: TestAccElasticsearchDomain_VolumeType_gp3ToGP2 (2985.81s)
--- PASS: TestAccElasticsearchDomain_VolumeType_update (4440.89s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/elasticsearch	4442.801s

@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 tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. service/elasticsearch Issues and PRs that pertain to the elasticsearch service. size/L Managed by automation to categorize the size of a PR. needs-triage Waiting for first response or review from a maintainer. labels Jul 24, 2023
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

Welcome @gracevivi523 👋

It looks like this is your first Pull Request submission to the Terraform AWS Provider! If you haven’t already done so please make sure you have checked out our CONTRIBUTOR guide and FAQ to make sure your contribution is adhering to best practice and has all the necessary elements in place for a successful approval.

Also take a look at our FAQ which details how we prioritize Pull Requests for inclusion.

Thanks again, and welcome to the community! 😃

@itsmatthu
Copy link

👍 💯

@justinretzolk justinretzolk added bug Addresses a defect in current functionality. and removed needs-triage Waiting for first response or review from a maintainer. labels Jul 24, 2023
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=360m make testacc TESTARGS='-run=TestAccElasticsearchDomain_VolumeType_' PKG=elasticsearch ACCTEST_PARALLELISM=2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/elasticsearch/... -v -count 1 -parallel 2  -run=TestAccElasticsearchDomain_VolumeType_ -timeout 360m
=== RUN   TestAccElasticsearchDomain_VolumeType_update
=== PAUSE TestAccElasticsearchDomain_VolumeType_update
=== RUN   TestAccElasticsearchDomain_VolumeType_gp3ToGP2
=== PAUSE TestAccElasticsearchDomain_VolumeType_gp3ToGP2
=== RUN   TestAccElasticsearchDomain_VolumeType_missing
=== PAUSE TestAccElasticsearchDomain_VolumeType_missing
=== CONT  TestAccElasticsearchDomain_VolumeType_update
=== CONT  TestAccElasticsearchDomain_VolumeType_missing
--- PASS: TestAccElasticsearchDomain_VolumeType_missing (1475.35s)
=== CONT  TestAccElasticsearchDomain_VolumeType_gp3ToGP2
--- PASS: TestAccElasticsearchDomain_VolumeType_update (4467.45s)
--- PASS: TestAccElasticsearchDomain_VolumeType_gp3ToGP2 (3002.56s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/elasticsearch	4482.952s

@ewbankkit
Copy link
Contributor

@gracevivi523 Thanks for the contribution 🎉 👏.

@ewbankkit ewbankkit merged commit 82d0487 into hashicorp:main Jul 25, 2023
40 checks passed
@github-actions github-actions bot added this to the v5.10.0 milestone Jul 25, 2023
@github-actions
Copy link

This functionality has been released in v5.10.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 Aug 27, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bug Addresses a defect in current functionality. service/elasticsearch Issues and PRs that pertain to the elasticsearch service. size/L 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.

[Bug]: aws_elasticsearch_domain ebs_options throughput attribute populated for non-gp3 volume types?
4 participants