Skip to content

Commit 3e4802c

Browse files
scaleway-botscaleway-bot
authored
Merge branch 'scaleway:master' into master
2 parents 7f42af5 + d30cd72 commit 3e4802c

15 files changed

+16476
-13953
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ ARGS:
4040
[install.partitioning-schema.zfs.pools.{index}.filesystem-options.{index}]
4141
[option-ids.{index}] IDs of options to enable on server
4242
[protected] If enabled, the server can not be deleted
43+
[user-data] Configuration data to pass to cloud-init such as a YAML cloud config data or a user-data script
4344
[organization-id] Organization ID to use. If none is passed the default organization ID will be used
4445
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-2 | pl-waw-2 | pl-waw-3)
4546

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ ARGS:
3838
[partitioning-schema.zfs.pools.{index}.filesystem-options.{index}]
3939
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-2 | pl-waw-2 | pl-waw-3)
4040

41+
DEPRECATED ARGS:
42+
[user-data.name]
43+
[user-data.content-type]
44+
[user-data.content]
45+
4146
FLAGS:
4247
-h, --help help for install
4348
-w, --wait wait until the server is ready

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ ARGS:
1111
[description] Description associated with the server, max 255 characters, not updated if null
1212
[tags.{index}] Tags associated with the server, not updated if null
1313
[protected] If enabled, the server can not be deleted
14+
[user-data] Configuration data to pass to cloud-init such as a YAML cloud config data or a user-data script
1415
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-2 | pl-waw-2 | pl-waw-3)
1516

1617
FLAGS:

‎docs/commands/baremetal.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -565,6 +565,7 @@ scw baremetal server create [arg=value ...]
565565
| install.partitioning-schema.zfs.pools.{index}.filesystem-options.{index} | | |
566566
| option-ids.{index} | | IDs of options to enable on server |
567567
| protected | | If enabled, the server can not be deleted |
568+
| user-data | | Configuration data to pass to cloud-init such as a YAML cloud config data or a user-data script |
568569
| organization-id | | Organization ID to use. If none is passed the default organization ID will be used |
569570
| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `nl-ams-2`, `pl-waw-2`, `pl-waw-3` | Zone to target. If none is passed will use default zone from the config |
570571

@@ -700,6 +701,9 @@ scw baremetal server install <server-id ...> [arg=value ...]
700701
| partitioning-schema.zfs.pools.{index}.devices.{index} | | |
701702
| partitioning-schema.zfs.pools.{index}.options.{index} | | |
702703
| partitioning-schema.zfs.pools.{index}.filesystem-options.{index} | | |
704+
| ~~user-data.name~~ | Deprecated | |
705+
| ~~user-data.content-type~~ | Deprecated | |
706+
| ~~user-data.content~~ | Deprecated | |
703707
| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `nl-ams-2`, `pl-waw-2`, `pl-waw-3` | Zone to target. If none is passed will use default zone from the config |
704708

705709

@@ -895,6 +899,7 @@ scw baremetal server update <server-id ...> [arg=value ...]
895899
| description | | Description associated with the server, max 255 characters, not updated if null |
896900
| tags.{index} | | Tags associated with the server, not updated if null |
897901
| protected | | If enabled, the server can not be deleted |
902+
| user-data | | Configuration data to pass to cloud-init such as a YAML cloud config data or a user-data script |
898903
| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `nl-ams-2`, `pl-waw-2`, `pl-waw-3` | Zone to target. If none is passed will use default zone from the config |
899904

900905

‎go.mod‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.25.0
44

