Skip to content

Commit d1544c1

Browse files
jremy42jremy42
authored
Merge branch 'master' into feat/add_default_choice_for_mongodb
2 parents ab53209 + e3c9da6 commit d1544c1

29 files changed

+554
-33
lines changed

‎cmd/scw/testdata/test-all-usage-function-deploy-usage.golden

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ USAGE:
88
ARGS:
99
[namespace-id] Function Namespace ID to deploy to
1010
name Name of the function to deploy, will be used in namespace's name if no ID is provided
11-
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 | go121 | node22 | python312 | php83 | go122 | rust179)
11+
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 | go121 | node22 | python312 | php83 | go122 | rust179 | go123 | go124)
1212
zip-file Path of the zip file that contains your code
1313
[region=fr-par] Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
1414

‎cmd/scw/testdata/test-all-usage-function-function-create-usage.golden

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ARGS:
1111
[environment-variables.{key}] Environment variables of the function
1212
[min-scale] Minumum number of instances to scale the function to
1313
[max-scale] Maximum number of instances to scale the function to
14-
[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 | node22 | python312 | php83 | go122 | rust179)
14+
[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 | node22 | python312 | php83 | go122 | rust179 | go123 | go124)
1515
[memory-limit] Memory limit of the function in MB
1616
[timeout] Request processing time limit for the function
1717
[handler] Handler to use with the function

‎cmd/scw/testdata/test-all-usage-function-function-update-usage.golden

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ARGS:
1010
[environment-variables.{key}] Environment variables of the function to update
1111
[min-scale] Minumum number of instances to scale the function to
1212
[max-scale] Maximum number of instances to scale the function to
13-
[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 | node22 | python312 | php83 | go122 | rust179)
13+
[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 | node22 | python312 | php83 | go122 | rust179 | go123 | go124)
1414
[memory-limit] Memory limit of the function in MB
1515
[timeout] Processing time limit for the function
1616
[redeploy] Redeploy failed function

‎cmd/scw/testdata/test-all-usage-iam-user-create-usage.golden

+4
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ ARGS:
1313
[member.send-welcome-email] Whether or not to send a welcome email that includes onboarding information.
1414
[member.username] The member's username
1515
[member.password] The member's password
16+
[member.first-name] The member's first name
17+
[member.last-name] The member's last name
18+
[member.phone-number] The member's phone number
19+
[member.locale] The member's locale
1620
[organization-id] Organization ID to use. If none is passed the default organization ID will be used
1721

1822
FLAGS:

‎cmd/scw/testdata/test-all-usage-iam-user-update-usage.golden

+4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ ARGS:
99
user-id ID of the user to update
1010
[tags.{index}] New tags for the user (maximum of 10 tags)
1111
[email] IAM member email
12+
[first-name] IAM member first name
13+
[last-name] IAM member last name
14+
[phone-number] IAM member phone number
15+
[locale] IAM member locale
1216

1317
FLAGS:
1418
-h, --help help for update

‎cmd/scw/testdata/test-all-usage-lb-backend-create-usage.golden

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ ARGS:
1919
[health-check.check-max-retries] Number of consecutive unsuccessful health checks after which the server will be considered dead
2020
[health-check.mysql-config.user] MySQL user to use for the health check
2121
[health-check.pgsql-config.user] PostgreSQL user to use for the health check
22-
[health-check.http-config.uri] HTTP URI used for the health check
22+
[health-check.http-config.uri] HTTP path used for the health check
2323
[health-check.http-config.method] HTTP method used for the health check
2424
[health-check.http-config.code] HTTP response code expected for a successful health check
2525
[health-check.http-config.host-header] HTTP host header used for the health check
26-
[health-check.https-config.uri] HTTP URI used for the health check
26+
[health-check.https-config.uri] HTTP path used for the health check
2727
[health-check.https-config.method] HTTP method used for the health check
2828
[health-check.https-config.code] HTTP response code expected for a successful health check
2929
[health-check.https-config.host-header] HTTP host header used for the health check

‎cmd/scw/testdata/test-all-usage-lb-backend-update-healthcheck-usage.golden

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ ARGS:
1414
[check-send-proxy] Defines whether proxy protocol should be activated for the health check
1515
[mysql-config.user] MySQL user to use for the health check
1616
[pgsql-config.user] PostgreSQL user to use for the health check
17-
[http-config.uri] HTTP URI used for the health check
17+
[http-config.uri] HTTP path used for the health check
1818
[http-config.method] HTTP method used for the health check
1919
[http-config.code] HTTP response code expected for a successful health check
2020
[http-config.host-header] HTTP host header used for the health check
21-
[https-config.uri] HTTP URI used for the health check
21+
[https-config.uri] HTTP path used for the health check
2222
[https-config.method] HTTP method used for the health check
2323
[https-config.code] HTTP response code expected for a successful health check
2424
[https-config.host-header] HTTP host header used for the health check

