Merge pull request #10757 from cpuguy83/shim_deps

Clean up some dependency trees for runc shim

Makefile

@@ -150,6 +150,8 @@ GOTEST ?= $(GO) test
 OUTPUTDIR = $(join $(ROOTDIR), _output)
 CRIDIR=$(OUTPUTDIR)/cri
 
+SHIM_GO_TAGS := --tags no_grpc
+
 .PHONY: clean all AUTHORS build binaries test integration generate protos check-protos coverage ci check help install uninstall vendor release static-release mandir install-man install-doc genman install-cri-deps cri-release cri-cni-release cri-integration install-deps bin/cri-integration.test remove-replace clean-vendor
 .DEFAULT: default
 
@@ -171,7 +173,7 @@ generate: protos
 	@echo "$(WHALE) $@"
 	@PATH="${ROOTDIR}/bin:${PATH}" $(GO) generate -x ${PACKAGES}
 
-protos: bin/protoc-gen-go-fieldpath
+protos: bin/protoc-gen-go-fieldpath bin/go-buildtag
 	@echo "$(WHALE) $@"
 	@find . -path ./vendor -prune -false -o -name '*.pb.go' | xargs rm
 	$(eval TMPDIR := $(shell mktemp -d))
@@ -181,6 +183,7 @@ protos: bin/protoc-gen-go-fieldpath
 	@rm -rf ${TMPDIR} v2
 	go-fix-acronym -w -a '^Os' $(shell find api/ -name '*.pb.go')
 	go-fix-acronym -w -a '(Id|Io|Uuid|Os)$$' $(shell find api/ -name '*.pb.go')
+	bin/go-buildtag -w --tags '!no_grpc' $(shell find api/ -name '*_grpc.pb.go')
 	@test -z "$$(git status --short | grep "api/next.pb.txt" | tee /dev/stderr)" || \
 		$(GO) mod edit -replace=github.com/containerd/containerd/api=./api
 
@@ -230,7 +233,7 @@ cri-integration: binaries bin/cri-integration.test ## run cri integration tests
 # build runc shimv2 with failpoint control, only used by integration test
 bin/containerd-shim-runc-fp-v1: integration/failpoint/cmd/containerd-shim-runc-fp-v1 FORCE
 	@echo "$(WHALE) $@"
-	@CGO_ENABLED=${SHIM_CGO_ENABLED} $(GO) build ${GO_BUILD_FLAGS} -o $@ ${SHIM_GO_LDFLAGS} ${GO_TAGS} ./integration/failpoint/cmd/containerd-shim-runc-fp-v1
+	@CGO_ENABLED=${SHIM_CGO_ENABLED} $(GO) build ${GO_BUILD_FLAGS} -o $@ ${SHIM_GO_LDFLAGS} ${GO_TAGS} ${SHIM_GO_TAGS} ./integration/failpoint/cmd/containerd-shim-runc-fp-v1
 
 # build CNI bridge plugin wrapper with failpoint support, only used by integration test
 bin/cni-bridge-fp: integration/failpoint/cmd/cni-bridge-fp FORCE
@@ -264,7 +267,7 @@ bin/gen-manpages: cmd/gen-manpages FORCE
 
 bin/containerd-shim-runc-v2: cmd/containerd-shim-runc-v2 FORCE # set !cgo and omit pie for a static shim build: https://github.com/golang/go/issues/17789#issuecomment-258542220
 	@echo "$(WHALE) $@"
-	@CGO_ENABLED=${SHIM_CGO_ENABLED} $(GO) build ${GO_BUILD_FLAGS} -o $@ ${SHIM_GO_LDFLAGS} ${GO_TAGS} ./cmd/containerd-shim-runc-v2
+	CGO_ENABLED=${SHIM_CGO_ENABLED} $(GO) build ${GO_BUILD_FLAGS} -o $@ ${SHIM_GO_LDFLAGS} ${GO_TAGS} ${SHIM_GO_TAGS} ./cmd/containerd-shim-runc-v2
 
 binaries: $(BINARIES) ## build binaries
 	@echo "$(WHALE) $@"

api/runtime/sandbox/v1/sandbox_grpc.pb.go

@@ -1,3 +1,5 @@
+//go:build !no_grpc
+
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0

api/runtime/task/v3/shim_grpc.pb.go

@@ -1,3 +1,5 @@
+//go:build !no_grpc
+
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0

