Merge pull request scaleway#112 from terraform-providers/go-modules-2019-03-01

[MODULES] Switch to Go Modules

Author: nicolai86

.go-version

@@ -0,0 +1 @@
+1.11.5

.travis.yml

@@ -12,11 +12,9 @@ install:
 # packages that live there.
 # See: https://github.com/golang/go/issues/12933
 - bash scripts/gogetcookie.sh
-- go get github.com/kardianos/govendor
 
 script:
 - make test
-- make vendor-status
 - make vet
 - make website-test
 
@@ -27,3 +25,5 @@ matrix:
   fast_finish: true
   allow_failures:
   - go: tip
+env:
+  - GOFLAGS=-mod=vendor GO111MODULE=on

GNUmakefile

@@ -34,8 +34,6 @@ fmtcheck:
 errcheck:
 	@sh -c "'$(CURDIR)/scripts/errcheck.sh'"
 
-vendor-status:
-	@govendor status
 
 test-compile:
 	@if [ "$(TEST)" = "./..." ]; then \
@@ -59,5 +57,5 @@ ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO)))
 endif
 	@$(MAKE) -C $(GOPATH)/src/$(WEBSITE_REPO) website-provider-test PROVIDER_PATH=$(shell pwd) PROVIDER_NAME=$(PKG_NAME)
 
-.PHONY: build test testacc vet fmt fmtcheck errcheck vendor-status test-compile website website-test
+.PHONY: build test testacc vet fmt fmtcheck errcheck test-compile website website-test
 

go.mod

@@ -0,0 +1,12 @@
+module github.com/terraform-providers/terraform-provider-scaleway
+
+require (
+	github.com/blang/semver v3.5.1+incompatible // indirect
+	github.com/hashicorp/go-retryablehttp v0.5.1
+	github.com/hashicorp/terraform v0.11.12-beta1.0.20190227065421-fc531f54a878
+	github.com/nicolai86/scaleway-sdk v0.0.0-20181024210327-b20018e944c4
+	github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa // indirect
+	golang.org/x/crypto v0.0.0-20180211211603-9de5f2eaf759
+	golang.org/x/sys v0.0.0-20190228124157-a34e9553db1e // indirect
+	golang.org/x/text v0.3.0 // indirect
+)

go.sum

@@ -2,6 +2,7 @@ package scaleway
 
 import (
 	"bytes"
+	"context"
 	"io"
 	"io/ioutil"
 	"log"
@@ -62,14 +63,14 @@ func (c *Config) Client() (*Client, error) {
 			cl.RetryWaitMax = 2 * time.Minute
 			cl.Logger = log.New(os.Stderr, "", 0)
 			cl.RetryWaitMin = time.Minute
-			cl.CheckRetry = func(resp *http.Response, err error) (bool, error) {
+			cl.CheckRetry = func(_ context.Context, resp *http.Response, err error) (bool, error) {
 				if resp == nil {
 					return true, err
 				}
 				if resp.StatusCode == http.StatusTooManyRequests {
 					return true, err
 				}
-				return retryablehttp.DefaultRetryPolicy(resp, err)
+				return retryablehttp.DefaultRetryPolicy(context.TODO(), resp, err)
 			}
 			c.Client = &client{cl}
 		},