Skip to content

Commit 1046989

Browse files
scaleway-botremyleone
scaleway-bot
and
remyleone
authored
chore: bump scaleway sdk (#1977)
Co-authored-by: Rémy Léone <[email protected]>
1 parent 709d7cc commit 1046989

25 files changed

+2438
-2606
lines changed

‎cmd/scw/testdata/test-all-usage-baremetal-server-create-usage.golden‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ARGS:
1616
[project-id] Project ID to use. If none is passed the default project ID will be used
1717
name=<generated> Name of the server (≠hostname)
1818
[description] Description associated to the server, max 255 characters
19-
[type=GP-BM1-S] Server commercial type (GP-BM1-L | GP-BM1-M | GP-BM1-S | HC-BM1-L | HC-BM1-S | HM-BM1-XL | HM-BM1-M)
19+
[type=GP-BM1-S] Server commercial type (GP-BM1-L | GP-BM1-M | GP-BM1-S | GP-BM2-S | GP-BM2-M | HC-BM1-XS | HC-BM1-S | HC-BM1-L | HC-BM1-S | HC-BM2-M | HC-BM2-L | HC-BM2-XL | HM-BM1-S | HM-BM1-M | HM-BM1-XL | HM-BM2-L | HM-BM2-XXL | UP-BM2-M | UP-BM2-XL)
2020
[tags.{index}] Tags to associate to the server
2121
[install.os-id]
2222
[install.hostname]

‎cmd/scw/testdata/test-all-usage-config-set-usage.golden‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ARGS:
2121
[default-organization-id] A default Scaleway organization id
2222
[default-project-id] A default Scaleway project id
2323
[default-region] A default Scaleway region (fr-par | nl-ams | pl-waw)
24-
[default-zone] A default Scaleway zone (fr-par-1 | fr-par-2 | nl-ams-1 | pl-waw-1)
24+
[default-zone] A default Scaleway zone (fr-par-1 | fr-par-2 | fr-par-3 | nl-ams-1 | pl-waw-1)
2525
[send-telemetry] Set to false to disable telemetry
2626

2727
FLAGS:

‎docs/commands/baremetal.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ scw baremetal server create [arg=value ...]
170170
| project-id | | Project ID to use. If none is passed the default project ID will be used |
171171
| name | Required<br />Default: `<generated>` | Name of the server (≠hostname) |
172172
| description | | Description associated to the server, max 255 characters |
173-
| type | Default: `GP-BM1-S`<br />One of: `GP-BM1-L`, `GP-BM1-M`, `GP-BM1-S`, `HC-BM1-L`, `HC-BM1-S`, `HM-BM1-XL`, `HM-BM1-M` | Server commercial type |
173+
| type | Default: `GP-BM1-S`<br />One of: `GP-BM1-L`, `GP-BM1-M`, `GP-BM1-S`, `GP-BM2-S`, `GP-BM2-M`, `HC-BM1-XS`, `HC-BM1-S`, `HC-BM1-L`, `HC-BM1-S`, `HC-BM2-M`, `HC-BM2-L`, `HC-BM2-XL`, `HM-BM1-S`, `HM-BM1-M`, `HM-BM1-XL`, `HM-BM2-L`, `HM-BM2-XXL`, `UP-BM2-M`, `UP-BM2-XL` | Server commercial type |
174174
| tags.{index} | | Tags to associate to the server |
175175
| install.os-id | | |
176176
| install.hostname | | |

‎docs/commands/config.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ scw config set [arg=value ...]
169169
| default-organization-id | | A default Scaleway organization id |
170170
| default-project-id | | A default Scaleway project id |
171171
| default-region | One of: `fr-par`, `nl-ams`, `pl-waw` | A default Scaleway region |
172-
| default-zone | One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `pl-waw-1` | A default Scaleway zone |
172+
| default-zone | One of: `fr-par-1`, `fr-par-2`, `fr-par-3`, `nl-ams-1`, `pl-waw-1` | A default Scaleway zone |
173173
| send-telemetry | | Set to false to disable telemetry |
174174

175175

‎go.mod‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,33 @@ require (
88
github.com/containerd/console v1.0.3
99
github.com/dnaeon/go-vcr v1.2.0
1010
github.com/dustin/go-humanize v1.0.0
11-
github.com/fatih/color v1.13.0
11+
github.com/fatih/color v1.7.0
1212
github.com/getsentry/raven-go v0.2.0
1313
github.com/ghodss/yaml v1.0.0
1414
github.com/gorilla/websocket v1.4.2
1515
github.com/hashicorp/go-version v1.3.0
1616
github.com/karrick/tparse v2.4.2+incompatible
1717
github.com/kubernetes-client/go-base v0.0.0-20190205182333-3d0e39759d98
18-
github.com/mattn/go-colorable v0.1.11
19-
github.com/mattn/go-isatty v0.0.14
20-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20210915130531-0285df8effc0
18+
github.com/mattn/go-colorable v0.0.9
19+
github.com/mattn/go-isatty v0.0.3
20+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20211007145859-8bd4dc50f74b
2121
github.com/spf13/cobra v1.2.1
2222
github.com/spf13/pflag v1.0.5
2323
github.com/stretchr/testify v1.7.0
24-
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b
24+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
2525
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
2626
)
2727

2828
require (
2929
github.com/alecthomas/colour v0.1.0 // indirect
30-
github.com/alecthomas/repr v0.0.0-20200325044227-4184120f674c // indirect
30+
github.com/alecthomas/repr v0.0.0-20210801044451-80ca428c5142 // indirect
3131
github.com/certifi/gocertifi v0.0.0-20210507211836-431795d63e8d // indirect
3232
github.com/davecgh/go-spew v1.1.1 // indirect
3333
github.com/etdub/goparsetime v0.0.0-20160315173935-ea17b0ac3318 // indirect
3434
github.com/inconshreveable/mousetrap v1.0.0 // indirect
35-
github.com/pkg/errors v0.9.1 // indirect
35+
github.com/pkg/errors v0.8.1 // indirect
3636
github.com/pmezard/go-difflib v1.0.0 // indirect
37-
github.com/sergi/go-diff v1.1.0 // indirect
38-
golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 // indirect
37+
github.com/sergi/go-diff v1.2.0 // indirect
38+
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
3939
gopkg.in/yaml.v2 v2.4.0 // indirect
4040
)

‎go.sum‎

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38 h1:smF2tmSOzy2Mm
4343
github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod h1:r7bzyVFMNntcxPZXK3/+KdruV1H5KSlyVY0gc+NgInI=
4444
github.com/alecthomas/colour v0.1.0 h1:nOE9rJm6dsZ66RGWYSFrXw461ZIt9A6+nHgL7FRrDUk=
4545
github.com/alecthomas/colour v0.1.0/go.mod h1:QO9JBoKquHd+jz9nshCh40fOfO+JzsoXy8qTHF68zU0=
46-
github.com/alecthomas/repr v0.0.0-20200325044227-4184120f674c h1:MVVbswUlqicyj8P/JljoocA7AyCo62gzD0O7jfvrhtE=
47-
github.com/alecthomas/repr v0.0.0-20200325044227-4184120f674c/go.mod h1:xTS7Pm1pD1mvyM075QCDSRqH6qRLXylzS24ZTpRiSzQ=
46+
github.com/alecthomas/repr v0.0.0-20210801044451-80ca428c5142 h1:8Uy0oSf5co/NZXje7U1z8Mpep++QJOldL2hs/sBQf48=
47+
github.com/alecthomas/repr v0.0.0-20210801044451-80ca428c5142/go.mod h1:2kn6fqh/zIyPLmm3ugklbEi5hg5wS435eygvNfaDQL8=
4848
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
4949
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
5050
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
@@ -72,7 +72,6 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsr
7272
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
7373
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
7474
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
75-
github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
7675
github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
7776
github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
7877
github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
@@ -86,9 +85,8 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.m
8685
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
8786
github.com/etdub/goparsetime v0.0.0-20160315173935-ea17b0ac3318 h1:iguwbR+9xsizl84VMHU47I4OOWYSex1HZRotEoqziWQ=
8887
github.com/etdub/goparsetime v0.0.0-20160315173935-ea17b0ac3318/go.mod h1:O/QFFckzvu1KpS1AOuQGgi6ErznEF8nZZVNDDMXlDP4=
88+
github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
8989
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
90-
github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
91-
github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
9290
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
9391
github.com/getsentry/raven-go v0.2.0 h1:no+xWJRb5ZI7eE8TWgIq1jLulQiIoLG0IfYxv5JYMGs=
9492
github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ=
@@ -207,14 +205,10 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
207205
github.com/kubernetes-client/go-base v0.0.0-20190205182333-3d0e39759d98 h1:ZMIkOkl/Bg5H4EJI7zbjVXAo4rV0QJOGz2U5A0xUmZU=
208206
github.com/kubernetes-client/go-base v0.0.0-20190205182333-3d0e39759d98/go.mod h1:HPlr4uJEfrxar3JUY9cmXs3oooPjTLO6nEaEAIt5LI8=
209207
github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
208+
github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4=
210209
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
211-
github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
212-
github.com/mattn/go-colorable v0.1.11 h1:nQ+aFkoE2TMGc0b68U2OKSexC+eq46+XwZzWXHRmPYs=
213-
github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
210+
github.com/mattn/go-isatty v0.0.3 h1:ns/ykhmWi7G9O+8a448SecJU3nSMBXJfqQkl0upE1jI=
214211
github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
215-
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
216-
github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
217-
github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
218212
github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
219213
github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
220214
github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
@@ -230,9 +224,8 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb
230224
github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8=
231225
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
232226
github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
227+
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
233228
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
234-
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
235-
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
236229
github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI=
237230
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
238231
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -242,11 +235,11 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L
242235
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
243236
github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
244237
github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
245-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20210915130531-0285df8effc0 h1:rjfzAgwrQV3eZqOfC9K84vd08SAsIqpFR4twmgF6+uc=
246-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20210915130531-0285df8effc0/go.mod h1:CJJ5VAbozOl0yEw7nHB9+7BXTJbIn6h7W+f6Gau5IP8=
238+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20211007145859-8bd4dc50f74b h1:1hqy1UeDJ5StL3pb1iOytD/pLw/puXcCwfgcg2wULAE=
239+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20211007145859-8bd4dc50f74b/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
247240
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
248-
github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
249-
github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
241+
github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
242+
github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
250243
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
251244
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
252245
github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
@@ -402,7 +395,6 @@ golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7w
402395
golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
403396
golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
404397
golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
405-
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
406398
golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
407399
golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
408400
golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -429,13 +421,11 @@ golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7w
429421
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
430422
golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
431423
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
424+
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4=
432425
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
433-
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
434-
golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 h1:foEbQz/B0Oz6YIqu/69kfXPYeFQAuuMYFkjaqXzl5Wo=
435-
golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
436426
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
437-
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b h1:9zKuko04nR4gjZ4+DNjHqRlAJqbJETHwiNKDqTfOjfE=
438-
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
427+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
428+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
439429
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
440430
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
441431
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

‎internal/namespaces/baremetal/v1/custom_server_create.go‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,28 @@ func serverCreateBuilder(c *core.Command) *core.Command {
4444
"GP-BM1-L",
4545
"GP-BM1-M",
4646
"GP-BM1-S",
47+
"GP-BM2-S",
48+
"GP-BM2-M",
4749

4850
// High-computing offers
51+
"HC-BM1-XS",
52+
"HC-BM1-S",
4953
"HC-BM1-L",
5054
"HC-BM1-S",
55+
"HC-BM2-M",
56+
"HC-BM2-L",
57+
"HC-BM2-XL",
5158

5259
// High-Memory offers
53-
"HM-BM1-XL",
60+
"HM-BM1-S",
5461
"HM-BM1-M",
62+
"HM-BM1-XL",
63+
"HM-BM2-L",
64+
"HM-BM2-XXL",
65+
66+
// Ultimate performance
67+
"UP-BM2-M",
68+
"UP-BM2-XL",
5569
},
5670
})
5771

