Ensure build action is set

cmd/state-offline-installer/install.go

@@ -297,12 +297,12 @@ func (r *runner) setupRuntime(artifactsPath string, targetPath string) (*runtime
 	offlineProgress := newOfflineProgressOutput(r.out)
 	eventHandler := events.NewRuntimeEventHandler(offlineProgress, nil, logfile)
 
-	rti, err := runtime.New(offlineTarget, r.analytics, nil)
+	rti, err := runtime.New(offlineTarget, r.analytics, nil, nil)
 	if err != nil {
 		if !runtime.IsNeedsUpdateError(err) {
 			return nil, errs.Wrap(err, "Could not create runtime")
 		}
-		if err = rti.Update(nil, eventHandler); err != nil {
+		if err = rti.Update(eventHandler); err != nil {
 			return nil, errs.Wrap(err, "Had an installation error")
 		}
 	}

cmd/state/internal/cmdtree/cmdtree.go

@@ -204,6 +204,7 @@ func New(prime *primer.Values, args ...string) *CmdTree {
 		refreshCmd,
 		newSwitchCommand(prime),
 		newTestCommand(prime),
+		newCommitCommand(prime),
 	)
 
 	return &CmdTree{

cmd/state/internal/cmdtree/commit.go

@@ -0,0 +1,28 @@
+package cmdtree
+
+import (
+	"github.com/ActiveState/cli/internal/captain"
+	"github.com/ActiveState/cli/internal/locale"
+	"github.com/ActiveState/cli/internal/primer"
+	"github.com/ActiveState/cli/internal/runners/commit"
+)
+
+func newCommitCommand(prime *primer.Values) *captain.Command {
+	runner := commit.New(prime)
+
+	cmd := captain.NewCommand(
+		"commit",
+		locale.Tl("commit_title", "Commit Changes"),
+		locale.Tl("commit_description", "Commit changes to the Build Script"),
+		prime,
+		[]*captain.Flag{},
+		[]*captain.Argument{},
+		func(_ *captain.Command, _ []string) error {
+			return runner.Run()
+		},
+	)
+
+	cmd.SetGroup(EnvironmentSetupGroup)
+
+	return cmd
+}

go.mod

@@ -10,6 +10,7 @@ require (
 	github.com/ActiveState/termtest v0.7.2
 	github.com/ActiveState/termtest/expect v0.7.0
 	github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78
+	github.com/alecthomas/participle/v2 v2.0.0
 	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
 	github.com/andygrunwald/go-jira v1.15.1
 	github.com/aws/aws-sdk-go v1.34.28
@@ -131,7 +132,7 @@ require (
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
-	github.com/sergi/go-diff v1.1.0 // indirect
+	github.com/sergi/go-diff v1.3.1
 	github.com/src-d/gcfg v1.4.0 // indirect
 	github.com/stretchr/objx v0.5.0 // indirect
 	github.com/tklauser/go-sysconf v0.3.10 // indirect

go.sum

@@ -384,6 +384,10 @@ github.com/agnivade/levenshtein v1.1.1 h1:QY8M92nrzkmr798gCo3kmMyqXFzdQVpxLlGPRB
 github.com/agnivade/levenshtein v1.1.1/go.mod h1:veldBMzWxcCG2ZvUTKD2kJNRdCk5hVbJomOvKkmgYbo=
 github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs=
 github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs=
+github.com/alecthomas/assert/v2 v2.2.2 h1:Z/iVC0xZfWTaFNE6bA3z07T86hd45Xe2eLt6WVy2bbk=
+github.com/alecthomas/participle/v2 v2.0.0 h1:Fgrq+MbuSsJwIkw3fEj9h75vDP0Er5JzepJ0/HNHv0g=
+github.com/alecthomas/participle/v2 v2.0.0/go.mod h1:rAKZdJldHu8084ojcWevWAL8KmEU+AT+Olodb+WoN2Y=
+github.com/alecthomas/repr v0.2.0 h1:HAzS41CIzNW5syS8Mf9UwXhNH1J9aix/BvDRf1Ml2Yk=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
@@ -753,6 +757,7 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO
 github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=
 github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
 github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
+github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
 github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174/go.mod h1:DqJ97dSdRW1W22yXSB90986pcOyQ7r45iio1KN2ez1A=
 github.com/hinshun/vt10x v0.0.0-20180809195222-d55458df857c h1:kp3AxgXgDOmIJFR7bIwqFhwJ2qWar8tEQSE5XXhCfVk=
 github.com/hinshun/vt10x v0.0.0-20180809195222-d55458df857c/go.mod h1:DqJ97dSdRW1W22yXSB90986pcOyQ7r45iio1KN2ez1A=
@@ -949,8 +954,9 @@ github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
-github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
 github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
+github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
+github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
 github.com/shibukawa/configdir v0.0.0-20170330084843-e180dbdc8da0 h1:Xuk8ma/ibJ1fOy4Ee11vHhUFHQNpHhrBneOCNHVXS5w=
 github.com/shibukawa/configdir v0.0.0-20170330084843-e180dbdc8da0/go.mod h1:7AwjWCpdPhkSmNAgUv5C7EJ4AbmjEB3r047r3DXWu3Y=
 github.com/shirou/gopsutil/v3 v3.22.7 h1:flKnuCMfUUrO+oAvwAd6GKZgnPzr098VA/UJ14nhJd4=

internal/assets/contents/activestate.yaml.tpl

@@ -1,5 +1,2 @@
 project: {{.Project}}
-{{if and (.Private) (eq .CommitID "") }}
-private: {{.Private}}
-{{end}}
 {{.Content}}

internal/constants/constants.go

@@ -25,6 +25,16 @@ const ServiceCommandName = "state-svc"
 // ConfigFileName holds the name of the file that the user uses to configure their project, not to be confused with InternalConfigFileNameLegacy
 const ConfigFileName = "activestate.yaml"
 
+// ProjectConfigDirName is the name of the directory that holds project-specific data like commit ID.
+// This folder does not hold ConfigFileName. It is a sibling to that file in a given directory.
+const ProjectConfigDirName = ".activestate"
+
+// BuildScriptFileName holds the name of the file that represents the build script used to generate the runtime
+const BuildScriptFileName = "buildscript.yaml"
+
+// CommitIdFileName is the name of the file in ProjectConfigDirName that contains a project's commit ID.
+const CommitIdFileName = "commit"
+
 // InternalConfigNamespace holds the appdata folder name under which we store our config
 const InternalConfigNamespace = "activestate"
 
@@ -366,6 +376,9 @@ const RuntimeRecipeStore = "recipe"
 // RuntimeBuildPlanStore containts a serialization of the build plan used to create this build
 const RuntimeBuildPlanStore = "build_plan"
 
+// BuildExpressionStore holds the cached build expression for the current commit ID.
+const BuildExpressionStore = "build_expression"
+
 // StateToolMarketingPage links to the marketing page for the state tool
 const StateToolMarketingPage = "https://www.activestate.com/products/platform/state-tool/"
 
@@ -501,3 +514,7 @@ const TerminalAnimationInterval = 150 * time.Millisecond
 // RuntimeSetupWaitEnvVarName is only used for an integration test to pause installation and wait
 // for Ctrl+C.
 const RuntimeSetupWaitEnvVarName = "ACTIVESTATE_CLI_RUNTIME_SETUP_WAIT"
+
+// PlatformApiRequestRequestsEnvVarName is only used for an integration test to print some Platform
+// API request info.
+const PlatformApiPrintRequestsEnvVarName = "ACTIVESTATE_CLI_PLATFORM_API_PRINT_REQUESTS"

internal/constraints/constraints.go

@@ -3,16 +3,17 @@ package constraints
 import (
 	"bytes"
 	"fmt"
-	"path/filepath"
 	"regexp"
 	"sort"
 	"strings"
 	"text/template"
 
+	"github.com/ActiveState/cli/internal/errs"
 	"github.com/ActiveState/cli/internal/locale"
 	"github.com/ActiveState/cli/internal/logging"
 	"github.com/ActiveState/cli/internal/multilog"
 	"github.com/ActiveState/cli/internal/rtutils/ptr"
+	"github.com/ActiveState/cli/pkg/localcommit"
 	"github.com/ActiveState/cli/pkg/platform/authentication"
 	"github.com/ActiveState/cli/pkg/projectfile"
 	"github.com/ActiveState/cli/pkg/sysinfo"
@@ -76,9 +77,9 @@ type projectable interface {
 	Owner() string
 	Name() string
 	NamespaceString() string
-	CommitID() string
 	BranchName() string
 	Path() string
+	Dir() string
 	URL() string
 }
 
@@ -90,19 +91,20 @@ func NewPrimeConditional(auth *authentication.Auth, pj projectable, subshellName
 		pjURL       string
 		pjCommit    string
 		pjBranch    string
-		pjPath      string
+		pjDir       string
 	)
 	if !ptr.IsNil(pj) {
 		pjOwner = pj.Owner()
 		pjName = pj.Name()
 		pjNamespace = pj.NamespaceString()
 		pjURL = pj.URL()
-		pjCommit = pj.CommitID()
-		pjBranch = pj.BranchName()
-		pjPath = pj.Path()
-		if pjPath != "" {
-			pjPath = filepath.Dir(pjPath)
+		commitID, err := localcommit.Get(pj.Dir())
+		if err != nil && !localcommit.IsFileDoesNotExistError(err) {
+			multilog.Error("Unable to get local commit: %v", errs.JoinMessage(err))
 		}
+		pjCommit = commitID.String()
+		pjBranch = pj.BranchName()
+		pjDir = pj.Dir()
 	}
 
 	c := NewConditional(auth)
@@ -113,7 +115,7 @@ func NewPrimeConditional(auth *authentication.Auth, pj projectable, subshellName
 		"Url":       pjURL,
 		"Commit":    pjCommit,
 		"Branch":    pjBranch,
-		"Path":      pjPath,
+		"Path":      pjDir,
 
 		// Legacy
 		"NamespacePrefix": pjNamespace,

internal/constraints/testdata/activestate.yaml

@@ -1,2 +1,2 @@
-project: https://platform.activestate.com/constraints-tests/ActiveState?branch=main&commitID=00010001-0001-0001-0001-000100010001
+project: https://platform.activestate.com/constraints-tests/ActiveState?branch=main
 environments: "itworks"

internal/locale/locales/en-us.yaml

@@ -680,8 +680,6 @@ secrets_row_value_unset:
   other: "[ERROR]× Not defined[/RESET]"
 secrets_description_unset:
   other: "[DISABLED]Not provided.[/RESET]"
-pull_not_updated:
-  other: Your activestate.yaml is already up to date!
 pull_updated:
   other: Your project in the activestate.yaml has been updated to {{.V0}}@{{.V1}}.
 keypair_cmd_description:
@@ -1222,6 +1220,12 @@ package_update_config_file:
   other: To ensure your local project is synchronized with the ActiveState platform please use [ACTIONABLE]`state pull`[/RESET]
 inventory_ingredient_not_available:
   other: The package '[NOTICE]{{.V0}}[/RESET]' is not available on the ActiveState Platform, or does not have a matching version
+err_update_build_script:
+  other: Could not update runtime build script
+notice_commit_build_script:
+  other: |
+    Your local build script has changes that should be committed. Please run [ACTIONABLE]`state commit`[/RESET] to do so.
+
 command_flag_invalid_value:
   other: "Invalid value for {{.V0}} flag: [NOTICE]{{.V1}}[/RESET]"
 err_cmdtree:
@@ -1679,8 +1683,8 @@ artifact_succeeded:
   other: "Completed: [NOTICE]{{.V0}} ({{.V1}}/{{.V2}})[/RESET]"
 artifact_failed:
   other: "Failed: [NOTICE]{{.V0}}[/RESET]. Error returned: [ERROR]{{.V1}}[/RESET]"
-err_package_update_pjfile:
-  other: "Could not update your activestate.yaml with the new commit ID. Please run [ACTIONABLE]`state pull`[/RESET] manually."
+err_package_update_commit_id:
+  other: "Could not update your project runtime's commit ID. Please run [ACTIONABLE]`state pull`[/RESET] manually."
 prepare_protocol_warning:
   other: Could not add state protocol
 err_preparestart_shortcut:
@@ -2076,6 +2080,15 @@ err_init_authenticated:
   other: You need to be authenticated to initialize a project. Authenticate by running [ACTIONABLE]`state auth`[/RESET].
 err_country_blocked:
   other: This service is not available in your region.
+err_commit_id_invalid:
+  other: "Invalid project commit ID: {{.V0}}"
+commit_id_gitignore:
+  other: |
+    # Ignore {{.V0}}/{{.V1}} file; tracking this via VCS will cause users to have to resolve redundant conflicts
+    {{.V0}}/{{.V1}}
+notice_commit_id_gitignore:
+  other: |
+    The State Tool created an [ACTIONABLE]{{.V0}}/{{.V1}}[/RESET] file with your project's commit ID, but it was unable to add it to your [ACTIONABLE].gitignore[/RESET] file. Please add it manually.
 err_shortcutdir_writable:
   other: Could not continue as we don't have permission to create [ACTIONABLE]{{.V0}}[/RESET].
 err_edit_local_checkouts: