Skip to content

Commit c1d2c83

Browse files
motatoesmotatoes
authored
Feat/fix of next path (#1649)
* fix next pathway digger
1 parent f03dccb commit c1d2c83

File tree

4 files changed

+48
-47
lines changed

4 files changed

+48
-47
lines changed

‎.github/workflows/next_deploy.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on:
33
push:
44
branches:
55
- develop # change to main if needed
6+
- feat/fix-of-next-path
67
jobs:
78
deploy:
89
name: Deploy app

‎cli/pkg/digger/digger.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ func RunJobs(jobs []orchestrator.Job, prService ci.PullRequestService, orgServic
9797

9898
executorResult, output, err := run(command, job, policyChecker, orgService, SCMOrganisation, SCMrepository, job.PullRequestNumber, job.RequestedBy, reporter, lock, prService, job.Namespace, workingDir, planStorage, appliesPerProject)
9999
if err != nil {
100+
log.Printf("error while running command %v for project %v: %v", command, job.ProjectName, err)
100101
reportErr := backendApi.ReportProjectRun(SCMOrganisation+"-"+SCMrepository, job.ProjectName, runStartedAt, time.Now(), "FAILED", command, output)
101102
if reportErr != nil {
102103
log.Printf("error reporting project Run err: %v.\n", reportErr)

‎cli/pkg/spec/next.go

Lines changed: 45 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ import (
55
"github.com/diggerhq/digger/cli/pkg/digger"
66
"github.com/diggerhq/digger/cli/pkg/usage"
77
backend2 "github.com/diggerhq/digger/libs/backendapi"
8+
"github.com/diggerhq/digger/libs/ci"
9+
"github.com/diggerhq/digger/libs/comment_utils/reporting"
810
comment_summary "github.com/diggerhq/digger/libs/comment_utils/summary"
9-
"github.com/diggerhq/digger/libs/digger_config"
1011
"github.com/diggerhq/digger/libs/scheduler"
1112
"github.com/diggerhq/digger/libs/spec"
1213
"github.com/samber/lo"
@@ -19,7 +20,7 @@ import (
1920
func reporterError(spec spec.Spec, backendApi backend2.Api, err error) {
2021
_, reportingError := backendApi.ReportProjectJobStatus(spec.VCS.RepoName, spec.Job.ProjectName, spec.JobId, "failed", time.Now(), nil, "", "")
2122
if reportingError != nil {
22-
usage.ReportErrorAndExit(spec.VCS.RepoOwner, fmt.Sprintf("Failed run commands. %s", err), 5)
23+
usage.ReportErrorAndExit(spec.VCS.RepoOwner, fmt.Sprintf("Failed to run commands. %v", err), 5)
2324
}
2425
}
2526

@@ -89,25 +90,29 @@ func RunSpecNext(
8990
usage.ReportErrorAndExit(spec.VCS.Actor, fmt.Sprintf("could not get lock: %v", err), 1)
9091
}
9192

92-
prService, err := vcsProvider.GetPrService(spec.VCS)
93-
if err != nil {
94-
log.Printf("error getting prservice: %v", err)
95-
reporterError(spec, backendApi, err)
96-
usage.ReportErrorAndExit(spec.VCS.Actor, fmt.Sprintf("could not get prservice: %v", err), 1)
97-
}
98-
99-
orgService, err := vcsProvider.GetOrgService(spec.VCS)
100-
if err != nil {
101-
log.Printf("error getting orgservice: %v", err)
102-
reporterError(spec, backendApi, err)
103-
usage.ReportErrorAndExit(spec.VCS.Actor, fmt.Sprintf("could not get orgservice: %v", err), 1)
104-
}
105-
reporter, err := reporterProvider.GetReporter(fmt.Sprintf("%v for %v", spec.Job.JobType, job.ProjectName), spec.Reporter, prService, *spec.Job.PullRequestNumber)
106-
if err != nil {
107-
log.Printf("error getting reporter: %v", err)
108-
reporterError(spec, backendApi, err)
109-
usage.ReportErrorAndExit(spec.VCS.Actor, fmt.Sprintf("could not get reporter: %v", err), 1)
110-
}
93+
prService := ci.MockPullRequestManager{}
94+
//prService, err := vcsProvider.GetPrService(spec.VCS)
95+
//if err != nil {
96+
// log.Printf("error getting prservice: %v", err)
97+
// reporterError(spec, backendApi, err)
98+
// usage.ReportErrorAndExit(spec.VCS.Actor, fmt.Sprintf("could not get prservice: %v", err), 1)
99+
//}
100+
101+
orgService := ci.MockPullRequestManager{}
102+
//orgService, err := vcsProvider.GetOrgService(spec.VCS)
103+
//if err != nil {
104+
// log.Printf("error getting orgservice: %v", err)
105+
// reporterError(spec, backendApi, err)
106+
// usage.ReportErrorAndExit(spec.VCS.Actor, fmt.Sprintf("could not get orgservice: %v", err), 1)
107+
//}
108+
109+
//reporter, err := reporterProvider.GetReporter(fmt.Sprintf("%v for %v", spec.Job.JobType, job.ProjectName), spec.Reporter, prService, *spec.Job.PullRequestNumber)
110+
//if err != nil {
111+
// log.Printf("error getting reporter: %v", err)
112+
// reporterError(spec, backendApi, err)
113+
// usage.ReportErrorAndExit(spec.VCS.Actor, fmt.Sprintf("could not get reporter: %v", err), 1)
114+
//}
115+
reporter := reporting.NoopReporter{}
111116

112117
policyChecker, err := policyProvider.GetPolicyProvider(spec.Policy, spec.Backend.BackendHostname, spec.Backend.BackendOrganisationName, spec.Backend.BackendJobToken)
113118
if err != nil {
@@ -116,27 +121,21 @@ func RunSpecNext(
116121
usage.ReportErrorAndExit(spec.VCS.Actor, fmt.Sprintf("could not get policy provider: %v", err), 1)
117122
}
118123

119-
changedFiles, err := prService.GetChangedFiles(*spec.Job.PullRequestNumber)
120-
if err != nil {
121-
log.Printf("error getting changed files: %v", err)
122-
reporterError(spec, backendApi, err)
123-
usage.ReportErrorAndExit(spec.VCS.Actor, fmt.Sprintf("could not get changed files: %v", err), 1)
124-
}
125-
126-
diggerConfig, _, _, err := digger_config.LoadDiggerConfig("./", false, changedFiles)
127-
if err != nil {
128-
log.Printf("error getting digger config: %v", err)
129-
reporterError(spec, backendApi, err)
130-
usage.ReportErrorAndExit(spec.VCS.Actor, fmt.Sprintf("Failed to read Digger digger_config. %s", err), 4)
131-
}
132-
log.Printf("Digger digger_config read successfully\n")
124+
//changedFiles, err := prService.GetChangedFiles(*spec.Job.PullRequestNumber)
125+
//if err != nil {
126+
// usage.ReportErrorAndExit(spec.VCS.Actor, fmt.Sprintf("could not get changed files: %v", err), 1)
127+
//}
128+
//diggerConfig, _, _, err := digger_config.LoadDiggerConfig("./", false, changedFiles)
129+
//if err != nil {
130+
// usage.ReportErrorAndExit(spec.VCS.Actor, fmt.Sprintf("Failed to read Digger digger_config. %s", err), 4)
131+
//}
132+
//log.Printf("Digger digger_config read successfully\n")
133133

134-
commentUpdater, err := commentUpdaterProvider.Get(*diggerConfig)
135-
if err != nil {
136-
log.Printf("error getting comment updater: %v", err)
137-
reporterError(spec, backendApi, err)
138-
usage.ReportErrorAndExit(spec.VCS.Actor, fmt.Sprintf("could not get comment updater: %v", err), 8)
139-
}
134+
commentUpdater := comment_summary.NoopCommentUpdater{}
135+
//commentUpdater, err := commentUpdaterProvider.Get(*diggerConfig)
136+
//if err != nil {
137+
// usage.ReportErrorAndExit(spec.VCS.Actor, fmt.Sprintf("could not get comment updater: %v", err), 8)
138+
//}
140139

141140
planStorage, err := PlanStorageProvider.GetPlanStorage(spec.VCS.RepoOwner, spec.VCS.RepoName, *spec.Job.PullRequestNumber)
142141
if err != nil {
@@ -167,13 +166,13 @@ func RunSpecNext(
167166
reportTerraformOutput := spec.Reporter.ReportTerraformOutput
168167
allAppliesSuccess, _, err := digger.RunJobs(jobs, prService, orgService, lock, reporter, planStorage, policyChecker, commentUpdater, backendApi, spec.JobId, true, reportTerraformOutput, commentId, currentDir)
169168
if !allAppliesSuccess || err != nil {
170-
serializedBatch, reportingError := backendApi.ReportProjectJobStatus(spec.VCS.RepoName, spec.Job.ProjectName, spec.JobId, "failed", time.Now(), nil, "", "")
169+
_, reportingError := backendApi.ReportProjectJobStatus(spec.VCS.RepoName, spec.Job.ProjectName, spec.JobId, "failed", time.Now(), nil, "", "")
171170
if reportingError != nil {
172-
usage.ReportErrorAndExit(spec.VCS.RepoOwner, fmt.Sprintf("Failed run commands. %s", err), 5)
171+
usage.ReportErrorAndExit(spec.VCS.RepoOwner, fmt.Sprintf("Failed run commands. %v", err), 5)
173172
}
174-
commentUpdater.UpdateComment(serializedBatch.Jobs, serializedBatch.PrNumber, prService, commentId)
175-
digger.UpdateAggregateStatus(serializedBatch, prService)
176-
usage.ReportErrorAndExit(spec.VCS.RepoOwner, fmt.Sprintf("Failed to run commands. %s", err), 5)
173+
//commentUpdater.UpdateComment(serializedBatch.Jobs, serializedBatch.PrNumber, prService, commentId)
174+
//digger.UpdateAggregateStatus(serializedBatch, prService)
175+
usage.ReportErrorAndExit(spec.VCS.RepoOwner, fmt.Sprintf("Failed to run commands. %v", err), 5)
177176
}
178177
usage.ReportErrorAndExit(spec.VCS.RepoOwner, "Digger finished successfully", 0)
179178

‎next/services/scheduler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func TriggerJob(gh utils.GithubClientProvider, ciBackend ci_backends.CiBackend,
7676
return fmt.Errorf("could not get variable spec from job: %v", err)
7777
}
7878

79-
spec, err := GetSpecFromJob(*job, lib_spec.SpecTypeNextJob)
79+
spec, err := GetSpecFromJob(*job, lib_spec.SpecTypeApplyBeforeMergeJob)
8080
if err != nil {
8181
log.Printf("could not get spec: %v", err)
8282
return fmt.Errorf("coult not get spec %v", err)

0 commit comments

Comments
 (0)