diff --git a/.travis.yml b/.travis.yml index a7a2876cdf..c11f41424f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ dist: trusty sudo: false language: go go: -- 1.9.1 +- "1.10" # add TF_CONSUL_TEST=1 to run consul tests # they were causing timouts in travis @@ -34,7 +34,6 @@ script: - make vendor-status - make test - make e2etest -- make vet - GOOS=windows go build branches: only: diff --git a/Makefile b/Makefile index 07897daacd..879a1e0352 100644 --- a/Makefile +++ b/Makefile @@ -68,17 +68,6 @@ cover: go tool cover -html=coverage.out rm coverage.out -# vet runs the Go source code static analysis tool `vet` to find -# any common errors. -vet: - @echo 'go vet ./...' - @go vet ./... ; if [ $$? -eq 1 ]; then \ - echo ""; \ - echo "Vet found suspicious constructs. Please check the reported constructs"; \ - echo "and fix them if necessary before submitting the code for review."; \ - exit 1; \ - fi - # generate runs `go generate` to build the dynamically generated # source files. generate: @@ -102,4 +91,4 @@ vendor-status: # under parallel conditions. .NOTPARALLEL: -.PHONY: bin cover default dev e2etest fmt fmtcheck generate plugin-dev quickdev test-compile test testacc testrace tools vendor-status vet +.PHONY: bin cover default dev e2etest fmt fmtcheck generate plugin-dev quickdev test-compile test testacc testrace tools vendor-status diff --git a/command/format/plan_test.go b/command/format/plan_test.go index 0a2dc1e36e..a87646cf0a 100644 --- a/command/format/plan_test.go +++ b/command/format/plan_test.go @@ -408,7 +408,7 @@ func TestPlanStats(t *testing.T) { }, }, PlanStats{ - // data resource refreshes are not counted in our stats + // data resource refreshes are not counted in our stats }, }, "replace": { diff --git a/terraform/interpolate_test.go b/terraform/interpolate_test.go index 00aec367da..10f23a2788 100644 --- a/terraform/interpolate_test.go +++ b/terraform/interpolate_test.go @@ -348,8 +348,8 @@ func TestInterpolater_resourceVariableMissingDuringInput(t *testing.T) { &ModuleState{ Path: rootModulePath, Resources: map[string]*ResourceState{ - // No resources at all yet, because we're still dealing - // with input and so the resources haven't been created. + // No resources at all yet, because we're still dealing + // with input and so the resources haven't been created. }, }, },