Skip to content

add repo owner to locks #79

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
Spartakovic merged 1 commit into from
Mar 30, 2023
Merged

add repo owner to locks #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion pkg/digger/digger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ func RunCommandsPerProject(commandsPerProject []ProjectCommand, repoOwner string
PrManager: prManager,
ProjectName: projectCommands.ProjectName,
RepoName: repoName,
RepoOwner: repoOwner,
}
diggerExecutor := DiggerExecutor{
workingDir,
Expand Down Expand Up @@ -216,7 +217,7 @@ type DiggerExecutor struct {
}

func (d DiggerExecutor) LockId() string {
return d.repoName + "#" + d.projectName
return d.repoOwner + "/" + d.repoName + "#" + d.projectName
}

func (d DiggerExecutor) Plan(prNumber int) {
Expand Down
7 changes: 7 additions & 0 deletions pkg/integration/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ func getProjectLockForTests() (error, *utils.ProjectLockImpl) {
PrManager: githubPrService,
ProjectName: "test_dynamodb_lock",
RepoName: repositoryName,
RepoOwner: repoOwner,
}
return err, projectLock
}
Expand Down Expand Up @@ -388,6 +389,7 @@ func TestHappyPath(t *testing.T) {
PrManager: githubPrService,
ProjectName: "dev",
RepoName: repositoryName,
RepoOwner: repoOwner,
}
resource := repositoryName + "#" + projectLock.ProjectName
transactionId, err := projectLock.InternalLock.GetLock(resource)
Expand Down Expand Up @@ -428,6 +430,7 @@ func TestHappyPath(t *testing.T) {
PrManager: githubPrService,
ProjectName: "dev",
RepoName: repositoryName,
RepoOwner: repoOwner,
}
transactionId, err = projectLock.InternalLock.GetLock(resource)
assert.NoError(t, err)
Expand All @@ -451,6 +454,7 @@ func TestHappyPath(t *testing.T) {
PrManager: githubPrService,
ProjectName: "dev",
RepoName: repositoryName,
RepoOwner: repoOwner,
}
transactionId, err = projectLock.InternalLock.GetLock(resource)
assert.NoError(t, err)
Expand Down Expand Up @@ -528,6 +532,7 @@ func TestMultiEnvHappyPath(t *testing.T) {
PrManager: githubPrService,
ProjectName: "digger_demo",
RepoName: repositoryName,
RepoOwner: repoOwner,
}
resource := "digger_demo#default"
transactionId, err := projectLock.InternalLock.GetLock(resource)
Expand Down Expand Up @@ -567,6 +572,7 @@ func TestMultiEnvHappyPath(t *testing.T) {
PrManager: githubPrService,
ProjectName: "digger_demo",
RepoName: repositoryName,
RepoOwner: repoOwner,
}
transactionId, err = projectLock.InternalLock.GetLock(resource)
assert.NoError(t, err)
Expand All @@ -590,6 +596,7 @@ func TestMultiEnvHappyPath(t *testing.T) {
PrManager: githubPrService,
ProjectName: "digger_demo",
RepoName: repositoryName,
RepoOwner: repoOwner,
}
transactionId, err = projectLock.InternalLock.GetLock(resource)
assert.NoError(t, err)
Expand Down
19 changes: 12 additions & 7 deletions pkg/utils/locking.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ type ProjectLockImpl struct {
PrManager github.PullRequestManager
ProjectName string
RepoName string
RepoOwner string
}

type Lock interface {
Expand All @@ -47,11 +48,11 @@ func (projectLock *ProjectLockImpl) Lock(lockId string, prNumber int) (bool, err
if transactionId != nil {
transactionIdStr := strconv.Itoa(*transactionId)
if *transactionId != prNumber {
comment := "Project " + projectLock.ProjectName + " locked by another PR #" + transactionIdStr + "(failed to acquire lock " + projectLock.ProjectName + "). The locking plan must be applied or discarded before future plans can execute"
comment := "Project " + projectLock.projectId() + " locked by another PR #" + transactionIdStr + "(failed to acquire lock " + projectLock.ProjectName + "). The locking plan must be applied or discarded before future plans can execute"
projectLock.PrManager.PublishComment(prNumber, comment)
return false, nil
}
comment := "Project " + projectLock.ProjectName + " locked by this PR #" + transactionIdStr + " already."
comment := "Project " + projectLock.projectId() + " locked by this PR #" + transactionIdStr + " already."
projectLock.PrManager.PublishComment(prNumber, comment)
return true, nil
}
Expand All @@ -62,16 +63,16 @@ func (projectLock *ProjectLockImpl) Lock(lockId string, prNumber int) (bool, err
}

if lockAcquired {
comment := "Project " + projectLock.ProjectName + " has been locked by PR #" + strconv.Itoa(prNumber)
comment := "Project " + projectLock.projectId() + " has been locked by PR #" + strconv.Itoa(prNumber)
projectLock.PrManager.PublishComment(prNumber, comment)
println("project " + projectLock.ProjectName + " locked successfully. PR # " + strconv.Itoa(prNumber))
println("project " + projectLock.projectId() + " locked successfully. PR # " + strconv.Itoa(prNumber))
return true, nil
}

transactionId, _ = projectLock.InternalLock.GetLock(lockId)
transactionIdStr = strconv.Itoa(*transactionId)

comment := "Project " + projectLock.ProjectName + " locked by another PR #" + transactionIdStr + " (failed to acquire lock " + projectLock.RepoName + "). The locking plan must be applied or discarded before future plans can execute"
comment := "Project " + projectLock.projectId() + " locked by another PR #" + transactionIdStr + " (failed to acquire lock " + projectLock.RepoName + "). The locking plan must be applied or discarded before future plans can execute"
projectLock.PrManager.PublishComment(prNumber, comment)
println(comment)
return false, nil
Expand All @@ -92,7 +93,7 @@ func (projectLock *ProjectLockImpl) Unlock(lockId string, prNumber int) (bool, e
return false, err
}
if lockReleased {
comment := "Project unlocked (" + projectLock.ProjectName + ")."
comment := "Project unlocked (" + projectLock.projectId() + ")."
projectLock.PrManager.PublishComment(prNumber, comment)
println("Project unlocked")
return true, nil
Expand All @@ -109,13 +110,17 @@ func (projectLock *ProjectLockImpl) ForceUnlock(lockId string, prNumber int) {
lockReleased, _ := projectLock.InternalLock.Unlock(lockId)

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

func (projectLock *ProjectLockImpl) projectId() string {
return projectLock.RepoOwner + "/" + projectLock.RepoName
}

func GetLock() (Lock, error) {
awsRegion := strings.ToLower(os.Getenv("AWS_REGION"))
awsProfile := strings.ToLower(os.Getenv("AWS_PROFILE"))
Expand Down
1 change: 1 addition & 0 deletions pkg/utils/locking_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ func TestLockingTwiceThrowsError(t *testing.T) {
PrManager: &mockPrManager,
ProjectName: "",
RepoName: "",
RepoOwner: "",
}
state1, err1 := pl.Lock("a", 1)
assert.True(t, state1)
Expand Down