Skip to content

Commit 0aad075

Browse files
scaleway-botscaleway-bot
committed
feat(product_catalog): add support for new HSM backed Key Manager Keys in our APIs
1 parent 264fa28 commit 0aad075

6 files changed

Lines changed: 91 additions & 19 deletions

File tree

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

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,23 @@ USAGE:
66
scw datawarehouse deployment create [arg=value ...]
77

88
ARGS:
9-
[project-id] Project ID to use. If none is passed the default project ID will be used
10-
[name] Name of the deployment
11-
[tags.{index}] Tags to apply to the deployment
12-
[version] ClickHouse® version to use for the deployment
13-
[replica-count] Number of replicas for the deployment
14-
[shard-count] Number of shard for the deployment
15-
[password] Password for the initial user
16-
[cpu-min] Minimum CPU count for the deployment
17-
[cpu-max] Maximum CPU count for the deployment
18-
[endpoints.{index}.private-network.private-network-id] UUID of the Private Network
19-
[ram-per-cpu] RAM per CPU count for the deployment (in GB)
20-
[move-factor] For the `tiered` storage policy, controls when data is moved from the hot volume (Block Storage) to the cold volume (Object Storage). Data is moved once free space on the hot volume drops below this fraction of its capacity. Value between 0 and 1 (default 0.1, i.e. data is moved when the hot volume is 90% full).
21-
[region=fr-par] Region to target. If none is passed will use default region from the config (fr-par)
9+
[project-id] Project ID to use. If none is passed the default project ID will be used
10+
[name] Name of the deployment
11+
[tags.{index}] Tags to apply to the deployment
12+
[version] ClickHouse® version to use for the deployment
13+
[replica-count] Number of replicas for the deployment
14+
[shard-count] Number of shard for the deployment
15+
[password] Password for the initial user
16+
[cpu-min] Minimum CPU count for the deployment
17+
[cpu-max] Maximum CPU count for the deployment
18+
[endpoints.{index}.private-network.private-network-id] UUID of the Private Network
19+
[endpoints.{index}.private-network.nodes.{index}.node-name] Name of the node
20+
[endpoints.{index}.private-network.nodes.{index}.shard] The ClickHouse shard to which the node belongs to
21+
[endpoints.{index}.private-network.nodes.{index}.replica] The ClickHouse replica to which the node belongs to
22+
[endpoints.{index}.private-network.nodes.{index}.ip-address] Private static IP address of that node.
23+
[ram-per-cpu] RAM per CPU count for the deployment (in GB)
24+
[move-factor] For the `tiered` storage policy, controls when data is moved from the hot volume (Block Storage) to the cold volume (Object Storage). Data is moved once free space on the hot volume drops below this fraction of its capacity. Value between 0 and 1 (default 0.1, i.e. data is moved when the hot volume is 90% full).
25+
[region=fr-par] Region to target. If none is passed will use default region from the config (fr-par)
2226

2327
FLAGS:
2428
-h, --help help for create

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,13 @@ USAGE:
66
scw datawarehouse endpoint create [arg=value ...]
77

88
ARGS:
9-
[deployment-id] UUID of the deployment
10-
[endpoint.private-network.private-network-id] UUID of the Private Network
11-
[region=fr-par] Region to target. If none is passed will use default region from the config (fr-par)
9+
[deployment-id] UUID of the deployment
10+
[endpoint.private-network.private-network-id] UUID of the Private Network
11+
[endpoint.private-network.nodes.{index}.node-name] Name of the node
12+
[endpoint.private-network.nodes.{index}.shard] The ClickHouse shard to which the node belongs to
13+
[endpoint.private-network.nodes.{index}.replica] The ClickHouse replica to which the node belongs to
14+
[endpoint.private-network.nodes.{index}.ip-address] Private static IP address of that node.
15+
[region=fr-par] Region to target. If none is passed will use default region from the config (fr-par)
1216

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

‎docs/commands/datawarehouse.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,10 @@ scw datawarehouse deployment create [arg=value ...]
101101
| cpu-min | | Minimum CPU count for the deployment |
102102
| cpu-max | | Maximum CPU count for the deployment |
103103
| endpoints.{index}.private-network.private-network-id | | UUID of the Private Network |
104+
| endpoints.{index}.private-network.nodes.{index}.node-name | | Name of the node |
105+
| endpoints.{index}.private-network.nodes.{index}.shard | | The ClickHouse shard to which the node belongs to |
106+
| endpoints.{index}.private-network.nodes.{index}.replica | | The ClickHouse replica to which the node belongs to |
107+
| endpoints.{index}.private-network.nodes.{index}.ip-address | | Private static IP address of that node. |
104108
| ram-per-cpu | | RAM per CPU count for the deployment (in GB) |
105109
| move-factor | | For the `tiered` storage policy, controls when data is moved from the hot volume (Block Storage) to the cold volume (Object Storage). Data is moved once free space on the hot volume drops below this fraction of its capacity. Value between 0 and 1 (default 0.1, i.e. data is moved when the hot volume is 90% full). |
106110
| region | Default: `fr-par`<br />One of: `fr-par` | Region to target. If none is passed will use default region from the config |
@@ -239,6 +243,10 @@ scw datawarehouse endpoint create [arg=value ...]
239243
|------|---|-------------|
240244
| deployment-id | | UUID of the deployment |
241245
| endpoint.private-network.private-network-id | | UUID of the Private Network |
246+
| endpoint.private-network.nodes.{index}.node-name | | Name of the node |
247+
| endpoint.private-network.nodes.{index}.shard | | The ClickHouse shard to which the node belongs to |
248+
| endpoint.private-network.nodes.{index}.replica | | The ClickHouse replica to which the node belongs to |
249+
| endpoint.private-network.nodes.{index}.ip-address | | Private static IP address of that node. |
242250
| region | Default: `fr-par`<br />One of: `fr-par` | Region to target. If none is passed will use default region from the config |
243251

