Skip to content

Commit 72cb2fb

Browse files
committed
set correct status when sending repo in set-status endpoint
1 parent de0a222 commit 72cb2fb

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

cli/pkg/spec/spec.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@ import (
1212
"log"
1313
"os"
1414
"os/exec"
15+
"strings"
1516
"time"
1617
)
1718

1819
func reportError(spec spec.Spec, backendApi backend2.Api, message string, err error) {
1920
log.Printf(message)
20-
_, reportingError := backendApi.ReportProjectJobStatus(spec.VCS.RepoName, spec.Job.ProjectName, spec.JobId, "failed", time.Now(), nil, "", "", "", nil)
21+
repoNameForBackendReporting := strings.ReplaceAll(spec.VCS.RepoName, "/", "-")
22+
_, reportingError := backendApi.ReportProjectJobStatus(repoNameForBackendReporting, spec.Job.ProjectName, spec.JobId, "failed", time.Now(), nil, "", "", "", nil)
2123
if reportingError != nil {
2224
usage.ReportErrorAndExit(spec.VCS.RepoOwner, fmt.Sprintf("Failed to run commands. %v", err), 5)
2325
}
@@ -137,8 +139,8 @@ func RunSpec(
137139

138140
jobs := []scheduler.Job{job}
139141

140-
fullRepoName := fmt.Sprintf("%v-%v", spec.VCS.RepoOwner, spec.VCS.RepoName)
141-
_, err = backendApi.ReportProjectJobStatus(fullRepoName, spec.Job.ProjectName, spec.JobId, "started", time.Now(), nil, "", "", "", nil)
142+
repoNameForBackendReporting := strings.ReplaceAll(spec.VCS.RepoName, "/", "-")
143+
_, err = backendApi.ReportProjectJobStatus(repoNameForBackendReporting, spec.Job.ProjectName, spec.JobId, "started", time.Now(), nil, "", "", "", nil)
142144
if err != nil {
143145
message := fmt.Sprintf("Failed to report jobSpec status to backend. Exiting. %v", err)
144146
reportError(spec, backendApi, message, err)
@@ -159,7 +161,7 @@ func RunSpec(
159161
reportTerraformOutput := spec.Reporter.ReportTerraformOutput
160162
allAppliesSuccess, _, err := digger.RunJobs(jobs, prService, orgService, lock, reporter, planStorage, policyChecker, commentUpdater, backendApi, spec.JobId, true, reportTerraformOutput, commentId, currentDir)
161163
if !allAppliesSuccess || err != nil {
162-
serializedBatch, reportingError := backendApi.ReportProjectJobStatus(spec.VCS.RepoName, spec.Job.ProjectName, spec.JobId, "failed", time.Now(), nil, "", "", "", nil)
164+
serializedBatch, reportingError := backendApi.ReportProjectJobStatus(repoNameForBackendReporting, spec.Job.ProjectName, spec.JobId, "failed", time.Now(), nil, "", "", "", nil)
163165
if reportingError != nil {
164166
message := fmt.Sprintf("Failed run commands. %v", err)
165167
reportError(spec, backendApi, message, err)

0 commit comments

Comments
 (0)