From e0eda868fe54842842b598f92e7102024dda31e7 Mon Sep 17 00:00:00 2001 From: Benjamin Grandfond Date: Wed, 6 Apr 2022 14:04:22 +0200 Subject: [PATCH] Remove the go.mod stub file after vendors have been updated, validated or outdated vendors listed. This helps to avoid `go build` to fail because of unconsistencies between go.mod and vendor/modules.txt files. Signed-off-by: Benjamin Grandfond --- scripts/vendor | 7 + vendor/modules.txt | 388 --------------------------------------------- 2 files changed, 7 insertions(+), 388 deletions(-) delete mode 100644 vendor/modules.txt diff --git a/scripts/vendor b/scripts/vendor index c8f5bc3ff732..ec2994678541 100755 --- a/scripts/vendor +++ b/scripts/vendor @@ -13,6 +13,10 @@ if [ -z "$TYP" ]; then usage fi +clear() { + rm go.mod +} + init() { # create dummy go.mod, see comment in vendor.mod cat > go.mod <&2 "Unknown type $TYP" diff --git a/vendor/modules.txt b/vendor/modules.txt deleted file mode 100644 index 822b8e43ac98..000000000000 --- a/vendor/modules.txt +++ /dev/null @@ -1,388 +0,0 @@ -# github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 -## explicit; go 1.16 -github.com/Azure/go-ansiterm -github.com/Azure/go-ansiterm/winterm -# github.com/Microsoft/go-winio v0.5.1 -## explicit; go 1.12 -github.com/Microsoft/go-winio -github.com/Microsoft/go-winio/pkg/guid -# github.com/beorn7/perks v1.0.1 -## explicit; go 1.11 -github.com/beorn7/perks/quantile -# github.com/cespare/xxhash/v2 v2.1.2 -## explicit; go 1.11 -github.com/cespare/xxhash/v2 -# github.com/containerd/containerd v1.6.2 -## explicit; go 1.17 -github.com/containerd/containerd/errdefs -github.com/containerd/containerd/log -github.com/containerd/containerd/pkg/userns -github.com/containerd/containerd/platforms -# github.com/creack/pty v1.1.11 -## explicit; go 1.13 -github.com/creack/pty -# github.com/docker/distribution v2.8.1+incompatible -## explicit -github.com/docker/distribution -github.com/docker/distribution/digestset -github.com/docker/distribution/manifest -github.com/docker/distribution/manifest/manifestlist -github.com/docker/distribution/manifest/schema2 -github.com/docker/distribution/metrics -github.com/docker/distribution/reference -github.com/docker/distribution/registry/api/errcode -github.com/docker/distribution/registry/api/v2 -github.com/docker/distribution/registry/client -github.com/docker/distribution/registry/client/auth -github.com/docker/distribution/registry/client/auth/challenge -github.com/docker/distribution/registry/client/transport -github.com/docker/distribution/registry/storage/cache -github.com/docker/distribution/registry/storage/cache/memory -github.com/docker/distribution/uuid -# github.com/docker/docker v20.10.14+incompatible => github.com/docker/docker v20.10.3-0.20220326171151-8941dcfcc5db+incompatible -## explicit -github.com/docker/docker/api -github.com/docker/docker/api/types -github.com/docker/docker/api/types/blkiodev -github.com/docker/docker/api/types/container -github.com/docker/docker/api/types/events -github.com/docker/docker/api/types/filters -github.com/docker/docker/api/types/image -github.com/docker/docker/api/types/mount -github.com/docker/docker/api/types/network -github.com/docker/docker/api/types/registry -github.com/docker/docker/api/types/strslice -github.com/docker/docker/api/types/swarm -github.com/docker/docker/api/types/swarm/runtime -github.com/docker/docker/api/types/time -github.com/docker/docker/api/types/versions -github.com/docker/docker/api/types/volume -github.com/docker/docker/builder/remotecontext/git -github.com/docker/docker/client -github.com/docker/docker/errdefs -github.com/docker/docker/pkg/archive -github.com/docker/docker/pkg/fileutils -github.com/docker/docker/pkg/homedir -github.com/docker/docker/pkg/idtools -github.com/docker/docker/pkg/ioutils -github.com/docker/docker/pkg/jsonmessage -github.com/docker/docker/pkg/longpath -github.com/docker/docker/pkg/pools -github.com/docker/docker/pkg/progress -github.com/docker/docker/pkg/stdcopy -github.com/docker/docker/pkg/streamformatter -github.com/docker/docker/pkg/stringid -github.com/docker/docker/pkg/system -github.com/docker/docker/pkg/urlutil -github.com/docker/docker/registry -# github.com/docker/docker-credential-helpers v0.6.4 -## explicit; go 1.13 -github.com/docker/docker-credential-helpers/client -github.com/docker/docker-credential-helpers/credentials -# github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c -## explicit -github.com/docker/go/canonical/json -# github.com/docker/go-connections v0.4.0 -## explicit -github.com/docker/go-connections/nat -github.com/docker/go-connections/sockets -github.com/docker/go-connections/tlsconfig -# github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c -## explicit -github.com/docker/go-events -# github.com/docker/go-metrics v0.0.1 -## explicit; go 1.11 -github.com/docker/go-metrics -# github.com/docker/go-units v0.4.0 -## explicit -github.com/docker/go-units -# github.com/docker/swarmkit v1.12.1-0.20220307221335-616e8db4c3b0 -## explicit -github.com/docker/swarmkit/api -github.com/docker/swarmkit/api/deepcopy -github.com/docker/swarmkit/api/defaults -github.com/docker/swarmkit/api/genericresource -github.com/docker/swarmkit/manager/raftselector -github.com/docker/swarmkit/protobuf/plugin -# github.com/fvbommel/sortorder v1.0.2 -## explicit; go 1.13 -github.com/fvbommel/sortorder -# github.com/gogo/protobuf v1.3.2 -## explicit; go 1.15 -github.com/gogo/protobuf/gogoproto -github.com/gogo/protobuf/proto -github.com/gogo/protobuf/protoc-gen-gogo/descriptor -github.com/gogo/protobuf/sortkeys -github.com/gogo/protobuf/types -# github.com/golang/protobuf v1.5.2 -## explicit; go 1.9 -github.com/golang/protobuf/proto -github.com/golang/protobuf/ptypes -github.com/golang/protobuf/ptypes/any -github.com/golang/protobuf/ptypes/duration -github.com/golang/protobuf/ptypes/timestamp -# github.com/google/go-cmp v0.5.7 -## explicit; go 1.11 -github.com/google/go-cmp/cmp -github.com/google/go-cmp/cmp/cmpopts -github.com/google/go-cmp/cmp/internal/diff -github.com/google/go-cmp/cmp/internal/flags -github.com/google/go-cmp/cmp/internal/function -github.com/google/go-cmp/cmp/internal/value -# github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 -## explicit; go 1.13 -github.com/google/shlex -# github.com/gorilla/mux v1.8.0 -## explicit; go 1.12 -github.com/gorilla/mux -# github.com/imdario/mergo v0.3.12 -## explicit; go 1.13 -github.com/imdario/mergo -# github.com/inconshreveable/mousetrap v1.0.0 -## explicit -github.com/inconshreveable/mousetrap -# github.com/klauspost/compress v1.15.0 -## explicit; go 1.15 -github.com/klauspost/compress -github.com/klauspost/compress/fse -github.com/klauspost/compress/huff0 -github.com/klauspost/compress/internal/snapref -github.com/klauspost/compress/zstd -github.com/klauspost/compress/zstd/internal/xxhash -# github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 -## explicit; go 1.9 -github.com/matttproud/golang_protobuf_extensions/pbutil -# github.com/miekg/pkcs11 v1.0.3 -## explicit; go 1.12 -github.com/miekg/pkcs11 -# github.com/mitchellh/mapstructure v1.3.2 -## explicit; go 1.14 -github.com/mitchellh/mapstructure -# github.com/moby/buildkit v0.10.0 -## explicit; go 1.17 -github.com/moby/buildkit/frontend/dockerfile/dockerignore -github.com/moby/buildkit/util/appcontext -# github.com/moby/sys/signal v0.7.0 -## explicit; go 1.16 -github.com/moby/sys/signal -# github.com/moby/sys/symlink v0.2.0 -## explicit; go 1.16 -github.com/moby/sys/symlink -# github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 -## explicit; go 1.13 -github.com/moby/term -github.com/moby/term/windows -# github.com/morikuni/aec v1.0.0 -## explicit -github.com/morikuni/aec -# github.com/opencontainers/go-digest v1.0.0 -## explicit; go 1.13 -github.com/opencontainers/go-digest -# github.com/opencontainers/image-spec v1.0.2 -## explicit -github.com/opencontainers/image-spec/specs-go -github.com/opencontainers/image-spec/specs-go/v1 -# github.com/opencontainers/runc v1.1.0 -## explicit; go 1.16 -github.com/opencontainers/runc/libcontainer/user -# github.com/pkg/errors v0.9.1 -## explicit -github.com/pkg/errors -# github.com/prometheus/client_golang v1.12.1 -## explicit; go 1.13 -github.com/prometheus/client_golang/prometheus -github.com/prometheus/client_golang/prometheus/internal -github.com/prometheus/client_golang/prometheus/promhttp -# github.com/prometheus/client_model v0.2.0 -## explicit; go 1.9 -github.com/prometheus/client_model/go -# github.com/prometheus/common v0.32.1 -## explicit; go 1.13 -github.com/prometheus/common/expfmt -github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg -github.com/prometheus/common/model -# github.com/prometheus/procfs v0.7.3 -## explicit; go 1.13 -github.com/prometheus/procfs -github.com/prometheus/procfs/internal/fs -github.com/prometheus/procfs/internal/util -# github.com/sirupsen/logrus v1.8.1 -## explicit; go 1.13 -github.com/sirupsen/logrus -# github.com/spf13/cobra v1.4.0 -## explicit; go 1.15 -github.com/spf13/cobra -# github.com/spf13/pflag v1.0.5 -## explicit; go 1.12 -github.com/spf13/pflag -# github.com/theupdateframework/notary v0.7.1-0.20210315103452-bf96a202a09a -## explicit; go 1.12 -github.com/theupdateframework/notary -github.com/theupdateframework/notary/client -github.com/theupdateframework/notary/client/changelist -github.com/theupdateframework/notary/cryptoservice -github.com/theupdateframework/notary/passphrase -github.com/theupdateframework/notary/storage -github.com/theupdateframework/notary/trustmanager -github.com/theupdateframework/notary/trustmanager/yubikey -github.com/theupdateframework/notary/trustpinning -github.com/theupdateframework/notary/tuf -github.com/theupdateframework/notary/tuf/data -github.com/theupdateframework/notary/tuf/signed -github.com/theupdateframework/notary/tuf/utils -github.com/theupdateframework/notary/tuf/validation -# github.com/tonistiigi/go-rosetta v0.0.0-20200727161949-f79598599c5d -## explicit; go 1.13 -github.com/tonistiigi/go-rosetta -# github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb -## explicit -github.com/xeipuuv/gojsonpointer -# github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 -## explicit -github.com/xeipuuv/gojsonreference -# github.com/xeipuuv/gojsonschema v1.2.0 -## explicit -github.com/xeipuuv/gojsonschema -# go.etcd.io/etcd/raft/v3 v3.5.2 -## explicit; go 1.16 -go.etcd.io/etcd/raft/v3/raftpb -# golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd -## explicit; go 1.17 -golang.org/x/crypto/ed25519 -golang.org/x/crypto/pbkdf2 -# golang.org/x/net v0.0.0-20211216030914-fe4d6282115f -## explicit; go 1.17 -golang.org/x/net/http/httpguts -golang.org/x/net/http2 -golang.org/x/net/http2/hpack -golang.org/x/net/idna -golang.org/x/net/internal/socks -golang.org/x/net/internal/timeseries -golang.org/x/net/proxy -golang.org/x/net/trace -# golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 -## explicit; go 1.17 -golang.org/x/sys/execabs -golang.org/x/sys/internal/unsafeheader -golang.org/x/sys/plan9 -golang.org/x/sys/unix -golang.org/x/sys/windows -# golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b -## explicit; go 1.17 -golang.org/x/term -# golang.org/x/text v0.3.7 -## explicit; go 1.17 -golang.org/x/text/secure/bidirule -golang.org/x/text/transform -golang.org/x/text/unicode/bidi -golang.org/x/text/unicode/norm -golang.org/x/text/width -# golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac -## explicit -golang.org/x/time/rate -# golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 -## explicit; go 1.11 -golang.org/x/xerrors -golang.org/x/xerrors/internal -# google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa -## explicit; go 1.11 -google.golang.org/genproto/googleapis/rpc/status -# google.golang.org/grpc v1.44.0 -## explicit; go 1.14 -google.golang.org/grpc -google.golang.org/grpc/attributes -google.golang.org/grpc/backoff -google.golang.org/grpc/balancer -google.golang.org/grpc/balancer/base -google.golang.org/grpc/balancer/grpclb/state -google.golang.org/grpc/balancer/roundrobin -google.golang.org/grpc/binarylog/grpc_binarylog_v1 -google.golang.org/grpc/codes -google.golang.org/grpc/connectivity -google.golang.org/grpc/credentials -google.golang.org/grpc/credentials/insecure -google.golang.org/grpc/encoding -google.golang.org/grpc/encoding/proto -google.golang.org/grpc/grpclog -google.golang.org/grpc/internal -google.golang.org/grpc/internal/backoff -google.golang.org/grpc/internal/balancerload -google.golang.org/grpc/internal/binarylog -google.golang.org/grpc/internal/buffer -google.golang.org/grpc/internal/channelz -google.golang.org/grpc/internal/credentials -google.golang.org/grpc/internal/envconfig -google.golang.org/grpc/internal/grpclog -google.golang.org/grpc/internal/grpcrand -google.golang.org/grpc/internal/grpcsync -google.golang.org/grpc/internal/grpcutil -google.golang.org/grpc/internal/metadata -google.golang.org/grpc/internal/resolver -google.golang.org/grpc/internal/resolver/dns -google.golang.org/grpc/internal/resolver/passthrough -google.golang.org/grpc/internal/resolver/unix -google.golang.org/grpc/internal/serviceconfig -google.golang.org/grpc/internal/status -google.golang.org/grpc/internal/syscall -google.golang.org/grpc/internal/transport -google.golang.org/grpc/internal/transport/networktype -google.golang.org/grpc/keepalive -google.golang.org/grpc/metadata -google.golang.org/grpc/peer -google.golang.org/grpc/resolver -google.golang.org/grpc/serviceconfig -google.golang.org/grpc/stats -google.golang.org/grpc/status -google.golang.org/grpc/tap -# google.golang.org/protobuf v1.27.1 -## explicit; go 1.9 -google.golang.org/protobuf/encoding/prototext -google.golang.org/protobuf/encoding/protowire -google.golang.org/protobuf/internal/descfmt -google.golang.org/protobuf/internal/descopts -google.golang.org/protobuf/internal/detrand -google.golang.org/protobuf/internal/encoding/defval -google.golang.org/protobuf/internal/encoding/messageset -google.golang.org/protobuf/internal/encoding/tag -google.golang.org/protobuf/internal/encoding/text -google.golang.org/protobuf/internal/errors -google.golang.org/protobuf/internal/filedesc -google.golang.org/protobuf/internal/filetype -google.golang.org/protobuf/internal/flags -google.golang.org/protobuf/internal/genid -google.golang.org/protobuf/internal/impl -google.golang.org/protobuf/internal/order -google.golang.org/protobuf/internal/pragma -google.golang.org/protobuf/internal/set -google.golang.org/protobuf/internal/strs -google.golang.org/protobuf/internal/version -google.golang.org/protobuf/proto -google.golang.org/protobuf/reflect/protodesc -google.golang.org/protobuf/reflect/protoreflect -google.golang.org/protobuf/reflect/protoregistry -google.golang.org/protobuf/runtime/protoiface -google.golang.org/protobuf/runtime/protoimpl -google.golang.org/protobuf/types/descriptorpb -google.golang.org/protobuf/types/known/anypb -google.golang.org/protobuf/types/known/durationpb -google.golang.org/protobuf/types/known/timestamppb -# gopkg.in/yaml.v2 v2.4.0 -## explicit; go 1.15 -gopkg.in/yaml.v2 -# gotest.tools/v3 v3.1.0 -## explicit; go 1.11 -gotest.tools/v3/assert -gotest.tools/v3/assert/cmp -gotest.tools/v3/env -gotest.tools/v3/fs -gotest.tools/v3/golden -gotest.tools/v3/icmd -gotest.tools/v3/internal/assert -gotest.tools/v3/internal/cleanup -gotest.tools/v3/internal/difflib -gotest.tools/v3/internal/format -gotest.tools/v3/internal/source -gotest.tools/v3/poll -gotest.tools/v3/skip -# github.com/docker/docker => github.com/docker/docker v20.10.3-0.20220326171151-8941dcfcc5db+incompatible -# github.com/gogo/googleapis => github.com/gogo/googleapis v1.3.2