diff --git a/opencloud/pkg/command/benchmark.go b/opencloud/pkg/command/benchmark.go index d7104eba9..be9589e17 100644 --- a/opencloud/pkg/command/benchmark.go +++ b/opencloud/pkg/command/benchmark.go @@ -14,7 +14,8 @@ import ( "strings" "time" - tw "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter/tw" "github.com/opencloud-eu/opencloud/opencloud/pkg/register" "github.com/opencloud-eu/opencloud/pkg/config" "github.com/opencloud-eu/opencloud/pkg/version" @@ -403,11 +404,24 @@ func benchmark(iterations int, path string) error { fmt.Printf("Iterations: %d\n", iterations) fmt.Println("") - table := tw.NewWriter(os.Stdout) - table.SetHeader([]string{"Test", "Iterations", "dur/it", "total"}) - table.SetAutoFormatHeaders(false) - table.SetColumnAlignment([]int{tw.ALIGN_LEFT, tw.ALIGN_RIGHT, tw.ALIGN_RIGHT, tw.ALIGN_RIGHT}) - table.SetAutoMergeCellsByColumnIndex([]int{2, 3}) + cfg := tablewriter.Config{ + Header: tw.CellConfig{ + Formatting: tw.CellFormatting{ + AutoFormat: tw.Off, + }, + }, + Row: tw.CellConfig{ + ColumnAligns: []tw.Align{ + tw.AlignLeft, + tw.AlignRight, + tw.AlignRight, + tw.AlignRight, + }, + }, + } + + table := tablewriter.NewTable(os.Stdout, tablewriter.WithConfig(cfg)) + table.Header([]string{"Test", "Iterations", "dur/it", "total"}) for _, t := range []string{"lockedfile open(wo,c,t) close", "stat", "fopen(wo,t) write close", "fopen(ro) close", "fopen(ro) read close", "xattr-set", "xattr-get"} { start := time.Now() err := tests[t]() diff --git a/opencloud/pkg/command/version.go b/opencloud/pkg/command/version.go index 3c8ac1de2..e9303a2ca 100644 --- a/opencloud/pkg/command/version.go +++ b/opencloud/pkg/command/version.go @@ -4,7 +4,8 @@ import ( "fmt" "os" - tw "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter/tw" "github.com/urfave/cli/v2" mreg "go-micro.dev/v4/registry" @@ -62,9 +63,8 @@ func VersionCommand(cfg *config.Config) *cli.Command { return nil } - table := tw.NewWriter(os.Stdout) - table.SetHeader([]string{"Version", "Address", "Id"}) - table.SetAutoFormatHeaders(false) + table := tablewriter.NewTable(os.Stdout, tablewriter.WithHeaderAutoFormat(tw.Off)) + table.Header([]string{"Version", "Address", "Id"}) for _, s := range services { for _, n := range s.Nodes { table.Append([]string{s.Version, n.Address, n.Id}) diff --git a/opencloud/pkg/runtime/service/service.go b/opencloud/pkg/runtime/service/service.go index 0220154e4..4025c608d 100644 --- a/opencloud/pkg/runtime/service/service.go +++ b/opencloud/pkg/runtime/service/service.go @@ -480,8 +480,8 @@ func (s *Service) generateRunSet(cfg *occfg.Config) { // List running processes for the Service Controller. func (s *Service) List(_ struct{}, reply *string) error { tableString := &strings.Builder{} - table := tablewriter.NewWriter(tableString) - table.SetHeader([]string{"Service"}) + table := tablewriter.NewTable(tableString) + table.Header([]string{"Service"}) names := []string{} for t := range s.serviceToken { diff --git a/services/app-provider/pkg/command/version.go b/services/app-provider/pkg/command/version.go index 865743471..f4bf84b63 100644 --- a/services/app-provider/pkg/command/version.go +++ b/services/app-provider/pkg/command/version.go @@ -7,7 +7,8 @@ import ( "github.com/opencloud-eu/opencloud/pkg/registry" "github.com/opencloud-eu/opencloud/pkg/version" - tw "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter/tw" "github.com/opencloud-eu/opencloud/services/app-provider/pkg/config" "github.com/urfave/cli/v2" ) @@ -35,9 +36,8 @@ func Version(cfg *config.Config) *cli.Command { return nil } - table := tw.NewWriter(os.Stdout) - table.SetHeader([]string{"Version", "Address", "Id"}) - table.SetAutoFormatHeaders(false) + table := tablewriter.NewTable(os.Stdout, tablewriter.WithHeaderAutoFormat(tw.Off)) + table.Header([]string{"Version", "Address", "Id"}) for _, s := range services { for _, n := range s.Nodes { table.Append([]string{s.Version, n.Address, n.Id}) diff --git a/services/app-registry/pkg/command/version.go b/services/app-registry/pkg/command/version.go index d41df027d..4ee4afde7 100644 --- a/services/app-registry/pkg/command/version.go +++ b/services/app-registry/pkg/command/version.go @@ -7,7 +7,8 @@ import ( "github.com/opencloud-eu/opencloud/pkg/registry" "github.com/opencloud-eu/opencloud/pkg/version" - tw "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter/tw" "github.com/opencloud-eu/opencloud/services/app-registry/pkg/config" "github.com/urfave/cli/v2" ) @@ -35,9 +36,8 @@ func Version(cfg *config.Config) *cli.Command { return nil } - table := tw.NewWriter(os.Stdout) - table.SetHeader([]string{"Version", "Address", "Id"}) - table.SetAutoFormatHeaders(false) + table := tablewriter.NewTable(os.Stdout, tablewriter.WithHeaderAutoFormat(tw.Off)) + table.Header([]string{"Version", "Address", "Id"}) for _, s := range services { for _, n := range s.Nodes { table.Append([]string{s.Version, n.Address, n.Id}) diff --git a/services/auth-app/pkg/command/version.go b/services/auth-app/pkg/command/version.go index 9b6c2b3d2..42b2c757a 100644 --- a/services/auth-app/pkg/command/version.go +++ b/services/auth-app/pkg/command/version.go @@ -7,7 +7,8 @@ import ( "github.com/opencloud-eu/opencloud/pkg/registry" "github.com/opencloud-eu/opencloud/pkg/version" - tw "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter/tw" "github.com/opencloud-eu/opencloud/services/auth-app/pkg/config" "github.com/urfave/cli/v2" ) @@ -35,9 +36,8 @@ func Version(cfg *config.Config) *cli.Command { return nil } - table := tw.NewWriter(os.Stdout) - table.SetHeader([]string{"Version", "Address", "Id"}) - table.SetAutoFormatHeaders(false) + table := tablewriter.NewTable(os.Stdout, tablewriter.WithHeaderAutoFormat(tw.Off)) + table.Header([]string{"Version", "Address", "Id"}) for _, s := range services { for _, n := range s.Nodes { table.Append([]string{s.Version, n.Address, n.Id}) diff --git a/services/auth-basic/pkg/command/version.go b/services/auth-basic/pkg/command/version.go index bc4185d89..1bf553f60 100644 --- a/services/auth-basic/pkg/command/version.go +++ b/services/auth-basic/pkg/command/version.go @@ -7,7 +7,8 @@ import ( "github.com/opencloud-eu/opencloud/pkg/registry" "github.com/opencloud-eu/opencloud/pkg/version" - tw "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter/tw" "github.com/opencloud-eu/opencloud/services/auth-basic/pkg/config" "github.com/urfave/cli/v2" ) @@ -35,9 +36,8 @@ func Version(cfg *config.Config) *cli.Command { return nil } - table := tw.NewWriter(os.Stdout) - table.SetHeader([]string{"Version", "Address", "Id"}) - table.SetAutoFormatHeaders(false) + table := tablewriter.NewTable(os.Stdout, tablewriter.WithHeaderAutoFormat(tw.Off)) + table.Header([]string{"Version", "Address", "Id"}) for _, s := range services { for _, n := range s.Nodes { table.Append([]string{s.Version, n.Address, n.Id}) diff --git a/services/auth-bearer/pkg/command/version.go b/services/auth-bearer/pkg/command/version.go index 1ecc7e9eb..28c40cb01 100644 --- a/services/auth-bearer/pkg/command/version.go +++ b/services/auth-bearer/pkg/command/version.go @@ -7,7 +7,8 @@ import ( "github.com/opencloud-eu/opencloud/pkg/registry" "github.com/opencloud-eu/opencloud/pkg/version" - tw "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter/tw" "github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/config" "github.com/urfave/cli/v2" ) @@ -35,9 +36,8 @@ func Version(cfg *config.Config) *cli.Command { return nil } - table := tw.NewWriter(os.Stdout) - table.SetHeader([]string{"Version", "Address", "Id"}) - table.SetAutoFormatHeaders(false) + table := tablewriter.NewTable(os.Stdout, tablewriter.WithHeaderAutoFormat(tw.Off)) + table.Header([]string{"Version", "Address", "Id"}) for _, s := range services { for _, n := range s.Nodes { table.Append([]string{s.Version, n.Address, n.Id}) diff --git a/services/auth-machine/pkg/command/version.go b/services/auth-machine/pkg/command/version.go index 3f7eaf2c7..2f7659b5c 100644 --- a/services/auth-machine/pkg/command/version.go +++ b/services/auth-machine/pkg/command/version.go @@ -7,7 +7,8 @@ import ( "github.com/opencloud-eu/opencloud/pkg/registry" "github.com/opencloud-eu/opencloud/pkg/version" - tw "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter/tw" "github.com/opencloud-eu/opencloud/services/auth-machine/pkg/config" "github.com/urfave/cli/v2" ) @@ -35,9 +36,8 @@ func Version(cfg *config.Config) *cli.Command { return nil } - table := tw.NewWriter(os.Stdout) - table.SetHeader([]string{"Version", "Address", "Id"}) - table.SetAutoFormatHeaders(false) + table := tablewriter.NewTable(os.Stdout, tablewriter.WithHeaderAutoFormat(tw.Off)) + table.Header([]string{"Version", "Address", "Id"}) for _, s := range services { for _, n := range s.Nodes { table.Append([]string{s.Version, n.Address, n.Id}) diff --git a/services/auth-service/pkg/command/version.go b/services/auth-service/pkg/command/version.go index a6af596e7..0f3656b3d 100644 --- a/services/auth-service/pkg/command/version.go +++ b/services/auth-service/pkg/command/version.go @@ -7,7 +7,8 @@ import ( "github.com/opencloud-eu/opencloud/pkg/registry" "github.com/opencloud-eu/opencloud/pkg/version" - tw "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter/tw" "github.com/opencloud-eu/opencloud/services/auth-service/pkg/config" "github.com/urfave/cli/v2" ) @@ -35,9 +36,8 @@ func Version(cfg *config.Config) *cli.Command { return nil } - table := tw.NewWriter(os.Stdout) - table.SetHeader([]string{"Version", "Address", "Id"}) - table.SetAutoFormatHeaders(false) + table := tablewriter.NewTable(os.Stdout, tablewriter.WithHeaderAutoFormat(tw.Off)) + table.Header([]string{"Version", "Address", "Id"}) for _, s := range services { for _, n := range s.Nodes { table.Append([]string{s.Version, n.Address, n.Id}) diff --git a/services/collaboration/pkg/command/version.go b/services/collaboration/pkg/command/version.go index 9ef93e179..a001041c2 100644 --- a/services/collaboration/pkg/command/version.go +++ b/services/collaboration/pkg/command/version.go @@ -7,7 +7,8 @@ import ( "github.com/opencloud-eu/opencloud/pkg/registry" "github.com/opencloud-eu/opencloud/pkg/version" - tw "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter/tw" "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config" "github.com/urfave/cli/v2" ) @@ -35,9 +36,8 @@ func Version(cfg *config.Config) *cli.Command { return nil } - table := tw.NewWriter(os.Stdout) - table.SetHeader([]string{"Version", "Address", "Id"}) - table.SetAutoFormatHeaders(false) + table := tablewriter.NewTable(os.Stdout, tablewriter.WithHeaderAutoFormat(tw.Off)) + table.Header([]string{"Version", "Address", "Id"}) for _, s := range services { for _, n := range s.Nodes { table.Append([]string{s.Version, n.Address, n.Id}) diff --git a/services/frontend/pkg/command/version.go b/services/frontend/pkg/command/version.go index 9c320f047..71d7c7260 100644 --- a/services/frontend/pkg/command/version.go +++ b/services/frontend/pkg/command/version.go @@ -7,7 +7,8 @@ import ( "github.com/opencloud-eu/opencloud/pkg/registry" "github.com/opencloud-eu/opencloud/pkg/version" - tw "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter/tw" "github.com/opencloud-eu/opencloud/services/frontend/pkg/config" "github.com/urfave/cli/v2" ) @@ -35,9 +36,8 @@ func Version(cfg *config.Config) *cli.Command { return nil } - table := tw.NewWriter(os.Stdout) - table.SetHeader([]string{"Version", "Address", "Id"}) - table.SetAutoFormatHeaders(false) + table := tablewriter.NewTable(os.Stdout, tablewriter.WithHeaderAutoFormat(tw.Off)) + table.Header([]string{"Version", "Address", "Id"}) for _, s := range services { for _, n := range s.Nodes { table.Append([]string{s.Version, n.Address, n.Id}) diff --git a/services/gateway/pkg/command/version.go b/services/gateway/pkg/command/version.go index 0663f1911..903269ee1 100644 --- a/services/gateway/pkg/command/version.go +++ b/services/gateway/pkg/command/version.go @@ -7,7 +7,8 @@ import ( "github.com/opencloud-eu/opencloud/pkg/registry" "github.com/opencloud-eu/opencloud/pkg/version" - tw "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter/tw" "github.com/opencloud-eu/opencloud/services/gateway/pkg/config" "github.com/urfave/cli/v2" ) @@ -35,9 +36,8 @@ func Version(cfg *config.Config) *cli.Command { return nil } - table := tw.NewWriter(os.Stdout) - table.SetHeader([]string{"Version", "Address", "Id"}) - table.SetAutoFormatHeaders(false) + table := tablewriter.NewTable(os.Stdout, tablewriter.WithHeaderAutoFormat(tw.Off)) + table.Header([]string{"Version", "Address", "Id"}) for _, s := range services { for _, n := range s.Nodes { table.Append([]string{s.Version, n.Address, n.Id}) diff --git a/services/graph/pkg/command/unified_roles.go b/services/graph/pkg/command/unified_roles.go index 140e16ab1..6df9f9703 100644 --- a/services/graph/pkg/command/unified_roles.go +++ b/services/graph/pkg/command/unified_roles.go @@ -6,6 +6,8 @@ import ( "strings" "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter/renderer" + "github.com/olekukonko/tablewriter/tw" "github.com/urfave/cli/v2" "github.com/opencloud-eu/opencloud/pkg/config/configlog" @@ -54,12 +56,17 @@ func listUnifiedRoles(cfg *config.Config) *cli.Command { Name: "list", Usage: "list available unified roles", Action: func(c *cli.Context) error { - tbl := tablewriter.NewWriter(os.Stdout) - tbl.SetRowLine(true) - tbl.SetAutoMergeCellsByColumnIndex([]int{0}) // rowspan should only affect the first column + r := tw.Rendition{ + Settings: tw.Settings{ + Separators: tw.Separators{ + BetweenRows: tw.On, + }, + }, + } + tbl := tablewriter.NewTable(os.Stdout, tablewriter.WithRenderer(renderer.NewBlueprint(r))) headers := []string{"Name", "UID", "Enabled", "Description", "Condition", "Allowed resource actions"} - tbl.SetHeader(headers) + tbl.Header(headers) for _, definition := range unifiedrole.GetRoles(unifiedrole.RoleFilterAll()) { const enabled = "enabled" diff --git a/services/graph/pkg/command/version.go b/services/graph/pkg/command/version.go index fca1bb8d3..ac418dc33 100644 --- a/services/graph/pkg/command/version.go +++ b/services/graph/pkg/command/version.go @@ -7,7 +7,8 @@ import ( "github.com/opencloud-eu/opencloud/pkg/registry" "github.com/opencloud-eu/opencloud/pkg/version" - tw "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter/tw" "github.com/opencloud-eu/opencloud/services/graph/pkg/config" "github.com/urfave/cli/v2" ) @@ -35,9 +36,8 @@ func Version(cfg *config.Config) *cli.Command { return nil } - table := tw.NewWriter(os.Stdout) - table.SetHeader([]string{"Version", "Address", "Id"}) - table.SetAutoFormatHeaders(false) + table := tablewriter.NewTable(os.Stdout, tablewriter.WithHeaderAutoFormat(tw.Off)) + table.Header([]string{"Version", "Address", "Id"}) for _, s := range services { for _, n := range s.Nodes { table.Append([]string{s.Version, n.Address, n.Id}) diff --git a/services/groups/pkg/command/version.go b/services/groups/pkg/command/version.go index 50f725c38..3c6493b3c 100644 --- a/services/groups/pkg/command/version.go +++ b/services/groups/pkg/command/version.go @@ -7,7 +7,8 @@ import ( "github.com/opencloud-eu/opencloud/pkg/registry" "github.com/opencloud-eu/opencloud/pkg/version" - tw "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter/tw" "github.com/opencloud-eu/opencloud/services/groups/pkg/config" "github.com/urfave/cli/v2" ) @@ -35,9 +36,8 @@ func Version(cfg *config.Config) *cli.Command { return nil } - table := tw.NewWriter(os.Stdout) - table.SetHeader([]string{"Version", "Address", "Id"}) - table.SetAutoFormatHeaders(false) + table := tablewriter.NewTable(os.Stdout, tablewriter.WithHeaderAutoFormat(tw.Off)) + table.Header([]string{"Version", "Address", "Id"}) for _, s := range services { for _, n := range s.Nodes { table.Append([]string{s.Version, n.Address, n.Id}) diff --git a/services/idp/pkg/command/version.go b/services/idp/pkg/command/version.go index 97257a9f8..6a5982bed 100644 --- a/services/idp/pkg/command/version.go +++ b/services/idp/pkg/command/version.go @@ -7,7 +7,8 @@ import ( "github.com/opencloud-eu/opencloud/pkg/registry" "github.com/opencloud-eu/opencloud/pkg/version" - tw "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter/tw" "github.com/opencloud-eu/opencloud/services/idp/pkg/config" "github.com/urfave/cli/v2" ) @@ -35,9 +36,8 @@ func Version(cfg *config.Config) *cli.Command { return nil } - table := tw.NewWriter(os.Stdout) - table.SetHeader([]string{"Version", "Address", "Id"}) - table.SetAutoFormatHeaders(false) + table := tablewriter.NewTable(os.Stdout, tablewriter.WithHeaderAutoFormat(tw.Off)) + table.Header([]string{"Version", "Address", "Id"}) for _, s := range services { for _, n := range s.Nodes { table.Append([]string{s.Version, n.Address, n.Id}) diff --git a/services/invitations/pkg/command/version.go b/services/invitations/pkg/command/version.go index 3d79f476d..ffbfbce20 100644 --- a/services/invitations/pkg/command/version.go +++ b/services/invitations/pkg/command/version.go @@ -7,7 +7,8 @@ import ( "github.com/opencloud-eu/opencloud/pkg/registry" "github.com/opencloud-eu/opencloud/pkg/version" - tw "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter/tw" "github.com/opencloud-eu/opencloud/services/invitations/pkg/config" "github.com/urfave/cli/v2" ) @@ -35,9 +36,8 @@ func Version(cfg *config.Config) *cli.Command { return nil } - table := tw.NewWriter(os.Stdout) - table.SetHeader([]string{"Version", "Address", "Id"}) - table.SetAutoFormatHeaders(false) + table := tablewriter.NewTable(os.Stdout, tablewriter.WithHeaderAutoFormat(tw.Off)) + table.Header([]string{"Version", "Address", "Id"}) for _, s := range services { for _, n := range s.Nodes { table.Append([]string{s.Version, n.Address, n.Id}) diff --git a/services/ocdav/pkg/command/version.go b/services/ocdav/pkg/command/version.go index 4a8c515cc..ecc31c43e 100644 --- a/services/ocdav/pkg/command/version.go +++ b/services/ocdav/pkg/command/version.go @@ -7,7 +7,8 @@ import ( "github.com/opencloud-eu/opencloud/pkg/registry" "github.com/opencloud-eu/opencloud/pkg/version" - tw "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter/tw" "github.com/opencloud-eu/opencloud/services/ocdav/pkg/config" "github.com/urfave/cli/v2" ) @@ -35,9 +36,8 @@ func Version(cfg *config.Config) *cli.Command { return nil } - table := tw.NewWriter(os.Stdout) - table.SetHeader([]string{"Version", "Address", "Id"}) - table.SetAutoFormatHeaders(false) + table := tablewriter.NewTable(os.Stdout, tablewriter.WithHeaderAutoFormat(tw.Off)) + table.Header([]string{"Version", "Address", "Id"}) for _, s := range services { for _, n := range s.Nodes { table.Append([]string{s.Version, n.Address, n.Id}) diff --git a/services/ocs/pkg/command/version.go b/services/ocs/pkg/command/version.go index e11fc599c..5961aead4 100644 --- a/services/ocs/pkg/command/version.go +++ b/services/ocs/pkg/command/version.go @@ -7,7 +7,8 @@ import ( "github.com/opencloud-eu/opencloud/pkg/registry" "github.com/opencloud-eu/opencloud/pkg/version" - tw "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter/tw" "github.com/opencloud-eu/opencloud/services/ocs/pkg/config" "github.com/urfave/cli/v2" ) @@ -35,9 +36,8 @@ func Version(cfg *config.Config) *cli.Command { return nil } - table := tw.NewWriter(os.Stdout) - table.SetHeader([]string{"Version", "Address", "Id"}) - table.SetAutoFormatHeaders(false) + table := tablewriter.NewTable(os.Stdout, tablewriter.WithHeaderAutoFormat(tw.Off)) + table.Header([]string{"Version", "Address", "Id"}) for _, s := range services { for _, n := range s.Nodes { table.Append([]string{s.Version, n.Address, n.Id}) diff --git a/services/policies/pkg/command/version.go b/services/policies/pkg/command/version.go index 561fc7de8..2886e9ee8 100644 --- a/services/policies/pkg/command/version.go +++ b/services/policies/pkg/command/version.go @@ -7,7 +7,8 @@ import ( "github.com/opencloud-eu/opencloud/pkg/registry" "github.com/opencloud-eu/opencloud/pkg/version" - tw "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter/tw" "github.com/opencloud-eu/opencloud/services/policies/pkg/config" "github.com/urfave/cli/v2" ) @@ -35,9 +36,8 @@ func Version(cfg *config.Config) *cli.Command { return nil } - table := tw.NewWriter(os.Stdout) - table.SetHeader([]string{"Version", "Address", "Id"}) - table.SetAutoFormatHeaders(false) + table := tablewriter.NewTable(os.Stdout, tablewriter.WithHeaderAutoFormat(tw.Off)) + table.Header([]string{"Version", "Address", "Id"}) for _, s := range services { for _, n := range s.Nodes { table.Append([]string{s.Version, n.Address, n.Id}) diff --git a/services/proxy/pkg/command/version.go b/services/proxy/pkg/command/version.go index ac6529365..951c96a1f 100644 --- a/services/proxy/pkg/command/version.go +++ b/services/proxy/pkg/command/version.go @@ -7,7 +7,8 @@ import ( "github.com/opencloud-eu/opencloud/pkg/registry" "github.com/opencloud-eu/opencloud/pkg/version" - tw "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter/tw" "github.com/opencloud-eu/opencloud/services/proxy/pkg/config" "github.com/urfave/cli/v2" ) @@ -35,9 +36,8 @@ func Version(cfg *config.Config) *cli.Command { return nil } - table := tw.NewWriter(os.Stdout) - table.SetHeader([]string{"Version", "Address", "Id"}) - table.SetAutoFormatHeaders(false) + table := tablewriter.NewTable(os.Stdout, tablewriter.WithHeaderAutoFormat(tw.Off)) + table.Header([]string{"Version", "Address", "Id"}) for _, s := range services { for _, n := range s.Nodes { table.Append([]string{s.Version, n.Address, n.Id}) diff --git a/services/search/pkg/command/version.go b/services/search/pkg/command/version.go index 437ab50c1..4ee3da64e 100644 --- a/services/search/pkg/command/version.go +++ b/services/search/pkg/command/version.go @@ -7,7 +7,8 @@ import ( "github.com/opencloud-eu/opencloud/pkg/registry" "github.com/opencloud-eu/opencloud/pkg/version" - tw "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter/tw" "github.com/opencloud-eu/opencloud/services/search/pkg/config" "github.com/urfave/cli/v2" ) @@ -35,9 +36,8 @@ func Version(cfg *config.Config) *cli.Command { return nil } - table := tw.NewWriter(os.Stdout) - table.SetHeader([]string{"Version", "Address", "Id"}) - table.SetAutoFormatHeaders(false) + table := tablewriter.NewTable(os.Stdout, tablewriter.WithHeaderAutoFormat(tw.Off)) + table.Header([]string{"Version", "Address", "Id"}) for _, s := range services { for _, n := range s.Nodes { table.Append([]string{s.Version, n.Address, n.Id}) diff --git a/services/settings/pkg/command/version.go b/services/settings/pkg/command/version.go index 68d6fb240..189ed639a 100644 --- a/services/settings/pkg/command/version.go +++ b/services/settings/pkg/command/version.go @@ -7,7 +7,8 @@ import ( "github.com/opencloud-eu/opencloud/pkg/registry" "github.com/opencloud-eu/opencloud/pkg/version" - tw "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter/tw" "github.com/opencloud-eu/opencloud/services/settings/pkg/config" "github.com/urfave/cli/v2" ) @@ -35,9 +36,8 @@ func Version(cfg *config.Config) *cli.Command { return nil } - table := tw.NewWriter(os.Stdout) - table.SetHeader([]string{"Version", "Address", "Id"}) - table.SetAutoFormatHeaders(false) + table := tablewriter.NewTable(os.Stdout, tablewriter.WithHeaderAutoFormat(tw.Off)) + table.Header([]string{"Version", "Address", "Id"}) for _, s := range services { for _, n := range s.Nodes { table.Append([]string{s.Version, n.Address, n.Id}) diff --git a/services/sharing/pkg/command/version.go b/services/sharing/pkg/command/version.go index 0703a6db8..d45bc5224 100644 --- a/services/sharing/pkg/command/version.go +++ b/services/sharing/pkg/command/version.go @@ -7,7 +7,8 @@ import ( "github.com/opencloud-eu/opencloud/pkg/registry" "github.com/opencloud-eu/opencloud/pkg/version" - tw "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter/tw" "github.com/opencloud-eu/opencloud/services/sharing/pkg/config" "github.com/urfave/cli/v2" ) @@ -35,9 +36,8 @@ func Version(cfg *config.Config) *cli.Command { return nil } - table := tw.NewWriter(os.Stdout) - table.SetHeader([]string{"Version", "Address", "Id"}) - table.SetAutoFormatHeaders(false) + table := tablewriter.NewTable(os.Stdout, tablewriter.WithHeaderAutoFormat(tw.Off)) + table.Header([]string{"Version", "Address", "Id"}) for _, s := range services { for _, n := range s.Nodes { table.Append([]string{s.Version, n.Address, n.Id}) diff --git a/services/storage-publiclink/pkg/command/version.go b/services/storage-publiclink/pkg/command/version.go index ba56fd22c..6692fb027 100644 --- a/services/storage-publiclink/pkg/command/version.go +++ b/services/storage-publiclink/pkg/command/version.go @@ -7,7 +7,8 @@ import ( "github.com/opencloud-eu/opencloud/pkg/registry" "github.com/opencloud-eu/opencloud/pkg/version" - tw "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter/tw" "github.com/opencloud-eu/opencloud/services/storage-publiclink/pkg/config" "github.com/urfave/cli/v2" ) @@ -35,9 +36,8 @@ func Version(cfg *config.Config) *cli.Command { return nil } - table := tw.NewWriter(os.Stdout) - table.SetHeader([]string{"Version", "Address", "Id"}) - table.SetAutoFormatHeaders(false) + table := tablewriter.NewTable(os.Stdout, tablewriter.WithHeaderAutoFormat(tw.Off)) + table.Header([]string{"Version", "Address", "Id"}) for _, s := range services { for _, n := range s.Nodes { table.Append([]string{s.Version, n.Address, n.Id}) diff --git a/services/storage-shares/pkg/command/version.go b/services/storage-shares/pkg/command/version.go index 9d984c106..d6c825e7a 100644 --- a/services/storage-shares/pkg/command/version.go +++ b/services/storage-shares/pkg/command/version.go @@ -7,7 +7,8 @@ import ( "github.com/opencloud-eu/opencloud/pkg/registry" "github.com/opencloud-eu/opencloud/pkg/version" - tw "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter/tw" "github.com/opencloud-eu/opencloud/services/storage-shares/pkg/config" "github.com/urfave/cli/v2" ) @@ -35,9 +36,8 @@ func Version(cfg *config.Config) *cli.Command { return nil } - table := tw.NewWriter(os.Stdout) - table.SetHeader([]string{"Version", "Address", "Id"}) - table.SetAutoFormatHeaders(false) + table := tablewriter.NewTable(os.Stdout, tablewriter.WithHeaderAutoFormat(tw.Off)) + table.Header([]string{"Version", "Address", "Id"}) for _, s := range services { for _, n := range s.Nodes { table.Append([]string{s.Version, n.Address, n.Id}) diff --git a/services/storage-system/pkg/command/version.go b/services/storage-system/pkg/command/version.go index 601e66e9d..025818f1e 100644 --- a/services/storage-system/pkg/command/version.go +++ b/services/storage-system/pkg/command/version.go @@ -7,7 +7,8 @@ import ( "github.com/opencloud-eu/opencloud/pkg/registry" "github.com/opencloud-eu/opencloud/pkg/version" - tw "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter/tw" "github.com/opencloud-eu/opencloud/services/storage-system/pkg/config" "github.com/urfave/cli/v2" ) @@ -35,9 +36,8 @@ func Version(cfg *config.Config) *cli.Command { return nil } - table := tw.NewWriter(os.Stdout) - table.SetHeader([]string{"Version", "Address", "Id"}) - table.SetAutoFormatHeaders(false) + table := tablewriter.NewTable(os.Stdout, tablewriter.WithHeaderAutoFormat(tw.Off)) + table.Header([]string{"Version", "Address", "Id"}) for _, s := range services { for _, n := range s.Nodes { table.Append([]string{s.Version, n.Address, n.Id}) diff --git a/services/storage-users/pkg/command/trash_bin.go b/services/storage-users/pkg/command/trash_bin.go index 24f21d98a..12dac4447 100644 --- a/services/storage-users/pkg/command/trash_bin.go +++ b/services/storage-users/pkg/command/trash_bin.go @@ -14,7 +14,8 @@ import ( rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" "github.com/mohae/deepcopy" - tw "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter/tw" "github.com/opencloud-eu/opencloud/pkg/config/configlog" zlog "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/storage-users/pkg/config" @@ -469,11 +470,10 @@ func itemType(it provider.ResourceType) string { return itemType } -func itemsTable(total int) *tw.Table { - table := tw.NewWriter(os.Stdout) - table.SetHeader([]string{"itemID", "path", "type", "delete at"}) - table.SetAutoFormatHeaders(false) - table.SetFooter([]string{"", "", "", "total count: " + strconv.Itoa(total)}) +func itemsTable(total int) *tablewriter.Table { + table := tablewriter.NewTable(os.Stdout, tablewriter.WithHeaderAutoFormat(tw.Off)) + table.Header([]string{"itemID", "path", "type", "delete at"}) + table.Footer([]string{"", "", "", "total count: " + strconv.Itoa(total)}) return table } diff --git a/services/storage-users/pkg/command/uploads.go b/services/storage-users/pkg/command/uploads.go index 25c9ccba0..785d64e93 100644 --- a/services/storage-users/pkg/command/uploads.go +++ b/services/storage-users/pkg/command/uploads.go @@ -9,7 +9,8 @@ import ( "strings" "time" - tw "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter/tw" "github.com/urfave/cli/v2" userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" @@ -145,16 +146,15 @@ func ListUploadSessions(cfg *config.Config) *cli.Command { } var ( - table *tw.Table + table *tablewriter.Table raw []Session ) if !c.Bool("json") { fmt.Println(buildInfo(filter)) - table = tw.NewWriter(os.Stdout) - table.SetHeader([]string{"Space", "Upload Id", "Name", "Offset", "Size", "Executant", "Owner", "Expires", "Processing", "Scan Date", "Scan Result"}) - table.SetAutoFormatHeaders(false) + table = tablewriter.NewTable(os.Stdout, tablewriter.WithHeaderAutoFormat(tw.Off)) + table.Header([]string{"Space", "Upload Id", "Name", "Offset", "Size", "Executant", "Owner", "Expires", "Processing", "Scan Date", "Scan Result"}) } for _, u := range uploads { diff --git a/services/storage-users/pkg/command/version.go b/services/storage-users/pkg/command/version.go index 99ef72f4f..f227795d7 100644 --- a/services/storage-users/pkg/command/version.go +++ b/services/storage-users/pkg/command/version.go @@ -7,7 +7,8 @@ import ( "github.com/opencloud-eu/opencloud/pkg/registry" "github.com/opencloud-eu/opencloud/pkg/version" - tw "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter/tw" "github.com/opencloud-eu/opencloud/services/storage-users/pkg/config" "github.com/urfave/cli/v2" ) @@ -35,9 +36,8 @@ func Version(cfg *config.Config) *cli.Command { return nil } - table := tw.NewWriter(os.Stdout) - table.SetHeader([]string{"Version", "Address", "Id"}) - table.SetAutoFormatHeaders(false) + table := tablewriter.NewTable(os.Stdout, tablewriter.WithHeaderAutoFormat(tw.Off)) + table.Header([]string{"Version", "Address", "Id"}) for _, s := range services { for _, n := range s.Nodes { table.Append([]string{s.Version, n.Address, n.Id}) diff --git a/services/thumbnails/pkg/command/version.go b/services/thumbnails/pkg/command/version.go index 9f6e21ccc..003fc98d7 100644 --- a/services/thumbnails/pkg/command/version.go +++ b/services/thumbnails/pkg/command/version.go @@ -7,7 +7,8 @@ import ( "github.com/opencloud-eu/opencloud/pkg/registry" "github.com/opencloud-eu/opencloud/pkg/version" - tw "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter/tw" "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config" "github.com/urfave/cli/v2" ) @@ -35,9 +36,8 @@ func Version(cfg *config.Config) *cli.Command { return nil } - table := tw.NewWriter(os.Stdout) - table.SetHeader([]string{"Version", "Address", "Id"}) - table.SetAutoFormatHeaders(false) + table := tablewriter.NewTable(os.Stdout, tablewriter.WithHeaderAutoFormat(tw.Off)) + table.Header([]string{"Version", "Address", "Id"}) for _, s := range services { for _, n := range s.Nodes { table.Append([]string{s.Version, n.Address, n.Id}) diff --git a/services/users/pkg/command/version.go b/services/users/pkg/command/version.go index 07f078523..a1c591f50 100644 --- a/services/users/pkg/command/version.go +++ b/services/users/pkg/command/version.go @@ -7,7 +7,8 @@ import ( "github.com/opencloud-eu/opencloud/pkg/registry" "github.com/opencloud-eu/opencloud/pkg/version" - tw "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter/tw" "github.com/opencloud-eu/opencloud/services/users/pkg/config" "github.com/urfave/cli/v2" ) @@ -35,9 +36,8 @@ func Version(cfg *config.Config) *cli.Command { return nil } - table := tw.NewWriter(os.Stdout) - table.SetHeader([]string{"Version", "Address", "Id"}) - table.SetAutoFormatHeaders(false) + table := tablewriter.NewTable(os.Stdout, tablewriter.WithHeaderAutoFormat(tw.Off)) + table.Header([]string{"Version", "Address", "Id"}) for _, s := range services { for _, n := range s.Nodes { table.Append([]string{s.Version, n.Address, n.Id}) diff --git a/services/web/pkg/command/version.go b/services/web/pkg/command/version.go index 663c168d6..fa713ee5a 100644 --- a/services/web/pkg/command/version.go +++ b/services/web/pkg/command/version.go @@ -7,7 +7,8 @@ import ( "github.com/opencloud-eu/opencloud/pkg/registry" "github.com/opencloud-eu/opencloud/pkg/version" - tw "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter/tw" "github.com/opencloud-eu/opencloud/services/web/pkg/config" "github.com/urfave/cli/v2" ) @@ -35,9 +36,8 @@ func Version(cfg *config.Config) *cli.Command { return nil } - table := tw.NewWriter(os.Stdout) - table.SetHeader([]string{"Version", "Address", "Id"}) - table.SetAutoFormatHeaders(false) + table := tablewriter.NewTable(os.Stdout, tablewriter.WithHeaderAutoFormat(tw.Off)) + table.Header([]string{"Version", "Address", "Id"}) for _, s := range services { for _, n := range s.Nodes { table.Append([]string{s.Version, n.Address, n.Id}) diff --git a/services/webdav/pkg/command/version.go b/services/webdav/pkg/command/version.go index d9f626fce..d7b5e6d49 100644 --- a/services/webdav/pkg/command/version.go +++ b/services/webdav/pkg/command/version.go @@ -7,7 +7,8 @@ import ( "github.com/opencloud-eu/opencloud/pkg/registry" "github.com/opencloud-eu/opencloud/pkg/version" - tw "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter/tw" "github.com/opencloud-eu/opencloud/services/webdav/pkg/config" "github.com/urfave/cli/v2" ) @@ -35,9 +36,8 @@ func Version(cfg *config.Config) *cli.Command { return nil } - table := tw.NewWriter(os.Stdout) - table.SetHeader([]string{"Version", "Address", "Id"}) - table.SetAutoFormatHeaders(false) + table := tablewriter.NewTable(os.Stdout, tablewriter.WithHeaderAutoFormat(tw.Off)) + table.Header([]string{"Version", "Address", "Id"}) for _, s := range services { for _, n := range s.Nodes { table.Append([]string{s.Version, n.Address, n.Id}) diff --git a/services/webfinger/pkg/command/version.go b/services/webfinger/pkg/command/version.go index a2504afc1..646760f2b 100644 --- a/services/webfinger/pkg/command/version.go +++ b/services/webfinger/pkg/command/version.go @@ -7,7 +7,8 @@ import ( "github.com/opencloud-eu/opencloud/pkg/registry" "github.com/opencloud-eu/opencloud/pkg/version" - tw "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter" + "github.com/olekukonko/tablewriter/tw" "github.com/opencloud-eu/opencloud/services/webfinger/pkg/config" "github.com/urfave/cli/v2" ) @@ -35,9 +36,8 @@ func Version(cfg *config.Config) *cli.Command { return nil } - table := tw.NewWriter(os.Stdout) - table.SetHeader([]string{"Version", "Address", "Id"}) - table.SetAutoFormatHeaders(false) + table := tablewriter.NewTable(os.Stdout, tablewriter.WithHeaderAutoFormat(tw.Off)) + table.Header([]string{"Version", "Address", "Id"}) for _, s := range services { for _, n := range s.Nodes { table.Append([]string{s.Version, n.Address, n.Id})