From b9ef28062947496cd3fb488b883a2cb98f4e7fff Mon Sep 17 00:00:00 2001 From: Andrew Nester Date: Mon, 5 Jun 2023 13:45:38 +0200 Subject: [PATCH 1/2] Do not use FgWhite and FgBlack for terminal output --- cmd/auth/profiles.go | 4 ++-- cmd/workspace/catalogs/overrides.go | 2 +- cmd/workspace/clusters/overrides.go | 4 ++-- cmd/workspace/dashboards/overrides.go | 2 +- cmd/workspace/external-locations/overrides.go | 2 +- cmd/workspace/jobs/overrides.go | 2 +- cmd/workspace/metastores/overrides.go | 4 ++-- cmd/workspace/queries/overrides.go | 4 ++-- cmd/workspace/query-history/overrides.go | 2 +- cmd/workspace/schemas/overrides.go | 4 ++-- cmd/workspace/secrets/overrides.go | 2 +- cmd/workspace/storage-credentials/overrides.go | 4 ++-- cmd/workspace/tables/overrides.go | 2 +- cmd/workspace/token-management/overrides.go | 4 ++-- cmd/workspace/tokens/overrides.go | 4 ++-- cmd/workspace/warehouses/overrides.go | 4 ++-- cmd/workspace/workspace/overrides.go | 4 ++-- libs/cmdio/render.go | 7 +++---- 18 files changed, 30 insertions(+), 31 deletions(-) diff --git a/cmd/auth/profiles.go b/cmd/auth/profiles.go index 465d45bfbe..4850716dd9 100644 --- a/cmd/auth/profiles.go +++ b/cmd/auth/profiles.go @@ -99,8 +99,8 @@ var profilesCmd = &cobra.Command{ Short: "Lists profiles from ~/.databrickscfg", Annotations: map[string]string{ "template": cmdio.Heredoc(` - {{white "Name"}} {{white "Host"}} {{white "Valid"}} - {{range .Profiles}}{{.Name | green}} {{.Host|white}} {{bool .Valid}} + {{"Name"}} {{"Host"}} {{"Valid"}} + {{range .Profiles}}{{.Name | green}} {{.Host}} {{bool .Valid}} {{end}}`), }, RunE: func(cmd *cobra.Command, args []string) error { diff --git a/cmd/workspace/catalogs/overrides.go b/cmd/workspace/catalogs/overrides.go index 574c957781..5dccba8223 100644 --- a/cmd/workspace/catalogs/overrides.go +++ b/cmd/workspace/catalogs/overrides.go @@ -4,7 +4,7 @@ import "github.com/databricks/cli/libs/cmdio" func init() { listCmd.Annotations["template"] = cmdio.Heredoc(` - {{white "Name"}} {{white "Type"}} {{white "Comment"}} + {{"Name"}} {{"Type"}} {{"Comment"}} {{range .}}{{.Name|green}} {{blue "%s" .CatalogType}} {{.Comment}} {{end}}`) } diff --git a/cmd/workspace/clusters/overrides.go b/cmd/workspace/clusters/overrides.go index f98ac5929c..0dad52cc09 100644 --- a/cmd/workspace/clusters/overrides.go +++ b/cmd/workspace/clusters/overrides.go @@ -4,8 +4,8 @@ import "github.com/databricks/cli/libs/cmdio" func init() { listCmd.Annotations["template"] = cmdio.Heredoc(` - {{white "ID"}} {{white "Name"}} {{white "State"}} - {{range .}}{{.ClusterId | green}} {{.ClusterName|white}} {{if eq .State "RUNNING"}}{{green "%s" .State}}{{else if eq .State "TERMINATED"}}{{red "%s" .State}}{{else}}{{blue "%s" .State}}{{end}} + {{"ID"}} {{"Name"}} {{"State"}} + {{range .}}{{.ClusterId | green}} {{.ClusterName}} {{if eq .State "RUNNING"}}{{green "%s" .State}}{{else if eq .State "TERMINATED"}}{{red "%s" .State}}{{else}}{{blue "%s" .State}}{{end}} {{end}}`) listNodeTypesCmd.Annotations["template"] = cmdio.Heredoc(` diff --git a/cmd/workspace/dashboards/overrides.go b/cmd/workspace/dashboards/overrides.go index 87bc14e4f8..544a832ee4 100644 --- a/cmd/workspace/dashboards/overrides.go +++ b/cmd/workspace/dashboards/overrides.go @@ -4,7 +4,7 @@ import "github.com/databricks/cli/libs/cmdio" func init() { listCmd.Annotations["template"] = cmdio.Heredoc(` - {{white "ID"}} {{white "Name"}} + {{"ID"}} {{"Name"}} {{range .}}{{.Id|green}} {{.Name}} {{end}}`) } diff --git a/cmd/workspace/external-locations/overrides.go b/cmd/workspace/external-locations/overrides.go index 7afd7da0c7..bcb4ec20b1 100644 --- a/cmd/workspace/external-locations/overrides.go +++ b/cmd/workspace/external-locations/overrides.go @@ -4,7 +4,7 @@ import "github.com/databricks/cli/libs/cmdio" func init() { listCmd.Annotations["template"] = cmdio.Heredoc(` - {{white "Name"}} {{white "Credential"}} {{white "URL"}} + {{"Name"}} {{"Credential"}} {{"URL"}} {{range .}}{{.Name|green}} {{.CredentialName|blue}} {{.Url}} {{end}}`) } diff --git a/cmd/workspace/jobs/overrides.go b/cmd/workspace/jobs/overrides.go index 103176cba3..28cf2203d3 100644 --- a/cmd/workspace/jobs/overrides.go +++ b/cmd/workspace/jobs/overrides.go @@ -8,7 +8,7 @@ func init() { {{end}}`) listRunsCmd.Annotations["template"] = cmdio.Heredoc(` - {{"Job ID"|white}} {{"Run ID"|white}} {{"Result State"|white}} URL + {{"Job ID"}} {{"Run ID"}} {{"Result State"}} URL {{range .}}{{green "%d" .JobId}} {{blue "%d" .RunId}} {{if eq .State.ResultState "SUCCESS"}}{{"SUCCESS"|green}}{{else}}{{red "%s" .State.ResultState}}{{end}} {{.RunPageUrl}} {{end}}`) } diff --git a/cmd/workspace/metastores/overrides.go b/cmd/workspace/metastores/overrides.go index d53675d021..b66b99091e 100644 --- a/cmd/workspace/metastores/overrides.go +++ b/cmd/workspace/metastores/overrides.go @@ -4,7 +4,7 @@ import "github.com/databricks/cli/libs/cmdio" func init() { listCmd.Annotations["template"] = cmdio.Heredoc(` - {{white "ID"}} {{white "Name"}} {{white "Region"}} - {{range .}}{{.MetastoreId|green}} {{.Name|white}} {{.Region}} + {{"ID"}} {{"Name"}} {{"Region"}} + {{range .}}{{.MetastoreId|green}} {{.Name}} {{.Region}} {{end}}`) } diff --git a/cmd/workspace/queries/overrides.go b/cmd/workspace/queries/overrides.go index cc22ffaeec..33880a4811 100644 --- a/cmd/workspace/queries/overrides.go +++ b/cmd/workspace/queries/overrides.go @@ -5,7 +5,7 @@ import "github.com/databricks/cli/libs/cmdio" func init() { // TODO: figure out colored/non-colored headers and colspan shifts listCmd.Annotations["template"] = cmdio.Heredoc(` - {{white "ID"}} {{white "Name"}} {{white "Author"}} - {{range .}}{{.Id|green}} {{.Name|white}} {{.User.Email|white}} + {{"ID"}} {{"Name"}} {{"Author"}} + {{range .}}{{.Id|green}} {{.Name}} {{.User.Email}} {{end}}`) } diff --git a/cmd/workspace/query-history/overrides.go b/cmd/workspace/query-history/overrides.go index 11f0d9c8d9..416966ddb9 100644 --- a/cmd/workspace/query-history/overrides.go +++ b/cmd/workspace/query-history/overrides.go @@ -5,6 +5,6 @@ import "github.com/databricks/cli/libs/cmdio" func init() { // TODO: figure out the right format listCmd.Annotations["template"] = cmdio.Heredoc(` - {{range .}}{{.UserName}} {{white "%s" .Status}} {{.QueryText}} + {{range .}}{{.UserName}} {{.Status}} {{.QueryText}} {{end}}`) } diff --git a/cmd/workspace/schemas/overrides.go b/cmd/workspace/schemas/overrides.go index fbf4bebcdf..47e679afb3 100644 --- a/cmd/workspace/schemas/overrides.go +++ b/cmd/workspace/schemas/overrides.go @@ -4,7 +4,7 @@ import "github.com/databricks/cli/libs/cmdio" func init() { listCmd.Annotations["template"] = cmdio.Heredoc(` - {{white "Full Name"}} {{white "Owner"}} {{white "Comment"}} - {{range .}}{{.FullName|green}} {{.Owner|white}} {{.Comment}} + {{"Full Name"}} {{"Owner"}} {{"Comment"}} + {{range .}}{{.FullName|green}} {{.Owner}} {{.Comment}} {{end}}`) } diff --git a/cmd/workspace/secrets/overrides.go b/cmd/workspace/secrets/overrides.go index e3ab714f4f..299f36424b 100644 --- a/cmd/workspace/secrets/overrides.go +++ b/cmd/workspace/secrets/overrides.go @@ -10,7 +10,7 @@ import ( func init() { listScopesCmd.Annotations["template"] = cmdio.Heredoc(` - {{white "Scope"}} {{white "Backend Type"}} + {{"Scope"}} {{"Backend Type"}} {{range .}}{{.Name|green}} {{.BackendType}} {{end}}`) diff --git a/cmd/workspace/storage-credentials/overrides.go b/cmd/workspace/storage-credentials/overrides.go index e9643d39bf..63d396f540 100644 --- a/cmd/workspace/storage-credentials/overrides.go +++ b/cmd/workspace/storage-credentials/overrides.go @@ -4,7 +4,7 @@ import "github.com/databricks/cli/libs/cmdio" func init() { listCmd.Annotations["template"] = cmdio.Heredoc(` - {{white "ID"}} {{white "Name"}} {{white "Credentials"}} - {{range .}}{{.Id|green}} {{.Name|white}} {{if .AwsIamRole}}{{.AwsIamRole.RoleArn}}{{end}}{{if .AzureServicePrincipal}}{{.AzureServicePrincipal.ApplicationId}}{{end}}{{if .GcpServiceAccountKey}}{{.Email}}{{end}} + {{"ID"}} {{"Name"}} {{"Credentials"}} + {{range .}}{{.Id|green}} {{.Name}} {{if .AwsIamRole}}{{.AwsIamRole.RoleArn}}{{end}}{{if .AzureServicePrincipal}}{{.AzureServicePrincipal.ApplicationId}}{{end}}{{if .GcpServiceAccountKey}}{{.Email}}{{end}} {{end}}`) } diff --git a/cmd/workspace/tables/overrides.go b/cmd/workspace/tables/overrides.go index 128821c233..c80c17afe1 100644 --- a/cmd/workspace/tables/overrides.go +++ b/cmd/workspace/tables/overrides.go @@ -4,7 +4,7 @@ import "github.com/databricks/cli/libs/cmdio" func init() { listCmd.Annotations["template"] = cmdio.Heredoc(` - {{white "Full Name"}} {{white "Table Type"}} + {{"Full Name"}} {{"Table Type"}} {{range .}}{{.FullName|green}} {{blue "%s" .TableType}} {{end}}`) } diff --git a/cmd/workspace/token-management/overrides.go b/cmd/workspace/token-management/overrides.go index ea3bbaf951..f8c1e506ed 100644 --- a/cmd/workspace/token-management/overrides.go +++ b/cmd/workspace/token-management/overrides.go @@ -4,7 +4,7 @@ import "github.com/databricks/cli/libs/cmdio" func init() { listCmd.Annotations["template"] = cmdio.Heredoc(` - {{white "ID"}} {{white "Created By"}} {{white "Comment"}} - {{range .}}{{.TokenId|green}} {{.CreatedByUsername|white}} {{.Comment|white}} + {{"ID"}} {{"Created By"}} {{"Comment"}} + {{range .}}{{.TokenId|green}} {{.CreatedByUsername}} {{.Comment}} {{end}}`) } diff --git a/cmd/workspace/tokens/overrides.go b/cmd/workspace/tokens/overrides.go index 8d9ba41f22..5f767f1363 100644 --- a/cmd/workspace/tokens/overrides.go +++ b/cmd/workspace/tokens/overrides.go @@ -4,7 +4,7 @@ import "github.com/databricks/cli/libs/cmdio" func init() { listCmd.Annotations["template"] = cmdio.Heredoc(` - {{white "ID"}} {{white "Expiry time"}} {{white "Comment"}} - {{range .}}{{.TokenId|green}} {{white "%d" .ExpiryTime}} {{.Comment|white}} + {{"ID"}} {{"Expiry time"}} {{"Comment"}} + {{range .}}{{.TokenId|green}} {{.ExpiryTime}} {{.Comment}} {{end}}`) } diff --git a/cmd/workspace/warehouses/overrides.go b/cmd/workspace/warehouses/overrides.go index 5f77233006..fa7468ddac 100644 --- a/cmd/workspace/warehouses/overrides.go +++ b/cmd/workspace/warehouses/overrides.go @@ -4,7 +4,7 @@ import "github.com/databricks/cli/libs/cmdio" func init() { listCmd.Annotations["template"] = cmdio.Heredoc(` - {{white "ID"}} {{white "Name"}} {{white "Size"}} {{white "State"}} - {{range .}}{{.Id|green}} {{.Name|white}} {{.ClusterSize|white}} {{if eq .State "RUNNING"}}{{"RUNNING"|green}}{{else if eq .State "STOPPED"}}{{"STOPPED"|red}}{{else}}{{blue "%s" .State}}{{end}} + {{"ID"}} {{"Name"}} {{"Size"}} {{"State"}} + {{range .}}{{.Id|green}} {{.Name}} {{.ClusterSize}} {{if eq .State "RUNNING"}}{{"RUNNING"|green}}{{else if eq .State "STOPPED"}}{{"STOPPED"|red}}{{else}}{{blue "%s" .State}}{{end}} {{end}}`) } diff --git a/cmd/workspace/workspace/overrides.go b/cmd/workspace/workspace/overrides.go index 611868905f..f4fdf4c989 100644 --- a/cmd/workspace/workspace/overrides.go +++ b/cmd/workspace/workspace/overrides.go @@ -5,7 +5,7 @@ import "github.com/databricks/cli/libs/cmdio" func init() { listReq.Path = "/" listCmd.Annotations["template"] = cmdio.Heredoc(` - {{white "ID"}} {{white "Type"}} {{white "Language"}} {{white "Path"}} - {{range .}}{{green "%d" .ObjectId}} {{blue "%s" .ObjectType}} {{cyan "%s" .Language}} {{.Path|white}} + {{"ID"}} {{"Type"}} {{"Language"}} {{"Path"}} + {{range .}}{{green "%d" .ObjectId}} {{blue "%s" .ObjectType}} {{cyan "%s" .Language}} {{.Path}} {{end}}`) } diff --git a/libs/cmdio/render.go b/libs/cmdio/render.go index 8aff2b8d2c..2cc7167618 100644 --- a/libs/cmdio/render.go +++ b/libs/cmdio/render.go @@ -58,8 +58,6 @@ func renderTemplate(w io.Writer, tmpl string, v any) error { // we render colored output if stdout is TTY, otherwise we render text. // in the future we'll check if we can explicitly check for stderr being // a TTY - "black": color.BlackString, - "white": color.WhiteString, "red": color.RedString, "green": color.GreenString, "blue": color.BlueString, @@ -107,8 +105,9 @@ func fancyJSON(v any) ([]byte, error) { f.FalseColor = color.New(color.FgRed) f.NumberColor = color.New(color.FgCyan) f.NullColor = color.New(color.FgMagenta) - f.FieldColor = color.New(color.FgWhite, color.Bold) - f.FieldQuoteColor = color.New(color.FgWhite) + f.ObjectColor = color.New(color.Reset) + f.CommaColor = color.New(color.Reset) + f.ColonColor = color.New(color.Reset) return jsoncolor.MarshalIndentWithFormatter(v, "", " ", f) } From d1c042f98c4d34dc7ff2ddce457a1104735be731 Mon Sep 17 00:00:00 2001 From: Andrew Nester Date: Mon, 5 Jun 2023 16:12:00 +0200 Subject: [PATCH 2/2] Fixed header alignment --- cmd/auth/profiles.go | 4 ++-- cmd/workspace/catalogs/overrides.go | 2 +- cmd/workspace/clusters/overrides.go | 4 ++-- cmd/workspace/dashboards/overrides.go | 2 +- cmd/workspace/external-locations/overrides.go | 4 ++-- cmd/workspace/jobs/overrides.go | 4 ++-- cmd/workspace/metastores/overrides.go | 4 ++-- cmd/workspace/queries/overrides.go | 4 ++-- cmd/workspace/query-history/overrides.go | 2 +- cmd/workspace/schemas/overrides.go | 4 ++-- cmd/workspace/secrets/overrides.go | 2 +- cmd/workspace/storage-credentials/overrides.go | 4 ++-- cmd/workspace/tables/overrides.go | 2 +- cmd/workspace/token-management/overrides.go | 4 ++-- cmd/workspace/tokens/overrides.go | 4 ++-- cmd/workspace/warehouses/overrides.go | 4 ++-- cmd/workspace/workspace/overrides.go | 4 ++-- libs/cmdio/render.go | 1 + 18 files changed, 30 insertions(+), 29 deletions(-) diff --git a/cmd/auth/profiles.go b/cmd/auth/profiles.go index 4850716dd9..d3b167b772 100644 --- a/cmd/auth/profiles.go +++ b/cmd/auth/profiles.go @@ -99,8 +99,8 @@ var profilesCmd = &cobra.Command{ Short: "Lists profiles from ~/.databrickscfg", Annotations: map[string]string{ "template": cmdio.Heredoc(` - {{"Name"}} {{"Host"}} {{"Valid"}} - {{range .Profiles}}{{.Name | green}} {{.Host}} {{bool .Valid}} + {{header "Name"}} {{header "Host"}} {{header "Valid"}} + {{range .Profiles}}{{.Name | green}} {{.Host|cyan}} {{bool .Valid}} {{end}}`), }, RunE: func(cmd *cobra.Command, args []string) error { diff --git a/cmd/workspace/catalogs/overrides.go b/cmd/workspace/catalogs/overrides.go index 5dccba8223..5b8cffea94 100644 --- a/cmd/workspace/catalogs/overrides.go +++ b/cmd/workspace/catalogs/overrides.go @@ -4,7 +4,7 @@ import "github.com/databricks/cli/libs/cmdio" func init() { listCmd.Annotations["template"] = cmdio.Heredoc(` - {{"Name"}} {{"Type"}} {{"Comment"}} + {{header "Name"}} {{header "Type"}} {{header "Comment"}} {{range .}}{{.Name|green}} {{blue "%s" .CatalogType}} {{.Comment}} {{end}}`) } diff --git a/cmd/workspace/clusters/overrides.go b/cmd/workspace/clusters/overrides.go index 0dad52cc09..1e8818952a 100644 --- a/cmd/workspace/clusters/overrides.go +++ b/cmd/workspace/clusters/overrides.go @@ -4,8 +4,8 @@ import "github.com/databricks/cli/libs/cmdio" func init() { listCmd.Annotations["template"] = cmdio.Heredoc(` - {{"ID"}} {{"Name"}} {{"State"}} - {{range .}}{{.ClusterId | green}} {{.ClusterName}} {{if eq .State "RUNNING"}}{{green "%s" .State}}{{else if eq .State "TERMINATED"}}{{red "%s" .State}}{{else}}{{blue "%s" .State}}{{end}} + {{header "ID"}} {{header "Name"}} {{header "State"}} + {{range .}}{{.ClusterId | green}} {{.ClusterName | cyan}} {{if eq .State "RUNNING"}}{{green "%s" .State}}{{else if eq .State "TERMINATED"}}{{red "%s" .State}}{{else}}{{blue "%s" .State}}{{end}} {{end}}`) listNodeTypesCmd.Annotations["template"] = cmdio.Heredoc(` diff --git a/cmd/workspace/dashboards/overrides.go b/cmd/workspace/dashboards/overrides.go index 544a832ee4..ba7e42ec76 100644 --- a/cmd/workspace/dashboards/overrides.go +++ b/cmd/workspace/dashboards/overrides.go @@ -4,7 +4,7 @@ import "github.com/databricks/cli/libs/cmdio" func init() { listCmd.Annotations["template"] = cmdio.Heredoc(` - {{"ID"}} {{"Name"}} + {{header "ID"}} {{header "Name"}} {{range .}}{{.Id|green}} {{.Name}} {{end}}`) } diff --git a/cmd/workspace/external-locations/overrides.go b/cmd/workspace/external-locations/overrides.go index bcb4ec20b1..7efd193d93 100644 --- a/cmd/workspace/external-locations/overrides.go +++ b/cmd/workspace/external-locations/overrides.go @@ -4,7 +4,7 @@ import "github.com/databricks/cli/libs/cmdio" func init() { listCmd.Annotations["template"] = cmdio.Heredoc(` - {{"Name"}} {{"Credential"}} {{"URL"}} - {{range .}}{{.Name|green}} {{.CredentialName|blue}} {{.Url}} + {{header "Name"}} {{header "Credential"}} {{header "URL"}} + {{range .}}{{.Name|green}} {{.CredentialName|cyan}} {{.Url}} {{end}}`) } diff --git a/cmd/workspace/jobs/overrides.go b/cmd/workspace/jobs/overrides.go index 28cf2203d3..93512c84a0 100644 --- a/cmd/workspace/jobs/overrides.go +++ b/cmd/workspace/jobs/overrides.go @@ -8,7 +8,7 @@ func init() { {{end}}`) listRunsCmd.Annotations["template"] = cmdio.Heredoc(` - {{"Job ID"}} {{"Run ID"}} {{"Result State"}} URL - {{range .}}{{green "%d" .JobId}} {{blue "%d" .RunId}} {{if eq .State.ResultState "SUCCESS"}}{{"SUCCESS"|green}}{{else}}{{red "%s" .State.ResultState}}{{end}} {{.RunPageUrl}} + {{header "Job ID"}} {{header "Run ID"}} {{header "Result State"}} URL + {{range .}}{{green "%d" .JobId}} {{cyan "%d" .RunId}} {{if eq .State.ResultState "SUCCESS"}}{{"SUCCESS"|green}}{{else}}{{red "%s" .State.ResultState}}{{end}} {{.RunPageUrl}} {{end}}`) } diff --git a/cmd/workspace/metastores/overrides.go b/cmd/workspace/metastores/overrides.go index b66b99091e..9d1c23ac2d 100644 --- a/cmd/workspace/metastores/overrides.go +++ b/cmd/workspace/metastores/overrides.go @@ -4,7 +4,7 @@ import "github.com/databricks/cli/libs/cmdio" func init() { listCmd.Annotations["template"] = cmdio.Heredoc(` - {{"ID"}} {{"Name"}} {{"Region"}} - {{range .}}{{.MetastoreId|green}} {{.Name}} {{.Region}} + {{header "ID"}} {{header "Name"}} {{"Region"}} + {{range .}}{{.MetastoreId|green}} {{.Name|cyan}} {{.Region}} {{end}}`) } diff --git a/cmd/workspace/queries/overrides.go b/cmd/workspace/queries/overrides.go index 33880a4811..86f47388ec 100644 --- a/cmd/workspace/queries/overrides.go +++ b/cmd/workspace/queries/overrides.go @@ -5,7 +5,7 @@ import "github.com/databricks/cli/libs/cmdio" func init() { // TODO: figure out colored/non-colored headers and colspan shifts listCmd.Annotations["template"] = cmdio.Heredoc(` - {{"ID"}} {{"Name"}} {{"Author"}} - {{range .}}{{.Id|green}} {{.Name}} {{.User.Email}} + {{header "ID"}} {{header "Name"}} {{header "Author"}} + {{range .}}{{.Id|green}} {{.Name|cyan}} {{.User.Email|cyan}} {{end}}`) } diff --git a/cmd/workspace/query-history/overrides.go b/cmd/workspace/query-history/overrides.go index 416966ddb9..7e70206972 100644 --- a/cmd/workspace/query-history/overrides.go +++ b/cmd/workspace/query-history/overrides.go @@ -5,6 +5,6 @@ import "github.com/databricks/cli/libs/cmdio" func init() { // TODO: figure out the right format listCmd.Annotations["template"] = cmdio.Heredoc(` - {{range .}}{{.UserName}} {{.Status}} {{.QueryText}} + {{range .}}{{.UserName}} {{cyan "%s" .Status}} {{.QueryText}} {{end}}`) } diff --git a/cmd/workspace/schemas/overrides.go b/cmd/workspace/schemas/overrides.go index 47e679afb3..4ff8bf1248 100644 --- a/cmd/workspace/schemas/overrides.go +++ b/cmd/workspace/schemas/overrides.go @@ -4,7 +4,7 @@ import "github.com/databricks/cli/libs/cmdio" func init() { listCmd.Annotations["template"] = cmdio.Heredoc(` - {{"Full Name"}} {{"Owner"}} {{"Comment"}} - {{range .}}{{.FullName|green}} {{.Owner}} {{.Comment}} + {{header "Full Name"}} {{header "Owner"}} {{header "Comment"}} + {{range .}}{{.FullName|green}} {{.Owner|cyan}} {{.Comment}} {{end}}`) } diff --git a/cmd/workspace/secrets/overrides.go b/cmd/workspace/secrets/overrides.go index 299f36424b..d46284bf6a 100644 --- a/cmd/workspace/secrets/overrides.go +++ b/cmd/workspace/secrets/overrides.go @@ -10,7 +10,7 @@ import ( func init() { listScopesCmd.Annotations["template"] = cmdio.Heredoc(` - {{"Scope"}} {{"Backend Type"}} + {{header "Scope"}} {{header "Backend Type"}} {{range .}}{{.Name|green}} {{.BackendType}} {{end}}`) diff --git a/cmd/workspace/storage-credentials/overrides.go b/cmd/workspace/storage-credentials/overrides.go index 63d396f540..8bce9ffa2f 100644 --- a/cmd/workspace/storage-credentials/overrides.go +++ b/cmd/workspace/storage-credentials/overrides.go @@ -4,7 +4,7 @@ import "github.com/databricks/cli/libs/cmdio" func init() { listCmd.Annotations["template"] = cmdio.Heredoc(` - {{"ID"}} {{"Name"}} {{"Credentials"}} - {{range .}}{{.Id|green}} {{.Name}} {{if .AwsIamRole}}{{.AwsIamRole.RoleArn}}{{end}}{{if .AzureServicePrincipal}}{{.AzureServicePrincipal.ApplicationId}}{{end}}{{if .GcpServiceAccountKey}}{{.Email}}{{end}} + {{header "ID"}} {{header "Name"}} {{header "Credentials"}} + {{range .}}{{.Id|green}} {{.Name|cyan}} {{if .AwsIamRole}}{{.AwsIamRole.RoleArn}}{{end}}{{if .AzureServicePrincipal}}{{.AzureServicePrincipal.ApplicationId}}{{end}}{{if .GcpServiceAccountKey}}{{.Email}}{{end}} {{end}}`) } diff --git a/cmd/workspace/tables/overrides.go b/cmd/workspace/tables/overrides.go index c80c17afe1..ed9c86ed5e 100644 --- a/cmd/workspace/tables/overrides.go +++ b/cmd/workspace/tables/overrides.go @@ -4,7 +4,7 @@ import "github.com/databricks/cli/libs/cmdio" func init() { listCmd.Annotations["template"] = cmdio.Heredoc(` - {{"Full Name"}} {{"Table Type"}} + {{header "Full Name"}} {{header "Table Type"}} {{range .}}{{.FullName|green}} {{blue "%s" .TableType}} {{end}}`) } diff --git a/cmd/workspace/token-management/overrides.go b/cmd/workspace/token-management/overrides.go index f8c1e506ed..2070e2a2b1 100644 --- a/cmd/workspace/token-management/overrides.go +++ b/cmd/workspace/token-management/overrides.go @@ -4,7 +4,7 @@ import "github.com/databricks/cli/libs/cmdio" func init() { listCmd.Annotations["template"] = cmdio.Heredoc(` - {{"ID"}} {{"Created By"}} {{"Comment"}} - {{range .}}{{.TokenId|green}} {{.CreatedByUsername}} {{.Comment}} + {{header "ID"}} {{header "Created By"}} {{header "Comment"}} + {{range .}}{{.TokenId|green}} {{.CreatedByUsername|cyan}} {{.Comment|cyan}} {{end}}`) } diff --git a/cmd/workspace/tokens/overrides.go b/cmd/workspace/tokens/overrides.go index 5f767f1363..b5673c0e9e 100644 --- a/cmd/workspace/tokens/overrides.go +++ b/cmd/workspace/tokens/overrides.go @@ -4,7 +4,7 @@ import "github.com/databricks/cli/libs/cmdio" func init() { listCmd.Annotations["template"] = cmdio.Heredoc(` - {{"ID"}} {{"Expiry time"}} {{"Comment"}} - {{range .}}{{.TokenId|green}} {{.ExpiryTime}} {{.Comment}} + {{header "ID"}} {{header "Expiry time"}} {{header "Comment"}} + {{range .}}{{.TokenId|green}} {{cyan "%d" .ExpiryTime}} {{.Comment|cyan}} {{end}}`) } diff --git a/cmd/workspace/warehouses/overrides.go b/cmd/workspace/warehouses/overrides.go index fa7468ddac..82319d6fc9 100644 --- a/cmd/workspace/warehouses/overrides.go +++ b/cmd/workspace/warehouses/overrides.go @@ -4,7 +4,7 @@ import "github.com/databricks/cli/libs/cmdio" func init() { listCmd.Annotations["template"] = cmdio.Heredoc(` - {{"ID"}} {{"Name"}} {{"Size"}} {{"State"}} - {{range .}}{{.Id|green}} {{.Name}} {{.ClusterSize}} {{if eq .State "RUNNING"}}{{"RUNNING"|green}}{{else if eq .State "STOPPED"}}{{"STOPPED"|red}}{{else}}{{blue "%s" .State}}{{end}} + {{header "ID"}} {{header "Name"}} {{header "Size"}} {{header "State"}} + {{range .}}{{.Id|green}} {{.Name|cyan}} {{.ClusterSize|cyan}} {{if eq .State "RUNNING"}}{{"RUNNING"|green}}{{else if eq .State "STOPPED"}}{{"STOPPED"|red}}{{else}}{{blue "%s" .State}}{{end}} {{end}}`) } diff --git a/cmd/workspace/workspace/overrides.go b/cmd/workspace/workspace/overrides.go index f4fdf4c989..0a00ba2595 100644 --- a/cmd/workspace/workspace/overrides.go +++ b/cmd/workspace/workspace/overrides.go @@ -5,7 +5,7 @@ import "github.com/databricks/cli/libs/cmdio" func init() { listReq.Path = "/" listCmd.Annotations["template"] = cmdio.Heredoc(` - {{"ID"}} {{"Type"}} {{"Language"}} {{"Path"}} - {{range .}}{{green "%d" .ObjectId}} {{blue "%s" .ObjectType}} {{cyan "%s" .Language}} {{.Path}} + {{header "ID"}} {{header "Type"}} {{header "Language"}} {{header "Path"}} + {{range .}}{{green "%d" .ObjectId}} {{blue "%s" .ObjectType}} {{cyan "%s" .Language}} {{.Path|cyan}} {{end}}`) } diff --git a/libs/cmdio/render.go b/libs/cmdio/render.go index 2cc7167618..4ffd563fab 100644 --- a/libs/cmdio/render.go +++ b/libs/cmdio/render.go @@ -58,6 +58,7 @@ func renderTemplate(w io.Writer, tmpl string, v any) error { // we render colored output if stdout is TTY, otherwise we render text. // in the future we'll check if we can explicitly check for stderr being // a TTY + "header": color.BlueString, "red": color.RedString, "green": color.GreenString, "blue": color.BlueString,