Merge branch version/0-47-0-RC1 to adopt changes from PR #3551

activestate.yaml

@@ -181,9 +181,9 @@ scripts:
     value: |
       set -e
       $constants.SET_ENV
-      TARGET=$BUILD_REMOTE_INSTALLER_TARGET
+      TARGET=$constants.BUILD_REMOTE_INSTALLER_TARGET
       if [[ "$GOOS" == "windows" || "$OS" == "Windows_NT" ]]; then
-        TARGET="${BUILD_REMOTE_INSTALLER_TARGET}.exe"
+        TARGET="${constants.BUILD_REMOTE_INSTALLER_TARGET}.exe"
       fi
       GOFLAGS="" go install github.com/josephspurrier/goversioninfo/cmd/[email protected]
       cd cmd/state-remote-installer

test/integration/remote_installer_int_test.go

@@ -2,14 +2,19 @@ package integration
 
 import (
 	"fmt"
+	"os/exec"
 	"path/filepath"
+	"runtime"
+	"strings"
 	"testing"
 
+	svcAutostart "github.com/ActiveState/cli/cmd/state-svc/autostart"
 	anaConst "github.com/ActiveState/cli/internal/analytics/constants"
 	"github.com/ActiveState/cli/internal/constants"
 	"github.com/ActiveState/cli/internal/environment"
 	"github.com/ActiveState/cli/internal/fileutils"
 	"github.com/ActiveState/cli/internal/osutils"
+	"github.com/ActiveState/cli/internal/osutils/autostart"
 	"github.com/ActiveState/cli/internal/testhelpers/e2e"
 	"github.com/ActiveState/cli/internal/testhelpers/suite"
 	"github.com/ActiveState/cli/internal/testhelpers/tagsuite"
@@ -25,6 +30,28 @@ func (suite *RemoteInstallIntegrationTestSuite) TestInstall() {
 	ts := e2e.New(suite.T(), false)
 	defer ts.Close()
 
+	// Setup running the remote installer in restricted powershell mode.
+	if runtime.GOOS == "windows" {
+		getPolicy := func() string {
+			policy, err := exec.Command("powershell.exe", "Get-ExecutionPolicy").CombinedOutput()
+			suite.Require().NoError(err, "error getting policy: "+string(policy))
+			return strings.TrimSpace(string(policy))
+		}
+		setPolicy := func(policy string) {
+			output, err := exec.Command("powershell.exe", "Set-ExecutionPolicy", "-ExecutionPolicy", policy).CombinedOutput()
+			suite.Require().NoError(err, "error setting policy: "+string(output))
+		}
+
+		policy := getPolicy()
+		defer func() {
+			setPolicy(policy)
+			suite.Assert().Equal(policy, getPolicy(), "execution policy was not reset to '"+policy+"'; subsequent test results may be invalid")
+		}()
+
+		setPolicy("Restricted")
+		suite.Assert().Equal("Restricted", getPolicy(), "should have set powershell policy to 'Restricted'")
+	}
+
 	tests := []struct {
 		Name    string
 		Version string
@@ -103,6 +130,13 @@ func (suite *RemoteInstallIntegrationTestSuite) TestInstall() {
 				}
 			}
 			suite.Assert().True(sessionTokenFound, "sessionToken was not found in analytics")
+
+			// Verify a startup shortcut was created (we use powershell to create it).
+			if runtime.GOOS == "windows" {
+				shortcut, err := autostart.AutostartPath("", svcAutostart.Options)
+				suite.Require().NoError(err)
+				suite.Assert().FileExists(shortcut)
+			}
 		})
 	}
 }
@@ -112,7 +146,7 @@ func (s *RemoteInstallIntegrationTestSuite) setupTest(ts *e2e.Session) {
 	buildDir := fileutils.Join(root, "build")
 	installerExe := filepath.Join(buildDir, constants.StateRemoteInstallerCmd+osutils.ExeExtension)
 	if !fileutils.FileExists(installerExe) {
-		s.T().Fatal("E2E tests require a state-remote-installer binary. Run `state run build-installer`.")
+		s.T().Fatal("E2E tests require a state-remote-installer binary. Run `state run build-remote-installer`.")
 	}
 	s.remoteInstallerExe = ts.CopyExeToDir(installerExe, filepath.Join(ts.Dirs.Base, "installer"))
 }