Merge branch 'main' into proposal-diagnose

.github/workflows/build.yml

@@ -27,7 +27,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go-version: ['1.22']
+        go-version: ['1.23']
       fail-fast: true
     steps:
       - name: Checkout

.github/workflows/codeql-analysis.yml

@@ -35,7 +35,7 @@ jobs:
       security-events: write
     strategy:
       matrix:
-        go-version: ['1.22']
+        go-version: ['1.23']
       fail-fast: false
     steps:
       - name: Checkout repository

.github/workflows/golangci-lint.yml

@@ -27,7 +27,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go-version: ['1.22']
+        go-version: ['1.23']
       fail-fast: true
     steps:
     - name: Checkout

.github/workflows/release-github.yml

@@ -29,7 +29,7 @@ jobs:
       - name: setup go environment
         uses: actions/setup-go@v5
         with:
-          go-version: '1.22.3'
+          go-version: '1.23.0'
       - name: run goreleaser
         uses: goreleaser/goreleaser-action@v6
         with:

Dockerfile

@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.22.3-alpine as builder
+FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.23.0-alpine as builder
 ARG TARGETPLATFORM
 RUN apk add git make
 ENV ORASPKG /oras

Makefile

@@ -18,6 +18,19 @@ GIT_COMMIT  = $(shell git rev-parse HEAD)
 GIT_TAG     = $(shell git describe --tags --abbrev=0 --exact-match 2>/dev/null)
 GIT_DIRTY   = $(shell test -n "`git status --porcelain`" && echo "dirty" || echo "clean")
 GO_EXE      = go
+OSNAME      = $(shell uname -o)
+ARCHNAME    = $(shell uname -m)
+
+ifeq ($(OSNAME),Darwin)
+  OS = mac
+else
+  OS = linux
+endif
+ifeq ($(ARCHNAME),arm64)
+  ARCH = arm64
+else
+  ARCH = amd64
+endif
 
 TARGET_OBJS ?= checksums.txt darwin_amd64.tar.gz darwin_arm64.tar.gz linux_amd64.tar.gz linux_arm64.tar.gz linux_armv7.tar.gz linux_s390x.tar.gz linux_ppc64le.tar.gz linux_riscv64.tar.gz windows_amd64.zip freebsd_amd64.tar.gz
 
@@ -31,6 +44,10 @@ endif
 LDFLAGS += -X $(PROJECT_PKG)/internal/version.GitCommit=${GIT_COMMIT}
 LDFLAGS += -X $(PROJECT_PKG)/internal/version.GitTreeState=${GIT_DIRTY}
 
+.PHONY: default
+default: test build-$(OS)-$(ARCH)
+	@echo 'Done ' build-$(OS)-$(ARCH)
+
 .PHONY: test
 test: tidy vendor check-encoding  ## tidy and run tests
 	$(GO_EXE) test -race -v -coverprofile=coverage.txt -covermode=atomic -coverpkg=./... ./...

cmd/oras/internal/display/handler.go

@@ -174,6 +174,11 @@ func NewManifestPushHandler(printer *output.Printer) metadata.ManifestPushHandle
 	return text.NewManifestPushHandler(printer)
 }
 