‎cmd/scw/testdata/test-all-usage-tem-offers-list-usage.golden

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
2+
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
3+
Retrieve the list of the available and free-of-charge offers you can subscribe to.
4+
5+
USAGE:
6+
scw tem offers list [arg=value ...]
7+
8+
ARGS:
9+
[region=fr-par] Region to target. If none is passed will use default region from the config (fr-par)
10+
11+
FLAGS:
12+
-h, --help help for list
13+
14+
GLOBAL FLAGS:
15+
-c, --config string The path to the config file
16+
-D, --debug Enable debug mode
17+
-o, --output string Output format: json or human, see 'scw help output' for more info (default "human")
18+
-p, --profile string The config profile to use

‎cmd/scw/testdata/test-all-usage-tem-offers-update-usage.golden

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
2+
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
3+
Update a subscribed offer.
4+
5+
USAGE:
6+
scw tem offers update [arg=value ...]
7+
8+
ARGS:
9+
[project-id] Project ID to use. If none is passed the default project ID will be used
10+
[name] Name of the offer-subscription (unknown_name | essential | scale)
11+
[region=fr-par] Region to target. If none is passed will use default region from the config (fr-par)
12+
13+
FLAGS:
14+
-h, --help help for update
15+
16+
GLOBAL FLAGS:
17+
-c, --config string The path to the config file
18+
-D, --debug Enable debug mode
19+
-o, --output string Output format: json or human, see 'scw help output' for more info (default "human")
20+
-p, --profile string The config profile to use

‎cmd/scw/testdata/test-all-usage-tem-offers-usage.golden

+7-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
This section allows you to manage and get get subscribed information about your project email offer.
44

55
USAGE:
6-
scw tem offers
6+
scw tem offers <command>
7+
8+
AVAILABLE COMMANDS:
9+
list List the available offers.
10+
update Update a subscribed offer
711

812
FLAGS:
913
-h, --help help for offers
@@ -13,3 +17,5 @@ GLOBAL FLAGS:
1317
-D, --debug Enable debug mode
1418
-o, --output string Output format: json or human, see 'scw help output' for more info (default "human")
1519
-p, --profile string The config profile to use
20+
21+
Use "scw tem offers [command] --help" for more information about a command.

‎cmd/scw/testdata/test-all-usage-tem-project-consumption-get-usage.golden

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
2+
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
3+
Get project resource consumption.
4+
5+
USAGE:
6+
scw tem project-consumption get [arg=value ...]
7+
8+
ARGS:
9+
[project-id] Project ID to use. If none is passed the default project ID will be used
10+
[region=fr-par] Region to target. If none is passed will use default region from the config (fr-par)
11+
12+
FLAGS:
13+
-h, --help help for get
14+
15+
GLOBAL FLAGS:
16+
-c, --config string The path to the config file
17+
-D, --debug Enable debug mode
18+
-o, --output string Output format: json or human, see 'scw help output' for more info (default "human")
19+
-p, --profile string The config profile to use

‎cmd/scw/testdata/test-all-usage-tem-project-consumption-usage.golden

+6-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
Project consumption allow you to see your project consumption.
44

55
USAGE:
6-
scw tem project-consumption
6+
scw tem project-consumption <command>
7+
8+
AVAILABLE COMMANDS:
9+
get Get project resource consumption.
710

811
FLAGS:
912
-h, --help help for project-consumption
@@ -13,3 +16,5 @@ GLOBAL FLAGS:
1316
-D, --debug Enable debug mode
1417
-o, --output string Output format: json or human, see 'scw help output' for more info (default "human")
1518
-p, --profile string The config profile to use
19+
20+
Use "scw tem project-consumption [command] --help" for more information about a command.

‎cmd/scw/testdata/test-all-usage-vpc-rule-get-usage.golden

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
2+
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
3+
Retrieve a list of ACL rules for a VPC, specified by its VPC ID.
4+
5+
USAGE:
6+
scw vpc rule get [arg=value ...]
7+
8+
ARGS:
9+
vpc-id ID of the Network ACL's VPC
10+
is-ipv6 Defines whether this set of ACL rules is for IPv6 (false = IPv4). Each Network ACL can have rules for only one IP type.
11+
[region=fr-par] Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
12+
13+
FLAGS:
14+
-h, --help help for get
15+
16+
GLOBAL FLAGS:
17+
-c, --config string The path to the config file
18+
-D, --debug Enable debug mode
19+
-o, --output string Output format: json or human, see 'scw help output' for more info (default "human")
20+
-p, --profile string The config profile to use

