Skip to content

Commit

Permalink
generate: rename --workload-owner-key to --add-workload-owner-key
Browse files Browse the repository at this point in the history
This makes it more obvious to the user that this flag only ever adds
keys and never removes existing keys.
  • Loading branch information
Freax13 committed Jul 3, 2024
1 parent 6be70ec commit 2c54f56
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions cli/cmd/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ subcommands.`,
cmd.Flags().StringP("genpolicy-cache-path", "c", layersCacheFilename, "path to cache for the cache (.json) file containing the image layers")
cmd.Flags().StringP("manifest", "m", manifestFilename, "path to manifest (.json) file")
cmd.Flags().String("reference-values", "", "set the default reference values used for attestation (one of: aks)")
cmd.Flags().StringArrayP("workload-owner-key", "w", []string{workloadOwnerPEM},
cmd.Flags().StringArrayP("add-workload-owner-key", "w", []string{workloadOwnerPEM},
"path to workload owner key (.pem) file (can be passed more than once)")
cmd.Flags().StringArray("seedshare-owner-key", []string{seedshareOwnerPEM},
"path to seedshare owner key (.pem) file (can be passed more than once)")
Expand All @@ -74,7 +74,7 @@ subcommands.`,
must(cmd.MarkFlagFilename("policy", "rego"))
must(cmd.MarkFlagFilename("settings", "json"))
must(cmd.MarkFlagFilename("manifest", "json"))
cmd.MarkFlagsMutuallyExclusive("workload-owner-key", "disable-updates")
cmd.MarkFlagsMutuallyExclusive("add-workload-owner-key", "disable-updates")
return cmd
}

Expand Down Expand Up @@ -557,7 +557,7 @@ func parseGenerateFlags(cmd *cobra.Command) (*generateFlags, error) {
if !slices.Contains([]string{"", "aks"}, referenceValues) {
return nil, fmt.Errorf("unknown reference values")
}
workloadOwnerKeys, err := cmd.Flags().GetStringArray("workload-owner-key")
workloadOwnerKeys, err := cmd.Flags().GetStringArray("add-workload-owner-key")
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -587,7 +587,7 @@ func parseGenerateFlags(cmd *cobra.Command) (*generateFlags, error) {
if !cmd.Flags().Changed("manifest") {
manifestPath = filepath.Join(workspaceDir, manifestFilename)
}
if !cmd.Flags().Changed("workload-owner-key") {
if !cmd.Flags().Changed("add-workload-owner-key") {
workloadOwnerKeys = []string{filepath.Join(workspaceDir, workloadOwnerKeys[0])}
}
if !cmd.Flags().Changed("seedshare-owner-key") {
Expand Down

0 comments on commit 2c54f56

Please sign in to comment.