Skip to content

Commit 5a8a22f

Browse files
authored
Merge branch 'master' into feat/redis-connect
2 parents 1469a91 + 660e8b8 commit 5a8a22f

37 files changed

+1659
-491
lines changed
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
2+
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
3+
Retrieve information about the security settings of an Organization, specified by the `organization_id` parameter.
4+
5+
USAGE:
6+
scw iam security-settings get [arg=value ...]
7+
8+
ARGS:
9+
[organization-id] Organization ID to use. If none is passed the default organization ID will be used
10+
11+
FLAGS:
12+
-h, --help help for get
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
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
2+
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
3+
Update the security settings of an Organization.
4+
5+
USAGE:
6+
scw iam security-settings update [arg=value ...]
7+
8+
ARGS:
9+
[enforce-password-renewal] Defines whether password renewal is enforced during first login
10+
[grace-period-duration] Duration of the grace period to renew password or enable MFA.
11+
[login-attempts-before-locked] Number of login attempts before the account is locked
12+
[max-login-session-duration] Maximum duration a login session will stay active before needing to relogin.
13+
[max-api-key-expiration-duration] Maximum duration the `expires_at` field of an API key can represent. A value of 0 means there is no maximum duration.
14+
[organization-id] Organization ID to use. If none is passed the default organization ID will be used
15+
16+
FLAGS:
17+
-h, --help help for update
18+
19+
GLOBAL FLAGS:
20+
-c, --config string The path to the config file
21+
-D, --debug Enable debug mode
22+
-o, --output string Output format: json or human, see 'scw help output' for more info (default "human")
23+
-p, --profile string The config profile to use
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
2+
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
3+
Security settings management commands.
4+
5+
USAGE:
6+
scw iam security-settings <command>
7+
8+
AVAILABLE COMMANDS:
9+
get Get security settings of an Organization
10+
update Update the security settings of an Organization
11+
12+
FLAGS:
13+
-h, --help help for security-settings
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
20+
21+
Use "scw iam security-settings [command] --help" for more information about a command.

cmd/scw/testdata/test-all-usage-iam-usage.golden

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ AVAILABLE COMMANDS:
1717
rule Rules management commands
1818
saml SAML management commands
1919
saml-certificates SAML Certificates management commands
20+
security-settings Security settings management commands
2021
ssh-key SSH keys management commands
2122
user Users management commands
2223

cmd/scw/testdata/test-all-usage-instance-server-console-usage.golden

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ USAGE:
88
ARGS:
99
server-id Server ID to connect to
1010
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | fr-par-3 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-1 | pl-waw-2 | pl-waw-3)
11+
[ws-url] WebSocket URL to connect to (overrides default)
1112

1213
FLAGS:
1314
-h, --help help for console
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
2+
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
3+
Prepare, wait for, and download logs from a Database Instance. This command automatically prepares the logs, waits for them to be ready, and downloads them to a file.
4+
5+
USAGE:
6+
scw rdb log download <instance-id ...> [arg=value ...]
7+
8+
EXAMPLES:
9+
Download logs from a database instance
10+
scw rdb log download 11111111-1111-1111-1111-111111111111
11+
12+
Download logs with a time range
13+
scw rdb log download 11111111-1111-1111-1111-111111111111 from=2023-01-01T00:00:00Z to=2023-01-02T00:00:00Z
14+
15+
Download logs to a specific file
16+
scw rdb log download 11111111-1111-1111-1111-111111111111 output=myLogs.txt
17+
18+
ARGS:
19+
instance-id UUID of the Database Instance you want logs of
20+
[from] Start datetime of your log. Supports absolute RFC3339 timestamps and relative times (see `scw help date`).
21+
[to] End datetime of your log. Supports absolute RFC3339 timestamps and relative times (see `scw help date`).
22+
[output] Filename to write to
23+
[region=fr-par] Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
24+
25+
FLAGS:
26+
-h, --help help for download
27+
28+
GLOBAL FLAGS:
29+
-c, --config string The path to the config file
30+
-D, --debug Enable debug mode
31+
-o, --output string Output format: json or human, see 'scw help output' for more info (default "human")
32+
-p, --profile string The config profile to use

