fix(cli): adding skip of version mismatch for the server install cmd (#…

…2651)
kubeshop · Jun 5, 2023 · f4ce24a · f4ce24a
1 parent f45bc54
commit f4ce24a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/cli/cmd/config.go b/cli/cmd/config.go
@@ -26,7 +26,8 @@ var (
 )
 
 type setupConfig struct {
-	shouldValidateConfig bool
+	shouldValidateConfig          bool
+	shouldValidateVersionMismatch bool
 }
 
 type setupOption func(*setupConfig)
@@ -37,9 +38,16 @@ func SkipConfigValidation() setupOption {
 	}
 }
 
+func SkipVersionMismatchCheck() setupOption {
+	return func(sc *setupConfig) {
+		sc.shouldValidateVersionMismatch = false
+	}
+}
+
 func setupCommand(options ...setupOption) func(cmd *cobra.Command, args []string) {
 	config := setupConfig{
-		shouldValidateConfig: true,
+		shouldValidateConfig:          true,
+		shouldValidateVersionMismatch: true,
 	}
 	for _, option := range options {
 		option(&config)
@@ -109,6 +117,10 @@ func setupCommand(options ...setupOption) func(cmd *cobra.Command, args []string
 			validateConfig(cmd, args)
 		}
 
+		if config.shouldValidateVersionMismatch {
+			validateVersionMismatch()
+		}
+
 		analytics.Init(cliConfig)
 	}
 }
@@ -202,7 +214,9 @@ func setupVersion() {
 
 	action := actions.NewGetServerVersionAction(options...)
 	versionText, isVersionMatch = action.GetVersion(ctx)
+}
 
+func validateVersionMismatch() {
 	if !isVersionMatch && os.Getenv("TRACETEST_DEV") == "" {
 		fmt.Fprintf(os.Stderr, versionText+`
 ✖️ Error: Version Mismatch

diff --git a/cli/cmd/server_cmd.go b/cli/cmd/server_cmd.go
@@ -9,7 +9,7 @@ var serverCmd = &cobra.Command{
 	Use:     "server",
 	Short:   "Manage your tracetest server",
 	Long:    "Manage your tracetest server",
-	PreRun:  setupCommand(),
+	PreRun:  setupCommand(SkipVersionMismatchCheck()),
 	Run: func(cmd *cobra.Command, args []string) {
 		cmd.Help()
 	},

diff --git a/cli/cmd/server_install_cmd.go b/cli/cmd/server_install_cmd.go
@@ -18,7 +18,7 @@ var serverInstallCmd = &cobra.Command{
 	Use:    "install",
 	Short:  "Install a new Tracetest server",
 	Long:   "Install a new Tracetest server",
-	PreRun: setupCommand(SkipConfigValidation()),
+	PreRun: setupCommand(SkipConfigValidation(), SkipVersionMismatchCheck()),
 	Run: func(_ *cobra.Command, _ []string) {
 		installer.Force = installerParams.Force
 		installer.RunEnvironment = installerParams.RunEnvironment