Use JSON instead of string array

Author: ivov

docs/environment.md

@@ -16,14 +16,14 @@ Example:
         "GENERIC_TIMEZONE",
         "N8N_RUNNERS_MAX_PAYLOAD",
         "N8N_RUNNERS_MAX_CONCURRENCY",
-        "N8N_RUNNERS_TASK_TIMEOUT",
+        "N8N_RUNNERS_TASK_TIMEOUT"
       ],
-      "override-envs": [
-        "NODE_FUNCTION_ALLOW_BUILTIN=crypto",
-        "NODE_FUNCTION_ALLOW_EXTERNAL=moment"
-        "NODE_OPTIONS=--max-old-space-size=4096"
-      ]
-    },
+      "env-overrides": {
+        "NODE_FUNCTION_ALLOW_BUILTIN": "crypto",
+        "NODE_FUNCTION_ALLOW_EXTERNAL": "moment",
+        "NODE_OPTIONS": "--max-old-space-size=4096"
+      }
+    }
   ]
 }
 ```

docs/setup.md

@@ -20,15 +20,15 @@ This launcher is intended for deployment as a sidecar container alongside one or
         "PATH",
         "GENERIC_TIMEZONE",
       ],
-      "override-envs": [
-        "N8N_RUNNERS_TASK_TIMEOUT=80",
-        "N8N_RUNNERS_AUTO_SHUTDOWN_TIMEOUT=120",
-        "N8N_RUNNERS_MAX_CONCURRENCY=3",
-        "NODE_FUNCTION_ALLOW_BUILTIN=crypto",
-        "NODE_FUNCTION_ALLOW_EXTERNAL=moment"
-        "NODE_OPTIONS=--max-old-space-size=4096",
-      ]
-    },
+      "env-overrides": {
+        "N8N_RUNNERS_TASK_TIMEOUT": "80",
+        "N8N_RUNNERS_AUTO_SHUTDOWN_TIMEOUT": "120",
+        "N8N_RUNNERS_MAX_CONCURRENCY": "3",
+        "NODE_FUNCTION_ALLOW_BUILTIN": "crypto",
+        "NODE_FUNCTION_ALLOW_EXTERNAL": "moment",
+        "NODE_OPTIONS": "--max-old-space-size=4096"
+      }
+    }
   ]
 }
 ```
@@ -39,7 +39,7 @@ Task runner config fields:
 - `workdir` is the path to directory containing the task runner binary.
 - `command` is the command to execute in order to start the task runner.
 - `args` are the args for the command to execute, currently the path to the task runner entrypoint.
-- `allowed-env` and `override-envs` are env vars that the launcher will pass through to or set directly on the runner, respectively. See [environment](environment.md).
+- `allowed-env` and `env-overrides` are env vars that the launcher will pass through to or set directly on the runner, respectively. See [environment](environment.md).
 
 3. Set the **environment variables** for the launcher.
 

internal/config/config.go

@@ -79,7 +79,7 @@ type RunnerConfig struct {
 	AllowedEnv []string `json:"allowed-env"`
 
 	// Env vars for the launcher to set directly on the runner.
-	EnvOverrides []string `json:"env-overrides"`
+	EnvOverrides map[string]string `json:"env-overrides"`
 }
 
 func LoadConfig(runnerType string, lookuper envconfig.Lookuper) (*Config, error) {

internal/env/env.go

@@ -132,17 +132,13 @@ func PrepareRunnerEnv(cfg *config.Config) []string {
 	runnerEnv = append(runnerEnv, fmt.Sprintf("%s=%s", EnvVarAutoShutdownTimeout, cfg.AutoShutdownTimeout))
 	runnerEnv = append(runnerEnv, fmt.Sprintf("%s=%s", EnvVarTaskTimeout, cfg.TaskTimeout))
 
-	for _, override := range cfg.Runner.EnvOverrides {
-		parts := strings.SplitN(override, "=", 2)
-		if len(parts) == 2 {
-			key := parts[0]
-			if slices.Contains(requiredRuntimeEnvVars, key) {
-				logs.Warnf("Disregarded env-override for required runtime variable: %s", key)
-				continue
-			}
-			runnerEnv = Clear(runnerEnv, key)
+	for key, value := range cfg.Runner.EnvOverrides {
+		if slices.Contains(requiredRuntimeEnvVars, key) {
+			logs.Warnf("Disregarded env-override for required runtime variable: %s", key)
+			continue
 		}
-		runnerEnv = append(runnerEnv, override)
+		runnerEnv = Clear(runnerEnv, key)
+		runnerEnv = append(runnerEnv, fmt.Sprintf("%s=%s", key, value))
 	}
 
 	logs.Debugf("Env vars to pass to runner: %v", keys(runnerEnv))

internal/env/env_test.go

@@ -253,8 +253,11 @@ func TestPrepareRunnerEnv(t *testing.T) {
 				AutoShutdownTimeout: "30",
 				TaskTimeout:         "60",
 				Runner: &config.RunnerConfig{
-					AllowedEnv:   []string{"CUSTOM_VAR1", "CUSTOM_VAR2"},
-					EnvOverrides: []string{"CUSTOM_VAR1=overridden", "NEW_VAR=added"},
+					AllowedEnv: []string{"CUSTOM_VAR1", "CUSTOM_VAR2"},
+					EnvOverrides: map[string]string{
+						"CUSTOM_VAR1": "overridden",
+						"NEW_VAR":     "added",
+					},
 				},
 			},
 			envSetup: map[string]string{
@@ -283,10 +286,10 @@ func TestPrepareRunnerEnv(t *testing.T) {
 				TaskTimeout:         "60",
 				Runner: &config.RunnerConfig{
 					AllowedEnv: []string{},
-					EnvOverrides: []string{
-						"N8N_RUNNERS_TASK_BROKER_URI=http://evil:5679",
-						"N8N_RUNNERS_HEALTH_CHECK_SERVER_ENABLED=false",
-						"CUSTOM_VAR=allowed",
+					EnvOverrides: map[string]string{
+						"N8N_RUNNERS_TASK_BROKER_URI":             "http://evil:5679",
+						"N8N_RUNNERS_HEALTH_CHECK_SERVER_ENABLED": "false",
+						"CUSTOM_VAR": "allowed",
 					},
 				},
 			},