Merge remote-tracking branch 'upstream/master'

pks-os · Jan 23, 2025 · 2f09cd8 · 2f09cd8
2 parents 65d59a2 + 7129195
commit 2f09cd8
Show file tree

Hide file tree

Showing 610 changed files with 1,211 additions and 879 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -3,7 +3,7 @@ updates:
   - package-ecosystem: "gomod"
     directory: "/"
     schedule:
-      interval: "daily"
+      interval: "weekly"
     open-pull-requests-limit: 50
     groups:
       golangx:

diff --git a/.github/workflows/tc39.yml b/.github/workflows/tc39.yml
@@ -27,6 +27,6 @@ jobs:
       - name: Run tests
         run: |
           set -x
-          cd js/tc39
+          cd internal/js/tc39
           sh checkout.sh
           go test -timeout 1h
diff --git a/.github/workflows/wpt.yml b/.github/workflows/wpt.yml
@@ -22,12 +22,12 @@ jobs:
       - name: Run Streams Tests
         run: |
           set -x
-          cd js/modules/k6/experimental/streams/tests
+          cd internal/js/modules/k6/experimental/streams/tests
           sh checkout.sh
           go test ../... -tags=wpt
       - name: Run Webcrypto Tests
         run: |
           set -x
-          cd js/modules/k6/webcrypto/tests
+          cd internal/js/modules/k6/webcrypto/tests
           sh checkout.sh
           go test ./... -tags=wpt
diff --git a/.gitignore b/.gitignore
@@ -2,8 +2,8 @@
 /k6.exe
 /dist
 /pkg-build
-/js/tc39/TestTC39
-/js/modules/k6/experimental/streams/tests/wpt
+/internal/js/tc39/TestTC39
+/internal/js/modules/k6/experimental/streams/tests/wpt
 
 .vscode
 *.sublime-workspace
