Skip to content

Commit 2c2c1db

Browse files
authored
Merge branch 'master' into v1.7310.0
2 parents 453c59b + c45d556 commit 2c2c1db

File tree

14 files changed

+202
-150
lines changed

14 files changed

+202
-150
lines changed

cmd/scw/testdata/test-all-usage-apple-silicon-server-create-usage.golden

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,19 @@ USAGE:
66
scw apple-silicon server create [arg=value ...]
77

88
ARGS:
9-
[name=<generated>] Create a server with this given name
10-
[project-id] Project ID to use. If none is passed the default project ID will be used
11-
[type] Create a server of the given type
12-
[os-id] Create a server with the given os_id
13-
[enable-vpc] Activate the Private Network feature for this server
14-
[commitment-type] Activate commitment for this server (duration_24h | renewed_monthly | none)
15-
[public-bandwidth-bps] Public bandwidth to configure for this server. Expressed in bits per second.
16-
[runner-configuration.name]
17-
[runner-configuration.url]
18-
[runner-configuration.token]
19-
[runner-configuration.provider] (unknown_provider | github | gitlab)
20-
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-3)
9+
[name=<generated>] Create a server with this given name
10+
[project-id] Project ID to use. If none is passed the default project ID will be used
11+
[type] Create a server of the given type
12+
[os-id] Create a server with the given os_id
13+
[enable-vpc] Activate the Private Network feature for this server
14+
[commitment-type] Activate commitment for this server (duration_24h | renewed_monthly | none)
15+
[public-bandwidth-bps] Public bandwidth to configure for this server. Expressed in bits per second.
16+
[runner-configuration.name]
17+
[runner-configuration.url]
18+
[runner-configuration.token]
19+
[runner-configuration.provider] (unknown_provider | github | gitlab)
20+
[applied-runner-configurations.runner-configuration-ids.{index}]
21+
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-3)
2122

2223
FLAGS:
2324
-h, --help help for create

cmd/scw/testdata/test-all-usage-apple-silicon-server-update-usage.golden

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@ USAGE:
66
scw apple-silicon server update <server-id ...> [arg=value ...]
77

88
ARGS:
9-
server-id UUID of the server you want to update
10-
[name] Updated name for your server
11-
[schedule-deletion] Specify whether the server should be flagged for automatic deletion
12-
[enable-vpc] Activate or deactivate Private Network support for this server
13-
[commitment-type.commitment-type] (duration_24h | renewed_monthly | none)
14-
[public-bandwidth-bps] Public bandwidth configured for this server
15-
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-3)
9+
server-id UUID of the server you want to update
10+
[name] Updated name for your server
11+
[schedule-deletion] Specify whether the server should be flagged for automatic deletion
12+
[enable-vpc] Activate or deactivate Private Network support for this server
13+
[commitment-type.commitment-type] (duration_24h | renewed_monthly | none)
14+
[public-bandwidth-bps] Public bandwidth configured for this server
15+
[applied-runner-configurations.runner-configuration-ids.{index}]
16+
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-3)
1617

1718
FLAGS:
1819
-h, --help help for update

cmd/scw/testdata/test-all-usage-audit-trail-event-list-usage.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ USAGE:
77

88
ARGS:
99
[project-id] (Optional) ID of the Project containing the Audit Trail events
10-
[resource-type] (Optional) Type of the Scaleway resource (unknown_type | secm_secret | secm_secret_version | kube_cluster | kube_pool | kube_node | kube_acl | keym_key | iam_user | iam_application | iam_group | iam_policy | iam_api_key | iam_ssh_key | iam_rule | iam_saml | iam_saml_certificate | iam_scim | iam_scim_token | secret_manager_secret | secret_manager_version | key_manager_key | account_user | account_organization | account_project | instance_server | instance_placement_group | instance_security_group | instance_volume | instance_snapshot | instance_image | apple_silicon_server | baremetal_server | baremetal_setting | ipam_ip | sbs_volume | sbs_snapshot | load_balancer_lb | load_balancer_ip | load_balancer_frontend | load_balancer_backend | load_balancer_route | load_balancer_acl | load_balancer_certificate | sfs_filesystem | vpc_private_network | edge_services_plan | edge_services_pipeline | edge_services_dns_stage | edge_services_tls_stage | edge_services_cache_stage | edge_services_route_stage | edge_services_route_rules | edge_services_waf_stage | edge_services_backend_stage)
10+
[resource-type] (Optional) Type of the Scaleway resource (unknown_type | secm_secret | secm_secret_version | kube_cluster | kube_pool | kube_node | kube_acl | keym_key | iam_user | iam_application | iam_group | iam_policy | iam_api_key | iam_ssh_key | iam_rule | iam_saml | iam_saml_certificate | iam_scim | iam_scim_token | secret_manager_secret | secret_manager_version | key_manager_key | account_user | account_organization | account_project | instance_server | instance_placement_group | instance_security_group | instance_volume | instance_snapshot | instance_image | apple_silicon_server | baremetal_server | baremetal_setting | ipam_ip | sbs_volume | sbs_snapshot | load_balancer_lb | load_balancer_ip | load_balancer_frontend | load_balancer_backend | load_balancer_route | load_balancer_acl | load_balancer_certificate | sfs_filesystem | vpc_private_network | edge_services_plan | edge_services_pipeline | edge_services_dns_stage | edge_services_tls_stage | edge_services_cache_stage | edge_services_route_stage | edge_services_route_rules | edge_services_waf_stage | edge_services_backend_stage | s2s_vpn_gateway | s2s_customer_gateway | s2s_routing_policy | s2s_connection)
1111
[method-name] (Optional) Name of the method of the API call performed
1212
[status] (Optional) HTTP status code of the request. Returns either `200` if the request was successful or `403` if the permission was denied
1313
[recorded-after] (Optional) The `recorded_after` parameter defines the earliest timestamp from which Audit Trail events are retrieved. Returns `one hour ago` by default

