nicer errors

Author: mstoykov

internal/js/modules/k6/secrets/secrets_test.go

@@ -89,10 +89,22 @@ func TestSecrets(t *testing.T) {
 			script:        "await secrets.source('second').get('secret2')",
 			expectedValue: "value2",
 		},
+		"multiple get wrong": {
+			secretsources: map[string]secretsource.Source{
+				"default": mock.NewMockSecretSource("some", map[string]string{
+					"secret": "value",
+				}),
+				"second": mock.NewMockSecretSource("some", map[string]string{
+					"secret2": "value2",
+				}),
+			},
+			script:        "await secrets.source('third').get('secret2')",
+			expectedError: "no secret source with name \"third\" is configured",
+		},
 		"get secret without source": {
 			secretsources: map[string]secretsource.Source{},
 			script:        "await secrets.get('secret')",
-			expectedError: "no source with name default",
+			expectedError: "no secret sources are configured",
 		},
 		"get none existing source": {
 			secretsources: map[string]secretsource.Source{

secretsource/manager.go

@@ -1,6 +1,7 @@
 package secretsource
 
 import (
+	"errors"
 	"fmt"
 	"sync"
 
@@ -53,9 +54,12 @@ func NewManager(sources map[string]Source) (*Manager, logrus.Hook, error) {
 // It can be used with the [DefaultSourceName].
 // This automatically starts redacting the secret before returning it.
 func (sm *Manager) Get(sourceName, key string) (string, error) {
+	if len(sm.cache) == 0 {
+		return "", errors.New("no secret sources are configured")
+	}
 	sourceCache, ok := sm.cache[sourceName]
 	if !ok {
-		return "", fmt.Errorf("no source with name %s", sourceName)
+		return "", UnknownSourceError(sourceName)
 	}
 	v, ok := sourceCache.Load(key)
 	if ok {
@@ -70,3 +74,10 @@ func (sm *Manager) Get(sourceName, key string) (string, error) {
 	sm.hook.add(value)
 	return value, err
 }
+
+// UnknownSourceError is returned when a unknown source is requested
+type UnknownSourceError string
+
+func (u UnknownSourceError) Error() string {
+	return fmt.Sprintf("no secret source with name %q is configured", (string)(u))
+}