Skip to content

Commit dbde2ca

Browse files
scaleway-botscaleway-bot
committed
feat(instance): add support for SRN
1 parent eb65e6b commit dbde2ca

12 files changed

Lines changed: 81 additions & 4 deletions

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ ARGS:
99
[project-id] Project ID to use. If none is passed the default project ID will be used
1010
[name] (Optional) Name of the key
1111
[usage.symmetric-encryption] Encrypt and decrypt arbitrary payloads using a symmetric encryption algorithm. (unknown_symmetric_encryption | aes_256_gcm)
12-
[usage.asymmetric-encryption] Encrypt and decrypt arbitrary payloads using an asymmetric encryption algorithm. (unknown_asymmetric_encryption | rsa_oaep_2048_sha256 | rsa_oaep_3072_sha256 | rsa_oaep_4096_sha256 | ml_kem_768 | ml_kem_1024)
12+
[usage.asymmetric-encryption] Encrypt and decrypt arbitrary payloads using an asymmetric encryption algorithm. (unknown_asymmetric_encryption | rsa_oaep_2048_sha256 | rsa_oaep_3072_sha256 | rsa_oaep_4096_sha256)
1313
[usage.asymmetric-signing] Sign and verify arbitrary messages using an asymmetric signing algorithm. (unknown_asymmetric_signing | ec_p256_sha256 | ec_p384_sha384 | rsa_pss_2048_sha256 | rsa_pss_3072_sha256 | rsa_pss_4096_sha256 | rsa_pkcs1_2048_sha256 | rsa_pkcs1_3072_sha256 | rsa_pkcs1_4096_sha256 | ml_dsa_44 | ml_dsa_65 | ml_dsa_87 | ec_secp256k1_sha256)
14+
[usage.key-encapsulation] (unknown_key_encapsulation | ml_kem_768 | ml_kem_1024)
1415
[description] (Optional) Description of the key
1516
[tags.{index}] (Optional) List of the key's tags
1617
[rotation-policy.rotation-period] Rotation period

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ ARGS:
5151
[max-retries] Number of retries when a backend server connection failed
5252
[max-connections] Maximum number of connections allowed per backend server
5353
[timeout-queue] Maximum time for a request to be left pending in queue when `max_connections` is reached
54+
[host] Host value to use when connecting to backend servers
5455
[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)
5556

5657
DEPRECATED ARGS:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ ARGS:
2525
[max-retries] Number of retries when a backend server connection failed
2626
[max-connections] Maximum number of connections allowed per backend server
2727
[timeout-queue] Maximum time for a request to be left pending in queue when `max_connections` is reached
28+
[host] Host value to use when connecting to backend servers
2829
[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)
2930

3031
DEPRECATED ARGS:

‎cmd/scw/testdata/test-all-usage-sdb-sql-database-create-usage.golden‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ ARGS:
1111
cpu-min The minimum number of CPU units for your Serverless SQL Database.
1212
cpu-max The maximum number of CPU units for your Serverless SQL Database.
1313
[from-backup-id] The ID of the backup to create the database from.
14+
[version] The major version of the postgreSQL requested.
1415
[region=fr-par] Region to target. If none is passed will use default region from the config (fr-par)
1516

1617
FLAGS:

‎cmd/scw/testdata/test-all-usage-sdb-sql-usage.golden‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ USAGE:
88
AVAILABLE COMMANDS:
99
backup
1010
database
11+
version
1112

1213
FLAGS:
1314
-h, --help help for sdb-sql

‎cmd/scw/testdata/test-all-usage-sdb-sql-version-usage.golden‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
2+
🟩🟩🟩 STDOUT️ 🟩🟩🟩️
3+
USAGE:
4+
scw sdb-sql version
5+
6+
FLAGS:
7+
-h, --help help for version
8+
--list-sub-commands List all subcommands
9+
10+
GLOBAL FLAGS:
11+
-c, --config string The path to the config file
12+
-D, --debug Enable debug mode
13+
-o, --output string Output format: json or human, see 'scw help output' for more info (default "human")
14+
-p, --profile string The config profile to use

