Merge branch 'main' into logging-refinement

Signed-off-by: Simon Heather <[email protected]>

server/core/runtime/models/shell_command_runner.go

@@ -173,11 +173,13 @@ func (s *ShellCommandRunner) RunCommandAsync(ctx command.ProjectContext) (chan<-
 
 		// We're done now. Send an error if there was one.
 		if err != nil {
-			err = errors.Wrapf(err, "running '%s' in '%s'", s.command, s.workingDir)
+			err = errors.Wrapf(err, "running '%s %s' in '%s'",
+				s.shell.String(), s.command, s.workingDir)
 			log.Err(err.Error())
 			outCh <- Line{Err: err}
 		} else {
-			log.Info("Successfully ran '%s' in '%s'", s.command, s.workingDir)
+			log.Info("successfully ran '%s %s' in '%s'",
+				s.shell.String(), s.command, s.workingDir)
 		}
 	}()
 

server/core/terraform/terraform_client_internal_test.go

@@ -344,7 +344,7 @@ func TestDefaultClient_RunCommandAsync_ExitOne(t *testing.T) {
 	_, outCh := client.RunCommandAsync(ctx, tmp, []string{"dying", "&&", "exit", "1"}, map[string]string{}, nil, "workspace")
 
 	out, err := waitCh(outCh)
-	ErrEquals(t, fmt.Sprintf(`running 'echo dying && exit 1' in '%s': exit status 1`, tmp), err)
+	ErrEquals(t, fmt.Sprintf(`running 'sh -c echo dying && exit 1' in '%s': exit status 1`, tmp), err)
 	// Test that we still get our output.
 	Equals(t, "dying", out)