Remove moq generation step

Fixes #125
johanbrandhorst · Aug 30, 2020 · 33391fc · 33391fc
1 parent 85f6b74
commit 33391fc
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 17 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -34,15 +34,11 @@ jobs:
   generate:
     docker:
       - image: golang:latest
-    environment:
-      GO111MODULE: "on"
-      GOPROXY: "https://proxy.golang.org"
     steps:
       - checkout
       - run: apt-get update
       - run: apt-get install -y protobuf-compiler
-      - run: go install github.com/golang/protobuf/protoc-gen-go github.com/matryer/moq
-      - run: go mod vendor # for AWS interface mock generation
+      - run: go install github.com/golang/protobuf/protoc-gen-go
       - run: go generate -x ./...
       - run: go mod tidy
       - run: git diff --exit-code

diff --git a/certify_test.go b/certify_test.go
@@ -26,9 +26,6 @@ import (
 	"github.com/johanbrandhorst/certify/mocks"
 )
 
-//go:generate moq -out mocks/issuer.mock.go -pkg mocks . Issuer
-//go:generate moq -out mocks/logger.mock.go -pkg mocks . Logger
-
 var _ = Describe("Caches", func() {
 	// Note: this setup step doesn't clean
 	// up this directory properly after running.

diff --git a/go.mod b/go.mod
@@ -17,7 +17,6 @@ require (
 	github.com/hashicorp/vault/sdk v0.1.14-0.20200305172021-03a3749f220d // indirect
 	github.com/kelseyhightower/envconfig v1.4.0
 	github.com/lib/pq v1.2.0 // indirect
-	github.com/matryer/moq v0.0.0-20191103151256-382bd174c0ef
 	github.com/onsi/ginkgo v1.8.0
 	github.com/onsi/gomega v1.5.0
 	github.com/opencontainers/runc v0.1.1 // indirect
@@ -28,7 +27,6 @@ require (
 	github.com/uw-labs/podrick v0.3.1-0.20191110182239-f0d4f8dde70f
 	golang.org/x/sync v0.0.0-20190423024810-112230192c58
 	golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // indirect
-	golang.org/x/tools v0.0.0-20190718200317-82a3ea8a504c // indirect
 	google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64 // indirect
 	google.golang.org/grpc v1.24.0
 	logur.dev/adapter/logrus v0.2.0

diff --git a/go.sum b/go.sum
@@ -165,8 +165,6 @@ github.com/kylelemons/go-gypsy v0.0.0-20160905020020-08cad365cd28/go.mod h1:T/T7
 github.com/lib/pq v0.0.0-20180201184707-88edab080323/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0=
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/matryer/moq v0.0.0-20191103151256-382bd174c0ef h1:xOc9vkuE08ZH6zw5n3Q2LPpKeR+QR8rKwjGzLRcUIzo=
-github.com/matryer/moq v0.0.0-20191103151256-382bd174c0ef/go.mod h1:9ELz6aaclSIGnZBoaSLZ3NAl1VTufbOrXBPvtcy6WiQ=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o=
@@ -324,8 +322,6 @@ golang.org/x/tools v0.0.0-20190311212946-11955173bddd h1:/e+gpKk9r3dJobndpTytxS2
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135 h1:5Beo0mZN8dRzgrMMkDp0jc8YXQKx9DiJ2k1dkvGsn5A=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190718200317-82a3ea8a504c h1:/w2shrE71LqqE7724PI+5iMYc5YbPnUaRosCQncZ/Nk=
-golang.org/x/tools v0.0.0-20190718200317-82a3ea8a504c/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508=

diff --git a/internal/tools/tools.go b/internal/tools/tools.go
@@ -4,6 +4,5 @@ package tools
 
 import (
 	_ "github.com/golang/protobuf/protoc-gen-go"
-	_ "github.com/matryer/moq"
 	_ "github.com/onsi/ginkgo/ginkgo"
 )
diff --git a/issuers/aws/aws_test.go b/issuers/aws/aws_test.go
@@ -25,8 +25,6 @@ import (
 	"github.com/johanbrandhorst/certify/issuers/aws/mocks"
 )
 
-//go:generate moq -out mocks/client.mock.go -pkg mocks ../../vendor/github.com/aws/aws-sdk-go-v2/service/acmpca/acmpcaiface ACMPCAAPI
-
 var _ = Describe("AWS Issuer", func() {
 	It("issues a certificate", func() {
 		caARN := "someARN"