From a5024e1c70bfa6bc94e85513c719545762cf6827 Mon Sep 17 00:00:00 2001 From: scaleway-bot Date: Tue, 1 Apr 2025 16:16:56 +0000 Subject: [PATCH 1/2] feat: update generated APIs --- ...-all-usage-function-function-get-download-url-usage.golden | 2 +- .../testdata/test-all-usage-iam-group-add-member-usage.golden | 2 +- .../test-all-usage-iam-group-remove-member-usage.golden | 2 +- cmd/scw/testdata/test-all-usage-instance-usage.golden | 2 +- .../test-all-usage-vpc-gw-gateway-network-create-usage.golden | 2 +- cmd/scw/testdata/test-all-usage-vpc-vpc-list-usage.golden | 2 +- cmd/scw/testdata/test-main-usage-usage.golden | 2 +- docs/commands/function.md | 2 +- docs/commands/iam.md | 4 ++-- docs/commands/instance.md | 2 +- docs/commands/vpc.md | 2 +- internal/namespaces/instance/v1/instance_cli.go | 4 ++-- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cmd/scw/testdata/test-all-usage-function-function-get-download-url-usage.golden b/cmd/scw/testdata/test-all-usage-function-function-get-download-url-usage.golden index 2946aaea14..f4a335f9ff 100644 --- a/cmd/scw/testdata/test-all-usage-function-function-get-download-url-usage.golden +++ b/cmd/scw/testdata/test-all-usage-function-function-get-download-url-usage.golden @@ -6,7 +6,7 @@ USAGE: scw function function get-download-url [arg=value ...] ARGS: - function-id UUID of the function to get the the download URL for + function-id UUID of the function to get the download URL for [region=fr-par] Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw) FLAGS: diff --git a/cmd/scw/testdata/test-all-usage-iam-group-add-member-usage.golden b/cmd/scw/testdata/test-all-usage-iam-group-add-member-usage.golden index 4371d1dc8d..0e06e30452 100644 --- a/cmd/scw/testdata/test-all-usage-iam-group-add-member-usage.golden +++ b/cmd/scw/testdata/test-all-usage-iam-group-add-member-usage.golden @@ -1,6 +1,6 @@ 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲 πŸŸ₯πŸŸ₯πŸŸ₯ STDERR️️ πŸŸ₯πŸŸ₯πŸŸ₯️ -Add a user or an application to a group. You can specify a `user_id` and and `application_id` in the body of your request. Note that you can only add one of each per request. +Add a user or an application to a group. You can specify a `user_id` and `application_id` in the body of your request. Note that you can only add one of each per request. USAGE: scw iam group add-member [arg=value ...] diff --git a/cmd/scw/testdata/test-all-usage-iam-group-remove-member-usage.golden b/cmd/scw/testdata/test-all-usage-iam-group-remove-member-usage.golden index 151c05c46a..26c6df8339 100644 --- a/cmd/scw/testdata/test-all-usage-iam-group-remove-member-usage.golden +++ b/cmd/scw/testdata/test-all-usage-iam-group-remove-member-usage.golden @@ -1,6 +1,6 @@ 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲 πŸŸ₯πŸŸ₯πŸŸ₯ STDERR️️ πŸŸ₯πŸŸ₯πŸŸ₯️ -Remove a user or an application from a group. You can specify a `user_id` and and `application_id` in the body of your request. Note that you can only remove one of each per request. Removing a user from a group means that any permissions given to them via the group (i.e. from an attached policy) will no longer apply. Be sure you want to remove these permissions from the user before proceeding. +Remove a user or an application from a group. You can specify a `user_id` and `application_id` in the body of your request. Note that you can only remove one of each per request. Removing a user from a group means that any permissions given to them via the group (i.e. from an attached policy) will no longer apply. Be sure you want to remove these permissions from the user before proceeding. USAGE: scw iam group remove-member [arg=value ...] diff --git a/cmd/scw/testdata/test-all-usage-instance-usage.golden b/cmd/scw/testdata/test-all-usage-instance-usage.golden index 7564824deb..dd3638d873 100644 --- a/cmd/scw/testdata/test-all-usage-instance-usage.golden +++ b/cmd/scw/testdata/test-all-usage-instance-usage.golden @@ -1,6 +1,6 @@ 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲 πŸŸ₯πŸŸ₯πŸŸ₯ STDERR️️ πŸŸ₯πŸŸ₯πŸŸ₯️ -This API allows you to manage your Instances. +This API allows you to manage your CPU and GPU Instances. USAGE: scw instance diff --git a/cmd/scw/testdata/test-all-usage-vpc-gw-gateway-network-create-usage.golden b/cmd/scw/testdata/test-all-usage-vpc-gw-gateway-network-create-usage.golden index 26c6950759..e9bae635fe 100644 --- a/cmd/scw/testdata/test-all-usage-vpc-gw-gateway-network-create-usage.golden +++ b/cmd/scw/testdata/test-all-usage-vpc-gw-gateway-network-create-usage.golden @@ -11,7 +11,7 @@ ARGS: [enable-masquerade] Defines whether to enable masquerade (dynamic NAT) on the GatewayNetwork. [enable-dhcp] Defines whether to enable DHCP on this Private Network. [dhcp-id] ID of an existing DHCP configuration object to use for this GatewayNetwork - [address] Static IP address in CIDR format to to use without DHCP + [address] Static IP address in CIDR format to use without DHCP [ipam-config.push-default-route] Enabling the default route also enables masquerading [ipam-config.ipam-ip-id] Use this IPAM-booked IP ID as the Gateway's IP in this Private Network [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) diff --git a/cmd/scw/testdata/test-all-usage-vpc-vpc-list-usage.golden b/cmd/scw/testdata/test-all-usage-vpc-vpc-list-usage.golden index 31ebef11d3..b02c4ad3b4 100644 --- a/cmd/scw/testdata/test-all-usage-vpc-vpc-list-usage.golden +++ b/cmd/scw/testdata/test-all-usage-vpc-vpc-list-usage.golden @@ -8,7 +8,7 @@ USAGE: ARGS: [order-by] Sort order of the returned VPCs (created_at_asc | created_at_desc | name_asc | name_desc) [name] Name to filter for. Only VPCs with names containing this string will be returned - [tags.{index}] Tags to filter for. Only VPCs with one more more matching tags will be returned + [tags.{index}] Tags to filter for. Only VPCs with one or more matching tags will be returned [project-id] Project ID to filter for. Only VPCs belonging to this Project will be returned [is-default] Defines whether to filter only for VPCs which are the default one for their Project [routing-enabled] Defines whether to filter only for VPCs which route traffic between their Private Networks diff --git a/cmd/scw/testdata/test-main-usage-usage.golden b/cmd/scw/testdata/test-main-usage-usage.golden index 760cd1059b..dc34a753e5 100644 --- a/cmd/scw/testdata/test-main-usage-usage.golden +++ b/cmd/scw/testdata/test-main-usage-usage.golden @@ -12,7 +12,7 @@ BAREMETAL COMMANDS: fip This API allows you to manage your Elastic Metal servers' flexible public IP addresses COMPUTE COMMANDS: - instance This API allows you to manage your Instances + instance This API allows you to manage your CPU and GPU Instances marketplace This API allows you to find available images for use when launching a Scaleway Instance CONFIGURATION COMMANDS: diff --git a/docs/commands/function.md b/docs/commands/function.md index 688554328c..f794392ab4 100644 --- a/docs/commands/function.md +++ b/docs/commands/function.md @@ -383,7 +383,7 @@ scw function function get-download-url [arg=value ...] | Name | | Description | |------|---|-------------| -| function-id | Required | UUID of the function to get the the download URL for | +| function-id | Required | UUID of the function to get the download URL for | | region | Default: `fr-par`
One of: `fr-par`, `nl-ams`, `pl-waw` | Region to target. If none is passed will use default region from the config | diff --git a/docs/commands/iam.md b/docs/commands/iam.md index 8496bc4d44..ce4151b717 100644 --- a/docs/commands/iam.md +++ b/docs/commands/iam.md @@ -306,7 +306,7 @@ Groups management commands. ### Add a user or an application to a group -Add a user or an application to a group. You can specify a `user_id` and and `application_id` in the body of your request. Note that you can only add one of each per request. +Add a user or an application to a group. You can specify a `user_id` and `application_id` in the body of your request. Note that you can only add one of each per request. **Usage:** @@ -453,7 +453,7 @@ scw iam group list [arg=value ...] ### Remove a user or an application from a group -Remove a user or an application from a group. You can specify a `user_id` and and `application_id` in the body of your request. Note that you can only remove one of each per request. Removing a user from a group means that any permissions given to them via the group (i.e. from an attached policy) will no longer apply. Be sure you want to remove these permissions from the user before proceeding. +Remove a user or an application from a group. You can specify a `user_id` and `application_id` in the body of your request. Note that you can only remove one of each per request. Removing a user from a group means that any permissions given to them via the group (i.e. from an attached policy) will no longer apply. Be sure you want to remove these permissions from the user before proceeding. **Usage:** diff --git a/docs/commands/instance.md b/docs/commands/instance.md index 200100232f..d9042f562c 100644 --- a/docs/commands/instance.md +++ b/docs/commands/instance.md @@ -1,6 +1,6 @@ # Documentation for `scw instance` -This API allows you to manage your Instances. +This API allows you to manage your CPU and GPU Instances. - [Image management commands](#image-management-commands) - [Create an Instance image](#create-an-instance-image) diff --git a/docs/commands/vpc.md b/docs/commands/vpc.md index 48321cc7f9..e6bbfd8856 100644 --- a/docs/commands/vpc.md +++ b/docs/commands/vpc.md @@ -469,7 +469,7 @@ scw vpc vpc list [arg=value ...] |------|---|-------------| | order-by | One of: `created_at_asc`, `created_at_desc`, `name_asc`, `name_desc` | Sort order of the returned VPCs | | name | | Name to filter for. Only VPCs with names containing this string will be returned | -| tags.{index} | | Tags to filter for. Only VPCs with one more more matching tags will be returned | +| tags.{index} | | Tags to filter for. Only VPCs with one or more matching tags will be returned | | project-id | | Project ID to filter for. Only VPCs belonging to this Project will be returned | | is-default | | Defines whether to filter only for VPCs which are the default one for their Project | | routing-enabled | | Defines whether to filter only for VPCs which route traffic between their Private Networks | diff --git a/internal/namespaces/instance/v1/instance_cli.go b/internal/namespaces/instance/v1/instance_cli.go index e8a4b0d89e..bbb7eaa414 100644 --- a/internal/namespaces/instance/v1/instance_cli.go +++ b/internal/namespaces/instance/v1/instance_cli.go @@ -96,8 +96,8 @@ func GetGeneratedCommands() *core.Commands { } func instanceRoot() *core.Command { return &core.Command{ - Short: `This API allows you to manage your Instances`, - Long: `This API allows you to manage your Instances.`, + Short: `This API allows you to manage your CPU and GPU Instances`, + Long: `This API allows you to manage your CPU and GPU Instances.`, Namespace: "instance", } } From bb53ea06a2c89c3dc8045e489591afc2c486f22b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= Date: Mon, 7 Apr 2025 18:44:35 +0200 Subject: [PATCH 2/2] Fix --- ...-all-usage-function-function-get-download-url-usage.golden | 2 +- .../testdata/test-all-usage-iam-group-add-member-usage.golden | 2 +- .../test-all-usage-iam-group-remove-member-usage.golden | 2 +- .../test-all-usage-vpc-gw-gateway-network-create-usage.golden | 2 +- cmd/scw/testdata/test-all-usage-vpc-vpc-list-usage.golden | 2 +- docs/commands/function.md | 2 +- docs/commands/iam.md | 4 ++-- docs/commands/vpc.md | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmd/scw/testdata/test-all-usage-function-function-get-download-url-usage.golden b/cmd/scw/testdata/test-all-usage-function-function-get-download-url-usage.golden index f4a335f9ff..2946aaea14 100644 --- a/cmd/scw/testdata/test-all-usage-function-function-get-download-url-usage.golden +++ b/cmd/scw/testdata/test-all-usage-function-function-get-download-url-usage.golden @@ -6,7 +6,7 @@ USAGE: scw function function get-download-url [arg=value ...] ARGS: - function-id UUID of the function to get the download URL for + function-id UUID of the function to get the the download URL for [region=fr-par] Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw) FLAGS: diff --git a/cmd/scw/testdata/test-all-usage-iam-group-add-member-usage.golden b/cmd/scw/testdata/test-all-usage-iam-group-add-member-usage.golden index 0e06e30452..4371d1dc8d 100644 --- a/cmd/scw/testdata/test-all-usage-iam-group-add-member-usage.golden +++ b/cmd/scw/testdata/test-all-usage-iam-group-add-member-usage.golden @@ -1,6 +1,6 @@ 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲 πŸŸ₯πŸŸ₯πŸŸ₯ STDERR️️ πŸŸ₯πŸŸ₯πŸŸ₯️ -Add a user or an application to a group. You can specify a `user_id` and `application_id` in the body of your request. Note that you can only add one of each per request. +Add a user or an application to a group. You can specify a `user_id` and and `application_id` in the body of your request. Note that you can only add one of each per request. USAGE: scw iam group add-member [arg=value ...] diff --git a/cmd/scw/testdata/test-all-usage-iam-group-remove-member-usage.golden b/cmd/scw/testdata/test-all-usage-iam-group-remove-member-usage.golden index 26c6df8339..151c05c46a 100644 --- a/cmd/scw/testdata/test-all-usage-iam-group-remove-member-usage.golden +++ b/cmd/scw/testdata/test-all-usage-iam-group-remove-member-usage.golden @@ -1,6 +1,6 @@ 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲 πŸŸ₯πŸŸ₯πŸŸ₯ STDERR️️ πŸŸ₯πŸŸ₯πŸŸ₯️ -Remove a user or an application from a group. You can specify a `user_id` and `application_id` in the body of your request. Note that you can only remove one of each per request. Removing a user from a group means that any permissions given to them via the group (i.e. from an attached policy) will no longer apply. Be sure you want to remove these permissions from the user before proceeding. +Remove a user or an application from a group. You can specify a `user_id` and and `application_id` in the body of your request. Note that you can only remove one of each per request. Removing a user from a group means that any permissions given to them via the group (i.e. from an attached policy) will no longer apply. Be sure you want to remove these permissions from the user before proceeding. USAGE: scw iam group remove-member [arg=value ...] diff --git a/cmd/scw/testdata/test-all-usage-vpc-gw-gateway-network-create-usage.golden b/cmd/scw/testdata/test-all-usage-vpc-gw-gateway-network-create-usage.golden index e9bae635fe..26c6950759 100644 --- a/cmd/scw/testdata/test-all-usage-vpc-gw-gateway-network-create-usage.golden +++ b/cmd/scw/testdata/test-all-usage-vpc-gw-gateway-network-create-usage.golden @@ -11,7 +11,7 @@ ARGS: [enable-masquerade] Defines whether to enable masquerade (dynamic NAT) on the GatewayNetwork. [enable-dhcp] Defines whether to enable DHCP on this Private Network. [dhcp-id] ID of an existing DHCP configuration object to use for this GatewayNetwork - [address] Static IP address in CIDR format to use without DHCP + [address] Static IP address in CIDR format to to use without DHCP [ipam-config.push-default-route] Enabling the default route also enables masquerading [ipam-config.ipam-ip-id] Use this IPAM-booked IP ID as the Gateway's IP in this Private Network [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) diff --git a/cmd/scw/testdata/test-all-usage-vpc-vpc-list-usage.golden b/cmd/scw/testdata/test-all-usage-vpc-vpc-list-usage.golden index b02c4ad3b4..31ebef11d3 100644 --- a/cmd/scw/testdata/test-all-usage-vpc-vpc-list-usage.golden +++ b/cmd/scw/testdata/test-all-usage-vpc-vpc-list-usage.golden @@ -8,7 +8,7 @@ USAGE: ARGS: [order-by] Sort order of the returned VPCs (created_at_asc | created_at_desc | name_asc | name_desc) [name] Name to filter for. Only VPCs with names containing this string will be returned - [tags.{index}] Tags to filter for. Only VPCs with one or more matching tags will be returned + [tags.{index}] Tags to filter for. Only VPCs with one more more matching tags will be returned [project-id] Project ID to filter for. Only VPCs belonging to this Project will be returned [is-default] Defines whether to filter only for VPCs which are the default one for their Project [routing-enabled] Defines whether to filter only for VPCs which route traffic between their Private Networks diff --git a/docs/commands/function.md b/docs/commands/function.md index f794392ab4..688554328c 100644 --- a/docs/commands/function.md +++ b/docs/commands/function.md @@ -383,7 +383,7 @@ scw function function get-download-url [arg=value ...] | Name | | Description | |------|---|-------------| -| function-id | Required | UUID of the function to get the download URL for | +| function-id | Required | UUID of the function to get the the download URL for | | region | Default: `fr-par`
One of: `fr-par`, `nl-ams`, `pl-waw` | Region to target. If none is passed will use default region from the config | diff --git a/docs/commands/iam.md b/docs/commands/iam.md index ce4151b717..8496bc4d44 100644 --- a/docs/commands/iam.md +++ b/docs/commands/iam.md @@ -306,7 +306,7 @@ Groups management commands. ### Add a user or an application to a group -Add a user or an application to a group. You can specify a `user_id` and `application_id` in the body of your request. Note that you can only add one of each per request. +Add a user or an application to a group. You can specify a `user_id` and and `application_id` in the body of your request. Note that you can only add one of each per request. **Usage:** @@ -453,7 +453,7 @@ scw iam group list [arg=value ...] ### Remove a user or an application from a group -Remove a user or an application from a group. You can specify a `user_id` and `application_id` in the body of your request. Note that you can only remove one of each per request. Removing a user from a group means that any permissions given to them via the group (i.e. from an attached policy) will no longer apply. Be sure you want to remove these permissions from the user before proceeding. +Remove a user or an application from a group. You can specify a `user_id` and and `application_id` in the body of your request. Note that you can only remove one of each per request. Removing a user from a group means that any permissions given to them via the group (i.e. from an attached policy) will no longer apply. Be sure you want to remove these permissions from the user before proceeding. **Usage:** diff --git a/docs/commands/vpc.md b/docs/commands/vpc.md index e6bbfd8856..48321cc7f9 100644 --- a/docs/commands/vpc.md +++ b/docs/commands/vpc.md @@ -469,7 +469,7 @@ scw vpc vpc list [arg=value ...] |------|---|-------------| | order-by | One of: `created_at_asc`, `created_at_desc`, `name_asc`, `name_desc` | Sort order of the returned VPCs | | name | | Name to filter for. Only VPCs with names containing this string will be returned | -| tags.{index} | | Tags to filter for. Only VPCs with one or more matching tags will be returned | +| tags.{index} | | Tags to filter for. Only VPCs with one more more matching tags will be returned | | project-id | | Project ID to filter for. Only VPCs belonging to this Project will be returned | | is-default | | Defines whether to filter only for VPCs which are the default one for their Project | | routing-enabled | | Defines whether to filter only for VPCs which route traffic between their Private Networks |