set correct exit code when running a script with an invalid option

cmd/config.go

@@ -164,15 +164,13 @@ func readEnvConfig(envMap map[string]string) (Config, error) {
 // TODO: add better validation, more explicit default values and improve consistency between formats
 // TODO: accumulate all errors and differentiate between the layers?
 func getConsolidatedConfig(gs *state.GlobalState, cliConf Config, runnerOpts lib.Options) (conf Config, err error) {
-	// TODO: use errext.WithExitCodeIfNone(err, exitcodes.InvalidConfig) where it makes sense?
-
 	fileConf, err := readDiskConfig(gs)
 	if err != nil {
-		return conf, err
+		return conf, errext.WithExitCodeIfNone(err, exitcodes.InvalidConfig)
 	}
 	envConf, err := readEnvConfig(gs.Env)
 	if err != nil {
-		return conf, err
+		return conf, errext.WithExitCodeIfNone(err, exitcodes.InvalidConfig)
 	}
 
 	conf = cliConf.Apply(fileConf)

cmd/run_test.go

@@ -118,7 +118,9 @@ func TestRunScriptErrorsAndAbort(t *testing.T) {
 		testFilename, name   string
 		expErr, expLogOutput string
 		expExitCode          exitcodes.ExitCode
+		configFilename       string
 		extraArgs            []string
+		envVars              map[string]string
 	}{
 		{
 			testFilename: "abort.js",
@@ -146,6 +148,41 @@ func TestRunScriptErrorsAndAbort(t *testing.T) {
 			expErr:       "ReferenceError: someUndefinedVar is not defined",
 			expExitCode:  exitcodes.ScriptException,
 		},
+		{
+			testFilename: "invalidconfig/invalid_option.js",
+			name:         "run should fail with exit status 104 if an invalid option value exists",
+			expErr:       "this is an invalid type",
+			expExitCode:  exitcodes.InvalidConfig,
+		},
+		{
+			testFilename: "invalidconfig/option_env.js",
+			name:         "run should fail with exit status 104 if an invalid option is set through env variable",
+			expErr:       "envconfig.Process",
+			expExitCode:  exitcodes.InvalidConfig,
+			envVars: map[string]string{
+				"K6_DURATION": "fails",
+			},
+		},
+		{
+			testFilename: "invalidconfig/option_env.js",
+			name:         "run should fail with exit status 104 if an invalid option is set through k6 variable",
+			expErr:       "invalid duration",
+			expExitCode:  exitcodes.InvalidConfig,
+			extraArgs:    []string{"--env", "DURATION=fails"},
+		},
+		{
+			testFilename:   "invalidconfig/option_env.js",
+			name:           "run should fail with exit status 104 if an invalid option is set in a config file",
+			expErr:         "invalid duration",
+			expExitCode:    exitcodes.InvalidConfig,
+			configFilename: "invalidconfig/invalid.json",
+		},
+		{
+			testFilename: "invalidconfig/invalid_scenario.js",
+			name:         "run should fail with exit status 104 if an invalid scenario exists",
+			expErr:       "specified executor type",
+			expExitCode:  exitcodes.InvalidConfig,
+		},
 		{
 			testFilename: "thresholds/non_existing_metric.js",
 			name:         "run should fail with exit status 104 on a threshold applied to a non existing metric",
@@ -203,6 +240,16 @@ func TestRunScriptErrorsAndAbort(t *testing.T) {
 			require.NoError(t, fsext.WriteFile(ts.FS, filepath.Join(ts.Cwd, tc.testFilename), testScript, 0o644))
 			ts.CmdArgs = append([]string{"k6", "run", tc.testFilename}, tc.extraArgs...)
 
+			if tc.configFilename != "" {
+				configFile, err := os.ReadFile(path.Join("testdata", tc.configFilename)) //nolint:forbidigo
+				require.NoError(t, err)
+				require.NoError(t, fsext.WriteFile(ts.FS, filepath.Join(ts.Cwd, tc.configFilename), configFile, 0o644))
+				ts.Flags.ConfigFilePath = path.Join(ts.Cwd, tc.configFilename)
+			}
+			if tc.envVars != nil {
+				ts.Env = tc.envVars
+			}
+
 			ts.ExpectedExitCode = int(tc.expExitCode)
 			newRootCommand(ts.GlobalState).execute()
 

cmd/testdata/invalidconfig/invalid.json

@@ -0,0 +1,3 @@
+{
+    "duration": "fails"
+}

cmd/testdata/invalidconfig/invalid_option.js

@@ -0,0 +1,5 @@
+export const options = {
+    vus: 'this is an invalid type',
+}
+
+export default function () {}

cmd/testdata/invalidconfig/invalid_scenario.js

@@ -0,0 +1,22 @@
+export const options = {
+    scenarios: {
+      example_scenario: {
+        // name of the executor to use
+        executor: 'shared-iterations',
+        // common scenario configuration
+        startTime: '10s',
+        gracefulStop: '5s',
+        env: { EXAMPLEVAR: 'testing' },
+        tags: { example_tag: 'testing' },
+
+        // executor-specific configuration
+        vus: 10,
+        iterations: 200,
+        maxDuration: '10s',
+      },
+      another_scenario: {
+        /*...*/
+      },
+    },
+  };
+

cmd/testdata/invalidconfig/option_env.js

@@ -0,0 +1,10 @@
+import http from 'k6/http';
+
+export const options = {
+	iterations: 1,
+    duration: __ENV.DURATION,
+};
+
+export default function () {
+  const res = http.get('https://test.k6.io');
+}

js/bundle.go

@@ -15,6 +15,8 @@ import (
 	"github.com/sirupsen/logrus"
 	"gopkg.in/guregu/null.v3"
 
+	"go.k6.io/k6/errext"
+	"go.k6.io/k6/errext/exitcodes"
 	"go.k6.io/k6/event"
 	"go.k6.io/k6/js/common"
 	"go.k6.io/k6/js/compiler"
@@ -208,7 +210,10 @@ func (b *Bundle) populateExports(updateOptions bool, exports *goja.Object) error
 			dec.DisallowUnknownFields()
 			if err := dec.Decode(&b.Options); err != nil {
 				if uerr := json.Unmarshal(data, &b.Options); uerr != nil {
-					return uerr
+					return errext.WithAbortReasonIfNone(
+						errext.WithExitCodeIfNone(uerr, exitcodes.InvalidConfig),
+						errext.AbortedByScriptError,
+					)
 				}
 				b.preInitState.Logger.WithError(err).Warn("There were unknown fields in the options exported in the script")
 			}