refactor: add handlers to manifest push commmand

cmd/oras/internal/display/handler.go

@@ -170,8 +170,11 @@ func NewTagHandler(printer *output.Printer, target option.Target) metadata.TagHa
 }
 
 // NewManifestPushHandler returns a manifest push handler.
-func NewManifestPushHandler(printer *output.Printer) metadata.ManifestPushHandler {
-	return text.NewManifestPushHandler(printer)
+func NewManifestPushHandler(printer *output.Printer, outputDescriptor bool, pretty bool) (status.ManifestPushHandler, metadata.ManifestPushHandler) {
+	if outputDescriptor {
+		return status.NewDiscardHandler(), metadata.NewDiscardHandler()
+	}
+	return status.NewTextManifestPushHandler(printer), text.NewManifestPushHandler(printer)
 }
 
 // NewManifestIndexCreateHandler returns status, metadata and content handlers for index create command.

cmd/oras/internal/display/metadata/interface.go

@@ -76,6 +76,7 @@ type TagHandler interface {
 // ManifestPushHandler handles metadata output for manifest push events.
 type ManifestPushHandler interface {
 	TaggedHandler
+	OnCompleted(desc ocispec.Descriptor) error
 }
 
 // ManifestIndexCreateHandler handles metadata output for index create events.

cmd/oras/internal/display/metadata/text/manifest_push.go

@@ -37,3 +37,8 @@ func NewManifestPushHandler(printer *output.Printer) metadata.ManifestPushHandle
 func (h *ManifestPushHandler) OnTagged(_ ocispec.Descriptor, tag string) error {
 	return h.printer.Println("Tagged", tag)
 }
+
+// OnCompleted implements metadata.ManifestPushHandler.
+func (h *ManifestPushHandler) OnCompleted(desc ocispec.Descriptor) error {
+	return h.printer.Println("Digest:", desc.Digest)
+}

cmd/oras/internal/display/status/discard.go

@@ -100,6 +100,26 @@ func (DiscardHandler) OnFetched(string, ocispec.Descriptor) error {
 	return nil
 }
 
+// OnManifestExists implements ManifestPushHandler.
+func (DiscardHandler) OnManifestExists(desc ocispec.Descriptor) error {
+	return nil
+}
+
+// OnManifestUploading implements ManifestPushHandler.
+func (DiscardHandler) OnManifestUploading(desc ocispec.Descriptor) error {
+	return nil
+}
+
+// OnManifestUploaded implements ManifestPushHandler.
+func (DiscardHandler) OnManifestUploaded(desc ocispec.Descriptor) error {
+	return nil
+}
+
+// OnManifestPushed implements ManifestPushHandler.
+func (DiscardHandler) OnManifestPushed(ref string) error {
+	return nil
+}
+
 // OnManifestRemoved implements ManifestIndexUpdateHandler.
 func (DiscardHandler) OnManifestRemoved(digest.Digest) error {
 	return nil

cmd/oras/internal/display/status/discard_test.go

@@ -21,6 +21,20 @@ import (
 	v1 "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
+func TestDiscardHandler_OnManifestPushed(t *testing.T) {
+	testDiscard := NewDiscardHandler()
+	if err := testDiscard.OnManifestPushed("test"); err != nil {
+		t.Errorf("DiscardHandler.OnIndexMerged() error = %v, wantErr nil", err)
+	}
+}
+
+func TestDiscardHandler_OnManifestExists(t *testing.T) {
+	testDiscard := NewDiscardHandler()
+	if err := testDiscard.OnManifestExists(v1.Descriptor{}); err != nil {
+		t.Errorf("DiscardHandler.OnIndexExists() error = %v, wantErr nil", err)
+	}
+}
+
 func TestDiscardHandler_OnManifestRemoved(t *testing.T) {
 	testDiscard := NewDiscardHandler()
 	if err := testDiscard.OnManifestRemoved("sha256:44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a"); err != nil {

cmd/oras/internal/display/status/interface.go

@@ -64,6 +64,14 @@ type CopyHandler interface {
 	OnMounted(ctx context.Context, desc ocispec.Descriptor) error
 }
 
+// ManifestPushHandler handles status output for manifest push command.
+type ManifestPushHandler interface {
+	OnManifestExists(desc ocispec.Descriptor) error
+	OnManifestUploading(desc ocispec.Descriptor) error
+	OnManifestUploaded(desc ocispec.Descriptor) error
+	OnManifestPushed(ref string) error
+}
+
 // ManifestIndexCreateHandler handles status output for manifest index create command.
 type ManifestIndexCreateHandler interface {
 	OnFetching(manifestRef string) error

cmd/oras/internal/display/status/text.go

@@ -183,6 +183,35 @@ func (ch *TextCopyHandler) OnMounted(_ context.Context, desc ocispec.Descriptor)
 	return ch.printer.PrintStatus(desc, copyPromptMounted)
 }
 
+// TextManifestPushHandler handles text status output for manifest push events.
+type TextManifestPushHandler struct {
+	printer *output.Printer
+}
+
+// NewTextManifestPushHandler returns a new handler for manifest push command.
+func NewTextManifestPushHandler(printer *output.Printer) ManifestPushHandler {
+	tmich := TextManifestPushHandler{
+		printer: printer,
+	}
+	return &tmich
+}
+
+func (mph *TextManifestPushHandler) OnManifestExists(desc ocispec.Descriptor) error {
+	return mph.printer.PrintStatus(desc, PushPromptExists)
+}
+
+func (mph *TextManifestPushHandler) OnManifestUploading(desc ocispec.Descriptor) error {
+	return mph.printer.PrintStatus(desc, PushPromptUploading)
+}
+
+func (mph *TextManifestPushHandler) OnManifestUploaded(desc ocispec.Descriptor) error {
+	return mph.printer.PrintStatus(desc, PushPromptUploaded)
+}
+
+func (mph *TextManifestPushHandler) OnManifestPushed(ref string) error {
+	return mph.printer.Println(PushPromptPushed, ref)
+}
+
 // TextManifestIndexCreateHandler handles text status output for manifest index create events.
 type TextManifestIndexCreateHandler struct {
 	printer *output.Printer

cmd/oras/internal/display/status/text_test.go

@@ -194,6 +194,13 @@ func TestTextPushHandler_PreCopy(t *testing.T) {
 	validatePrinted(t, "Uploading 0b442c23c1dd oci-image")
 }
 
+func TestTextManifestPushHandler_OnManifestExists(t *testing.T) {
+	mph := NewTextManifestPushHandler(printer)
+	if mph.OnManifestExists(ocispec.Descriptor{}) != nil {
+		t.Error("OnManifestExists() should not return an error")
+	}
+}
+
 func TestTextManifestIndexUpdateHandler_OnManifestAdded(t *testing.T) {
 	tests := []struct {
 		name    string

cmd/oras/internal/display/status/utils.go

@@ -37,6 +37,7 @@ const (
 	PushPromptUploading = "Uploading"
 	PushPromptSkipped   = "Skipped  "
 	PushPromptExists    = "Exists   "
+	PushPromptPushed    = "Pushed   "
 )
 
 // Prompts for cp events.

cmd/oras/root/manifest/push.go

@@ -147,6 +147,8 @@
 		}
 	}
 
+	displayStatus, displayMetadata := display.NewManifestPushHandler(opts.Printer, opts.OutputDescriptor, opts.Pretty.Pretty)
+
 	// prepare manifest descriptor
 	desc := content.NewDescriptorFromBytes(mediaType, contentBytes)
 
@@ -159,17 +161,17 @@
 		return err
 	}
 	if match {
-		if err := opts.Printer.PrintStatus(desc, "Exists"); err != nil {
+		if err := displayStatus.OnManifestExists(desc); err != nil {
 			return err
 		}
 	} else {
-		if err = opts.Printer.PrintStatus(desc, "Uploading"); err != nil {
+		if err = displayStatus.OnManifestUploading(desc); err != nil {
 			return err
 		}
 		if _, err := oras.TagBytes(ctx, target, mediaType, contentBytes, ref); err != nil {
 			return err
 		}
-		if err = opts.Printer.PrintStatus(desc, "Uploaded "); err != nil {
+		if err = displayStatus.OnManifestUploaded(desc); err != nil {
 			return err
 		}
 	}
@@ -190,18 +192,17 @@
 		}
 		return opts.Output(os.Stdout, descJSON)
 	}
-	_ = opts.Printer.Println("Pushed", opts.AnnotatedReference())
+	if err := displayStatus.OnManifestPushed(opts.AnnotatedReference()); err != nil {
+		return err
+	}
 	if len(opts.extraRefs) != 0 {
-		handler := display.NewManifestPushHandler(opts.Printer)
-		tagListener := listener.NewTaggedListener(target, handler.OnTagged)
+		tagListener := listener.NewTaggedListener(target, displayMetadata.OnTagged)
 		if _, err = oras.TagBytesN(ctx, tagListener, mediaType, contentBytes, opts.extraRefs, tagBytesNOpts); err != nil {
 			return err
 		}
 	}
 
-	_ = opts.Printer.Println("Digest:", desc.Digest)
-
-	return nil
+	return displayMetadata.OnCompleted(desc)
 }
 
 // matchDigest checks whether the manifest's digest matches to it in the remote