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

Unconditionally enable api termination when deleting aws_instance #19277

Merged

Conversation

tmccombs
Copy link
Contributor

@tmccombs tmccombs commented May 7, 2021

When we delete an ec2 instance, make sure that we turn off disabled api
termination, so that deletion always works.

Fixes #19275

Alternative to (and conflicts with) #19276

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

@tmccombs tmccombs requested a review from a team as a code owner May 7, 2021 16:16
@ghost ghost added size/XS Managed by automation to categorize the size of a PR. service/ec2 Issues and PRs that pertain to the ec2 service. labels May 7, 2021
@github-actions github-actions bot added the needs-triage Waiting for first response or review from a maintainer. label May 7, 2021
@breathingdust breathingdust added enhancement Requests to existing resources that expand the functionality or scope. and removed needs-triage Waiting for first response or review from a maintainer. labels Sep 4, 2021
@zhelding
Copy link
Contributor

Pull request #21306 has significantly refactored the AWS Provider codebase. As a result, most PRs opened prior to the refactor now have merge conflicts that must be resolved before proceeding.

Specifically, PR #21306 relocated the code for all AWS resources and data sources from a single aws directory to a large number of separate directories in internal/service, each corresponding to a particular AWS service. This separation of code has also allowed for us to simplify the names of underlying functions -- while still avoiding namespace collisions.

We recognize that many pull requests have been open for some time without yet being addressed by our maintainers. Therefore, we want to make it clear that resolving these conflicts in no way affects the prioritization of a particular pull request. Once a pull request has been prioritized for review, the necessary changes will be made by a maintainer -- either directly or in collaboration with the pull request author.

For a more complete description of this refactor, including examples of how old filepaths and function names correspond to their new counterparts: please refer to issue #20000.

For a quick guide on how to amend your pull request to resolve the merge conflicts resulting from this refactor and bring it in line with our new code patterns: please refer to our Service Package Refactor Pull Request Guide.

When we delete an ec2 instance, make sure that we turn off disabled api
termination, so that deletion always works.

Closes hashicorp#19275

Alternative to (and conflicts with) hashicorp#19276
@ewbankkit ewbankkit added bug Addresses a defect in current functionality. and removed enhancement Requests to existing resources that expand the functionality or scope. labels May 26, 2022
@github-actions github-actions bot added tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. 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. labels May 26, 2022
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 🚀.

% make testacc TESTARGS='-run=TestAccEC2Instance_disableAPITermination\|TestAccEC2Instance_basic' PKG=ec2 ACCTEST_PARALLELISM=2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ec2/... -v -count 1 -parallel 2  -run=TestAccEC2Instance_disableAPITermination\|TestAccEC2Instance_basic -timeout 180m
=== RUN   TestAccEC2Instance_basic
=== PAUSE TestAccEC2Instance_basic
=== RUN   TestAccEC2Instance_disableAPITerminationFinalFalse
=== PAUSE TestAccEC2Instance_disableAPITerminationFinalFalse
=== RUN   TestAccEC2Instance_disableAPITerminationFinalTrue
=== PAUSE TestAccEC2Instance_disableAPITerminationFinalTrue
=== CONT  TestAccEC2Instance_basic
=== CONT  TestAccEC2Instance_disableAPITerminationFinalTrue
--- PASS: TestAccEC2Instance_disableAPITerminationFinalTrue (124.33s)
=== CONT  TestAccEC2Instance_disableAPITerminationFinalFalse
--- PASS: TestAccEC2Instance_basic (124.47s)
--- PASS: TestAccEC2Instance_disableAPITerminationFinalFalse (165.54s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/ec2	294.127s

@ewbankkit
Copy link
Contributor

@tmccombs Thanks for the contribution 🎉 👏.

@ewbankkit ewbankkit merged commit 676bfd5 into hashicorp:main May 26, 2022
@github-actions github-actions bot added this to the v4.16.0 milestone May 26, 2022
@tmccombs tmccombs deleted the always-enable-api-termination-on-delete branch May 27, 2022 03:20
@github-actions
Copy link

This functionality has been released in v4.16.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 Jun 28, 2022
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/ec2 Issues and PRs that pertain to the ec2 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
Development

Successfully merging this pull request may close these issues.

Unable to delete aws_instance if disable_api_termination was true
4 participants