From 4263229a7b2775f4294cada91ccde988586019ff Mon Sep 17 00:00:00 2001 From: Shengjing Zhu Date: Thu, 16 Apr 2020 03:29:43 +0800 Subject: [PATCH] Replace docker/distribution/reference with containerd/reference/docker Since https://github.com/containerd/containerd/pull/3728 The docker/distribution/reference package is copied into containerd core Signed-off-by: Shengjing Zhu --- pkg/server/helpers.go | 16 ++++++++-------- pkg/server/helpers_test.go | 4 ++-- pkg/server/image_pull.go | 2 +- pkg/util/image.go | 8 ++++---- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkg/server/helpers.go b/pkg/server/helpers.go index 163629f8a..965d64a3f 100644 --- a/pkg/server/helpers.go +++ b/pkg/server/helpers.go @@ -28,10 +28,10 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/containers" "github.com/containerd/containerd/plugin" + "github.com/containerd/containerd/reference/docker" "github.com/containerd/containerd/runtime/linux/runctypes" runcoptions "github.com/containerd/containerd/runtime/v2/runc/options" "github.com/containerd/typeurl" - "github.com/docker/distribution/reference" imagedigest "github.com/opencontainers/go-digest" "github.com/pkg/errors" "golang.org/x/net/context" @@ -146,12 +146,12 @@ func criContainerStateToString(state runtime.ContainerState) string { } // getRepoDigestAngTag returns image repoDigest and repoTag of the named image reference. -func getRepoDigestAndTag(namedRef reference.Named, digest imagedigest.Digest, schema1 bool) (string, string) { +func getRepoDigestAndTag(namedRef docker.Named, digest imagedigest.Digest, schema1 bool) (string, string) { var repoTag, repoDigest string - if _, ok := namedRef.(reference.NamedTagged); ok { + if _, ok := namedRef.(docker.NamedTagged); ok { repoTag = namedRef.String() } - if _, ok := namedRef.(reference.Canonical); ok { + if _, ok := namedRef.(docker.Canonical); ok { repoDigest = namedRef.String() } else if !schema1 { // digest is not actual repo digest for schema1 image. @@ -170,7 +170,7 @@ func (c *criService) localResolve(refOrID string) (imagestore.Image, error) { return func(ref string) string { // ref is not image id, try to resolve it locally. // TODO(random-liu): Handle this error better for debugging. - normalized, err := reference.ParseDockerRef(ref) + normalized, err := docker.ParseDockerRef(ref) if err != nil { return "" } @@ -283,13 +283,13 @@ func toRuntimeAuthConfig(a criconfig.AuthConfig) *runtime.AuthConfig { func parseImageReferences(refs []string) ([]string, []string) { var tags, digests []string for _, ref := range refs { - parsed, err := reference.ParseAnyReference(ref) + parsed, err := docker.ParseAnyReference(ref) if err != nil { continue } - if _, ok := parsed.(reference.Canonical); ok { + if _, ok := parsed.(docker.Canonical); ok { digests = append(digests, parsed.String()) - } else if _, ok := parsed.(reference.Tagged); ok { + } else if _, ok := parsed.(docker.Tagged); ok { tags = append(tags, parsed.String()) } } diff --git a/pkg/server/helpers_test.go b/pkg/server/helpers_test.go index de5bd9e1a..a67f587fa 100644 --- a/pkg/server/helpers_test.go +++ b/pkg/server/helpers_test.go @@ -24,9 +24,9 @@ import ( "github.com/BurntSushi/toml" "github.com/containerd/containerd/oci" "github.com/containerd/containerd/plugin" + "github.com/containerd/containerd/reference/docker" "github.com/containerd/containerd/runtime/linux/runctypes" runcoptions "github.com/containerd/containerd/runtime/v2/runc/options" - "github.com/docker/distribution/reference" imagedigest "github.com/opencontainers/go-digest" runtimespec "github.com/opencontainers/runtime-spec/specs-go" "github.com/stretchr/testify/assert" @@ -107,7 +107,7 @@ func TestGetRepoDigestAndTag(t *testing.T) { }, } { t.Logf("TestCase %q", desc) - named, err := reference.ParseDockerRef(test.ref) + named, err := docker.ParseDockerRef(test.ref) assert.NoError(t, err) repoDigest, repoTag := getRepoDigestAndTag(named, digest, test.schema1) assert.Equal(t, test.expectedRepoDigest, repoDigest) diff --git a/pkg/server/image_pull.go b/pkg/server/image_pull.go index 5e2df2b24..d2457a267 100644 --- a/pkg/server/image_pull.go +++ b/pkg/server/image_pull.go @@ -31,10 +31,10 @@ import ( "github.com/containerd/containerd/errdefs" containerdimages "github.com/containerd/containerd/images" "github.com/containerd/containerd/log" + distribution "github.com/containerd/containerd/reference/docker" "github.com/containerd/containerd/remotes/docker" "github.com/containerd/imgcrypt" "github.com/containerd/imgcrypt/images/encryption" - distribution "github.com/docker/distribution/reference" imagespec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" "golang.org/x/net/context" diff --git a/pkg/util/image.go b/pkg/util/image.go index 3a9883604..f046a8c9d 100644 --- a/pkg/util/image.go +++ b/pkg/util/image.go @@ -17,7 +17,7 @@ limitations under the License. package util import ( - "github.com/docker/distribution/reference" + "github.com/containerd/containerd/reference/docker" ) // NormalizeImageRef normalizes the image reference following the docker convention. This is added @@ -27,7 +27,7 @@ import ( // sha256:7cc4b5aefd1d0cadf8d97d4350462ba51c694ebca145b08d7d41b41acc8db5aa will be returned as // docker.io/library/busybox@sha256:7cc4b5aefd1d0cadf8d97d4350462ba51c694ebca145b08d7d41b41acc8db5aa. // -// Deprecated: use github.com/docker/reference.ParseDockerRef() instead -func NormalizeImageRef(ref string) (reference.Named, error) { - return reference.ParseDockerRef(ref) +// Deprecated: use github.com/containerd/containerd/reference/docker.ParseDockerRef() instead +func NormalizeImageRef(ref string) (docker.Named, error) { + return docker.ParseDockerRef(ref) }