244252

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ require (
2727
github.com/moby/moby/client v0.5.0
2828
github.com/modelcontextprotocol/go-sdk v1.6.1
2929
github.com/opencontainers/go-digest v1.0.0
30-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.36.0.20260710103148-281788bca18b
30+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.36.0.20260710152605-3ffc85380e0f
3131
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
3232
github.com/spf13/cobra v1.10.2
3333
github.com/spf13/pflag v1.0.10

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -473,8 +473,8 @@ github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7
473473
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
474474
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI=
475475
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs=
476-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.36.0.20260710103148-281788bca18b h1:Zsm1nlcA/zMuVhQNqFI6tYvgWCYx8xDYmOE0kRj41+Y=
477-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.36.0.20260710103148-281788bca18b/go.mod h1:Rtb4r3WZ5x4AqmL3t/wiF/DmQi+7GlU/nCRdqFbClV4=
476+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.36.0.20260710152605-3ffc85380e0f h1:Ds2/MnZU3YkcQxgTvLpFUuuL+bCCi/Ea/AvwRCiAf0Q=
477+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.36.0.20260710152605-3ffc85380e0f/go.mod h1:Rtb4r3WZ5x4AqmL3t/wiF/DmQi+7GlU/nCRdqFbClV4=
478478
github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8=
479479
github.com/sclevine/spec v1.4.0/go.mod h1:LvpgJaFyvQzRvc1kaDs0bulYwzC70PbiYjC4QnFHkOM=
480480
github.com/secure-systems-lab/go-securesystemslib v0.11.0 h1:iuCR9kcMFD4QurdKrGvPLoKZLv9YvwPYVr0473BdtFs=

‎internal/namespaces/datawarehouse/v1beta1/datawarehouse_cli.go‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,34 @@ func datawarehouseDeploymentCreate() *core.Command {
364364
Deprecated: false,
365365
Positional: false,
366366
},
367+
{
368+
Name: "endpoints.{index}.private-network.nodes.{index}.node-name",
369+
Short: `Name of the node`,
370+
Required: false,
371+
Deprecated: false,
372+
Positional: false,
373+
},
374+
{
375+
Name: "endpoints.{index}.private-network.nodes.{index}.shard",
376+
Short: `The ClickHouse shard to which the node belongs to`,
377+
Required: false,
378+
Deprecated: false,
379+
Positional: false,
380+
},
381+
{
382+
Name: "endpoints.{index}.private-network.nodes.{index}.replica",
383+
Short: `The ClickHouse replica to which the node belongs to`,
384+
Required: false,
385+
Deprecated: false,
386+
Positional: false,
387+
},
388+
{
389+
Name: "endpoints.{index}.private-network.nodes.{index}.ip-address",
390+
Short: `Private static IP address of that node.`,
391+
Required: false,
392+
Deprecated: false,
393+
Positional: false,
394+
},
367395
{
368396
Name: "ram-per-cpu",
369397
Short: `RAM per CPU count for the deployment (in GB)`,
@@ -790,6 +818,34 @@ func datawarehouseEndpointCreate() *core.Command {
790818
Deprecated: false,
791819
Positional: false,
792820
},
821+
{
822+
Name: "endpoint.private-network.nodes.{index}.node-name",
823+
Short: `Name of the node`,
824+
Required: false,
825+
Deprecated: false,
826+
Positional: false,
827+
},
828+
{
829+
Name: "endpoint.private-network.nodes.{index}.shard",
830+
Short: `The ClickHouse shard to which the node belongs to`,
831+
Required: false,
832+
Deprecated: false,
833+
Positional: false,
834+
},
835+
{
836+
Name: "endpoint.private-network.nodes.{index}.replica",
837+
Short: `The ClickHouse replica to which the node belongs to`,
838+
Required: false,
839+
Deprecated: false,
840+
Positional: false,
841+
},
842+
{
843+
Name: "endpoint.private-network.nodes.{index}.ip-address",
844+
Short: `Private static IP address of that node.`,
845+
Required: false,
846+
Deprecated: false,
847+
Positional: false,
848+
},
793849
core.RegionArgSpec(scw.RegionFrPar),
794850
},
795851
Run: func(ctx context.Context, args any) (i any, e error) {

0 commit comments

Comments
 (0)