From fc16b98e4cbbc633e0ae5723e95c68eb2517ab54 Mon Sep 17 00:00:00 2001
From: Gyuho Lee <leegyuho@amazon.com>
Date: Fri, 1 Feb 2019 14:15:15 -0800
Subject: [PATCH] *: update to Go 1.12.2 and make related changes

Update to Go 1.12.2 testing. Remove deprecated unused and gosimple
pacakges, and mask staticcheck 1006.

Related #10528 #10438

Co-Authored-By: Gyuho Lee <leegyuho@amazon.com>
---
 .travis.yml      | 10 +++++-----
 Makefile         |  2 +-
 test             |  2 +-
 tests/Dockerfile |  2 --
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4fa89935d9e..74bb661d249 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ sudo: required
 services: docker
 
 go:
-- 1.11.5
+- 1.12.2
 - tip
 
 notifications:
@@ -30,13 +30,13 @@ env:
 matrix:
   fast_finish: true
   allow_failures:
-  - go: 1.11.5
+  - go: 1.12.2
     env: TARGET=linux-amd64-grpcproxy
-  - go: 1.11.5
+  - go: 1.12.2
     env: TARGET=linux-amd64-coverage
   - go: tip
     env: TARGET=linux-amd64-fmt-unit-go-tip
-  - go: 1.11.5
+  - go: 1.12.2
     env: TARGET=linux-386-unit
   exclude:
   - go: tip
@@ -57,7 +57,7 @@ matrix:
     env: TARGET=linux-amd64-grpcproxy
   - go: tip
     env: TARGET=linux-amd64-coverage
-  - go: 1.11.5
+  - go: 1.12.2
     env: TARGET=linux-amd64-fmt-unit-go-tip
   - go: tip
     env: TARGET=linux-386-unit
diff --git a/Makefile b/Makefile
index b992ef07500..ea3ded743fc 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,7 @@ docker-remove:
 
 
 
-GO_VERSION ?= 1.11.5
+GO_VERSION ?= 1.12.2
 ETCD_VERSION ?= $(shell git rev-parse --short HEAD || echo "GitNotFound")
 
 TEST_SUFFIX = $(shell date +%s | base64 | head -c 15)
diff --git a/test b/test
index 9249de9055e..085b2a13570 100755
--- a/test
+++ b/test
@@ -472,7 +472,7 @@ function staticcheck_pass {
 		if [ -n "${staticcheckResult}" ]; then
 			# TODO: resolve these after go1.8 migration
 			# See https://github.com/dominikh/go-tools/tree/master/cmd/staticcheck
-			STATIC_CHECK_MASK="S(A|T)(1002|1005|1008|1012|1019|1032|2002|4003|4006)"
+			STATIC_CHECK_MASK="S(A|T)(1002|1005|1006|1008|1012|1019|1032|2002|4003|4006)"
 			if echo "${staticcheckResult}" | grep -vE "$STATIC_CHECK_MASK"; then
 				echo -e "staticcheck checking failed:\\n${staticcheckResult}"
 				exit 255
diff --git a/tests/Dockerfile b/tests/Dockerfile
index 3012dd6be7d..d21c50204f0 100644
--- a/tests/Dockerfile
+++ b/tests/Dockerfile
@@ -49,8 +49,6 @@ RUN go get -v -u -tags spell github.com/chzchzchz/goword \
   && go get -v -u github.com/mgechev/revive \
   && go get -v -u github.com/mdempsky/unconvert \
   && go get -v -u mvdan.cc/unparam \
-  && go get -v -u honnef.co/go/tools/cmd/gosimple \
-  && go get -v -u honnef.co/go/tools/cmd/unused \
   && go get -v -u honnef.co/go/tools/cmd/staticcheck \
   && go get -v -u github.com/gyuho/gocovmerge \
   && go get -v -u github.com/gordonklaus/ineffassign \