From 083e39b47725af46842671f385d67bf69b8662bc Mon Sep 17 00:00:00 2001
From: Tibor Vass <tibor@docker.com>
Date: Fri, 31 May 2019 20:52:43 +0000
Subject: [PATCH] remove gosimple - package is gone and it's not important

Also fixes issue reported by ineffassign

Signed-off-by: Tibor Vass <tibor@docker.com>
---
 Dockerfile                  | 3 +--
 Makefile                    | 8 ++------
 controller.go               | 1 -
 procfs/procfs_linux_test.go | 1 +
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6eac5c46a2..9ffe9971d2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,8 +11,7 @@ RUN go get golang.org/x/lint/golint \
 		golang.org/x/tools/cmd/cover \
 		github.com/mattn/goveralls \
 		github.com/gordonklaus/ineffassign \
-		github.com/client9/misspell/cmd/misspell \
-		honnef.co/go/tools/cmd/gosimple
+		github.com/client9/misspell/cmd/misspell
 
 WORKDIR /go/src/github.com/docker/libnetwork
 
diff --git a/Makefile b/Makefile
index d4795d4f9e..90f2a36625 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all all-local build build-local clean cross cross-local gosimple vet lint misspell check check-local check-code check-format unit-tests protobuf protobuf-local check-protobuf
+.PHONY: all all-local build build-local clean cross cross-local vet lint misspell check check-local check-code check-format unit-tests protobuf protobuf-local check-protobuf
 SHELL=/bin/bash
 
 dockerbuildargs ?= --target dev - < Dockerfile
@@ -115,7 +115,7 @@ check: builder
 
 check-local: check-code check-format
 
-check-code: check-protobuf lint gosimple vet ineffassign
+check-code: check-protobuf lint vet ineffassign
 
 check-format: fmt misspell
 
@@ -164,10 +164,6 @@ ineffassign: ## run ineffassign
 	@echo "🐳 $@"
 	@test -z "$$(ineffassign . | grep -v vendor/ | grep -v ".pb.go:" | grep -v ".mock.go" | tee /dev/stderr)"
 
-gosimple: ## run gosimple
-	@echo "🐳 $@"
-	@test -z "$$(gosimple . | grep -v vendor/ | grep -v ".pb.go:" | grep -v ".mock.go" | tee /dev/stderr)"
-
 # check-protobuf rebuilds .pb.go files and fails if they have changed
 check-protobuf: PROTOC_CHECK=1
 check-protobuf: $(PB_FILES)
diff --git a/controller.go b/controller.go
index 2896011dbf..ed05c0ace7 100644
--- a/controller.go
+++ b/controller.go
@@ -339,7 +339,6 @@ func (c *controller) clusterAgentInit() {
 				}
 			}
 		case cluster.EventNodeLeave:
-			keysAvailable = false
 			c.agentOperationStart()
 			c.Lock()
 			c.keys = nil
diff --git a/procfs/procfs_linux_test.go b/procfs/procfs_linux_test.go
index 2669feb81a..009a0f4b30 100644
--- a/procfs/procfs_linux_test.go
+++ b/procfs/procfs_linux_test.go
@@ -24,6 +24,7 @@ import (
 	"runtime"
 	"testing"
 
+	_ "github.com/docker/libnetwork/testutils"
 	"gotest.tools/assert"
 )