Skip to content

fix unlock for gcp #110

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

Merged
motatoes merged 4 commits into from
Apr 13, 2023
Merged

fix unlock for gcp #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
66fe053
print error if unlock failed
motatoes Apr 5, 2023
57f64b1
report more error messages
motatoes Apr 6, 2023
8507c68
Merge branch 'main' into feat/gcp-unlock-fix
motatoes Apr 13, 2023
e6d9ccc
merge main into branch
motatoes Apr 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions pkg/digger/digger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,17 +263,23 @@ func (d DiggerExecutor) Apply(prNumber int) {
d.prManager.PublishComment(prNumber, comment)
if err == nil {
_, err := d.lock.Unlock(d.LockId(), prNumber)
fmt.Errorf("error unlocking project: %v", err)
if err != nil {
fmt.Errorf("error unlocking project: %v", err)
}
} else {

d.prManager.PublishComment(prNumber, "Error during applying. Project lock will persist")
}
}

}

func (d DiggerExecutor) Unlock(prNumber int) {
d.lock.ForceUnlock(d.LockId(), prNumber)

err := d.lock.ForceUnlock(d.LockId(), prNumber)
if err != nil {
fmt.Printf("%v\n", err)
os.Exit(1)
}
}

func (d DiggerExecutor) Lock(prNumber int) bool {
Expand Down
16 changes: 12 additions & 4 deletions pkg/utils/locking.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ type Lock interface {
type ProjectLock interface {
Lock(lockId string, prNumber int) (bool, error)
Unlock(lockId string, prNumber int) (bool, error)
ForceUnlock(lockId string, prNumber int)
ForceUnlock(lockId string, prNumber int) error
}

func (projectLock *ProjectLockImpl) Lock(lockId string, prNumber int) (bool, error) {
Expand Down Expand Up @@ -104,18 +104,26 @@ func (projectLock *ProjectLockImpl) Unlock(lockId string, prNumber int) (bool, e
return false, nil
}

func (projectLock *ProjectLockImpl) ForceUnlock(lockId string, prNumber int) {
func (projectLock *ProjectLockImpl) ForceUnlock(lockId string, prNumber int) error {
fmt.Printf("ForceUnlock %s\n", lockId)
lock, _ := projectLock.InternalLock.GetLock(lockId)
lock, err := projectLock.InternalLock.GetLock(lockId)
if err != nil {
return err
}
if lock != nil {
lockReleased, _ := projectLock.InternalLock.Unlock(lockId)
lockReleased, err := projectLock.InternalLock.Unlock(lockId)
if err != nil {
return err
}

if lockReleased {
comment := "Project unlocked (" + projectLock.projectId() + ")."
projectLock.PrManager.PublishComment(prNumber, comment)
println("Project unlocked")
}
return nil
}
return nil
}

func (projectLock *ProjectLockImpl) projectId() string {
Expand Down