Merge pull request ActiveState#3399 from ActiveState/version/0-45-0-RC2

Version 0.45.0-RC2

Author: Naatan

.github/workflows/build.yml

@@ -36,7 +36,7 @@ jobs:
     strategy:
       matrix:
         go-version:
-          - 1.20.x
+          - 1.22.x
         sys:
           - {os: ubuntu-latest}
           - {os: macos-12, shell: zsh}
@@ -175,7 +175,7 @@ jobs:
         name: Check Format
         id: check_format
         shell: bash
-        if: "!contains(fromJSON('[\"refs/heads/beta\", \"refs/heads/release\", \"refs/heads/LTS\"]'), github.ref) && !startsWith(github.event.pull_request.head.ref, 'version/')"
+        if: "!contains(fromJSON('[\"refs/heads/beta\", \"refs/heads/release\", \"refs/heads/LTS\", \"refs/heads/master\"]'), github.ref) && !startsWith(github.event.pull_request.head.ref, 'version/')"
         run: parallelize results Check-Format
 
       - # === Unit Tests ===

.github/workflows/propagate.yml

@@ -34,7 +34,7 @@ jobs:
         name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: '1.20.x'
+          go-version: '1.22.x'
 
       - # === Install State Tool ===
         name: Install State Tool

.github/workflows/release.yml

@@ -31,7 +31,7 @@ jobs:
         name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: '1.20.x'
+          go-version: '1.22.x'
 
       - # === Install State Tool ===
         name: Install State Tool

.github/workflows/verify.yml

@@ -36,7 +36,7 @@ jobs:
         name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: '1.20.x'
+          go-version: '1.22.x'
 
       - # === Install State Tool ===
         name: Install State Tool

activestate.yaml

@@ -51,12 +51,12 @@ scripts:
     if: ne .Shell "cmd"
     value: |
       if ! type "go" &> /dev/null; then
-        echo "go is not installed. Please install Go version 1.20 or above."
+        echo "go is not installed. Please install Go version 1.22 or above."
         exit 1
       fi
       if ! type "golangci-lint" &> /dev/null; then
         echo "golangci-lint was not found on your PATH, installing .."
-        go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.51.2
+        go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.59.1
       fi
       git config core.hooksPath .githooks
       if ! type "swagger" &> /dev/null; then
@@ -288,7 +288,7 @@ scripts:
     language: bash
     description: Runs unit tests (not integration tests)
     value: |
-      ACTIVESTATE_PROJECT="" go test -v `go list ./... | grep -v integration | grep -v automation | grep -v expect | grep -v state-svc | grep -v state-offline` $@
+      go test -v `go list ./... | grep -v integration | grep -v automation | grep -v expect | grep -v state-svc | grep -v state-offline` $@
     standalone: true
   - name: integration-tests
     language: bash
@@ -373,13 +373,9 @@ scripts:
 
       git fetch --quiet origin $TARGET_BRANCH:refs/remotes/origin/$TARGET_BRANCH
 
-      CHANGED=$(git diff --name-only origin/$TARGET_BRANCH)
+      CHANGED=$(git diff --name-only origin/$TARGET_BRANCH | grep -v testdata | grep -v vendor)
       NO_NEWLINE=0
       for FILE in $CHANGED; do
