fix: prevent error about lock being acquired by the current PR (#216)

Author: fleroux514

pkg/gcp/gcp_lock.go

@@ -1,12 +1,13 @@
 package gcp
 
 import (
-	"cloud.google.com/go/storage"
 	"context"
 	"fmt"
 	"log"
 	"strconv"
 	"time"
+
+	"cloud.google.com/go/storage"
 )
 
 type GoogleStorageLock struct {
@@ -16,14 +17,6 @@ type GoogleStorageLock struct {
 }
 
 func (googleLock *GoogleStorageLock) Lock(transactionId int, resource string) (bool, error) {
-	existingLockTransactionId, err := googleLock.GetLock(resource)
-	if err != nil {
-		fmt.Printf("failed to get lock: %v\n", err)
-	}
-	if existingLockTransactionId != nil {
-		return false, nil
-	}
-
 	now := time.Now().Format(time.RFC3339)
 	fileName := resource
 

pkg/utils/locking.go

@@ -8,12 +8,13 @@ import (
 	"digger/pkg/github"
 	"errors"
 	"fmt"
-	"github.com/aws/aws-sdk-go/service/sts"
 	"log"
 	"os"
 	"strconv"
 	"strings"
 
+	"github.com/aws/aws-sdk-go/service/sts"
+
 	"cloud.google.com/go/storage"
 	awssdk "github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/credentials"
@@ -56,6 +57,21 @@ func (projectLock *ProjectLockImpl) Lock(prNumber int) (bool, error) {
 		return false, nil
 	}
 
+	existingLockTransactionId, err := projectLock.InternalLock.GetLock(lockId)
+	if err != nil {
+		fmt.Printf("failed to get lock: %v\n", err)
+		return false, err
+	}
+	if existingLockTransactionId != nil {
+		if *existingLockTransactionId == prNumber {
+			return true, nil
+		} else {
+			transactionIdStr := strconv.Itoa(*existingLockTransactionId)
+			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)
+			return false, nil
+		}
+	}
 	lockAcquired, err := projectLock.InternalLock.Lock(prNumber, lockId)
 	if err != nil {
 		return false, err
@@ -65,15 +81,9 @@ func (projectLock *ProjectLockImpl) Lock(prNumber int) (bool, error) {
 		comment := "Project " + projectLock.projectId() + " has been locked by PR #" + strconv.Itoa(prNumber)
 		projectLock.PrManager.PublishComment(prNumber, comment)
 		println("project " + projectLock.projectId() + " locked successfully. PR # " + strconv.Itoa(prNumber))
-		return true, nil
-	}
-	var transactionIdStr string
-	transactionId, _ := projectLock.InternalLock.GetLock(lockId)
-	transactionIdStr = strconv.Itoa(*transactionId)
 
-	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)
-	return false, nil
+	}
+	return lockAcquired, nil
 }
 
 func (projectLock *ProjectLockImpl) verifyNoHangingLocks(prNumber int) (bool, error) {

pkg/utils/plan_storage.go

@@ -1,15 +1,16 @@
 package utils
 
 import (
-	"cloud.google.com/go/storage"
 	"context"
 	"fmt"
-	"github.com/google/go-github/v51/github"
 	"io"
 	"net/http"
 	"net/url"
 	"os"
 	"strconv"
+
+	"cloud.google.com/go/storage"
+	"github.com/google/go-github/v51/github"
 )
 
 type PlanStorage interface {