Fixed value set completion improvements

Signed-off-by: Ville Skyttä <[email protected]>

Author: scop

cmd/cosign/cli/options/attach.go

@@ -82,11 +82,15 @@ func (o *AttachSBOMOptions) AddFlags(cmd *cobra.Command) {
 		"path to the sbom, or {-} for stdin")
 	_ = cmd.MarkFlagFilename("sbom", sbomExts...)
 
-	cmd.Flags().StringVar(&o.SBOMType, "type", "spdx",
-		"type of sbom (spdx|cyclonedx|syft)")
+	sbomTypes := []string{"spdx", "cyclonedx", "syft"}
+	cmd.Flags().StringVar(&o.SBOMType, "type", sbomTypes[0],
+		"type of sbom ("+strings.Join(sbomTypes, "|")+")")
+	_ = cmd.RegisterFlagCompletionFunc("type", cobra.FixedCompletions(sbomTypes, cobra.ShellCompDirectiveNoFileComp))
 
+	inputFormats := []string{ctypes.JSONInputFormat, ctypes.XMLInputFormat, ctypes.TextInputFormat}
 	cmd.Flags().StringVar(&o.SBOMInputFormat, "input-format", "",
-		"type of sbom input format (json|xml|text)")
+		"type of sbom input format ("+strings.Join(inputFormats, "|")+")")
+	_ = cmd.RegisterFlagCompletionFunc("input-format", cobra.FixedCompletions(inputFormats, cobra.ShellCompDirectiveNoFileComp))
 }
 
 func (o *AttachSBOMOptions) MediaType() (types.MediaType, error) {

cmd/cosign/cli/options/attest.go

@@ -16,6 +16,8 @@
 package options
 
 import (
+	"strings"
+
 	"github.com/spf13/cobra"
 )
 
@@ -87,8 +89,9 @@ func (o *AttestOptions) AddFlags(cmd *cobra.Command) {
 	cmd.Flags().BoolVar(&o.TlogUpload, "tlog-upload", true,
 		"whether or not to upload to the tlog")
 
-	cmd.Flags().StringVar(&o.RekorEntryType, "rekor-entry-type", "dsse",
-		"specifies the type to be used for a rekor entry upload. Options are intoto or dsse (default). ")
+	cmd.Flags().StringVar(&o.RekorEntryType, "rekor-entry-type", rekorEntryTypes[0],
+		"specifies the type to be used for a rekor entry upload ("+strings.Join(rekorEntryTypes, "|")+")")
+	_ = cmd.RegisterFlagCompletionFunc("rekor-entry-type", cobra.FixedCompletions(rekorEntryTypes, cobra.ShellCompDirectiveNoFileComp))
 
 	cmd.Flags().StringVar(&o.TSAClientCACert, "timestamp-client-cacert", "",
 		"path to the X.509 CA certificate file in PEM format to be used for the connection to the TSA Server")

cmd/cosign/cli/options/attest_blob.go

@@ -15,6 +15,8 @@
 package options
 
 import (
+	"strings"
+
 	"github.com/spf13/cobra"
 )
 
@@ -105,8 +107,9 @@ func (o *AttestBlobOptions) AddFlags(cmd *cobra.Command) {
 	cmd.Flags().BoolVar(&o.TlogUpload, "tlog-upload", true,
 		"whether or not to upload to the tlog")
 
-	cmd.Flags().StringVar(&o.RekorEntryType, "rekor-entry-type", "dsse",
-		"specifies the type to be used for a rekor entry upload. Options are intoto or dsse (default). ")
+	cmd.Flags().StringVar(&o.RekorEntryType, "rekor-entry-type", rekorEntryTypes[0],
+		"specifies the type to be used for a rekor entry upload ("+strings.Join(rekorEntryTypes, "|")+")")
+	_ = cmd.RegisterFlagCompletionFunc("rekor-entry-type", cobra.FixedCompletions(rekorEntryTypes, cobra.ShellCompDirectiveNoFileComp))
 
 	cmd.Flags().StringVar(&o.TSAClientCACert, "timestamp-client-cacert", "",
 		"path to the X.509 CA certificate file in PEM format to be used for the connection to the TSA Server")

cmd/cosign/cli/options/bundle.go

@@ -16,6 +16,8 @@
 package options
 
 import (
+	"strings"
+
 	"github.com/spf13/cobra"
 )
 
@@ -79,9 +81,11 @@ func (o *BundleCreateOptions) AddFlags(cmd *cobra.Command) {
 	cmd.Flags().BoolVar(&o.Sk, "sk", false,
 		"whether to use a hardware security key")
 
-	cmd.Flags().StringVar(&o.Slot, "slot", "",
-		"security key slot to use for generated key (default: signature) "+
-			"(authentication|signature|card-authentication|key-management)")
+	slots := []string{"authentication", "signature", "card-authentication", "key-management"}
+	cmd.Flags().StringVar(&o.Slot, "slot", "signature",
+		"security key slot to use for generated key ("+
+			strings.Join(slots, "|")+")")
+	_ = cmd.RegisterFlagCompletionFunc("slot", cobra.FixedCompletions(slots, cobra.ShellCompDirectiveNoFileComp))
 
 	cmd.MarkFlagsMutuallyExclusive("bundle", "certificate")
 	cmd.MarkFlagsMutuallyExclusive("bundle", "signature")

cmd/cosign/cli/options/options.go

@@ -55,3 +55,8 @@ var signatureExts = []string{
 var wasmExts = []string{
 	"wasm",
 }
+
+var rekorEntryTypes = []string{
+	"dsse", // first one is the default
+	"intoto",
+}