From fe39267e3a0df5765c3202d5b6b431b2238023f1 Mon Sep 17 00:00:00 2001 From: Guillaume Tardif Date: Fri, 15 Jan 2021 16:45:27 +0100 Subject: [PATCH] Move formatter => cli/formatter. Needed to move formatter.MemBytes => utils.MemBytes (helper class on memory display) Signed-off-by: Guillaume Tardif --- api/containers/api.go | 4 ++-- cli/cmd/compose/list.go | 2 +- cli/cmd/compose/logs.go | 2 +- cli/cmd/compose/ps.go | 2 +- cli/cmd/compose/up.go | 2 +- cli/cmd/context/ls.go | 2 +- cli/cmd/inspect.go | 2 +- cli/cmd/ps.go | 2 +- cli/cmd/secrets.go | 2 +- cli/cmd/version.go | 2 +- cli/cmd/volume/command.go | 2 +- cli/cmd/volume/list.go | 2 +- {formatter => cli/formatter}/colors.go | 0 {formatter => cli/formatter}/consts.go | 0 {formatter => cli/formatter}/formatter.go | 0 {formatter => cli/formatter}/formatter_test.go | 0 {formatter => cli/formatter}/json.go | 0 {formatter => cli/formatter}/logs.go | 0 {formatter => cli/formatter}/pretty.go | 0 cli/options/run/opts.go | 5 +++-- cli/server/proxy/containers.go | 5 +++-- cli/server/proxy/containers_test.go | 5 +++-- {formatter => utils}/units.go | 2 +- {formatter => utils}/units_test.go | 2 +- 24 files changed, 24 insertions(+), 21 deletions(-) rename {formatter => cli/formatter}/colors.go (100%) rename {formatter => cli/formatter}/consts.go (100%) rename {formatter => cli/formatter}/formatter.go (100%) rename {formatter => cli/formatter}/formatter_test.go (100%) rename {formatter => cli/formatter}/json.go (100%) rename {formatter => cli/formatter}/logs.go (100%) rename {formatter => cli/formatter}/pretty.go (100%) rename {formatter => utils}/units.go (98%) rename {formatter => utils}/units_test.go (98%) diff --git a/api/containers/api.go b/api/containers/api.go index f5f55d2c..02cab49d 100644 --- a/api/containers/api.go +++ b/api/containers/api.go @@ -23,7 +23,7 @@ import ( "github.com/compose-spec/compose-go/types" specs "github.com/opencontainers/image-spec/specs-go/v1" - "github.com/docker/compose-cli/formatter" + "github.com/docker/compose-cli/utils" ) const ( @@ -102,7 +102,7 @@ type ContainerConfig struct { // Volumes to be mounted Volumes []string // Memlimit - MemLimit formatter.MemBytes + MemLimit utils.MemBytes // CPUlimit CPULimit float64 // Environment variables diff --git a/cli/cmd/compose/list.go b/cli/cmd/compose/list.go index 8b8d7c07..114cf2aa 100644 --- a/cli/cmd/compose/list.go +++ b/cli/cmd/compose/list.go @@ -27,7 +27,7 @@ import ( "github.com/docker/compose-cli/api/client" "github.com/docker/compose-cli/api/compose" - "github.com/docker/compose-cli/formatter" + "github.com/docker/compose-cli/cli/formatter" ) func listCommand() *cobra.Command { diff --git a/cli/cmd/compose/logs.go b/cli/cmd/compose/logs.go index 6993943b..49758d45 100644 --- a/cli/cmd/compose/logs.go +++ b/cli/cmd/compose/logs.go @@ -24,7 +24,7 @@ import ( "github.com/docker/compose-cli/api/client" "github.com/docker/compose-cli/api/compose" - "github.com/docker/compose-cli/formatter" + "github.com/docker/compose-cli/cli/formatter" ) func logsCommand() *cobra.Command { diff --git a/cli/cmd/compose/ps.go b/cli/cmd/compose/ps.go index 63d7b512..aa317aa9 100644 --- a/cli/cmd/compose/ps.go +++ b/cli/cmd/compose/ps.go @@ -27,7 +27,7 @@ import ( "github.com/spf13/cobra" "github.com/docker/compose-cli/api/client" - "github.com/docker/compose-cli/formatter" + "github.com/docker/compose-cli/cli/formatter" ) func psCommand() *cobra.Command { diff --git a/cli/cmd/compose/up.go b/cli/cmd/compose/up.go index c0210917..6fbfa019 100644 --- a/cli/cmd/compose/up.go +++ b/cli/cmd/compose/up.go @@ -26,7 +26,7 @@ import ( "github.com/docker/compose-cli/api/compose" "github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/api/progress" - "github.com/docker/compose-cli/formatter" + "github.com/docker/compose-cli/cli/formatter" "github.com/compose-spec/compose-go/cli" "github.com/compose-spec/compose-go/types" diff --git a/cli/cmd/context/ls.go b/cli/cmd/context/ls.go index 1f678f38..ffcd1b8e 100644 --- a/cli/cmd/context/ls.go +++ b/cli/cmd/context/ls.go @@ -28,8 +28,8 @@ import ( apicontext "github.com/docker/compose-cli/api/context" "github.com/docker/compose-cli/api/context/store" + "github.com/docker/compose-cli/cli/formatter" "github.com/docker/compose-cli/cli/mobycli" - "github.com/docker/compose-cli/formatter" ) type lsOpts struct { diff --git a/cli/cmd/inspect.go b/cli/cmd/inspect.go index 6ce9a0e2..e344794c 100644 --- a/cli/cmd/inspect.go +++ b/cli/cmd/inspect.go @@ -27,7 +27,7 @@ import ( "github.com/docker/compose-cli/api/client" "github.com/docker/compose-cli/api/containers" - "github.com/docker/compose-cli/formatter" + "github.com/docker/compose-cli/cli/formatter" ) // InspectCommand inspects into containers diff --git a/cli/cmd/ps.go b/cli/cmd/ps.go index 56d6ab72..587999b1 100644 --- a/cli/cmd/ps.go +++ b/cli/cmd/ps.go @@ -28,7 +28,7 @@ import ( "github.com/docker/compose-cli/api/client" "github.com/docker/compose-cli/api/containers" - formatter2 "github.com/docker/compose-cli/formatter" + formatter2 "github.com/docker/compose-cli/cli/formatter" "github.com/docker/compose-cli/utils/formatter" ) diff --git a/cli/cmd/secrets.go b/cli/cmd/secrets.go index 0fc14c58..22a9e934 100644 --- a/cli/cmd/secrets.go +++ b/cli/cmd/secrets.go @@ -26,7 +26,7 @@ import ( "github.com/docker/compose-cli/api/client" "github.com/docker/compose-cli/api/secrets" - "github.com/docker/compose-cli/formatter" + "github.com/docker/compose-cli/cli/formatter" ) // SecretCommand manage secrets diff --git a/cli/cmd/version.go b/cli/cmd/version.go index f1238ab9..83372aa3 100644 --- a/cli/cmd/version.go +++ b/cli/cmd/version.go @@ -24,8 +24,8 @@ import ( "github.com/spf13/cobra" "github.com/docker/compose-cli/cli/cmd/mobyflags" + "github.com/docker/compose-cli/cli/formatter" "github.com/docker/compose-cli/cli/mobycli" - "github.com/docker/compose-cli/formatter" "github.com/docker/compose-cli/internal" ) diff --git a/cli/cmd/volume/command.go b/cli/cmd/volume/command.go index 1136129a..8188c320 100644 --- a/cli/cmd/volume/command.go +++ b/cli/cmd/volume/command.go @@ -25,8 +25,8 @@ import ( "github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/api/progress" "github.com/docker/compose-cli/cli/formatter" + formatter2 "github.com/docker/compose-cli/cli/formatter" "github.com/docker/compose-cli/ecs" - formatter2 "github.com/docker/compose-cli/formatter" "github.com/hashicorp/go-multierror" "github.com/spf13/cobra" diff --git a/cli/cmd/volume/list.go b/cli/cmd/volume/list.go index 062ef63c..8bbc2018 100644 --- a/cli/cmd/volume/list.go +++ b/cli/cmd/volume/list.go @@ -25,7 +25,7 @@ import ( "github.com/docker/compose-cli/api/client" "github.com/docker/compose-cli/api/volumes" - "github.com/docker/compose-cli/formatter" + "github.com/docker/compose-cli/cli/formatter" ) type listVolumeOpts struct { diff --git a/formatter/colors.go b/cli/formatter/colors.go similarity index 100% rename from formatter/colors.go rename to cli/formatter/colors.go diff --git a/formatter/consts.go b/cli/formatter/consts.go similarity index 100% rename from formatter/consts.go rename to cli/formatter/consts.go diff --git a/formatter/formatter.go b/cli/formatter/formatter.go similarity index 100% rename from formatter/formatter.go rename to cli/formatter/formatter.go diff --git a/formatter/formatter_test.go b/cli/formatter/formatter_test.go similarity index 100% rename from formatter/formatter_test.go rename to cli/formatter/formatter_test.go diff --git a/formatter/json.go b/cli/formatter/json.go similarity index 100% rename from formatter/json.go rename to cli/formatter/json.go diff --git a/formatter/logs.go b/cli/formatter/logs.go similarity index 100% rename from formatter/logs.go rename to cli/formatter/logs.go diff --git a/formatter/pretty.go b/cli/formatter/pretty.go similarity index 100% rename from formatter/pretty.go rename to cli/formatter/pretty.go diff --git a/cli/options/run/opts.go b/cli/options/run/opts.go index ea95be63..3388d673 100644 --- a/cli/options/run/opts.go +++ b/cli/options/run/opts.go @@ -22,6 +22,8 @@ import ( "strings" "time" + "github.com/docker/compose-cli/utils" + "github.com/compose-spec/compose-go/types" "github.com/containerd/containerd/platforms" "github.com/docker/cli/opts" @@ -30,7 +32,6 @@ import ( specs "github.com/opencontainers/image-spec/specs-go/v1" "github.com/docker/compose-cli/api/containers" - "github.com/docker/compose-cli/formatter" ) // Opts contain run command options @@ -41,7 +42,7 @@ type Opts struct { Labels []string Volumes []string Cpus float64 - Memory formatter.MemBytes + Memory utils.MemBytes Detach bool Environment []string EnvironmentFiles []string diff --git a/cli/server/proxy/containers.go b/cli/server/proxy/containers.go index 46bfc58c..802a0930 100644 --- a/cli/server/proxy/containers.go +++ b/cli/server/proxy/containers.go @@ -20,6 +20,8 @@ import ( "context" "errors" + "github.com/docker/compose-cli/utils" + "github.com/compose-spec/compose-go/types" "github.com/containerd/containerd/platforms" specs "github.com/opencontainers/image-spec/specs-go/v1" @@ -27,7 +29,6 @@ import ( "github.com/docker/compose-cli/api/containers" containersv1 "github.com/docker/compose-cli/cli/server/protos/containers/v1" "github.com/docker/compose-cli/cli/server/proxy/streams" - "github.com/docker/compose-cli/formatter" ) func portsToGrpc(ports []containers.Port) []*containersv1.Port { @@ -185,7 +186,7 @@ func grpcContainerToContainerConfig(request *containersv1.RunRequest) (container Ports: ports, Labels: request.GetLabels(), Volumes: request.GetVolumes(), - MemLimit: formatter.MemBytes(request.GetMemoryLimit()), + MemLimit: utils.MemBytes(request.GetMemoryLimit()), CPULimit: float64(request.GetCpuLimit()), RestartPolicyCondition: request.RestartPolicyCondition, Environment: request.Environment, diff --git a/cli/server/proxy/containers_test.go b/cli/server/proxy/containers_test.go index e821e6da..701175ac 100644 --- a/cli/server/proxy/containers_test.go +++ b/cli/server/proxy/containers_test.go @@ -19,11 +19,12 @@ package proxy import ( "testing" + "github.com/docker/compose-cli/utils" + "gotest.tools/v3/assert" "github.com/docker/compose-cli/api/containers" containersv1 "github.com/docker/compose-cli/cli/server/protos/containers/v1" - "github.com/docker/compose-cli/formatter" ) func TestGrpcContainerToContainerConfig(t *testing.T) { @@ -53,7 +54,7 @@ func TestGrpcContainerToContainerConfig(t *testing.T) { assert.NilError(t, err) assert.Equal(t, cc.ID, "myId") assert.Equal(t, cc.Image, "myImage") - assert.Equal(t, cc.MemLimit, formatter.MemBytes(41)) + assert.Equal(t, cc.MemLimit, utils.MemBytes(41)) assert.Equal(t, cc.CPULimit, float64(42)) assert.DeepEqual(t, cc.Volumes, []string{"myvolume"}) assert.DeepEqual(t, cc.Ports, []containers.Port{ diff --git a/formatter/units.go b/utils/units.go similarity index 98% rename from formatter/units.go rename to utils/units.go index d26902cd..401dddbe 100644 --- a/formatter/units.go +++ b/utils/units.go @@ -14,7 +14,7 @@ limitations under the License. */ -package formatter +package utils import ( "github.com/docker/go-units" diff --git a/formatter/units_test.go b/utils/units_test.go similarity index 98% rename from formatter/units_test.go rename to utils/units_test.go index ea21a210..2e35e11b 100644 --- a/formatter/units_test.go +++ b/utils/units_test.go @@ -14,7 +14,7 @@ limitations under the License. */ -package formatter +package utils import ( "testing"