From 47a03caff625bdeb0f295610dc505f37d0b286c3 Mon Sep 17 00:00:00 2001
From: Cheng Pan <chengpan@amazon.com>
Date: Tue, 3 Dec 2019 00:31:07 -0800
Subject: [PATCH] Use main from e2e tester

---
 Makefile           |  4 +++-
 go.mod             |  2 +-
 go.sum             |  6 ++++++
 tester/cmd/main.go | 25 -------------------------
 4 files changed, 10 insertions(+), 27 deletions(-)
 delete mode 100644 tester/cmd/main.go

diff --git a/Makefile b/Makefile
index 2a3f8da6c..3ecc8b62e 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,7 @@ BUILD_DATE?=$(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
 LDFLAGS?="-X ${PKG}/pkg/driver.driverVersion=${VERSION} -X ${PKG}/pkg/driver.gitCommit=${GIT_COMMIT} -X ${PKG}/pkg/driver.buildDate=${BUILD_DATE}"
 GO111MODULE=on
 GOPROXY=direct
+GOPATH=$(shell go env GOPATH)
 
 .EXPORT_ALL_VARIABLES:
 
@@ -41,7 +42,8 @@ test:
 
 .PHONY: test-e2e
 test-e2e:
-	TESTCONFIG=./tester/e2e-test-config.yaml go run tester/cmd/main.go
+	go get github.com/aws/aws-k8s-tester/e2e/tester/cmd/k8s-e2e-tester@master
+	TESTCONFIG=./tester/e2e-test-config.yaml ${GOPATH}/bin/k8s-e2e-tester
 
 .PHONY: image
 image:
diff --git a/go.mod b/go.mod
index 6d1ad897a..b08d619e6 100644
--- a/go.mod
+++ b/go.mod
@@ -1,7 +1,7 @@
 module github.com/kubernetes-sigs/aws-efs-csi-driver
 
 require (
-	github.com/aws/aws-k8s-tester/e2e/tester v0.0.0-20191012181850-1ee05aff3c62
+	github.com/aws/aws-k8s-tester/e2e/tester v0.0.0-20191204032858-d97ad2e4255e // indirect
 	github.com/aws/aws-sdk-go v1.23.21
 	github.com/container-storage-interface/spec v1.1.0
 	github.com/golang/mock v1.3.1
diff --git a/go.sum b/go.sum
index 3904e7bbc..c0b540b56 100644
--- a/go.sum
+++ b/go.sum
@@ -45,8 +45,14 @@ github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5
 github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7/go.mod h1:LWMyo4iOLWXHGdBki7NIht1kHru/0wM179h+d3g8ATM=
+github.com/aws/aws-k8s-tester v0.4.5-0.20191203073900-e5a28058b567 h1:tzabayjAiOaNO1nEoy+Fj9JHs1X3+LYqrRHbJRfVwqg=
+github.com/aws/aws-k8s-tester v0.4.5-0.20191204032858-d97ad2e4255e h1:WSYBU6UIqHrVV5xoVpWwacwaIGY8+oohVmhaszJSqFA=
 github.com/aws/aws-k8s-tester/e2e/tester v0.0.0-20191012181850-1ee05aff3c62 h1:Yrm8Zmwd0mW+9Z0wMtt5CdRK1QZGiPx1fq3HwL5L9io=
 github.com/aws/aws-k8s-tester/e2e/tester v0.0.0-20191012181850-1ee05aff3c62/go.mod h1:xCa3ZGICI7/IqtJdYjEsM3QL9vwlLHxgwSA/MD09Zgo=
+github.com/aws/aws-k8s-tester/e2e/tester v0.0.0-20191203073900-e5a28058b567 h1:6zSO87AbCbY3doj1VEaqIs9Z81QxzNX0LWF7o2P6liU=
+github.com/aws/aws-k8s-tester/e2e/tester v0.0.0-20191203073900-e5a28058b567/go.mod h1:DJkIJa8BA0LCJWjl01jsEl8vm/fjei0uWJFzZol0KUI=
+github.com/aws/aws-k8s-tester/e2e/tester v0.0.0-20191204032858-d97ad2e4255e h1:QbCzp3el1/7dBBLfM+LPB2KkXaU+Svlpp4Yod/hIueQ=
+github.com/aws/aws-k8s-tester/e2e/tester v0.0.0-20191204032858-d97ad2e4255e/go.mod h1:DJkIJa8BA0LCJWjl01jsEl8vm/fjei0uWJFzZol0KUI=
 github.com/aws/aws-sdk-go v1.16.26/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.23.21 h1:eVJT2C99cAjZlBY8+CJovf6AwrSANzAcYNuxdCB+SPk=
 github.com/aws/aws-sdk-go v1.23.21/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
diff --git a/tester/cmd/main.go b/tester/cmd/main.go
deleted file mode 100644
index 8e4a255d6..000000000
--- a/tester/cmd/main.go
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-Copyright 2019 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package main
-
-import (
-	"github.com/aws/aws-k8s-tester/e2e/tester"
-)
-
-func main() {
-	tester.Start()
-}