From f295c9aa5c92a72828b5d08823537671156eaabb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Nov 2023 18:58:06 +0000 Subject: [PATCH 1/2] Bump github.com/docker/distribution Bumps [github.com/docker/distribution](https://github.com/docker/distribution) from 2.8.2+incompatible to 2.8.3+incompatible. - [Release notes](https://github.com/docker/distribution/releases) - [Commits](https://github.com/docker/distribution/compare/v2.8.2...v2.8.3) --- updated-dependencies: - dependency-name: github.com/docker/distribution dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 3 ++- go.sum | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index eced92f14..3227607df 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ toolchain go1.21.4 require ( github.com/avast/retry-go v3.0.0+incompatible - github.com/docker/distribution v2.8.2+incompatible + github.com/docker/distribution v2.8.3+incompatible github.com/docker/docker v24.0.7+incompatible github.com/equinix-labs/otel-init-go v0.0.9 github.com/go-logr/logr v1.4.1 @@ -55,6 +55,7 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/distribution/reference v0.5.0 // indirect github.com/docker/go-connections v0.4.0 // indirect github.com/docker/go-units v0.5.0 // indirect github.com/emicklei/go-restful/v3 v3.11.0 // indirect diff --git a/go.sum b/go.sum index e20609c56..ffc7d270c 100644 --- a/go.sum +++ b/go.sum @@ -326,8 +326,10 @@ github.com/dgryski/go-gk v0.0.0-20140819190930-201884a44051/go.mod h1:qm+vckxRlD github.com/dgryski/go-gk v0.0.0-20200319235926-a69029f61654/go.mod h1:qm+vckxRlDt0aOla0RYJJVeqHZlWfOm2UIxHaqPB46E= github.com/dgryski/go-lttb v0.0.0-20180810165845-318fcdf10a77/go.mod h1:Va5MyIzkU0rAM92tn3hb3Anb7oz7KcnixF49+2wOMe4= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= -github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= -github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0= +github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= +github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= +github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM= github.com/docker/docker v24.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= From 73d7ce190dbe04b76b51d015fc7cf2ccf95f6039 Mon Sep 17 00:00:00 2001 From: Chris Doherty Date: Fri, 12 Jan 2024 17:12:47 -0600 Subject: [PATCH 2/2] Change github.com/docker/distribution dep to github.com/distribution Signed-off-by: Chris Doherty --- go.mod | 7 ++----- internal/workflow/template_validator.go | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 3227607df..24fb94fe5 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ toolchain go1.21.4 require ( github.com/avast/retry-go v3.0.0+incompatible - github.com/docker/distribution v2.8.3+incompatible + github.com/distribution/reference v0.5.0 github.com/docker/docker v24.0.7+incompatible github.com/equinix-labs/otel-init-go v0.0.9 github.com/go-logr/logr v1.4.1 @@ -55,7 +55,7 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/distribution/reference v0.5.0 // indirect + github.com/docker/distribution v2.8.3+incompatible // indirect github.com/docker/go-connections v0.4.0 // indirect github.com/docker/go-units v0.5.0 // indirect github.com/emicklei/go-restful/v3 v3.11.0 // indirect @@ -130,6 +130,3 @@ require ( // package. This is a known issue with buf and is fixed in the latest version of buf. // This fix was found in https://github.com/aws-observability/aws-otel-collector/issues/926#issuecomment-1263065587 replace cloud.google.com/go => cloud.google.com/go v0.107.0 - -// 2.8.0+incompatible has incorrect checksums in the public sumdb. -exclude github.com/docker/distributions v2.8.0+incompatible diff --git a/internal/workflow/template_validator.go b/internal/workflow/template_validator.go index e8bac5954..6cb3df3be 100644 --- a/internal/workflow/template_validator.go +++ b/internal/workflow/template_validator.go @@ -5,7 +5,7 @@ import ( "fmt" "text/template" - "github.com/docker/distribution/reference" + "github.com/distribution/reference" "github.com/pkg/errors" "gopkg.in/yaml.v2" )