From b7053cad8e09e94d006cecb2362c64f23d62aab7 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 21 Oct 2022 03:25:59 +0200 Subject: [PATCH] go mod: tidy and group "require" blocks, update comments The file had multiple "requires" blocks, which made it harder to find which dependencies were used. Some direct modules also were in the "indirect" block. While updating, also updated some comments. Signed-off-by: Sebastiaan van Stijn --- e2e/go.mod | 16 ++++++++-------- go.mod | 48 ++++++++++++++++++++++-------------------------- 2 files changed, 30 insertions(+), 34 deletions(-) diff --git a/e2e/go.mod b/e2e/go.mod index 031ae6be3..d3f6b6fa7 100644 --- a/e2e/go.mod +++ b/e2e/go.mod @@ -8,7 +8,7 @@ replace github.com/cucumber/godog => github.com/laurazard/godog v0.0.0-202209220 require ( github.com/cucumber/godog v0.12.5 - github.com/docker/compose/v2 v2.11.1 + github.com/docker/compose/v2 v2.11.1 // replaced; see replace rule for actual version gotest.tools/v3 v3.4.0 ) @@ -35,9 +35,9 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/distribution/distribution/v3 v3.0.0-20220907155224-78b9c98c5c31 // indirect github.com/docker/buildx v0.9.1 // indirect - github.com/docker/cli v20.10.19+incompatible // indirect + github.com/docker/cli v20.10.20+incompatible // indirect; replaced; see replace rule for actual version github.com/docker/distribution v2.8.1+incompatible // indirect - github.com/docker/docker v20.10.19+incompatible // indirect + github.com/docker/docker v20.10.20+incompatible // indirect; replaced; see replace rule for actual version github.com/docker/docker-credential-helpers v0.6.4 // indirect github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect github.com/docker/go-connections v0.4.0 // indirect @@ -79,7 +79,7 @@ require ( github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect github.com/miekg/pkcs11 v1.1.1 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect - github.com/moby/buildkit v0.10.4 // indirect + github.com/moby/buildkit v0.10.4 // indirect; replaced; see replace rule for actual version github.com/moby/locker v1.0.1 // indirect github.com/moby/patternmatcher v0.5.0 // indirect github.com/moby/spdystream v0.2.0 // indirect @@ -144,9 +144,9 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/api v0.24.1 // indirect - k8s.io/apimachinery v0.24.1 // indirect - k8s.io/client-go v0.24.1 // indirect + k8s.io/api v0.24.1 // indirect; replaced; see replace rule for actual version + k8s.io/apimachinery v0.24.1 // indirect; replaced; see replace rule for actual version + k8s.io/client-go v0.24.1 // indirect; replaced; see replace rule for actual version k8s.io/klog/v2 v2.60.1 // indirect k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect @@ -164,7 +164,7 @@ replace ( // upgraded to the version specified in containerd, which is not relevant to the // version needed. // See https://github.com/docker/buildx/pull/948 for details. - // https://github.com/docker/buildx/blob/v0.8.1/go.mod#L62-L64 + // https://github.com/docker/buildx/blob/v0.9.1/go.mod#L62-L64 k8s.io/api => k8s.io/api v0.22.4 k8s.io/apimachinery => k8s.io/apimachinery v0.22.4 k8s.io/client-go => k8s.io/client-go v0.22.4 diff --git a/go.mod b/go.mod index b50fd255e..033f66a75 100644 --- a/go.mod +++ b/go.mod @@ -11,9 +11,9 @@ require ( github.com/containerd/containerd v1.6.8 github.com/distribution/distribution/v3 v3.0.0-20220907155224-78b9c98c5c31 github.com/docker/buildx v0.9.1 // when updating, also update the replace rules accordingly - github.com/docker/cli v20.10.19+incompatible + github.com/docker/cli v20.10.20+incompatible // replaced; see replace rule for actual version github.com/docker/cli-docs-tool v0.5.0 - github.com/docker/docker v20.10.19+incompatible + github.com/docker/docker v20.10.20+incompatible // replaced; see replace rule for actual version github.com/docker/go-connections v0.4.0 github.com/docker/go-units v0.5.0 github.com/golang/mock v1.6.0 @@ -21,7 +21,7 @@ require ( github.com/hashicorp/go-version v1.6.0 github.com/mattn/go-isatty v0.0.16 github.com/mattn/go-shellwords v1.0.12 - github.com/moby/buildkit v0.10.4 + github.com/moby/buildkit v0.10.4 // replaced; see replace rule for actual version github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae github.com/morikuni/aec v1.0.0 github.com/opencontainers/go-digest v1.0.0 @@ -32,10 +32,12 @@ require ( github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.0 github.com/theupdateframework/notary v0.7.0 + go.opentelemetry.io/otel v1.11.1 golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde gopkg.in/yaml.v2 v2.4.0 gotest.tools v2.2.0+incompatible gotest.tools/v3 v3.4.0 + k8s.io/client-go v0.24.1 // replaced; see replace for the actual version used ) require ( @@ -43,11 +45,13 @@ require ( github.com/Masterminds/semver v1.5.0 // indirect github.com/Microsoft/go-winio v0.5.2 // indirect github.com/beorn7/perks v1.0.1 // indirect + github.com/cenkalti/backoff/v4 v4.1.2 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/cnabio/cnab-go v0.23.4 // indirect github.com/containerd/continuity v0.3.0 // indirect github.com/containerd/ttrpc v1.1.0 // indirect github.com/containerd/typeurl v1.0.2 // indirect + github.com/cyberphone/json-canonicalization v0.0.0-20210303052042-6bc126869bf4 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/docker/distribution v2.8.1+incompatible // indirect github.com/docker/docker-credential-helpers v0.6.4 // indirect @@ -64,6 +68,7 @@ require ( github.com/google/go-cmp v0.5.9 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect + github.com/googleapis/gnostic v0.5.5 // indirect github.com/gorilla/mux v1.8.0 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect @@ -74,11 +79,15 @@ require ( github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect github.com/klauspost/compress v1.15.9 // indirect github.com/mattn/go-colorable v0.1.12 // indirect + github.com/mattn/go-runewidth v0.0.14 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect github.com/miekg/pkcs11 v1.1.1 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/moby/locker v1.0.1 // indirect + github.com/moby/patternmatcher v0.5.0 // indirect + github.com/moby/spdystream v0.2.0 // indirect + github.com/moby/sys/sequential v0.5.0 // indirect github.com/moby/sys/signal v0.7.0 // indirect github.com/moby/sys/symlink v0.2.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect @@ -92,17 +101,23 @@ require ( github.com/prometheus/procfs v0.7.3 // indirect github.com/qri-io/jsonpointer v0.1.1 // indirect github.com/qri-io/jsonschema v0.2.2-0.20210831022256-780655b2ba0e // indirect + github.com/rivo/uniseg v0.2.0 // indirect + github.com/serialx/hashring v0.0.0-20190422032157-8b2912629002 // indirect github.com/tonistiigi/fsutil v0.0.0-20220930225714-4638ad635be5 // indirect github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea // indirect github.com/tonistiigi/vt100 v0.0.0-20210615222946-8066bb97264f // indirect github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/xeipuuv/gojsonschema v1.2.0 // indirect + github.com/zmap/zcrypto v0.0.0-20220605182715-4dfcec6e9a8c // indirect + github.com/zmap/zlint v1.1.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.29.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect - go.opentelemetry.io/otel v1.11.1 + go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.4.1 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.4.1 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.4.1 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.4.1 // indirect go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect go.opentelemetry.io/otel/sdk v1.4.1 // indirect @@ -121,44 +136,25 @@ require ( google.golang.org/protobuf v1.27.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/apimachinery v0.24.1 // indirect; see replace for the actual version used - k8s.io/client-go v0.24.1 // see replace for the actual version used + k8s.io/api v0.24.1 // indirect; replaced; see replace for the actual version used + k8s.io/apimachinery v0.24.1 // indirect; replaced; see replace for the actual version used k8s.io/klog/v2 v2.60.1 // indirect k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect sigs.k8s.io/yaml v1.2.0 // indirect ) -require ( - github.com/cenkalti/backoff/v4 v4.1.2 // indirect - github.com/cyberphone/json-canonicalization v0.0.0-20210303052042-6bc126869bf4 // indirect - github.com/googleapis/gnostic v0.5.5 // indirect - github.com/mattn/go-runewidth v0.0.14 // indirect - github.com/moby/patternmatcher v0.5.0 // indirect - github.com/moby/spdystream v0.2.0 // indirect - github.com/moby/sys/sequential v0.5.0 // indirect - github.com/rivo/uniseg v0.2.0 // indirect - github.com/serialx/hashring v0.0.0-20190422032157-8b2912629002 // indirect - github.com/zmap/zcrypto v0.0.0-20220605182715-4dfcec6e9a8c // indirect - github.com/zmap/zlint v1.1.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.4.1 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.4.1 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.4.1 // indirect - k8s.io/api v0.24.1 // indirect -) - replace ( github.com/docker/cli => github.com/docker/cli v20.10.3-0.20221013132413-1d6c6e2367e2+incompatible // 22.06 master branch github.com/docker/docker => github.com/docker/docker v20.10.3-0.20221013203545-33ab36d6b304+incompatible // 22.06 branch github.com/moby/buildkit => github.com/moby/buildkit v0.10.1-0.20220816171719-55ba9d14360a // same as buildx - github.com/opencontainers/runc => github.com/opencontainers/runc v1.1.2 // Can be removed on next bump of containerd to > 1.6.4 // For k8s dependencies, we use a replace directive, to prevent them being // upgraded to the version specified in containerd, which is not relevant to the // version needed. // See https://github.com/docker/buildx/pull/948 for details. - // https://github.com/docker/buildx/blob/v0.8.1/go.mod#L62-L64 + // https://github.com/docker/buildx/blob/v0.9.1/go.mod#L62-L64 k8s.io/api => k8s.io/api v0.22.4 k8s.io/apimachinery => k8s.io/apimachinery v0.22.4 k8s.io/client-go => k8s.io/client-go v0.22.4