Skip to content

Commit

Permalink
Merge branch 'master' into v1.5968.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jremy42 authored Jan 17, 2025
2 parents 3f0570b + 24169b7 commit e154ea9
Show file tree
Hide file tree
Showing 8 changed files with 394 additions and 305 deletions.
15 changes: 15 additions & 0 deletions cmd/scw/testdata/test-all-usage-vpc-rule-usage.golden
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
Acl Rules.

USAGE:
scw vpc rule

FLAGS:
-h, --help help for rule

GLOBAL FLAGS:
-c, --config string The path to the config file
-D, --debug Enable debug mode
-o, --output string Output format: json or human, see 'scw help output' for more info (default "human")
-p, --profile string The config profile to use
1 change: 1 addition & 0 deletions cmd/scw/testdata/test-all-usage-vpc-usage.golden
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ USAGE:
AVAILABLE COMMANDS:
private-network Private network management command
route Route management command
rule Rule management command
subnet Subnet management command
vpc VPC management command

Expand Down
15 changes: 15 additions & 0 deletions docs/commands/vpc.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ This API allows you to manage your Virtual Private Clouds (VPCs) and Private Net
- [Get a Route](#get-a-route)
- [Return routes with associated next hop data](#return-routes-with-associated-next-hop-data)
- [Update Route](#update-route)
- [Rule management command](#rule-management-command)
- [Subnet management command](#subnet-management-command)
- [VPC management command](#vpc-management-command)
- [Create a VPC](#create-a-vpc)
Expand Down Expand Up @@ -331,6 +332,20 @@ scw vpc route update <route-id ...> [arg=value ...]



## Rule management command

Acl Rules.

Acl Rules.

**Usage:**

```
scw vpc rule
```



## Subnet management command

CIDR Subnet.
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ require (
github.com/mattn/go-isatty v0.0.20
github.com/moby/buildkit v0.13.2
github.com/opencontainers/go-digest v1.0.0
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20250113175114-44bd5547ea5b
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20250115142435-07825390847c
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
github.com/spf13/cobra v1.8.1
github.com/spf13/pflag v1.0.5
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -463,8 +463,8 @@ github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUz
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI=
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs=
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20250113175114-44bd5547ea5b h1:x15N6mLN/5Yp/MACKBocLUKRPDnM8ZtMOUpVIXKt3lg=
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20250113175114-44bd5547ea5b/go.mod h1:kzh+BSAvpoyHHdHBCDhmSWtBc1NbLMZ2lWHqnBoxFks=
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20250115142435-07825390847c h1:zn2PUSZUy/YS1oVV03pAGH6IB+gjxHxCyc/+KoRehUI=
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20250115142435-07825390847c/go.mod h1:kzh+BSAvpoyHHdHBCDhmSWtBc1NbLMZ2lWHqnBoxFks=
github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8=
github.com/sclevine/spec v1.4.0/go.mod h1:LvpgJaFyvQzRvc1kaDs0bulYwzC70PbiYjC4QnFHkOM=
github.com/secure-systems-lab/go-securesystemslib v0.8.0 h1:mr5An6X45Kb2nddcFlbmfHkLguCE9laoZCUzEEpIZXA=
Expand Down
640 changes: 344 additions & 296 deletions internal/namespaces/rdb/v1/testdata/test-list-backup-simple.cassette.yaml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
🟩🟩🟩 STDOUT️ 🟩🟩🟩️
ID Name Database Name Size Status Instance ID URL Expired Is Exported Expires At Created At Updated At Region Same Region
4a7d57b2-f92b-4b13-86de-b56e47cad9f5 will_be_exported rdb 2.1 kB ready 8a25dbba-dac7-49bf-854c-5f1da6a545bc false true few seconds ago few seconds ago few seconds ago fr-par false
a929798a-28be-4717-b8a7-0c02c088160e will_not_be_exported rdb 2.1 kB ready 8a25dbba-dac7-49bf-854c-5f1da6a545bc true false few seconds ago few seconds ago few seconds ago fr-par false
bd5681c4-a529-463e-8368-791619b53644 will_be_exported rdb 2.1 kB ready 319e7311-4804-4035-9b70-c762c694a3e0 false true few seconds ago few seconds ago few seconds ago fr-par false
8c2e48c7-31c1-4e15-9556-08040b8701a9 will_not_be_exported rdb 2.1 kB ready 319e7311-4804-4035-9b70-c762c694a3e0 true false few seconds ago few seconds ago few seconds ago fr-par false
🟩🟩🟩 JSON STDOUT 🟩🟩🟩
[
{
"ID": "4a7d57b2-f92b-4b13-86de-b56e47cad9f5",
"instance_ID": "8a25dbba-dac7-49bf-854c-5f1da6a545bc",
"ID": "bd5681c4-a529-463e-8368-791619b53644",
"instance_ID": "319e7311-4804-4035-9b70-c762c694a3e0",
"database_name": "rdb",
"name": "will_be_exported",
"status": "ready",
Expand All @@ -22,8 +22,8 @@ a929798a-28be-4717-b8a7-0c02c088160e will_not_be_exported rdb 2.1 k
"same_region": false
},
{
"ID": "a929798a-28be-4717-b8a7-0c02c088160e",
"instance_ID": "8a25dbba-dac7-49bf-854c-5f1da6a545bc",
"ID": "8c2e48c7-31c1-4e15-9556-08040b8701a9",
"instance_ID": "319e7311-4804-4035-9b70-c762c694a3e0",
"database_name": "rdb",
"name": "will_not_be_exported",
"status": "ready",
Expand Down
10 changes: 10 additions & 0 deletions internal/namespaces/vpc/v2/vpc_cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ func GetGeneratedCommands() *core.Commands {
vpcPrivateNetwork(),
vpcSubnet(),
vpcRoute(),
vpcRule(),
vpcVpcList(),
vpcVpcCreate(),
vpcVpcGet(),
Expand Down Expand Up @@ -93,6 +94,15 @@ func vpcRoute() *core.Command {
}
}

func vpcRule() *core.Command {
return &core.Command{
Short: `Rule management command`,
Long: `Acl Rules.`,
Namespace: "vpc",
Resource: "rule",
}
}

func vpcVpcList() *core.Command {
return &core.Command{
Short: `List VPCs`,
Expand Down

0 comments on commit e154ea9

Please sign in to comment.