Skip to content

rdb: add color rendering for status #1218

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 2 commits into from
Jul 15, 2020
Merged

rdb: add color rendering for status #1218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c3ac9a
rdb: add color rendering for status
remyleone Jul 15, 2020
22f7693
Merge branch 'v2' into color_status
remyleone Jul 15, 2020
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
4 changes: 4 additions & 0 deletions internal/namespaces/rdb/v1/custom.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ func GetCommands() *core.Commands {
human.RegisterMarshalerFunc(rdb.Instance{}, instanceMarshalerFunc)
human.RegisterMarshalerFunc(rdb.BackupSchedule{}, backupScheduleMarshalerFunc)

human.RegisterMarshalerFunc(rdb.InstanceStatus(0), human.EnumMarshalFunc(instanceStatusMarshalSpecs))
human.RegisterMarshalerFunc(rdb.DatabaseBackupStatus(0), human.EnumMarshalFunc(backupStatusMarshalSpecs))
human.RegisterMarshalerFunc(rdb.InstanceLogStatus(0), human.EnumMarshalFunc(logStatusMarshalSpecs))

cmds.Merge(core.NewCommands(
instanceWaitCommand(),
instanceConnectCommand(),
Expand Down
14 changes: 14 additions & 0 deletions internal/namespaces/rdb/v1/custom_backup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ import (
"reflect"
"time"

"github.com/fatih/color"
"github.com/scaleway/scaleway-cli/internal/core"
"github.com/scaleway/scaleway-cli/internal/human"
"github.com/scaleway/scaleway-sdk-go/api/rdb/v1"
"github.com/scaleway/scaleway-sdk-go/scw"
)
Expand All @@ -14,6 +16,18 @@ const (
backupActionTimeout = 20 * time.Minute
)

var (
backupStatusMarshalSpecs = human.EnumMarshalSpecs{
rdb.DatabaseBackupStatusUnknown: &human.EnumMarshalSpec{Attribute: color.Faint, Value: "unknown"},
rdb.DatabaseBackupStatusCreating: &human.EnumMarshalSpec{Attribute: color.FgBlue, Value: "creating"},
rdb.DatabaseBackupStatusReady: &human.EnumMarshalSpec{Attribute: color.FgGreen, Value: "ready"},
rdb.DatabaseBackupStatusRestoring: &human.EnumMarshalSpec{Attribute: color.FgBlue, Value: "restoring"},
rdb.DatabaseBackupStatusDeleting: &human.EnumMarshalSpec{Attribute: color.FgBlue, Value: "deleting"},
rdb.DatabaseBackupStatusError: &human.EnumMarshalSpec{Attribute: color.FgRed, Value: "error"},
rdb.DatabaseBackupStatusExporting: &human.EnumMarshalSpec{Attribute: color.FgBlue, Value: "exporting"},
}
)

type backupWaitRequest struct {
DatabaseBackupID string
Region scw.Region
Expand Down
17 changes: 17 additions & 0 deletions internal/namespaces/rdb/v1/custom_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"strings"
"time"

"github.com/fatih/color"
"github.com/scaleway/scaleway-cli/internal/core"
"github.com/scaleway/scaleway-cli/internal/human"
"github.com/scaleway/scaleway-cli/internal/interactive"
Expand All @@ -22,6 +23,22 @@ const (
instanceActionTimeout = 20 * time.Minute
)

var (
instanceStatusMarshalSpecs = human.EnumMarshalSpecs{
rdb.InstanceStatusUnknown: &human.EnumMarshalSpec{Attribute: color.Faint, Value: "unknown"},
rdb.InstanceStatusReady: &human.EnumMarshalSpec{Attribute: color.FgGreen, Value: "ready"},
rdb.InstanceStatusProvisioning: &human.EnumMarshalSpec{Attribute: color.FgBlue, Value: "provisioning"},
rdb.InstanceStatusConfiguring: &human.EnumMarshalSpec{Attribute: color.FgBlue, Value: "configuring"},
rdb.InstanceStatusDeleting: &human.EnumMarshalSpec{Attribute: color.FgBlue, Value: "deleting"},
rdb.InstanceStatusError: &human.EnumMarshalSpec{Attribute: color.FgRed, Value: "error"},
rdb.InstanceStatusAutohealing: &human.EnumMarshalSpec{Attribute: color.FgBlue, Value: "auto-healing"},
rdb.InstanceStatusLocked: &human.EnumMarshalSpec{Attribute: color.FgRed, Value: "locked"},
rdb.InstanceStatusInitializing: &human.EnumMarshalSpec{Attribute: color.FgBlue, Value: "initialized"},
rdb.InstanceStatusDiskFull: &human.EnumMarshalSpec{Attribute: color.FgRed, Value: "disk_full"},
rdb.InstanceStatusBackuping: &human.EnumMarshalSpec{Attribute: color.FgBlue, Value: "backuping"},
}
)

type serverWaitRequest struct {
InstanceID string
Region scw.Region
Expand Down
16 changes: 16 additions & 0 deletions internal/namespaces/rdb/v1/custom_log.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package rdb

import (
"github.com/fatih/color"
"github.com/scaleway/scaleway-cli/internal/human"
"github.com/scaleway/scaleway-sdk-go/api/rdb/v1"
)

var (
logStatusMarshalSpecs = human.EnumMarshalSpecs{
rdb.InstanceLogStatusUnknown: &human.EnumMarshalSpec{Attribute: color.Faint, Value: "unknown"},
rdb.InstanceLogStatusReady: &human.EnumMarshalSpec{Attribute: color.FgGreen, Value: "ready"},
rdb.InstanceLogStatusCreating: &human.EnumMarshalSpec{Attribute: color.FgBlue, Value: "creating"},
rdb.InstanceLogStatusError: &human.EnumMarshalSpec{Attribute: color.FgRed, Value: "error"},
}
)