Skip to content

Commit 9039c3a

Browse files
authored
fix/pr 0 (#1691)
* support noop pr service to avoid PR interactions post merge * fix noop issue
1 parent e11d380 commit 9039c3a

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

libs/spec/providers.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,8 @@ type VCSProviderBasic struct{}
177177

178178
func (v VCSProviderBasic) GetPrService(vcsSpec VcsSpec) (ci.PullRequestService, error) {
179179
switch vcsSpec.VcsType {
180+
case "noop":
181+
return ci.MockPullRequestManager{}, nil
180182
case "github":
181183
token := os.Getenv("GITHUB_TOKEN")
182184
if token == "" {
@@ -200,6 +202,8 @@ func (v VCSProviderBasic) GetPrService(vcsSpec VcsSpec) (ci.PullRequestService,
200202

201203
func (v VCSProviderBasic) GetOrgService(vcsSpec VcsSpec) (ci.OrgService, error) {
202204
switch vcsSpec.VcsType {
205+
case "noop":
206+
return ci.MockPullRequestManager{}, nil
203207
case "github":
204208
token := os.Getenv("GITHUB_TOKEN")
205209
if token == "" {

next/services/runs.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ func RunQueuesStateMachine(queueItem *model.DiggerRunQueueItem, service ci.PullR
6161
log.Printf("could not get spec: %v", err)
6262
return fmt.Errorf("could not get spec: %v", err)
6363
}
64+
// temp: override vcs type to use "noop"
65+
spec.VCS.VcsType = "noop"
6466

6567
vcsToken, err := GetVCSTokenFromJob(*planJob, gh)
6668
if err != nil {
@@ -150,6 +152,8 @@ func RunQueuesStateMachine(queueItem *model.DiggerRunQueueItem, service ci.PullR
150152
log.Printf("could not get spec: %v", err)
151153
return fmt.Errorf("could not get spec: %v", err)
152154
}
155+
// temp: override vcs type to use "noop"
156+
spec.VCS.VcsType = "noop"
153157

154158
vcsToken, err := GetVCSTokenFromJob(*job, gh)
155159
if err != nil {

next/services/spec.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,10 @@ func GetRunNameFromJob(job model.DiggerJob) (*string, error) {
143143
requestedBy := jobSpec.RequestedBy
144144
prNumber := *jobSpec.PullRequestNumber
145145

146-
runName := fmt.Sprintf("[%v] %v %v By: %v PR: %v", batchIdShort, diggerCommand, projectName, requestedBy, prNumber)
146+
runName := fmt.Sprintf("[%v] %v %v By: %v", batchIdShort, diggerCommand, projectName, requestedBy)
147+
if prNumber != 0 {
148+
runName += fmt.Sprintf(" PR: %v", prNumber)
149+
}
147150
return &runName, nil
148151
}
149152

0 commit comments

Comments
 (0)