cmd/scw/testdata/test-all-usage-rdb-log-usage.golden

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ USAGE:
66
scw rdb log <command>
77

88
AVAILABLE COMMANDS:
9+
download Download logs from a database instance
910
get Get given logs of a Database Instance
1011
list List available logs of a Database Instance
1112
list-details List remote Database Instance logs details
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
2+
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
3+
List available settings from a Redis™ version.
4+
5+
USAGE:
6+
scw redis version list-settings [arg=value ...]
7+
8+
EXAMPLES:
9+
List settings for Redis™ 7.2.11
10+
scw redis version list-settings version=7.2.11
11+
12+
ARGS:
13+
version Redis™ engine version
14+
[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 | pl-waw-1 | pl-waw-2)
15+
16+
FLAGS:
17+
-h, --help help for list-settings
18+
19+
GLOBAL FLAGS:
20+
-c, --config string The path to the config file
21+
-D, --debug Enable debug mode
22+
-o, --output string Output format: json or human, see 'scw help output' for more info (default "human")
23+
-p, --profile string The config profile to use

cmd/scw/testdata/test-all-usage-redis-version-usage.golden

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ USAGE:
66
scw redis version <command>
77

88
AVAILABLE COMMANDS:
9-
list List available Redis™ versions
9+
list List available Redis™ versions
10+
list-settings List available settings from a Redis™ version
1011

1112
FLAGS:
1213
-h, --help help for version

docs/commands/iam.md

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ This API allows you to manage Identity and Access Management (IAM) across your S
5555
- [Add a SAML certificate](#add-a-saml-certificate)
5656
- [Delete a SAML certificate](#delete-a-saml-certificate)
5757
- [List SAML certificates](#list-saml-certificates)
58+
- [Security settings management commands](#security-settings-management-commands)
59+
- [Get security settings of an Organization](#get-security-settings-of-an-organization)
60+
- [Update the security settings of an Organization](#update-the-security-settings-of-an-organization)
5861
- [SSH keys management commands](#ssh-keys-management-commands)
5962
- [Create an SSH key](#create-an-ssh-key)
6063
- [Delete an SSH key](#delete-an-ssh-key)
@@ -1064,6 +1067,54 @@ scw iam saml-certificates list <saml-id ...> [arg=value ...]
10641067

10651068

10661069

1070+
## Security settings management commands
1071+
1072+
Security settings management commands.
1073+
1074+
1075+
### Get security settings of an Organization
1076+
1077+
Retrieve information about the security settings of an Organization, specified by the `organization_id` parameter.
1078+
1079+
**Usage:**
1080+
1081+
```
1082+
scw iam security-settings get [arg=value ...]
1083+
```
1084+
1085+
1086+
**Args:**
1087+
1088+
| Name | | Description |
1089+
|------|---|-------------|
1090+
| organization-id | | Organization ID to use. If none is passed the default organization ID will be used |
1091+
1092+
1093+
1094+
### Update the security settings of an Organization
1095+
1096+
Update the security settings of an Organization.
1097+
1098+
**Usage:**
1099+
1100+
```
1101+
scw iam security-settings update [arg=value ...]
1102+
```
1103+
1104+
1105+
**Args:**
1106+
1107+
| Name | | Description |
1108+
|------|---|-------------|
1109+
| enforce-password-renewal | | Defines whether password renewal is enforced during first login |
1110+
| grace-period-duration | | Duration of the grace period to renew password or enable MFA. |
1111+
| login-attempts-before-locked | | Number of login attempts before the account is locked |
1112+
| max-login-session-duration | | Maximum duration a login session will stay active before needing to relogin. |
1113+
| max-api-key-expiration-duration | | Maximum duration the `expires_at` field of an API key can represent. A value of 0 means there is no maximum duration. |
1114+
| organization-id | | Organization ID to use. If none is passed the default organization ID will be used |
1115+
1116+
1117+
10671118
## SSH keys management commands
10681119

10691120
SSH keys management commands.

0 commit comments

Comments
 (0)