js/modules: Remove all calls for common utils

Something was missed from the module migration to the new `modules.Module` API, where the goja.Runtime and lib.State are now directly accessible without getting them from the context.
grafana · Feb 4, 2022 · 0e1a7ac · 0e1a7ac
1 parent 9c58b15
commit 0e1a7ac
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 100 deletions.
diff --git a/js/modules/k6/crypto/crypto_test.go b/js/modules/k6/crypto/crypto_test.go
@@ -49,14 +49,12 @@ func TestCryptoAlgorithms(t *testing.T) {
 
 	rt := goja.New()
 	rt.SetFieldNameMapper(common.FieldNameMapper{})
-	ctx := context.Background()
-	ctx = common.WithRuntime(ctx, rt)
 
 	m, ok := New().NewModuleInstance(
 		&modulestest.VU{
 			RuntimeField: rt,
 			InitEnvField: &common.InitEnvironment{},
-			CtxField:     ctx,
+			CtxField:     context.Background(),
 			StateField:   nil,
 		},
 	).(*Crypto)
@@ -201,15 +199,13 @@ func TestStreamingApi(t *testing.T) {
 	state := &lib.State{Group: root}
 
 	ctx := context.Background()
-	ctx = lib.WithState(ctx, state)
-	ctx = common.WithRuntime(ctx, rt)
 
 	m, ok := New().NewModuleInstance(
 		&modulestest.VU{
 			RuntimeField: rt,
 			InitEnvField: &common.InitEnvironment{},
 			CtxField:     ctx,
-			StateField:   nil,
+			StateField:   state,
 		},
 	).(*Crypto)
 	require.True(t, ok)
@@ -271,18 +267,11 @@ func TestOutputEncoding(t *testing.T) {
 	rt := goja.New()
 	rt.SetFieldNameMapper(common.FieldNameMapper{})
 
-	root, _ := lib.NewGroup("", nil)
-	state := &lib.State{Group: root}
-
-	ctx := context.Background()
-	ctx = lib.WithState(ctx, state)
-	ctx = common.WithRuntime(ctx, rt)
-
 	m, ok := New().NewModuleInstance(
 		&modulestest.VU{
 			RuntimeField: rt,
 			InitEnvField: &common.InitEnvironment{},
-			CtxField:     ctx,
+			CtxField:     context.Background(),
 			StateField:   nil,
 		},
 	).(*Crypto)
@@ -359,18 +348,11 @@ func TestHMac(t *testing.T) {
 	rt := goja.New()
 	rt.SetFieldNameMapper(common.FieldNameMapper{})
 
-	root, _ := lib.NewGroup("", nil)
-	state := &lib.State{Group: root}
-
-	ctx := context.Background()
-	ctx = lib.WithState(ctx, state)
-	ctx = common.WithRuntime(ctx, rt)
-
 	m, ok := New().NewModuleInstance(
 		&modulestest.VU{
 			RuntimeField: rt,
 			InitEnvField: &common.InitEnvironment{},
-			CtxField:     ctx,
+			CtxField:     context.Background(),
 			StateField:   nil,
 		},
 	).(*Crypto)
@@ -499,13 +481,12 @@ func TestAWSv4(t *testing.T) {
 	// example values from https://docs.aws.amazon.com/general/latest/gr/signature-v4-examples.html
 	rt := goja.New()
 	rt.SetFieldNameMapper(common.FieldNameMapper{})
-	ctx := common.WithRuntime(context.Background(), rt)
 
 	m, ok := New().NewModuleInstance(
 		&modulestest.VU{
 			RuntimeField: rt,
 			InitEnvField: &common.InitEnvironment{},
-			CtxField:     ctx,
+			CtxField:     context.Background(),
 			StateField:   nil,
 		},
 	).(*Crypto)

diff --git a/js/modules/k6/crypto/x509/x509_test.go b/js/modules/k6/crypto/x509/x509_test.go
@@ -37,12 +37,11 @@ import (
 func makeRuntime(t *testing.T) *goja.Runtime {
 	rt := goja.New()
 	rt.SetFieldNameMapper(common.FieldNameMapper{})
-	ctx := common.WithRuntime(context.Background(), rt)
 	m, ok := New().NewModuleInstance(
 		&modulestest.VU{
 			RuntimeField: rt,
 			InitEnvField: &common.InitEnvironment{},
-			CtxField:     ctx,
+			CtxField:     context.Background(),
 			StateField:   nil,
 		},
 	).(*X509)

diff --git a/js/modules/k6/data/share_test.go b/js/modules/k6/data/share_test.go
@@ -53,7 +53,7 @@ func newConfiguredRuntime() (*goja.Runtime, error) {
 		&modulestest.VU{
 			RuntimeField: rt,
 			InitEnvField: &common.InitEnvironment{},
-			CtxField:     common.WithRuntime(context.Background(), rt),
+			CtxField:     context.Background(),
 			StateField:   nil,
 		},
 	).(*Data)
@@ -173,7 +173,7 @@ func TestSharedArrayAnotherRuntimeWorking(t *testing.T) {
 	vu := &modulestest.VU{
 		RuntimeField: rt,
 		InitEnvField: &common.InitEnvironment{},
-		CtxField:     common.WithRuntime(context.Background(), rt),
+		CtxField:     context.Background(),
 		StateField:   nil,
 	}
 	m, ok := New().NewModuleInstance(vu).(*Data)
@@ -186,7 +186,7 @@ func TestSharedArrayAnotherRuntimeWorking(t *testing.T) {
 	// create another Runtime with new ctx but keep the initEnv
 	rt = goja.New()
 	vu.RuntimeField = rt
-	vu.CtxField = common.WithRuntime(context.Background(), rt)
+	vu.CtxField = context.Background()
 	require.NoError(t, rt.Set("data", m.Exports().Named))
 
 	_, err = rt.RunString(`var array = new data.SharedArray("shared", function() {throw "wat";});`)

diff --git a/js/modules/k6/encoding/encoding_test.go b/js/modules/k6/encoding/encoding_test.go
@@ -34,6 +34,7 @@ import (
 
 func TestEncodingAlgorithms(t *testing.T) {
 	t.Parallel()
+
 	if testing.Short() {
 		return
 	}
@@ -42,7 +43,7 @@ func TestEncodingAlgorithms(t *testing.T) {
 	rt.SetFieldNameMapper(common.FieldNameMapper{})
 	m, ok := New().NewModuleInstance(
 		&modulestest.VU{
-			CtxField:     common.WithRuntime(context.Background(), rt),
+			CtxField:     context.Background(),
 			RuntimeField: rt,
 			InitEnvField: &common.InitEnvironment{},
 			StateField:   nil,

diff --git a/js/modules/k6/execution/execution_test.go b/js/modules/k6/execution/execution_test.go
@@ -60,9 +60,11 @@ func setupTagsExecEnv(t *testing.T) execEnv {
 		Logger: testLog,
 	}
 
-	rt := goja.New()
-	ctx := common.WithRuntime(context.Background(), rt)
-	ctx = lib.WithState(ctx, state)
+	var (
+		rt  = goja.New()
+		ctx = context.Background()
+	)
+
 	m, ok := New().NewModuleInstance(
 		&modulestest.VU{
 			RuntimeField: rt,
@@ -187,10 +189,11 @@ func TestVUTags(t *testing.T) {
 func TestAbortTest(t *testing.T) { //nolint: tparallel
 	t.Parallel()
 
-	rt := goja.New()
-	ctx := common.WithRuntime(context.Background(), rt)
-	state := &lib.State{}
-	ctx = lib.WithState(ctx, state)
+	var (
+		rt    = goja.New()
+		state = &lib.State{}
+		ctx   = context.Background()
+	)
 
 	m, ok := New().NewModuleInstance(
 		&modulestest.VU{

diff --git a/js/modules/k6/k6_test.go b/js/modules/k6/k6_test.go
@@ -23,7 +23,6 @@ package k6
 import (
 	"context"
 	"fmt"
-	"runtime"
 	"testing"
 	"time"
 
@@ -45,7 +44,7 @@ func TestFail(t *testing.T) {
 		&modulestest.VU{
 			RuntimeField: rt,
 			InitEnvField: &common.InitEnvironment{},
-			CtxField:     common.WithRuntime(context.Background(), rt),
+			CtxField:     context.Background(),
 			StateField:   nil,
 		},
 	).(*K6)
@@ -73,7 +72,7 @@ func TestSleep(t *testing.T) {
 				&modulestest.VU{
 					RuntimeField: rt,
 					InitEnvField: &common.InitEnvironment{},
-					CtxField:     common.WithRuntime(context.Background(), rt),
+					CtxField:     context.Background(),
 					StateField:   nil,
 				},
 			).(*K6)
@@ -90,13 +89,14 @@ func TestSleep(t *testing.T) {
 
 	t.Run("Cancel", func(t *testing.T) {
 		t.Parallel()
+
 		rt := goja.New()
 		ctx, cancel := context.WithCancel(context.Background())
 		m, ok := New().NewModuleInstance(
 			&modulestest.VU{
 				RuntimeField: rt,
 				InitEnvField: &common.InitEnvironment{},
-				CtxField:     common.WithRuntime(ctx, rt),
+				CtxField:     ctx,
 				StateField:   nil,
 			},
 		).(*K6)
@@ -111,12 +111,11 @@ func TestSleep(t *testing.T) {
 			assert.NoError(t, err)
 			dch <- endTime.Sub(startTime)
 		}()
-		runtime.Gosched()
+
 		time.Sleep(1 * time.Second)
-		runtime.Gosched()
 		cancel()
-		runtime.Gosched()
 		d := <-dch
+
 		assert.True(t, d > 500*time.Millisecond, "did not sleep long enough")
 		assert.True(t, d < 2*time.Second, "slept for too long!!")
 	})
@@ -130,7 +129,7 @@ func TestRandSeed(t *testing.T) {
 		&modulestest.VU{
 			RuntimeField: rt,
 			InitEnvField: &common.InitEnvironment{},
-			CtxField:     common.WithRuntime(context.Background(), rt),
+			CtxField:     context.Background(),
 			StateField:   nil,
 		},
 	).(*K6)
@@ -154,6 +153,7 @@ func TestRandSeed(t *testing.T) {
 
 func TestGroup(t *testing.T) {
 	t.Parallel()
+
 	setupGroupTest := func() (*goja.Runtime, *lib.State, *lib.Group) {
 		root, err := lib.NewGroup("", nil)
 		assert.NoError(t, err)
@@ -167,13 +167,13 @@ func TestGroup(t *testing.T) {
 				SystemTags: stats.NewSystemTagSet(stats.TagGroup),
 			},
 		}
-		ctx := lib.WithState(context.Background(), state)
 		state.BuiltinMetrics = metrics.RegisterBuiltinMetrics(metrics.NewRegistry())
+
 		m, ok := New().NewModuleInstance(
 			&modulestest.VU{
 				RuntimeField: rt,
 				InitEnvField: &common.InitEnvironment{},
-				CtxField:     common.WithRuntime(ctx, rt),
+				CtxField:     context.Background(),
 				StateField:   state,
 			},
 		).(*K6)
@@ -231,8 +231,6 @@ func checkTestRuntime(t testing.TB, ctxs ...*context.Context) (
 	if len(ctxs) == 1 { // hacks
 		ctx = *ctxs[0]
 	}
-	ctx = common.WithRuntime(ctx, rt)
-	ctx = lib.WithState(ctx, state)
 	state.BuiltinMetrics = metrics.RegisterBuiltinMetrics(metrics.NewRegistry())
 	m, ok := New().NewModuleInstance(
 		&modulestest.VU{
@@ -425,9 +423,11 @@ func TestCheckTypes(t *testing.T) {
 
 func TestCheckContextExpiry(t *testing.T) {
 	t.Parallel()
+
 	ctx, cancel := context.WithCancel(context.Background())
 	rt, _, _ := checkTestRuntime(t, &ctx)
-	root := lib.GetState(ctx).Group
+	root, err := lib.NewGroup("", nil)
+	require.NoError(t, err)
 
 	v, err := rt.RunString(`k6.check(null, { "check": true })`)
 	if assert.NoError(t, err) {
@@ -441,9 +441,8 @@ func TestCheckContextExpiry(t *testing.T) {
 	cancel()
 
 	v, err = rt.RunString(`k6.check(null, { "check": true })`)
-	if assert.NoError(t, err) {
-		assert.Equal(t, true, v.Export())
-	}
+	require.NoError(t, err)
+	assert.Equal(t, true, v.Export())
 
 	assert.Equal(t, int64(1), check.Passes)
 	assert.Equal(t, int64(0), check.Fails)