api/services/containers/v1/containers_grpc.pb.go

@@ -1,3 +1,5 @@
+//go:build !no_grpc
+
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0

api/services/content/v1/content_grpc.pb.go

@@ -1,3 +1,5 @@
+//go:build !no_grpc
+
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0

api/services/diff/v1/diff_grpc.pb.go

@@ -1,3 +1,5 @@
+//go:build !no_grpc
+
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0

api/services/events/v1/events_grpc.pb.go

@@ -1,3 +1,5 @@
+//go:build !no_grpc
+
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0

api/services/images/v1/images_grpc.pb.go

@@ -1,3 +1,5 @@
+//go:build !no_grpc
+
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0

api/services/introspection/v1/introspection_grpc.pb.go

@@ -1,3 +1,5 @@
+//go:build !no_grpc
+
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0

api/services/leases/v1/leases_grpc.pb.go

@@ -1,3 +1,5 @@
+//go:build !no_grpc
+
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0

api/services/namespaces/v1/namespace_grpc.pb.go

@@ -1,3 +1,5 @@
+//go:build !no_grpc
+
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0

api/services/sandbox/v1/sandbox_grpc.pb.go

@@ -1,3 +1,5 @@
+//go:build !no_grpc
+
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0

api/services/snapshots/v1/snapshots_grpc.pb.go

@@ -1,3 +1,5 @@
+//go:build !no_grpc
+
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0

api/services/streaming/v1/streaming_grpc.pb.go

@@ -1,3 +1,5 @@
+//go:build !no_grpc
+
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0

api/services/tasks/v1/tasks_grpc.pb.go

@@ -1,3 +1,5 @@
+//go:build !no_grpc
+
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0

api/services/transfer/v1/transfer_grpc.pb.go

@@ -1,3 +1,5 @@
+//go:build !no_grpc
+
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0

api/services/version/v1/version_grpc.pb.go

@@ -1,3 +1,5 @@
+//go:build !no_grpc
+
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0

cmd/containerd-shim-runc-v2/manager/manager_linux.go