‎cmd/scw/testdata/test-all-usage-vpc-rule-set-usage.golden

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
2+
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
3+
Set the list of ACL rules and the default routing policy for a VPC.
4+
5+
USAGE:
6+
scw vpc rule set [arg=value ...]
7+
8+
ARGS:
9+
vpc-id ID of the Network ACL's VPC
10+
rules.{index}.protocol Protocol to which this rule applies (ANY | TCP | UDP | ICMP)
11+
rules.{index}.source Source IP range to which this rule applies (CIDR notation with subnet mask)
12+
rules.{index}.src-port-low Starting port of the source port range to which this rule applies (inclusive)
13+
rules.{index}.src-port-high Ending port of the source port range to which this rule applies (inclusive)
14+
rules.{index}.destination Destination IP range to which this rule applies (CIDR notation with subnet mask)
15+
rules.{index}.dst-port-low Starting port of the destination port range to which this rule applies (inclusive)
16+
rules.{index}.dst-port-high Ending port of the destination port range to which this rule applies (inclusive)
17+
rules.{index}.action Policy to apply to the packet (unknown_action | accept | drop)
18+
rules.{index}.description Rule description
19+
is-ipv6 Defines whether this set of ACL rules is for IPv6 (false = IPv4). Each Network ACL can have rules for only one IP type.
20+
default-policy Action to take for packets which do not match any rules (unknown_action | accept | drop)
21+
[region=fr-par] Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
22+
23+
FLAGS:
24+
-h, --help help for set
25+
26+
GLOBAL FLAGS:
27+
-c, --config string The path to the config file
28+
-D, --debug Enable debug mode
29+
-o, --output string Output format: json or human, see 'scw help output' for more info (default "human")
30+
-p, --profile string The config profile to use

‎cmd/scw/testdata/test-all-usage-vpc-rule-usage.golden

+7-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
Acl Rules.
44

55
USAGE:
6-
scw vpc rule
6+
scw vpc rule <command>
7+
8+
AVAILABLE COMMANDS:
9+
get Get Acl Rules for VPC
10+
set Set VPC ACL rules
711

812
FLAGS:
913
-h, --help help for rule
@@ -13,3 +17,5 @@ GLOBAL FLAGS:
1317
-D, --debug Enable debug mode
1418
-o, --output string Output format: json or human, see 'scw help output' for more info (default "human")
1519
-p, --profile string The config profile to use
20+
21+
Use "scw vpc rule [command] --help" for more information about a command.

‎docs/commands/function.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ scw function deploy [arg=value ...]
176176
|------|---|-------------|
177177
| namespace-id | | Function Namespace ID to deploy to |
178178
| name | Required | Name of the function to deploy, will be used in namespace's name if no ID is provided |
179-
| runtime | Required<br />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`, `node22`, `python312`, `php83`, `go122`, `rust179` | |
179+
| runtime | Required<br />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`, `node22`, `python312`, `php83`, `go122`, `rust179`, `go123`, `go124` | |
180180
| zip-file | Required | Path of the zip file that contains your code |
181181
| region | Default: `fr-par`<br />One of: `fr-par`, `nl-ams`, `pl-waw` | Region to target. If none is passed will use default region from the config |
182182

@@ -294,7 +294,7 @@ scw function function create [arg=value ...]
294294
| environment-variables.{key} | | Environment variables of the function |
295295
| min-scale | | Minumum number of instances to scale the function to |
296296
| max-scale | | Maximum number of instances to scale the function to |
297-
| 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`, `node22`, `python312`, `php83`, `go122`, `rust179` | Runtime to use with the function |
297+
| 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`, `node22`, `python312`, `php83`, `go122`, `rust179`, `go123`, `go124` | Runtime to use with the function |
298298
| memory-limit | | Memory limit of the function in MB |
299299
| timeout | | Request processing time limit for the function |
300300
| handler | | Handler to use with the function |
@@ -452,7 +452,7 @@ scw function function update <function-id ...> [arg=value ...]
452452
| environment-variables.{key} | | Environment variables of the function to update |
453453
| min-scale | | Minumum number of instances to scale the function to |
454454
| max-scale | | Maximum number of instances to scale the function to |
455-
| 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`, `node22`, `python312`, `php83`, `go122`, `rust179` | Runtime to use with the function |
455+
| 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`, `node22`, `python312`, `php83`, `go122`, `rust179`, `go123`, `go124` | Runtime to use with the function |
456456
| memory-limit | | Memory limit of the function in MB |
457457
| timeout | | Processing time limit for the function |
458458
| redeploy | | Redeploy failed function |

‎docs/commands/iam.md

+8
Original file line numberDiff line numberDiff line change
@@ -1065,6 +1065,10 @@ scw iam user create [arg=value ...]
10651065
| member.send-welcome-email | | Whether or not to send a welcome email that includes onboarding information. |
10661066
| member.username | | The member's username |
10671067
| member.password | | The member's password |
1068+
| member.first-name | | The member's first name |
1069+
| member.last-name | | The member's last name |
1070+
| member.phone-number | | The member's phone number |
1071+
| member.locale | | The member's locale |
10681072
| organization-id | | Organization ID to use. If none is passed the default organization ID will be used |
10691073

10701074

@@ -1149,6 +1153,10 @@ scw iam user update <user-id ...> [arg=value ...]
11491153
| user-id | Required | ID of the user to update |
11501154
| tags.{index} | | New tags for the user (maximum of 10 tags) |
11511155
| email | | IAM member email |
1156+
| first-name | | IAM member first name |
1157+
| last-name | | IAM member last name |
1158+
| phone-number | | IAM member phone number |
1159+
| locale | | IAM member locale |
11521160

11531161

11541162

0 commit comments

Comments
 (0)