Skip to content

feat(cli): add verbosity to cdsctl admin database commands #6246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 1, 2022
Merged

feat(cli): add verbosity to cdsctl admin database commands #6246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 40 additions & 4 deletions cli/cdsctl/admin_database.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ package main

import (
"fmt"
"sort"
"strconv"

"github.com/spf13/cobra"

Expand Down Expand Up @@ -129,16 +131,33 @@ var adminDatabaseSignatureRoll = cli.Command{
Name: "entity",
AllowEmpty: true,
},
Flags: []cli.Flag{
{
Name: "index",
Usage: "Resume from a specific index (only available for one entity)",
IsValid: func(s string) bool {
if s == "" {
return true
}
_, err := strconv.Atoi(s)
return err == nil
},
},
},
}

func adminDatabaseSignatureRollFunc(args cli.Values) error {
entities := args.GetStringSlice("entity")
if len(entities) == 0 {
return client.AdminDatabaseSignaturesRollAllEntities(args.GetString(argServiceName))
}

idx, _ := args.GetInt64("index")
if len(entities) > 1 && idx > 0 {
return fmt.Errorf("--index can only be used with one entity")
}
sort.Strings(entities)
for _, e := range entities {
if err := client.AdminDatabaseSignaturesRollEntity(args.GetString(argServiceName), e); err != nil {
if err := client.AdminDatabaseSignaturesRollEntity(args.GetString(argServiceName), e, &idx); err != nil {
return err
}
}
Expand Down Expand Up @@ -182,16 +201,33 @@ var adminDatabaseEncryptionRoll = cli.Command{
Name: "entity",
AllowEmpty: true,
},
Flags: []cli.Flag{
{
Name: "index",
Usage: "Resume from a specific index (only available for one entity)",
IsValid: func(s string) bool {
if s == "" {
return true
}
_, err := strconv.Atoi(s)
return err == nil
},
},
},
}

func adminDatabaseEncryptionRollFunc(args cli.Values) error {
entities := args.GetStringSlice("entity")
if len(entities) == 0 {
return client.AdminDatabaseRollAllEncryptedEntities(args.GetString(argServiceName))
}

idx, _ := args.GetInt64("index")
if len(entities) > 1 && idx > 0 {
return fmt.Errorf("--index can only be used with one entity")
}
sort.Strings(entities)
for _, e := range entities {
if err := client.AdminDatabaseRollEncryptedEntity(args.GetString(argServiceName), e); err != nil {
if err := client.AdminDatabaseRollEncryptedEntity(args.GetString(argServiceName), e, &idx); err != nil {
return err
}
}
Expand Down
43 changes: 37 additions & 6 deletions sdk/cdsclient/client_admin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ import (
"fmt"
"net/http"
"net/url"
"time"

"github.com/ovh/cds/cli"
"github.com/ovh/cds/sdk"
)

Expand Down Expand Up @@ -234,7 +236,7 @@ func (c *client) AdminDatabaseSignaturesResume(service string) (sdk.CanonicalFor
return res, err
}

func (c *client) AdminDatabaseSignaturesRollEntity(service string, e string) error {
func (c *client) AdminDatabaseSignaturesRollEntity(service string, e string, idx *int64) error {
resume, err := c.AdminDatabaseSignaturesResume(service)
if err != nil {
return err
Expand All @@ -245,19 +247,34 @@ func (c *client) AdminDatabaseSignaturesRollEntity(service string, e string) err
}

for _, s := range resume[e] {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()

var display = new(cli.Display)
display.Printf("Rolling %v...", e)
display.Do(ctx)

url := fmt.Sprintf("/admin/database/signature/%s/%s", e, s.Signer)
var pks []string
var f = c.switchServiceCallFunc(service, http.MethodGet, url, nil, &pks)
if _, err := f(); err != nil {
return err
}

for _, pk := range pks {
for i, pk := range pks {
if idx != nil && *idx > int64(i) {
continue
}
display.Printf("Rolling %v (%d/%d)...", e, i+1, len(pks))
url := fmt.Sprintf("/admin/database/signature/%s/roll/%s", e, pk)
var f = c.switchServiceCallFunc(service, http.MethodPost, url, nil, nil)
if _, err := f(); err != nil {
return err
}
if i == len(pks)-1 {
display.Printf("Rolling %v (%d/%d) - DONE\n", e, i+1, len(pks))
time.Sleep(time.Second)
}
}
}
return nil
Expand All @@ -270,7 +287,7 @@ func (c *client) AdminDatabaseSignaturesRollAllEntities(service string) error {
}

for e := range resume {
if err := c.AdminDatabaseSignaturesRollEntity(service, e); err != nil {
if err := c.AdminDatabaseSignaturesRollEntity(service, e, nil); err != nil {
return err
}
}
Expand All @@ -284,7 +301,7 @@ func (c *client) AdminDatabaseListEncryptedEntities(service string) ([]string, e
return res, err
}

func (c *client) AdminDatabaseRollEncryptedEntity(service string, e string) error {
func (c *client) AdminDatabaseRollEncryptedEntity(service string, e string, idx *int64) error {
url := fmt.Sprintf("/admin/database/encryption/%s", e)
var pks []string

Expand All @@ -293,12 +310,26 @@ func (c *client) AdminDatabaseRollEncryptedEntity(service string, e string) erro
return err
}

for _, pk := range pks {
for i, pk := range pks {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()

var display = new(cli.Display)
display.Printf("Rolling %v...", e)
display.Do(ctx)
if idx != nil && *idx > int64(i) {
continue
}
display.Printf("Rolling %v (%d/%d)...", e, i+1, len(pks))
url := fmt.Sprintf("/admin/database/encryption/%s/roll/%s", e, pk)
var f = c.switchServiceCallFunc(service, http.MethodPost, url, nil, nil)
if _, err := f(); err != nil {
return err
}
if i == len(pks)-1 {
display.Printf("Rolling %v (%d/%d) - DONE\n", e, i+1, len(pks))
time.Sleep(time.Second)
}
}

return nil
Expand All @@ -310,7 +341,7 @@ func (c *client) AdminDatabaseRollAllEncryptedEntities(service string) error {
return err
}
for _, e := range entities {
if err := c.AdminDatabaseRollEncryptedEntity(service, e); err != nil {
if err := c.AdminDatabaseRollEncryptedEntity(service, e, nil); err != nil {
return err
}
}
Expand Down
4 changes: 2 additions & 2 deletions sdk/cdsclient/interface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ type Admin interface {
AdminDatabaseMigrationUnlock(service string, id string) error
AdminDatabaseMigrationsList(service string) ([]sdk.DatabaseMigrationStatus, error)
AdminDatabaseSignaturesResume(service string) (sdk.CanonicalFormUsageResume, error)
AdminDatabaseSignaturesRollEntity(service string, e string) error
AdminDatabaseSignaturesRollEntity(service string, e string, idx *int64) error
AdminDatabaseSignaturesRollAllEntities(service string) error
AdminDatabaseListEncryptedEntities(service string) ([]string, error)
AdminDatabaseRollEncryptedEntity(service string, e string) error
AdminDatabaseRollEncryptedEntity(service string, e string, idx *int64) error
AdminDatabaseRollAllEncryptedEntities(service string) error
AdminCDSMigrationList() ([]sdk.Migration, error)
AdminCDSMigrationCancel(id int64) error
Expand Down
32 changes: 16 additions & 16 deletions sdk/cdsclient/mock_cdsclient/interface_mock.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.