diff --git a/cmd/scw/testdata/test-all-usage-apple-silicon-server-create-usage.golden b/cmd/scw/testdata/test-all-usage-apple-silicon-server-create-usage.golden index 9a66b56d9b..c91594b6b6 100644 --- a/cmd/scw/testdata/test-all-usage-apple-silicon-server-create-usage.golden +++ b/cmd/scw/testdata/test-all-usage-apple-silicon-server-create-usage.golden @@ -6,14 +6,18 @@ USAGE: scw apple-silicon server create [arg=value ...] ARGS: - [name=] Create a server with this given name - [project-id] Project ID to use. If none is passed the default project ID will be used - [type] Create a server of the given type - [os-id] Create a server with the given os_id - [enable-vpc] Activate the Private Network feature for this server - [commitment-type] Activate commitment for this server (duration_24h | renewed_monthly | none) - [public-bandwidth-bps] Public bandwidth to configure for this server. Expressed in bits per second. - [zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-3) + [name=] Create a server with this given name + [project-id] Project ID to use. If none is passed the default project ID will be used + [type] Create a server of the given type + [os-id] Create a server with the given os_id + [enable-vpc] Activate the Private Network feature for this server + [commitment-type] Activate commitment for this server (duration_24h | renewed_monthly | none) + [public-bandwidth-bps] Public bandwidth to configure for this server. Expressed in bits per second. + [runner-configuration.name] + [runner-configuration.url] + [runner-configuration.token] + [runner-configuration.provider] (unknown_provider | github | gitlab) + [zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-3) FLAGS: -h, --help help for create diff --git a/cmd/scw/testdata/test-all-usage-apple-silicon-server-reinstall-usage.golden b/cmd/scw/testdata/test-all-usage-apple-silicon-server-reinstall-usage.golden index 5ed92eba80..6293f4a421 100644 --- a/cmd/scw/testdata/test-all-usage-apple-silicon-server-reinstall-usage.golden +++ b/cmd/scw/testdata/test-all-usage-apple-silicon-server-reinstall-usage.golden @@ -6,9 +6,13 @@ USAGE: scw apple-silicon server reinstall [arg=value ...] ARGS: - server-id UUID of the server you want to reinstall - [os-id] Reinstall the server with the OS corresponding to the os_id - [zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-3) + server-id UUID of the server you want to reinstall + [os-id] Reinstall the server with the OS corresponding to the os_id + [runner-configuration.name] + [runner-configuration.url] + [runner-configuration.token] + [runner-configuration.provider] (unknown_provider | github | gitlab) + [zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-3) FLAGS: -h, --help help for reinstall diff --git a/docs/commands/apple-silicon.md b/docs/commands/apple-silicon.md index 0751fc20a4..b9b00eaf97 100644 --- a/docs/commands/apple-silicon.md +++ b/docs/commands/apple-silicon.md @@ -197,6 +197,10 @@ scw apple-silicon server create [arg=value ...] | enable-vpc | | Activate the Private Network feature for this server | | commitment-type | One of: `duration_24h`, `renewed_monthly`, `none` | Activate commitment for this server | | public-bandwidth-bps | | Public bandwidth to configure for this server. Expressed in bits per second. | +| runner-configuration.name | | | +| runner-configuration.url | | | +| runner-configuration.token | | | +| runner-configuration.provider | One of: `unknown_provider`, `github`, `gitlab` | | | zone | Default: `fr-par-1`
One of: `fr-par-3` | Zone to target. If none is passed will use default zone from the config | @@ -300,6 +304,10 @@ scw apple-silicon server reinstall [arg=value ...] |------|---|-------------| | server-id | Required | UUID of the server you want to reinstall | | os-id | | Reinstall the server with the OS corresponding to the os_id | +| runner-configuration.name | | | +| runner-configuration.url | | | +| runner-configuration.token | | | +| runner-configuration.provider | One of: `unknown_provider`, `github`, `gitlab` | | | zone | Default: `fr-par-1`
One of: `fr-par-3` | Zone to target. If none is passed will use default zone from the config | diff --git a/go.mod b/go.mod index 07f08a2f2c..4eb0c565af 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/mattn/go-isatty v0.0.20 github.com/moby/buildkit v0.24.0 github.com/opencontainers/go-digest v1.0.0 - github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20250917154444-1d3cdbf4ce0d + github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20250929084830-e251d5dd081b github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 github.com/spf13/cobra v1.10.1 github.com/spf13/pflag v1.0.10 diff --git a/go.sum b/go.sum index 470623ce2c..018b9d9715 100644 --- a/go.sum +++ b/go.sum @@ -258,6 +258,8 @@ github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs= github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= +github.com/goccy/go-yaml v1.18.0 h1:8W7wMFS12Pcas7KU+VVkaiCng+kG8QiFeFwzFb+rwuw= +github.com/goccy/go-yaml v1.18.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA= github.com/gofrs/flock v0.12.1 h1:MTLVXXHf8ekldpJk3AKicLij9MdwOWkZ+a/jHHZby9E= github.com/gofrs/flock v0.12.1/go.mod h1:9zxTsyu5xtJ9DK+1tFZyibEV7y3uwDxPPfbxeeHCoD0= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= @@ -460,8 +462,8 @@ github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI= github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs= -github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20250917154444-1d3cdbf4ce0d h1:9tZdwRedm970w1MsuDvYP4jxdzb7Oa4/WOwhPV8XNvA= -github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20250917154444-1d3cdbf4ce0d/go.mod h1:47B1d/YXmSAxlJxUJxClzHR6b3T4M1WyCvwENPQNBWc= +github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20250929084830-e251d5dd081b h1:ol5HdwkC17jR76fR49CsnqwUab9JIpmhGl6X6r2B5es= +github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20250929084830-e251d5dd081b/go.mod h1:DVB9HV7nK7TdTRqlpdxw6T0Wxg+aB9xPBEpO3aM2iqQ= github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8= github.com/sclevine/spec v1.4.0/go.mod h1:LvpgJaFyvQzRvc1kaDs0bulYwzC70PbiYjC4QnFHkOM= github.com/secure-systems-lab/go-securesystemslib v0.8.0 h1:mr5An6X45Kb2nddcFlbmfHkLguCE9laoZCUzEEpIZXA= @@ -683,6 +685,8 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/dnaeon/go-vcr.v4 v4.0.5 h1:I0hpTIvD5rII+8LgYGrHMA2d4SQPoL6u7ZvJakWKsiA= +gopkg.in/dnaeon/go-vcr.v4 v4.0.5/go.mod h1:dRos81TkW9C1WJt6tTaE+uV2Lo8qJT3AG2b35+CB/nQ= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= diff --git a/internal/namespaces/applesilicon/v1alpha1/applesilicon_cli.go b/internal/namespaces/applesilicon/v1alpha1/applesilicon_cli.go index b5a64c8375..322340301b 100644 --- a/internal/namespaces/applesilicon/v1alpha1/applesilicon_cli.go +++ b/internal/namespaces/applesilicon/v1alpha1/applesilicon_cli.go @@ -203,6 +203,35 @@ func appleSiliconServerCreate() *core.Command { Deprecated: false, Positional: false, }, + { + Name: "runner-configuration.name", + Required: false, + Deprecated: false, + Positional: false, + }, + { + Name: "runner-configuration.url", + Required: false, + Deprecated: false, + Positional: false, + }, + { + Name: "runner-configuration.token", + Required: false, + Deprecated: false, + Positional: false, + }, + { + Name: "runner-configuration.provider", + Required: false, + Deprecated: false, + Positional: false, + EnumValues: []string{ + "unknown_provider", + "github", + "gitlab", + }, + }, core.ZoneArgSpec(scw.ZoneFrPar3), }, Run: func(ctx context.Context, args any) (i any, e error) { @@ -545,6 +574,35 @@ func appleSiliconServerReinstall() *core.Command { Deprecated: false, Positional: false, }, + { + Name: "runner-configuration.name", + Required: false, + Deprecated: false, + Positional: false, + }, + { + Name: "runner-configuration.url", + Required: false, + Deprecated: false, + Positional: false, + }, + { + Name: "runner-configuration.token", + Required: false, + Deprecated: false, + Positional: false, + }, + { + Name: "runner-configuration.provider", + Required: false, + Deprecated: false, + Positional: false, + EnumValues: []string{ + "unknown_provider", + "github", + "gitlab", + }, + }, core.ZoneArgSpec(scw.ZoneFrPar3), }, Run: func(ctx context.Context, args any) (i any, e error) {