bug fix

Signed-off-by: Billy Zha <jinzha1@microsoft.com>
oras-project · Jan 20, 2023 · 37b1e22 · 37b1e22
1 parent 18ebd6c
commit 37b1e22
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/cmd/oras/internal/option/remote.go b/cmd/oras/internal/option/remote.go
@@ -64,7 +64,10 @@ func (opts *Remote) ApplyFlags(fs *pflag.FlagSet) {
 	fs.BoolVarP(&opts.PasswordFromStdin, "password-stdin", "", false, "read password or identity token from stdin")
 }
 
-func generatePrefix(prefix, description string) (flagPrefix, notePrefix string) {
+func applyPrefix(prefix, description string) (flagPrefix, notePrefix string) {
+	if prefix == "" {
+		return "", ""
+	}
 	return prefix + "-", description + " "
 }
 
@@ -79,9 +82,9 @@ func (opts *Remote) ApplyFlagsWithPrefix(fs *pflag.FlagSet, prefix, description
 	)
 	if prefix == "" {
 		shortUser, shortPassword = "u", "p"
-	} else {
-		flagPrefix, notePrefix = generatePrefix(prefix, description)
 	}
+	flagPrefix, notePrefix = applyPrefix(prefix, description)
+
 	if opts.applyDistributionSpec {
 		opts.distributionSpec.ApplyFlagsWithPrefix(fs, prefix, description)
 	}

diff --git a/cmd/oras/internal/option/spec.go b/cmd/oras/internal/option/spec.go
@@ -80,6 +80,6 @@ func (opts *distributionSpec) Parse() error {
 
 // ApplyFlagsWithPrefix applies flags to a command flag set with a prefix string.
 func (opts *distributionSpec) ApplyFlagsWithPrefix(fs *pflag.FlagSet, prefix, description string) {
-	flagPrefix, notePrefix := generatePrefix(prefix, description)
+	flagPrefix, notePrefix := applyPrefix(prefix, description)
 	fs.StringVar(&opts.specFlag, flagPrefix+"distribution-spec", "", "set OCI distribution spec version and API option for "+notePrefix+"target. options: v1.1-referrers-api, v1.1-referrers-tag")
 }
diff --git a/cmd/oras/internal/option/target.go b/cmd/oras/internal/option/target.go
@@ -68,7 +68,7 @@ func (opts *Target) AnnotatedReference() string {
 // Since there is only one target type besides the default `registry` type,
 // the full form is not implemented until a new type comes in.
 func (opts *Target) applyFlagsWithPrefix(fs *pflag.FlagSet, prefix, description string) {
-	flagPrefix, notePrefix := generatePrefix(prefix, description)
+	flagPrefix, notePrefix := applyPrefix(prefix, description)
 	fs.BoolVarP(&opts.isOCILayout, flagPrefix+"oci-layout", "", false, "Set "+notePrefix+"target as an OCI image layout.")
 }