‎internal/namespaces/baremetal/v1/custom_server_create_test.go‎

Lines changed: 9 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"github.com/alecthomas/assert"
88
"github.com/scaleway/scaleway-cli/internal/core"
99
baremetal "github.com/scaleway/scaleway-sdk-go/api/baremetal/v1"
10-
"github.com/scaleway/scaleway-sdk-go/scw"
1110
)
1211

1312
// All test below should succeed to create an instance.
@@ -16,66 +15,38 @@ func Test_CreateServer(t *testing.T) {
1615
t.Run("Simple", func(t *testing.T) {
1716
t.Run("Default", core.Test(&core.TestConfig{
1817
Commands: GetCommands(),
19-
Cmd: "scw baremetal server create -w",
18+
Cmd: "scw baremetal server create zone=nl-ams-1 type=GP-BM2-S -w",
2019
Check: core.TestCheckCombine(
2120
core.TestCheckGolden(),
2221
core.TestCheckExitCode(0),
2322
),
24-
AfterFunc: func(ctx *core.AfterFuncCtx) error {
25-
_, err := baremetal.NewAPI(ctx.Client).DeleteServer(&baremetal.DeleteServerRequest{
26-
ServerID: ctx.CmdResult.(*baremetal.Server).ID,
27-
})
28-
if err != nil {
29-
return err
30-
}
31-
return nil
32-
},
33-
DefaultZone: scw.ZoneFrPar2,
34-
}))
23+
AfterFunc: core.ExecAfterCmd("scw baremetal server delete {{ .CmdResult.ID }} zone=nl-ams-1"),
24+
},
25+
))
3526

