From a0230f3d9a1f650c06142a2865f8aed08e3a7f0d Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 4 Mar 2022 14:49:42 +0100 Subject: remove unneeded "digest" alias for "go-digest" I think this was there for historic reasons (may have been goimports expected this, and we used to have a linter that wanted it), but it's not needed, so let's remove it (to make my IDE less complaining about unneeded aliases). Signed-off-by: Sebastiaan van Stijn --- distribution/config.go | 2 +- distribution/manifest.go | 2 +- distribution/manifest_test.go | 2 +- distribution/metadata/v2_metadata_service.go | 2 +- distribution/metadata/v2_metadata_service_test.go | 2 +- distribution/pull.go | 2 +- distribution/pull_v2.go | 2 +- distribution/pull_v2_test.go | 2 +- distribution/push_v2.go | 2 +- distribution/push_v2_test.go | 2 +- distribution/xfer/download_test.go | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) (limited to 'distribution') diff --git a/distribution/config.go b/distribution/config.go index ead0bba904..af6a497b98 100644 --- a/distribution/config.go +++ b/distribution/config.go @@ -18,7 +18,7 @@ import ( refstore "github.com/docker/docker/reference" "github.com/docker/docker/registry" "github.com/docker/libtrust" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" ) diff --git a/distribution/manifest.go b/distribution/manifest.go index ff6cf4bcf3..1e8e32cb63 100644 --- a/distribution/manifest.go +++ b/distribution/manifest.go @@ -14,7 +14,7 @@ import ( "github.com/docker/distribution/manifest/manifestlist" "github.com/docker/distribution/manifest/schema1" "github.com/docker/distribution/manifest/schema2" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" ) diff --git a/distribution/manifest_test.go b/distribution/manifest_test.go index 3aac85c5fe..2edaa762aa 100644 --- a/distribution/manifest_test.go +++ b/distribution/manifest_test.go @@ -18,7 +18,7 @@ import ( "github.com/docker/distribution/manifest/schema1" "github.com/docker/distribution/manifest/schema2" "github.com/google/go-cmp/cmp/cmpopts" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" "gotest.tools/v3/assert" diff --git a/distribution/metadata/v2_metadata_service.go b/distribution/metadata/v2_metadata_service.go index 482d2224ea..fe33498554 100644 --- a/distribution/metadata/v2_metadata_service.go +++ b/distribution/metadata/v2_metadata_service.go @@ -9,7 +9,7 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/layer" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" ) // V2MetadataService maps layer IDs to a set of known metadata for diff --git a/distribution/metadata/v2_metadata_service_test.go b/distribution/metadata/v2_metadata_service_test.go index ca54eaed98..94d0f0b9c3 100644 --- a/distribution/metadata/v2_metadata_service_test.go +++ b/distribution/metadata/v2_metadata_service_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/docker/docker/layer" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" ) func TestV2MetadataService(t *testing.T) { diff --git a/distribution/pull.go b/distribution/pull.go index 829c5fed6a..e86205bf70 100644 --- a/distribution/pull.go +++ b/distribution/pull.go @@ -10,7 +10,7 @@ import ( "github.com/docker/docker/pkg/progress" refstore "github.com/docker/docker/reference" "github.com/docker/docker/registry" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/distribution/pull_v2.go b/distribution/pull_v2.go index 07cc1e5b86..ed7482e063 100644 --- a/distribution/pull_v2.go +++ b/distribution/pull_v2.go @@ -28,7 +28,7 @@ import ( "github.com/docker/docker/pkg/system" refstore "github.com/docker/docker/reference" "github.com/docker/docker/registry" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/distribution/pull_v2_test.go b/distribution/pull_v2_test.go index ac42858a7a..0079544c6f 100644 --- a/distribution/pull_v2_test.go +++ b/distribution/pull_v2_test.go @@ -12,7 +12,7 @@ import ( "github.com/docker/distribution/manifest/schema1" "github.com/docker/distribution/reference" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go/v1" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/distribution/push_v2.go b/distribution/push_v2.go index 4a58527c8b..4aa4f60175 100644 --- a/distribution/push_v2.go +++ b/distribution/push_v2.go @@ -24,7 +24,7 @@ import ( "github.com/docker/docker/pkg/progress" "github.com/docker/docker/pkg/stringid" "github.com/docker/docker/registry" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/distribution/push_v2_test.go b/distribution/push_v2_test.go index 99d29f0802..ea7ce00ec8 100644 --- a/distribution/push_v2_test.go +++ b/distribution/push_v2_test.go @@ -17,7 +17,7 @@ import ( "github.com/docker/docker/pkg/progress" refstore "github.com/docker/docker/reference" "github.com/docker/docker/registry" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" ) func TestGetRepositoryMountCandidates(t *testing.T) { diff --git a/distribution/xfer/download_test.go b/distribution/xfer/download_test.go index 6b2b83d71e..3b4a6a9df9 100644 --- a/distribution/xfer/download_test.go +++ b/distribution/xfer/download_test.go @@ -15,7 +15,7 @@ import ( "github.com/docker/docker/image" "github.com/docker/docker/layer" "github.com/docker/docker/pkg/progress" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" "gotest.tools/v3/assert" ) -- cgit v1.2.1