From 9039c3a02f1becedf4aa943bde75ce6f8a9391aa Mon Sep 17 00:00:00 2001
From: Mohamed Habib <moe.habib9@gmail.com>
Date: Wed, 4 Sep 2024 08:03:21 -0700
Subject: [PATCH] fix/pr 0 (#1691)

* support noop pr service to avoid PR interactions post merge

* fix noop issue
---
 libs/spec/providers.go | 4 ++++
 next/services/runs.go  | 4 ++++
 next/services/spec.go  | 5 ++++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/libs/spec/providers.go b/libs/spec/providers.go
index b6b44fedd..6ad1aac49 100644
--- a/libs/spec/providers.go
+++ b/libs/spec/providers.go
@@ -177,6 +177,8 @@ type VCSProviderBasic struct{}
 
 func (v VCSProviderBasic) GetPrService(vcsSpec VcsSpec) (ci.PullRequestService, error) {
 	switch vcsSpec.VcsType {
+	case "noop":
+		return ci.MockPullRequestManager{}, nil
 	case "github":
 		token := os.Getenv("GITHUB_TOKEN")
 		if token == "" {
@@ -200,6 +202,8 @@ func (v VCSProviderBasic) GetPrService(vcsSpec VcsSpec) (ci.PullRequestService,
 
 func (v VCSProviderBasic) GetOrgService(vcsSpec VcsSpec) (ci.OrgService, error) {
 	switch vcsSpec.VcsType {
+	case "noop":
+		return ci.MockPullRequestManager{}, nil
 	case "github":
 		token := os.Getenv("GITHUB_TOKEN")
 		if token == "" {
diff --git a/next/services/runs.go b/next/services/runs.go
index 4ebc1005d..764f9a3d5 100644
--- a/next/services/runs.go
+++ b/next/services/runs.go
@@ -61,6 +61,8 @@ func RunQueuesStateMachine(queueItem *model.DiggerRunQueueItem, service ci.PullR
 			log.Printf("could not get spec: %v", err)
 			return fmt.Errorf("could not get spec: %v", err)
 		}
+		// temp: override vcs type to use "noop"
+		spec.VCS.VcsType = "noop"
 
 		vcsToken, err := GetVCSTokenFromJob(*planJob, gh)
 		if err != nil {
@@ -150,6 +152,8 @@ func RunQueuesStateMachine(queueItem *model.DiggerRunQueueItem, service ci.PullR
 			log.Printf("could not get spec: %v", err)
 			return fmt.Errorf("could not get spec: %v", err)
 		}
+		// temp: override vcs type to use "noop"
+		spec.VCS.VcsType = "noop"
 
 		vcsToken, err := GetVCSTokenFromJob(*job, gh)
 		if err != nil {
diff --git a/next/services/spec.go b/next/services/spec.go
index d128da51b..9e5be2366 100644
--- a/next/services/spec.go
+++ b/next/services/spec.go
@@ -143,7 +143,10 @@ func GetRunNameFromJob(job model.DiggerJob) (*string, error) {
 	requestedBy := jobSpec.RequestedBy
 	prNumber := *jobSpec.PullRequestNumber
 
-	runName := fmt.Sprintf("[%v] %v %v By: %v PR: %v", batchIdShort, diggerCommand, projectName, requestedBy, prNumber)
+	runName := fmt.Sprintf("[%v] %v %v By: %v", batchIdShort, diggerCommand, projectName, requestedBy)
+	if prNumber != 0 {
+		runName += fmt.Sprintf(" PR: %v", prNumber)
+	}
 	return &runName, nil
 }