‎docs/commands/keymanager.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ scw keymanager key create [arg=value ...]
2525
| project-id | Project ID to use. If none is passed the default project ID will be used | |
2626
| name | (Optional) Name of the key | |
2727
| usage.symmetric-encryption | Encrypt and decrypt arbitrary payloads using a symmetric encryption algorithm. | One of: `unknown_symmetric_encryption`, `aes_256_gcm` |
28-
| usage.asymmetric-encryption | Encrypt and decrypt arbitrary payloads using an asymmetric encryption algorithm. | One of: `unknown_asymmetric_encryption`, `rsa_oaep_2048_sha256`, `rsa_oaep_3072_sha256`, `rsa_oaep_4096_sha256`, `ml_kem_768`, `ml_kem_1024` |
28+
| usage.asymmetric-encryption | Encrypt and decrypt arbitrary payloads using an asymmetric encryption algorithm. | One of: `unknown_asymmetric_encryption`, `rsa_oaep_2048_sha256`, `rsa_oaep_3072_sha256`, `rsa_oaep_4096_sha256` |
2929
| usage.asymmetric-signing | Sign and verify arbitrary messages using an asymmetric signing algorithm. | One of: `unknown_asymmetric_signing`, `ec_p256_sha256`, `ec_p384_sha384`, `rsa_pss_2048_sha256`, `rsa_pss_3072_sha256`, `rsa_pss_4096_sha256`, `rsa_pkcs1_2048_sha256`, `rsa_pkcs1_3072_sha256`, `rsa_pkcs1_4096_sha256`, `ml_dsa_44`, `ml_dsa_65`, `ml_dsa_87`, `ec_secp256k1_sha256` |
30+
| usage.key-encapsulation | | One of: `unknown_key_encapsulation`, `ml_kem_768`, `ml_kem_1024` |
3031
| description | (Optional) Description of the key | |
3132
| tags.{index} | (Optional) List of the key's tags | |
3233
| rotation-policy.rotation-period | Rotation period | |

‎docs/commands/lb.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,7 @@ scw lb backend create [arg=value ...]
260260
| max-retries | Number of retries when a backend server connection failed | |
261261
| max-connections | Maximum number of connections allowed per backend server | |
262262
| timeout-queue | Maximum time for a request to be left pending in queue when `max_connections` is reached | |
263+
| host | Host value to use when connecting to backend servers | |
263264
| zone | Zone to target. If none is passed will use default zone from the config | Default: `fr-par-1`<br />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` |
264265

265266

@@ -434,6 +435,7 @@ scw lb backend update <backend-id ...> [arg=value ...]
434435
| max-retries | Number of retries when a backend server connection failed | |
435436
| max-connections | Maximum number of connections allowed per backend server | |
436437
| timeout-queue | Maximum time for a request to be left pending in queue when `max_connections` is reached | |
438+
| host | Host value to use when connecting to backend servers | |
437439
| zone | Zone to target. If none is passed will use default zone from the config | Default: `fr-par-1`<br />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` |
438440

439441

‎docs/commands/sdb-sql.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ scw sdb-sql database create [arg=value ...]
9595
| cpu-min | The minimum number of CPU units for your Serverless SQL Database. | Required |
9696
| cpu-max | The maximum number of CPU units for your Serverless SQL Database. | Required |
9797
| from-backup-id | The ID of the backup to create the database from. | |
98+
| version | The major version of the postgreSQL requested. | |
9899
| region | Region to target. If none is passed will use default region from the config | Default: `fr-par`<br />One of: `fr-par` |
99100

100101

@@ -205,3 +206,17 @@ scw sdb-sql database update <database-id ...> [arg=value ...]
205206

206207

207208

209+
##
210+
211+
212+
213+
214+
215+
**Usage:**
216+
217+
```shell
218+
scw sdb-sql version
219+
```
220+
221+
222+

‎internal/namespaces/key_manager/v1alpha1/key_manager_cli.go‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,6 @@ func keymanagerKeyCreate() *core.Command {
9696
"rsa_oaep_2048_sha256",
9797
"rsa_oaep_3072_sha256",
9898
"rsa_oaep_4096_sha256",
99-
"ml_kem_768",
100-
"ml_kem_1024",
10199
},
102100
},
103101
{
@@ -122,6 +120,17 @@ func keymanagerKeyCreate() *core.Command {
122120
"ec_secp256k1_sha256",
123121
},
124122
},
123+
{
124+
Name: "usage.key-encapsulation",
125+
Required: false,
126+
Deprecated: false,
127+
Positional: false,
128+
EnumValues: []string{
129+
"unknown_key_encapsulation",
130+
"ml_kem_768",
131+
"ml_kem_1024",
132+
},
133+
},
125134
{
126135
Name: "description",
127136
Short: `(Optional) Description of the key`,

0 commit comments

Comments
 (0)