-          if [[ $FILE == vendor/* ]]; then
-              continue
-          fi
-
           if file "$FILE" | grep -q -E 'text|ASCII'; then
               if [ $(tail -c 1 "$FILE" | wc -l) -eq 0 ]; then
                   echo "Missing newline at end of file: $FILE"
@@ -458,13 +454,21 @@ scripts:
       fi
       perf stat -d -r 8 -e task-clock,page-faults,cycles,instructions -- ${@} >/dev/null
       ${updated} && sudo sh -c 'echo '${paranoid}' >/proc/sys/kernel/perf_event_paranoid'
+  - name: to-buildscript
+    language: bash
+    standalone: true
+    value: go run $project.path()/scripts/to-buildscript/main.go $@
+  - name: to-buildexpression
+    language: bash
+    standalone: true
+    value: go run $project.path()/scripts/to-buildexpression/main.go $@
 
 events:
   - name: activate
     if: ne .Shell "cmd"
     value: |
       $scripts.install-deps-dev.path()
   - name: file-changed
-    scope: ["internal/locale/locales"]
+    scope: [ "internal/locale/locales" ]
     value: build
 config_version: 1

changelog.md

@@ -6,6 +6,56 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.45.0
+
+### Added
+
+* On Linux we will now automatically detect the most appropriate platform based on the system glibc version.
+    * This only applies if your project has multiple linux platforms defined.
+    * If you were using the `runtime.preferred.glibc` config option it will still be respected, but you likely won't
+      need it anymore.
+* We now show failed builds when running `state artifacts`. You can still instrument the artifacts that did not fail.
+
+### Changed
+
+* We no longer support running shell-builtins through `state exec`, instead we require that the executable passed in
+  exists on the system. Running shell-builtins was never the intended behavior, but was a side-effect. You can still
+  access shell built-ins by running it through a shell, eg. `state exec -- cmd /C "where python3"`.
+* Our installers now give slightly better indication that a download is happening, avoiding confusion about the process
+  hanging.
+* We will now produce an error if you have an invalid `if` conditional in your activestate.yaml. Previously these
+  conditionals were simply assumed to be `false`.
+* We will now inform you there is nothing new to commit when running `state commit` with no changes to commit.
+* The `LOCAL` and `REMOTE` targets for `state reset` are now case-insensitive.
+* You can now `state checkout` a project without a language defined in its configuration.
+    * Note making changes to such a project in the State Tool is not yet fully supported.
+* When the State Tool encounters an unexpected internal we now relay this internal error to the user. Previously you
+  only received a generic "execute failed" error, which is far less helpful than an internal error.
+* Running `state pull` will now fail if the configured commit does not belong to the configured project.
+    * This is a corrupted state that the user can encounter by manually editing their activestate.yaml (eg. by resolving
+      a git conflict).
+
+### Fixed
+
+* Updates would retry and eventually timeout if it took longer than 30 seconds to download.
+* On Windows, arguments were not always escaped properly when using commands like `state exec`, or runtime executors.
+* Sometimes row/column text was not aligned properly.
+* Build progress and an empty build log would sometimes be produced when the build was already done.
+* The "Platforms" command group was shown twice on `state --help`, one of these should have been the "Authors" group.
+* When running `state artifacts` with the `--commit` flag; it was not respected when `--namespace` was also supplied.
+* Running `state publish` with a custom `EDITOR` environment variable would not respect the configured editor.
+* Sometimes `state pull` would produce conflicts when there shouldn't have been any.
+* Our service process now has a longer timeout window, eliminating state-svc errors when the system is under heavy load
+  and the service hasn't started yet (eg. when booting up).
+* We no longer show redundant bullets for each change under `state history`.
+* Running `state publish --edit` will no longer require you to supply a file (eg. you just want to change the
+  description).
+
+### Security
+
+* Addressed several CVEs, packages in question [have been updated](https://github.com/ActiveState/cli/pull/3306/files)
+  to more recent appropriate versions.
+
 ## 0.44.1
 
 ### Changed

cmd/state-exec/cmd.go

@@ -3,12 +3,11 @@ package main
 import (
 	"fmt"
 	"os"
-	"os/exec"
 )
 
 func runCmd(meta *executorMeta) (int, error) {
 	userArgs := os.Args[1:]
-	cmd := exec.Command(meta.MatchingBin, userArgs...)
+	cmd := Command(meta.MatchingBin, userArgs...)
 	cmd.Stdin = os.Stdin
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr

cmd/state-exec/cmd_lin_mac.go

@@ -0,0 +1,10 @@
+//go:build !windows
+// +build !windows
+
+package main
+
+import "os/exec"
+
+func Command(name string, arg ...string) *exec.Cmd {
+	return exec.Command(name, arg...)
+}

cmd/state-exec/cmd_windows.go

@@ -0,0 +1,99 @@
+package main
+
+import (
+	"os/exec"
+	"path/filepath"
+	"strings"
+	"syscall"
+
+	"github.com/ActiveState/cli/cmd/state-exec/internal/logr"
+)
+
+func Command(name string, arg ...string) *exec.Cmd {
+	cmd := exec.Command(name, arg...)
+
+	exeName := filepath.Base(strings.ToLower(name))
+	if exeName == "cmd" || strings.HasSuffix(exeName, ".bat") || strings.HasSuffix(exeName, ".cmd") {
+		// Go currently does not escape arguments properly on Windows, it account for spaces and tab characters, but not
+		// other characters that need escaping such as `<` and `>`.
+		// This can be dropped once we update to a Go version that fixes this bug: https://github.com/golang/go/issues/68313
+		cmd.SysProcAttr = &syscall.SysProcAttr{CmdLine: makeCmdLine(cmd.Args)}
+		logr.Debug("processed command line: %s", cmd.SysProcAttr.CmdLine)
+	}
+
+	return cmd
+}
+
+// makeCmdLine builds a command line out of args by escaping "special"
+// characters and joining the arguments with spaces.
+// Based on syscall\exec_windows.go
+func makeCmdLine(args []string) string {
+	var b []byte
+	for _, v := range args {
+		if len(b) > 0 {
+			b = append(b, ' ')
+		}
+		b = appendEscapeArg(b, v)
+	}
+	return string(b)
+}
+
+// appendEscapeArg escapes the string s, as per escapeArg,
+// appends the result to b, and returns the updated slice.
+// Based on syscall\exec_windows.go
+func appendEscapeArg(b []byte, s string) []byte {
+	if len(s) == 0 {
+		return append(b, `""`...)
+	}
+
+	needsBackslash := false
+	needsQuotes := false
+	for i := 0; i < len(s); i++ {
+		switch s[i] {
+		case '"', '\\':
+			needsBackslash = true
+		// Based on https://github.com/sebres/PoC/blob/master/SB-0D-001-win-exec/SOLUTION.md#definition
+		case ' ', '\t', '<', '>', '&', '|', '^', '!', '(', ')', '%':
+			needsQuotes = true
+		}
+	}
+
+	if !needsBackslash && !needsQuotes {
+		// No special handling required; normal case.
+		return append(b, s...)
+	}
+	if !needsBackslash {
+		// hasSpace is true, so we need to quote the string.
+		b = append(b, '"')
+		b = append(b, s...)
+		return append(b, '"')
+	}
+
+	if needsQuotes {
+		b = append(b, '"')
+	}
+	slashes := 0
+	for i := 0; i < len(s); i++ {
+		c := s[i]
+		switch c {
+		default:
+			slashes = 0
+		case '\\':
+			slashes++
+		case '"':
+			for ; slashes > 0; slashes-- {
+				b = append(b, '\\')
+			}
+			b = append(b, '\\')
+		}
+		b = append(b, c)
+	}
+	if needsQuotes {
+		for ; slashes > 0; slashes-- {
+			b = append(b, '\\')
+		}
+		b = append(b, '"')
+	}
+
+	return b
+}

cmd/state-installer/installer.go

@@ -108,7 +108,7 @@ func (i *Installer) Install() (rerr error) {
 			// If we got to this point, we could not copy and rename over existing files.
 			// This is a permission issue. (We have an installer test for copying and renaming over a file
 			// in use, which does not raise an error.)
-			return locale.WrapInputError(err, "err_update_access_denied", "", errs.JoinMessage(err))
+			return locale.WrapExternalError(err, "err_update_access_denied", "", errs.JoinMessage(err))
 		}
 		return errs.Wrap(err, "Failed to copy installation files to dir %s. Error received: %s", i.path, errs.JoinMessage(err))
 	}