Skip to content

Commit 8f61f78

Browse files
authored
Merge branch 'scaleway:master' into master
2 parents 0b1a224 + 048db2a commit 8f61f78

22 files changed

+271
-52
lines changed

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) Returns a paginated list of Scaleway resources' features (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 | secret_manager_secret | secret_manager_version | key_manager_key | account_user | account_organization | instance_server | apple_silicon_server)
10+
[resource-type] (Optional) Returns a paginated list of Scaleway resources' features (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 | secret_manager_secret | secret_manager_version | key_manager_key | account_user | account_organization | account_project | instance_server | apple_silicon_server | baremetal_server | baremetal_setting)
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

cmd/scw/testdata/test-all-usage-instance-server-attach-volume-usage.golden

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
3-
Attach a volume to a server
3+
Attach a volume to an Instance.
44

55
USAGE:
66
scw instance server attach-volume [arg=value ...]
77

8-
EXAMPLES:
9-
Attach a volume to a server
10-
scw instance server attach-volume server-id=11111111-1111-1111-1111-111111111111 volume-id=22222222-1111-5555-2222-666666111111
11-
128
ARGS:
13-
server-id ID of the server
14-
volume-id ID of the volume to attach
9+
server-id
10+
[volume-id]
11+
[volume-type] (unknown_volume_type | l_ssd | b_ssd | sbs_volume)
12+
[boot]
1513
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | fr-par-3 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-1 | pl-waw-2 | pl-waw-3)
1614

1715
FLAGS:

cmd/scw/testdata/test-all-usage-instance-server-detach-filesystem-usage.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
3-
Detach a filesystem volume to an Instance.
3+
Detach a filesystem volume from an Instance.
44

55
USAGE:
66
scw instance server detach-filesystem [arg=value ...]

cmd/scw/testdata/test-all-usage-instance-server-detach-volume-usage.golden

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
3-
Detach a volume from its server
3+
Detach a volume from an Instance.
44

55
USAGE:
66
scw instance server detach-volume [arg=value ...]
77

8-
EXAMPLES:
9-
Detach a volume from its server
10-
scw instance server detach-volume volume-id=22222222-1111-5555-2222-666666111111
11-
128
ARGS:
13-
volume-id ID of the volume to detach
14-
server-id ID of the server
9+
server-id
10+
[volume-id]
1511
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | fr-par-3 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-1 | pl-waw-2 | pl-waw-3)
1612

1713
FLAGS:

cmd/scw/testdata/test-all-usage-instance-server-usage.golden

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,14 @@ AVAILABLE COMMANDS:
1111
action Perform a raw API action on a server
1212
attach-filesystem Attach a filesystem volume to an Instance
1313
attach-ip Attach an IP to a server
14+
attach-volume Attach a volume to an Instance
1415
backup Backup server
1516
console Connect to the serial console of an instance
1617
create Create server
1718
delete Delete server
18-
detach-filesystem Detach a filesystem volume to an Instance
19+
detach-filesystem Detach a filesystem volume from an Instance
1920
detach-ip Detach an IP from a server
21+
detach-volume Detach a volume from an Instance
2022
enable-routed-ip Migrate server to IP mobility
2123
get Get an Instance
2224
get-compatible-types Get Instance compatible types

cmd/scw/testdata/test-all-usage-k8s-cluster-create-usage.golden

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ ARGS:
6262
[open-id-connect-config.required-claim.{index}] Multiple key=value pairs describing a required claim in the ID token. If set, the claims are verified to be present in the ID token with a matching value
6363
[apiserver-cert-sans.{index}] Additional Subject Alternative Names for the Kubernetes API server certificate
6464
[private-network-id] Private network ID for internal cluster communication (cannot be changed later). For Kapsule clusters, if none is provided, a private network will be created
65+
[pod-cidr] Subnet used for the Pod CIDR (cannot be changed later)
66+
[service-cidr] Subnet used for the Service CIDR (cannot be changed later)
67+
[service-dns-ip] IP used for the DNS Service (cannot be changes later). If unset, default to Service CIDR's network + 10
6568
[organization-id] Organization ID to use. If none is passed the default organization ID will be used
6669
[region=fr-par] Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
6770

cmd/scw/testdata/test-all-usage-lb-frontend-create-usage.golden

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ ARGS:
1414
[certificate-ids.{index}] List of SSL/TLS certificate IDs to bind to the frontend
1515
[enable-http3] Defines whether to enable HTTP/3 protocol on the frontend
1616
[connection-rate-limit] Rate limit for new connections established on this frontend. Use 0 value to disable, else value is connections per second.
17+
[enable-access-logs] Defines whether to enable access logs on the frontend
1718
[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 | nl-ams-3 | pl-waw-1 | pl-waw-2 | pl-waw-3)
1819

1920
DEPRECATED ARGS:

cmd/scw/testdata/test-all-usage-lb-frontend-update-usage.golden

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ ARGS:
1414
[certificate-ids.{index}] List of SSL/TLS certificate IDs to bind to the frontend
1515
[enable-http3] Defines whether to enable HTTP/3 protocol on the frontend
1616
[connection-rate-limit] Rate limit for new connections established on this frontend. Use 0 value to disable, else value is connections per second.
17+
[enable-access-logs] Defines whether to enable access logs on the frontend
1718
[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 | nl-ams-3 | pl-waw-1 | pl-waw-2 | pl-waw-3)
1819

1920
DEPRECATED ARGS:

cmd/scw/testdata/test-all-usage-webhosting-hosting-create-usage.golden

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ ARGS:
1111
[email] Contact email for the Web Hosting client
1212
[tags.{index}] List of tags for the Web Hosting plan
1313
[domain] Domain name to link to the Web Hosting plan. You must already own this domain name, and have completed the DNS validation process beforehand
14+
[subdomain] The name prefix to use as a free subdomain (for example, `mysite`) assigned to the Web Hosting plan. The full domain will be automatically created by adding it to the fixed base domain (e.g. `mysite.scw.site`). You do not need to include the base domain yourself.
1415
[offer-options.{index}.id] Offer option ID
1516
[offer-options.{index}.quantity] The option requested quantity to set for the Web Hosting plan
1617
[language] Default language for the control panel interface (unknown_language_code | en_US | fr_FR | de_DE)

cmd/scw/testdata/test-all-usage-webhosting-hosting-list-usage.golden

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@ EXAMPLES:
1212
ARGS:
1313
[order-by] Sort order for Web Hosting plans in the response (created_at_asc | created_at_desc)
1414
[tags.{index}] Tags to filter for, only Web Hosting plans with matching tags will be returned
15-
[statuses.{index}] Statuses to filter for, only Web Hosting plans with matching statuses will be returned (unknown_status | delivering | ready | deleting | error | locked | migrating)
15+
[statuses.{index}] Statuses to filter for, only Web Hosting plans with matching statuses will be returned (unknown_status | delivering | ready | deleting | error | locked | migrating | updating)
1616
[domain] Domain to filter for, only Web Hosting plans associated with this domain will be returned
1717
[project-id] Project ID to filter for, only Web Hosting plans from this Project will be returned
1818
[control-panels.{index}] Name of the control panel to filter for, only Web Hosting plans from this control panel will be returned
19+
[subdomain] Optional free subdomain linked to the Web Hosting plan
1920
[organization-id] Organization ID to filter for, only Web Hosting plans from this Organization will be returned
2021
[region=fr-par] Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw | all)
2122

0 commit comments

Comments
 (0)