From b5493ba059bac83852536bdfcf1b4c46c74a6203 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Tue, 16 Jul 2024 22:45:03 +0200 Subject: [PATCH] refactor: CreateTable2 -> CreateTable [ci skip] --- cli/app/check.go | 2 +- cli/app/list.go | 2 +- cli/app/new.go | 4 ++-- cli/app/ps.go | 2 +- cli/app/secret.go | 4 ++-- cli/app/services.go | 2 +- cli/app/volume.go | 2 +- cli/recipe/lint.go | 2 +- cli/recipe/list.go | 2 +- cli/recipe/version.go | 2 +- cli/server/list.go | 2 +- pkg/formatter/formatter.go | 4 ++-- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cli/app/check.go b/cli/app/check.go index e1df776e..8cb90fee 100644 --- a/cli/app/check.go +++ b/cli/app/check.go @@ -43,7 +43,7 @@ ${FOO:} syntax). "check" does not confirm or deny this for you.`, log.Fatal(err) } - table, err := formatter.CreateTable2() + table, err := formatter.CreateTable() if err != nil { log.Fatal(err) } diff --git a/cli/app/list.go b/cli/app/list.go index cc471855..d0d46ab7 100644 --- a/cli/app/list.go +++ b/cli/app/list.go @@ -250,7 +250,7 @@ can take some time.`, ) } - table, err := formatter.CreateTable2() + table, err := formatter.CreateTable() if err != nil { log.Fatal(err) } diff --git a/cli/app/new.go b/cli/app/new.go index 2fb912f4..be77f168 100644 --- a/cli/app/new.go +++ b/cli/app/new.go @@ -158,7 +158,7 @@ var appNewCommand = cli.Command{ log.Fatal(err) } - secretsTable, err = formatter.CreateTable2() + secretsTable, err = formatter.CreateTable() if err != nil { log.Fatal(err) } @@ -175,7 +175,7 @@ var appNewCommand = cli.Command{ internal.NewAppServer = "local" } - table, err := formatter.CreateTable2() + table, err := formatter.CreateTable() if err != nil { log.Fatal(err) } diff --git a/cli/app/ps.go b/cli/app/ps.go index 1891c23f..de8e5c4b 100644 --- a/cli/app/ps.go +++ b/cli/app/ps.go @@ -151,7 +151,7 @@ func showPSOutput(app appPkg.App, cl *dockerClient.Client, deployedVersion, chao return } - table, err := formatter.CreateTable2() + table, err := formatter.CreateTable() if err != nil { log.Fatal(err) } diff --git a/cli/app/secret.go b/cli/app/secret.go index c869b346..a6751cca 100644 --- a/cli/app/secret.go +++ b/cli/app/secret.go @@ -116,7 +116,7 @@ var appSecretGenerateCommand = cli.Command{ } headers := []string{"NAME", "VALUE"} - table, err := formatter.CreateTable2() + table, err := formatter.CreateTable() if err != nil { log.Fatal(err) } @@ -365,7 +365,7 @@ var appSecretLsCommand = cli.Command{ } headers := []string{"NAME", "VERSION", "GENERATED NAME", "CREATED ON SERVER"} - table, err := formatter.CreateTable2() + table, err := formatter.CreateTable() if err != nil { log.Fatal(err) } diff --git a/cli/app/services.go b/cli/app/services.go index 98c729d7..a2a18df1 100644 --- a/cli/app/services.go +++ b/cli/app/services.go @@ -56,7 +56,7 @@ var appServicesCommand = cli.Command{ log.Fatal(err) } - table, err := formatter.CreateTable2() + table, err := formatter.CreateTable() if err != nil { log.Fatal(err) } diff --git a/cli/app/volume.go b/cli/app/volume.go index 4be9d6ef..0595d702 100644 --- a/cli/app/volume.go +++ b/cli/app/volume.go @@ -45,7 +45,7 @@ var appVolumeListCommand = cli.Command{ headers := []string{"name", "created", "mounted"} - table, err := formatter.CreateTable2() + table, err := formatter.CreateTable() if err != nil { log.Fatal(err) } diff --git a/cli/recipe/lint.go b/cli/recipe/lint.go index 8bfbc9f0..cc5542ef 100644 --- a/cli/recipe/lint.go +++ b/cli/recipe/lint.go @@ -41,7 +41,7 @@ var recipeLintCommand = cli.Command{ "resolve", } - table, err := formatter.CreateTable2() + table, err := formatter.CreateTable() if err != nil { log.Fatal(err) } diff --git a/cli/recipe/list.go b/cli/recipe/list.go index 2f686766..dfad4eb7 100644 --- a/cli/recipe/list.go +++ b/cli/recipe/list.go @@ -41,7 +41,7 @@ var recipeListCommand = cli.Command{ recipes := catl.Flatten() sort.Sort(recipe.ByRecipeName(recipes)) - table, err := formatter.CreateTable2() + table, err := formatter.CreateTable() if err != nil { log.Fatal(err) } diff --git a/cli/recipe/version.go b/cli/recipe/version.go index b9d4328f..c0f64580 100644 --- a/cli/recipe/version.go +++ b/cli/recipe/version.go @@ -63,7 +63,7 @@ var recipeVersionCommand = cli.Command{ var allRows [][]string for i := len(recipeMeta.Versions) - 1; i >= 0; i-- { - table, err := formatter.CreateTable2() + table, err := formatter.CreateTable() if err != nil { log.Fatal(err) } diff --git a/cli/server/list.go b/cli/server/list.go index 9b9ad6e5..e17914ac 100644 --- a/cli/server/list.go +++ b/cli/server/list.go @@ -30,7 +30,7 @@ var serverListCommand = cli.Command{ log.Fatal(err) } - table, err := formatter.CreateTable2() + table, err := formatter.CreateTable() if err != nil { log.Fatal(err) } diff --git a/pkg/formatter/formatter.go b/pkg/formatter/formatter.go index 8e672686..ca9c5961 100644 --- a/pkg/formatter/formatter.go +++ b/pkg/formatter/formatter.go @@ -40,8 +40,8 @@ func HumanDuration(timestamp int64) string { return units.HumanDuration(now.Sub(date)) + " ago" } -// CreateTable2 prepares a table layout for output. -func CreateTable2() (*table.Table, error) { +// CreateTable prepares a table layout for output. +func CreateTable() (*table.Table, error) { width, _, err := term.GetSize(0) if err != nil { return nil, err