From 816b3cb4fc89a84a00f04282acc61e2ae89c2157 Mon Sep 17 00:00:00 2001 From: Quentin Perez Date: Fri, 15 Apr 2016 11:14:57 +0200 Subject: [PATCH 1/5] Makefile: use go list to determine the path of scwversion --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f4bd632405..bff8a0c31f 100644 --- a/Makefile +++ b/Makefile @@ -33,9 +33,9 @@ PACKAGES := $(shell go list ./... | grep -v /vendor/ | grep -v /cmd/) REL_COMMANDS := $(subst $(GODIR),.,$(COMMANDS)) REL_PACKAGES := $(subst $(GODIR),.,$(PACKAGES)) VERSION = $(shell cat .goxc.json | grep "PackageVersion" | egrep -o "([0-9]{1,}\.)+[0-9]{1,}") -REV = $(shell git rev-parse HEAD || echo "nogit") +REV = $(shell git rev-parse --short HEAD || echo "nogit") TAG = $(shell git describe --tags --always || echo $(VERSION) || echo "nogit") -LDFLAGS = "-X github.com/scaleway/scaleway-cli/pkg/scwversion.GITCOMMIT=$(REV)" +LDFLAGS = "-X `go list ./pkg/scwversion`.GITCOMMIT=$(REV) -s" BUILDER = scaleway-cli-builder # Check go version From e8b714efd30fcec8a65482b87dd64fdbea831337 Mon Sep 17 00:00:00 2001 From: Quentin Perez Date: Fri, 15 Apr 2016 11:16:02 +0200 Subject: [PATCH 2/5] Fix: #337 --- pkg/api/api.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/api/api.go b/pkg/api/api.go index cdc7dbff55..2784159c73 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -1392,6 +1392,9 @@ func (s *ScalewayAPI) GetImages() (*[]MarketImage, error) { return nil, err } body, err := s.handleHTTPError([]int{200}, resp) + if err != nil { + return nil, err + } var OrgaImages ScalewayImages if err = json.Unmarshal(body, &OrgaImages); err != nil { From 5dd12f192d881ccdbfcddfcefe7d221edbca61f3 Mon Sep 17 00:00:00 2001 From: Quentin Perez Date: Fri, 15 Apr 2016 11:16:29 +0200 Subject: [PATCH 3/5] api helper: fix commercialtype check --- pkg/api/helpers.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/api/helpers.go b/pkg/api/helpers.go index e2f90d799f..ab7f1f7dc7 100644 --- a/pkg/api/helpers.go +++ b/pkg/api/helpers.go @@ -313,7 +313,7 @@ func CreateServer(api *ScalewayAPI, c *ConfigCreateServer) (string, error) { server.CommercialType = commercialType server.Volumes = make(map[string]string) server.DynamicIPRequired = &c.DynamicIPRequired - if c.CommercialType == "" { + if commercialType == "" { return "", errors.New("You need to specify a commercial-type") } if c.IP != "" { From 10b84068e3665f63dc6cca713feee0ec585d321b Mon Sep 17 00:00:00 2001 From: Quentin Perez Date: Fri, 15 Apr 2016 11:16:59 +0200 Subject: [PATCH 4/5] scwversion: Edit comment --- pkg/scwversion/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/scwversion/version.go b/pkg/scwversion/version.go index a058eaa430..33e0f37199 100644 --- a/pkg/scwversion/version.go +++ b/pkg/scwversion/version.go @@ -3,7 +3,7 @@ package scwversion import "fmt" var ( - // VERSION represents the semver version of the package, it is configured at build time + // VERSION represents the semver version of the package VERSION = "v1.9.0+dev" // GITCOMMIT represents the git commit hash of the package, it is configured at build time From 5f0afa070be14f2c3a38f8192b43d504fd9f30e6 Mon Sep 17 00:00:00 2001 From: Quentin Perez Date: Fri, 15 Apr 2016 11:21:57 +0200 Subject: [PATCH 5/5] README: update changelog --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 2b9dfe3547..258742e00f 100644 --- a/README.md +++ b/README.md @@ -1184,6 +1184,7 @@ $ scw inspect myserver | jq '.[0].public_ip.address' ### master (unreleased) +* Fix `scw images` bad error message ([#336](https://github.com/scaleway/scaleway-cli/issues/337)) * Fix sshExecCommand with Windows ([#338](https://github.com/scaleway/scaleway-cli/issues/338)) * Fix `scw login` with Windows ([#341](https://github.com/scaleway/scaleway-cli/issues/341)) * Add `enable_ipv6` field ([#334](https://github.com/scaleway/scaleway-cli/issues/334))