From 00f182b8d3070d2c0a0334657fd58a284778ef83 Mon Sep 17 00:00:00 2001 From: Jon Johnson Date: Fri, 16 Aug 2024 11:37:27 -0700 Subject: [PATCH] Expose compare package (#2001) I've needed this outside of ggcr for a while but have been just making due without. Signed-off-by: Jon Johnson --- pkg/crane/crane_test.go | 2 +- pkg/legacy/tarball/write_test.go | 2 +- {internal => pkg/v1}/compare/doc.go | 0 {internal => pkg/v1}/compare/image.go | 0 {internal => pkg/v1}/compare/image_test.go | 0 {internal => pkg/v1}/compare/index.go | 0 {internal => pkg/v1}/compare/index_test.go | 0 {internal => pkg/v1}/compare/layer.go | 0 {internal => pkg/v1}/compare/layer_test.go | 0 pkg/v1/daemon/image_test.go | 2 +- pkg/v1/partial/compressed_test.go | 2 +- pkg/v1/partial/uncompressed_test.go | 2 +- pkg/v1/remote/layer_test.go | 2 +- pkg/v1/tarball/layer_test.go | 2 +- pkg/v1/tarball/write_test.go | 2 +- 15 files changed, 8 insertions(+), 8 deletions(-) rename {internal => pkg/v1}/compare/doc.go (100%) rename {internal => pkg/v1}/compare/image.go (100%) rename {internal => pkg/v1}/compare/image_test.go (100%) rename {internal => pkg/v1}/compare/index.go (100%) rename {internal => pkg/v1}/compare/index_test.go (100%) rename {internal => pkg/v1}/compare/layer.go (100%) rename {internal => pkg/v1}/compare/layer_test.go (100%) diff --git a/pkg/crane/crane_test.go b/pkg/crane/crane_test.go index 63dcc566a..b46205530 100644 --- a/pkg/crane/crane_test.go +++ b/pkg/crane/crane_test.go @@ -28,12 +28,12 @@ import ( "strings" "testing" - "github.com/google/go-containerregistry/internal/compare" "github.com/google/go-containerregistry/pkg/authn" "github.com/google/go-containerregistry/pkg/crane" "github.com/google/go-containerregistry/pkg/name" "github.com/google/go-containerregistry/pkg/registry" v1 "github.com/google/go-containerregistry/pkg/v1" + "github.com/google/go-containerregistry/pkg/v1/compare" "github.com/google/go-containerregistry/pkg/v1/empty" "github.com/google/go-containerregistry/pkg/v1/mutate" "github.com/google/go-containerregistry/pkg/v1/random" diff --git a/pkg/legacy/tarball/write_test.go b/pkg/legacy/tarball/write_test.go index 33e658ce0..8009ce6e2 100644 --- a/pkg/legacy/tarball/write_test.go +++ b/pkg/legacy/tarball/write_test.go @@ -24,9 +24,9 @@ import ( "strings" "testing" - "github.com/google/go-containerregistry/internal/compare" "github.com/google/go-containerregistry/pkg/name" v1 "github.com/google/go-containerregistry/pkg/v1" + "github.com/google/go-containerregistry/pkg/v1/compare" "github.com/google/go-containerregistry/pkg/v1/mutate" "github.com/google/go-containerregistry/pkg/v1/partial" "github.com/google/go-containerregistry/pkg/v1/random" diff --git a/internal/compare/doc.go b/pkg/v1/compare/doc.go similarity index 100% rename from internal/compare/doc.go rename to pkg/v1/compare/doc.go diff --git a/internal/compare/image.go b/pkg/v1/compare/image.go similarity index 100% rename from internal/compare/image.go rename to pkg/v1/compare/image.go diff --git a/internal/compare/image_test.go b/pkg/v1/compare/image_test.go similarity index 100% rename from internal/compare/image_test.go rename to pkg/v1/compare/image_test.go diff --git a/internal/compare/index.go b/pkg/v1/compare/index.go similarity index 100% rename from internal/compare/index.go rename to pkg/v1/compare/index.go diff --git a/internal/compare/index_test.go b/pkg/v1/compare/index_test.go similarity index 100% rename from internal/compare/index_test.go rename to pkg/v1/compare/index_test.go diff --git a/internal/compare/layer.go b/pkg/v1/compare/layer.go similarity index 100% rename from internal/compare/layer.go rename to pkg/v1/compare/layer.go diff --git a/internal/compare/layer_test.go b/pkg/v1/compare/layer_test.go similarity index 100% rename from internal/compare/layer_test.go rename to pkg/v1/compare/layer_test.go diff --git a/pkg/v1/daemon/image_test.go b/pkg/v1/daemon/image_test.go index b4795db3a..3dd49579e 100644 --- a/pkg/v1/daemon/image_test.go +++ b/pkg/v1/daemon/image_test.go @@ -27,8 +27,8 @@ import ( api "github.com/docker/docker/api/types/image" "github.com/docker/docker/api/types" - "github.com/google/go-containerregistry/internal/compare" "github.com/google/go-containerregistry/pkg/name" + "github.com/google/go-containerregistry/pkg/v1/compare" "github.com/google/go-containerregistry/pkg/v1/tarball" "github.com/google/go-containerregistry/pkg/v1/validate" ) diff --git a/pkg/v1/partial/compressed_test.go b/pkg/v1/partial/compressed_test.go index bf6bff494..4061db981 100644 --- a/pkg/v1/partial/compressed_test.go +++ b/pkg/v1/partial/compressed_test.go @@ -22,10 +22,10 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/google/go-containerregistry/internal/compare" "github.com/google/go-containerregistry/pkg/name" "github.com/google/go-containerregistry/pkg/registry" v1 "github.com/google/go-containerregistry/pkg/v1" + "github.com/google/go-containerregistry/pkg/v1/compare" "github.com/google/go-containerregistry/pkg/v1/partial" "github.com/google/go-containerregistry/pkg/v1/random" "github.com/google/go-containerregistry/pkg/v1/remote" diff --git a/pkg/v1/partial/uncompressed_test.go b/pkg/v1/partial/uncompressed_test.go index ce5a6fa23..6e1a89c51 100644 --- a/pkg/v1/partial/uncompressed_test.go +++ b/pkg/v1/partial/uncompressed_test.go @@ -19,10 +19,10 @@ import ( "os" "testing" - "github.com/google/go-containerregistry/internal/compare" legacy "github.com/google/go-containerregistry/pkg/legacy/tarball" "github.com/google/go-containerregistry/pkg/name" v1 "github.com/google/go-containerregistry/pkg/v1" + "github.com/google/go-containerregistry/pkg/v1/compare" "github.com/google/go-containerregistry/pkg/v1/mutate" "github.com/google/go-containerregistry/pkg/v1/partial" "github.com/google/go-containerregistry/pkg/v1/random" diff --git a/pkg/v1/remote/layer_test.go b/pkg/v1/remote/layer_test.go index a2f56bd41..fc1dc6759 100644 --- a/pkg/v1/remote/layer_test.go +++ b/pkg/v1/remote/layer_test.go @@ -20,9 +20,9 @@ import ( "net/url" "testing" - "github.com/google/go-containerregistry/internal/compare" "github.com/google/go-containerregistry/pkg/name" "github.com/google/go-containerregistry/pkg/registry" + "github.com/google/go-containerregistry/pkg/v1/compare" "github.com/google/go-containerregistry/pkg/v1/empty" "github.com/google/go-containerregistry/pkg/v1/mutate" "github.com/google/go-containerregistry/pkg/v1/partial" diff --git a/pkg/v1/tarball/layer_test.go b/pkg/v1/tarball/layer_test.go index 5d93360df..a808b5c24 100644 --- a/pkg/v1/tarball/layer_test.go +++ b/pkg/v1/tarball/layer_test.go @@ -22,9 +22,9 @@ import ( "testing" "github.com/containerd/stargz-snapshotter/estargz" - "github.com/google/go-containerregistry/internal/compare" "github.com/google/go-containerregistry/pkg/compression" v1 "github.com/google/go-containerregistry/pkg/v1" + "github.com/google/go-containerregistry/pkg/v1/compare" "github.com/google/go-containerregistry/pkg/v1/types" "github.com/google/go-containerregistry/pkg/v1/validate" ) diff --git a/pkg/v1/tarball/write_test.go b/pkg/v1/tarball/write_test.go index fdfe4994d..80cbb999a 100644 --- a/pkg/v1/tarball/write_test.go +++ b/pkg/v1/tarball/write_test.go @@ -25,9 +25,9 @@ import ( "strings" "testing" - "github.com/google/go-containerregistry/internal/compare" "github.com/google/go-containerregistry/pkg/name" v1 "github.com/google/go-containerregistry/pkg/v1" + "github.com/google/go-containerregistry/pkg/v1/compare" "github.com/google/go-containerregistry/pkg/v1/mutate" "github.com/google/go-containerregistry/pkg/v1/random" "github.com/google/go-containerregistry/pkg/v1/tarball"