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

Terraform Force Unlock #268

Merged
merged 38 commits into from
Aug 19, 2022
Merged

Terraform Force Unlock #268

merged 38 commits into from
Aug 19, 2022

Conversation

Nalum
Copy link
Contributor

@Nalum Nalum commented Jul 19, 2022

This is adding the ability to force unlock a terraform state, see #250 for more information

@Nalum Nalum requested review from chanwit, phoban01 and tomhuang12 July 19, 2022 10:57
@Nalum
Copy link
Contributor Author

Nalum commented Aug 2, 2022

@chanwit just dropping a comment here so I don't forgot, if possible we need to get hashicorp/terraform-exec#268 merged or have your fork updated to at least v0.16.0 as that is when the force-unlock feature was added to the exec package.

@Nalum Nalum force-pushed the issue-250 branch 4 times, most recently from 30dac41 to 7be8714 Compare August 15, 2022 11:01
@Nalum Nalum mentioned this pull request Aug 17, 2022
Closed
Nalum and others added 20 commits August 18, 2022 17:18
@Nalum
Setup new field for force-unlock and the condition function
52fffd9 
Signed-off-by: Luke Mallon (Nalum) <luke@mallon.ie>
@Nalum
Setup state config as a pointer
cda0484 
Signed-off-by: Luke Mallon (Nalum) <luke@mallon.ie>
@Nalum
Rename function to match common naming, add ForceUnlock CLI command
35a236b 
Signed-off-by: Luke Mallon (Nalum) <luke@mallon.ie>
@Nalum
Output some messaging around force unlock
cdf64da 
Signed-off-by: Luke Mallon (Nalum) <luke@mallon.ie>
@Nalum
Fix args list to function and vars in print
bf3b221 
Signed-off-by: Luke Mallon (Nalum) <luke.mallon@weave.works>
@Nalum
Setup new function to force unlock a locked state
303852b 
Signed-off-by: Luke Mallon (Nalum) <luke.mallon@weave.works>
@Nalum
Update CRD definition
cb271c3 
Signed-off-by: Luke Mallon (Nalum) <luke.mallon@weave.works>
@Nalum
update based on new crd
cdb274f 
Signed-off-by: Luke Mallon (Nalum) <luke.mallon@weave.works>
Signed-off-by: Luke Mallon (Nalum) <luke@mallon.ie>
@Nalum
Fix bool var to pointer
eb5700f 
Signed-off-by: Luke Mallon (Nalum) <luke.mallon@weave.works>
@Nalum
Setup space for the lock id in reply messages
5fdab08 
Signed-off-by: Luke Mallon (Nalum) <luke.mallon@weave.works>
@Nalum
Set ForceUnlock as an Enum and add new field for lock id
8ff417f 
Signed-off-by: Luke Mallon (Nalum) <luke@mallon.ie>
@Nalum
Make use of the enum values to check for unlock and pull the id
dbfe449 
Signed-off-by: Luke Mallon (Nalum) <luke@mallon.ie>
@Nalum
Set appropriate name and pass ctx and terraform
2714d6d 
Signed-off-by: Luke Mallon (Nalum) <luke@mallon.ie>
@Nalum
Update ForceUnlock to work with new structure
41a6b2a 
Fix default value

Change true, false to yes, no

