resolved comments

Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>

cmd/oras/internal/display/handler.go

@@ -180,22 +180,15 @@ func NewManifestIndexCreateHandler(outputPath string, printer *output.Printer, p
 	metadata.ManifestIndexCreateHandler,
 	content.ManifestIndexCreateHandler,
 	error) {
-	var statusHandler status.ManifestIndexCreateHandler
-	var metadataHandler metadata.ManifestIndexCreateHandler
-	var contentHandler content.ManifestIndexCreateHandler
+	statusHandler := status.NewTextManifestIndexCreateHandler(printer)
+	metadataHandler := text.NewManifestIndexCreateHandler(printer)
+	contentHandler := content.NewManifestIndexCreateHandler(printer, pretty, outputPath)
 	switch outputPath {
 	case "":
-		statusHandler = status.NewTextManifestIndexCreateHandler(printer)
-		metadataHandler = text.NewManifestIndexCreateHandler(printer)
 		contentHandler = content.NewDiscardHandler()
 	case "-":
 		statusHandler = status.NewDiscardHandler()
 		metadataHandler = metadata.NewDiscardHandler()
-		contentHandler = content.NewManifestIndexCreateHandler(printer, pretty, outputPath)
-	default:
-		statusHandler = status.NewTextManifestIndexCreateHandler(printer)
-		metadataHandler = text.NewManifestIndexCreateHandler(printer)
-		contentHandler = content.NewManifestIndexCreateHandler(printer, pretty, outputPath)
 	}
 	return statusHandler, metadataHandler, contentHandler, nil
 }
@@ -206,22 +199,15 @@ func NewManifestIndexUpdateHandler(outputPath string, printer *output.Printer, p
 	metadata.ManifestIndexUpdateHandler,
 	content.ManifestIndexUpdateHandler,
 	error) {
-	var statusHandler status.ManifestIndexUpdateHandler
-	var metadataHandler metadata.ManifestIndexUpdateHandler
-	var contentHandler content.ManifestIndexUpdateHandler
+	statusHandler := status.NewTextManifestIndexUpdateHandler(printer)
+	metadataHandler := text.NewManifestIndexUpdateHandler(printer)
+	contentHandler := content.NewManifestIndexCreateHandler(printer, pretty, outputPath)
 	switch outputPath {
 	case "":
-		statusHandler = status.NewTextManifestIndexUpdateHandler(printer)
-		metadataHandler = text.NewManifestIndexCreateHandler(printer)
 		contentHandler = content.NewDiscardHandler()
 	case "-":
 		statusHandler = status.NewDiscardHandler()
 		metadataHandler = metadata.NewDiscardHandler()
-		contentHandler = content.NewManifestIndexCreateHandler(printer, pretty, outputPath)
-	default:
-		statusHandler = status.NewTextManifestIndexUpdateHandler(printer)
-		metadataHandler = text.NewManifestIndexCreateHandler(printer)
-		contentHandler = content.NewManifestIndexCreateHandler(printer, pretty, outputPath)
 	}
 	return statusHandler, metadataHandler, contentHandler, nil
 }

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

@@ -38,6 +38,36 @@ func (discard) OnTagged(ocispec.Descriptor, string) error {
 }
 
 // OnCompleted implements ManifestIndexCreateHandler.
