diff --git a/cli/main.go b/cli/main.go index 446d50469..c99483103 100644 --- a/cli/main.go +++ b/cli/main.go @@ -39,13 +39,13 @@ import ( "github.com/docker/compose-cli/cli/cmd/logout" "github.com/docker/compose-cli/cli/cmd/run" "github.com/docker/compose-cli/cli/cmd/volume" + "github.com/docker/compose-cli/cli/metrics" "github.com/docker/compose-cli/cli/mobycli" cliopts "github.com/docker/compose-cli/cli/options" "github.com/docker/compose-cli/config" apicontext "github.com/docker/compose-cli/context" "github.com/docker/compose-cli/context/store" "github.com/docker/compose-cli/errdefs" - "github.com/docker/compose-cli/metrics" // Backend registrations _ "github.com/docker/compose-cli/aci" diff --git a/metrics/client.go b/cli/metrics/client.go similarity index 100% rename from metrics/client.go rename to cli/metrics/client.go diff --git a/metrics/commands.go b/cli/metrics/commands.go similarity index 100% rename from metrics/commands.go rename to cli/metrics/commands.go diff --git a/metrics/conn_e2e.go b/cli/metrics/conn_e2e.go similarity index 100% rename from metrics/conn_e2e.go rename to cli/metrics/conn_e2e.go diff --git a/metrics/conn_other.go b/cli/metrics/conn_other.go similarity index 100% rename from metrics/conn_other.go rename to cli/metrics/conn_other.go diff --git a/metrics/conn_windows.go b/cli/metrics/conn_windows.go similarity index 100% rename from metrics/conn_windows.go rename to cli/metrics/conn_windows.go diff --git a/metrics/generatecommands/main.go b/cli/metrics/generatecommands/main.go similarity index 100% rename from metrics/generatecommands/main.go rename to cli/metrics/generatecommands/main.go diff --git a/metrics/metrics.go b/cli/metrics/metrics.go similarity index 100% rename from metrics/metrics.go rename to cli/metrics/metrics.go diff --git a/metrics/metrics_test.go b/cli/metrics/metrics_test.go similarity index 100% rename from metrics/metrics_test.go rename to cli/metrics/metrics_test.go diff --git a/cli/mobycli/exec.go b/cli/mobycli/exec.go index c46637ed2..651a923f2 100644 --- a/cli/mobycli/exec.go +++ b/cli/mobycli/exec.go @@ -26,10 +26,10 @@ import ( "github.com/spf13/cobra" + "github.com/docker/compose-cli/cli/metrics" "github.com/docker/compose-cli/cli/mobycli/resolvepath" apicontext "github.com/docker/compose-cli/context" "github.com/docker/compose-cli/context/store" - "github.com/docker/compose-cli/metrics" ) var delegatedContextTypes = []string{store.DefaultContextType} diff --git a/server/metrics.go b/server/metrics.go index bbd1131ec..bde81f9bb 100644 --- a/server/metrics.go +++ b/server/metrics.go @@ -21,7 +21,7 @@ import ( "google.golang.org/grpc" - "github.com/docker/compose-cli/metrics" + "github.com/docker/compose-cli/cli/metrics" "github.com/docker/compose-cli/server/proxy" ) diff --git a/server/metrics_test.go b/server/metrics_test.go index 3b47c7efe..4185cf541 100644 --- a/server/metrics_test.go +++ b/server/metrics_test.go @@ -33,8 +33,8 @@ import ( "github.com/docker/compose-cli/api/containers" "github.com/docker/compose-cli/api/secrets" "github.com/docker/compose-cli/api/volumes" + "github.com/docker/compose-cli/cli/metrics" "github.com/docker/compose-cli/errdefs" - "github.com/docker/compose-cli/metrics" composev1 "github.com/docker/compose-cli/protos/compose/v1" containersv1 "github.com/docker/compose-cli/protos/containers/v1" contextsv1 "github.com/docker/compose-cli/protos/contexts/v1" diff --git a/server/server.go b/server/server.go index e5adfa53f..a5511af13 100644 --- a/server/server.go +++ b/server/server.go @@ -25,7 +25,7 @@ import ( "google.golang.org/grpc/health" "google.golang.org/grpc/health/grpc_health_v1" - "github.com/docker/compose-cli/metrics" + "github.com/docker/compose-cli/cli/metrics" ) // New returns a new GRPC server.