Skip to content

Commit b87784f

Browse files
authoredMay 9, 2020
* Bump and pin deps * Add changelog * Regen code * Move changelog * Adding changelog file to new location * Deleting changelog file from old location
1 parent 72996db commit b87784f

File tree

23 files changed

+288
-275
lines changed

23 files changed

+288
-275
lines changed
 

‎.github/pull_request_template.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Users ran into this bug doing ... \ Users needed this feature to ...
1111
# Checklist:
1212

1313
- [ ] I included a concise, user-facing changelog (for details, see https://github.com/solo-io/go-utils/tree/master/changelogutils) which references the issue that is resolved.
14-
- [ ] If I updated APIs (our protos) or helm values, I ran `make generated-code` to ensure there will be no code diff
14+
- [ ] If I updated APIs (our protos) or helm values, I ran `make update-deps generated-code` to ensure there will be no code diff
1515
- [ ] I followed guidelines laid out in the Gloo [contribution guide](https://docs.solo.io/gloo/latest/contributing/)
1616
- [ ] I opened a draft PR or added the work in progress label if my PR is not ready for review
1717
- [ ] I have performed a self-review of my own code

‎Makefile

+6-6
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,12 @@ mod-download:
9090
update-deps: mod-download
9191
$(shell cd $(shell go list -f '{{ .Dir }}' -m github.com/solo-io/protoc-gen-ext); make install)
9292
chmod +x $(shell go list -f '{{ .Dir }}' -m k8s.io/code-generator)/generate-groups.sh
93-
GO111MODULE=off go get -u golang.org/x/tools/cmd/goimports
94-
GO111MODULE=off go get -u github.com/gogo/protobuf/gogoproto
95-
GO111MODULE=off go get -u github.com/gogo/protobuf/protoc-gen-gogo
96-
GO111MODULE=off go get -u github.com/cratonica/2goarray
97-
GO111MODULE=off go get -v -u github.com/golang/mock/gomock
98-
GO111MODULE=off go install github.com/golang/mock/mockgen
93+
go get -v golang.org/x/tools/cmd/goimports@v0.0.0-20200423205358-59e73619c742
94+
go get -v github.com/gogo/protobuf/gogoproto@v1.3.1
95+
go get -v github.com/gogo/protobuf/protoc-gen-gogo@v1.3.1
96+
go get -v github.com/cratonica/2goarray@514510793eaa1ae2cc2217a9a743104312412f35
97+
go get -v -u github.com/golang/mock/gomock@v1.4.3
98+
go get -v github.com/golang/mock/mockgen@v1.4.3
9999

100100

101101
.PHONY: check-format
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
changelog:
2+
- type: NON_USER_FACING
3+
description: Pin our deps downloaded to generate code

‎go.mod

+3-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ require (
1919
github.com/go-swagger/go-swagger v0.21.0
2020
github.com/gogo/googleapis v1.3.1
2121
github.com/gogo/protobuf v1.3.1
22-
github.com/golang/mock v1.4.0
22+
github.com/golang/mock v1.4.3
2323
github.com/golang/protobuf v1.3.3
2424
github.com/google/go-github v17.0.0+incompatible
2525
github.com/google/go-github/v31 v31.0.0
@@ -61,9 +61,10 @@ require (
6161
go.opencensus.io v0.22.2
6262
go.uber.org/multierr v1.4.0
6363
go.uber.org/zap v1.13.0
64-
golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd
64+
golang.org/x/mod v0.2.0
6565
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
6666
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e
67+
golang.org/x/tools v0.0.0-20200423205358-59e73619c742 // indirect
6768
google.golang.org/genproto v0.0.0-20191115221424-83cc0476cb11
6869
google.golang.org/grpc v1.27.0
6970
gopkg.in/AlecAivazis/survey.v1 v1.8.7

‎go.sum

+9
Original file line numberDiff line numberDiff line change
@@ -478,6 +478,8 @@ github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfb
478478
github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
479479
github.com/golang/mock v1.4.0 h1:Rd1kQnQu0Hq3qvJppYSG0HtP+f5LPPUiDswTLiEegLg=
480480
github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
481+
github.com/golang/mock v1.4.3 h1:GV+pQPG/EUUbkh47niozDcADz6go/dUwhVzdUQHIVRw=
482+
github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
481483
github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
482484
github.com/golang/protobuf v1.0.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
483485
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -1097,6 +1099,7 @@ github.com/xenolf/lego v0.3.2-0.20160613233155-a9d8cec0e656/go.mod h1:fwiGnfsIjG
10971099
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
10981100
github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1/go.mod h1:QcJo0QPSfTONNIgpN5RA8prR7fF8nkF6cTWTcNerRO8=
10991101
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
1102+
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
11001103
github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs=
11011104
github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940 h1:p7OofyZ509h8DmPLh8Hn+EIIZm/xYhdZHJ9GnXHdr6U=
11021105
github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs=
@@ -1179,6 +1182,8 @@ golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU
11791182
golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
11801183
golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd h1:ePuNC7PZ6O5BzgPn9bZayERXBdfZjUYoXEf5BTfDfh8=
11811184
golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
1185+
golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ=
1186+
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
11821187
golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
11831188
golang.org/x/net v0.0.0-20180112015858-5ccada7d0a7b/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
11841189
golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1216,6 +1221,8 @@ golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLL
12161221
golang.org/x/net v0.0.0-20191028085509-fe3aa8a45271/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
12171222
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 h1:efeOvDhwQ29Dj3SdAV/MJf8oukgn+8D8WgaCaRMchF8=
12181223
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
1224+
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b h1:0mm1VjtFUOIlE1SbDlwjYaDxZVDP2S5ou6y0gSgXHu8=
1225+
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
12191226
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
12201227
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
12211228
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0=
@@ -1327,6 +1334,8 @@ golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtn
13271334
golang.org/x/tools v0.0.0-20191127201027-ecd32218bd7f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
13281335
golang.org/x/tools v0.0.0-20191212051200-825cb0626375 h1:hrBCt+pkb1irxFjg/GeadSn24gLxi5/Z861I53OkQbc=
13291336
golang.org/x/tools v0.0.0-20191212051200-825cb0626375/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
1337+
golang.org/x/tools v0.0.0-20200423205358-59e73619c742 h1:9OGWpORUXvk8AsaBJlpzzDx7Srv/rSK6rvjcsJq4rJo=
1338+
golang.org/x/tools v0.0.0-20200423205358-59e73619c742/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
13301339
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
13311340
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 h1:/atklqdjdhuosWIl6AIbOeHJjicWYPqR9bpxqxYG2pA=
13321341
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎pkg/listers/mocks/mock_listers.go

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/utils/selectionutils/mocks/mock_virtual_service.go

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎projects/gloo/cli/pkg/cmd/install/mocks/mock_helm_client.go

+14-14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎projects/gloo/cli/pkg/cmd/install/mocks/mock_helm_installation.go

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎projects/gloo/cli/pkg/cmd/install/mocks/mock_helm_release_list.go

+8-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎projects/gloo/cli/pkg/cmd/install/mocks/mock_helm_uninstallation.go

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎projects/gloo/cli/pkg/cmd/version/mocks/mock_watcher.go

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎projects/gloo/pkg/discovery/mocks/mock_discovery.go

+12-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎projects/gloo/pkg/plugins/consul/mocks/dnsresolver_mock.go

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎projects/gloo/pkg/plugins/kubernetes/mocks/kubesharedfactory_mock.go

+10-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎projects/gloo/pkg/plugins/wasm/mocks/mock_cache.go

+10-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎projects/gloo/pkg/upstreams/consul/mocks/mock_consul_client.go

+12-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎projects/gloo/pkg/upstreams/consul/mocks/mock_watcher.go

+14-14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎projects/metrics/pkg/metricsservice/mocks/mock_metrics_stream.go

+20-20
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎projects/metrics/pkg/metricsservice/mocks/mock_storage.go

+8-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/mocks/cache/corecache.go

+28-28
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/mocks/gloo/validation_client.go

+8-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/mocks/kubernetes/kubeinterface.go

+86-86
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
Please sign in to comment.