docs/commands/apple-silicon.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ scw apple-silicon server create [arg=value ...]
201201
| runner-configuration.url | | |
202202
| runner-configuration.token | | |
203203
| runner-configuration.provider | One of: `unknown_provider`, `github`, `gitlab` | |
204+
| applied-runner-configurations.runner-configuration-ids.{index} | | |
204205
| zone | Default: `fr-par-1`<br />One of: `fr-par-3` | Zone to target. If none is passed will use default zone from the config |
205206

206207

@@ -352,6 +353,7 @@ scw apple-silicon server update <server-id ...> [arg=value ...]
352353
| enable-vpc | | Activate or deactivate Private Network support for this server |
353354
| commitment-type.commitment-type | One of: `duration_24h`, `renewed_monthly`, `none` | |
354355
| public-bandwidth-bps | | Public bandwidth configured for this server |
356+
| applied-runner-configurations.runner-configuration-ids.{index} | | |
355357
| zone | Default: `fr-par-1`<br />One of: `fr-par-3` | Zone to target. If none is passed will use default zone from the config |
356358

357359

docs/commands/audit-trail.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ scw audit-trail event list [arg=value ...]
2929
| Name | | Description |
3030
|------|---|-------------|
3131
| project-id | | (Optional) ID of the Project containing the Audit Trail events |
32-
| resource-type | One of: `unknown_type`, `secm_secret`, `secm_secret_version`, `kube_cluster`, `kube_pool`, `kube_node`, `kube_acl`, `keym_key`, `iam_user`, `iam_application`, `iam_group`, `iam_policy`, `iam_api_key`, `iam_ssh_key`, `iam_rule`, `iam_saml`, `iam_saml_certificate`, `iam_scim`, `iam_scim_token`, `secret_manager_secret`, `secret_manager_version`, `key_manager_key`, `account_user`, `account_organization`, `account_project`, `instance_server`, `instance_placement_group`, `instance_security_group`, `instance_volume`, `instance_snapshot`, `instance_image`, `apple_silicon_server`, `baremetal_server`, `baremetal_setting`, `ipam_ip`, `sbs_volume`, `sbs_snapshot`, `load_balancer_lb`, `load_balancer_ip`, `load_balancer_frontend`, `load_balancer_backend`, `load_balancer_route`, `load_balancer_acl`, `load_balancer_certificate`, `sfs_filesystem`, `vpc_private_network`, `edge_services_plan`, `edge_services_pipeline`, `edge_services_dns_stage`, `edge_services_tls_stage`, `edge_services_cache_stage`, `edge_services_route_stage`, `edge_services_route_rules`, `edge_services_waf_stage`, `edge_services_backend_stage` | (Optional) Type of the Scaleway resource |
32+
| resource-type | One of: `unknown_type`, `secm_secret`, `secm_secret_version`, `kube_cluster`, `kube_pool`, `kube_node`, `kube_acl`, `keym_key`, `iam_user`, `iam_application`, `iam_group`, `iam_policy`, `iam_api_key`, `iam_ssh_key`, `iam_rule`, `iam_saml`, `iam_saml_certificate`, `iam_scim`, `iam_scim_token`, `secret_manager_secret`, `secret_manager_version`, `key_manager_key`, `account_user`, `account_organization`, `account_project`, `instance_server`, `instance_placement_group`, `instance_security_group`, `instance_volume`, `instance_snapshot`, `instance_image`, `apple_silicon_server`, `baremetal_server`, `baremetal_setting`, `ipam_ip`, `sbs_volume`, `sbs_snapshot`, `load_balancer_lb`, `load_balancer_ip`, `load_balancer_frontend`, `load_balancer_backend`, `load_balancer_route`, `load_balancer_acl`, `load_balancer_certificate`, `sfs_filesystem`, `vpc_private_network`, `edge_services_plan`, `edge_services_pipeline`, `edge_services_dns_stage`, `edge_services_tls_stage`, `edge_services_cache_stage`, `edge_services_route_stage`, `edge_services_route_rules`, `edge_services_waf_stage`, `edge_services_backend_stage`, `s2s_vpn_gateway`, `s2s_customer_gateway`, `s2s_routing_policy`, `s2s_connection` | (Optional) Type of the Scaleway resource |
3333
| method-name | | (Optional) Name of the method of the API call performed |
3434
| status | | (Optional) HTTP status code of the request. Returns either `200` if the request was successful or `403` if the permission was denied |
3535
| recorded-after | | (Optional) The `recorded_after` parameter defines the earliest timestamp from which Audit Trail events are retrieved. Returns `one hour ago` by default |

