golang: 1.13.7 -> 1.15.2

.go-version

@@ -1 +1 @@
-1.13.7
+1.15.2

.travis.yml

@@ -2,7 +2,7 @@ sudo: required
 language: go
 go_import_path: github.com/open-policy-agent/opa-envoy-plugin
 go:
-- '1.13'
+- '1.15'
 services:
 - docker
 env:

Makefile

@@ -42,7 +42,7 @@ GO15VENDOREXPERIMENT := 1
 export GO15VENDOREXPERIMENT
 
 .PHONY: all build build-darwin build-linux build-windows clean check check-fmt check-vet check-lint \
-    deps deploy-travis generate image image-quick push push-latest tag-latest \
+    deploy-travis generate image image-quick push push-latest tag-latest \
     test test-cluster test-e2e update-opa update-istio-quickstart-version version
 
 ######################################################
@@ -51,14 +51,11 @@ export GO15VENDOREXPERIMENT
 #
 ######################################################
 
-all: deps build test check
+all: build test check
 
 version:
 	@echo $(VERSION)
 
-deps:
-	@./build/install-deps.sh
-
 generate:
 	$(GO) generate ./...
 

build/check-lint.sh

@@ -12,7 +12,7 @@ function opa-envoy-plugin::check_lint() {
     exec 5>&1
     exit_code=0
     for pkg in $(opa-envoy-plugin::go_packages); do
-        __output=$(golint $pkg | tee >(cat - >&5))
+        __output=$(go run ./vendor/golang.org/x/lint/golint $pkg | tee >(cat - >&5))
         if [ ! -z "$__output" ]; then
             exit_code=1
         fi

build/utils.sh

@@ -4,6 +4,9 @@ set -o errexit
 set -o pipefail
 set -o nounset
 
+export GO111MODULE=on
+export GOFLAGS=-mod=vendor
+
 function opa-envoy-plugin::go_packages() {
     for pkg in $(go list ./.../ 2>/dev/null | grep -v vendor); do
         echo $pkg

go.mod

@@ -15,8 +15,10 @@ require (
 	github.com/rcrowley/go-metrics v0.0.0-20190706150252-9beb055b7962 // indirect
 	github.com/sirupsen/logrus v1.4.2
 	github.com/spf13/cobra v0.0.5 // indirect
+	golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3
 	golang.org/x/net v0.0.0-20190724013045-ca1201d0de80
 	golang.org/x/text v0.3.2 // indirect
+	golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72
 	google.golang.org/genproto v0.0.0-20190905072037-92dd089d5514
 	google.golang.org/grpc v1.23.0
 	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect

go.sum

@@ -87,16 +87,6 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/olekukonko/tablewriter v0.0.1 h1:b3iUnf1v+ppJiOfNX4yxxqfWKMQPZR5yoh8urCTFX88=
 github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
-github.com/open-policy-agent/opa v0.21.0 h1:0CVq4EEUP+fJEzjwd9yNLSTWZk4W5rM+QbjdLcT1nY0=
-github.com/open-policy-agent/opa v0.21.0/go.mod h1:cZaTfhxsj7QdIiUI0U9aBtOLLTqVNe+XE60+9kZKLHw=
-github.com/open-policy-agent/opa v0.21.1 h1:c4lUnB0mO2KssiUnyh6Y9IGhggvXI3EgObkmhVTvEqQ=
-github.com/open-policy-agent/opa v0.21.1/go.mod h1:cZaTfhxsj7QdIiUI0U9aBtOLLTqVNe+XE60+9kZKLHw=
-github.com/open-policy-agent/opa v0.22.0 h1:KZvn0uMQIorBIwYk8Vc89dp8No9FIEF8eFl0sc1r/1U=
-github.com/open-policy-agent/opa v0.22.0/go.mod h1:rrwxoT/b011T0cyj+gg2VvxqTtn6N3gp/jzmr3fjW44=
-github.com/open-policy-agent/opa v0.23.0 h1:9SqWUD545w+NtNNldzK1GW3XRjsbTXIomnXgQoDMJcU=
-github.com/open-policy-agent/opa v0.23.0/go.mod h1:rrwxoT/b011T0cyj+gg2VvxqTtn6N3gp/jzmr3fjW44=
-github.com/open-policy-agent/opa v0.23.1 h1:fGfytxLxSrVhVJTrNajGwYH0PkxFwT3WY5baZ4/CKG4=
-github.com/open-policy-agent/opa v0.23.1/go.mod h1:rrwxoT/b011T0cyj+gg2VvxqTtn6N3gp/jzmr3fjW44=
 github.com/open-policy-agent/opa v0.23.2 h1:co9fPjnLPwnvaEThBJjCb5E2iAyvW95Qq2PvSOEIwGE=
 github.com/open-policy-agent/opa v0.23.2/go.mod h1:rrwxoT/b011T0cyj+gg2VvxqTtn6N3gp/jzmr3fjW44=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=

internal/internal_test.go

@@ -1062,7 +1062,7 @@ func TestGetResponseHttpStatus(t *testing.T) {
 		t.Fatal("Expected error but got nil")
 	}
 
-	input["http_status"] = json.Number(301)
+	input["http_status"] = json.Number("1")
 	result, err = getResponseHTTPStatus(input)
 	if err == nil {
 		t.Fatal("Expected error but got nil")

tools.go

@@ -0,0 +1,15 @@
+// +build tools
+
+// Copyright 2019 The OPA Authors.  All rights reserved.
+// Use of this source code is governed by an Apache2
+// license that can be found in the LICENSE file.
+
+// package tools imports require tooling so that
+// the dependencies are tracked with the OPA module
+// and are archived in the vendor directory.
+package tools
+
+import (
+	_ "golang.org/x/lint/golint"
+	_ "golang.org/x/tools/cmd/goimports"
+)