3627
t.Run("With name", core.Test(&core.TestConfig{
3728
Commands: GetCommands(),
38-
Cmd: "scw baremetal server create name=test-create-server-with-name -w",
29+
Cmd: "scw baremetal server create name=test-create-server-with-name zone=nl-ams-1 type=GP-BM2-S -w",
3930
Check: core.TestCheckCombine(
4031
func(t *testing.T, ctx *core.CheckFuncCtx) {
4132
assert.Equal(t, "test-create-server-with-name", ctx.Result.(*baremetal.Server).Name)
4233
},
4334
core.TestCheckExitCode(0),
4435
),
45-
DefaultZone: scw.ZoneFrPar2,
46-
AfterFunc: func(ctx *core.AfterFuncCtx) error {
47-
_, err := baremetal.NewAPI(ctx.Client).DeleteServer(&baremetal.DeleteServerRequest{
48-
ServerID: ctx.CmdResult.(*baremetal.Server).ID,
49-
})
50-
if err != nil {
51-
return err
52-
}
53-
54-
return nil
55-
},
36+
AfterFunc: core.ExecAfterCmd("scw baremetal server delete {{ .CmdResult.ID }} zone=nl-ams-1"),
5637
}))
5738

5839
t.Run("Tags", core.Test(&core.TestConfig{
5940
Commands: GetCommands(),
60-
Cmd: "scw baremetal server create tags.0=prod tags.1=blue -w",
41+
Cmd: "scw baremetal server create tags.0=prod tags.1=blue zone=nl-ams-1 type=GP-BM2-S -w",
6142
Check: core.TestCheckCombine(
6243
func(t *testing.T, ctx *core.CheckFuncCtx) {
6344
assert.Equal(t, "prod", ctx.Result.(*baremetal.Server).Tags[0])
6445
assert.Equal(t, "blue", ctx.Result.(*baremetal.Server).Tags[1])
6546
},
6647
core.TestCheckExitCode(0),
6748
),
68-
DefaultZone: scw.ZoneFrPar2,
69-
AfterFunc: func(ctx *core.AfterFuncCtx) error {
70-
_, err := baremetal.NewAPI(ctx.Client).DeleteServer(&baremetal.DeleteServerRequest{
71-
ServerID: ctx.CmdResult.(*baremetal.Server).ID,
72-
})
73-
if err != nil {
74-
return err
75-
}
76-
77-
return nil
78-
},
49+
AfterFunc: core.ExecAfterCmd("scw baremetal server delete {{ .CmdResult.ID }} zone=nl-ams-1"),
7950
}))
8051
})
8152

@@ -88,7 +59,7 @@ func Test_CreateServer(t *testing.T) {
8859
Check: core.TestCheckCombine(
8960
core.TestCheckError(&core.CliError{
9061
Err: fmt.Errorf("invalid value 'foobar' for arg 'type'"),
91-
Hint: "Accepted values for 'type' are [GP-BM1-L GP-BM1-M GP-BM1-S HC-BM1-L HC-BM1-S HM-BM1-XL HM-BM1-M]",
62+
Hint: "Accepted values for 'type' are [GP-BM1-L GP-BM1-M GP-BM1-S GP-BM2-S GP-BM2-M HC-BM1-XS HC-BM1-S HC-BM1-L HC-BM1-S HC-BM2-M HC-BM2-L HC-BM2-XL HM-BM1-S HM-BM1-M HM-BM1-XL HM-BM2-L HM-BM2-XXL UP-BM2-M UP-BM2-XL]",
9263
}),
9364
core.TestCheckExitCode(1),
9465
),

0 commit comments

Comments
 (0)