From 67bedc37887f53b03b3608b68853d1581f1f724e Mon Sep 17 00:00:00 2001 From: JonJagger Date: Mon, 9 Sep 2024 10:44:06 +0100 Subject: [PATCH] Fix text for --template-file flag in begin-trail command so it does not mention --use-empty-template flag --- cmd/kosli/beginTrail.go | 2 +- cmd/kosli/root.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/kosli/beginTrail.go b/cmd/kosli/beginTrail.go index fc1f01fd3..fced4c861 100644 --- a/cmd/kosli/beginTrail.go +++ b/cmd/kosli/beginTrail.go @@ -78,7 +78,7 @@ func newBeginTrailCmd(out io.Writer) *cobra.Command { ci := WhichCI() cmd.Flags().StringVar(&o.flow, "flow", "", flowNameFlag) cmd.Flags().StringVar(&o.payload.Description, "description", "", trailDescriptionFlag) - cmd.Flags().StringVarP(&o.templateFile, "template-file", "f", "", templateFileFlag) + cmd.Flags().StringVarP(&o.templateFile, "template-file", "f", "", templateFileSimpleFlag) cmd.Flags().StringVarP(&o.userDataFile, "user-data", "u", "", trailUserDataFlag) cmd.Flags().StringVarP(&o.commitSHA, "commit", "g", DefaultValueForCommit(ci, false), beginTrailCommitFlag) cmd.Flags().StringSliceVar(&o.redactedCommitInfo, "redact-commit-info", []string{}, attestationRedactCommitInfoFlag) diff --git a/cmd/kosli/root.go b/cmd/kosli/root.go index ca00a3f20..1fb1e2ee6 100644 --- a/cmd/kosli/root.go +++ b/cmd/kosli/root.go @@ -113,6 +113,7 @@ The service principal needs to have the following permissions: visibilityFlag = "[defaulted] The visibility of the Kosli flow. Valid visibilities are [public, private]." templateFlag = "[defaulted] The comma-separated list of required compliance controls names." templateFileFlag = "[optional] The path to a yaml template file. Cannot be used together with --use-empty-template" + templateFileSimpleFlag = "[optional] The path to a yaml template file." useEmptyTemplateFlag = "Use an empty template for the flow creation without specifying a file. Cannot be used together with --template or --template-file" approvalUserDataFlag = "[optional] The path to a JSON file containing additional data you would like to attach to the approval." evidenceUserDataFlag = "[optional] The path to a JSON file containing additional data you would like to attach to the evidence."