Move to async get

Author: mstoykov

examples/secrets/secrets.test.js

@@ -1,9 +1,9 @@
 // k6 run --secret-source=file=file.secret secrets.test.js
 import secrets from "k6/secrets";
 
-export default () => {
-	const my_secret = secrets.get("cool"); // get secret from a source with the provided identifier
+export default async () => {
+	const my_secret = await secrets.get("cool"); // get secret from a source with the provided identifier
 	console.log(my_secret);
-	secrets.get("else"); // get secret from a source with the provided identifier
+	await secrets.get("else"); // get secret from a source with the provided identifier
 	console.log(my_secret);
 }

internal/cmd/tests/cmd_run_test.go

@@ -2409,10 +2409,10 @@ func TestBasicSecrets(t *testing.T) {
 	mainScript := `
 		import secrets from "k6/secrets";
 
-		export default () => {
-			const my_secret = secrets.get("cool"); // get secret from a source with the provided identifier
+		export default async () => {
+			const my_secret = await secrets.get("cool"); // get secret from a source with the provided identifier
 			console.log(my_secret);
-			secrets.get("else"); // get secret from a source with the provided identifier
+			await secrets.get("else"); // get secret from a source with the provided identifier
 			console.log(my_secret);
 		}
 	`
@@ -2437,17 +2437,17 @@ func TestMultipleSecretSources(t *testing.T) {
 	mainScript := `
 		import secrets from "k6/secrets";
 
-		export default () => {
-			const my_secret = secrets.source("first").get("cool");
+		export default async () => {
+			const my_secret = await secrets.source("first").get("cool");
 			console.log(my_secret);
-			secrets.source("second").get("else");
+			await secrets.source("second").get("else");
 			console.log(my_secret);
 			try {
-				secrets.source("second").get("unkwown");
+				await secrets.source("second").get("unkwown");
 			} catch {
 				console.log("trigger exception on wrong key")
 			}
-			secrets.get("else"); // testing default setting
+			await secrets.get("else"); // testing default setting
 		}
 	`
 

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

@@ -6,6 +6,7 @@ import (
 
 	"go.k6.io/k6/js/common"
 	"go.k6.io/k6/js/modules"
+	"go.k6.io/k6/js/promises"
 	"go.k6.io/k6/secretsource"
 )
 
@@ -50,13 +51,13 @@ func (mi *Secrets) Exports() modules.Exports {
 }
 
 func (mi *Secrets) secrets() (*sobek.Object, error) {
-	obj, err := secretSourceObjectForSourceName(mi.vu.Runtime(), mi.secretsManager, secretsource.DefaultSourceName)
+	obj, err := secretSourceObjectForSourceName(mi.vu, mi.secretsManager, secretsource.DefaultSourceName)
 	if err != nil {
 		return nil, err
 	}
 
 	err = obj.Set("source", func(sourceName string) (*sobek.Object, error) {
-		return secretSourceObjectForSourceName(mi.vu.Runtime(), mi.secretsManager, sourceName)
+		return secretSourceObjectForSourceName(mi.vu, mi.secretsManager, sourceName)
 	})
 	if err != nil {
 		return nil, err
@@ -66,11 +67,20 @@ func (mi *Secrets) secrets() (*sobek.Object, error) {
 }
 
 func secretSourceObjectForSourceName(
-	rt *sobek.Runtime, manager *secretsource.Manager, sourceName string,
+	vu modules.VU, manager *secretsource.Manager, sourceName string,
 ) (*sobek.Object, error) {
-	obj := rt.NewObject()
-	err := obj.Set("get", func(key string) (string, error) {
-		return manager.Get(sourceName, key)
+	obj := vu.Runtime().NewObject()
+	err := obj.Set("get", func(key string) *sobek.Promise {
+		p, resolve, reject := promises.New(vu)
+		go func() {
+			res, err := manager.Get(sourceName, key)
+			if err != nil {
+				reject(err)
+				return
+			}
+			resolve(res)
+		}()
+		return p
 	})
 	if err != nil {
 		return nil, err

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

@@ -41,7 +41,7 @@ func TestSecrets(t *testing.T) {
 					"secret": "value",
 				}),
 			},
-			script:        "secrets.get('secret')",
+			script:        "await secrets.get('secret')",
 			expectedValue: "value",
 		},
 		"error": {
@@ -50,7 +50,7 @@ func TestSecrets(t *testing.T) {
 					"secret": "value",
 				}),
 			},
-			script:        "secrets.get('not_secret')",
+			script:        "await secrets.get('not_secret')",
 			expectedError: "no value",
 		},
 		"multiple": {
@@ -62,7 +62,7 @@ func TestSecrets(t *testing.T) {
 					"secret2": "value2",
 				}),
 			},
-			script:        "secrets.get('secret')",
+			script:        "await secrets.get('secret')",
 			expectedValue: "value",
 		},
 		"multiple get default": {
@@ -74,7 +74,7 @@ func TestSecrets(t *testing.T) {
 					"secret2": "value2",
 				}),
 			},
-			script:        "secrets.source('default').get('secret')",
+			script:        "await secrets.source('default').get('secret')",
 			expectedValue: "value",
 		},
 		"multiple get not default": {
@@ -86,12 +86,12 @@ func TestSecrets(t *testing.T) {
 					"secret2": "value2",
 				}),
 			},
-			script:        "secrets.source('second').get('secret2')",
+			script:        "await secrets.source('second').get('secret2')",
 			expectedValue: "value2",
 		},
 		"get secret without source": {
 			secretsources: map[string]secretsource.Source{},
-			script:        "secrets.get('secret')",
+			script:        "await secrets.get('secret')",
 			expectedError: "no source with name default",
 		},
 		"get none existing source": {
@@ -100,7 +100,7 @@ func TestSecrets(t *testing.T) {
 					"secret": "value",
 				}),
 			},
-			script:        "secrets.source('second') != undefined",
+			script:        "(await secrets.source('second')) != undefined",
 			expectedValue: true,
 		},
 	}
@@ -110,12 +110,13 @@ func TestSecrets(t *testing.T) {
 			t.Parallel()
 			testruntime := testRuntimeWithSecrets(t, testCase.secretsources)
 
-			v, err := testruntime.RunOnEventLoop(testCase.script)
+			_, err := testruntime.RunOnEventLoop("(async ()=>{globalThis.result = " + testCase.script + "})()")
 			if testCase.expectedError != "" {
 				require.ErrorContains(t, err, testCase.expectedError)
 				return
 			}
 			require.NoError(t, err)
+			v := testruntime.VU.Runtime().GlobalObject().Get("result")
 			assert.Equal(t, testCase.expectedValue, v.Export())
 		})
 	}