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

Fix terraform force-unlock <lock_id> for Consul backend #25837

Merged
merged 2 commits into from
Oct 5, 2020

Conversation

remilapeyre
Copy link
Contributor

When locking was enabled with the Consul backend and the lock not properly
released, the terraform force-unlock <lock_id> command would do nothing as
its implementation would exit early in that case.

It now destroys the session that created the lock and clean both the lock and
the lock-info keys.

A regression test is added to TestConsul_destroyLock() to catch the issue if it
happends again.

Closes #22174

When locking was enabled with the Consul backend and the lock not properly
released, the `terraform force-unlock <lock_id>` command would do nothing as
its implementation would exit early in that case.

It now destroys the session that created the lock and clean both the lock and
the lock-info keys.

A regression test is added to TestConsul_destroyLock() to catch the issue if it
happends again.

Closes hashicorp#22174
@codecov
Copy link

codecov bot commented Aug 13, 2020

Codecov Report

Merging #25837 into master will increase coverage by 0.02%.
The diff coverage is 71.42%.

Impacted Files Coverage Δ
backend/remote-state/consul/client.go 72.79% <71.42%> (+4.49%) ⬆️
internal/providercache/dir.go 66.66% <0.00%> (-6.25%) ⬇️
terraform/node_resource_plan.go 97.63% <0.00%> (+1.57%) ⬆️

Copy link
Contributor

@alisdair alisdair left a comment

Choose a reason for hiding this comment

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

Thanks!

@alisdair alisdair self-assigned this Sep 11, 2020
@alisdair
Copy link
Contributor

@remilapeyre Thank you for this fix! Unfortunately there's a conflict after merging #25842. Would you mind rebasing?

@remilapeyre
Copy link
Contributor Author

Hi @alisdair, sorry I had missed your message, it should all be good now :)

Copy link
Contributor

@alisdair alisdair left a comment

Choose a reason for hiding this comment

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

Thank you! 🙌

@alisdair alisdair merged commit 35d4926 into hashicorp:master Oct 5, 2020
@ghost
Copy link

ghost commented Nov 5, 2020

I'm going to lock this issue 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 similar to this, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@ghost ghost locked as resolved and limited conversation to collaborators Nov 5, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

terraform force-unlock unable to remove lock in consul backend
3 participants