Signed-off-by: Luke Mallon (Nalum) <luke@mallon.ie>
@Nalum
Check for null values
0d349d0 
Signed-off-by: Luke Mallon (Nalum) <luke@mallon.ie>
@Nalum
Restructure the backendconfig block
7ec0de7 
Signed-off-by: Luke Mallon (Nalum) <luke@mallon.ie>
@Nalum
Fix invalid config error
d389371 
Signed-off-by: Luke Mallon (Nalum) <luke@mallon.ie>
@Nalum
Update definition of InClusterConfig to set a default
83e7a77 
Signed-off-by: Luke Mallon (Nalum) <luke@mallon.ie>
@Nalum
Update to match CRD definition
70a4eaa 
Signed-off-by: Luke Mallon (Nalum) <luke@mallon.ie>
@Nalum
Move state unlock out of backend config
0f43117 
Signed-off-by: Luke Mallon (Nalum) <luke@mallon.ie>
Nalum and others added 17 commits August 18, 2022 17:19
@Nalum
Update to match CRD
aee0652 
Signed-off-by: Luke Mallon (Nalum) <luke@mallon.ie>
@Nalum
Fix name of State Spec
2d6264b 
Signed-off-by: Luke Mallon (Nalum) <luke@mallon.ie>
@Nalum
Revert changes to backendConfig setup
e8584a4 
Signed-off-by: Luke Mallon (Nalum) <luke@mallon.ie>
@Nalum
Remove comments as they don't make sense anymore
6a6894b 
Signed-off-by: Luke Mallon (Nalum) <luke@mallon.ie>
@Nalum
setForceUnlock function will now try updating the state and error out…
229ed6a 
… on failure

Signed-off-by: Luke Mallon (Nalum) <luke@mallon.ie>
@Nalum
Update the field name to tfstate
1c8272d 
Signed-off-by: Luke Mallon (Nalum) <luke@mallon.ie>
@Nalum
Udpate to match CRD
3b858db 
Signed-off-by: Luke Mallon (Nalum) <luke@mallon.ie>
@Nalum
Update conditions on the terraform object when state is locked and wh…
3fa35ba 
…en we're trying to force unlock it

Signed-off-by: Luke Mallon (Nalum) <luke@mallon.ie>
@Nalum
Test for locked state
c07a26f 
Signed-off-by: Luke Mallon (Nalum) <luke@mallon.ie>
@Nalum
Output State Error if it is a match
b9814d5 
Signed-off-by: Luke Mallon (Nalum) <luke.mallon@weave.works>
@Nalum
Use status.Status to return the error with additional details
8e7c855 
Signed-off-by: Luke Mallon (Nalum) <luke.mallon@weave.works>
@Nalum
Unpack the error with status.FromError and process the details
8b065b8 
Signed-off-by: Luke Mallon (Nalum) <luke.mallon@weave.works>
@Nalum
Correctly patch the lease with annotation required to lock the state
2d8e79f 
Signed-off-by: Luke Mallon (Nalum) <luke.mallon@weave.works>
@Nalum
Make sure we always set the new Status error
91d95a3 
Signed-off-by: Luke Mallon (Nalum) <luke.mallon@weave.works>
@Nalum
First unit test running successfully
35ffa99 
Signed-off-by: Luke Mallon (Nalum) <luke.mallon@weave.works>
@Nalum
Init terraform before force unlocking
b50a8b2 
Signed-off-by: Luke Mallon (Nalum) <luke.mallon@weave.works>
@Nalum
Test ForceUnlock yes and ForceUnlock auto
d3b1f3e 
Signed-off-by: Luke Mallon (Nalum) <luke.mallon@weave.works>
@Nalum
Extend the timeout on condition check
6d3b118 
Signed-off-by: Luke Mallon (Nalum) <luke.mallon@weave.works>
@Nalum Nalum marked this pull request as ready for review August 18, 2022 16:53
@Nalum Nalum added the kind/enhancement New feature or request label Aug 18, 2022
@chanwit chanwit merged commit 80be24d into flux-iac:main Aug 19, 2022
@chanwit
Copy link
Collaborator

chanwit commented Aug 19, 2022

Thank you so much @Nalum !!

@Nalum Nalum deleted the issue-250 branch August 19, 2022 15:58
@Nalum Nalum mentioned this pull request Aug 19, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chanwit chanwit chanwit approved these changes

@phoban01 phoban01 Awaiting requested review from phoban01

@tomhuang12 tomhuang12 Awaiting requested review from tomhuang12

Assignees
No one assigned
Labels
kind/enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Nalum @chanwit