Various Changes

.gopmfile

@@ -1,8 +1,7 @@
 [deps]
-github.com/Sirupsen/logrus = 
-github.com/docker/docker = 
-github.com/scaleway/scaleway-cli = 
+github.com/sirupsen/logrus =
+github.com/docker/docker =
+github.com/scaleway/scaleway-cli =
 
 [res]
-include = 
-
+include =

.travis.yml

@@ -19,7 +19,11 @@ matrix:
       env:  TEST_WITH_REAL_API=0 GOTESTFLAGS="-race -cpu=1,2,4"
     - go:   1.8
       env:  TEST_WITH_REAL_API=0 GOTESTFLAGS="-race -cpu=1,2,4"
-    - go:   1.8
+    - go:   1.9
+      env:  TEST_WITH_REAL_API=0 GOTESTFLAGS="-race -cpu=1,2,4"
+    - go:   "1.10"
+      env:  TEST_WITH_REAL_API=0 GOTESTFLAGS="-race -cpu=1,2,4"
+    - go:   "1.10"
       env:  TEST_WITH_REAL_API=1
     - go:   tip
       env:  TEST_WITH_REAL_API=0 GOTESTFLAGS="-race -cpu=1,2,4"

Makefile

@@ -1,5 +1,5 @@
 # Go parameters
-GOENV ?=	GO15VENDOREXPERIMENT=1
+GOENV ?=
 GO ?=		$(GOENV) go
 GODEP ?=	$(GOENV) godep
 GOBUILD ?=	$(GO) build
@@ -41,13 +41,6 @@ REV =		$(shell git rev-parse --short HEAD 2>/dev/null || echo "nogit")
 LDFLAGS = "-X `go list ./pkg/scwversion`.GITCOMMIT=$(REV) -s"
 BUILDER =	scaleway-cli-builder
 
-# Check go version
-GOVERSIONMAJOR = $(shell go version | grep -o '[1-9].[0-9]' | cut -d '.' -f1)
-GOVERSIONMINOR = $(shell go version | grep -o '[1-9].[0-9]' | cut -d '.' -f2)
-VERSION_GE_1_5 = $(shell [ $(GOVERSIONMAJOR) -gt 1 -o $(GOVERSIONMINOR) -ge 5 ] && echo true)
-ifneq ($(VERSION_GE_1_5),true)
-	$(error Bad go version, please install a version greater than or equal to 1.5)
-endif
 
 BUILD_LIST =		$(foreach int, $(COMMANDS), $(int)_build)
 CLEAN_LIST =		$(foreach int, $(COMMANDS) $(PACKAGES), $(int)_clean)

cmd/scw/main.go

@@ -11,8 +11,8 @@ package main
 import (
 	"os"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/scaleway/scaleway-cli/pkg/cli"
+	"github.com/sirupsen/logrus"
 )
 
 func main() {

pkg/api/README.md

@@ -1,26 +1,3 @@
 # Scaleway's API
 
-[![GoDoc](https://godoc.org/github.com/scaleway/scaleway-cli/pkg/api?status.svg)](https://godoc.org/github.com/scaleway/scaleway-cli/pkg/api)
-
-This package contains facilities to play with the Scaleway API, it includes the following features:
-
-- dedicated configuration file containing credentials to deal with the API
-- caching to resolve UUIDs without contacting the API
-
-## Links
-
-- [API documentation](https://developer.scaleway.com)
-- [Official Python SDK](https://github.com/scaleway/python-scaleway)
-- Projects using this SDK
-  - https://github.com/scaleway/devhub
-  - https://github.com/scaleway/docker-machine-driver-scaleway
-  - https://github.com/huseyin/docker-machine-driver-scaleway
-  - https://github.com/scaleway-community/scaleway-ubuntu-coreos/blob/master/overlay/usr/local/update-firewall/scw-api/cache.go
-  - https://github.com/pulcy/quark
-  - https://github.com/hex-sh/terraform-provider-scaleway
-  - https://github.com/tscolari/bosh-scaleway-cpi
-- Other **golang** clients
-  - https://github.com/lalyos/onlabs
-  - https://github.com/meatballhat/packer-builder-onlinelabs
-  - https://github.com/nlamirault/go-scaleway
-  - https://github.com/golang/build/blob/master/cmd/scaleway/scaleway.go
+## Deprecated in favor of https://github.com/scaleway/go-scaleway

pkg/api/helpers.go

@@ -14,12 +14,12 @@ import (
 	"sync"
 	"time"
 
-	"github.com/Sirupsen/logrus"
-	log "github.com/Sirupsen/logrus"
 	"github.com/docker/docker/pkg/namesgenerator"
 	"github.com/dustin/go-humanize"
 	"github.com/moul/anonuuid"
 	"github.com/scaleway/scaleway-cli/pkg/utils"
+	"github.com/sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 )
 
 // ScalewayResolvedIdentifier represents a list of matching identifier for a specifier pattern

pkg/cli/cmd_images.go

@@ -7,8 +7,8 @@ package cli
 import (
 	"strings"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/scaleway/scaleway-cli/pkg/commands"
+	"github.com/sirupsen/logrus"
 )
 
 var cmdImages = &Command{

pkg/cli/cmd_ps.go

@@ -7,8 +7,8 @@ package cli
 import (
 	"strings"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/scaleway/scaleway-cli/pkg/commands"
+	"github.com/sirupsen/logrus"
 )
 
 var cmdPs = &Command{

pkg/cli/main.go

@@ -13,8 +13,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/Sirupsen/logrus"
 	flag "github.com/docker/docker/pkg/mflag"
+	"github.com/sirupsen/logrus"
 
 	version "github.com/hashicorp/go-version"
 	"github.com/scaleway/scaleway-cli/pkg/api"

pkg/cli/x_billing.go

@@ -11,11 +11,11 @@ import (
 	"text/tabwriter"
 	"time"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/go-units"
 	"github.com/scaleway/scaleway-cli/pkg/commands"
 	"github.com/scaleway/scaleway-cli/pkg/pricing"
 	"github.com/scaleway/scaleway-cli/pkg/utils"
+	"github.com/sirupsen/logrus"
 )
 
 var cmdBilling = &Command{

pkg/cli/x_patch.go

@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"strings"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 
 	api "github.com/scaleway/scaleway-cli/pkg/api"
 )

pkg/clilogger/clilogger.go

@@ -4,9 +4,9 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/moul/http2curl"
 	"github.com/scaleway/scaleway-cli/pkg/api"
+	"github.com/sirupsen/logrus"
 )
 
 type cliLogger struct {