-func (discard) OnCompleted(digest.Digest) error {
+func (discard) OnCompleted(ocispec.Descriptor) error {
+	return nil
+}
+
+// OnIndexPacked implements ManifestIndexCreateHandler.
+func (discard) OnIndexPacked(string) error {
+	return nil
+}
+
+// OnIndexPushed implements ManifestIndexCreateHandler.
+func (discard) OnIndexPushed(string) error {
+	return nil
+}
+
+// OnManifestRemoved implements ManifestIndexUpdateHandler.
+func (discard) OnManifestRemoved(digest.Digest) error {
+	return nil
+}
+
+// OnManifestAdded implements ManifestIndexUpdateHandler.
+func (discard) OnManifestAdded(string, digest.Digest) error {
+	return nil
+}
+
+// OnIndexMerged implements ManifestIndexUpdateHandler.
+func (discard) OnIndexMerged(string, digest.Digest) error {
+	return nil
+}
+
+// OnIndexUpdated implements ManifestIndexUpdateHandler.
+func (discard) OnIndexUpdated(digest.Digest) error {
 	return nil
 }

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

@@ -82,11 +82,21 @@ type ManifestPushHandler interface {
 // ManifestIndexCreateHandler handles metadata output for index create events.
 type ManifestIndexCreateHandler interface {
 	TaggedHandler
-	OnCompleted(digest digest.Digest) error
+	OnIndexPacked(shortDigest string) error
+	OnIndexPushed(path string) error
+	OnCompleted(desc ocispec.Descriptor) error
 }
 
 // ManifestIndexUpdateHandler handles metadata output for index update events.
-type ManifestIndexUpdateHandler ManifestIndexCreateHandler
+type ManifestIndexUpdateHandler interface {
+	TaggedHandler
+	OnManifestRemoved(digest digest.Digest) error
+	OnManifestAdded(manifestRef string, digest digest.Digest) error
+	OnIndexMerged(indexRef string, digest digest.Digest) error
+	OnIndexUpdated(digest digest.Digest) error
+	OnIndexPushed(path string) error
+	OnCompleted(desc ocispec.Descriptor) error
+}
 
 // CopyHandler handles metadata output for cp events.
 type CopyHandler interface {

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

@@ -0,0 +1,108 @@
+/*
+Copyright The ORAS Authors.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package text
+
+import (
+	"github.com/opencontainers/go-digest"
+	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
+	"oras.land/oras/cmd/oras/internal/display/metadata"
+	"oras.land/oras/cmd/oras/internal/output"
+	"oras.land/oras/internal/contentutil"
+)
+
+// ManifestIndexCreateHandler handles text metadata output for index create events.
+type ManifestIndexCreateHandler struct {
+	printer *output.Printer
+}
+
+// NewManifestIndexCreateHandler returns a new handler for index create events.
+func NewManifestIndexCreateHandler(printer *output.Printer) metadata.ManifestIndexCreateHandler {
+	return &ManifestIndexCreateHandler{
+		printer: printer,
+	}
+}
+
+// OnIndexPacked implements metadata.ManifestIndexCreateHandler.
+func (h *ManifestIndexCreateHandler) OnIndexPacked(shortDigest string) error {
+	return h.printer.Println("Packed", shortDigest, ocispec.MediaTypeImageIndex)
+}
+
+// OnIndexPushed implements metadata.ManifestIndexCreateHandler.
+func (h *ManifestIndexCreateHandler) OnIndexPushed(path string) error {
+	return h.printer.Println("Pushed", path)
+}
+
+// OnTagged implements metadata.TaggedHandler.
+func (h *ManifestIndexCreateHandler) OnTagged(_ ocispec.Descriptor, tag string) error {
+	return h.printer.Println("Tagged", tag)
+}
+
+// OnCompleted implements metadata.ManifestIndexCreateHandler.
+func (h *ManifestIndexCreateHandler) OnCompleted(desc ocispec.Descriptor) error {
+	return h.printer.Println("Digest:", desc.Digest)
+}
+
+type ManifestIndexUpdateHandler struct {
+	printer *output.Printer
+}
+
+// NewManifestIndexUpdateHandler returns a new handler for index update events.
+func NewManifestIndexUpdateHandler(printer *output.Printer) metadata.ManifestIndexUpdateHandler {
+	return &ManifestIndexUpdateHandler{
+		printer: printer,
+	}
+}
+
+// OnManifestRemoved implements metadata.ManifestIndexUpdateHandler.
+func (miuh ManifestIndexUpdateHandler) OnManifestRemoved(digest digest.Digest) error {
+	return miuh.printer.Println("Removed", digest)
+}
+
+// OnManifestAdded implements metadata.ManifestIndexUpdateHandler.
+func (miuh ManifestIndexUpdateHandler) OnManifestAdded(ref string, digest digest.Digest) error {
+	if contentutil.IsDigest(ref) {
+		return miuh.printer.Println("Added", ref)
+	}
+	return miuh.printer.Println("Added", digest, ref)
+}
+
+// OnIndexMerged implements metadata.ManifestIndexUpdateHandler.
+func (miuh ManifestIndexUpdateHandler) OnIndexMerged(ref string, digest digest.Digest) error {
+	if contentutil.IsDigest(ref) {
+		return miuh.printer.Println("Merged", ref)
+	}
+	return miuh.printer.Println("Merged", digest, ref)
+}
+
+// OnIndexUpdated implements metadata.ManifestIndexUpdateHandler.
+func (miuh ManifestIndexUpdateHandler) OnIndexUpdated(digest digest.Digest) error {
+	return miuh.printer.Println("Updated", digest)
+}
+
+// OnIndexPushed implements metadata.ManifestIndexUpdateHandler.
+func (miuh ManifestIndexUpdateHandler) OnIndexPushed(indexRef string) error {
+	return miuh.printer.Println("Pushed", indexRef)
+}
+
+// OnTagged implements metadata.TaggedHandler.
+func (h *ManifestIndexUpdateHandler) OnTagged(_ ocispec.Descriptor, tag string) error {
+	return h.printer.Println("Tagged", tag)
+}
+
+// OnCompleted implements metadata.ManifestIndexUpdateHandler.
+func (h *ManifestIndexUpdateHandler) OnCompleted(desc ocispec.Descriptor) error {
+	return h.printer.Println("Digest:", desc.Digest)
+}

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

@@ -68,8 +68,6 @@ type CopyHandler interface {
 type ManifestIndexCreateHandler interface {
 	OnSourceManifestFetching(source string) error
 	OnSourceManifestFetched(source string) error
-	OnIndexPacked(shortDigest string) error
-	OnIndexPushed(path string) error
 }
 
 // ManifestIndexUpdateHandler handles status output for manifest index update command.
@@ -78,9 +76,4 @@ type ManifestIndexUpdateHandler interface {
 	OnIndexFetched(indexRef string, digest digest.Digest) error
 	OnManifestFetching(manifestRef string) error
 	OnManifestFetched(manifestRef string, digest digest.Digest) error
-	OnManifestRemoved(digest digest.Digest) error
-	OnManifestAdded(manifestRef string, digest digest.Digest) error
-	OnIndexMerged(indexRef string, digest digest.Digest) error
-	OnIndexUpdated(digest digest.Digest) error
-	OnIndexPushed(path string) error
 }

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

@@ -197,16 +197,6 @@ func (mich TextManifestIndexCreateHandler) OnSourceManifestFetched(source string
 	return mich.printer.Println(IndexPromptFetched, source)
 }
 
-// OnIndexPacked implements ManifestIndexCreateHandler.
-func (mich TextManifestIndexCreateHandler) OnIndexPacked(shortDigest string) error {
-	return mich.printer.Println(IndexPromptPacked, shortDigest, ocispec.MediaTypeImageIndex)
-}
-
-// OnIndexPushed implements ManifestIndexCreateHandler.
-func (mich TextManifestIndexCreateHandler) OnIndexPushed(path string) error {
-	return mich.printer.Println(IndexPromptPushed, path)
-}
-
 // NewTextManifestIndexCreateHandler returns a new handler for manifest index create command.
 func NewTextManifestIndexCreateHandler(printer *output.Printer) ManifestIndexCreateHandler {
 	tmich := TextManifestIndexCreateHandler{
@@ -246,37 +236,6 @@ func (miuh TextManifestIndexUpdateHandler) OnManifestFetched(ref string, digest
 	return miuh.printer.Println(IndexPromptFetched, digest, ref)
 }
 
-// OnManifestRemoved implements ManifestIndexUpdateHandler.
-func (miuh TextManifestIndexUpdateHandler) OnManifestRemoved(digest digest.Digest) error {
-	return miuh.printer.Println(IndexPromptRemoved, digest)
-}
-
-// OnManifestAdded implements ManifestIndexUpdateHandler.
-func (miuh TextManifestIndexUpdateHandler) OnManifestAdded(ref string, digest digest.Digest) error {
-	if contentutil.IsDigest(ref) {
-		return miuh.printer.Println(IndexPromptAdded, ref)
-	}
-	return miuh.printer.Println(IndexPromptAdded, digest, ref)
-}
-
-// OnIndexMerged implements ManifestIndexUpdateHandler.
-func (miuh TextManifestIndexUpdateHandler) OnIndexMerged(ref string, digest digest.Digest) error {
-	if contentutil.IsDigest(ref) {
-		return miuh.printer.Println(IndexPromptMerged, ref)
-	}
-	return miuh.printer.Println(IndexPromptMerged, digest, ref)
-}
-
-// OnIndexUpdated implements ManifestIndexUpdateHandler.
-func (miuh TextManifestIndexUpdateHandler) OnIndexUpdated(digest digest.Digest) error {
-	return miuh.printer.Println(IndexPromptUpdated, digest)
-}
-
-// OnIndexPushed implements ManifestIndexUpdateHandler.
-func (miuh TextManifestIndexUpdateHandler) OnIndexPushed(indexRef string) error {
-	return miuh.printer.Println(IndexPromptPushed, indexRef)
-}
-
 // NewTextManifestIndexUpdateHandler returns a new handler for manifest index create command.
 func NewTextManifestIndexUpdateHandler(printer *output.Printer) ManifestIndexUpdateHandler {
 	miuh := TextManifestIndexUpdateHandler{

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

@@ -52,12 +52,6 @@ const (
 const (
 	IndexPromptFetching = "Fetching "
 	IndexPromptFetched  = "Fetched  "
-	IndexPromptAdded    = "Added    "
-	IndexPromptMerged   = "Merged   "
-	IndexPromptRemoved  = "Removed  "
-	IndexPromptPacked   = "Packed   "
-	IndexPromptPushed   = "Pushed   "
-	IndexPromptUpdated  = "Updated  "
 )
 
 // DeduplicatedFilter filters out deduplicated descriptors.

cmd/oras/root/manifest/index/create.go

@@ -132,18 +132,18 @@ func createIndex(cmd *cobra.Command, opts createOptions) error {
 		return err
 	}
 	desc := content.NewDescriptorFromBytes(ocispec.MediaTypeImageIndex, indexBytes)
-	if err := displayStatus.OnIndexPacked(descriptor.ShortDigest(desc)); err != nil {
+	if err := displayMetadata.OnIndexPacked(descriptor.ShortDigest(desc)); err != nil {
 		return err
 	}
 	if err := displayContent.OnContentCreated(indexBytes); err != nil {
 		return err
 	}
 	if opts.outputPath == "" {
-		if err := pushIndex(ctx, displayStatus.OnIndexPushed, displayMetadata.OnTagged, target, desc, indexBytes, opts.Reference, opts.extraRefs, opts.AnnotatedReference()); err != nil {
+		if err := pushIndex(ctx, displayMetadata.OnIndexPushed, displayMetadata.OnTagged, target, desc, indexBytes, opts.Reference, opts.extraRefs, opts.AnnotatedReference()); err != nil {
 			return err
 		}
 	}
-	return displayMetadata.OnCompleted(desc.Digest)
+	return displayMetadata.OnCompleted(desc)
 }
 
 func fetchSourceManifests(ctx context.Context, displayStatus status.ManifestIndexCreateHandler, target oras.ReadOnlyTarget, sources []string) ([]ocispec.Descriptor, error) {