Skip to content
Permalink
Browse files

Fixed go.mod file so the project builds with module-aware go v.1.13. (#…

…1352)

* Fixed go.mod file so the project builds with module-aware go v.1.13.
* Upgraded Trillian version to latest.
* Added replace statement to map remaining broken upstream module dependency.
* Ran go mod tidy
* Fixed usage of testdb.NewTrillianDB which has changed signature in new version.
* Increased lint timeout
* Use latest release of linter.
* Disable funlen until we determine we want it.

funlen is a new check in the latest version of the golangci-lin. It sounds like a good idea, but we need to get this to build in travis before thinking about turning on new checks.
  • Loading branch information...
mhutchinson committed Sep 10, 2019
1 parent eddb427 commit 50f19adf937723e13abdc027cff332ea0ffc9bba
Showing with 163 additions and 82 deletions.
  1. +1 −0 .golangci.yml
  2. +2 −2 .travis.yml
  3. +32 −15 go.mod
  4. +126 −64 go.sum
  5. +2 −1 impl/integration/env.go
@@ -31,6 +31,7 @@ linters:
- gochecknoglobals
- lll
- interfacer
- funlen

issues:
exclude:
@@ -22,8 +22,8 @@ jobs:
- name: "build"
script: go build ./...
- name: "lint"
install: curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.16.0
script: golangci-lint run --deadline=5m
install: curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.18.0
script: golangci-lint run --deadline=7m
- name: "coverage"
script:
- go test ./... -coverprofile=coverage1.txt
47 go.mod
@@ -3,39 +3,56 @@ module github.com/google/keytransparency
go 1.12

require (
github.com/OpenPeeDeeP/depguard v1.0.0 // indirect
github.com/Masterminds/sprig v2.20.0+incompatible // indirect
github.com/benlaurie/objecthash v0.0.0-20180202135721-d1e3d6079fc1
github.com/coreos/go-systemd v0.0.0-20190620071333-e64a0ec8b42a // indirect
github.com/coreos/etcd v3.3.15+incompatible // indirect
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect
github.com/emicklei/proto v1.6.15 // indirect
github.com/fullstorydev/grpcurl v1.3.2 // indirect
github.com/go-sql-driver/mysql v1.4.1
github.com/gobuffalo/flect v0.1.6 // indirect
github.com/gogo/protobuf v1.3.0 // indirect
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
github.com/golang/mock v1.3.1
github.com/golang/protobuf v1.3.2
github.com/golangci/golangci-lint v1.18.0 // indirect
github.com/google/go-cmp v0.3.0
github.com/google/tink v1.2.1-0.20190523150020-6495d823d968
github.com/google/trillian v1.2.2-0.20190628151111-5e2c3d733100
github.com/googleapis/gax-go/v2 v2.0.5 // indirect
github.com/google/trillian v1.3.2-0.20190910105707-fa759d0a2aee
github.com/gorilla/websocket v1.4.1 // indirect
github.com/gostaticanalysis/analysisutil v0.0.3 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.0.0
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
github.com/grpc-ecosystem/grpc-gateway v1.9.3
github.com/grpc-ecosystem/grpc-gateway v1.11.1
github.com/kr/pretty v0.1.0
github.com/kylelemons/godebug v1.1.0
github.com/lyft/protoc-gen-validate v0.1.0 // indirect
github.com/mattn/go-isatty v0.0.9 // indirect
github.com/mattn/go-sqlite3 v1.10.0
github.com/prometheus/client_golang v1.0.0
github.com/prometheus/common v0.6.0 // indirect
github.com/prometheus/procfs v0.0.3 // indirect
github.com/mwitkow/go-proto-validators v0.1.0 // indirect
github.com/prometheus/client_golang v1.1.0
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 // indirect
github.com/prometheus/procfs v0.0.4 // indirect
github.com/russross/blackfriday v2.0.0+incompatible // indirect
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
github.com/spf13/cobra v0.0.5
github.com/spf13/pflag v1.0.3
github.com/spf13/viper v1.4.0
github.com/uber/prototool v1.8.1 // indirect
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4
golang.org/x/net v0.0.0-20190628185345-da137c7871d7 // indirect
github.com/ultraware/funlen v0.0.2 // indirect
github.com/urfave/cli v1.22.0 // indirect
go.etcd.io/etcd v3.3.15+incompatible // indirect
golang.org/x/crypto v0.0.0-20190909091759-094676da4a83
golang.org/x/net v0.0.0-20190909003024-a7b16738d86b // indirect
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
golang.org/x/sync v0.0.0-20190423024810-112230192c58
golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb // indirect
golang.org/x/sys v0.0.0-20190910064555-bbd175535a8b // indirect
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
golang.org/x/tools v0.0.0-20190628222527-fb37f6ba8261 // indirect
golang.org/x/tools v0.0.0-20190910044552-dd2b5c81c578 // indirect
google.golang.org/api v0.7.0
google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64
google.golang.org/grpc v1.21.1
google.golang.org/genproto v0.0.0-20190905072037-92dd089d5514
google.golang.org/grpc v1.23.0
mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f // indirect
sigs.k8s.io/yaml v1.1.0 // indirect
)

replace google.golang.org/genproto v0.0.0-20170818100345-ee236bd376b0 => google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0

0 comments on commit 50f19ad

Please sign in to comment.
You can’t perform that action at this time.