@@ -40,7 +40,6 @@ import (
 	"github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/runc"
 	"github.com/containerd/containerd/v2/core/mount"
 	"github.com/containerd/containerd/v2/pkg/namespaces"
-	"github.com/containerd/containerd/v2/pkg/oci"
 	"github.com/containerd/containerd/v2/pkg/schedcore"
 	"github.com/containerd/containerd/v2/pkg/shim"
 	"github.com/containerd/containerd/v2/version"
@@ -112,7 +111,8 @@ func newCommand(ctx context.Context, id, containerdAddress, containerdTTRPCAddre
 }
 
 func readSpec() (*spec, error) {
-	f, err := os.Open(oci.ConfigFilename)
+	const configFileName = "config.json"
+	f, err := os.Open(configFileName)
 	if err != nil {
 		return nil, err
 	}

cmd/containerd-shim-runc-v2/runc/util.go

@@ -20,9 +20,10 @@ package runc
 
 import (
 	"context"
+	"encoding/json"
+	"os"
 	"path/filepath"
 
-	"github.com/containerd/containerd/v2/pkg/oci"
 	"github.com/containerd/log"
 	"github.com/opencontainers/runtime-spec/specs-go"
 )
@@ -30,7 +31,7 @@ import (
 // ShouldKillAllOnExit reads the bundle's OCI spec and returns true if
 // there is an error reading the spec or if the container has a private PID namespace
 func ShouldKillAllOnExit(ctx context.Context, bundlePath string) bool {
-	spec, err := oci.ReadSpec(filepath.Join(bundlePath, oci.ConfigFilename))
+	spec, err := readSpec(bundlePath)
 	if err != nil {
 		log.G(ctx).WithError(err).Error("shouldKillAllOnExit: failed to read config.json")
 		return true
@@ -45,3 +46,17 @@ func ShouldKillAllOnExit(ctx context.Context, bundlePath string) bool {
 	}
 	return true
 }
+
+func readSpec(p string) (*specs.Spec, error) {
+	const configFileName = "config.json"
+	f, err := os.Open(filepath.Join(p, configFileName))
+	if err != nil {
+		return nil, err
+	}
+	defer f.Close()
+	var s specs.Spec
+	if err := json.NewDecoder(f).Decode(&s); err != nil {
+		return nil, err
+	}
+	return &s, nil
+}

cmd/go-buildtag/main.go

@@ -0,0 +1,96 @@
+/*
+   Copyright The containerd 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 main
+
+import (
+	"flag"
+	"fmt"
+	"io"
+	"os"
+)
+
+func main() {
+	wrFl := flag.Bool("w", false, "Write to file")
+	tagsFl := flag.String("tags", "", "Tags to add")
+
+	flag.Parse()
+
+	if flag.NArg() < 1 {
+		fmt.Fprintln(os.Stderr, "Usage: go-buildtag <options> <file1> [<file2> <file3> ...]")
+		os.Exit(1)
+	}
+
+	wr := *wrFl
+	tags := *tagsFl
+	for i := 0; i < flag.NArg(); i++ {
+		p := flag.Arg(i)
+		if err := handle(wr, tags, p); err != nil {
+			fmt.Fprintln(os.Stderr, p+":", err)
+			os.Exit(2)
+		}
+	}
+}
+
+func handle(wr bool, tags, p string) (retErr error) {
+	out := os.Stdout
+
+	rdr, err := os.Open(p)
+	if err != nil {
+		return fmt.Errorf("could not open source file: %w", err)
+	}
+	defer rdr.Close()
+
+	if wr {
+		f, err := os.Create(p + ".tmp")
+		if err != nil {
+			return fmt.Errorf("error creatign temp file")
+		}
+		defer func() {
+			if retErr != nil {
+				os.Remove(f.Name())
+			}
+		}()
+
+		defer f.Close()
+		out = f
+	}
+
+	_, err = fmt.Fprintf(out, "//go:build %s\n\n", tags)
+	if err != nil {
+		return fmt.Errorf("error writing build tags: %w", err)
+	}
+
+	_, err = io.Copy(out, rdr)
+	if err != nil {
+		return fmt.Errorf("error copying original content to temp file")
+	}
+
+	rdr.Close()
+	if wr {
+		out.Close()
+
+		if err := os.Remove(p); err != nil {
+			return fmt.Errorf("error removing original source file: %w", err)
+		}
+
+		if err := os.Rename(p+".tmp", p); err != nil {
+			return fmt.Errorf("error replacing original source: %w", err)
+		}
+	}
+
+	return nil
+}

contrib/snapshotservice/service.go

@@ -22,6 +22,7 @@ import (
 	snapshotsapi "github.com/containerd/containerd/api/services/snapshots/v1"
 	"github.com/containerd/containerd/v2/core/mount"
 	"github.com/containerd/containerd/v2/core/snapshots"
+	"github.com/containerd/containerd/v2/core/snapshots/proxy"
 	ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
 	"github.com/containerd/errdefs"
 )
@@ -103,16 +104,16 @@ func (s service) Stat(ctx context.Context, sr *snapshotsapi.StatSnapshotRequest)
 		return nil, errdefs.ToGRPC(err)
 	}
 
-	return &snapshotsapi.StatSnapshotResponse{Info: snapshots.InfoToProto(info)}, nil
+	return &snapshotsapi.StatSnapshotResponse{Info: proxy.InfoToProto(info)}, nil
 }
 
 func (s service) Update(ctx context.Context, sr *snapshotsapi.UpdateSnapshotRequest) (*snapshotsapi.UpdateSnapshotResponse, error) {
-	info, err := s.sn.Update(ctx, snapshots.InfoFromProto(sr.Info), sr.UpdateMask.GetPaths()...)
+	info, err := s.sn.Update(ctx, proxy.InfoFromProto(sr.Info), sr.UpdateMask.GetPaths()...)
 	if err != nil {
 		return nil, errdefs.ToGRPC(err)
 	}
 
-	return &snapshotsapi.UpdateSnapshotResponse{Info: snapshots.InfoToProto(info)}, nil
+	return &snapshotsapi.UpdateSnapshotResponse{Info: proxy.InfoToProto(info)}, nil
 }
 
 func (s service) List(sr *snapshotsapi.ListSnapshotsRequest, ss snapshotsapi.Snapshots_ListServer) error {
@@ -125,7 +126,7 @@ func (s service) List(sr *snapshotsapi.ListSnapshotsRequest, ss snapshotsapi.Sna
 		}
 	)
 	err := s.sn.Walk(ss.Context(), func(ctx context.Context, info snapshots.Info) error {
-		buffer = append(buffer, snapshots.InfoToProto(info))
+		buffer = append(buffer, proxy.InfoToProto(info))
 
 		if len(buffer) >= 100 {
 			if err := sendBlock(buffer); err != nil {

core/snapshots/proxy/convert.go

@@ -0,0 +1,90 @@
+/*
+   Copyright The containerd 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 proxy
+
+import (
+	snapshotsapi "github.com/containerd/containerd/api/services/snapshots/v1"
+	"github.com/containerd/containerd/v2/core/snapshots"
+	"github.com/containerd/containerd/v2/pkg/protobuf"
+)
+
+// KindToProto converts from [Kind] to the protobuf definition [snapshots.Kind].
+func KindToProto(kind snapshots.Kind) snapshotsapi.Kind {
+	switch kind {
+	case snapshots.KindActive:
+		return snapshotsapi.Kind_ACTIVE
+	case snapshots.KindView:
+		return snapshotsapi.Kind_VIEW
+	default:
+		return snapshotsapi.Kind_COMMITTED
+	}
+}
+
+// KindFromProto converts from the protobuf definition [snapshots.Kind] to
+// [Kind].
+func KindFromProto(kind snapshotsapi.Kind) snapshots.Kind {
+	switch kind {
+	case snapshotsapi.Kind_ACTIVE:
+		return snapshots.KindActive
+	case snapshotsapi.Kind_VIEW:
+		return snapshots.KindView
+	default:
+		return snapshots.KindCommitted
+	}
+}
+
+// InfoToProto converts from [Info] to the protobuf definition [snapshots.Info].
+func InfoToProto(info snapshots.Info) *snapshotsapi.Info {
+	return &snapshotsapi.Info{
+		Name:      info.Name,
+		Parent:    info.Parent,
+		Kind:      KindToProto(info.Kind),
+		CreatedAt: protobuf.ToTimestamp(info.Created),
+		UpdatedAt: protobuf.ToTimestamp(info.Updated),
+		Labels:    info.Labels,
+	}
+}
+
+// InfoFromProto converts from the protobuf definition [snapshots.Info] to
+// [Info].
+func InfoFromProto(info *snapshotsapi.Info) snapshots.Info {
+	return snapshots.Info{
+		Name:    info.Name,
+		Parent:  info.Parent,
+		Kind:    KindFromProto(info.Kind),
+		Created: protobuf.FromTimestamp(info.CreatedAt),
+		Updated: protobuf.FromTimestamp(info.UpdatedAt),
+		Labels:  info.Labels,
+	}
+}
+
+// UsageFromProto converts from the protobuf definition [snapshots.Usage] to
+// [Usage].
+func UsageFromProto(resp *snapshotsapi.UsageResponse) snapshots.Usage {
+	return snapshots.Usage{
+		Inodes: resp.Inodes,
+		Size:   resp.Size,
+	}
+}
+
+// UsageToProto converts from [Usage] to the protobuf definition [snapshots.Usage].
+func UsageToProto(usage snapshots.Usage) *snapshotsapi.UsageResponse {
+	return &snapshotsapi.UsageResponse{
+		Inodes: usage.Inodes,
+		Size:   usage.Size,
+	}
+}

core/snapshots/proxy/proxy.go

@@ -50,14 +50,14 @@ func (p *proxySnapshotter) Stat(ctx context.Context, key string) (snapshots.Info
 	if err != nil {
 		return snapshots.Info{}, errdefs.FromGRPC(err)
 	}
-	return snapshots.InfoFromProto(resp.Info), nil
+	return InfoFromProto(resp.Info), nil
 }
 
 func (p *proxySnapshotter) Update(ctx context.Context, info snapshots.Info, fieldpaths ...string) (snapshots.Info, error) {
 	resp, err := p.client.Update(ctx,
 		&snapshotsapi.UpdateSnapshotRequest{
 			Snapshotter: p.snapshotterName,
-			Info:        snapshots.InfoToProto(info),
+			Info:        InfoToProto(info),
 			UpdateMask: &protobuftypes.FieldMask{
 				Paths: fieldpaths,
 			},
@@ -65,7 +65,7 @@ func (p *proxySnapshotter) Update(ctx context.Context, info snapshots.Info, fiel
 	if err != nil {
 		return snapshots.Info{}, errdefs.FromGRPC(err)
 	}
-	return snapshots.InfoFromProto(resp.Info), nil
+	return InfoFromProto(resp.Info), nil
 }
 
 func (p *proxySnapshotter) Usage(ctx context.Context, key string) (snapshots.Usage, error) {
@@ -76,7 +76,7 @@ func (p *proxySnapshotter) Usage(ctx context.Context, key string) (snapshots.Usa
 	if err != nil {
 		return snapshots.Usage{}, errdefs.FromGRPC(err)
 	}
-	return snapshots.UsageFromProto(resp), nil
+	return UsageFromProto(resp), nil
 }
 
 func (p *proxySnapshotter) Mounts(ctx context.Context, key string) ([]mount.Mount, error) {
@@ -172,7 +172,7 @@ func (p *proxySnapshotter) Walk(ctx context.Context, fn snapshots.WalkFunc, fs .
 			return nil
 		}
 		for _, info := range resp.Info {
-			if err := fn(ctx, snapshots.InfoFromProto(info)); err != nil {
+			if err := fn(ctx, InfoFromProto(info)); err != nil {
 				return err
 			}
 		}

core/snapshots/snapshotter.go

@@ -22,9 +22,7 @@ import (
 	"strings"
 	"time"
 
-	snapshotsapi "github.com/containerd/containerd/api/services/snapshots/v1"
 	"github.com/containerd/containerd/v2/core/mount"
-	"github.com/containerd/containerd/v2/pkg/protobuf"
 )
 
 const (
@@ -100,31 +98,6 @@ func (k *Kind) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// KindToProto converts from [Kind] to the protobuf definition [snapshots.Kind].
-func KindToProto(kind Kind) snapshotsapi.Kind {
-	switch kind {
-	case KindActive:
-		return snapshotsapi.Kind_ACTIVE
-	case KindView:
-		return snapshotsapi.Kind_VIEW
-	default:
-		return snapshotsapi.Kind_COMMITTED
-	}
-}
-
-// KindFromProto converts from the protobuf definition [snapshots.Kind] to
-// [Kind].
-func KindFromProto(kind snapshotsapi.Kind) Kind {
-	switch kind {
-	case snapshotsapi.Kind_ACTIVE:
-		return KindActive
-	case snapshotsapi.Kind_VIEW:
-		return KindView
-	default:
-		return KindCommitted
-	}
-}
-
 // Info provides information about a particular snapshot.
 // JSON marshalling is supported for interacting with tools like ctr,
 type Info struct {
@@ -141,31 +114,6 @@ type Info struct {
 	Updated time.Time         `json:",omitempty"` // Last update time
 }
 
-// InfoToProto converts from [Info] to the protobuf definition [snapshots.Info].
-func InfoToProto(info Info) *snapshotsapi.Info {
-	return &snapshotsapi.Info{
-		Name:      info.Name,
-		Parent:    info.Parent,
-		Kind:      KindToProto(info.Kind),
-		CreatedAt: protobuf.ToTimestamp(info.Created),
-		UpdatedAt: protobuf.ToTimestamp(info.Updated),
-		Labels:    info.Labels,
-	}
-}
-
-// InfoFromProto converts from the protobuf definition [snapshots.Info] to
-// [Info].
-func InfoFromProto(info *snapshotsapi.Info) Info {
-	return Info{
-		Name:    info.Name,
-		Parent:  info.Parent,
-		Kind:    KindFromProto(info.Kind),
-		Created: protobuf.FromTimestamp(info.CreatedAt),
-		Updated: protobuf.FromTimestamp(info.UpdatedAt),
-		Labels:  info.Labels,
-	}
-}
-
 // Usage defines statistics for disk resources consumed by the snapshot.
 //
 // These resources only include the resources consumed by the snapshot itself
@@ -185,23 +133,6 @@ func (u *Usage) Add(other Usage) {
 	u.Inodes += other.Inodes
 }
 
-// UsageFromProto converts from the protobuf definition [snapshots.Usage] to
-// [Usage].
-func UsageFromProto(resp *snapshotsapi.UsageResponse) Usage {
-	return Usage{
-		Inodes: resp.Inodes,
-		Size:   resp.Size,
-	}
-}
-
-// UsageToProto converts from [Usage] to the protobuf definition [snapshots.Usage].
-func UsageToProto(usage Usage) *snapshotsapi.UsageResponse {
-	return &snapshotsapi.UsageResponse{
-		Inodes: usage.Inodes,
-		Size:   usage.Size,
-	}
-}
-
 // WalkFunc defines the callback for a snapshot walk.
 type WalkFunc func(context.Context, Info) error
 

go.mod

@@ -149,3 +149,5 @@ require (
 	sigs.k8s.io/yaml v1.4.0 // indirect
 	tags.cncf.io/container-device-interface/specs-go v0.8.0 // indirect
 )
+
+replace github.com/containerd/containerd/api => ./api

go.sum

@@ -669,8 +669,6 @@ github.com/containerd/cgroups/v3 v3.0.3 h1:S5ByHZ/h9PMe5IOQoN7E+nMc2UcLEM/V48DGD
 github.com/containerd/cgroups/v3 v3.0.3/go.mod h1:8HBe7V3aWGLFPd/k03swSIsGjZhHI2WzJmticMgVuz0=
 github.com/containerd/console v1.0.4 h1:F2g4+oChYvBTsASRTz8NP6iIAi97J3TtSAsLbIFn4ro=
 github.com/containerd/console v1.0.4/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk=
-github.com/containerd/containerd/api v1.8.0-rc.3 h1:q9MyeXmuAGEyKmUGYvvFftNX1RQhfTLsAvYK+SQHQso=
-github.com/containerd/containerd/api v1.8.0-rc.3/go.mod h1:dFv4lt6S20wTu/hMcP4350RL87qPWLVa/OHOwmmdnYc=
 github.com/containerd/continuity v0.4.3 h1:6HVkalIp+2u1ZLH1J/pYX2oBVXlJZvh1X1A7bEZ9Su8=
 github.com/containerd/continuity v0.4.3/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ=
 github.com/containerd/errdefs v0.1.0 h1:m0wCRBiu1WJT/Fr+iOoQHMQS/eP5myQ8lCv4Dz5ZURM=

plugins/services/snapshots/service.go

@@ -22,6 +22,7 @@ import (
 	snapshotsapi "github.com/containerd/containerd/api/services/snapshots/v1"
 	"github.com/containerd/containerd/v2/core/mount"
 	"github.com/containerd/containerd/v2/core/snapshots"
+	"github.com/containerd/containerd/v2/core/snapshots/proxy"
 	ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
 	"github.com/containerd/containerd/v2/plugins"
 	"github.com/containerd/containerd/v2/plugins/services"
@@ -175,7 +176,7 @@ func (s *service) Stat(ctx context.Context, sr *snapshotsapi.StatSnapshotRequest
 		return nil, errdefs.ToGRPC(err)
 	}
 
-	return &snapshotsapi.StatSnapshotResponse{Info: snapshots.InfoToProto(info)}, nil
+	return &snapshotsapi.StatSnapshotResponse{Info: proxy.InfoToProto(info)}, nil
 }
 
 func (s *service) Update(ctx context.Context, sr *snapshotsapi.UpdateSnapshotRequest) (*snapshotsapi.UpdateSnapshotResponse, error) {
@@ -185,12 +186,12 @@ func (s *service) Update(ctx context.Context, sr *snapshotsapi.UpdateSnapshotReq
 		return nil, err
 	}
 
-	info, err := sn.Update(ctx, snapshots.InfoFromProto(sr.Info), sr.UpdateMask.GetPaths()...)
+	info, err := sn.Update(ctx, proxy.InfoFromProto(sr.Info), sr.UpdateMask.GetPaths()...)
 	if err != nil {
 		return nil, errdefs.ToGRPC(err)
 	}
 
-	return &snapshotsapi.UpdateSnapshotResponse{Info: snapshots.InfoToProto(info)}, nil
+	return &snapshotsapi.UpdateSnapshotResponse{Info: proxy.InfoToProto(info)}, nil
 }
 
 func (s *service) List(sr *snapshotsapi.ListSnapshotsRequest, ss snapshotsapi.Snapshots_ListServer) error {
@@ -208,7 +209,7 @@ func (s *service) List(sr *snapshotsapi.ListSnapshotsRequest, ss snapshotsapi.Sn
 		}
 	)
 	err = sn.Walk(ss.Context(), func(ctx context.Context, info snapshots.Info) error {
-		buffer = append(buffer, snapshots.InfoToProto(info))
+		buffer = append(buffer, proxy.InfoToProto(info))
 
 		if len(buffer) >= 100 {
 			if err := sendBlock(buffer); err != nil {
@@ -244,7 +245,7 @@ func (s *service) Usage(ctx context.Context, ur *snapshotsapi.UsageRequest) (*sn
 		return nil, errdefs.ToGRPC(err)
 	}
 
-	return snapshots.UsageToProto(usage), nil
+	return proxy.UsageToProto(usage), nil
 }
 
 func (s *service) Cleanup(ctx context.Context, cr *snapshotsapi.CleanupRequest) (*ptypes.Empty, error) {

vendor/github.com/containerd/containerd/api/LICENSE

@@ -1,191 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        https://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   Copyright The containerd 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
-
-       https://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.

vendor/github.com/containerd/containerd/api/runtime/sandbox/v1/sandbox_grpc.pb.go

@@ -1,3 +1,5 @@
+//go:build !no_grpc
+
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0

vendor/github.com/containerd/containerd/api/runtime/task/v3/shim_grpc.pb.go

@@ -1,3 +1,5 @@
+//go:build !no_grpc
+
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0

vendor/github.com/containerd/containerd/api/services/containers/v1/containers_grpc.pb.go

@@ -1,3 +1,5 @@
+//go:build !no_grpc
+
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0

vendor/github.com/containerd/containerd/api/services/content/v1/content_grpc.pb.go

@@ -1,3 +1,5 @@
+//go:build !no_grpc
+
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0

vendor/github.com/containerd/containerd/api/services/diff/v1/diff_grpc.pb.go

@@ -1,3 +1,5 @@
+//go:build !no_grpc
+
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0

vendor/github.com/containerd/containerd/api/services/events/v1/events_grpc.pb.go

@@ -1,3 +1,5 @@
+//go:build !no_grpc
+
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0

vendor/github.com/containerd/containerd/api/services/images/v1/images_grpc.pb.go

@@ -1,3 +1,5 @@
+//go:build !no_grpc
+
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0

vendor/github.com/containerd/containerd/api/services/introspection/v1/introspection_grpc.pb.go

@@ -1,3 +1,5 @@
+//go:build !no_grpc
+
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0

vendor/github.com/containerd/containerd/api/services/leases/v1/leases_grpc.pb.go

@@ -1,3 +1,5 @@
+//go:build !no_grpc
+
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0

vendor/github.com/containerd/containerd/api/services/namespaces/v1/namespace_grpc.pb.go

@@ -1,3 +1,5 @@
+//go:build !no_grpc
+
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0

vendor/github.com/containerd/containerd/api/services/sandbox/v1/sandbox_grpc.pb.go

@@ -1,3 +1,5 @@
+//go:build !no_grpc
+
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0

vendor/github.com/containerd/containerd/api/services/snapshots/v1/snapshots_grpc.pb.go

@@ -1,3 +1,5 @@
+//go:build !no_grpc
+
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0

vendor/github.com/containerd/containerd/api/services/streaming/v1/streaming_grpc.pb.go

@@ -1,3 +1,5 @@
+//go:build !no_grpc
+
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0

vendor/github.com/containerd/containerd/api/services/tasks/v1/tasks_grpc.pb.go

@@ -1,3 +1,5 @@
+//go:build !no_grpc
+
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0

vendor/github.com/containerd/containerd/api/services/transfer/v1/transfer_grpc.pb.go

@@ -1,3 +1,5 @@
+//go:build !no_grpc
+
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0

vendor/github.com/containerd/containerd/api/services/version/v1/version_grpc.pb.go

@@ -1,3 +1,5 @@
+//go:build !no_grpc
+
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0

vendor/modules.txt

@@ -105,7 +105,7 @@ github.com/containerd/cgroups/v3/cgroup2/stats
 # github.com/containerd/console v1.0.4
 ## explicit; go 1.13
 github.com/containerd/console
-# github.com/containerd/containerd/api v1.8.0-rc.3
+# github.com/containerd/containerd/api v1.8.0-rc.3 => ./api
 ## explicit; go 1.21
 github.com/containerd/containerd/api/events
 github.com/containerd/containerd/api/runtime/sandbox/v1
@@ -868,3 +868,4 @@ tags.cncf.io/container-device-interface/pkg/parser
 # tags.cncf.io/container-device-interface/specs-go v0.8.0
 ## explicit; go 1.19
 tags.cncf.io/container-device-interface/specs-go
+# github.com/containerd/containerd/api => ./api