Skip to content

Commit 9ac7352

Browse files
committed
artefacts
1 parent 1c83398 commit 9ac7352

File tree

2 files changed

+16
-9
lines changed

2 files changed

+16
-9
lines changed

cli/pkg/spec/spec.go

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"github.com/diggerhq/digger/cli/pkg/digger"
66
"github.com/diggerhq/digger/cli/pkg/usage"
77
"github.com/diggerhq/digger/cli/pkg/utils"
8+
"github.com/diggerhq/digger/libs/backendapi"
89
"github.com/diggerhq/digger/libs/ci"
910
"github.com/diggerhq/digger/libs/comment_utils/reporting"
1011
comment_summary "github.com/diggerhq/digger/libs/comment_utils/summary"
@@ -191,8 +192,9 @@ func RunSpecManualCommand(
191192
os.Chdir(gitLocation)
192193
cmd := exec.Command("git", "init")
193194
cmd.Stdout = os.Stdout
194-
cmd.Stdout = os.Stderr
195-
195+
cmd.Stderr = os.Stderr
196+
cmd.Run()
197+
196198
policyChecker, err := policyProvider.GetPolicyProvider(spec.Policy, spec.Backend.BackendHostname, spec.Backend.BackendOrganisationName, spec.Backend.BackendJobToken)
197199
if err != nil {
198200
usage.ReportErrorAndExit(spec.VCS.Actor, fmt.Sprintf("could not get policy provider: %v", err), 1)
@@ -206,11 +208,13 @@ func RunSpecManualCommand(
206208

207209
jobs := []scheduler.Job{job}
208210

209-
fullRepoName := fmt.Sprintf("%v-%v", spec.VCS.RepoOwner, spec.VCS.RepoName)
210-
_, err = backendApi.ReportProjectJobStatus(fullRepoName, spec.Job.ProjectName, spec.JobId, "started", time.Now(), nil, "", "")
211-
if err != nil {
212-
usage.ReportErrorAndExit(spec.VCS.Actor, fmt.Sprintf("Failed to report jobSpec status to backend. Exiting. %v", err), 4)
213-
}
211+
//fullRepoName := fmt.Sprintf("%v-%v", spec.VCS.RepoOwner, spec.VCS.RepoName)
212+
//_, err = backendApi.ReportProjectJobStatus(fullRepoName, spec.Job.ProjectName, spec.JobId, "started", time.Now(), nil, "", "")
213+
//if err != nil {
214+
// usage.ReportErrorAndExit(spec.VCS.Actor, fmt.Sprintf("Failed to report jobSpec status to backend. Exiting. %v", err), 4)
215+
//}
216+
217+
noopBackendApi := backendapi.NoopApi{}
214218

215219
commentId := spec.CommentId
216220
if err != nil {
@@ -225,7 +229,7 @@ func RunSpecManualCommand(
225229
commentUpdater := comment_summary.NoopCommentUpdater{}
226230
// do not change these placeholders as they are parsed by dgctl to stream logs
227231
log.Printf("<========= DIGGER RUNNING IN MANUAL MODE =========>")
228-
allAppliesSuccess, _, err := digger.RunJobs(jobs, prService, orgService, lock, reporter, planStorage, policyChecker, commentUpdater, backendApi, spec.JobId, false, false, commentId, currentDir)
232+
allAppliesSuccess, _, err := digger.RunJobs(jobs, prService, orgService, lock, reporter, planStorage, policyChecker, commentUpdater, noopBackendApi, spec.JobId, false, false, commentId, currentDir)
229233
log.Printf("<========= DIGGER COMPLETED =========>")
230234
if err != nil || allAppliesSuccess == false {
231235
usage.ReportErrorAndExit(spec.VCS.RepoOwner, "Terraform execution failed", 1)

ee/backend/controllers/spec.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,10 @@ func (d DiggerEEController) GetSpec(c *gin.Context) {
9292
LockType: "noop",
9393
},
9494
Backend: spec.BackendSpec{
95-
BackendType: "noop",
95+
BackendType: "backend",
96+
BackendHostname: jobSpec.BackendHostname,
97+
BackendJobToken: jobSpec.BackendJobToken,
98+
BackendOrganisationName: jobSpec.BackendOrganisationName,
9699
},
97100
VCS: spec.VcsSpec{
98101
VcsType: "github",

0 commit comments

Comments
 (0)