@@ -36,4 +36,4 @@ script.js
 /packaging/*.gpg
 
 # web platform tests
-js/modules/k6/webcrypto/tests/wpt/
+/internal/js/modules/k6/webcrypto/tests/wpt/
diff --git a/api/v1/control_surface.go b/api/v1/control_surface.go
@@ -3,10 +3,10 @@ package v1
 import (
 	"context"
 
-	"go.k6.io/k6/execution"
+	"go.k6.io/k6/internal/execution"
+	"go.k6.io/k6/internal/metrics/engine"
 	"go.k6.io/k6/lib"
 	"go.k6.io/k6/metrics"
-	"go.k6.io/k6/metrics/engine"
 )
 
 // ControlSurface includes the methods the REST API can use to control and

diff --git a/api/v1/group_routes_test.go b/api/v1/group_routes_test.go
@@ -10,14 +10,14 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"go.k6.io/k6/execution"
-	"go.k6.io/k6/execution/local"
+	"go.k6.io/k6/internal/execution"
+	"go.k6.io/k6/internal/execution/local"
+	"go.k6.io/k6/internal/lib/testutils"
+	"go.k6.io/k6/internal/lib/testutils/minirunner"
+	"go.k6.io/k6/internal/metrics/engine"
+	"go.k6.io/k6/internal/usage"
 	"go.k6.io/k6/lib"
-	"go.k6.io/k6/lib/testutils"
-	"go.k6.io/k6/lib/testutils/minirunner"
 	"go.k6.io/k6/metrics"
-	"go.k6.io/k6/metrics/engine"
-	"go.k6.io/k6/usage"
 )
 
 func getTestPreInitState(tb testing.TB) *lib.TestPreInitState {

diff --git a/api/v1/metric_routes_test.go b/api/v1/metric_routes_test.go
@@ -10,8 +10,8 @@ import (
 	"github.com/stretchr/testify/require"
 	"gopkg.in/guregu/null.v3"
 
+	"go.k6.io/k6/internal/lib/testutils/minirunner"
 	"go.k6.io/k6/lib"
-	"go.k6.io/k6/lib/testutils/minirunner"
 	"go.k6.io/k6/metrics"
 )
 

diff --git a/api/v1/setup_teardown_routes_test.go b/api/v1/setup_teardown_routes_test.go
@@ -15,14 +15,14 @@ import (
 	"github.com/stretchr/testify/require"
 	"gopkg.in/guregu/null.v3"
 
-	"go.k6.io/k6/execution"
-	"go.k6.io/k6/execution/local"
-	"go.k6.io/k6/js"
+	"go.k6.io/k6/internal/execution"
+	"go.k6.io/k6/internal/execution/local"
+	"go.k6.io/k6/internal/js"
+	"go.k6.io/k6/internal/loader"
+	"go.k6.io/k6/internal/metrics/engine"
 	"go.k6.io/k6/lib"
 	"go.k6.io/k6/lib/types"
-	"go.k6.io/k6/loader"
 	"go.k6.io/k6/metrics"
-	"go.k6.io/k6/metrics/engine"
 	"go.k6.io/k6/output"
 )
 

diff --git a/api/v1/status_routes.go b/api/v1/status_routes.go
@@ -9,7 +9,7 @@ import (
 
 	"go.k6.io/k6/errext"
 	"go.k6.io/k6/errext/exitcodes"
-	"go.k6.io/k6/execution"
+	"go.k6.io/k6/internal/execution"
 	"go.k6.io/k6/lib/executor"
 )
 

diff --git a/api/v1/status_routes_test.go b/api/v1/status_routes_test.go
@@ -15,12 +15,12 @@ import (
 	"github.com/stretchr/testify/require"
 	"gopkg.in/guregu/null.v3"
 
-	"go.k6.io/k6/execution"
-	"go.k6.io/k6/execution/local"
+	"go.k6.io/k6/internal/execution"
+	"go.k6.io/k6/internal/execution/local"
+	"go.k6.io/k6/internal/lib/testutils/minirunner"
+	"go.k6.io/k6/internal/metrics/engine"
 	"go.k6.io/k6/lib"
-	"go.k6.io/k6/lib/testutils/minirunner"
 	"go.k6.io/k6/metrics"
-	"go.k6.io/k6/metrics/engine"
 	"go.k6.io/k6/output"
 )
 

diff --git a/cloudapi/api_test.go b/cloudapi/api_test.go
@@ -20,7 +20,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"go.k6.io/k6/lib/testutils"
+	"go.k6.io/k6/internal/lib/testutils"
 	"go.k6.io/k6/lib/types"
 )
 

diff --git a/cloudapi/logs_test.go b/cloudapi/logs_test.go
@@ -20,8 +20,8 @@ import (
 	"github.com/stretchr/testify/require"
 	"gopkg.in/guregu/null.v3"
 
-	"go.k6.io/k6/lib/testutils"
-	"go.k6.io/k6/lib/testutils/httpmultibin"
+	"go.k6.io/k6/internal/lib/testutils"
+	"go.k6.io/k6/internal/lib/testutils/httpmultibin"
 )
 
 func TestMsgParsing(t *testing.T) {

diff --git a/cmd/execute.go b/cmd/execute.go
@@ -0,0 +1,10 @@
+// Package cmd is here to provide a way for xk6 to build a binary with added extensions
+package cmd
+
+import "go.k6.io/k6/internal/cmd"
+
+// Execute exectues the k6 command
+// It only is exported here for backwards compatibility and the ability to use xk6 to build extended k6
+func Execute() {
+	cmd.Execute()
+}
diff --git a/cmd/new.go b/cmd/new.go
diff --git a/cmd/state/state.go b/cmd/state/state.go
@@ -12,9 +12,9 @@ import (
 	"github.com/mattn/go-isatty"
 	"github.com/sirupsen/logrus"
 
-	"go.k6.io/k6/event"
+	"go.k6.io/k6/internal/event"
+	"go.k6.io/k6/internal/ui/console"
 	"go.k6.io/k6/lib/fsext"
-	"go.k6.io/k6/ui/console"
 )
 
 const defaultConfigFileName = "config.json"

diff --git a/cmd/tests/global_state.go b/cmd/tests/global_state.go
@@ -0,0 +1,17 @@
+// Package tests contains types needed for running integration tests that run k6 commands.
+package tests
+
+import (
+	"testing"
+
+	"go.k6.io/k6/internal/cmd/tests"
+)
+
+// GlobalTestState is a wrapper around GlobalState for use in tests.
+type GlobalTestState = tests.GlobalTestState
+
+// NewGlobalTestState returns an initialized GlobalTestState, mocking all
+// GlobalState fields for use in tests.
+func NewGlobalTestState(tb testing.TB) *GlobalTestState {
+	return tests.NewGlobalTestState(tb)
+}
diff --git a/go.mod b/go.mod
@@ -50,7 +50,7 @@ require (
 	golang.org/x/term v0.28.0
 	golang.org/x/time v0.9.0
 	google.golang.org/grpc v1.69.4
-	google.golang.org/protobuf v1.36.2
+	google.golang.org/protobuf v1.36.3
 	gopkg.in/guregu/null.v3 v3.3.0
 	gopkg.in/yaml.v3 v3.0.1
 )

diff --git a/go.sum b/go.sum
@@ -333,8 +333,8 @@ google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A=
 google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-google.golang.org/protobuf v1.36.2 h1:R8FeyR1/eLmkutZOM5CWghmo5itiG9z0ktFlTVLuTmU=
-google.golang.org/protobuf v1.36.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU=
+google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/cenkalti/backoff.v1 v1.1.0 h1:Arh75ttbsvlpVA7WtVpH4u9h6Zl46xuptxqLxPiSo4Y=
 gopkg.in/cenkalti/backoff.v1 v1.1.0/go.mod h1:J6Vskwqd+OMVJl8C33mmtxTBs2gyzfv7UDAkHu8BrjI=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=