+// NewManifestIndexCreateHandler returns an index create handler.
+func NewManifestIndexCreateHandler(printer *output.Printer) metadata.ManifestIndexCreateHandler {
+	return text.NewManifestIndexCreateHandler(printer)
+}
+
 // NewCopyHandler returns copy handlers.
 func NewCopyHandler(printer *output.Printer, fetcher fetcher.Fetcher) (status.CopyHandler, metadata.CopyHandler) {
 	return status.NewTextCopyHandler(printer, fetcher), text.NewCopyHandler(printer)

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

@@ -78,6 +78,11 @@ type ManifestPushHandler interface {
 	TaggedHandler
 }
 
+// ManifestIndexCreateHandler handles metadata output for index create events.
+type ManifestIndexCreateHandler interface {
+	TaggedHandler
+}
+
 // CopyHandler handles metadata output for cp events.
 type CopyHandler interface {
 	TaggedHandler

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

@@ -0,0 +1,39 @@
+/*
+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 (
+	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
+	"oras.land/oras/cmd/oras/internal/display/metadata"
+	"oras.land/oras/cmd/oras/internal/output"
+)
+
+// 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,
+	}
+}
+
+// OnTagged implements metadata.TaggedHandler.
+func (h *ManifestIndexCreateHandler) OnTagged(_ ocispec.Descriptor, tag string) error {
+	return h.printer.Println("Tagged", tag)
+}

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

@@ -18,7 +18,7 @@ package console
 import (
 	"os"
 
-	"github.com/containerd/console"
+	containerd "github.com/containerd/console"
 	"github.com/morikuni/aec"
 )
 
@@ -33,60 +33,67 @@ const (
 	Restore = "\0338"
 )
 
-// Console is a wrapper around containerd's console.Console and ANSI escape
-// codes.
-type Console struct {
-	console.Console
+// Console is a wrapper around containerd's Console and ANSI escape codes.
+type Console interface {
+	containerd.Console
+	GetHeightWidth() (height, width int)
+	Save()
+	NewRow()
+	OutputTo(upCnt uint, str string)
+	Restore()
 }
 
-// Size returns the width and height of the console.
-// If the console size cannot be determined, returns a default value of 80x10.
-func (c *Console) Size() (width, height int) {
-	width = MinWidth
-	height = MinHeight
-	size, err := c.Console.Size()
-	if err == nil {
-		if size.Height > MinHeight {
-			height = int(size.Height)
-		}
-		if size.Width > MinWidth {
-			width = int(size.Width)
-		}
-	}
-	return
+type console struct {
+	containerd.Console
 }
 
-// New generates a Console from a file.
-func New(f *os.File) (*Console, error) {
-	c, err := console.ConsoleFromFile(f)
+// NewConsole generates a console from a file.
+func NewConsole(f *os.File) (Console, error) {
+	c, err := containerd.ConsoleFromFile(f)
 	if err != nil {
 		return nil, err
 	}
-	return &Console{c}, nil
+	return &console{c}, nil
+}
+
+// GetHeightWidth returns the width and height of the console.
+// If the console size cannot be determined, returns a default value of 80x10.
+func (c *console) GetHeightWidth() (height, width int) {
+	windowSize, err := c.Console.Size()
+	if err != nil {
+		return MinHeight, MinWidth
+	}
+	if windowSize.Height < MinHeight {
+		windowSize.Height = MinHeight
+	}
+	if windowSize.Width < MinWidth {
+		windowSize.Width = MinWidth
+	}
+	return int(windowSize.Height), int(windowSize.Width)
 }
 
 // Save saves the current cursor position.
-func (c *Console) Save() {
+func (c *console) Save() {
 	_, _ = c.Write([]byte(aec.Hide.Apply(Save)))
 }
 
 // NewRow allocates a horizontal space to the output area with scroll if needed.
-func (c *Console) NewRow() {
+func (c *console) NewRow() {
 	_, _ = c.Write([]byte(Restore))
 	_, _ = c.Write([]byte("\n"))
 	_, _ = c.Write([]byte(Save))
 }
 
 // OutputTo outputs a string to a specific line.
-func (c *Console) OutputTo(upCnt uint, str string) {
+func (c *console) OutputTo(upCnt uint, str string) {
 	_, _ = c.Write([]byte(Restore))
 	_, _ = c.Write([]byte(aec.PreviousLine(upCnt).Apply(str)))
 	_, _ = c.Write([]byte("\n"))
 	_, _ = c.Write([]byte(aec.EraseLine(aec.EraseModes.Tail).String()))
 }
 
 // Restore restores the saved cursor position.
-func (c *Console) Restore() {
+func (c *console) Restore() {
 	// cannot use aec.Restore since DEC has better compatibility than SCO
 	_, _ = c.Write([]byte(Restore))
 	_, _ = c.Write([]byte(aec.Column(0).

cmd/oras/internal/display/status/console/console_test.go

@@ -18,11 +18,38 @@ limitations under the License.
 package console
 
 import (
+	"os"
 	"testing"
 
-	"github.com/containerd/console"
+	containerd "github.com/containerd/console"
+	"oras.land/oras/internal/testutils"
 )
 
+func givenConsole(t *testing.T) (c Console, pty containerd.Console) {
+	pty, _, err := containerd.NewPty()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	c = &console{
+		Console: pty,
+	}
+	return c, pty
+}
+
+func givenTestConsole(t *testing.T) (c Console, pty containerd.Console, tty *os.File) {
+	var err error
+	pty, tty, err = testutils.NewPty()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	c = &console{
+		Console: pty,
+	}
+	return c, pty, tty
+}
+
 func validateSize(t *testing.T, gotWidth, gotHeight, wantWidth, wantHeight int) {
 	t.Helper()
 	if gotWidth != wantWidth {
@@ -33,31 +60,77 @@ func validateSize(t *testing.T, gotWidth, gotHeight, wantWidth, wantHeight int)
 	}
 }
 
-func TestConsole_Size(t *testing.T) {
-	pty, _, err := console.NewPty()
-	if err != nil {
-		t.Fatal(err)
-	}
-	c := &Console{
-		Console: pty,
+func TestNewConsole(t *testing.T) {
+	_, err := NewConsole(os.Stdin)
+	if err == nil {
+		t.Error("expected error creating bogus console")
 	}
+}
+
+func TestConsole_GetHeightWidth(t *testing.T) {
+	c, pty := givenConsole(t)
 
 	// minimal width and height
-	gotWidth, gotHeight := c.Size()
+	gotHeight, gotWidth := c.GetHeightWidth()
 	validateSize(t, gotWidth, gotHeight, MinWidth, MinHeight)
 
 	// zero width
-	_ = pty.Resize(console.WinSize{Width: 0, Height: MinHeight})
-	gotWidth, gotHeight = c.Size()
+	_ = pty.Resize(containerd.WinSize{Width: 0, Height: MinHeight})
+	gotHeight, gotWidth = c.GetHeightWidth()
 	validateSize(t, gotWidth, gotHeight, MinWidth, MinHeight)
 
 	// zero height
-	_ = pty.Resize(console.WinSize{Width: MinWidth, Height: 0})
-	gotWidth, gotHeight = c.Size()
+	_ = pty.Resize(containerd.WinSize{Width: MinWidth, Height: 0})
+	gotHeight, gotWidth = c.GetHeightWidth()
 	validateSize(t, gotWidth, gotHeight, MinWidth, MinHeight)
 
 	// valid zero and height
-	_ = pty.Resize(console.WinSize{Width: 200, Height: 100})
-	gotWidth, gotHeight = c.Size()
+	_ = pty.Resize(containerd.WinSize{Width: 200, Height: 100})
+	gotHeight, gotWidth = c.GetHeightWidth()
 	validateSize(t, gotWidth, gotHeight, 200, 100)
+
+}
+
+func TestConsole_NewRow(t *testing.T) {
+	c, pty, tty := givenTestConsole(t)
+
+	c.NewRow()
+
+	err := testutils.MatchPty(pty, tty, "^[8\r\n^[7")
+	if err != nil {
+		t.Fatalf("NewRow output error: %v", err)
+	}
+}
+
+func TestConsole_OutputTo(t *testing.T) {
+	c, pty, tty := givenTestConsole(t)
+
+	c.OutputTo(1, "test string")
+
+	err := testutils.MatchPty(pty, tty, "^[8^[[1Ftest string^[[0m\r\n^[[0K")
+	if err != nil {
+		t.Fatalf("OutputTo output error: %v", err)
+	}
+}
+
+func TestConsole_Restore(t *testing.T) {
+	c, pty, tty := givenTestConsole(t)
+
+	c.Restore()
+
+	err := testutils.MatchPty(pty, tty, "^[8^[[0G^[[2K^[[?25h")
+	if err != nil {
+		t.Fatalf("Restore output error: %v", err)
+	}
+}
+
+func TestConsole_Save(t *testing.T) {
+	c, pty, tty := givenTestConsole(t)
+
+	c.Save()
+
+	err := testutils.MatchPty(pty, tty, "^[[?25l^[7^[[0m")
+	if err != nil {
+		t.Fatalf("Save output error: %v", err)
+	}
 }