Skip to content

Commit

Permalink
Upgrade github.com/golang/mock and mockgen from 1.3.x to 1.6.0
Browse files Browse the repository at this point in the history
We shouldn't ask developers to use mockgen 1.3.x from 2019.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
  • Loading branch information
kzys committed Mar 15, 2023
1 parent 28ac48d commit 5bfcb7b
Show file tree
Hide file tree
Showing 70 changed files with 1,778 additions and 1,621 deletions.
11 changes: 4 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ misc/certs/ca-certificates.crt:
docker run "amazon/amazon-ecs-agent-cert-source:make" cat /etc/ssl/certs/ca-certificates.crt > misc/certs/ca-certificates.crt

gogenerate:
go generate -x ./agent/...
$(MAKE) goimports

gogenerate-init:
Expand Down Expand Up @@ -349,20 +348,18 @@ install-golang:
./scripts/install-golang.sh

.get-deps-stamp:
go get github.com/golang/mock/mockgen
cd "${GOPATH}/src/github.com/golang/mock/mockgen" && git checkout 1.3.1 && go get ./... && go install ./... && cd -
go get golang.org/x/tools/cmd/goimports
go install github.com/golang/mock/mockgen@v1.6.0
go install golang.org/x/tools/cmd/goimports@v0.2.0
GO111MODULE=on go install github.com/fzipp/gocyclo/cmd/gocyclo@v0.3.1
GO111MODULE=on go install honnef.co/go/tools/cmd/staticcheck@v0.3.2
touch .get-deps-stamp

get-deps: .get-deps-stamp

get-deps-init:
go get github.com/golang/mock/mockgen
cd "${GOPATH}/src/github.com/golang/mock/mockgen" && git checkout 1.3.1 && go get ./... && go install ./... && cd -
go install github.com/golang/mock/mockgen@v1.6.0
go install golang.org/x/tools/cmd/goimports@v0.2.0
GO111MODULE=on go install github.com/fzipp/gocyclo/cmd/gocyclo@v0.3.1
go get golang.org/x/tools/cmd/goimports
GO111MODULE=on go install honnef.co/go/tools/cmd/staticcheck@v0.3.2

amazon-linux-sources.tgz:
Expand Down
132 changes: 66 additions & 66 deletions agent/api/mocks/api_mocks.go

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions agent/app/factory/mocks/factory_mocks.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions agent/app/mocks/credentials_mocks.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions agent/asm/factory/mocks/factory_mocks.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 5bfcb7b

Please sign in to comment.