From e6e3c78545d348b4b5f4d2160b95f713035c1a33 Mon Sep 17 00:00:00 2001 From: scaleway-bot Date: Wed, 30 Mar 2022 16:04:39 +0000 Subject: [PATCH 1/2] feat: update generated cli --- ...st-all-usage-rdb-read-replica-usage.golden | 15 +++++++++++++ .../testdata/test-all-usage-rdb-usage.golden | 21 ++++++++++--------- docs/commands/rdb.md | 17 +++++++++++++++ go.mod | 4 ---- internal/namespaces/rdb/v1/rdb_cli.go | 11 ++++++++++ 5 files changed, 54 insertions(+), 14 deletions(-) create mode 100644 cmd/scw/testdata/test-all-usage-rdb-read-replica-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-read-replica-usage.golden b/cmd/scw/testdata/test-all-usage-rdb-read-replica-usage.golden new file mode 100644 index 0000000000..d8dc15345a --- /dev/null +++ b/cmd/scw/testdata/test-all-usage-rdb-read-replica-usage.golden @@ -0,0 +1,15 @@ +🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲 +πŸŸ₯πŸŸ₯πŸŸ₯ STDERR️️ πŸŸ₯πŸŸ₯πŸŸ₯️ +A read replica is a live copy of the main database instance only available for reading. Read replica allows you to scale your database instance for read-heavy database workloads. Read replicas can also be used for Business Intelligence workloads. + +USAGE: + scw rdb read-replica + +FLAGS: + -h, --help help for read-replica + +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 diff --git a/cmd/scw/testdata/test-all-usage-rdb-usage.golden b/cmd/scw/testdata/test-all-usage-rdb-usage.golden index bbf10bae91..bae8df2453 100644 --- a/cmd/scw/testdata/test-all-usage-rdb-usage.golden +++ b/cmd/scw/testdata/test-all-usage-rdb-usage.golden @@ -6,16 +6,17 @@ USAGE: scw rdb AVAILABLE COMMANDS: - acl Access Control List (ACL) management commands - backup Backup management commands - database Database management commands - engine Database engines commands - instance Instance management commands - log Instance logs management commands - node-type Node types management commands - privilege User privileges management commands - snapshot Block snapshot management - user User management commands + acl Access Control List (ACL) management commands + backup Backup management commands + database Database management commands + engine Database engines commands + instance Instance management commands + log Instance logs management commands + node-type Node types management commands + privilege User privileges management commands + read-replica Read replica management + snapshot Block snapshot management + user User management commands FLAGS: -h, --help help for rdb diff --git a/docs/commands/rdb.md b/docs/commands/rdb.md index 17139518e8..5e799d9424 100644 --- a/docs/commands/rdb.md +++ b/docs/commands/rdb.md @@ -46,6 +46,7 @@ Database RDB API - [User privileges management commands](#user-privileges-management-commands) - [List privileges of a given user for a given database on a given instance](#list-privileges-of-a-given-user-for-a-given-database-on-a-given-instance) - [Set privileges of a given user for a given database on a given instance](#set-privileges-of-a-given-user-for-a-given-database-on-a-given-instance) +- [Read replica management](#read-replica-management) - [Block snapshot management](#block-snapshot-management) - [Create an instance snapshot](#create-an-instance-snapshot) - [Delete an instance snapshot](#delete-an-instance-snapshot) @@ -924,6 +925,22 @@ scw rdb privilege set [arg=value ...] +## Read replica management + +A read replica is a live copy of the main database instance only available for reading. Read replica allows you to scale your database instance for read-heavy database workloads. Read replicas can also be used for Business Intelligence workloads. + + +A read replica is a live copy of the main database instance only available for reading. Read replica allows you to scale your database instance for read-heavy database workloads. Read replicas can also be used for Business Intelligence workloads. + + +**Usage:** + +``` +scw rdb read-replica +``` + + + ## Block snapshot management Create, restore and manage block snapshot diff --git a/go.mod b/go.mod index a2e1afddf5..9f92f0c80d 100644 --- a/go.mod +++ b/go.mod @@ -31,12 +31,8 @@ require ( github.com/certifi/gocertifi v0.0.0-20210507211836-431795d63e8d // indirect github.com/chzyer/logex v1.2.0 // indirect github.com/chzyer/test v0.0.0-20210722231415-061457976a23 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect github.com/etdub/goparsetime v0.0.0-20160315173935-ea17b0ac3318 // indirect - github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/pkg/errors v0.8.1 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect github.com/sergi/go-diff v1.2.0 // indirect golang.org/x/sys v0.0.0-20211205182925-97ca703d548d // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/internal/namespaces/rdb/v1/rdb_cli.go b/internal/namespaces/rdb/v1/rdb_cli.go index 9396cf2e11..a401699037 100644 --- a/internal/namespaces/rdb/v1/rdb_cli.go +++ b/internal/namespaces/rdb/v1/rdb_cli.go @@ -30,6 +30,7 @@ func GetGeneratedCommands() *core.Commands { rdbNodeType(), rdbLog(), rdbSnapshot(), + rdbReadReplica(), rdbEngineList(), rdbNodeTypeList(), rdbBackupList(), @@ -181,6 +182,16 @@ func rdbSnapshot() *core.Command { } } +func rdbReadReplica() *core.Command { + return &core.Command{ + Short: `Read replica management`, + Long: `A read replica is a live copy of the main database instance only available for reading. Read replica allows you to scale your database instance for read-heavy database workloads. Read replicas can also be used for Business Intelligence workloads. +`, + Namespace: "rdb", + Resource: "read-replica", + } +} + func rdbEngineList() *core.Command { return &core.Command{ Short: `List available database engines`, From f2cc9980b884c9df1c5b5a55986aa6ba82764290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= Date: Thu, 31 Mar 2022 10:27:41 +0200 Subject: [PATCH 2/2] Fix --- .github/workflows/coverage.yml | 18 ++++++++++++++++ ...st-all-usage-rdb-read-replica-usage.golden | 15 ------------- .../testdata/test-all-usage-rdb-usage.golden | 21 +++++++++---------- docs/commands/rdb.md | 17 --------------- go.mod | 4 ++++ internal/namespaces/rdb/v1/rdb_cli.go | 11 ---------- 6 files changed, 32 insertions(+), 54 deletions(-) create mode 100644 .github/workflows/coverage.yml delete mode 100644 cmd/scw/testdata/test-all-usage-rdb-read-replica-usage.golden diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml new file mode 100644 index 0000000000..3c9b0bcda7 --- /dev/null +++ b/.github/workflows/coverage.yml @@ -0,0 +1,18 @@ +name: Test and coverage + +on: [push, pull_request] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 2 + - uses: actions/setup-go@v2 + with: + go-version: '1.18' + - name: Run coverage + run: go test -coverprofile=coverage.out -covermode=count ./... + - name: Upload coverage to Codecov + uses: codecov/codecov-action@v2 diff --git a/cmd/scw/testdata/test-all-usage-rdb-read-replica-usage.golden b/cmd/scw/testdata/test-all-usage-rdb-read-replica-usage.golden deleted file mode 100644 index d8dc15345a..0000000000 --- a/cmd/scw/testdata/test-all-usage-rdb-read-replica-usage.golden +++ /dev/null @@ -1,15 +0,0 @@ -🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲 -πŸŸ₯πŸŸ₯πŸŸ₯ STDERR️️ πŸŸ₯πŸŸ₯πŸŸ₯️ -A read replica is a live copy of the main database instance only available for reading. Read replica allows you to scale your database instance for read-heavy database workloads. Read replicas can also be used for Business Intelligence workloads. - -USAGE: - scw rdb read-replica - -FLAGS: - -h, --help help for read-replica - -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 diff --git a/cmd/scw/testdata/test-all-usage-rdb-usage.golden b/cmd/scw/testdata/test-all-usage-rdb-usage.golden index bae8df2453..bbf10bae91 100644 --- a/cmd/scw/testdata/test-all-usage-rdb-usage.golden +++ b/cmd/scw/testdata/test-all-usage-rdb-usage.golden @@ -6,17 +6,16 @@ USAGE: scw rdb AVAILABLE COMMANDS: - acl Access Control List (ACL) management commands - backup Backup management commands - database Database management commands - engine Database engines commands - instance Instance management commands - log Instance logs management commands - node-type Node types management commands - privilege User privileges management commands - read-replica Read replica management - snapshot Block snapshot management - user User management commands + acl Access Control List (ACL) management commands + backup Backup management commands + database Database management commands + engine Database engines commands + instance Instance management commands + log Instance logs management commands + node-type Node types management commands + privilege User privileges management commands + snapshot Block snapshot management + user User management commands FLAGS: -h, --help help for rdb diff --git a/docs/commands/rdb.md b/docs/commands/rdb.md index 5e799d9424..17139518e8 100644 --- a/docs/commands/rdb.md +++ b/docs/commands/rdb.md @@ -46,7 +46,6 @@ Database RDB API - [User privileges management commands](#user-privileges-management-commands) - [List privileges of a given user for a given database on a given instance](#list-privileges-of-a-given-user-for-a-given-database-on-a-given-instance) - [Set privileges of a given user for a given database on a given instance](#set-privileges-of-a-given-user-for-a-given-database-on-a-given-instance) -- [Read replica management](#read-replica-management) - [Block snapshot management](#block-snapshot-management) - [Create an instance snapshot](#create-an-instance-snapshot) - [Delete an instance snapshot](#delete-an-instance-snapshot) @@ -925,22 +924,6 @@ scw rdb privilege set [arg=value ...] -## Read replica management - -A read replica is a live copy of the main database instance only available for reading. Read replica allows you to scale your database instance for read-heavy database workloads. Read replicas can also be used for Business Intelligence workloads. - - -A read replica is a live copy of the main database instance only available for reading. Read replica allows you to scale your database instance for read-heavy database workloads. Read replicas can also be used for Business Intelligence workloads. - - -**Usage:** - -``` -scw rdb read-replica -``` - - - ## Block snapshot management Create, restore and manage block snapshot diff --git a/go.mod b/go.mod index 9f92f0c80d..a2e1afddf5 100644 --- a/go.mod +++ b/go.mod @@ -31,8 +31,12 @@ require ( github.com/certifi/gocertifi v0.0.0-20210507211836-431795d63e8d // indirect github.com/chzyer/logex v1.2.0 // indirect github.com/chzyer/test v0.0.0-20210722231415-061457976a23 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect github.com/etdub/goparsetime v0.0.0-20160315173935-ea17b0ac3318 // indirect + github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/pkg/errors v0.8.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect github.com/sergi/go-diff v1.2.0 // indirect golang.org/x/sys v0.0.0-20211205182925-97ca703d548d // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/internal/namespaces/rdb/v1/rdb_cli.go b/internal/namespaces/rdb/v1/rdb_cli.go index a401699037..9396cf2e11 100644 --- a/internal/namespaces/rdb/v1/rdb_cli.go +++ b/internal/namespaces/rdb/v1/rdb_cli.go @@ -30,7 +30,6 @@ func GetGeneratedCommands() *core.Commands { rdbNodeType(), rdbLog(), rdbSnapshot(), - rdbReadReplica(), rdbEngineList(), rdbNodeTypeList(), rdbBackupList(), @@ -182,16 +181,6 @@ func rdbSnapshot() *core.Command { } } -func rdbReadReplica() *core.Command { - return &core.Command{ - Short: `Read replica management`, - Long: `A read replica is a live copy of the main database instance only available for reading. Read replica allows you to scale your database instance for read-heavy database workloads. Read replicas can also be used for Business Intelligence workloads. -`, - Namespace: "rdb", - Resource: "read-replica", - } -} - func rdbEngineList() *core.Command { return &core.Command{ Short: `List available database engines`,