From 2b5f351062043d8b1c215c1bee67c61271566fae Mon Sep 17 00:00:00 2001 From: Quentin Perez Date: Thu, 24 Mar 2016 17:15:49 +0100 Subject: [PATCH 1/2] Force use bootscript when it's an UUID --- pkg/api/api.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/api/api.go b/pkg/api/api.go index 05e6897206..be913690c0 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -2440,6 +2440,10 @@ func (s *ScalewayAPI) GetQuotas() (*ScalewayGetQuotas, error) { // GetBootscriptID returns exactly one bootscript matching func (s *ScalewayAPI) GetBootscriptID(needle, arch string) (string, error) { // Parses optional type prefix, i.e: "bootscript:name" -> "name" + if anonuuid.IsUUID(needle) == nil { + return needle, nil + } + _, needle = parseNeedle(needle) bootscripts, err := s.ResolveBootscript(needle) From b1724ae3014a1dcdec83964e4a08d455f2c8dd7a Mon Sep 17 00:00:00 2001 From: Quentin Perez Date: Thu, 24 Mar 2016 17:20:17 +0100 Subject: [PATCH 2/2] README.md: update --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 8674495ba8..249dd164fa 100644 --- a/README.md +++ b/README.md @@ -1183,6 +1183,7 @@ $ scw inspect myserver | jq '.[0].public_ip.address' ### master (unreleased) +* GetBootscriptID doesn't try to resolve when we pass an UUID * Add location fields for VPS * `scw ps` add commercial-type column * Use `SCW_SECURE_EXEC` instead of `exec_exec`