diff --git a/cmd/scw/testdata/test-all-usage-function-deploy-usage.golden b/cmd/scw/testdata/test-all-usage-function-deploy-usage.golden index 573a953a3a..caae542dcf 100644 --- a/cmd/scw/testdata/test-all-usage-function-deploy-usage.golden +++ b/cmd/scw/testdata/test-all-usage-function-deploy-usage.golden @@ -8,7 +8,7 @@ USAGE: ARGS: [namespace-id] Function Namespace ID to deploy to name Name of the function to deploy, will be used in namespace's name if no ID is provided - runtime (unknown_runtime | golang | python | python3 | node8 | node10 | node14 | node16 | node17 | python37 | python38 | python39 | python310 | go113 | go117 | go118 | node18 | rust165 | go119 | python311 | php82 | node19 | go120) + runtime (unknown_runtime | golang | python | python3 | node8 | node10 | node14 | node16 | node17 | python37 | python38 | python39 | python310 | go113 | go117 | go118 | node18 | rust165 | go119 | python311 | php82 | node19 | go120 | node20) zip-file Path of the zip file that contains your code [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-function-function-create-usage.golden b/cmd/scw/testdata/test-all-usage-function-function-create-usage.golden index d32f3d9467..d4f1238f36 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 @@ -11,7 +11,7 @@ ARGS: [environment-variables.{key}] Environment variables of the function [min-scale] Minumum number of instances to scale the function to [max-scale] Maximum number of instances to scale the function to - [runtime] Runtime to use with the function (unknown_runtime | golang | python | python3 | node8 | node10 | node14 | node16 | node17 | python37 | python38 | python39 | python310 | go113 | go117 | go118 | node18 | rust165 | go119 | python311 | php82 | node19 | go120) + [runtime] Runtime to use with the function (unknown_runtime | golang | python | python3 | node8 | node10 | node14 | node16 | node17 | python37 | python38 | python39 | python310 | go113 | go117 | go118 | node18 | rust165 | go119 | python311 | php82 | node19 | go120 | node20) [memory-limit] Memory limit of the function in MB [timeout.seconds] [timeout.nanos] 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 fe0665d0f2..db320b25d6 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 @@ -10,7 +10,7 @@ ARGS: [environment-variables.{key}] Environment variables of the function to update [min-scale] Minumum number of instances to scale the function to [max-scale] Maximum number of instances to scale the function to - [runtime] Runtime to use with the function (unknown_runtime | golang | python | python3 | node8 | node10 | node14 | node16 | node17 | python37 | python38 | python39 | python310 | go113 | go117 | go118 | node18 | rust165 | go119 | python311 | php82 | node19 | go120) + [runtime] Runtime to use with the function (unknown_runtime | golang | python | python3 | node8 | node10 | node14 | node16 | node17 | python37 | python38 | python39 | python310 | go113 | go117 | go118 | node18 | rust165 | go119 | python311 | php82 | node19 | go120 | node20) [memory-limit] Memory limit of the function in MB [timeout.seconds] [timeout.nanos] diff --git a/cmd/scw/testdata/test-all-usage-function-usage.golden b/cmd/scw/testdata/test-all-usage-function-usage.golden index c1a7742648..46aece30f3 100644 --- a/cmd/scw/testdata/test-all-usage-function-usage.golden +++ b/cmd/scw/testdata/test-all-usage-function-usage.golden @@ -1,6 +1,6 @@ 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲 πŸŸ₯πŸŸ₯πŸŸ₯ STDERR️️ πŸŸ₯πŸŸ₯πŸŸ₯️ -Functions API. +Serverless Functions API. USAGE: scw function diff --git a/docs/commands/function.md b/docs/commands/function.md index 848f802db2..df5c649d13 100644 --- a/docs/commands/function.md +++ b/docs/commands/function.md @@ -1,6 +1,6 @@ # Documentation for `scw function` -Functions API. +Serverless Functions API. - [Cron management commands](#cron-management-commands) - [Create a new cron](#create-a-new-cron) @@ -171,7 +171,7 @@ scw function deploy [arg=value ...] |------|---|-------------| | namespace-id | | Function Namespace ID to deploy to | | name | Required | Name of the function to deploy, will be used in namespace's name if no ID is provided | -| runtime | Required
One of: `unknown_runtime`, `golang`, `python`, `python3`, `node8`, `node10`, `node14`, `node16`, `node17`, `python37`, `python38`, `python39`, `python310`, `go113`, `go117`, `go118`, `node18`, `rust165`, `go119`, `python311`, `php82`, `node19`, `go120` | | +| runtime | Required
One of: `unknown_runtime`, `golang`, `python`, `python3`, `node8`, `node10`, `node14`, `node16`, `node17`, `python37`, `python38`, `python39`, `python310`, `go113`, `go117`, `go118`, `node18`, `rust165`, `go119`, `python311`, `php82`, `node19`, `go120`, `node20` | | | zip-file | Required | Path of the zip file that contains your code | | 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 | @@ -289,7 +289,7 @@ scw function function create [arg=value ...] | environment-variables.{key} | | Environment variables of the function | | min-scale | | Minumum number of instances to scale the function to | | max-scale | | Maximum number of instances to scale the function to | -| runtime | One of: `unknown_runtime`, `golang`, `python`, `python3`, `node8`, `node10`, `node14`, `node16`, `node17`, `python37`, `python38`, `python39`, `python310`, `go113`, `go117`, `go118`, `node18`, `rust165`, `go119`, `python311`, `php82`, `node19`, `go120` | Runtime to use with the function | +| runtime | One of: `unknown_runtime`, `golang`, `python`, `python3`, `node8`, `node10`, `node14`, `node16`, `node17`, `python37`, `python38`, `python39`, `python310`, `go113`, `go117`, `go118`, `node18`, `rust165`, `go119`, `python311`, `php82`, `node19`, `go120`, `node20` | Runtime to use with the function | | memory-limit | | Memory limit of the function in MB | | timeout.seconds | | | | timeout.nanos | | | @@ -468,7 +468,7 @@ scw function function update [arg=value ...] | environment-variables.{key} | | Environment variables of the function to update | | min-scale | | Minumum number of instances to scale the function to | | max-scale | | Maximum number of instances to scale the function to | -| runtime | One of: `unknown_runtime`, `golang`, `python`, `python3`, `node8`, `node10`, `node14`, `node16`, `node17`, `python37`, `python38`, `python39`, `python310`, `go113`, `go117`, `go118`, `node18`, `rust165`, `go119`, `python311`, `php82`, `node19`, `go120` | Runtime to use with the function | +| runtime | One of: `unknown_runtime`, `golang`, `python`, `python3`, `node8`, `node10`, `node14`, `node16`, `node17`, `python37`, `python38`, `python39`, `python310`, `go113`, `go117`, `go118`, `node18`, `rust165`, `go119`, `python311`, `php82`, `node19`, `go120`, `node20` | Runtime to use with the function | | memory-limit | | Memory limit of the function in MB | | timeout.seconds | | | | timeout.nanos | | | diff --git a/go.mod b/go.mod index 4222e3d993..b900ff3145 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/moby/buildkit v0.11.6 github.com/opencontainers/go-digest v1.0.0 github.com/pkg/errors v0.9.1 - github.com/scaleway/scaleway-sdk-go v1.0.0-beta.15.0.20230404142259-598b1ac41f06 + github.com/scaleway/scaleway-sdk-go v1.0.0-beta.16.0.20230424152630-05355b6e32c3 github.com/spf13/cobra v1.7.0 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.2 diff --git a/go.sum b/go.sum index be4ded6354..071298e6e0 100644 --- a/go.sum +++ b/go.sum @@ -274,8 +274,8 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/scaleway/scaleway-sdk-go v1.0.0-beta.15.0.20230404142259-598b1ac41f06 h1:QvmCsVGrajhRqLaJNd1KlZduhIkQvKYoUaUdv+I2yTM= -github.com/scaleway/scaleway-sdk-go v1.0.0-beta.15.0.20230404142259-598b1ac41f06/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg= +github.com/scaleway/scaleway-sdk-go v1.0.0-beta.16.0.20230424152630-05355b6e32c3 h1:Qc8zmH5LqWj3veWJrX1tXrQU7O2QJCdAJ9oPPJfZM2s= +github.com/scaleway/scaleway-sdk-go v1.0.0-beta.16.0.20230424152630-05355b6e32c3/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg= github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= github.com/secure-systems-lab/go-securesystemslib v0.4.0 h1:b23VGrQhTA8cN2CbBw7/FulN9fTtqYUdS5+Oxzt+DUE= github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= diff --git a/internal/namespaces/function/v1beta1/function_cli.go b/internal/namespaces/function/v1beta1/function_cli.go index 34f52a3b29..62493e8a52 100644 --- a/internal/namespaces/function/v1beta1/function_cli.go +++ b/internal/namespaces/function/v1beta1/function_cli.go @@ -59,7 +59,7 @@ func GetGeneratedCommands() *core.Commands { func functionRoot() *core.Command { return &core.Command{ Short: `Function as a Service API`, - Long: `Functions API.`, + Long: `Serverless Functions API.`, Namespace: "function", } } @@ -537,7 +537,7 @@ func functionFunctionCreate() *core.Command { Required: false, Deprecated: false, Positional: false, - EnumValues: []string{"unknown_runtime", "golang", "python", "python3", "node8", "node10", "node14", "node16", "node17", "python37", "python38", "python39", "python310", "go113", "go117", "go118", "node18", "rust165", "go119", "python311", "php82", "node19", "go120"}, + EnumValues: []string{"unknown_runtime", "golang", "python", "python3", "node8", "node10", "node14", "node16", "node17", "python37", "python38", "python39", "python310", "go113", "go117", "go118", "node18", "rust165", "go119", "python311", "php82", "node19", "go120", "node20"}, }, { Name: "memory-limit", @@ -658,7 +658,7 @@ func functionFunctionUpdate() *core.Command { Required: false, Deprecated: false, Positional: false, - EnumValues: []string{"unknown_runtime", "golang", "python", "python3", "node8", "node10", "node14", "node16", "node17", "python37", "python38", "python39", "python310", "go113", "go117", "go118", "node18", "rust165", "go119", "python311", "php82", "node19", "go120"}, + EnumValues: []string{"unknown_runtime", "golang", "python", "python3", "node8", "node10", "node14", "node16", "node17", "python37", "python38", "python39", "python310", "go113", "go117", "go118", "node18", "rust165", "go119", "python311", "php82", "node19", "go120", "node20"}, }, { Name: "memory-limit", diff --git a/internal/namespaces/function/v1beta1/testdata/test-deploy-simple.golden b/internal/namespaces/function/v1beta1/testdata/test-deploy-simple.golden index 2066be5fa2..66f67c8650 100644 --- a/internal/namespaces/function/v1beta1/testdata/test-deploy-simple.golden +++ b/internal/namespaces/function/v1beta1/testdata/test-deploy-simple.golden @@ -32,6 +32,7 @@ RuntimeMessage - "timeout": "300.000000000s", "handler": "Handle", "error_message": null, + "build_message": null, "privacy": "public", "description": "", "domain_name": "clitestfunctiondeploeqj6jxof-cli-test-function-deploy.functions.fnc.fr-par.scw.cloud",