From f5d2d3adf62a6dcaa223f7ad062306586f013b9d Mon Sep 17 00:00:00 2001 From: cellarspoon Date: Tue, 28 Dec 2021 01:24:23 +0100 Subject: [PATCH] refactor: formatter gets own package --- cli/app/cp.go | 2 +- cli/app/list.go | 4 ++-- cli/app/ps.go | 12 ++++++------ cli/app/secret.go | 6 +++--- cli/app/version.go | 4 ++-- cli/app/volume.go | 4 ++-- cli/catalogue/catalogue.go | 2 +- cli/internal/deploy.go | 6 +++--- cli/internal/new.go | 6 +++--- cli/recipe/lint.go | 2 +- cli/recipe/list.go | 2 +- cli/recipe/release.go | 4 ++-- cli/recipe/version.go | 2 +- cli/record/list.go | 4 ++-- cli/record/new.go | 6 +++--- cli/record/remove.go | 4 ++-- cli/server/list.go | 2 +- cli/server/new.go | 2 +- cli/server/remove.go | 2 +- pkg/config/app.go | 2 +- pkg/container/container.go | 4 ++-- {cli => pkg}/formatter/formatter.go | 0 pkg/recipe/recipe.go | 2 +- 23 files changed, 42 insertions(+), 42 deletions(-) rename {cli => pkg}/formatter/formatter.go (100%) diff --git a/cli/app/cp.go b/cli/app/cp.go index af24f91c..63f7c386 100644 --- a/cli/app/cp.go +++ b/cli/app/cp.go @@ -5,12 +5,12 @@ import ( "os" "strings" - "coopcloud.tech/abra/cli/formatter" "coopcloud.tech/abra/cli/internal" "coopcloud.tech/abra/pkg/autocomplete" "coopcloud.tech/abra/pkg/client" "coopcloud.tech/abra/pkg/config" "coopcloud.tech/abra/pkg/container" + "coopcloud.tech/abra/pkg/formatter" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/pkg/archive" diff --git a/cli/app/list.go b/cli/app/list.go index 9e96e2ff..aff457fd 100644 --- a/cli/app/list.go +++ b/cli/app/list.go @@ -5,9 +5,9 @@ import ( "sort" "strings" - abraFormatter "coopcloud.tech/abra/cli/formatter" "coopcloud.tech/abra/cli/internal" "coopcloud.tech/abra/pkg/config" + "coopcloud.tech/abra/pkg/formatter" "coopcloud.tech/abra/pkg/recipe" "coopcloud.tech/abra/pkg/ssh" "coopcloud.tech/tagcmp" @@ -209,7 +209,7 @@ can take some time. tableCol = append(tableCol, []string{"status", "version", "upgrade"}...) } - table := abraFormatter.CreateTable(tableCol) + table := formatter.CreateTable(tableCol) for _, appStat := range serverStat.apps { tableRow := []string{appStat.recipe, appStat.appName, appStat.domain} diff --git a/cli/app/ps.go b/cli/app/ps.go index a6dd949e..3aefd06e 100644 --- a/cli/app/ps.go +++ b/cli/app/ps.go @@ -4,14 +4,14 @@ import ( "strings" "time" - abraFormatter "coopcloud.tech/abra/cli/formatter" "coopcloud.tech/abra/cli/internal" "coopcloud.tech/abra/pkg/autocomplete" "coopcloud.tech/abra/pkg/client" "coopcloud.tech/abra/pkg/config" + "coopcloud.tech/abra/pkg/formatter" stack "coopcloud.tech/abra/pkg/upstream/stack" "github.com/buger/goterm" - "github.com/docker/cli/cli/command/formatter" + dockerFormatter "github.com/docker/cli/cli/command/formatter" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" dockerClient "github.com/docker/docker/client" @@ -71,7 +71,7 @@ func showPSOutput(c *cli.Context, app config.App, cl *dockerClient.Client) { } tableCol := []string{"image", "created", "status", "state", "ports"} - table := abraFormatter.CreateTable(tableCol) + table := formatter.CreateTable(tableCol) for _, container := range containers { var containerNames []string @@ -81,11 +81,11 @@ func showPSOutput(c *cli.Context, app config.App, cl *dockerClient.Client) { } tableRow := []string{ - abraFormatter.RemoveSha(container.Image), - abraFormatter.HumanDuration(container.Created), + formatter.RemoveSha(container.Image), + formatter.HumanDuration(container.Created), container.Status, container.State, - formatter.DisplayablePorts(container.Ports), + dockerFormatter.DisplayablePorts(container.Ports), } table.Append(tableRow) } diff --git a/cli/app/secret.go b/cli/app/secret.go index 8797d360..6dad8aee 100644 --- a/cli/app/secret.go +++ b/cli/app/secret.go @@ -6,10 +6,10 @@ import ( "os" "strconv" - abraFormatter "coopcloud.tech/abra/cli/formatter" "coopcloud.tech/abra/cli/internal" "coopcloud.tech/abra/pkg/autocomplete" "coopcloud.tech/abra/pkg/client" + "coopcloud.tech/abra/pkg/formatter" "coopcloud.tech/abra/pkg/secret" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" @@ -83,7 +83,7 @@ var appSecretGenerateCommand = &cli.Command{ } tableCol := []string{"name", "value"} - table := abraFormatter.CreateTable(tableCol) + table := formatter.CreateTable(tableCol) for name, val := range secretVals { table.Append([]string{name, val}) } @@ -215,7 +215,7 @@ var appSecretLsCommand = &cli.Command{ secrets := secret.ReadSecretEnvVars(app.Env) tableCol := []string{"Name", "Version", "Generated Name", "Created On Server"} - table := abraFormatter.CreateTable(tableCol) + table := formatter.CreateTable(tableCol) cl, err := client.New(app.Server) if err != nil { diff --git a/cli/app/version.go b/cli/app/version.go index ef1ab033..c536f0f2 100644 --- a/cli/app/version.go +++ b/cli/app/version.go @@ -3,10 +3,10 @@ package app import ( "strings" - abraFormatter "coopcloud.tech/abra/cli/formatter" "coopcloud.tech/abra/cli/internal" "coopcloud.tech/abra/pkg/autocomplete" "coopcloud.tech/abra/pkg/client" + "coopcloud.tech/abra/pkg/formatter" "coopcloud.tech/abra/pkg/recipe" "coopcloud.tech/abra/pkg/upstream/stack" "github.com/docker/distribution/reference" @@ -81,7 +81,7 @@ Cloud recipe version. } tableCol := []string{"version", "service", "image", "digest"} - table := abraFormatter.CreateTable(tableCol) + table := formatter.CreateTable(tableCol) table.SetAutoMergeCellsByColumnIndex([]int{0}) for serviceName, versionMeta := range versionsMeta { diff --git a/cli/app/volume.go b/cli/app/volume.go index 4450c85b..bf11902e 100644 --- a/cli/app/volume.go +++ b/cli/app/volume.go @@ -1,10 +1,10 @@ package app import ( - abraFormatter "coopcloud.tech/abra/cli/formatter" "coopcloud.tech/abra/cli/internal" "coopcloud.tech/abra/pkg/autocomplete" "coopcloud.tech/abra/pkg/client" + "coopcloud.tech/abra/pkg/formatter" "github.com/AlecAivazis/survey/v2" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" @@ -23,7 +23,7 @@ var appVolumeListCommand = &cli.Command{ logrus.Fatal(err) } - table := abraFormatter.CreateTable([]string{"driver", "volume name"}) + table := formatter.CreateTable([]string{"driver", "volume name"}) var volTable [][]string for _, volume := range volumeList { volRow := []string{ diff --git a/cli/catalogue/catalogue.go b/cli/catalogue/catalogue.go index 02f13cd1..3489710e 100644 --- a/cli/catalogue/catalogue.go +++ b/cli/catalogue/catalogue.go @@ -6,10 +6,10 @@ import ( "io/ioutil" "path" - "coopcloud.tech/abra/cli/formatter" "coopcloud.tech/abra/cli/internal" "coopcloud.tech/abra/pkg/autocomplete" "coopcloud.tech/abra/pkg/config" + "coopcloud.tech/abra/pkg/formatter" gitPkg "coopcloud.tech/abra/pkg/git" "coopcloud.tech/abra/pkg/limit" "coopcloud.tech/abra/pkg/recipe" diff --git a/cli/internal/deploy.go b/cli/internal/deploy.go index 28fa6d69..fc1f9634 100644 --- a/cli/internal/deploy.go +++ b/cli/internal/deploy.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - abraFormatter "coopcloud.tech/abra/cli/formatter" "coopcloud.tech/abra/pkg/client" "coopcloud.tech/abra/pkg/config" "coopcloud.tech/abra/pkg/dns" + "coopcloud.tech/abra/pkg/formatter" "coopcloud.tech/abra/pkg/git" "coopcloud.tech/abra/pkg/lint" "coopcloud.tech/abra/pkg/recipe" @@ -158,7 +158,7 @@ func DeployAction(c *cli.Context) error { // DeployOverview shows a deployment overview func DeployOverview(app config.App, version, message string) error { tableCol := []string{"server", "compose", "domain", "app name", "version"} - table := abraFormatter.CreateTable(tableCol) + table := formatter.CreateTable(tableCol) deployConfig := "compose.yml" if composeFiles, ok := app.Env["COMPOSE_FILE"]; ok { @@ -196,7 +196,7 @@ func DeployOverview(app config.App, version, message string) error { // NewVersionOverview shows an upgrade or downgrade overview func NewVersionOverview(app config.App, currentVersion, newVersion string) error { tableCol := []string{"server", "compose", "domain", "app name", "current version", "to be deployed"} - table := abraFormatter.CreateTable(tableCol) + table := formatter.CreateTable(tableCol) deployConfig := "compose.yml" if composeFiles, ok := app.Env["COMPOSE_FILE"]; ok { diff --git a/cli/internal/new.go b/cli/internal/new.go index 54a19600..e6f9f8ea 100644 --- a/cli/internal/new.go +++ b/cli/internal/new.go @@ -4,8 +4,8 @@ import ( "fmt" "path" - abraFormatter "coopcloud.tech/abra/cli/formatter" "coopcloud.tech/abra/pkg/config" + "coopcloud.tech/abra/pkg/formatter" "coopcloud.tech/abra/pkg/recipe" recipePkg "coopcloud.tech/abra/pkg/recipe" "coopcloud.tech/abra/pkg/secret" @@ -149,7 +149,7 @@ func NewAction(c *cli.Context) error { } secretCols := []string{"Name", "Value"} - secretTable := abraFormatter.CreateTable(secretCols) + secretTable := formatter.CreateTable(secretCols) for secret := range secrets { secretTable.Append([]string{secret, secrets[secret]}) } @@ -164,7 +164,7 @@ func NewAction(c *cli.Context) error { } tableCol := []string{"Name", "Domain", "Type", "Server"} - table := abraFormatter.CreateTable(tableCol) + table := formatter.CreateTable(tableCol) table.Append([]string{sanitisedAppName, Domain, recipe.Name, NewAppServer}) fmt.Println("") diff --git a/cli/recipe/lint.go b/cli/recipe/lint.go index 361f42d9..51236811 100644 --- a/cli/recipe/lint.go +++ b/cli/recipe/lint.go @@ -3,9 +3,9 @@ package recipe import ( "fmt" - "coopcloud.tech/abra/cli/formatter" "coopcloud.tech/abra/cli/internal" "coopcloud.tech/abra/pkg/autocomplete" + "coopcloud.tech/abra/pkg/formatter" "coopcloud.tech/abra/pkg/lint" recipePkg "coopcloud.tech/abra/pkg/recipe" "github.com/sirupsen/logrus" diff --git a/cli/recipe/list.go b/cli/recipe/list.go index 55bb7554..d610ae76 100644 --- a/cli/recipe/list.go +++ b/cli/recipe/list.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "coopcloud.tech/abra/cli/formatter" + "coopcloud.tech/abra/pkg/formatter" "coopcloud.tech/abra/pkg/recipe" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" diff --git a/cli/recipe/release.go b/cli/recipe/release.go index 97f6fcca..1bbe9920 100644 --- a/cli/recipe/release.go +++ b/cli/recipe/release.go @@ -6,10 +6,10 @@ import ( "strconv" "strings" - abraFormatter "coopcloud.tech/abra/cli/formatter" "coopcloud.tech/abra/cli/internal" "coopcloud.tech/abra/pkg/autocomplete" "coopcloud.tech/abra/pkg/config" + "coopcloud.tech/abra/pkg/formatter" gitPkg "coopcloud.tech/abra/pkg/git" "coopcloud.tech/abra/pkg/recipe" recipePkg "coopcloud.tech/abra/pkg/recipe" @@ -282,7 +282,7 @@ func tagRelease(tagString string, repo *git.Repository) error { return err } - hash := abraFormatter.SmallSHA(head.Hash().String()) + hash := formatter.SmallSHA(head.Hash().String()) logrus.Debugf(fmt.Sprintf("created tag %s at %s", tagString, hash)) return nil diff --git a/cli/recipe/version.go b/cli/recipe/version.go index 6d6686a2..48dd7fce 100644 --- a/cli/recipe/version.go +++ b/cli/recipe/version.go @@ -1,9 +1,9 @@ package recipe import ( - "coopcloud.tech/abra/cli/formatter" "coopcloud.tech/abra/cli/internal" "coopcloud.tech/abra/pkg/autocomplete" + "coopcloud.tech/abra/pkg/formatter" recipePkg "coopcloud.tech/abra/pkg/recipe" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" diff --git a/cli/record/list.go b/cli/record/list.go index 84e08bdf..d12a9243 100644 --- a/cli/record/list.go +++ b/cli/record/list.go @@ -4,9 +4,9 @@ import ( "fmt" "strconv" - abraFormatter "coopcloud.tech/abra/cli/formatter" "coopcloud.tech/abra/cli/internal" gandiPkg "coopcloud.tech/abra/pkg/dns/gandi" + "coopcloud.tech/abra/pkg/formatter" "github.com/libdns/gandi" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" @@ -55,7 +55,7 @@ are listed. This zone must already be created on your provider account. } tableCol := []string{"type", "name", "value", "TTL", "priority"} - table := abraFormatter.CreateTable(tableCol) + table := formatter.CreateTable(tableCol) for _, record := range records { value := record.Value diff --git a/cli/record/new.go b/cli/record/new.go index 9aa406b6..5c57d6fc 100644 --- a/cli/record/new.go +++ b/cli/record/new.go @@ -4,10 +4,10 @@ import ( "fmt" "strconv" - abraFormatter "coopcloud.tech/abra/cli/formatter" "coopcloud.tech/abra/cli/internal" "coopcloud.tech/abra/pkg/dns" gandiPkg "coopcloud.tech/abra/pkg/dns/gandi" + "coopcloud.tech/abra/pkg/formatter" "github.com/libdns/gandi" "github.com/libdns/libdns" "github.com/sirupsen/logrus" @@ -135,7 +135,7 @@ You may also invoke this command in "wizard" mode and be prompted for input createdRecord := createdRecords[0] tableCol := []string{"type", "name", "value", "TTL", "priority"} - table := abraFormatter.CreateTable(tableCol) + table := formatter.CreateTable(tableCol) value := createdRecord.Value if len(createdRecord.Value) > 30 { @@ -186,7 +186,7 @@ func autoConfigure(c *cli.Context, provider *gandi.Provider, zone string) error records := []libdns.Record{atRecord, wildcardRecord} tableCol := []string{"type", "name", "value", "TTL", "priority"} - table := abraFormatter.CreateTable(tableCol) + table := formatter.CreateTable(tableCol) for _, record := range records { existingRecords, err := provider.GetRecords(c.Context, zone) diff --git a/cli/record/remove.go b/cli/record/remove.go index d9d35218..a0bcc905 100644 --- a/cli/record/remove.go +++ b/cli/record/remove.go @@ -4,9 +4,9 @@ import ( "fmt" "strconv" - abraFormatter "coopcloud.tech/abra/cli/formatter" "coopcloud.tech/abra/cli/internal" gandiPkg "coopcloud.tech/abra/pkg/dns/gandi" + "coopcloud.tech/abra/pkg/formatter" "github.com/AlecAivazis/survey/v2" "github.com/libdns/gandi" "github.com/libdns/libdns" @@ -88,7 +88,7 @@ You may also invoke this command in "wizard" mode and be prompted for input } tableCol := []string{"type", "name", "value", "TTL", "priority"} - table := abraFormatter.CreateTable(tableCol) + table := formatter.CreateTable(tableCol) value := toDelete.Value if len(toDelete.Value) > 30 { diff --git a/cli/server/list.go b/cli/server/list.go index 054a24b8..492b3797 100644 --- a/cli/server/list.go +++ b/cli/server/list.go @@ -3,9 +3,9 @@ package server import ( "strings" - "coopcloud.tech/abra/cli/formatter" "coopcloud.tech/abra/pkg/config" "coopcloud.tech/abra/pkg/context" + "coopcloud.tech/abra/pkg/formatter" "github.com/docker/cli/cli/connhelper/ssh" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" diff --git a/cli/server/new.go b/cli/server/new.go index 3aa9c3e8..e05b1880 100644 --- a/cli/server/new.go +++ b/cli/server/new.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "coopcloud.tech/abra/cli/formatter" "coopcloud.tech/abra/cli/internal" + "coopcloud.tech/abra/pkg/formatter" "coopcloud.tech/libcapsul" "github.com/AlecAivazis/survey/v2" "github.com/hetznercloud/hcloud-go/hcloud" diff --git a/cli/server/remove.go b/cli/server/remove.go index b8e428c5..4d0ba3e9 100644 --- a/cli/server/remove.go +++ b/cli/server/remove.go @@ -5,10 +5,10 @@ import ( "os" "path/filepath" - "coopcloud.tech/abra/cli/formatter" "coopcloud.tech/abra/cli/internal" "coopcloud.tech/abra/pkg/client" "coopcloud.tech/abra/pkg/config" + "coopcloud.tech/abra/pkg/formatter" "github.com/AlecAivazis/survey/v2" "github.com/hetznercloud/hcloud-go/hcloud" "github.com/sirupsen/logrus" diff --git a/pkg/config/app.go b/pkg/config/app.go index 2332ae2f..059eba6c 100644 --- a/pkg/config/app.go +++ b/pkg/config/app.go @@ -8,7 +8,7 @@ import ( "path" "strings" - "coopcloud.tech/abra/cli/formatter" + "coopcloud.tech/abra/pkg/formatter" "coopcloud.tech/abra/pkg/upstream/convert" loader "coopcloud.tech/abra/pkg/upstream/stack" stack "coopcloud.tech/abra/pkg/upstream/stack" diff --git a/pkg/container/container.go b/pkg/container/container.go index bf0d785f..37e25938 100644 --- a/pkg/container/container.go +++ b/pkg/container/container.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - abraFormatter "coopcloud.tech/abra/cli/formatter" + "coopcloud.tech/abra/pkg/formatter" "github.com/AlecAivazis/survey/v2" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" @@ -33,7 +33,7 @@ func GetContainer(c context.Context, cl *client.Client, filters filters.Args, pr for _, container := range containers { containerName := strings.Join(container.Names, " ") trimmed := strings.TrimPrefix(containerName, "/") - created := abraFormatter.HumanDuration(container.Created) + created := formatter.HumanDuration(container.Created) containersRaw = append(containersRaw, fmt.Sprintf("%s (created %v)", trimmed, created)) } diff --git a/cli/formatter/formatter.go b/pkg/formatter/formatter.go similarity index 100% rename from cli/formatter/formatter.go rename to pkg/formatter/formatter.go diff --git a/pkg/recipe/recipe.go b/pkg/recipe/recipe.go index 3622262f..6ffd2258 100644 --- a/pkg/recipe/recipe.go +++ b/pkg/recipe/recipe.go @@ -10,10 +10,10 @@ import ( "strings" "time" - "coopcloud.tech/abra/cli/formatter" "coopcloud.tech/abra/pkg/client" "coopcloud.tech/abra/pkg/compose" "coopcloud.tech/abra/pkg/config" + "coopcloud.tech/abra/pkg/formatter" gitPkg "coopcloud.tech/abra/pkg/git" "coopcloud.tech/abra/pkg/upstream/stack" loader "coopcloud.tech/abra/pkg/upstream/stack"