From 4184062dd2c52f7a34b75c4bdfbffc6791ca7c7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= Date: Mon, 13 Jun 2022 10:00:03 +0200 Subject: [PATCH 1/5] chore: bump sdk --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 6f06ebab17..d1405c963b 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/kubernetes-client/go-base v0.0.0-20190205182333-3d0e39759d98 github.com/mattn/go-colorable v0.1.12 github.com/mattn/go-isatty v0.0.14 - github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9.0.20220602155859-78a7965b16ff + github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9.0.20220610160507-5be0939be9ed github.com/spf13/cobra v1.4.0 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.7.2 diff --git a/go.sum b/go.sum index f3135d9472..5a45080203 100644 --- a/go.sum +++ b/go.sum @@ -57,8 +57,8 @@ github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9.0.20220602155859-78a7965b16ff h1:TCGs/rpF1xnLQg8Aru/2jYTwjKKVhXU1xieUef7FQ0U= -github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9.0.20220602155859-78a7965b16ff/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg= +github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9.0.20220610160507-5be0939be9ed h1:oGXgDFPd9GsWp9xa2stcq9mS7jVR9ljWCZQwTcfKrD4= +github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9.0.20220610160507-5be0939be9ed/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg= github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q= From c98d7863c28ed2179b5d37f2990dda717582ce01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= Date: Mon, 13 Jun 2022 10:33:24 +0200 Subject: [PATCH 2/5] FIx --- docs/commands/baremetal.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/commands/baremetal.md b/docs/commands/baremetal.md index f2b0292ee7..5df31e166d 100644 --- a/docs/commands/baremetal.md +++ b/docs/commands/baremetal.md @@ -297,7 +297,7 @@ scw baremetal server install [arg=value ...] Install an OS on a given server with a particular SSH key ID ``` -scw baremetal server install 11111111-1111-1111-1111-111111111111 os-id=11111111-1111-1111-1111-111111111111 ssh-key-ids.0=11111111-1111-1111-1111-111111111111 +scw baremetal server install 11111111-1111-1111-1111-111111111111 ssh-key-ids.0=11111111-1111-1111-1111-111111111111 ``` From ad04c466239e84fa22cee01944a5c56772dc6639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= Date: Mon, 13 Jun 2022 11:55:58 +0200 Subject: [PATCH 3/5] Fix --- go.mod | 40 ---------------------------------------- go.sum | 2 ++ 2 files changed, 2 insertions(+), 40 deletions(-) diff --git a/go.mod b/go.mod index d1405c963b..4ea2b1b3bb 100644 --- a/go.mod +++ b/go.mod @@ -1,43 +1,3 @@ module github.com/scaleway/scaleway-cli go 1.17 - -require ( - github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38 - github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e - github.com/containerd/console v1.0.3 - github.com/dnaeon/go-vcr v1.2.0 - github.com/dustin/go-humanize v1.0.0 - github.com/fatih/color v1.13.0 - github.com/getsentry/raven-go v0.2.0 - github.com/ghodss/yaml v1.0.0 - github.com/gorilla/websocket v1.5.0 - github.com/hashicorp/go-version v1.5.0 - github.com/karrick/tparse v2.4.2+incompatible - github.com/kubernetes-client/go-base v0.0.0-20190205182333-3d0e39759d98 - github.com/mattn/go-colorable v0.1.12 - github.com/mattn/go-isatty v0.0.14 - github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9.0.20220610160507-5be0939be9ed - github.com/spf13/cobra v1.4.0 - github.com/spf13/pflag v1.0.5 - github.com/stretchr/testify v1.7.2 - golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 - golang.org/x/text v0.3.7 - gopkg.in/yaml.v3 v3.0.1 -) - -require ( - github.com/alecthomas/colour v0.1.0 // indirect - github.com/alecthomas/repr v0.0.0-20210801044451-80ca428c5142 // indirect - github.com/certifi/gocertifi v0.0.0-20210507211836-431795d63e8d // indirect - github.com/chzyer/logex v1.2.0 // indirect - github.com/chzyer/test v0.0.0-20210722231415-061457976a23 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect - github.com/etdub/goparsetime v0.0.0-20160315173935-ea17b0ac3318 // indirect - github.com/inconshreveable/mousetrap v1.0.0 // indirect - github.com/pkg/errors v0.8.1 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/sergi/go-diff v1.2.0 // indirect - golang.org/x/sys v0.0.0-20211205182925-97ca703d548d // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect -) diff --git a/go.sum b/go.sum index 5a45080203..10ce65a16e 100644 --- a/go.sum +++ b/go.sum @@ -59,6 +59,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9.0.20220610160507-5be0939be9ed h1:oGXgDFPd9GsWp9xa2stcq9mS7jVR9ljWCZQwTcfKrD4= github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9.0.20220610160507-5be0939be9ed/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg= +github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9.0.20220613094705-be70f243d339 h1:p/fh0AxdiWlRdhmzRvFBMhlupgrvXUnqlbWkcZubQT0= +github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9.0.20220613094705-be70f243d339/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg= github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q= From 6f4b9870069b4e9fb49be857d0b354340d2fff1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= Date: Mon, 13 Jun 2022 11:57:53 +0200 Subject: [PATCH 4/5] Fix --- go.mod | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/go.mod b/go.mod index 4ea2b1b3bb..dcd7628f94 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,43 @@ module github.com/scaleway/scaleway-cli go 1.17 + +require ( + github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38 + github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e + github.com/containerd/console v1.0.3 + github.com/dnaeon/go-vcr v1.2.0 + github.com/dustin/go-humanize v1.0.0 + github.com/fatih/color v1.13.0 + github.com/getsentry/raven-go v0.2.0 + github.com/ghodss/yaml v1.0.0 + github.com/gorilla/websocket v1.5.0 + github.com/hashicorp/go-version v1.5.0 + github.com/karrick/tparse v2.4.2+incompatible + github.com/kubernetes-client/go-base v0.0.0-20190205182333-3d0e39759d98 + github.com/mattn/go-colorable v0.1.12 + github.com/mattn/go-isatty v0.0.14 + github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9.0.20220613094705-be70f243d339 + github.com/spf13/cobra v1.4.0 + github.com/spf13/pflag v1.0.5 + github.com/stretchr/testify v1.7.2 + golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 + golang.org/x/text v0.3.7 + gopkg.in/yaml.v3 v3.0.1 +) + +require ( + github.com/alecthomas/colour v0.1.0 // indirect + github.com/alecthomas/repr v0.0.0-20210801044451-80ca428c5142 // indirect + github.com/certifi/gocertifi v0.0.0-20210507211836-431795d63e8d // indirect + github.com/chzyer/logex v1.2.0 // indirect + github.com/chzyer/test v0.0.0-20210722231415-061457976a23 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/etdub/goparsetime v0.0.0-20160315173935-ea17b0ac3318 // indirect + github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/pkg/errors v0.8.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/sergi/go-diff v1.2.0 // indirect + golang.org/x/sys v0.0.0-20211205182925-97ca703d548d // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect +) From bf65e7cb8a5aa3c59b83d9a56429ede57211566b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= Date: Mon, 13 Jun 2022 12:03:37 +0200 Subject: [PATCH 5/5] Fix --- docs/commands/baremetal.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/commands/baremetal.md b/docs/commands/baremetal.md index 5df31e166d..f2b0292ee7 100644 --- a/docs/commands/baremetal.md +++ b/docs/commands/baremetal.md @@ -297,7 +297,7 @@ scw baremetal server install [arg=value ...] Install an OS on a given server with a particular SSH key ID ``` -scw baremetal server install 11111111-1111-1111-1111-111111111111 ssh-key-ids.0=11111111-1111-1111-1111-111111111111 +scw baremetal server install 11111111-1111-1111-1111-111111111111 os-id=11111111-1111-1111-1111-111111111111 ssh-key-ids.0=11111111-1111-1111-1111-111111111111 ```