Skip to content

Commit e85958d

Browse files
fix: run go mod vendor (#1791)
* fix: run go mod vendor * ci(vendor): add check for inconsistent vendoring
1 parent 16d1a2f commit e85958d

File tree

211 files changed

+50
-39067
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

211 files changed

+50
-39067
lines changed

.github/workflows/gobuild.yml

+2
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ jobs:
3636
run: make check-docs
3737
- name: Check i18n
3838
run: make lint-lang
39+
- name: Check vendoring
40+
run: make check-vendor
3941
- name: Build
4042
run: make binary
4143
- name: Unit tests

Makefile

+4
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,10 @@ generate-downstream-docs: ## Generate command-line reference documentation in ad
8282
go run ./cmd/rhoas docs --dir ./dist --file-format adoc
8383
.PHONY: generate-downstream-docs
8484

85+
check-vendor:
86+
./scripts/check-vendor.sh
87+
.PHONY: check-vendor
88+
8589
I18N_LINTER_DEF := $(shell command -v app-services-go-linter 2> /dev/null)
8690

8791
lint-lang: ## Lint i18n files

go.mod

+7-12
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ require (
4646
k8s.io/utils v0.0.0-20220713171938-56c0de1e6f5e
4747
)
4848

49-
require github.com/spf13/viper v1.14.0
50-
5149
require (
5250
cloud.google.com/go/compute v1.12.1 // indirect
5351
cloud.google.com/go/compute/metadata v0.2.1 // indirect
@@ -78,23 +76,19 @@ require (
7876
github.com/google/gofuzz v1.1.0 // indirect
7977
github.com/google/uuid v1.1.2 // indirect
8078
github.com/googleapis/gnostic v0.5.5 // indirect
81-
github.com/hashicorp/hcl v1.0.0 // indirect
8279
github.com/iancoleman/orderedmap v0.2.0 // indirect
8380
github.com/imdario/mergo v0.3.12 // indirect
8481
github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf // indirect
8582
github.com/inconshreveable/mousetrap v1.0.1 // indirect
8683
github.com/json-iterator/go v1.1.12 // indirect
8784
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
88-
github.com/magiconair/properties v1.8.6 // indirect
85+
github.com/kr/pretty v0.3.0 // indirect
8986
github.com/mattn/go-colorable v0.1.12 // indirect
9087
github.com/mattn/go-runewidth v0.0.13 // indirect
9188
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
9289
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
93-
github.com/mitchellh/mapstructure v1.5.0 // indirect
9490
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
9591
github.com/modern-go/reflect2 v1.0.2 // indirect
96-
github.com/pelletier/go-toml v1.9.5 // indirect
97-
github.com/pelletier/go-toml/v2 v2.0.5 // indirect
9892
github.com/prometheus/client_golang v1.11.0 // indirect
9993
github.com/prometheus/client_model v0.2.0 // indirect
10094
github.com/prometheus/common v0.26.0 // indirect
@@ -104,22 +98,23 @@ require (
10498
github.com/russross/blackfriday/v2 v2.1.0 // indirect
10599
github.com/segmentio/backo-go v0.0.0-20200129164019-23eae7c10bd3 // indirect
106100
github.com/segmentio/ksuid v1.0.3 // indirect
107-
github.com/spf13/afero v1.9.2 // indirect
108-
github.com/spf13/cast v1.5.0 // indirect
109-
github.com/spf13/jwalterweatherman v1.1.0 // indirect
110-
github.com/subosito/gotenv v1.4.1 // indirect
101+
github.com/stretchr/testify v1.8.1 // indirect
111102
github.com/tcnksm/go-gitconfig v0.1.2 // indirect
112103
github.com/ulikunitz/xz v0.5.10 // indirect
104+
go.uber.org/atomic v1.9.0 // indirect
105+
go.uber.org/goleak v1.1.11 // indirect
106+
go.uber.org/multierr v1.8.0 // indirect
107+
go.uber.org/zap v1.21.0 // indirect
113108
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
114109
golang.org/x/net v0.2.0 // indirect
115110
golang.org/x/sys v0.2.0 // indirect
116111
golang.org/x/term v0.2.0 // indirect
117112
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
113+
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
118114
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
119115
google.golang.org/appengine v1.6.7 // indirect
120116
google.golang.org/protobuf v1.28.1 // indirect
121117
gopkg.in/inf.v0 v0.9.1 // indirect
122-
gopkg.in/ini.v1 v1.67.0 // indirect
123118
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
124119
gopkg.in/yaml.v3 v3.0.1 // indirect
125120
k8s.io/apiextensions-apiserver v0.22.1 // indirect

go.sum

+10-37
Large diffs are not rendered by default.

scripts/check-vendor.sh

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/usr/bin/env bash
2+
3+
set -uo pipefail
4+
5+
go mod vendor
6+
7+
commands=$(git diff --stat vendor | wc -l)
8+
9+
echo $((commands))
10+
if [[ $(($commands)) != 0 ]]; then
11+
echo echo "inconsistent vendoring detected"
12+
exit 1
13+
fi

vendor/github.com/hashicorp/hcl/.gitignore

-9
This file was deleted.

vendor/github.com/hashicorp/hcl/.travis.yml

-13
This file was deleted.

0 commit comments

Comments
 (0)