Merge remote-tracking branch 'origin/main' into test-improvements

Author: jahvon

.execs/test.flow

@@ -45,29 +45,29 @@ executables:
     name: unit
     description: Run unit tests with coverage
     serial:
+      dir: //
       execs:
         - cmd: |
             pwd
             ls
             echo "Running Go unit tests with coverage..."
             go test -race -coverprofile=unit-coverage.out -covermode=atomic -tags=unit ./...
             echo "Unit tests completed"
-          dir: //
           retries: 3
 
 
   - verb: test
     name: e2e
     description: Run E2E tests with instrumented binary and coverage
     serial:
+      dir: //
       execs:
         - cmd: |
             pwd
             ls
             echo "Running Go E2E tests..."
             go test -race -coverprofile=unit-coverage.out -covermode=atomic -coverpkg=./... -tags=e2e ./tests/...
             echo "E2E tests completed"
-          dir: //
           retries: 1
 
   - verb: test

.execs/validate.flow

@@ -36,6 +36,7 @@ executables:
     tags: [go]
     description: Run linters and formatters
     parallel:
+      dir: //
       execs:
         - cmd: go fmt ./...
           dir: //
@@ -49,7 +50,6 @@ executables:
             fi
 
             golangci-lint run ./... --fix --output.sarif.path lint.sarif
-          dir: //
 
   - verb: lint
     name: ts

docs/schemas/flowfile_schema.json

@@ -212,6 +212,10 @@
         "args": {
           "$ref": "#/definitions/ExecutableArgumentList"
         },
+        "dir": {
+          "$ref": "#/definitions/ExecutableDirectory",
+          "default": ""
+        },
         "execs": {
           "$ref": "#/definitions/ExecutableParallelRefConfigList",
           "description": "A list of executables to run in parallel.\nEach executable can be a command or a reference to another executable.\n"
@@ -450,6 +454,10 @@
         "args": {
           "$ref": "#/definitions/ExecutableArgumentList"
         },
+        "dir": {
+          "$ref": "#/definitions/ExecutableDirectory",
+          "default": ""
+        },
         "execs": {
           "$ref": "#/definitions/ExecutableSerialRefConfigList",
           "description": "A list of executables to run in serial.\nEach executable can be a command or a reference to another executable.\n"

docs/types/flowfile.md

@@ -187,6 +187,7 @@ Launches an application or opens a URI.
 | Field | Description | Type | Default | Required |
 | ----- | ----------- | ---- | ------- | :--------: |
 | `args` |  | [ExecutableArgumentList](#ExecutableArgumentList) | <no value> |  |
+| `dir` |  | [ExecutableDirectory](#ExecutableDirectory) |  |  |
 | `execs` | A list of executables to run in parallel. Each executable can be a command or a reference to another executable.  | [ExecutableParallelRefConfigList](#ExecutableParallelRefConfigList) | <no value> | ✘ |
 | `failFast` | End the parallel execution as soon as an exec exits with a non-zero status. This is the default behavior. When set to false, all execs will be run regardless of the exit status of parallel execs.  | `boolean` | <no value> |  |
 | `maxThreads` | The maximum number of threads to use when executing the parallel executables. | `integer` | 5 |  |
@@ -335,6 +336,7 @@ Executes a list of executables in serial.
 | Field | Description | Type | Default | Required |
 | ----- | ----------- | ---- | ------- | :--------: |
 | `args` |  | [ExecutableArgumentList](#ExecutableArgumentList) | <no value> |  |
+| `dir` |  | [ExecutableDirectory](#ExecutableDirectory) |  |  |
 | `execs` | A list of executables to run in serial. Each executable can be a command or a reference to another executable.  | [ExecutableSerialRefConfigList](#ExecutableSerialRefConfigList) | <no value> | ✘ |
 | `failFast` | End the serial execution as soon as an exec exits with a non-zero status. This is the default behavior. When set to false, all execs will be run regardless of the exit status of the previous exec.  | `boolean` | <no value> |  |
 | `params` |  | [ExecutableParameterList](#ExecutableParameterList) | <no value> |  |

internal/runner/parallel/parallel.go

@@ -61,6 +61,7 @@ func (r *parallelRunner) Exec(
 	return fmt.Errorf("no parallel executables to run")
 }
 
+//nolint:funlen
 func handleExec(
 	ctx *context.Context, parent *executable.Executable,
 	eng engine.Engine,
@@ -116,13 +117,21 @@ func handleExec(
 			maps.Copy(execPromptedEnv, a)
 		}
 
-		fields := map[string]interface{}{
-			"step": exec.ID(),
-		}
-		if exec.Exec != nil {
+		var dir executable.Directory
+		switch {
+		case exec.Exec != nil:
+			fields := map[string]interface{}{"step": exec.ID()}
 			exec.Exec.SetLogFields(fields)
+			dir = exec.Exec.Dir
+		case parent.Parallel != nil:
+			dir = exec.Parallel.Dir
+		case parent.Serial != nil:
+			dir = exec.Serial.Dir
 		}
-
+		if dir == "" {
+			dir = parent.Parallel.Dir
+		}
+		exec.Exec.Dir = dir
 		runExec := func() error {
 			err := runner.Exec(ctx, exec, eng, execPromptedEnv)
 			if err != nil {

internal/runner/serial/serial.go

@@ -60,6 +60,7 @@ func (r *serialRunner) Exec(
 	return fmt.Errorf("no serial executables to run")
 }
 
+//nolint:funlen
 func handleExec(
 	ctx *context.Context,
 	parent *executable.Executable,
@@ -111,10 +112,22 @@ func handleExec(
 			}
 			maps.Copy(execPromptedEnv, a)
 		}
-		fields := map[string]interface{}{"step": exec.ID()}
-		if exec.Exec != nil {
+
+		var dir executable.Directory
+		switch {
+		case exec.Exec != nil:
+			fields := map[string]interface{}{"step": exec.ID()}
 			exec.Exec.SetLogFields(fields)
+			dir = exec.Exec.Dir
+		case parent.Parallel != nil:
+			dir = exec.Parallel.Dir
+		case parent.Serial != nil:
+			dir = exec.Serial.Dir
+		}
+		if dir == "" {
+			dir = parent.Serial.Dir
 		}
+		exec.Exec.Dir = dir
 
 		runExec := func() error {
 			return runSerialExecFunc(ctx, i, refConfig, exec, eng, execPromptedEnv, serialSpec)

types/executable/executable.gen.go

@@ -385,6 +385,9 @@ definitions:
     type: object
     required: [execs]
     properties:
+      dir:
+        $ref: '#/definitions/Directory'
+        default: ""
       params:
         $ref: '#/definitions/ParameterList'
       args:
@@ -565,6 +568,9 @@ definitions:
     required: [execs]
     description: Executes a list of executables in serial.
     properties:
+      dir:
+        $ref: '#/definitions/Directory'
+        default: ""
       params:
         $ref: '#/definitions/ParameterList'
       args: