Merge pull request #170 from tcchend/convert-govendor-to-go-mod

Convert govendor to go mod

.travis.yml

@@ -5,13 +5,11 @@ services:
 
 language: go
 go:
-  - 1.11
+  - 1.13
 
 env:
   matrix:
-    - GO_VERSION=1.11
-    - GO_VERSION=1.10
-    - GO_VERSION=1.9
+    - GO_VERSION=1.13
 
 cache:
   directories:

Makefile

@@ -35,8 +35,8 @@ all: check build unit release
 check: vet lint
 
 vet:
-	@echo "go tool vet, skipping vendor packages"
-	@go tool vet -all ${DIRS_TO_CHECK}
+	@echo "go vet"
+	@for i in $DIRS_TO_CHECK; do go vet ./$i;done
 	@echo "ok"
 
 lint:
@@ -98,25 +98,25 @@ unit-race:
 	go test -v -race -cpu=1,2,4 ${PKGS_TO_CHECK}
 	@echo "ok"
 
-unit-runtime: unit-runtime-go-1.9 unit-runtime-go-1.10 unit-runtime-go-1.11
+unit-runtime: unit-runtime-go-1.13
 
-export define DOCKERFILE_GO_1_11
-FROM golang:1.11
+export define DOCKERFILE_GO_1_13
+FROM golang:1.13
 
 ADD . /go/src/github.com/yunify/qingcloud-sdk-go
 WORKDIR /go/src/github.com/yunify/qingcloud-sdk-go
 
 CMD ["make", "build", "unit"]
 endef
 
-unit-runtime-go-1.11:
-	@echo "run test in go 1.11"
-	echo "$${DOCKERFILE_GO_1_11}" > "dockerfile_go_1.11"
-	docker build -f "./dockerfile_go_1.11" -t "${PREFIX}:go-1.11" .
-	rm -f "./dockerfile_go_1.11"
-	docker run --name "${PREFIX}-go-1.11-unit" -t "${PREFIX}:go-1.11"
-	docker rm "${PREFIX}-go-1.11-unit"
-	docker rmi "${PREFIX}:go-1.11"
+unit-runtime-go-1.13:
+	@echo "run test in go 1.13"
+	echo "$${DOCKERFILE_GO_1_13}" > "dockerfile_go_1.13"
+	docker build -f "./dockerfile_go_1.13" -t "${PREFIX}:go-1.13" .
+	rm -f "./dockerfile_go_1.13"
+	docker run --name "${PREFIX}-go-1.13-unit" -t "${PREFIX}:go-1.13"
+	docker rm "${PREFIX}-go-1.13-unit"
+	docker rmi "${PREFIX}:go-1.13"
 	@echo "ok"
 
 export define DOCKERFILE_GO_1_10

go.mod

@@ -0,0 +1,16 @@
+module github.com/yunify/qingcloud-sdk-go
+
+go 1.13
+
+require (
+	github.com/DATA-DOG/godog v0.10.0
+	github.com/sirupsen/logrus v1.6.0
+	github.com/stretchr/testify v1.6.1
+	gopkg.in/yaml.v2 v2.3.0
+)
+
+replace github.com/DATA-DOG/godog v0.10.0 => github.com/cucumber/godog v0.7.9
+
+replace github.com/golang/lint v0.0.0-20200302205851-738671d3881b => golang.org/x/lint v0.0.0-20200302205851-738671d3881b
+
+replace golang.org/x/lint v0.0.0-20200302205851-738671d3881b => github.com/golang/lint v0.0.0-20200302205851-738671d3881b

go.sum

@@ -0,0 +1,23 @@
+github.com/cucumber/godog v0.7.9 h1:xBFguv4NJkVgDTGE95g53uzxruxQMclSee/L6rI7NTc=
+github.com/cucumber/godog v0.7.9/go.mod h1:2+kSV+QWoeX5l4THUNR1v5OnHuGM9QUD7nQILpqoklI=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8=
+github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
+github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=