From 6491c49ea22f90de5e28f7ac403608d4183f7bd0 Mon Sep 17 00:00:00 2001 From: Prototool Bot Date: Wed, 20 May 2026 14:24:43 +0000 Subject: [PATCH 1/3] feat: update generated APIs --- ...l-usage-product-catalog-product-list-usage.golden | 2 +- ...-all-usage-s2s-vpn-connection-create-usage.golden | 2 ++ ...t-all-usage-searchdb-deployment-list-usage.golden | 1 - docs/commands/product-catalog.md | 2 +- docs/commands/s2s-vpn.md | 2 ++ docs/commands/searchdb.md | 1 - go.mod | 2 +- go.sum | 4 ++-- internal/namespaces/s2s_vpn/v1alpha1/s2s_vpn_cli.go | 12 ++++++++++++ 9 files changed, 21 insertions(+), 7 deletions(-) diff --git a/cmd/scw/testdata/test-all-usage-product-catalog-product-list-usage.golden b/cmd/scw/testdata/test-all-usage-product-catalog-product-list-usage.golden index 7c8035229c..c3002f201e 100644 --- a/cmd/scw/testdata/test-all-usage-product-catalog-product-list-usage.golden +++ b/cmd/scw/testdata/test-all-usage-product-catalog-product-list-usage.golden @@ -6,7 +6,7 @@ USAGE: scw product-catalog product list [arg=value ...] ARGS: - [product-types.{index}] The list of filtered product categories. (unknown_product_type | instance | apple_silicon | elastic_metal | dedibox | block_storage | object_storage | managed_inference | generative_apis | load_balancer | secret_manager | key_manager | managed_redis_database | kubernetes | managed_relational_database | managed_mongodb) + [product-types.{index}] The list of filtered product categories. (unknown_product_type | instance | apple_silicon | elastic_metal | dedibox | block_storage | object_storage | managed_inference | generative_apis | load_balancer | secret_manager | key_manager | managed_redis_database | kubernetes | managed_relational_database | managed_mongodb | serverless_functions) [global] Filter global products. [region] Filter products by region. [zone] Filter products by zone. diff --git a/cmd/scw/testdata/test-all-usage-s2s-vpn-connection-create-usage.golden b/cmd/scw/testdata/test-all-usage-s2s-vpn-connection-create-usage.golden index 8f5f002a4c..6c79912edf 100644 --- a/cmd/scw/testdata/test-all-usage-s2s-vpn-connection-create-usage.golden +++ b/cmd/scw/testdata/test-all-usage-s2s-vpn-connection-create-usage.golden @@ -18,6 +18,8 @@ ARGS: [esp-ciphers.{index}.integrity] (unknown_integrity | sha256 | sha384 | sha512) [esp-ciphers.{index}.dh-group] (unknown_dhgroup | modp2048 | modp3072 | modp4096 | ecp256 | ecp384 | ecp521 | curve25519) [enable-route-propagation] Defines whether route propagation is enabled or not. + [secret.id] + [secret.revision] vpn-gateway-id ID of the VPN gateway to attach to the connection customer-gateway-id ID of the customer gateway to attach to the connection [bgp-config-ipv4.routing-policy-id] diff --git a/cmd/scw/testdata/test-all-usage-searchdb-deployment-list-usage.golden b/cmd/scw/testdata/test-all-usage-searchdb-deployment-list-usage.golden index 1c7d559472..1afffd4969 100644 --- a/cmd/scw/testdata/test-all-usage-searchdb-deployment-list-usage.golden +++ b/cmd/scw/testdata/test-all-usage-searchdb-deployment-list-usage.golden @@ -10,7 +10,6 @@ ARGS: [order-by] Define the order of the returned deployments (created_at_asc | created_at_desc | name_asc | name_desc | updated_at_asc | updated_at_desc) [tags.{index}] Filter by tag, only deployments with one or more matching tags will be returned [name] Deployment name to filter for - [version] Engine version to filter for [organization-id] ID of the Organization containing the deployments [region=fr-par] Region to target. If none is passed will use default region from the config (fr-par | all) diff --git a/docs/commands/product-catalog.md b/docs/commands/product-catalog.md index 8346ec3763..9252ee5dd2 100644 --- a/docs/commands/product-catalog.md +++ b/docs/commands/product-catalog.md @@ -28,7 +28,7 @@ scw product-catalog product list [arg=value ...] | Name | | Description | |------|---|-------------| -| product-types.{index} | One of: `unknown_product_type`, `instance`, `apple_silicon`, `elastic_metal`, `dedibox`, `block_storage`, `object_storage`, `managed_inference`, `generative_apis`, `load_balancer`, `secret_manager`, `key_manager`, `managed_redis_database`, `kubernetes`, `managed_relational_database`, `managed_mongodb` | The list of filtered product categories. | +| product-types.{index} | One of: `unknown_product_type`, `instance`, `apple_silicon`, `elastic_metal`, `dedibox`, `block_storage`, `object_storage`, `managed_inference`, `generative_apis`, `load_balancer`, `secret_manager`, `key_manager`, `managed_redis_database`, `kubernetes`, `managed_relational_database`, `managed_mongodb`, `serverless_functions` | The list of filtered product categories. | | global | | Filter global products. | | region | | Filter products by region. | | zone | | Filter products by zone. | diff --git a/docs/commands/s2s-vpn.md b/docs/commands/s2s-vpn.md index b99b0052ac..02880904d3 100644 --- a/docs/commands/s2s-vpn.md +++ b/docs/commands/s2s-vpn.md @@ -67,6 +67,8 @@ scw s2s-vpn connection create [arg=value ...] | esp-ciphers.{index}.integrity | One of: `unknown_integrity`, `sha256`, `sha384`, `sha512` | | | esp-ciphers.{index}.dh-group | One of: `unknown_dhgroup`, `modp2048`, `modp3072`, `modp4096`, `ecp256`, `ecp384`, `ecp521`, `curve25519` | | | enable-route-propagation | | Defines whether route propagation is enabled or not. | +| secret.id | | | +| secret.revision | | | | vpn-gateway-id | Required | ID of the VPN gateway to attach to the connection | | customer-gateway-id | Required | ID of the customer gateway to attach to the connection | | bgp-config-ipv4.routing-policy-id | | | diff --git a/docs/commands/searchdb.md b/docs/commands/searchdb.md index 2ea70be400..2d26f6b6f5 100644 --- a/docs/commands/searchdb.md +++ b/docs/commands/searchdb.md @@ -117,7 +117,6 @@ scw searchdb deployment list [arg=value ...] | order-by | One of: `created_at_asc`, `created_at_desc`, `name_asc`, `name_desc`, `updated_at_asc`, `updated_at_desc` | Define the order of the returned deployments | | tags.{index} | | Filter by tag, only deployments with one or more matching tags will be returned | | name | | Deployment name to filter for | -| version | | Engine version to filter for | | organization-id | | ID of the Organization containing the deployments | | region | Default: `fr-par`
One of: `fr-par`, `all` | Region to target. If none is passed will use default region from the config | diff --git a/go.mod b/go.mod index 70373c472f..b23c9a8b9a 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( github.com/moby/moby/client v0.4.1 github.com/modelcontextprotocol/go-sdk v1.6.0 github.com/opencontainers/go-digest v1.0.0 - github.com/scaleway/scaleway-sdk-go v1.0.0-beta.36.0.20260513090952-0a5c44ecc392 + github.com/scaleway/scaleway-sdk-go v1.0.0-beta.36.0.20260520090938-edea9c4217c0 github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 github.com/spf13/cobra v1.10.2 github.com/spf13/pflag v1.0.10 diff --git a/go.sum b/go.sum index c9c64252d4..19fa94c149 100644 --- a/go.sum +++ b/go.sum @@ -478,8 +478,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.36.0.20260513090952-0a5c44ecc392 h1:QdQq3OgcaTJ0i8C4ZvsA88DjnkFHz+TR0CKUPcSvryQ= -github.com/scaleway/scaleway-sdk-go v1.0.0-beta.36.0.20260513090952-0a5c44ecc392/go.mod h1:nM6TSLEqF6l+p7ds8I5/Xu+NXD9nRrYSu3sa/czcdEw= +github.com/scaleway/scaleway-sdk-go v1.0.0-beta.36.0.20260520090938-edea9c4217c0 h1:Z+qliEoFmWOxM9l80zLe+CHdhbRKPYJw1fegftVPq/s= +github.com/scaleway/scaleway-sdk-go v1.0.0-beta.36.0.20260520090938-edea9c4217c0/go.mod h1:nM6TSLEqF6l+p7ds8I5/Xu+NXD9nRrYSu3sa/czcdEw= 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.10.0 h1:l+H5ErcW0PAehBNrBxoGv1jjNpGYdZ9RcheFkB2WI14= diff --git a/internal/namespaces/s2s_vpn/v1alpha1/s2s_vpn_cli.go b/internal/namespaces/s2s_vpn/v1alpha1/s2s_vpn_cli.go index 8f7ccae409..5f0a2f3307 100644 --- a/internal/namespaces/s2s_vpn/v1alpha1/s2s_vpn_cli.go +++ b/internal/namespaces/s2s_vpn/v1alpha1/s2s_vpn_cli.go @@ -799,6 +799,18 @@ func s2sVpnConnectionCreate() *core.Command { Deprecated: false, Positional: false, }, + { + Name: "secret.id", + Required: false, + Deprecated: false, + Positional: false, + }, + { + Name: "secret.revision", + Required: false, + Deprecated: false, + Positional: false, + }, { Name: "vpn-gateway-id", Short: `ID of the VPN gateway to attach to the connection`, From 8263c3ba9b0aa47b975f2479673a4930eccbd3bd Mon Sep 17 00:00:00 2001 From: Jonathan Remy Date: Thu, 21 May 2026 06:10:43 +0200 Subject: [PATCH 2/3] Regenerate product-catalog and searchdb docs. --- docs/commands/product-catalog.md | 2 +- docs/commands/searchdb.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/commands/product-catalog.md b/docs/commands/product-catalog.md index 9252ee5dd2..8346ec3763 100644 --- a/docs/commands/product-catalog.md +++ b/docs/commands/product-catalog.md @@ -28,7 +28,7 @@ scw product-catalog product list [arg=value ...] | Name | | Description | |------|---|-------------| -| product-types.{index} | One of: `unknown_product_type`, `instance`, `apple_silicon`, `elastic_metal`, `dedibox`, `block_storage`, `object_storage`, `managed_inference`, `generative_apis`, `load_balancer`, `secret_manager`, `key_manager`, `managed_redis_database`, `kubernetes`, `managed_relational_database`, `managed_mongodb`, `serverless_functions` | The list of filtered product categories. | +| product-types.{index} | One of: `unknown_product_type`, `instance`, `apple_silicon`, `elastic_metal`, `dedibox`, `block_storage`, `object_storage`, `managed_inference`, `generative_apis`, `load_balancer`, `secret_manager`, `key_manager`, `managed_redis_database`, `kubernetes`, `managed_relational_database`, `managed_mongodb` | The list of filtered product categories. | | global | | Filter global products. | | region | | Filter products by region. | | zone | | Filter products by zone. | diff --git a/docs/commands/searchdb.md b/docs/commands/searchdb.md index 2d26f6b6f5..2ea70be400 100644 --- a/docs/commands/searchdb.md +++ b/docs/commands/searchdb.md @@ -117,6 +117,7 @@ scw searchdb deployment list [arg=value ...] | order-by | One of: `created_at_asc`, `created_at_desc`, `name_asc`, `name_desc`, `updated_at_asc`, `updated_at_desc` | Define the order of the returned deployments | | tags.{index} | | Filter by tag, only deployments with one or more matching tags will be returned | | name | | Deployment name to filter for | +| version | | Engine version to filter for | | organization-id | | ID of the Organization containing the deployments | | region | Default: `fr-par`
One of: `fr-par`, `all` | Region to target. If none is passed will use default region from the config | From bca5ff96af10cf3ccedd4b867a9b5b0a2c1a0aae Mon Sep 17 00:00:00 2001 From: Jonathan Remy Date: Thu, 21 May 2026 06:53:44 +0200 Subject: [PATCH 3/3] Update usage golden files for product-catalog and searchdb. --- .../test-all-usage-product-catalog-product-list-usage.golden | 2 +- .../test-all-usage-searchdb-deployment-list-usage.golden | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/scw/testdata/test-all-usage-product-catalog-product-list-usage.golden b/cmd/scw/testdata/test-all-usage-product-catalog-product-list-usage.golden index c3002f201e..7c8035229c 100644 --- a/cmd/scw/testdata/test-all-usage-product-catalog-product-list-usage.golden +++ b/cmd/scw/testdata/test-all-usage-product-catalog-product-list-usage.golden @@ -6,7 +6,7 @@ USAGE: scw product-catalog product list [arg=value ...] ARGS: - [product-types.{index}] The list of filtered product categories. (unknown_product_type | instance | apple_silicon | elastic_metal | dedibox | block_storage | object_storage | managed_inference | generative_apis | load_balancer | secret_manager | key_manager | managed_redis_database | kubernetes | managed_relational_database | managed_mongodb | serverless_functions) + [product-types.{index}] The list of filtered product categories. (unknown_product_type | instance | apple_silicon | elastic_metal | dedibox | block_storage | object_storage | managed_inference | generative_apis | load_balancer | secret_manager | key_manager | managed_redis_database | kubernetes | managed_relational_database | managed_mongodb) [global] Filter global products. [region] Filter products by region. [zone] Filter products by zone. diff --git a/cmd/scw/testdata/test-all-usage-searchdb-deployment-list-usage.golden b/cmd/scw/testdata/test-all-usage-searchdb-deployment-list-usage.golden index 1afffd4969..1c7d559472 100644 --- a/cmd/scw/testdata/test-all-usage-searchdb-deployment-list-usage.golden +++ b/cmd/scw/testdata/test-all-usage-searchdb-deployment-list-usage.golden @@ -10,6 +10,7 @@ ARGS: [order-by] Define the order of the returned deployments (created_at_asc | created_at_desc | name_asc | name_desc | updated_at_asc | updated_at_desc) [tags.{index}] Filter by tag, only deployments with one or more matching tags will be returned [name] Deployment name to filter for + [version] Engine version to filter for [organization-id] ID of the Organization containing the deployments [region=fr-par] Region to target. If none is passed will use default region from the config (fr-par | all)