Skip to content

Commit

Permalink
manifest add: complain if we get artifact flags without --artifact
Browse files Browse the repository at this point in the history
Complain if `manifest add` is invoked with any of "--artifact-type",
"--artifact-config", "--artifact-config-type", "--artifact-layer-type",
"--artifact-subject", "--artifact-exclude-titles", but not in
conjunction with "--artifact".

[NO NEW TESTS NEEDED]

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
  • Loading branch information
nalind committed Feb 29, 2024
1 parent d80ec96 commit 8a1bcd5
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions cmd/buildah/manifest.go
Expand Up @@ -533,6 +533,18 @@ func manifestAddCmd(c *cobra.Command, args []string, opts manifestAddOpts) error
return err
}
} else {
var changedArtifactFlags []string
for _, artifactOption := range []string{"artifact-type", "artifact-config", "artifact-config-type", "artifact-layer-type", "artifact-subject", "artifact-exclude-titles"} {
if c.Flags().Changed(artifactOption) {
changedArtifactFlags = append(changedArtifactFlags, "--"+artifactOption)
}
}
switch {
case len(changedArtifactFlags) == 1:
return fmt.Errorf("%s requires --artifact", changedArtifactFlags[0])
case len(changedArtifactFlags) > 1:
return fmt.Errorf("%s require --artifact", strings.Join(changedArtifactFlags, "/"))
}
var ref types.ImageReference
if ref, err = alltransports.ParseImageName(imageSpec); err != nil {
if ref, err = alltransports.ParseImageName(util.DefaultTransport + imageSpec); err != nil {
Expand Down

0 comments on commit 8a1bcd5

Please sign in to comment.