fix: move docker command

Signed-off-by: Vladislav Sukhin <[email protected]>

cmd/kubectl-testkube/commands/docker.go

@@ -0,0 +1,21 @@
+package commands
+
+import (
+ "github.com/spf13/cobra"
+
+ "github.com/kubeshop/testkube/cmd/kubectl-testkube/commands/docker"
+)
+
+func NewDockerCmd() *cobra.Command {
+
+ cmd := &cobra.Command{
+ Use: "docker",
+ Short: "Testkube Docker commands",
+ Run: func(cmd *cobra.Command, args []string) {
+ },
+ }
+
+ cmd.AddCommand(docker.NewInitCmd())
+
+ return cmd
+}

cmd/kubectl-testkube/commands/pro/docker.go → cmd/kubectl-testkube/commands/docker/init.go

@@ -1,18 +1,20 @@
-package pro
+package docker
 
 import (
  "errors"
+ "fmt"
  "os"
 
  "github.com/pterm/pterm"
  "github.com/spf13/cobra"
 
  "github.com/kubeshop/testkube/cmd/kubectl-testkube/commands/common"
  "github.com/kubeshop/testkube/cmd/kubectl-testkube/config"
+ "github.com/kubeshop/testkube/pkg/telemetry"
  "github.com/kubeshop/testkube/pkg/ui"
 )
 
-func NewDockerCmd() *cobra.Command {
+func NewInitCmd() *cobra.Command {
  var noLogin bool // ignore ask for login
  var dockerContainerName, dockerImage string
  var options common.HelmOptions
@@ -25,9 +27,9 @@ func NewDockerCmd() *cobra.Command {
  }
 
  cmd := &cobra.Command{
- Use: "docker",
+ Use: "init",
  Short: "Run Testkube Docker Agent and connect to Testkube Pro environment",
- Aliases: []string{"da", "docker-agent"},
+ Aliases: []string{"install", "agent"},
  Run: func(cmd *cobra.Command, args []string) {
  ui.Info("WELCOME TO")
  ui.Logo()
@@ -137,3 +139,28 @@ func NewDockerCmd() *cobra.Command {
 
  return cmd
 }
+
+func sendErrTelemetry(cmd *cobra.Command, clientCfg config.Data, errType string, errorLogs error) {
+ var errorStackTrace string
+ errorStackTrace = fmt.Sprintf("%+v", errorLogs)
+ if clientCfg.TelemetryEnabled {
+ ui.Debug("collecting anonymous telemetry data, you can disable it by calling `kubectl testkube disable telemetry`")
+ out, err := telemetry.SendCmdErrorEvent(cmd, common.Version, errType, errorStackTrace)
+ if ui.Verbose && err != nil {
+ ui.Err(err)
+ }
+
+ ui.Debug("telemetry send event response", out)
+ }
+}
+
+func sendAttemptTelemetry(cmd *cobra.Command, clientCfg config.Data) {
+ if clientCfg.TelemetryEnabled {
+ ui.Debug("collecting anonymous telemetry data, you can disable it by calling `kubectl testkube disable telemetry`")
+ out, err := telemetry.SendCmdAttemptEvent(cmd, common.Version)
+ if ui.Verbose && err != nil {
+ ui.Err(err)
+ }
+ ui.Debug("telemetry send event response", out)
+ }
+}

cmd/kubectl-testkube/commands/pro.go

@@ -19,7 +19,6 @@ func NewProCmd() *cobra.Command {
  cmd.AddCommand(pro.NewDisconnectCmd())
  cmd.AddCommand(pro.NewInitCmd())
  cmd.AddCommand(pro.NewLoginCmd())
- cmd.AddCommand(pro.NewDockerCmd())
 
  return cmd
 }

cmd/kubectl-testkube/commands/root.go

@@ -62,6 +62,7 @@ func init() {
  RootCmd.AddCommand(NewAgentCmd())
  RootCmd.AddCommand(NewCloudCmd())
  RootCmd.AddCommand(NewProCmd())
+ RootCmd.AddCommand(NewDockerCmd())
  RootCmd.AddCommand(pro.NewLoginCmd())
 
  RootCmd.SetHelpCommand(NewHelpCmd())