go.mod

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ module github.com/scaleway/scaleway-cli/v2
33
go 1.25.0
44

55
require (
6-
github.com/aws/aws-sdk-go-v2 v1.39.6
7-
github.com/aws/aws-sdk-go-v2/service/s3 v1.90.2
6+
github.com/aws/aws-sdk-go-v2 v1.40.0
7+
github.com/aws/aws-sdk-go-v2/service/s3 v1.91.1
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
@@ -14,21 +14,21 @@ require (
1414
github.com/docker/docker v28.5.2+incompatible
1515
github.com/dustin/go-humanize v1.0.1
1616
github.com/fatih/color v1.18.0
17-
github.com/getsentry/sentry-go v0.37.0
17+
github.com/getsentry/sentry-go v0.38.0
1818
github.com/ghodss/yaml v1.0.0
19-
github.com/gorilla/websocket v1.5.3
19+
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674
2020
github.com/hashicorp/go-version v1.7.0
2121
github.com/karrick/tparse/v2 v2.8.2
2222
github.com/mattn/go-colorable v0.1.14
2323
github.com/mattn/go-isatty v0.0.20
24-
github.com/moby/buildkit v0.25.2
24+
github.com/moby/buildkit v0.26.1
2525
github.com/opencontainers/go-digest v1.0.0
26-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251113134718-dbbe692a2820
26+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251117143834-a8fa9f915f40
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
3030
github.com/stretchr/testify v1.11.1
31-
golang.org/x/crypto v0.44.0
31+
golang.org/x/crypto v0.45.0
3232
golang.org/x/sync v0.18.0
3333
golang.org/x/term v0.37.0
3434
golang.org/x/text v0.31.0
@@ -59,16 +59,16 @@ require (
5959
github.com/aws/aws-sdk-go-v2/config v1.31.6 // indirect
6060
github.com/aws/aws-sdk-go-v2/credentials v1.18.10 // indirect
6161
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.6 // indirect
62-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.13 // indirect
63-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.13 // indirect
62+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.14 // indirect
63+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.14 // indirect
6464
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
65-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.13 // indirect
65+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.14 // indirect
6666
github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1 // indirect
6767
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2 // indirect
6868
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.3 // indirect
69-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.4 // indirect
70-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.13 // indirect
71-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.13 // indirect
69+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.5 // indirect
70+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.14 // indirect
71+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.14 // indirect
7272
github.com/aws/aws-sdk-go-v2/service/sso v1.29.1 // indirect
7373
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.2 // indirect
7474
github.com/aws/aws-sdk-go-v2/service/sts v1.38.2 // indirect
@@ -87,13 +87,13 @@ require (
8787
github.com/charmbracelet/x/term v0.2.1 // indirect
8888
github.com/chrismellard/docker-credential-acr-env v0.0.0-20230304212654-82a0ddb27589 // indirect
8989
github.com/cloudflare/circl v1.6.1 // indirect
90-
github.com/containerd/containerd/api v1.9.0 // indirect
91-
github.com/containerd/containerd/v2 v2.1.5 // indirect
90+
github.com/containerd/containerd/api v1.10.0 // indirect
91+
github.com/containerd/containerd/v2 v2.2.0 // indirect
9292
github.com/containerd/continuity v0.4.5 // indirect
9393
github.com/containerd/errdefs v1.0.0 // indirect
9494
github.com/containerd/errdefs/pkg v0.3.0 // indirect
9595
github.com/containerd/log v0.1.0 // indirect
96-
github.com/containerd/platforms v1.0.0-rc.1 // indirect
96+
github.com/containerd/platforms v1.0.0-rc.2 // indirect
9797
github.com/containerd/stargz-snapshotter/estargz v0.17.0 // indirect
9898
github.com/containerd/ttrpc v1.2.7 // indirect
9999
github.com/containerd/typeurl/v2 v2.2.3 // indirect
@@ -102,7 +102,7 @@ require (
102102
github.com/dimchansky/utfbom v1.1.1 // indirect
103103
github.com/distribution/reference v0.6.0 // indirect
104104
github.com/dnephin/pflag v1.0.7 // indirect
105-
github.com/docker/cli v28.4.0+incompatible // indirect
105+
github.com/docker/cli v28.5.0+incompatible // indirect
106106
github.com/docker/distribution v2.8.3+incompatible // indirect
107107
github.com/docker/docker-credential-helpers v0.9.3 // indirect
108108
github.com/docker/go-connections v0.6.0 // indirect
@@ -121,7 +121,7 @@ require (
121121
github.com/go-logr/stdr v1.2.2 // indirect
122122
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
123123
github.com/goccy/go-yaml v1.18.0 // indirect
124-
github.com/gofrs/flock v0.12.1 // indirect
124+
github.com/gofrs/flock v0.13.0 // indirect
125125
github.com/gogo/protobuf v1.3.2 // indirect
126126
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
127127
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
@@ -131,13 +131,13 @@ require (
131131
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
132132
github.com/google/uuid v1.6.0 // indirect
133133
github.com/gorilla/mux v1.8.1 // indirect
134-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 // indirect
134+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect
135135
github.com/heroku/color v0.0.6 // indirect
136136
github.com/in-toto/in-toto-golang v0.9.0 // indirect
137137
github.com/inconshreveable/mousetrap v1.1.0 // indirect
138138
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
139139
github.com/kevinburke/ssh_config v1.4.0 // indirect
140-
github.com/klauspost/compress v1.18.0 // indirect
140+
github.com/klauspost/compress v1.18.1 // indirect
141141
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
142142
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
143143
github.com/mattn/go-localereader v0.0.1 // indirect
@@ -174,7 +174,7 @@ require (
174174
github.com/rivo/tview v0.42.0 // indirect
175175
github.com/rivo/uniseg v0.4.7 // indirect
176176
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 // indirect
177-
github.com/secure-systems-lab/go-securesystemslib v0.8.0 // indirect
177+
github.com/secure-systems-lab/go-securesystemslib v0.9.1 // indirect
178178
github.com/sergi/go-diff v1.4.0 // indirect
179179
github.com/shibumi/go-pathspec v1.3.0 // indirect
180180
github.com/sirupsen/logrus v1.9.3 // indirect
@@ -183,32 +183,32 @@ require (
183183
github.com/tonistiigi/go-csvvalue v0.0.0-20240814133006-030d3b2625d0 // indirect
184184
github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea // indirect
185185
github.com/tonistiigi/vt100 v0.0.0-20240514184818-90bafcd6abab // indirect
186-
github.com/vbatts/tar-split v0.12.1 // indirect
186+
github.com/vbatts/tar-split v0.12.2 // indirect
187187
github.com/xanzy/ssh-agent v0.3.3 // indirect
188188
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
189189
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
190190
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
191191
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
192-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
193-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
194-
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.60.0 // indirect
192+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
193+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
194+
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.61.0 // indirect
195195
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
196196
go.opentelemetry.io/otel v1.38.0 // indirect
197-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 // indirect
197+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 // indirect
198198
go.opentelemetry.io/otel/metric v1.38.0 // indirect
199199
go.opentelemetry.io/otel/sdk v1.38.0 // indirect
200200
go.opentelemetry.io/otel/trace v1.38.0 // indirect
201-
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
201+
go.opentelemetry.io/proto/otlp v1.7.1 // indirect
202202
go.yaml.in/yaml/v2 v2.4.2 // indirect
203203
golang.org/x/mod v0.29.0 // indirect
204-
golang.org/x/net v0.46.0 // indirect
204+
golang.org/x/net v0.47.0 // indirect
205205
golang.org/x/sys v0.38.0 // indirect
206-
golang.org/x/time v0.12.0 // indirect
206+
golang.org/x/time v0.14.0 // indirect
207207
golang.org/x/tools v0.38.0 // indirect
208-
google.golang.org/genproto/googleapis/api v0.0.0-20250528174236-200df99c418a // indirect
209-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250721164621-a45f3dfb1074 // indirect
210-
google.golang.org/grpc v1.74.2 // indirect
211-
google.golang.org/protobuf v1.36.9 // indirect
208+
google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 // indirect
209+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 // indirect
210+
google.golang.org/grpc v1.76.0 // indirect
211+
google.golang.org/protobuf v1.36.10 // indirect
212212
gopkg.in/dnaeon/go-vcr.v4 v4.0.5 // indirect
213213
gopkg.in/warnings.v0 v0.1.2 // indirect
214214
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)