use /bin/bash instead of /bin/sh for venv

bruin-data · Dec 12, 2023 · e2bbfe0 · e2bbfe0
1 parent 63bfe68
commit e2bbfe0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/pkg/python/local.go b/pkg/python/local.go
@@ -63,7 +63,7 @@ func (l *localPythonRunner) Run(ctx context.Context, execCtx *executionContext)
 	}
 	fullCommand := fmt.Sprintf("source %s/bin/activate && echo 'activated virtualenv' && python3 -u -m %s", depsPath, execCtx.module)
 	return l.cmd.Run(ctx, execCtx.repo, &command{
-		Name:    "/bin/sh",
+		Name:    Shell,
 		Args:    []string{"-c", fullCommand},
 		EnvVars: execCtx.envVariables,
 	})

diff --git a/pkg/python/local_test.go b/pkg/python/local_test.go
@@ -131,7 +131,7 @@ func Test_localPythonRunner_Run(t *testing.T) {
 
 				cmd := new(mockCmd)
 				cmd.On("Run", mock.Anything, repo, &command{
-					Name: "/bin/sh",
+					Name: Shell,
 					Args: []string{"-c", expectedCommand},
 				}).Return(assert.AnError)
 
@@ -154,7 +154,7 @@ func Test_localPythonRunner_Run(t *testing.T) {
 
 				cmd := new(mockCmd)
 				cmd.On("Run", mock.Anything, repo, &command{
-					Name: "/bin/sh",
+					Name: Shell,
 					Args: []string{"-c", expectedCommand},
 				}).Return(nil)
 

diff --git a/pkg/python/venv.go b/pkg/python/venv.go
@@ -27,6 +27,8 @@ type installReqsToHomeDir struct {
 	lock sync.Mutex
 }
 
+const Shell = "/bin/bash"
+
 func (i *installReqsToHomeDir) EnsureVirtualEnvExists(ctx context.Context, repo *git.Repo, requirementsTxt string) (string, error) {
 	err := i.config.EnsureVirtualenvDirExists()
 	if err != nil {
@@ -69,7 +71,7 @@ func (i *installReqsToHomeDir) EnsureVirtualEnvExists(ctx context.Context, repo
 
 	fullCommand := fmt.Sprintf("source %s/bin/activate && pip3 install -r %s --quiet --quiet && echo 'installed all the dependencies'", venvPath, requirementsTxt)
 	err = i.cmd.Run(ctx, repo, &command{
-		Name: "/bin/sh",
+		Name: Shell,
 		Args: []string{"-c", fullCommand},
 	})
 

diff --git a/pkg/python/venv_test.go b/pkg/python/venv_test.go
@@ -171,7 +171,7 @@ func Test_installReqsToHomeDir_EnsureVirtualEnvExists(t *testing.T) {
 					Args: []string{"-m", "venv", "/path/to/venv"},
 				}).Return(nil)
 				fakeCmd.On("Run", mock.Anything, repo, &command{
-					Name: "/bin/sh",
+					Name: Shell,
 					Args: []string{"-c", "source /path/to/venv/bin/activate && pip3 install -r /path1/requirements.txt --quiet --quiet && echo 'installed all the dependencies'"},
 				}).Return(nil)