From 75ee4bf02c147485a6672f9c36b0ca8d994de759 Mon Sep 17 00:00:00 2001 From: scaleway-bot Date: Fri, 24 Nov 2023 10:20:38 +0000 Subject: [PATCH] feat: update generated APIs --- ...ge-container-container-create-usage.golden | 3 +- ...ge-container-container-update-usage.golden | 3 +- ...sage-function-function-create-usage.golden | 3 +- ...sage-function-function-update-usage.golden | 3 +- ...t-all-usage-lb-backend-create-usage.golden | 88 +++++++++---------- ...lb-backend-update-healthcheck-usage.golden | 39 ++++---- ...t-all-usage-lb-backend-update-usage.golden | 3 +- ...-all-usage-vpc-gw-dhcp-create-usage.golden | 9 +- ...-all-usage-vpc-gw-dhcp-update-usage.golden | 9 +- docs/commands/container.md | 6 +- docs/commands/function.md | 6 +- docs/commands/lb.md | 12 +-- docs/commands/vpc-gw.md | 18 ++-- .../container/v1beta1/container_cli.go | 18 +--- .../function/v1beta1/function_cli.go | 18 +--- internal/namespaces/lb/v1/lb_cli.go | 38 +++----- internal/namespaces/vpcgw/v1/vpcgw_cli.go | 54 +++--------- 17 files changed, 117 insertions(+), 213 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 8d351990ef..7cb9bb53f9 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 @@ -13,8 +13,7 @@ ARGS: [max-scale] Maximum number of instances to scale the container to [memory-limit] Memory limit of the container in MB [cpu-limit] CPU limit of the container in mvCPU - [timeout.seconds] - [timeout.nanos] + [timeout] Processing time limit for the container [privacy] Privacy setting of the container (unknown_privacy | public | private) [description] Description of the container [registry-image] Name of the registry image (e.g. "rg.fr-par.scw.cloud/something/image:tag"). 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 0247908171..0af5ae4380 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 @@ -12,8 +12,7 @@ ARGS: [max-scale] Maximum number of instances to scale the container to [memory-limit] Memory limit of the container in MB [cpu-limit] CPU limit of the container in mvCPU - [timeout.seconds] - [timeout.nanos] + [timeout] Processing time limit for the container [redeploy] Defines whether to redeploy failed containers [privacy] Privacy settings of the container (unknown_privacy | public | private) [description] Description of the container 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 d9061585b8..0c7cccf0ff 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 @@ -13,8 +13,7 @@ ARGS: [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 | node20 | go121) [memory-limit] Memory limit of the function in MB - [timeout.seconds] - [timeout.nanos] + [timeout] Request processing time limit for the function [handler] Handler to use with the function [privacy] Privacy setting of the function (unknown_privacy | public | private) [description] Description of the function 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 8e33fec527..04dbbcaa40 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 @@ -12,8 +12,7 @@ ARGS: [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 | node20 | go121) [memory-limit] Memory limit of the function in MB - [timeout.seconds] - [timeout.nanos] + [timeout] Processing time limit for the function [redeploy] Redeploy failed function [handler] Handler to use with the function [privacy] Privacy setting of the function (unknown_privacy | public | private) diff --git a/cmd/scw/testdata/test-all-usage-lb-backend-create-usage.golden b/cmd/scw/testdata/test-all-usage-lb-backend-create-usage.golden index 3b1ac63a25..7e07ba0b79 100644 --- a/cmd/scw/testdata/test-all-usage-lb-backend-create-usage.golden +++ b/cmd/scw/testdata/test-all-usage-lb-backend-create-usage.golden @@ -6,51 +6,49 @@ USAGE: scw lb backend create [arg=value ...] ARGS: - name= Name for the backend - forward-protocol Protocol to be used by the backend when forwarding traffic to backend servers (tcp | http) - forward-port Port to be used by the backend when forwarding traffic to backend servers - forward-port-algorithm=roundrobin Load balancing algorithm to be used when determining which backend server to forward new traffic to (roundrobin | leastconn | first) - sticky-sessions=none Defines whether to activate sticky sessions (binding a particular session to a particular backend server) and the method to use if so. None disables sticky sessions. Cookie-based uses an HTTP cookie TO stick a session to a backend server. Table-based uses the source (client) IP address to stick a session to a backend server (none | cookie | table) - [sticky-sessions-cookie-name] Cookie name for cookie-based sticky sessions - lb-id Load Balancer ID - [health-check.port] Port to use for the backend server health check - [health-check.check-delay=3s] Time to wait between two consecutive health checks - [health-check.check-timeout=1s] Maximum time a backend server has to reply to the health check - [health-check.check-max-retries] Number of consecutive unsuccessful health checks after which the server will be considered dead - [health-check.mysql-config.user] MySQL user to use for the health check - [health-check.pgsql-config.user] PostgreSQL user to use for the health check - [health-check.http-config.uri] HTTP URI used for the health check - [health-check.http-config.method] HTTP method used for the health check - [health-check.http-config.code] HTTP response code expected for a successful health check - [health-check.http-config.host-header] HTTP host header used for the health check - [health-check.https-config.uri] HTTP URI used for the health check - [health-check.https-config.method] HTTP method used for the health check - [health-check.https-config.code] HTTP response code expected for a successful health check - [health-check.https-config.host-header] HTTP host header used for the health check - [health-check.https-config.sni] SNI used for SSL health checks - [health-check.check-send-proxy] Defines whether proxy protocol should be activated for the health check - [health-check.transient-check-delay.seconds] - [health-check.transient-check-delay.nanos] - [instance-server-id.{index}] UIID of the instance server. - [instance-server-tag.{index}] Tag of the instance server. - [use-instance-server-public-ip] Use public IP address of the instance instead of the private one - [baremetal-server-id.{index}] UIID of the baremetal server. - [baremetal-server-tag.{index}] Tag of the baremetal server. - server-ip.{index} List of backend server IP addresses (IPv4 or IPv6) the backend should forward traffic to - [timeout-server=5m] Maximum allowed time for a backend server to process a request - [timeout-connect=5s] Maximum allowed time for establishing a connection to a backend server - [timeout-tunnel=15m] Maximum allowed tunnel inactivity time after Websocket is established (takes precedence over client and server timeout) - [on-marked-down-action] Action to take when a backend server is marked as down (on_marked_down_action_none | shutdown_sessions) - [proxy-protocol] Protocol to use between the Load Balancer and backend servers. Allows the backend servers to be informed of the client's real IP address. The PROXY protocol must be supported by the backend servers' software (proxy_protocol_unknown | proxy_protocol_none | proxy_protocol_v1 | proxy_protocol_v2 | proxy_protocol_v2_ssl | proxy_protocol_v2_ssl_cn) - [failover-host] Scaleway S3 bucket website to be served as failover if all backend servers are down, e.g. failover-website.s3-website.fr-par.scw.cloud - [ssl-bridging] Defines whether to enable SSL bridging between the Load Balancer and backend servers - [ignore-ssl-server-verify] Defines whether the server certificate verification should be ignored - [redispatch-attempt-count] Whether to use another backend server on each attempt - [max-retries] Number of retries when a backend server connection failed - [max-connections] Maximum number of connections allowed per backend server - [timeout-queue.seconds] - [timeout-queue.nanos] - [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) + name= Name for the backend + forward-protocol Protocol to be used by the backend when forwarding traffic to backend servers (tcp | http) + forward-port Port to be used by the backend when forwarding traffic to backend servers + forward-port-algorithm=roundrobin Load balancing algorithm to be used when determining which backend server to forward new traffic to (roundrobin | leastconn | first) + sticky-sessions=none Defines whether to activate sticky sessions (binding a particular session to a particular backend server) and the method to use if so. None disables sticky sessions. Cookie-based uses an HTTP cookie TO stick a session to a backend server. Table-based uses the source (client) IP address to stick a session to a backend server (none | cookie | table) + [sticky-sessions-cookie-name] Cookie name for cookie-based sticky sessions + lb-id Load Balancer ID + [health-check.port] Port to use for the backend server health check + [health-check.check-delay=3s] Time to wait between two consecutive health checks + [health-check.check-timeout=1s] Maximum time a backend server has to reply to the health check + [health-check.check-max-retries] Number of consecutive unsuccessful health checks after which the server will be considered dead + [health-check.mysql-config.user] MySQL user to use for the health check + [health-check.pgsql-config.user] PostgreSQL user to use for the health check + [health-check.http-config.uri] HTTP URI used for the health check + [health-check.http-config.method] HTTP method used for the health check + [health-check.http-config.code] HTTP response code expected for a successful health check + [health-check.http-config.host-header] HTTP host header used for the health check + [health-check.https-config.uri] HTTP URI used for the health check + [health-check.https-config.method] HTTP method used for the health check + [health-check.https-config.code] HTTP response code expected for a successful health check + [health-check.https-config.host-header] HTTP host header used for the health check + [health-check.https-config.sni] SNI used for SSL health checks + [health-check.check-send-proxy] Defines whether proxy protocol should be activated for the health check + [health-check.transient-check-delay=0.5s] Time to wait between two consecutive health checks when a backend server is in a transient state (going UP or DOWN) + [instance-server-id.{index}] UIID of the instance server. + [instance-server-tag.{index}] Tag of the instance server. + [use-instance-server-public-ip] Use public IP address of the instance instead of the private one + [baremetal-server-id.{index}] UIID of the baremetal server. + [baremetal-server-tag.{index}] Tag of the baremetal server. + server-ip.{index} List of backend server IP addresses (IPv4 or IPv6) the backend should forward traffic to + [timeout-server=5m] Maximum allowed time for a backend server to process a request + [timeout-connect=5s] Maximum allowed time for establishing a connection to a backend server + [timeout-tunnel=15m] Maximum allowed tunnel inactivity time after Websocket is established (takes precedence over client and server timeout) + [on-marked-down-action] Action to take when a backend server is marked as down (on_marked_down_action_none | shutdown_sessions) + [proxy-protocol] Protocol to use between the Load Balancer and backend servers. Allows the backend servers to be informed of the client's real IP address. The PROXY protocol must be supported by the backend servers' software (proxy_protocol_unknown | proxy_protocol_none | proxy_protocol_v1 | proxy_protocol_v2 | proxy_protocol_v2_ssl | proxy_protocol_v2_ssl_cn) + [failover-host] Scaleway S3 bucket website to be served as failover if all backend servers are down, e.g. failover-website.s3-website.fr-par.scw.cloud + [ssl-bridging] Defines whether to enable SSL bridging between the Load Balancer and backend servers + [ignore-ssl-server-verify] Defines whether the server certificate verification should be ignored + [redispatch-attempt-count] Whether to use another backend server on each attempt + [max-retries] Number of retries when a backend server connection failed + [max-connections] Maximum number of connections allowed per backend server + [timeout-queue] Maximum time for a request to be left pending in queue when `max_connections` is reached + [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) DEPRECATED ARGS: [send-proxy-v2] Deprecated in favor of proxy_protocol field diff --git a/cmd/scw/testdata/test-all-usage-lb-backend-update-healthcheck-usage.golden b/cmd/scw/testdata/test-all-usage-lb-backend-update-healthcheck-usage.golden index 7410258acb..a4497147a2 100644 --- a/cmd/scw/testdata/test-all-usage-lb-backend-update-healthcheck-usage.golden +++ b/cmd/scw/testdata/test-all-usage-lb-backend-update-healthcheck-usage.golden @@ -6,26 +6,25 @@ USAGE: scw lb backend update-healthcheck [arg=value ...] ARGS: - port Port to use for the backend server health check - check-delay Time to wait between two consecutive health checks - check-timeout Maximum time a backend server has to reply to the health check - check-max-retries Number of consecutive unsuccessful health checks after which the server will be considered dead - backend-id Backend ID - [check-send-proxy] Defines whether proxy protocol should be activated for the health check - [mysql-config.user] MySQL user to use for the health check - [pgsql-config.user] PostgreSQL user to use for the health check - [http-config.uri] HTTP URI used for the health check - [http-config.method] HTTP method used for the health check - [http-config.code] HTTP response code expected for a successful health check - [http-config.host-header] HTTP host header used for the health check - [https-config.uri] HTTP URI used for the health check - [https-config.method] HTTP method used for the health check - [https-config.code] HTTP response code expected for a successful health check - [https-config.host-header] HTTP host header used for the health check - [https-config.sni] SNI used for SSL health checks - [transient-check-delay.seconds] - [transient-check-delay.nanos] - [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) + port Port to use for the backend server health check + check-delay Time to wait between two consecutive health checks + check-timeout Maximum time a backend server has to reply to the health check + check-max-retries Number of consecutive unsuccessful health checks after which the server will be considered dead + backend-id Backend ID + [check-send-proxy] Defines whether proxy protocol should be activated for the health check + [mysql-config.user] MySQL user to use for the health check + [pgsql-config.user] PostgreSQL user to use for the health check + [http-config.uri] HTTP URI used for the health check + [http-config.method] HTTP method used for the health check + [http-config.code] HTTP response code expected for a successful health check + [http-config.host-header] HTTP host header used for the health check + [https-config.uri] HTTP URI used for the health check + [https-config.method] HTTP method used for the health check + [https-config.code] HTTP response code expected for a successful health check + [https-config.host-header] HTTP host header used for the health check + [https-config.sni] SNI used for SSL health checks + [transient-check-delay=0.5s] Time to wait between two consecutive health checks when a backend server is in a transient state (going UP or DOWN) + [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) FLAGS: -h, --help help for update-healthcheck diff --git a/cmd/scw/testdata/test-all-usage-lb-backend-update-usage.golden b/cmd/scw/testdata/test-all-usage-lb-backend-update-usage.golden index bc6600e1d0..0bb0eae444 100644 --- a/cmd/scw/testdata/test-all-usage-lb-backend-update-usage.golden +++ b/cmd/scw/testdata/test-all-usage-lb-backend-update-usage.golden @@ -24,8 +24,7 @@ ARGS: [redispatch-attempt-count] Whether to use another backend server on each attempt [max-retries] Number of retries when a backend server connection failed [max-connections] Maximum number of connections allowed per backend server - [timeout-queue.seconds] - [timeout-queue.nanos] + [timeout-queue] Maximum time for a request to be left pending in queue when `max_connections` is reached [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) DEPRECATED ARGS: diff --git a/cmd/scw/testdata/test-all-usage-vpc-gw-dhcp-create-usage.golden b/cmd/scw/testdata/test-all-usage-vpc-gw-dhcp-create-usage.golden index 4dc08ab355..ab7c0599f6 100644 --- a/cmd/scw/testdata/test-all-usage-vpc-gw-dhcp-create-usage.golden +++ b/cmd/scw/testdata/test-all-usage-vpc-gw-dhcp-create-usage.golden @@ -12,12 +12,9 @@ ARGS: [pool-low] Low IP (inclusive) of the dynamic address pool. Must be in the config's subnet. Defaults to the second address of the subnet [pool-high] High IP (inclusive) of the dynamic address pool. Must be in the config's subnet. Defaults to the last address of the subnet [enable-dynamic] Defines whether to enable dynamic pooling of IPs. When false, only pre-existing DHCP reservations will be handed out. Defaults to true - [valid-lifetime.seconds] - [valid-lifetime.nanos] - [renew-timer.seconds] - [renew-timer.nanos] - [rebind-timer.seconds] - [rebind-timer.nanos] + [valid-lifetime] How long DHCP entries will be valid for. Defaults to 1h (3600s) + [renew-timer] After how long a renew will be attempted. Must be 30s lower than `rebind_timer`. Defaults to 50m (3000s) + [rebind-timer] After how long a DHCP client will query for a new lease if previous renews fail. Must be 30s lower than `valid_lifetime`. Defaults to 51m (3060s) [push-default-route] Defines whether the gateway should push a default route to DHCP clients or only hand out IPs. Defaults to true [push-dns-server] Defines whether the gateway should push custom DNS servers to clients. This allows for Instance hostname -> IP resolution. Defaults to true [dns-servers-override.{index}] Array of DNS server IP addresses used to override the DNS server list pushed to DHCP clients, instead of the gateway itself diff --git a/cmd/scw/testdata/test-all-usage-vpc-gw-dhcp-update-usage.golden b/cmd/scw/testdata/test-all-usage-vpc-gw-dhcp-update-usage.golden index 3df92a0955..330f28861f 100644 --- a/cmd/scw/testdata/test-all-usage-vpc-gw-dhcp-update-usage.golden +++ b/cmd/scw/testdata/test-all-usage-vpc-gw-dhcp-update-usage.golden @@ -12,12 +12,9 @@ ARGS: [pool-low] Low IP (inclusive) of the dynamic address pool. Must be in the config's subnet [pool-high] High IP (inclusive) of the dynamic address pool. Must be in the config's subnet [enable-dynamic] Defines whether to enable dynamic pooling of IPs. When false, only pre-existing DHCP reservations will be handed out. Defaults to true - [valid-lifetime.seconds] - [valid-lifetime.nanos] - [renew-timer.seconds] - [renew-timer.nanos] - [rebind-timer.seconds] - [rebind-timer.nanos] + [valid-lifetime] How long DHCP entries will be valid for + [renew-timer] After how long a renew will be attempted. Must be 30s lower than `rebind_timer` + [rebind-timer] After how long a DHCP client will query for a new lease if previous renews fail. Must be 30s lower than `valid_lifetime` [push-default-route] Defines whether the gateway should push a default route to DHCP clients, or only hand out IPs [push-dns-server] Defines whether the gateway should push custom DNS servers to clients. This allows for instance hostname -> IP resolution [dns-servers-override.{index}] Array of DNS server IP addresses used to override the DNS server list pushed to DHCP clients, instead of the gateway itself diff --git a/docs/commands/container.md b/docs/commands/container.md index ee17d86184..7718029396 100644 --- a/docs/commands/container.md +++ b/docs/commands/container.md @@ -68,8 +68,7 @@ scw container container create [arg=value ...] | max-scale | | Maximum number of instances to scale the container to | | memory-limit | | Memory limit of the container in MB | | cpu-limit | | CPU limit of the container in mvCPU | -| timeout.seconds | | | -| timeout.nanos | | | +| timeout | | Processing time limit for the container | | privacy | One of: `unknown_privacy`, `public`, `private` | Privacy setting of the container | | description | | Description of the container | | registry-image | | Name of the registry image (e.g. "rg.fr-par.scw.cloud/something/image:tag"). | @@ -210,8 +209,7 @@ scw container container update [arg=value ...] | max-scale | | Maximum number of instances to scale the container to | | memory-limit | | Memory limit of the container in MB | | cpu-limit | | CPU limit of the container in mvCPU | -| timeout.seconds | | | -| timeout.nanos | | | +| timeout | | Processing time limit for the container | | redeploy | | Defines whether to redeploy failed containers | | privacy | One of: `unknown_privacy`, `public`, `private` | Privacy settings of the container | | description | | Description of the container | diff --git a/docs/commands/function.md b/docs/commands/function.md index 03a08a71ba..d1b8102e81 100644 --- a/docs/commands/function.md +++ b/docs/commands/function.md @@ -297,8 +297,7 @@ scw function function create [arg=value ...] | 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`, `node20`, `go121` | Runtime to use with the function | | memory-limit | | Memory limit of the function in MB | -| timeout.seconds | | | -| timeout.nanos | | | +| timeout | | Request processing time limit for the function | | handler | | Handler to use with the function | | privacy | One of: `unknown_privacy`, `public`, `private` | Privacy setting of the function | | description | | Description of the function | @@ -476,8 +475,7 @@ scw function function update [arg=value ...] | 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`, `node20`, `go121` | Runtime to use with the function | | memory-limit | | Memory limit of the function in MB | -| timeout.seconds | | | -| timeout.nanos | | | +| timeout | | Processing time limit for the function | | redeploy | | Redeploy failed function | | handler | | Handler to use with the function | | privacy | One of: `unknown_privacy`, `public`, `private` | Privacy setting of the function | diff --git a/docs/commands/lb.md b/docs/commands/lb.md index 0918940ae8..8841a225b7 100644 --- a/docs/commands/lb.md +++ b/docs/commands/lb.md @@ -301,8 +301,7 @@ scw lb backend create [arg=value ...] | health-check.https-config.host-header | | HTTP host header used for the health check | | health-check.https-config.sni | | SNI used for SSL health checks | | health-check.check-send-proxy | | Defines whether proxy protocol should be activated for the health check | -| health-check.transient-check-delay.seconds | | | -| health-check.transient-check-delay.nanos | | | +| health-check.transient-check-delay | Default: `0.5s` | Time to wait between two consecutive health checks when a backend server is in a transient state (going UP or DOWN) | | instance-server-id.{index} | | UIID of the instance server. | | instance-server-tag.{index} | | Tag of the instance server. | | use-instance-server-public-ip | | Use public IP address of the instance instead of the private one | @@ -321,8 +320,7 @@ scw lb backend create [arg=value ...] | redispatch-attempt-count | | Whether to use another backend server on each attempt | | max-retries | | Number of retries when a backend server connection failed | | max-connections | | Maximum number of connections allowed per backend server | -| timeout-queue.seconds | | | -| timeout-queue.nanos | | | +| timeout-queue | | Maximum time for a request to be left pending in queue when `max_connections` is reached | | zone | Default: `fr-par-1`
One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `nl-ams-2`, `nl-ams-3`, `pl-waw-1`, `pl-waw-2`, `pl-waw-3` | Zone to target. If none is passed will use default zone from the config | @@ -496,8 +494,7 @@ scw lb backend update [arg=value ...] | redispatch-attempt-count | | Whether to use another backend server on each attempt | | max-retries | | Number of retries when a backend server connection failed | | max-connections | | Maximum number of connections allowed per backend server | -| timeout-queue.seconds | | | -| timeout-queue.nanos | | | +| timeout-queue | | Maximum time for a request to be left pending in queue when `max_connections` is reached | | zone | Default: `fr-par-1`
One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `nl-ams-2`, `nl-ams-3`, `pl-waw-1`, `pl-waw-2`, `pl-waw-3` | Zone to target. If none is passed will use default zone from the config | @@ -534,8 +531,7 @@ scw lb backend update-healthcheck [arg=value ...] | https-config.code | | HTTP response code expected for a successful health check | | https-config.host-header | | HTTP host header used for the health check | | https-config.sni | | SNI used for SSL health checks | -| transient-check-delay.seconds | | | -| transient-check-delay.nanos | | | +| transient-check-delay | Default: `0.5s` | Time to wait between two consecutive health checks when a backend server is in a transient state (going UP or DOWN) | | zone | Default: `fr-par-1`
One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `nl-ams-2`, `nl-ams-3`, `pl-waw-1`, `pl-waw-2`, `pl-waw-3` | Zone to target. If none is passed will use default zone from the config | diff --git a/docs/commands/vpc-gw.md b/docs/commands/vpc-gw.md index 3163d906e1..23f2bc8bb8 100644 --- a/docs/commands/vpc-gw.md +++ b/docs/commands/vpc-gw.md @@ -72,12 +72,9 @@ scw vpc-gw dhcp create [arg=value ...] | pool-low | | Low IP (inclusive) of the dynamic address pool. Must be in the config's subnet. Defaults to the second address of the subnet | | pool-high | | High IP (inclusive) of the dynamic address pool. Must be in the config's subnet. Defaults to the last address of the subnet | | enable-dynamic | | Defines whether to enable dynamic pooling of IPs. When false, only pre-existing DHCP reservations will be handed out. Defaults to true | -| valid-lifetime.seconds | | | -| valid-lifetime.nanos | | | -| renew-timer.seconds | | | -| renew-timer.nanos | | | -| rebind-timer.seconds | | | -| rebind-timer.nanos | | | +| valid-lifetime | | How long DHCP entries will be valid for. Defaults to 1h (3600s) | +| renew-timer | | After how long a renew will be attempted. Must be 30s lower than `rebind_timer`. Defaults to 50m (3000s) | +| rebind-timer | | After how long a DHCP client will query for a new lease if previous renews fail. Must be 30s lower than `valid_lifetime`. Defaults to 51m (3060s) | | push-default-route | | Defines whether the gateway should push a default route to DHCP clients or only hand out IPs. Defaults to true | | push-dns-server | | Defines whether the gateway should push custom DNS servers to clients. This allows for Instance hostname -> IP resolution. Defaults to true | | dns-servers-override.{index} | | Array of DNS server IP addresses used to override the DNS server list pushed to DHCP clients, instead of the gateway itself | @@ -172,12 +169,9 @@ scw vpc-gw dhcp update [arg=value ...] | pool-low | | Low IP (inclusive) of the dynamic address pool. Must be in the config's subnet | | pool-high | | High IP (inclusive) of the dynamic address pool. Must be in the config's subnet | | enable-dynamic | | Defines whether to enable dynamic pooling of IPs. When false, only pre-existing DHCP reservations will be handed out. Defaults to true | -| valid-lifetime.seconds | | | -| valid-lifetime.nanos | | | -| renew-timer.seconds | | | -| renew-timer.nanos | | | -| rebind-timer.seconds | | | -| rebind-timer.nanos | | | +| valid-lifetime | | How long DHCP entries will be valid for | +| renew-timer | | After how long a renew will be attempted. Must be 30s lower than `rebind_timer` | +| rebind-timer | | After how long a DHCP client will query for a new lease if previous renews fail. Must be 30s lower than `valid_lifetime` | | push-default-route | | Defines whether the gateway should push a default route to DHCP clients, or only hand out IPs | | push-dns-server | | Defines whether the gateway should push custom DNS servers to clients. This allows for instance hostname -> IP resolution | | dns-servers-override.{index} | | Array of DNS server IP addresses used to override the DNS server list pushed to DHCP clients, instead of the gateway itself | diff --git a/internal/namespaces/container/v1beta1/container_cli.go b/internal/namespaces/container/v1beta1/container_cli.go index ae2c4e3c6a..bfa7c47bb3 100644 --- a/internal/namespaces/container/v1beta1/container_cli.go +++ b/internal/namespaces/container/v1beta1/container_cli.go @@ -513,13 +513,8 @@ func containerContainerCreate() *core.Command { Positional: false, }, { - Name: "timeout.seconds", - Required: false, - Deprecated: false, - Positional: false, - }, - { - Name: "timeout.nanos", + Name: "timeout", + Short: `Processing time limit for the container`, Required: false, Deprecated: false, Positional: false, @@ -655,13 +650,8 @@ func containerContainerUpdate() *core.Command { Positional: false, }, { - Name: "timeout.seconds", - Required: false, - Deprecated: false, - Positional: false, - }, - { - Name: "timeout.nanos", + Name: "timeout", + Short: `Processing time limit for the container`, Required: false, Deprecated: false, Positional: false, diff --git a/internal/namespaces/function/v1beta1/function_cli.go b/internal/namespaces/function/v1beta1/function_cli.go index 542902030c..e245af5856 100644 --- a/internal/namespaces/function/v1beta1/function_cli.go +++ b/internal/namespaces/function/v1beta1/function_cli.go @@ -562,13 +562,8 @@ func functionFunctionCreate() *core.Command { Positional: false, }, { - Name: "timeout.seconds", - Required: false, - Deprecated: false, - Positional: false, - }, - { - Name: "timeout.nanos", + Name: "timeout", + Short: `Request processing time limit for the function`, Required: false, Deprecated: false, Positional: false, @@ -683,13 +678,8 @@ func functionFunctionUpdate() *core.Command { Positional: false, }, { - Name: "timeout.seconds", - Required: false, - Deprecated: false, - Positional: false, - }, - { - Name: "timeout.nanos", + Name: "timeout", + Short: `Processing time limit for the function`, Required: false, Deprecated: false, Positional: false, diff --git a/internal/namespaces/lb/v1/lb_cli.go b/internal/namespaces/lb/v1/lb_cli.go index 81e1336b8d..fdf783c482 100644 --- a/internal/namespaces/lb/v1/lb_cli.go +++ b/internal/namespaces/lb/v1/lb_cli.go @@ -912,16 +912,12 @@ func lbBackendCreate() *core.Command { Positional: false, }, { - Name: "health-check.transient-check-delay.seconds", - Required: false, - Deprecated: false, - Positional: false, - }, - { - Name: "health-check.transient-check-delay.nanos", + Name: "health-check.transient-check-delay", + Short: `Time to wait between two consecutive health checks when a backend server is in a transient state (going UP or DOWN)`, Required: false, Deprecated: false, Positional: false, + Default: core.DefaultValueSetter("0.5s"), }, { Name: "server-ip.{index}", @@ -1020,13 +1016,8 @@ func lbBackendCreate() *core.Command { Positional: false, }, { - Name: "timeout-queue.seconds", - Required: false, - Deprecated: false, - Positional: false, - }, - { - Name: "timeout-queue.nanos", + Name: "timeout-queue", + Short: `Maximum time for a request to be left pending in queue when ` + "`" + `max_connections` + "`" + ` is reached`, Required: false, Deprecated: false, Positional: false, @@ -1226,13 +1217,8 @@ func lbBackendUpdate() *core.Command { Positional: false, }, { - Name: "timeout-queue.seconds", - Required: false, - Deprecated: false, - Positional: false, - }, - { - Name: "timeout-queue.nanos", + Name: "timeout-queue", + Short: `Maximum time for a request to be left pending in queue when ` + "`" + `max_connections` + "`" + ` is reached`, Required: false, Deprecated: false, Positional: false, @@ -1527,16 +1513,12 @@ func lbBackendUpdateHealthcheck() *core.Command { Positional: false, }, { - Name: "transient-check-delay.seconds", - Required: false, - Deprecated: false, - Positional: false, - }, - { - Name: "transient-check-delay.nanos", + Name: "transient-check-delay", + Short: `Time to wait between two consecutive health checks when a backend server is in a transient state (going UP or DOWN)`, Required: false, Deprecated: false, Positional: false, + Default: core.DefaultValueSetter("0.5s"), }, core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZoneNlAms3, scw.ZonePlWaw1, scw.ZonePlWaw2, scw.ZonePlWaw3), }, diff --git a/internal/namespaces/vpcgw/v1/vpcgw_cli.go b/internal/namespaces/vpcgw/v1/vpcgw_cli.go index 474dc4bdd3..bcac4ec1fe 100644 --- a/internal/namespaces/vpcgw/v1/vpcgw_cli.go +++ b/internal/namespaces/vpcgw/v1/vpcgw_cli.go @@ -1056,37 +1056,22 @@ func vpcGwDHCPCreate() *core.Command { Positional: false, }, { - Name: "valid-lifetime.seconds", + Name: "valid-lifetime", + Short: `How long DHCP entries will be valid for. Defaults to 1h (3600s)`, Required: false, Deprecated: false, Positional: false, }, { - Name: "valid-lifetime.nanos", + Name: "renew-timer", + Short: `After how long a renew will be attempted. Must be 30s lower than ` + "`" + `rebind_timer` + "`" + `. Defaults to 50m (3000s)`, Required: false, Deprecated: false, Positional: false, }, { - Name: "renew-timer.seconds", - Required: false, - Deprecated: false, - Positional: false, - }, - { - Name: "renew-timer.nanos", - Required: false, - Deprecated: false, - Positional: false, - }, - { - Name: "rebind-timer.seconds", - Required: false, - Deprecated: false, - Positional: false, - }, - { - Name: "rebind-timer.nanos", + Name: "rebind-timer", + Short: `After how long a DHCP client will query for a new lease if previous renews fail. Must be 30s lower than ` + "`" + `valid_lifetime` + "`" + `. Defaults to 51m (3060s)`, Required: false, Deprecated: false, Positional: false, @@ -1192,37 +1177,22 @@ func vpcGwDHCPUpdate() *core.Command { Positional: false, }, { - Name: "valid-lifetime.seconds", - Required: false, - Deprecated: false, - Positional: false, - }, - { - Name: "valid-lifetime.nanos", - Required: false, - Deprecated: false, - Positional: false, - }, - { - Name: "renew-timer.seconds", - Required: false, - Deprecated: false, - Positional: false, - }, - { - Name: "renew-timer.nanos", + Name: "valid-lifetime", + Short: `How long DHCP entries will be valid for`, Required: false, Deprecated: false, Positional: false, }, { - Name: "rebind-timer.seconds", + Name: "renew-timer", + Short: `After how long a renew will be attempted. Must be 30s lower than ` + "`" + `rebind_timer` + "`" + ``, Required: false, Deprecated: false, Positional: false, }, { - Name: "rebind-timer.nanos", + Name: "rebind-timer", + Short: `After how long a DHCP client will query for a new lease if previous renews fail. Must be 30s lower than ` + "`" + `valid_lifetime` + "`" + ``, Required: false, Deprecated: false, Positional: false,