Add powershell 7 support for sessions

PiperOrigin-RevId: 784039547

Author: WinOps Team

powershell/powershell.go

@@ -43,7 +43,8 @@ const (
 // PSConfig represents the command line parameters to use with invocations.
 type PSConfig struct {
 	ErrAction ErrorAction // The ErrorAction that is set.
-	Params    []string    // Additional parameters for calls to powershell.exe
+	Params    []string    // Additional parameters for calls to powershell.exe.
+	usePwsh7  bool        // Use PowerShell 7 if true.
 }
 
 var (

powershell/powershell_test.go

@@ -19,6 +19,7 @@ package powershell
 
 import (
 	"errors"
+	"os"
 	"path/filepath"
 	"testing"
 
@@ -125,6 +126,40 @@ func TestNewSession(t *testing.T) {
 	}
 }
 
+func TestNewSessionPwsh7(t *testing.T) {
+	// Stub out pwsh7 since it doesn't exist on Forge.
+	powerShell7Exe = filepath.Join(os.Getenv("SystemRoot"), `\System32\WindowsPowerShell\v1.0\powershell.exe`)
+	ps, err := NewSessionPwsh7()
+	if err != nil {
+		t.Fatalf("NewSessionPwsh7() failed: %v", err)
+	}
+	if err := ps.Close(); err != nil {
+		t.Fatalf("Close() failed: %v", err)
+	}
+}
+
+func TestNewSessionNoPwsh7(t *testing.T) {
+	ps, err := newSession(false)
+	if err != nil {
+		t.Fatalf("newSession() failed: %v", err)
+	}
+	if err := ps.Close(); err != nil {
+		t.Fatalf("Close() failed: %v", err)
+	}
+}
+
+func TestNewSessionWithPwsh7(t *testing.T) {
+	// Stub out pwsh7 since it doesn't exist on Forge.
+	powerShell7Exe = filepath.Join(os.Getenv("SystemRoot"), `\System32\WindowsPowerShell\v1.0\powershell.exe`)
+	ps, err := newSession(true)
+	if err != nil {
+		t.Fatalf("newSession() failed: %v", err)
+	}
+	if err := ps.Close(); err != nil {
+		t.Fatalf("Close() failed: %v", err)
+	}
+}
+
 func TestExecute(t *testing.T) {
 	ps, err := NewSession()
 	if err != nil {

powershell/powershell_windows.go

@@ -34,6 +34,7 @@ var (
 	powerShellCmd = powerShell
 
 	powerShellExe = filepath.Join(os.Getenv("SystemRoot"), `\System32\WindowsPowerShell\v1.0\powershell.exe`)
+	powerShell7Exe = `C:\Program Files\PowerShell\7\pwsh.exe`
 )
 
 // powerShell represents the OS command used to run a powerShell cmdlet on
@@ -121,7 +122,21 @@ type Session struct {
 
 // NewSession creates and starts a new PowerShell session.
 func NewSession() (*Session, error) {
-	cmd := exec.Command(powerShellExe, "-NoExit", "-NoProfile", "-Command", "-")
+	return newSession(false)
+}
+
+// NewSessionPwsh7 creates and starts a new PowerShell 7 session.
+func NewSessionPwsh7() (*Session, error) {
+	return newSession(true)
+}
+
+func newSession(usePwsh7 bool) (*Session, error) {
+	exe := powerShellExe
+	if usePwsh7 {
+		exe = powerShell7Exe
+	}
+
+	cmd := exec.Command(exe, "-NoExit", "-NoProfile", "-Command", "-")
 	stdin, err := cmd.StdinPipe()
 	if err != nil {
 		return nil, fmt.Errorf("failed to open stdin pipe: %w", err)