Merge pull request #15 from actionforge/feature/steps-context

Add steps expression support

Author: sebastianrath

.github/workflows/workflow.yml

@@ -4,6 +4,7 @@ on:
       - '*'
     branches:
       - main
+      - "feature/docker-run-node"
 
   pull_request:
     branches:

core/context.go

@@ -11,6 +11,8 @@ import (
 	"github.com/google/uuid"
 )
 
+const MAX_STEP_CACHE_ITEM_SIZE = 64 * 1024 // 64KB
+
 type ContextVisit struct {
 	Node     NodeBaseInterface `json:"-"`
 	NodeID   string            `json:"node_id"`
@@ -30,6 +32,82 @@ const (
 	Ephemeral
 )
 
+type StepCacheEntry struct {
+	Conclusion string         `json:"conclusion"`
+	Outputs    map[string]any `json:"outputs"`
+}
+
+// HierarchicalMap is a memory-efficient map that chains to parent contexts.
+// Each context only stores its own entries; lookups traverse the parent chain.
+type HierarchicalMap[K comparable, V any] struct {
+	data   map[K]V
+	parent *HierarchicalMap[K, V]
+}
+
+// NewHierarchicalMap creates a new map, optionally chained to a parent.
+func NewHierarchicalMap[K comparable, V any](parent *HierarchicalMap[K, V]) *HierarchicalMap[K, V] {
+	return &HierarchicalMap[K, V]{
+		data:   make(map[K]V),
+		parent: parent,
+	}
+}
+
+// Get retrieves a value by key, traversing up the parent chain if not found locally.
+func (m *HierarchicalMap[K, V]) Get(key K) (V, bool) {
+	if val, ok := m.data[key]; ok {
+		return val, true
+	}
+	if m.parent != nil {
+		return m.parent.Get(key)
+	}
+	var zero V
+	return zero, false
+}
+
+// GetLocal retrieves a value only from local data, not traversing parents.
+func (m *HierarchicalMap[K, V]) GetLocal(key K) (V, bool) {
+	val, ok := m.data[key]
+	return val, ok
+}
+
+// Set stores a value in the current context only (does not affect parent).
+func (m *HierarchicalMap[K, V]) Set(key K, value V) {
+	m.data[key] = value
+}
+
+// All returns all entries merged from the entire chain (child entries override parent).
+func (m *HierarchicalMap[K, V]) All() map[K]V {
+	result := make(map[K]V)
+	m.collectAll(result)
+	return result
+}
+
+func (m *HierarchicalMap[K, V]) collectAll(result map[K]V) {
+	if m.parent != nil {
+		m.parent.collectAll(result)
+	}
+	maps.Copy(result, m.data)
+}
+
+// StepCache is a type alias for the step output cache.
+type StepCache = HierarchicalMap[string, *StepCacheEntry]
+
+// NewStepCache creates a new step cache, optionally chained to a parent.
+func NewStepCache(parent *StepCache) *StepCache {
+	return NewHierarchicalMap(parent)
+}
+
+// GetOrCreateStepEntry retrieves an existing local entry or creates a new one.
+// Only checks local cache to avoid races on shared parent entries.
+func GetOrCreateStepEntry(cache *StepCache, key string) *StepCacheEntry {
+	if entry, ok := cache.GetLocal(key); ok {
+		return entry
+	}
+	entry := &StepCacheEntry{Outputs: make(map[string]any)}
+	cache.Set(key, entry)
+	return entry
+}
+
 // ExecutionState is a structure whose main purpose is to provide the correct output values
 // and environment variables requested by nodes that were executed in subsequent goroutines.
 //
@@ -85,6 +163,7 @@ type ExecutionState struct {
 	OutputCacheLock      *sync.RWMutex  `json:"-"`
 	DataOutputCache      map[string]any `json:"dataOutputCache"`
 	ExecutionOutputCache map[string]any `json:"executionOutputCache"`
+	StepCache            *StepCache     `json:"stepCache"`
 
 	DebugCallback DebugCallback `json:"-"`
 }
@@ -157,6 +236,7 @@ func (c *ExecutionState) PushNewExecutionState(parentNode NodeBaseInterface) *Ex
 		OutputCacheLock:      &sync.RWMutex{},
 		DataOutputCache:      make(map[string]any),
 		ExecutionOutputCache: make(map[string]any),
+		StepCache:            NewStepCache(c.StepCache),
 
 		Visited:       visited,
 		DebugCallback: c.DebugCallback,
@@ -203,19 +283,44 @@ func (c *ExecutionState) GetDataFromOutputCache(nodeCacheId string, outputId str
 	return nil, false
 }
 
-func (c *ExecutionState) CacheDataOutput(nodeCacheId string, outputId string, value any, ct CacheType) {
+func (c *ExecutionState) CacheDataOutput(node NodeBaseInterface, outputId string, value any, outputType string, ct CacheType) {
 	c.ContextStackLock.RLock()
 	defer c.ContextStackLock.RUnlock()
 
 	c.OutputCacheLock.Lock()
 	defer c.OutputCacheLock.Unlock()
 
-	cacheId := nodeCacheId + ":" + outputId
+	cacheId := node.GetCacheId() + ":" + outputId
 	if ct == Permanent {
 		c.ExecutionOutputCache[cacheId] = value
 	} else {
 		c.DataOutputCache[cacheId] = value
 	}
+
+	// Only cache primitive types under 64KB
+	if isPrimitiveType(outputType) && isUnderCacheLimit(value) {
+		stepEntry := GetOrCreateStepEntry(c.StepCache, node.GetId())
+		stepEntry.Outputs[outputId] = value
+	}
+}
+
+// isPrimitiveType returns true if the output type is a primitive type that should be cached.
+func isPrimitiveType(outputType string) bool {
+	switch outputType {
+	case "string", "number", "bool":
+		return true
+	default:
+		return false
+	}
+}
+
+// isUnderCacheLimit checks if a string value is under the cache size limit.
+// Non-string primitives always return true as they are small.
+func isUnderCacheLimit(value any) bool {
+	if s, ok := value.(string); ok {
+		return len(s) <= MAX_STEP_CACHE_ITEM_SIZE
+	}
+	return true
 }
 
 func (c *ExecutionState) EmptyDataOutputCache() {

core/docker.go

@@ -100,7 +100,7 @@ func (d *DockerClient) PullImage(ctx context.Context, imageRef string) error {
 	verbose := !IsTestE2eRunning()
 
 	if verbose {
-		utils.LogOut.Infof("%sPulling image '%s'\n", utils.LogGhStartGroup, imageRef)
+		utils.LogOut.Infof("%sPulling image '%s'\n", utils.LogGhStartGroup, utils.SanitizeImageRef(imageRef))
 		defer utils.LogOut.Infof(utils.LogGhEndGroup)
 	}
 
@@ -138,7 +138,7 @@ func (d *DockerClient) BuildImage(ctx context.Context, dockerfilePath, contextPa
 	verbose := !IsTestE2eRunning()
 
 	if verbose {
-		utils.LogOut.Infof("%sBuilding image '%s' from %s\n", utils.LogGhStartGroup, tag, dockerfilePath)
+		utils.LogOut.Infof("%sBuilding image '%s' from %s\n", utils.LogGhStartGroup, utils.SanitizeImageRef(tag), utils.SanitizeImageRef(dockerfilePath))
 		defer utils.LogOut.Infof(utils.LogGhEndGroup)
 	}
 

core/executions.go

@@ -30,6 +30,18 @@ func (n *Executions) Execute(outputPort OutputId, ec *ExecutionState, err error)
 
 	dest, hasDest := n.GetExecutionTarget(outputPort)
 
+	// Set the step conclusion for the SOURCE node based on which output port is being executed.
+	// This enables ${{ steps.X.conclusion }} syntax similar to GitHub Actions.
+	// The conclusion is set BEFORE downstream nodes execute so they can read it.
+	if hasDest && dest.SrcNode != nil {
+		srcStepEntry := GetOrCreateStepEntry(ec.StepCache, dest.SrcNode.GetId())
+		if err != nil {
+			srcStepEntry.Conclusion = "failure"
+		} else {
+			srcStepEntry.Conclusion = "success"
+		}
+	}
+
 	// if this is the error path, and the error port is not connected
 	// we return the error so it won't be silently ignored
 	if err != nil {

core/github.go

@@ -213,9 +213,12 @@ func LoadGitHubContext(env map[string]string, inputs map[string]any, secrets map
 	// Support for github.event.pull_request, github.event.commits, etc.
 	eventData := make(map[string]any)
 	if eventPath, ok := env["GITHUB_EVENT_PATH"]; ok && eventPath != "" {
-		fileContent, err := os.ReadFile(eventPath)
+		cleanPath, err := utils.ValidatePath(eventPath)
 		if err == nil {
-			_ = json.Unmarshal(fileContent, &eventData)
+			fileContent, err := os.ReadFile(cleanPath)
+			if err == nil {
+				_ = json.Unmarshal(fileContent, &eventData)
+			}
 		}
 	}
 
@@ -439,9 +442,13 @@ func SetupGitHubActionsEnv(finalEnv map[string]string) error {
 
 	for _, filePath := range fileCommandFiles {
 		if filePath != "" {
-			f, err := os.Create(filePath)
+			cleanPath, err := utils.ValidatePath(filePath)
+			if err != nil {
+				return CreateErr(nil, err, "invalid file command path %s", filePath)
+			}
+			f, err := os.Create(cleanPath)
 			if err != nil {
-				return CreateErr(nil, err, "failed to create file command file %s", filePath).
+				return CreateErr(nil, err, "failed to create file command file %s", cleanPath).
 					SetHint("Check that you have write permissions to the runner temp directory.")
 			}
 			f.Close()

core/github_evaluator.go

@@ -16,6 +16,7 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/actionforge/actrun-cli/utils"
 	"github.com/rhysd/actionlint"
 )
 
@@ -318,9 +319,13 @@ func (e *Evaluator) hashFiles(patterns ...string) (string, error) {
 	}
 	var uniqueFiles []string
 	for f := range fileSet {
-		info, err := os.Stat(f)
+		cleanPath, err := utils.ValidatePath(f)
+		if err != nil {
+			continue
+		}
+		info, err := os.Stat(cleanPath)
 		if err == nil && info.Mode().IsRegular() {
-			uniqueFiles = append(uniqueFiles, f)
+			uniqueFiles = append(uniqueFiles, cleanPath)
 		}
 	}
 	sort.Strings(uniqueFiles)
@@ -331,7 +336,11 @@ func (e *Evaluator) hashFiles(patterns ...string) (string, error) {
 
 	hasher := sha256.New()
 	for _, filePath := range uniqueFiles {
-		file, err := os.Open(filePath)
+		cleanPath, err := utils.ValidatePath(filePath)
+		if err != nil {
+			continue
+		}
+		file, err := os.Open(cleanPath)
 		if err != nil {
 			continue
 		}
@@ -356,7 +365,7 @@ func (e *Evaluator) resolveRootVar(name string) (any, error) {
 	case "needs":
 		return &GhNeedsProxy{GhNeeds: e.ctx.GhNeeds}, nil
 	case "steps":
-		return e.ctx.DataOutputCache, nil
+		return e.ctx.StepCache, nil
 	case "inputs":
 		return &InputsProxy{ctx: e.ctx}, nil
 	case "matrix":
@@ -475,6 +484,9 @@ func (e *Evaluator) evaluateArrayDeref(node *actionlint.ArrayDerefNode) (any, er
 		receiverVal = v.Secrets
 	case *InputsProxy:
 		receiverVal = v.ctx.Inputs
+	case *StepCache:
+		// Only flatten for iteration (steps.*)
+		return toSortedValues(v.All()), nil
 	}
 
 	switch m := receiverVal.(type) {
@@ -514,6 +526,19 @@ func (e *Evaluator) evaluateObjectDeref(node *actionlint.ObjectDerefNode) (any,
 			return val, nil
 		}
 
+	case *StepCache:
+		if entry, ok := v.Get(propName); ok {
+			return entry, nil
+		}
+
+	case *StepCacheEntry:
+		switch propName {
+		case "outputs":
+			return v.Outputs, nil
+		case "conclusion":
+			return v.Conclusion, nil
+		}
+
 	case map[string]any:
 		return lookupCaseInsensitive(v, propName), nil