diff --git a/context/context.go b/context/context.go index 06ef8ca7db2..7374e02bb78 100644 --- a/context/context.go +++ b/context/context.go @@ -99,7 +99,7 @@ func (r *ResolvedRemotes) BaseRepo(io *iostreams.IOStreams) (ghrepo.Interface, e cs := io.ColorScheme() fmt.Fprintf(io.ErrOut, - "%s No default remote repository has been set for this directory.\n", + "%s No default remote repository has been set. To learn more about the default repository, run: gh repo set-default --help\n", cs.FailureIcon()) fmt.Fprintln(io.Out) diff --git a/pkg/cmd/attestation/verify/verify.go b/pkg/cmd/attestation/verify/verify.go index 90242a9fed2..0a8de8b4599 100644 --- a/pkg/cmd/attestation/verify/verify.go +++ b/pkg/cmd/attestation/verify/verify.go @@ -236,7 +236,7 @@ func runVerify(opts *Options) error { filteredAttestations := verification.FilterAttestations(ec.PredicateType, attestations) if len(filteredAttestations) == 0 { opts.Logger.Printf(opts.Logger.ColorScheme.Red("✗ No attestations found with predicate type: %s\n"), opts.PredicateType) - return err + return fmt.Errorf("no matching predicate found") } attestations = filteredAttestations diff --git a/pkg/cmd/attestation/verify/verify_test.go b/pkg/cmd/attestation/verify/verify_test.go index 87ffa96f090..092a009d81e 100644 --- a/pkg/cmd/attestation/verify/verify_test.go +++ b/pkg/cmd/attestation/verify/verify_test.go @@ -501,6 +501,18 @@ func TestRunVerify(t *testing.T) { require.Nil(t, runVerify(&customOpts)) }) + t.Run("with valid OCI artifact with UseBundleFromRegistry flag and unknown predicate type", func(t *testing.T) { + customOpts := publicGoodOpts + customOpts.ArtifactPath = "oci://ghcr.io/github/test" + customOpts.BundlePath = "" + customOpts.UseBundleFromRegistry = true + customOpts.PredicateType = "https://predicate.type" + + err := runVerify(&customOpts) + require.Error(t, err) + require.ErrorContains(t, err, "no matching predicate found") + }) + t.Run("with valid OCI artifact with UseBundleFromRegistry flag but no bundle return from registry", func(t *testing.T) { customOpts := publicGoodOpts customOpts.ArtifactPath = "oci://ghcr.io/github/test" diff --git a/pkg/cmd/repo/setdefault/setdefault.go b/pkg/cmd/repo/setdefault/setdefault.go index 3e1554a6933..ede4d00b4b0 100644 --- a/pkg/cmd/repo/setdefault/setdefault.go +++ b/pkg/cmd/repo/setdefault/setdefault.go @@ -119,15 +119,18 @@ func setDefaultRun(opts *SetDefaultOptions) error { currentDefaultRepo, _ := remotes.ResolvedRemote() + cs := opts.IO.ColorScheme() + if opts.ViewMode { if currentDefaultRepo != nil { fmt.Fprintln(opts.IO.Out, displayRemoteRepoName(currentDefaultRepo)) } else { - fmt.Fprintln(opts.IO.ErrOut, "no default repository has been set; use `gh repo set-default` to select one") + fmt.Fprintf(opts.IO.ErrOut, + "%s No default remote repository has been set. To learn more about the default repository, run: gh repo set-default --help\n", + cs.FailureIcon()) } return nil } - cs := opts.IO.ColorScheme() if opts.UnsetMode { var msg string diff --git a/pkg/cmd/repo/setdefault/setdefault_test.go b/pkg/cmd/repo/setdefault/setdefault_test.go index dfd72d83e76..0d2e2ddaacc 100644 --- a/pkg/cmd/repo/setdefault/setdefault_test.go +++ b/pkg/cmd/repo/setdefault/setdefault_test.go @@ -176,7 +176,7 @@ func TestDefaultRun(t *testing.T) { Repo: repo1, }, }, - wantStderr: "no default repository has been set; use `gh repo set-default` to select one\n", + wantStderr: "X No default remote repository has been set. To learn more about the default repository, run: gh repo set-default --help\n", }, { name: "view mode no current default", @@ -188,7 +188,7 @@ func TestDefaultRun(t *testing.T) { Repo: repo1, }, }, - wantStderr: "no default repository has been set; use `gh repo set-default` to select one\n", + wantStderr: "X No default remote repository has been set. To learn more about the default repository, run: gh repo set-default --help\n", }, { name: "view mode with base resolved current default",