🐛 QD-12352 Change exec.Command to functions from utils (#648)

* 🐛 QD-12352 Change exec.Command to functions from utils

* 🐛 QD-12352 Add tests with spaces in archive path

* 🐛 QD-12352 Fix space issues with other OS

---------

Co-authored-by: Andrei Iurko <[email protected]>
Co-authored-by: alexey.afanasiev <[email protected]>

Author: 3 people

cli/go.work.sum

@@ -50,8 +50,12 @@ go.etcd.io/etcd/client/v2 v2.305.12/go.mod h1:aQ/yhsxMu+Oht1FOupSr60oBvcS9cKXHrz
 go.etcd.io/etcd/client/v3 v3.5.12/go.mod h1:tSbBCakoWmmddL+BKVAJHa9km+O/E+bumDe9mSbPiqw=
 go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0=
+go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw=
+golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
 golang.org/x/telemetry v0.0.0-20240521205824-bda55230c457/go.mod h1:pRgIJT+bRLFKnoM1ldnzKoxTIn14Yxz928LQRYYgIN0=
+golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
+golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI=
 golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
 google.golang.org/api v0.171.0/go.mod h1:Hnq5AHm4OTMt2BUVjael2CWZFD6vksJdWCWiUAmjC9o=
 google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds=

core/startup/installers.go

@@ -21,14 +21,6 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
-	"github.com/JetBrains/qodana-cli/v2025/platform"
-	"github.com/JetBrains/qodana-cli/v2025/platform/msg"
-	"github.com/JetBrains/qodana-cli/v2025/platform/product"
-	"github.com/JetBrains/qodana-cli/v2025/platform/strutil"
-	"github.com/JetBrains/qodana-cli/v2025/platform/utils"
-	cp "github.com/otiai10/copy"
-	"github.com/pterm/pterm"
-	log "github.com/sirupsen/logrus"
 	"io"
 	"io/fs"
 	"math/rand"
@@ -37,6 +29,15 @@ import (
 	"path/filepath"
 	"runtime"
 	"strings"
+
+	"github.com/JetBrains/qodana-cli/v2025/platform"
+	"github.com/JetBrains/qodana-cli/v2025/platform/msg"
+	"github.com/JetBrains/qodana-cli/v2025/platform/product"
+	"github.com/JetBrains/qodana-cli/v2025/platform/strutil"
+	"github.com/JetBrains/qodana-cli/v2025/platform/utils"
+	cp "github.com/otiai10/copy"
+	"github.com/pterm/pterm"
+	log "github.com/sirupsen/logrus"
 )
 
 func downloadAndInstallIDE(
@@ -210,13 +211,14 @@ func getIde(analyzer product.Analyzer) *ReleaseDownloadInfo {
 
 // installIdeWindowsExe is used as a fallback, since it needs installation privileges and alters the registry
 func installIdeWindowsExe(archivePath string, targetDir string) error {
-	output, err := exec.Command(
-		archivePath,
+	stdout, stderr, _, err := utils.RunCmdRedirectOutput(
+		"",
+		strutil.QuoteForWindows(archivePath),
 		"/S",
 		fmt.Sprintf("/D=%s", strutil.QuoteForWindows(targetDir)),
-	).CombinedOutput()
+	)
 	if err != nil {
-		return fmt.Errorf("%s: %s. Output: %s", archivePath, err, string(output))
+		return fmt.Errorf("%s: %s. Stdout: %s. Stderr: %s", archivePath, err, stdout, stderr)
 	}
 	return nil
 }
@@ -237,16 +239,16 @@ func installIdeFromZip(archivePath string, targetDir string) error {
 	if err != nil {
 		return fmt.Errorf("couldn't create a temporary directory %w", err)
 	}
-
-	output, err := exec.Command(
+	stdout, stderr, _, err := utils.RunCmdRedirectOutput(
+		"",
 		"tar",
 		"-xf",
-		strutil.QuoteForWindows(archivePath),
+		strutil.GetQuotedPath(archivePath),
 		"-C",
-		strutil.QuoteForWindows(tempDir),
-	).CombinedOutput()
+		strutil.GetQuotedPath(tempDir),
+	)
 	if err != nil {
-		return fmt.Errorf("extracting files error: %w. Output: %s", err, string(output))
+		return fmt.Errorf("extracting files error: %w. Stdout: %s. Stderr: %s", err, stdout, stderr)
 	}
 
 	err = os.Rename(tempDir, targetDir)
@@ -276,17 +278,19 @@ func installIdeFromTar(archivePath string, targetDir string) error {
 	if err := os.MkdirAll(targetDir, os.ModePerm); err != nil {
 		log.Fatal("couldn't create a directory ", err.Error())
 	}
-	output, err := exec.Command(
+	stdout, stderr, _, err := utils.RunCmdRedirectOutput(
+		"",
 		"tar",
 		"-xf",
-		archivePath,
+		strutil.GetQuotedPath(archivePath),
 		"-C",
-		targetDir,
+		strutil.GetQuotedPath(targetDir),
 		"--strip-components",
 		"1",
-	).CombinedOutput()
+	)
+
 	if err != nil {
-		return fmt.Errorf("tar: %s. Output: %s", err, string(output))
+		return fmt.Errorf("tar: %s. Stdout: %s. Stderr: %s", err, stdout, stderr)
 	}
 	return nil
 }
@@ -380,7 +384,7 @@ func downloadCustomPlugins(ideUrl string, targetDir string, spinner *pterm.Spinn
 		return fmt.Errorf("error while downloading plugins: %v", err)
 	}
 
-	_, err = exec.Command("tar", "-xf", archivePath, "-C", targetDir).Output()
+	_, err = utils.RunCmd("", "tar", "-xf", strutil.GetQuotedPath(archivePath), "-C", strutil.GetQuotedPath(targetDir))
 	if err != nil {
 		return fmt.Errorf("tar: %s", err)
 	}

core/startup/installers_test.go

@@ -108,22 +108,30 @@ func TestInstallIdeFromZip(t *testing.T) {
 	tests := []struct {
 		name       string
 		useSymlink bool
+		dirPattern string
 	}{
 		{
 			name:       "regular directory",
 			useSymlink: false,
+			dirPattern: "qodana_test",
 		},
 		{
 			name:       "symlink directory",
 			useSymlink: true,
+			dirPattern: "qodana_test",
+		},
+		{
+			name:       "arch path with space",
+			useSymlink: true,
+			dirPattern: "qodana _test",
 		},
 	}
 
 	for _, tt := range tests {
 		t.Run(
 			tt.name, func(t *testing.T) {
 				// Create a temporary directory for the test
-				tempDir, err := os.MkdirTemp("", "qodana_test_")
+				tempDir, err := os.MkdirTemp("", tt.dirPattern)
 				if err != nil {
 					t.Fatalf("Failed to create temporary directory: %v", err)
 				}

platform/strutil/strutil.go

@@ -86,6 +86,14 @@ func QuoteForWindows(s string) string {
 	return s
 }
 
+// GetQuotedPath returns a quoted path for the current OS.
+func GetQuotedPath(path string) string {
+	if runtime.GOOS == "windows" {
+		return QuoteForWindows(path)
+	}
+	return QuoteIfSpace(path)
+}
+
 // IsStringQuoted checks if a string is already quoted with double quotes.
 func IsStringQuoted(s string) bool {
 	return strings.HasPrefix(s, "\"") && strings.HasSuffix(s, "\"")