Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

little patches #348

Merged
merged 5 commits into from
Apr 15, 2016
Merged

little patches #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
816b3cb
Makefile: use go list to determine the path of scwversion
Apr 15, 2016
e8b714e
Fix: #337
Apr 15, 2016
5dd12f1
api helper: fix commercialtype check
Apr 15, 2016
10b8406
scwversion: Edit comment
Apr 15, 2016
5f0afa0
README: update changelog
Apr 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
3 changes: 3 additions & 0 deletions pkg/api/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 != "" {
Expand Down
2 changes: 1 addition & 1 deletion pkg/scwversion/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down