From b06984cef3e06b89a3a893d8eb3004f561e6747e Mon Sep 17 00:00:00 2001 From: scaleway-bot Date: Wed, 30 Apr 2025 14:18:01 +0000 Subject: [PATCH 1/3] feat: update generated APIs --- ...ge-container-container-create-usage.golden | 1 + ...ge-container-container-update-usage.golden | 1 + ...ge-container-namespace-create-usage.golden | 2 +- ...ge-container-namespace-update-usage.golden | 2 +- ...sage-function-function-create-usage.golden | 1 + ...sage-function-function-update-usage.golden | 1 + ...age-function-namespace-create-usage.golden | 2 +- ...age-function-namespace-update-usage.golden | 2 +- docs/commands/container.md | 6 ++++-- docs/commands/function.md | 6 ++++-- go.mod | 2 +- go.sum | 4 ++-- .../container/v1beta1/container_cli.go | 20 ++++++++++++++++--- .../function/v1beta1/function_cli.go | 20 ++++++++++++++++--- 14 files changed, 53 insertions(+), 17 deletions(-) diff --git a/cmd/scw/testdata/test-all-usage-container-container-create-usage.golden b/cmd/scw/testdata/test-all-usage-container-container-create-usage.golden index 977ca0d307..8d91b3b884 100644 --- a/cmd/scw/testdata/test-all-usage-container-container-create-usage.golden +++ b/cmd/scw/testdata/test-all-usage-container-container-create-usage.golden @@ -30,6 +30,7 @@ ARGS: [health-check.http.path] Path to use for the HTTP health check. [health-check.failure-threshold] Number of consecutive health check failures before considering the container unhealthy. [health-check.interval] Period between health checks. + [tags.{index}] Tags of the Serverless Container [deploy=true] Deploy container after creation [region=fr-par] Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw) diff --git a/cmd/scw/testdata/test-all-usage-container-container-update-usage.golden b/cmd/scw/testdata/test-all-usage-container-container-update-usage.golden index e61df84e1e..d31c349209 100644 --- a/cmd/scw/testdata/test-all-usage-container-container-update-usage.golden +++ b/cmd/scw/testdata/test-all-usage-container-container-update-usage.golden @@ -30,6 +30,7 @@ ARGS: [health-check.http.path] Path to use for the HTTP health check. [health-check.failure-threshold] Number of consecutive health check failures before considering the container unhealthy. [health-check.interval] Period between health checks. + [tags.{index}] Tags of the Serverless Container [region=fr-par] Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw) DEPRECATED ARGS: diff --git a/cmd/scw/testdata/test-all-usage-container-namespace-create-usage.golden b/cmd/scw/testdata/test-all-usage-container-namespace-create-usage.golden index b71229c5fa..d944eb6d70 100644 --- a/cmd/scw/testdata/test-all-usage-container-namespace-create-usage.golden +++ b/cmd/scw/testdata/test-all-usage-container-namespace-create-usage.golden @@ -12,7 +12,7 @@ ARGS: [description] Description of the namespace to create [secret-environment-variables.{index}.key] [secret-environment-variables.{index}.value] - [tags.{index}] [ALPHA] Tags of the Serverless Container Namespace + [tags.{index}] Tags of the Serverless Container Namespace [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-container-namespace-update-usage.golden b/cmd/scw/testdata/test-all-usage-container-namespace-update-usage.golden index 20f00a9a0f..bd9b366c45 100644 --- a/cmd/scw/testdata/test-all-usage-container-namespace-update-usage.golden +++ b/cmd/scw/testdata/test-all-usage-container-namespace-update-usage.golden @@ -11,7 +11,7 @@ ARGS: [description] Description of the namespace to update [secret-environment-variables.{index}.key] [secret-environment-variables.{index}.value] - [tags.{index}] [ALPHA] Tags of the Serverless Container Namespace + [tags.{index}] Tags of the Serverless Container Namespace [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-function-function-create-usage.golden b/cmd/scw/testdata/test-all-usage-function-function-create-usage.golden index 8d7a2e756b..925d7a815a 100644 --- a/cmd/scw/testdata/test-all-usage-function-function-create-usage.golden +++ b/cmd/scw/testdata/test-all-usage-function-function-create-usage.golden @@ -21,6 +21,7 @@ ARGS: [secret-environment-variables.{index}.value] [http-option=enabled] Configure how HTTP and HTTPS requests are handled (unknown_http_option | enabled | redirected) [sandbox] Execution environment of the function (unknown_sandbox | v1 | v2) + [tags.{index}] Tags of the Serverless Function [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-function-function-update-usage.golden b/cmd/scw/testdata/test-all-usage-function-function-update-usage.golden index c87df51dd3..a6847b4b4c 100644 --- a/cmd/scw/testdata/test-all-usage-function-function-update-usage.golden +++ b/cmd/scw/testdata/test-all-usage-function-function-update-usage.golden @@ -21,6 +21,7 @@ ARGS: [secret-environment-variables.{index}.value] [http-option] Configure how HTTP and HTTPS requests are handled (unknown_http_option | enabled | redirected) [sandbox] Execution environment of the function (unknown_sandbox | v1 | v2) + [tags.{index}] Tags of the Serverless Function [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-function-namespace-create-usage.golden b/cmd/scw/testdata/test-all-usage-function-namespace-create-usage.golden index cfcfb502d8..b1010b45db 100644 --- a/cmd/scw/testdata/test-all-usage-function-namespace-create-usage.golden +++ b/cmd/scw/testdata/test-all-usage-function-namespace-create-usage.golden @@ -12,7 +12,7 @@ ARGS: [description] Description of the namespace [secret-environment-variables.{index}.key] [secret-environment-variables.{index}.value] - [tags.{index}] [ALPHA] Tags of the Serverless Function Namespace + [tags.{index}] Tags of the Serverless Function Namespace [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-function-namespace-update-usage.golden b/cmd/scw/testdata/test-all-usage-function-namespace-update-usage.golden index fcab3ba3b2..c8f3a1394d 100644 --- a/cmd/scw/testdata/test-all-usage-function-namespace-update-usage.golden +++ b/cmd/scw/testdata/test-all-usage-function-namespace-update-usage.golden @@ -11,7 +11,7 @@ ARGS: [description] Description of the namespace [secret-environment-variables.{index}.key] [secret-environment-variables.{index}.value] - [tags.{index}] [ALPHA] Tags of the Serverless Function Namespace + [tags.{index}] Tags of the Serverless Function Namespace [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/docs/commands/container.md b/docs/commands/container.md index c5339e8618..fe5e56c351 100644 --- a/docs/commands/container.md +++ b/docs/commands/container.md @@ -85,6 +85,7 @@ scw container container create [arg=value ...] | health-check.http.path | | Path to use for the HTTP health check. | | health-check.failure-threshold | | Number of consecutive health check failures before considering the container unhealthy. | | health-check.interval | | Period between health checks. | +| tags.{index} | | Tags of the Serverless Container | | deploy | Default: `true` | Deploy container after creation | | 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 | @@ -214,6 +215,7 @@ scw container container update [arg=value ...] | health-check.http.path | | Path to use for the HTTP health check. | | health-check.failure-threshold | | Number of consecutive health check failures before considering the container unhealthy. | | health-check.interval | | Period between health checks. | +| tags.{index} | | Tags of the Serverless Container | | 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 | @@ -474,7 +476,7 @@ scw container namespace create [arg=value ...] | description | | Description of the namespace to create | | secret-environment-variables.{index}.key | | | | secret-environment-variables.{index}.value | | | -| tags.{index} | | [ALPHA] Tags of the Serverless Container Namespace | +| tags.{index} | | Tags of the Serverless Container Namespace | | 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 | @@ -562,7 +564,7 @@ scw container namespace update [arg=value ...] | description | | Description of the namespace to update | | secret-environment-variables.{index}.key | | | | secret-environment-variables.{index}.value | | | -| tags.{index} | | [ALPHA] Tags of the Serverless Container Namespace | +| tags.{index} | | Tags of the Serverless Container Namespace | | 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/function.md b/docs/commands/function.md index b6b4db50ae..d0679d93a6 100644 --- a/docs/commands/function.md +++ b/docs/commands/function.md @@ -304,6 +304,7 @@ scw function function create [arg=value ...] | secret-environment-variables.{index}.value | | | | http-option | Default: `enabled`
One of: `unknown_http_option`, `enabled`, `redirected` | Configure how HTTP and HTTPS requests are handled | | sandbox | One of: `unknown_sandbox`, `v1`, `v2` | Execution environment of the function | +| tags.{index} | | Tags of the Serverless Function | | 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 | @@ -463,6 +464,7 @@ scw function function update [arg=value ...] | secret-environment-variables.{index}.value | | | | http-option | One of: `unknown_http_option`, `enabled`, `redirected` | Configure how HTTP and HTTPS requests are handled | | sandbox | One of: `unknown_sandbox`, `v1`, `v2` | Execution environment of the function | +| tags.{index} | | Tags of the Serverless Function | | 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 | @@ -493,7 +495,7 @@ scw function namespace create [arg=value ...] | description | | Description of the namespace | | secret-environment-variables.{index}.key | | | | secret-environment-variables.{index}.value | | | -| tags.{index} | | [ALPHA] Tags of the Serverless Function Namespace | +| tags.{index} | | Tags of the Serverless Function Namespace | | 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 | @@ -581,7 +583,7 @@ scw function namespace update [arg=value ...] | description | | Description of the namespace | | secret-environment-variables.{index}.key | | | | secret-environment-variables.{index}.value | | | -| tags.{index} | | [ALPHA] Tags of the Serverless Function Namespace | +| tags.{index} | | Tags of the Serverless Function Namespace | | 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/go.mod b/go.mod index 3ddfbfd28d..e98977ec0e 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.13.2 github.com/opencontainers/go-digest v1.0.0 - github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250422095315-6f998f4655ec + github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250425155221-30ae936d86f6 github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 github.com/spf13/cobra v1.9.1 github.com/spf13/pflag v1.0.6 diff --git a/go.sum b/go.sum index 089e8b0f10..b1db18ec8c 100644 --- a/go.sum +++ b/go.sum @@ -466,8 +466,8 @@ github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUz 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.33.0.20250422095315-6f998f4655ec h1:XLNQFZzigDYXgdRHPxuV3w5VnKvnsCVbl8HBpvDYu40= -github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250422095315-6f998f4655ec/go.mod h1:w4o02EHpO0CBGy2nehzWRaFQKd62G9HIf+Q07PDaUcE= +github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250425155221-30ae936d86f6 h1:8gDJ72j/by4RH6VDkW9lTPpdve5v7Ou2ypD4ZbGzYvY= +github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250425155221-30ae936d86f6/go.mod h1:w4o02EHpO0CBGy2nehzWRaFQKd62G9HIf+Q07PDaUcE= 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= diff --git a/internal/namespaces/container/v1beta1/container_cli.go b/internal/namespaces/container/v1beta1/container_cli.go index 16bc587ed9..61de8a3776 100644 --- a/internal/namespaces/container/v1beta1/container_cli.go +++ b/internal/namespaces/container/v1beta1/container_cli.go @@ -8,7 +8,7 @@ import ( "reflect" "github.com/scaleway/scaleway-cli/v2/core" - container "github.com/scaleway/scaleway-sdk-go/api/container/v1beta1" + "github.com/scaleway/scaleway-sdk-go/api/container/v1beta1" "github.com/scaleway/scaleway-sdk-go/scw" ) @@ -272,7 +272,7 @@ func containerNamespaceCreate() *core.Command { }, { Name: "tags.{index}", - Short: `[ALPHA] Tags of the Serverless Container Namespace`, + Short: `Tags of the Serverless Container Namespace`, Required: false, Deprecated: false, Positional: false, @@ -339,7 +339,7 @@ func containerNamespaceUpdate() *core.Command { }, { Name: "tags.{index}", - Short: `[ALPHA] Tags of the Serverless Container Namespace`, + Short: `Tags of the Serverless Container Namespace`, Required: false, Deprecated: false, Positional: false, @@ -708,6 +708,13 @@ func containerContainerCreate() *core.Command { Deprecated: false, Positional: false, }, + { + Name: "tags.{index}", + Short: `Tags of the Serverless Container`, + Required: false, + Deprecated: false, + Positional: false, + }, core.RegionArgSpec( scw.RegionFrPar, scw.RegionNlAms, @@ -923,6 +930,13 @@ func containerContainerUpdate() *core.Command { Deprecated: false, Positional: false, }, + { + Name: "tags.{index}", + Short: `Tags of the Serverless Container`, + Required: false, + Deprecated: false, + Positional: false, + }, core.RegionArgSpec( scw.RegionFrPar, scw.RegionNlAms, diff --git a/internal/namespaces/function/v1beta1/function_cli.go b/internal/namespaces/function/v1beta1/function_cli.go index 79fa12bb4d..3f678e53e0 100644 --- a/internal/namespaces/function/v1beta1/function_cli.go +++ b/internal/namespaces/function/v1beta1/function_cli.go @@ -8,7 +8,7 @@ import ( "reflect" "github.com/scaleway/scaleway-cli/v2/core" - function "github.com/scaleway/scaleway-sdk-go/api/function/v1beta1" + "github.com/scaleway/scaleway-sdk-go/api/function/v1beta1" "github.com/scaleway/scaleway-sdk-go/scw" ) @@ -319,7 +319,7 @@ func functionNamespaceCreate() *core.Command { }, { Name: "tags.{index}", - Short: `[ALPHA] Tags of the Serverless Function Namespace`, + Short: `Tags of the Serverless Function Namespace`, Required: false, Deprecated: false, Positional: false, @@ -386,7 +386,7 @@ func functionNamespaceUpdate() *core.Command { }, { Name: "tags.{index}", - Short: `[ALPHA] Tags of the Serverless Function Namespace`, + Short: `Tags of the Serverless Function Namespace`, Required: false, Deprecated: false, Positional: false, @@ -721,6 +721,13 @@ func functionFunctionCreate() *core.Command { "v2", }, }, + { + Name: "tags.{index}", + Short: `Tags of the Serverless Function`, + Required: false, + Deprecated: false, + Positional: false, + }, core.RegionArgSpec( scw.RegionFrPar, scw.RegionNlAms, @@ -903,6 +910,13 @@ func functionFunctionUpdate() *core.Command { "v2", }, }, + { + Name: "tags.{index}", + Short: `Tags of the Serverless Function`, + Required: false, + Deprecated: false, + Positional: false, + }, core.RegionArgSpec( scw.RegionFrPar, scw.RegionNlAms, From 4aec96f904df7739438d414050825dd91718792a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= Date: Fri, 2 May 2025 16:58:00 +0200 Subject: [PATCH 2/3] Fix --- internal/namespaces/container/v1beta1/container_cli.go | 2 +- internal/namespaces/function/v1beta1/function_cli.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/namespaces/container/v1beta1/container_cli.go b/internal/namespaces/container/v1beta1/container_cli.go index 61de8a3776..c0f6e8a58d 100644 --- a/internal/namespaces/container/v1beta1/container_cli.go +++ b/internal/namespaces/container/v1beta1/container_cli.go @@ -8,7 +8,7 @@ import ( "reflect" "github.com/scaleway/scaleway-cli/v2/core" - "github.com/scaleway/scaleway-sdk-go/api/container/v1beta1" + container "github.com/scaleway/scaleway-sdk-go/api/container/v1beta1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/function/v1beta1/function_cli.go b/internal/namespaces/function/v1beta1/function_cli.go index 3f678e53e0..1dfa618a2e 100644 --- a/internal/namespaces/function/v1beta1/function_cli.go +++ b/internal/namespaces/function/v1beta1/function_cli.go @@ -8,7 +8,7 @@ import ( "reflect" "github.com/scaleway/scaleway-cli/v2/core" - "github.com/scaleway/scaleway-sdk-go/api/function/v1beta1" + function "github.com/scaleway/scaleway-sdk-go/api/function/v1beta1" "github.com/scaleway/scaleway-sdk-go/scw" ) From 45eef3c7c0a0806220f57f45d166b335fe1d2458 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= Date: Fri, 2 May 2025 18:01:38 +0200 Subject: [PATCH 3/3] Fix --- internal/namespaces/file/v1alpha1/file_cli.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/namespaces/file/v1alpha1/file_cli.go b/internal/namespaces/file/v1alpha1/file_cli.go index 6f79fcfc58..e5b4d6546b 100644 --- a/internal/namespaces/file/v1alpha1/file_cli.go +++ b/internal/namespaces/file/v1alpha1/file_cli.go @@ -8,7 +8,7 @@ import ( "reflect" "github.com/scaleway/scaleway-cli/v2/core" - "github.com/scaleway/scaleway-sdk-go/api/file/v1alpha1" + file "github.com/scaleway/scaleway-sdk-go/api/file/v1alpha1" "github.com/scaleway/scaleway-sdk-go/scw" )