Move parsing of name and defaults out of each secret source + integration tests

Author: mstoykov

internal/cmd/root.go

@@ -335,18 +335,24 @@ func createSecretSources(gs *state.GlobalState) (map[string]secretsource.Source,
 		}
 		c := found.Module.(secretsource.Constructor) //nolint:forcetypeassert
 		params := baseParams
+		name, isDefault, config := extractNameAndDefault(config)
 		params.ConfigArgument = config
 
 		secretSource, err := c(params)
 		if err != nil {
 			return nil, err
 		}
-		name := secretSource.Name()
 		_, alreadRegistered := result[name]
 		if alreadRegistered {
 			return nil, fmt.Errorf("secret source for name %q already registered before configuration %q", t, line)
 		}
 		result[name] = secretSource
+		if isDefault {
+			if _, ok := result["default"]; ok {
+				return nil, fmt.Errorf("can't have two secret sources that are default ones, second one was %q", config)
+			}
+			result["default"] = secretSource
+		}
 	}
 
 	if len(result) == 1 {
@@ -357,3 +363,21 @@ func createSecretSources(gs *state.GlobalState) (map[string]secretsource.Source,
 
 	return result, nil
 }
+
+func extractNameAndDefault(config string) (name string, isDefault bool, remaining string) {
+	list := strings.Split(config, ",")
+	remainingArray := make([]string, 0, len(list))
+	for _, kv := range list {
+		if kv == "default" {
+			isDefault = true
+			continue
+		}
+		k, v, _ := strings.Cut(kv, "=")
+		if k == "name" {
+			name = v
+			continue
+		}
+		remainingArray = append(remainingArray, kv)
+	}
+	return name, isDefault, strings.Join(remainingArray, ",")
+}

internal/cmd/tests/cmd_run_test.go

@@ -2447,6 +2447,7 @@ func TestMultipleSecretSources(t *testing.T) {
 			} catch {
 				console.log("trigger exception on wrong key")
 			}
+			secrets.get("else"); // testing default setting
 		}
 	`
 
@@ -2456,7 +2457,7 @@ func TestMultipleSecretSources(t *testing.T) {
 	ts.CmdArgs = []string{
 		"k6", "run",
 		"--secret-source=mock=name=first,cool=something",
-		"--secret-source=mock=name=second,else=source", "secrets.js",
+		"--secret-source=mock=name=second,else=source,default", "secrets.js",
 	}
 
 	cmd.ExecuteWithGlobalState(ts.GlobalState)

internal/secretsource/file/file.go

@@ -50,8 +50,6 @@ func (fss *fileSecretSource) parseArg(config string) error {
 			switch k {
 			case "filename":
 				fss.filename = v
-			case "name":
-				fss.name = v
 			default:
 				return fmt.Errorf("unknown configuration key for file secret source %q", k)
 			}
@@ -62,14 +60,9 @@ func (fss *fileSecretSource) parseArg(config string) error {
 
 type fileSecretSource struct {
 	internal map[string]string
-	name     string
 	filename string
 }
 
-func (fss *fileSecretSource) Name() string {
-	return fss.name
-}
-
 func (fss *fileSecretSource) Description() string {
 	return fmt.Sprintf("file source from %s", fss.filename)
 }

internal/secretsource/file/file_test.go

@@ -10,27 +10,23 @@ func TestParseArg(t *testing.T) {
 	t.Parallel()
 	testCases := map[string]struct {
 		input            string
-		expectedName     string
 		expectedFilename string
 		expectedError    string
 	}{
 		"simple": {
 			input:            "something.secret",
-			expectedName:     "",
 			expectedFilename: "something.secret",
 		},
 		"filename": {
 			input:            "filename=something.secret",
-			expectedName:     "",
 			expectedFilename: "something.secret",
 		},
 		"filename and name": {
-			input:            "filename=something.secret,name=cool",
-			expectedName:     "cool",
+			input:            "filename=something.secret",
 			expectedFilename: "something.secret",
 		},
 		"unknownfiled": {
-			input:         "filename=something.secret,name=cool,random=bad",
+			input:         "filename=something.secret,random=bad",
 			expectedError: "unknown configuration key for file secret source \"random\"",
 		},
 	}
@@ -46,7 +42,6 @@ func TestParseArg(t *testing.T) {
 			}
 			require.NoError(t, err)
 			require.Equal(t, testCase.expectedFilename, fss.filename)
-			require.Equal(t, testCase.expectedName, fss.name)
 		})
 	}
 }

internal/secretsource/mock/mock.go

@@ -19,10 +19,6 @@ func init() {
 			if !ok {
 				return nil, fmt.Errorf("parsing %q, needs =", kv)
 			}
-			if k == "name" {
-				name = v
-				continue
-			}
 
 			secrets[k] = v
 		}

secretsource/interface.go

@@ -2,8 +2,6 @@ package secretsource
 
 // Source is the interface a secret source needs to implement
 type Source interface {
-	// A name to be used when k6 has multiple sources
-	Name() string
 	// Human readable description to be printed on the cli
 	Description() string
 	Get(key string) (value string, err error)

secretsource/manager.go

@@ -28,7 +28,9 @@ func NewManager(sources map[string]Source) (*Manager, logrus.Hook, error) {
 		}, hook, nil
 	}
 	defaultSource := sources["default"]
-	cache["default"] = new(sync.Map)
+	if defaultSource != nil {
+		cache["default"] = new(sync.Map)
+	}
 	for k, source := range sources {
 		if k == "default" {
 			continue