From e2ea24ceb7a8adb715985abfd97fc264a746e549 Mon Sep 17 00:00:00 2001 From: Nicolas De Loof Date: Tue, 15 Jun 2021 08:48:49 +0200 Subject: [PATCH] move compose-plugin commands under /cmd Signed-off-by: Nicolas De Loof --- builder.Makefile | 16 ++++++++-------- cli/main.go | 10 +++++----- {cli/cmd => cmd}/compose/build.go | 0 {cli/cmd => cmd}/compose/compose.go | 0 {cli/cmd => cmd}/compose/compose_test.go | 0 {cli/cmd => cmd}/compose/convert.go | 0 {cli/cmd => cmd}/compose/convert_kube.go | 0 {cli/cmd => cmd}/compose/cp.go | 0 {cli/cmd => cmd}/compose/create.go | 0 {cli/cmd => cmd}/compose/down.go | 0 {cli/cmd => cmd}/compose/events.go | 0 {cli/cmd => cmd}/compose/exec.go | 0 {cli/cmd => cmd}/compose/images.go | 0 {cli/cmd => cmd}/compose/kill.go | 0 {cli/cmd => cmd}/compose/list.go | 0 {cli/cmd => cmd}/compose/logs.go | 0 {cli/cmd => cmd}/compose/pause.go | 0 {cli/cmd => cmd}/compose/port.go | 0 {cli/cmd => cmd}/compose/ps.go | 0 {cli/cmd => cmd}/compose/pull.go | 0 {cli/cmd => cmd}/compose/push.go | 0 {cli/cmd => cmd}/compose/remove.go | 0 {cli/cmd => cmd}/compose/restart.go | 0 {cli/cmd => cmd}/compose/run.go | 0 {cli/cmd => cmd}/compose/start.go | 0 {cli/cmd => cmd}/compose/stop.go | 0 {cli/cmd => cmd}/compose/top.go | 0 {cli/cmd => cmd}/compose/up.go | 0 {cli/cmd => cmd}/compose/up_test.go | 0 {cli/cmd => cmd}/compose/version.go | 0 main.go => cmd/main.go | 6 +++--- docs/yaml/main/generate.go | 2 +- 32 files changed, 17 insertions(+), 17 deletions(-) rename {cli/cmd => cmd}/compose/build.go (100%) rename {cli/cmd => cmd}/compose/compose.go (100%) rename {cli/cmd => cmd}/compose/compose_test.go (100%) rename {cli/cmd => cmd}/compose/convert.go (100%) rename {cli/cmd => cmd}/compose/convert_kube.go (100%) rename {cli/cmd => cmd}/compose/cp.go (100%) rename {cli/cmd => cmd}/compose/create.go (100%) rename {cli/cmd => cmd}/compose/down.go (100%) rename {cli/cmd => cmd}/compose/events.go (100%) rename {cli/cmd => cmd}/compose/exec.go (100%) rename {cli/cmd => cmd}/compose/images.go (100%) rename {cli/cmd => cmd}/compose/kill.go (100%) rename {cli/cmd => cmd}/compose/list.go (100%) rename {cli/cmd => cmd}/compose/logs.go (100%) rename {cli/cmd => cmd}/compose/pause.go (100%) rename {cli/cmd => cmd}/compose/port.go (100%) rename {cli/cmd => cmd}/compose/ps.go (100%) rename {cli/cmd => cmd}/compose/pull.go (100%) rename {cli/cmd => cmd}/compose/push.go (100%) rename {cli/cmd => cmd}/compose/remove.go (100%) rename {cli/cmd => cmd}/compose/restart.go (100%) rename {cli/cmd => cmd}/compose/run.go (100%) rename {cli/cmd => cmd}/compose/start.go (100%) rename {cli/cmd => cmd}/compose/stop.go (100%) rename {cli/cmd => cmd}/compose/top.go (100%) rename {cli/cmd => cmd}/compose/up.go (100%) rename {cli/cmd => cmd}/compose/up_test.go (100%) rename {cli/cmd => cmd}/compose/version.go (100%) rename main.go => cmd/main.go (92%) diff --git a/builder.Makefile b/builder.Makefile index a94d767b..f0c1d9eb 100644 --- a/builder.Makefile +++ b/builder.Makefile @@ -55,7 +55,7 @@ cli: .PHONY: compose-plugin compose-plugin: - GOOS=${GOOS} GOARCH=${GOARCH} $(GO_BUILD) $(TAGS) -o $(COMPOSE_BINARY_WITH_EXTENSION) . + GOOS=${GOOS} GOARCH=${GOARCH} $(GO_BUILD) $(TAGS) -o $(COMPOSE_BINARY_WITH_EXTENSION) ./cmd .PHONY: cross cross: @@ -69,13 +69,13 @@ cross: .PHONY: cross-compose-plugin cross-compose-plugin: - GOOS=linux GOARCH=amd64 $(GO_BUILD) $(TAGS) -o $(COMPOSE_BINARY)-linux-amd64 . - GOOS=linux GOARCH=arm64 $(GO_BUILD) $(TAGS) -o $(COMPOSE_BINARY)-linux-arm64 . - GOOS=linux GOARM=6 GOARCH=arm $(GO_BUILD) $(TAGS) -o $(COMPOSE_BINARY)-linux-armv6 . - GOOS=linux GOARM=7 GOARCH=arm $(GO_BUILD) $(TAGS) -o $(COMPOSE_BINARY)-linux-armv7 . - GOOS=darwin GOARCH=amd64 $(GO_BUILD) $(TAGS) -o $(COMPOSE_BINARY)-darwin-amd64 . - GOOS=darwin GOARCH=arm64 $(GO_BUILD) $(TAGS) -o $(COMPOSE_BINARY)-darwin-arm64 . - GOOS=windows GOARCH=amd64 $(GO_BUILD) $(TAGS) -o $(COMPOSE_BINARY)-windows-amd64.exe . + GOOS=linux GOARCH=amd64 $(GO_BUILD) $(TAGS) -o $(COMPOSE_BINARY)-linux-amd64 ./cmd + GOOS=linux GOARCH=arm64 $(GO_BUILD) $(TAGS) -o $(COMPOSE_BINARY)-linux-arm64 ./cmd + GOOS=linux GOARM=6 GOARCH=arm $(GO_BUILD) $(TAGS) -o $(COMPOSE_BINARY)-linux-armv6 ./cmd + GOOS=linux GOARM=7 GOARCH=arm $(GO_BUILD) $(TAGS) -o $(COMPOSE_BINARY)-linux-armv7 ./cmd + GOOS=darwin GOARCH=amd64 $(GO_BUILD) $(TAGS) -o $(COMPOSE_BINARY)-darwin-amd64 ./cmd + GOOS=darwin GOARCH=arm64 $(GO_BUILD) $(TAGS) -o $(COMPOSE_BINARY)-darwin-arm64 ./cmd + GOOS=windows GOARCH=amd64 $(GO_BUILD) $(TAGS) -o $(COMPOSE_BINARY)-windows-amd64.exe ./cmd .PHONY: test test: diff --git a/cli/main.go b/cli/main.go index bdfe1028..86a7bae1 100644 --- a/cli/main.go +++ b/cli/main.go @@ -39,7 +39,6 @@ import ( apicontext "github.com/docker/compose-cli/api/context" "github.com/docker/compose-cli/api/context/store" "github.com/docker/compose-cli/cli/cmd" - "github.com/docker/compose-cli/cli/cmd/compose" contextcmd "github.com/docker/compose-cli/cli/cmd/context" "github.com/docker/compose-cli/cli/cmd/login" "github.com/docker/compose-cli/cli/cmd/logout" @@ -49,8 +48,9 @@ import ( "github.com/docker/compose-cli/cli/metrics" "github.com/docker/compose-cli/cli/mobycli" cliopts "github.com/docker/compose-cli/cli/options" + compose2 "github.com/docker/compose-cli/cmd/compose" "github.com/docker/compose-cli/local" - api "github.com/docker/compose-cli/pkg/api" + "github.com/docker/compose-cli/pkg/api" // Backend registrations _ "github.com/docker/compose-cli/aci" @@ -225,7 +225,7 @@ func main() { if ctype != store.DefaultContextType { // On default context, "compose" is implemented by CLI Plugin proxy := api.NewServiceProxy().WithService(service.ComposeService()) - command := compose.RootCommand(ctype, proxy) + command := compose2.RootCommand(ctype, proxy) if ctype == store.AciContextType { customizeCliForACI(command, proxy) @@ -315,9 +315,9 @@ func exit(ctx string, err error, ctype string) { os.Exit(api.ExitCodeLoginRequired) } - if compose.Warning != "" { + if compose2.Warning != "" { logrus.Warn(err) - fmt.Fprintln(os.Stderr, compose.Warning) + fmt.Fprintln(os.Stderr, compose2.Warning) } if errors.Is(err, api.ErrNotImplemented) { diff --git a/cli/cmd/compose/build.go b/cmd/compose/build.go similarity index 100% rename from cli/cmd/compose/build.go rename to cmd/compose/build.go diff --git a/cli/cmd/compose/compose.go b/cmd/compose/compose.go similarity index 100% rename from cli/cmd/compose/compose.go rename to cmd/compose/compose.go diff --git a/cli/cmd/compose/compose_test.go b/cmd/compose/compose_test.go similarity index 100% rename from cli/cmd/compose/compose_test.go rename to cmd/compose/compose_test.go diff --git a/cli/cmd/compose/convert.go b/cmd/compose/convert.go similarity index 100% rename from cli/cmd/compose/convert.go rename to cmd/compose/convert.go diff --git a/cli/cmd/compose/convert_kube.go b/cmd/compose/convert_kube.go similarity index 100% rename from cli/cmd/compose/convert_kube.go rename to cmd/compose/convert_kube.go diff --git a/cli/cmd/compose/cp.go b/cmd/compose/cp.go similarity index 100% rename from cli/cmd/compose/cp.go rename to cmd/compose/cp.go diff --git a/cli/cmd/compose/create.go b/cmd/compose/create.go similarity index 100% rename from cli/cmd/compose/create.go rename to cmd/compose/create.go diff --git a/cli/cmd/compose/down.go b/cmd/compose/down.go similarity index 100% rename from cli/cmd/compose/down.go rename to cmd/compose/down.go diff --git a/cli/cmd/compose/events.go b/cmd/compose/events.go similarity index 100% rename from cli/cmd/compose/events.go rename to cmd/compose/events.go diff --git a/cli/cmd/compose/exec.go b/cmd/compose/exec.go similarity index 100% rename from cli/cmd/compose/exec.go rename to cmd/compose/exec.go diff --git a/cli/cmd/compose/images.go b/cmd/compose/images.go similarity index 100% rename from cli/cmd/compose/images.go rename to cmd/compose/images.go diff --git a/cli/cmd/compose/kill.go b/cmd/compose/kill.go similarity index 100% rename from cli/cmd/compose/kill.go rename to cmd/compose/kill.go diff --git a/cli/cmd/compose/list.go b/cmd/compose/list.go similarity index 100% rename from cli/cmd/compose/list.go rename to cmd/compose/list.go diff --git a/cli/cmd/compose/logs.go b/cmd/compose/logs.go similarity index 100% rename from cli/cmd/compose/logs.go rename to cmd/compose/logs.go diff --git a/cli/cmd/compose/pause.go b/cmd/compose/pause.go similarity index 100% rename from cli/cmd/compose/pause.go rename to cmd/compose/pause.go diff --git a/cli/cmd/compose/port.go b/cmd/compose/port.go similarity index 100% rename from cli/cmd/compose/port.go rename to cmd/compose/port.go diff --git a/cli/cmd/compose/ps.go b/cmd/compose/ps.go similarity index 100% rename from cli/cmd/compose/ps.go rename to cmd/compose/ps.go diff --git a/cli/cmd/compose/pull.go b/cmd/compose/pull.go similarity index 100% rename from cli/cmd/compose/pull.go rename to cmd/compose/pull.go diff --git a/cli/cmd/compose/push.go b/cmd/compose/push.go similarity index 100% rename from cli/cmd/compose/push.go rename to cmd/compose/push.go diff --git a/cli/cmd/compose/remove.go b/cmd/compose/remove.go similarity index 100% rename from cli/cmd/compose/remove.go rename to cmd/compose/remove.go diff --git a/cli/cmd/compose/restart.go b/cmd/compose/restart.go similarity index 100% rename from cli/cmd/compose/restart.go rename to cmd/compose/restart.go diff --git a/cli/cmd/compose/run.go b/cmd/compose/run.go similarity index 100% rename from cli/cmd/compose/run.go rename to cmd/compose/run.go diff --git a/cli/cmd/compose/start.go b/cmd/compose/start.go similarity index 100% rename from cli/cmd/compose/start.go rename to cmd/compose/start.go diff --git a/cli/cmd/compose/stop.go b/cmd/compose/stop.go similarity index 100% rename from cli/cmd/compose/stop.go rename to cmd/compose/stop.go diff --git a/cli/cmd/compose/top.go b/cmd/compose/top.go similarity index 100% rename from cli/cmd/compose/top.go rename to cmd/compose/top.go diff --git a/cli/cmd/compose/up.go b/cmd/compose/up.go similarity index 100% rename from cli/cmd/compose/up.go rename to cmd/compose/up.go diff --git a/cli/cmd/compose/up_test.go b/cmd/compose/up_test.go similarity index 100% rename from cli/cmd/compose/up_test.go rename to cmd/compose/up_test.go diff --git a/cli/cmd/compose/version.go b/cmd/compose/version.go similarity index 100% rename from cli/cmd/compose/version.go rename to cmd/compose/version.go diff --git a/main.go b/cmd/main.go similarity index 92% rename from main.go rename to cmd/main.go index 6e23a730..322b7d76 100644 --- a/main.go +++ b/cmd/main.go @@ -26,17 +26,17 @@ import ( "github.com/spf13/cobra" "github.com/docker/compose-cli/api/context/store" - "github.com/docker/compose-cli/cli/cmd/compose" "github.com/docker/compose-cli/cli/metrics" + commands "github.com/docker/compose-cli/cmd/compose" "github.com/docker/compose-cli/internal" impl "github.com/docker/compose-cli/local/compose" - api "github.com/docker/compose-cli/pkg/api" + "github.com/docker/compose-cli/pkg/api" ) func main() { plugin.Run(func(dockerCli command.Cli) *cobra.Command { lazyInit := api.NewServiceProxy() - cmd := compose.RootCommand(store.DefaultContextType, lazyInit) + cmd := commands.RootCommand(store.DefaultContextType, lazyInit) originalPreRun := cmd.PersistentPreRunE cmd.PersistentPreRunE = func(cmd *cobra.Command, args []string) error { if err := plugin.PersistentPreRunE(cmd, args); err != nil { diff --git a/docs/yaml/main/generate.go b/docs/yaml/main/generate.go index 19353dc7..23fff8ac 100644 --- a/docs/yaml/main/generate.go +++ b/docs/yaml/main/generate.go @@ -27,7 +27,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" - "github.com/docker/compose-cli/cli/cmd/compose" + "github.com/docker/compose-cli/cmd/compose" . "github.com/docker/compose-cli/docs/yaml" )