55
require (
66
github.com/aws/aws-sdk-go-v2 v1.39.4
7-
github.com/aws/aws-sdk-go-v2/service/s3 v1.88.6
7+
github.com/aws/aws-sdk-go-v2/service/s3 v1.88.7
88
github.com/buildpacks/pack v0.38.2
99
github.com/c-bata/go-prompt v0.2.6
1010
github.com/charmbracelet/bubbletea v1.3.10
@@ -23,7 +23,7 @@ require (
2323
github.com/mattn/go-isatty v0.0.20
2424
github.com/moby/buildkit v0.25.1
2525
github.com/opencontainers/go-digest v1.0.0
26-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251021162421-9dee01f565c9
26+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251024091811-f46054a61f65
2727
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
2828
github.com/spf13/cobra v1.10.1
2929
github.com/spf13/pflag v1.0.10
@@ -58,16 +58,16 @@ require (
5858
github.com/aws/aws-sdk-go-v2/config v1.31.6 // indirect
5959
github.com/aws/aws-sdk-go-v2/credentials v1.18.10 // indirect
6060
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.6 // indirect
61-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.10 // indirect
62-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.10 // indirect
61+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.11 // indirect
62+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.11 // indirect
6363
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
64-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.10 // indirect
64+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.11 // indirect
6565
github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1 // indirect
6666
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2 // indirect
6767
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.2 // indirect
68-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.1 // indirect
69-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.10 // indirect
70-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.10 // indirect
68+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.2 // indirect
69+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.11 // indirect
70+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.11 // indirect
7171
github.com/aws/aws-sdk-go-v2/service/sso v1.29.1 // indirect
7272
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.2 // indirect
7373
github.com/aws/aws-sdk-go-v2/service/sts v1.38.2 // indirect

‎go.sum‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -71,28 +71,28 @@ github.com/aws/aws-sdk-go-v2/credentials v1.18.10 h1:xdJnXCouCx8Y0NncgoptztUocIY
7171
github.com/aws/aws-sdk-go-v2/credentials v1.18.10/go.mod h1:7tQk08ntj914F/5i9jC4+2HQTAuJirq7m1vZVIhEkWs=
7272
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.6 h1:wbjnrrMnKew78/juW7I2BtKQwa1qlf6EjQgS69uYY14=
7373
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.6/go.mod h1:AtiqqNrDioJXuUgz3+3T0mBWN7Hro2n9wll2zRUc0ww=
74-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.10 h1:mj/bdWleWEh81DtpdHKkw41IrS+r3uw1J/VQtbwYYp8=
75-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.10/go.mod h1:7+oEMxAZWP8gZCyjcm9VicI0M61Sx4DJtcGfKYv2yKQ=
76-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.10 h1:wh+/mn57yhUrFtLIxyFPh2RgxgQz/u+Yrf7hiHGHqKY=
77-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.10/go.mod h1:7zirD+ryp5gitJJ2m1BBux56ai8RIRDykXZrJSp540w=
74+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.11 h1:7AANQZkF3ihM8fbdftpjhken0TP9sBzFbV/Ze/Y4HXA=
75+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.11/go.mod h1:NTF4QCGkm6fzVwncpkFQqoquQyOolcyXfbpC98urj+c=
76+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.11 h1:ShdtWUZT37LCAA4Mw2kJAJtzaszfSHFb5n25sdcv4YE=
77+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.11/go.mod h1:7bUb2sSr2MZ3M/N+VyETLTQtInemHXb/Fl3s8CLzm0Y=
7878
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d2KyU5X/BZxjOkRo=
7979
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo=
80-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.10 h1:FHw90xCTsofzk6vjU808TSuDtDfOOKPNdz5Weyc3tUI=
81-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.10/go.mod h1:n8jdIE/8F3UYkg8O4IGkQpn2qUmapg/1K1yl29/uf/c=
80+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.11 h1:bKgSxk1TW//00PGQqYmrq83c+2myGidEclp+t9pPqVI=
81+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.11/go.mod h1:vrPYCQ6rFHL8jzQA8ppu3gWX18zxjLIDGTeqDxkBmSI=
8282
github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1 h1:lcwFjRx3C/hBxJzoWkD6DIG2jeB+mzLmFVBFVOadxxE=
8383
github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1/go.mod h1:qt9OL5kXqWoSub4QAkOF74mS3M2zOTNxMODqgwEUjt8=
8484
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2 h1:EfatDVSMFxaS5TiR0C0zssQU1Nm+rGx3VbUGIH1y274=
8585
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2/go.mod h1:oRy1IEgzXtOkEk4B/J7HZbXUC258drDLtkmc++lN7IA=
8686
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.2 h1:xtuxji5CS0JknaXoACOunXOYOQzgfTvGAc9s2QdCJA4=
8787
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.2/go.mod h1:zxwi0DIR0rcRcgdbl7E2MSOvxDyyXGBlScvBkARFaLQ=
88-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.1 h1:ne+eepnDB2Wh5lHKzELgEncIqeVlQ1rSF9fEa4r5I+A=
89-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.1/go.mod h1:u0Jkg0L+dcG1ozUq21uFElmpbmjBnhHR5DELHIme4wg=
90-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.10 h1:DRND0dkCKtJzCj4Xl4OpVbXZgfttY5q712H9Zj7qc/0=
91-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.10/go.mod h1:tGGNmJKOTernmR2+VJ0fCzQRurcPZj9ut60Zu5Fi6us=
92-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.10 h1:DA+Hl5adieRyFvE7pCvBWm3VOZTRexGVkXw33SUqNoY=
93-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.10/go.mod h1:L+A89dH3/gr8L4ecrdzuXUYd1znoko6myzndVGZx/DA=
94-
github.com/aws/aws-sdk-go-v2/service/s3 v1.88.6 h1:Hcb4yllr4GTOHC/BKjEklxWhciWMHIqzeCI9oYf1OIk=
95-
github.com/aws/aws-sdk-go-v2/service/s3 v1.88.6/go.mod h1:N/iojY+8bW3MYol9NUMuKimpSbPEur75cuI1SmtonFM=
88+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.2 h1:DGFpGybmutVsCuF6vSuLZ25Vh55E3VmsnJmFfjeBx4M=
89+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.2/go.mod h1:hm/wU1HDvXCFEDzOLorQnZZ/CVvPXvWEmHMSmqgQRuA=
90+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.11 h1:GpMf3z2KJa4RnJ0ew3Hac+hRFYLZ9DDjfgXjuW+pB54=
91+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.11/go.mod h1:6MZP3ZI4QQsgUCFTwMZA2V0sEriNQ8k2hmoHF3qjimQ=
92+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.11 h1:weapBOuuFIBEQ9OX/NVW3tFQCvSutyjZYk/ga5jDLPo=
93+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.11/go.mod h1:3C1gN4FmIVLwYSh8etngUS+f1viY6nLCDVtZmrFbDy0=
94+
github.com/aws/aws-sdk-go-v2/service/s3 v1.88.7 h1:Wer3W0GuaedWT7dv/PiWNZGSQFSTcBY2rZpbiUp5xcA=
95+
github.com/aws/aws-sdk-go-v2/service/s3 v1.88.7/go.mod h1:UHKgcRSx8PVtvsc1Poxb/Co3PD3wL7P+f49P0+cWtuY=
9696
github.com/aws/aws-sdk-go-v2/service/sso v1.29.1 h1:8OLZnVJPvjnrxEwHFg9hVUof/P4sibH+Ea4KKuqAGSg=
9797
github.com/aws/aws-sdk-go-v2/service/sso v1.29.1/go.mod h1:27M3BpVi0C02UiQh1w9nsBEit6pLhlaH3NHna6WUbDE=
9898
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.2 h1:gKWSTnqudpo8dAxqBqZnDoDWCiEh/40FziUjr/mo6uA=
@@ -462,8 +462,8 @@ github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7
462462
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
463463
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI=
464464
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs=
465-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251021162421-9dee01f565c9 h1:ZwoABMCRbJRspA/zO14tnAg5wCnotc+cuZRB8ec3dsA=
466-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251021162421-9dee01f565c9/go.mod h1:SVm1Zk6UpZtqZN6KtEQpjC+v+Lir4tyVfhQTU19q3PA=
465+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251024091811-f46054a61f65 h1:PFmz82c+uiCm7BY5JQGwR8R15LSqbitZAbEdd9SsFFY=
466+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251024091811-f46054a61f65/go.mod h1:SVm1Zk6UpZtqZN6KtEQpjC+v+Lir4tyVfhQTU19q3PA=
467467
github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8=
468468
github.com/sclevine/spec v1.4.0/go.mod h1:LvpgJaFyvQzRvc1kaDs0bulYwzC70PbiYjC4QnFHkOM=
469469
github.com/secure-systems-lab/go-securesystemslib v0.8.0 h1:mr5An6X45Kb2nddcFlbmfHkLguCE9laoZCUzEEpIZXA=

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,13 @@ func baremetalServerCreate() *core.Command {
506506
Deprecated: false,
507507
Positional: false,
508508
},
509+
{
510+
Name: "user-data",
511+
Short: `Configuration data to pass to cloud-init such as a YAML cloud config data or a user-data script`,
512+
Required: false,
513+
Deprecated: false,
514+
Positional: false,
515+
},
509516
core.OrganizationIDArgSpec(),
510517
core.ZoneArgSpec(
511518
scw.ZoneFrPar1,
@@ -578,6 +585,13 @@ func baremetalServerUpdate() *core.Command {
578585
Deprecated: false,
579586
Positional: false,
580587
},
588+
{
589+
Name: "user-data",
590+
Short: `Configuration data to pass to cloud-init such as a YAML cloud config data or a user-data script`,
591+
Required: false,
592+
Deprecated: false,
593+
Positional: false,
594+
},
581595
core.ZoneArgSpec(
582596
scw.ZoneFrPar1,
583597
scw.ZoneFrPar2,
@@ -795,6 +809,24 @@ func baremetalServerInstall() *core.Command {
795809
Deprecated: false,
796810
Positional: false,
797811
},
812+
{
813+
Name: "user-data.name",
814+
Required: false,
815+
Deprecated: true,
816+
Positional: false,
817+
},
818+
{
819+
Name: "user-data.content-type",
820+
Required: false,
821+
Deprecated: true,
822+
Positional: false,
823+
},
824+
{
825+
Name: "user-data.content",
826+
Required: false,
827+
Deprecated: true,
828+
Positional: false,
829+
},
798830
core.ZoneArgSpec(
799831
scw.ZoneFrPar1,
800832
scw.ZoneFrPar2,

0 commit comments

Comments
 (0)