fix handling binary path and fix tests

bruin-data · Nov 13, 2024 · 4777fd5 · 4777fd5
1 parent c8d1539
commit 4777fd5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/pkg/python/uv.go b/pkg/python/uv.go
@@ -67,13 +67,13 @@ func (u *UvChecker) EnsureUvInstalled(ctx context.Context) (string, error) {
 		if err != nil {
 			return "", err
 		}
-		return "", nil
+		return uvBinaryPath, nil
 	}
 
 	cmd := exec.Command(uvBinaryPath, "version", "--output-format", "json")
 	output, err := cmd.CombinedOutput()
 	if err != nil {
-		return "", fmt.Errorf("failed to check uv version: %w\nOutput: %s\n\nPlease install uv v%s yourself: https://docs.astral.sh/uv/getting-started/installation/", err, output, UvVersion)
+		return "", fmt.Errorf("failed to check uv version: %w -- Output: %s", err, output)
 	}
 
 	var uvVersion struct {
@@ -109,7 +109,7 @@ func (u *UvChecker) installUvCommand(ctx context.Context, dest string) error {
 	if runtime.GOOS == "windows" {
 		commandInstance = exec.Command(Shell, ShellSubcommandFlag, fmt.Sprintf("winget install --accept-package-agreements --accept-source-agreements --silent --id=astral-sh.uv --version %s --location %s -e", UvVersion, dest)) //nolint:gosec
 	} else {
-		commandInstance = exec.Command(Shell, ShellSubcommandFlag, fmt.Sprintf(" set -o pipefail; UV_INSTALL_DIR=\"%s\" curl -LsSf https://astral.sh/uv/%s/install.sh | sh", dest, UvVersion)) //nolint:gosec
+		commandInstance = exec.Command(Shell, ShellSubcommandFlag, fmt.Sprintf(" set -o pipefail; curl -LsSf https://astral.sh/uv/%s/install.sh | UV_INSTALL_DIR=\"%s\" NO_MODIFY_PATH=1 sh", UvVersion, dest)) //nolint:gosec
 	}
 
 	err := u.cmd.RunAnyCommand(ctx, commandInstance)

diff --git a/pkg/python/uv_test.go b/pkg/python/uv_test.go
@@ -14,9 +14,9 @@ type mockUvInstaller struct {
 	mock.Mock
 }
 
-func (m *mockUvInstaller) EnsureUvInstalled(ctx context.Context) error {
+func (m *mockUvInstaller) EnsureUvInstalled(ctx context.Context) (string, error) {
 	called := m.Called(ctx)
-	return called.Error(0)
+	return called.String(0), called.Error(1)
 }
 
 func Test_uvPythonRunner_Run(t *testing.T) {
@@ -46,7 +46,7 @@ func Test_uvPythonRunner_Run(t *testing.T) {
 				}).Return(assert.AnError)
 
 				inst := new(mockUvInstaller)
-				inst.On("EnsureUvInstalled", mock.Anything).Return(nil)
+				inst.On("EnsureUvInstalled", mock.Anything).Return("~/.bruin/uv", nil)
 
 				return &fields{
 					cmd:         cmd,
@@ -73,7 +73,7 @@ func Test_uvPythonRunner_Run(t *testing.T) {
 				}).Return(assert.AnError)
 
 				inst := new(mockUvInstaller)
-				inst.On("EnsureUvInstalled", mock.Anything).Return(nil)
+				inst.On("EnsureUvInstalled", mock.Anything).Return("~/.bruin/uv", nil)
 
 				return &fields{
 					cmd:         cmd,
@@ -100,7 +100,7 @@ func Test_uvPythonRunner_Run(t *testing.T) {
 				}).Return(assert.AnError)
 
 				inst := new(mockUvInstaller)
-				inst.On("EnsureUvInstalled", mock.Anything).Return(nil)
+				inst.On("EnsureUvInstalled", mock.Anything).Return("~/.bruin/uv", nil)
 
 				return &fields{
 					cmd:         cmd,