Skip to content

Commit

Permalink
fix: run go mod vendor (#1791)
Browse files Browse the repository at this point in the history
* fix: run go mod vendor

* ci(vendor): add check for inconsistent vendoring
  • Loading branch information
rkpattnaik780 committed Dec 19, 2022
1 parent 16d1a2f commit e85958d
Show file tree
Hide file tree
Showing 211 changed files with 50 additions and 39,067 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/gobuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ jobs:
run: make check-docs
- name: Check i18n
run: make lint-lang
- name: Check vendoring
run: make check-vendor
- name: Build
run: make binary
- name: Unit tests
Expand Down
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@ generate-downstream-docs: ## Generate command-line reference documentation in ad
go run ./cmd/rhoas docs --dir ./dist --file-format adoc
.PHONY: generate-downstream-docs

check-vendor:
./scripts/check-vendor.sh
.PHONY: check-vendor

I18N_LINTER_DEF := $(shell command -v app-services-go-linter 2> /dev/null)

lint-lang: ## Lint i18n files
Expand Down
19 changes: 7 additions & 12 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ require (
k8s.io/utils v0.0.0-20220713171938-56c0de1e6f5e
)

require github.com/spf13/viper v1.14.0

require (
cloud.google.com/go/compute v1.12.1 // indirect
cloud.google.com/go/compute/metadata v0.2.1 // indirect
Expand Down Expand Up @@ -78,23 +76,19 @@ require (
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/uuid v1.1.2 // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/iancoleman/orderedmap v0.2.0 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
github.com/magiconair/properties v1.8.6 // indirect
github.com/kr/pretty v0.3.0 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-runewidth v0.0.13 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pelletier/go-toml/v2 v2.0.5 // indirect
github.com/prometheus/client_golang v1.11.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.26.0 // indirect
Expand All @@ -104,22 +98,23 @@ require (
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/segmentio/backo-go v0.0.0-20200129164019-23eae7c10bd3 // indirect
github.com/segmentio/ksuid v1.0.3 // indirect
github.com/spf13/afero v1.9.2 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/subosito/gotenv v1.4.1 // indirect
github.com/stretchr/testify v1.8.1 // indirect
github.com/tcnksm/go-gitconfig v0.1.2 // indirect
github.com/ulikunitz/xz v0.5.10 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/goleak v1.1.11 // indirect
go.uber.org/multierr v1.8.0 // indirect
go.uber.org/zap v1.21.0 // indirect
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
golang.org/x/net v0.2.0 // indirect
golang.org/x/sys v0.2.0 // indirect
golang.org/x/term v0.2.0 // indirect
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.22.1 // indirect
Expand Down
47 changes: 10 additions & 37 deletions go.sum

Large diffs are not rendered by default.

13 changes: 13 additions & 0 deletions scripts/check-vendor.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/usr/bin/env bash

set -uo pipefail

go mod vendor

commands=$(git diff --stat vendor | wc -l)

echo $((commands))
if [[ $(($commands)) != 0 ]]; then
echo echo "inconsistent vendoring detected"
exit 1
fi
9 changes: 0 additions & 9 deletions vendor/github.com/hashicorp/hcl/.gitignore

This file was deleted.

13 changes: 0 additions & 13 deletions vendor/github.com/hashicorp/hcl/.travis.yml

This file was deleted.

Loading

0 comments on commit e85958d

Please sign in to comment.