Skip to content

Commit 8a7d3fb

Browse files
committed
Update report evidence command payloads
1 parent 72fcbaa commit 8a7d3fb

1 file changed

Lines changed: 19 additions & 5 deletions

File tree

cmd/kosli/pullrequest.go

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,19 @@ func (o *pullRequestArtifactOptions) run(out io.Writer, args []string) error {
4848
}
4949
}
5050

51+
label := ""
52+
o.payload.GitProvider, label = getGitProviderAndLabel(o.retriever)
53+
5154
url := fmt.Sprintf("%s/api/v2/evidence/%s/artifact/%s/pull_request", global.Host, global.Org, o.flowName)
52-
pullRequestsEvidence, err := o.getRetriever().PREvidenceForCommitV1(o.commit)
55+
56+
// TODO: after the PR payload is enhanced for all git providers they will all use the same method
57+
var pullRequestsEvidence []*types.PREvidence
58+
if o.payload.GitProvider == "github" {
59+
pullRequestsEvidence, err = o.getRetriever().PREvidenceForCommitV1(o.commit)
60+
} else {
61+
pullRequestsEvidence, err = o.getRetriever().PREvidenceForCommitV2(o.commit)
62+
}
63+
5364
if err != nil {
5465
return err
5566
}
@@ -60,9 +71,6 @@ func (o *pullRequestArtifactOptions) run(out io.Writer, args []string) error {
6071
return err
6172
}
6273

63-
label := ""
64-
o.payload.GitProvider, label = getGitProviderAndLabel(o.retriever)
65-
6674
// PR evidence does not have files to upload
6775
form, cleanupNeeded, evidencePath, err := newEvidenceForm(o.payload, []string{})
6876
// if we created a tar package, remove it after uploading it
@@ -175,7 +183,13 @@ func (o *pullRequestCommitOptions) run(args []string) error {
175183
return err
176184
}
177185

178-
pullRequestsEvidence, err := o.getRetriever().PREvidenceForCommitV1(o.payload.CommitSHA)
186+
// TODO: after the PR payload is enhanced for all git providers they will all use the same method
187+
var pullRequestsEvidence []*types.PREvidence
188+
if o.payload.GitProvider == "github" {
189+
pullRequestsEvidence, err = o.getRetriever().PREvidenceForCommitV1(o.payload.CommitSHA)
190+
} else {
191+
pullRequestsEvidence, err = o.getRetriever().PREvidenceForCommitV2(o.payload.CommitSHA)
192+
}
179193
if err != nil {
180194
return err
181195
}

0 commit comments

Comments
 (0)