Skip to content

Commit

Permalink
Approval: only send newest commit in commit list. Added sending oldes…
Browse files Browse the repository at this point in the history
…t commit in seperate parameter
  • Loading branch information
ToreMerkely committed Nov 17, 2023
1 parent 4c5767e commit 06d79ae
Showing 1 changed file with 10 additions and 11 deletions.
21 changes: 10 additions & 11 deletions cmd/kosli/reportApproval.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,14 @@ type reportApprovalOptions struct {
}

type ApprovalPayload struct {
ArtifactFingerprint string `json:"artifact_fingerprint"`
Environment string `json:"environment,omitempty"`
Description string `json:"description"`
CommitList []string `json:"src_commit_list"`
Reviews []map[string]string `json:"approvals"`
UserData interface{} `json:"user_data"`
ArtifactFingerprint string `json:"artifact_fingerprint"`
Environment string `json:"environment,omitempty"`
Description string `json:"description"`
CommitList []string `json:"src_commit_list"`
// NewestCommit string `json:"newest_commit"`
OldestCommit string `json:"oldest_commit,omitempty"`
Reviews []map[string]string `json:"approvals"`
UserData interface{} `json:"user_data"`
}

func newReportApprovalCmd(out io.Writer) *cobra.Command {
Expand Down Expand Up @@ -109,7 +111,7 @@ func newReportApprovalCmd(out io.Writer) *cobra.Command {
cmd.Flags().StringVarP(&o.flowName, "flow", "f", "", flowNameFlag)
cmd.Flags().StringVarP(&o.payload.Description, "description", "d", "", approvalDescriptionFlag)
cmd.Flags().StringVarP(&o.userDataFile, "user-data", "u", "", approvalUserDataFlag)
cmd.Flags().StringVar(&o.oldestSrcCommit, "oldest-commit", "", oldestCommitFlag)
cmd.Flags().StringVar(&o.payload.OldestCommit, "oldest-commit", "", oldestCommitFlag)
cmd.Flags().StringVar(&o.newestSrcCommit, "newest-commit", "HEAD", newestCommitFlag)
cmd.Flags().StringVar(&o.srcRepoRoot, "repo-root", ".", repoRootFlag)
cmd.Flags().StringVar(&o.approver, "approver", "", approverFlag)
Expand Down Expand Up @@ -145,10 +147,7 @@ func (o *reportApprovalOptions) run(args []string, request bool) error {
return err
}

o.payload.CommitList, err = o.payloadCommitList()
if err != nil {
return err
}
o.payload.CommitList = []string{o.newestSrcCommit} // o.payloadCommitList()

url := fmt.Sprintf("%s/api/v2/approvals/%s/%s", global.Host, global.Org, o.flowName)

Expand Down

0 comments on commit 06d79ae

Please sign in to comment.