Remove experimental xk6-websockets

Remove for a temporary commit the experimental module to allow bumping the k6 dependency in the extension's repository.
grafana · Oct 17, 2022 · 3c97ec7 · 3c97ec7
1 parent 6663efe
commit 3c97ec7
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 1,360 deletions.
diff --git a/go.mod b/go.mod
@@ -14,7 +14,6 @@ require (
 	github.com/gorilla/websocket v1.5.0
 	github.com/grafana/xk6-redis v0.1.1
 	github.com/grafana/xk6-timers v0.1.2
-	github.com/grafana/xk6-websockets v0.1.4
 	github.com/influxdata/influxdb1-client v0.0.0-20190402204710-8ff2fc3824fc
 	github.com/jhump/protoreflect v1.13.0
 	github.com/klauspost/compress v1.15.11
@@ -50,6 +49,7 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/dlclark/regexp2 v1.7.0 // indirect
+	github.com/fsnotify/fsnotify v1.5.4 // indirect
 	github.com/go-redis/redis/v8 v8.11.5 // indirect
 	github.com/go-sourcemap/sourcemap v2.1.4-0.20211119122758-180fcef48034+incompatible
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect

diff --git a/go.sum b/go.sum
@@ -99,8 +99,6 @@ github.com/grafana/xk6-redis v0.1.1 h1:rvWnLanRB2qzDwuY6NMBe6PXei3wJ3kjYvfCwRJ+q
 github.com/grafana/xk6-redis v0.1.1/go.mod h1:z7el1Tz8advY+ex419KfLbENzSQYgaA2lQYwMlt9yMM=
 github.com/grafana/xk6-timers v0.1.2 h1:YVM6hPDgvy4SkdZQpd+/r9M0kDi1g+QdbSxW5ClfwDk=
 github.com/grafana/xk6-timers v0.1.2/go.mod h1:XHmDIXAKe30NJMXrxKIKMFXx98etsCl0jBYktjsSURc=
-github.com/grafana/xk6-websockets v0.1.4 h1:OVqNZ3rIXFjY+MEeBf2lhOYJMfIbKT1Bppm4XnDQQWU=
-github.com/grafana/xk6-websockets v0.1.4/go.mod h1:MAvkRFMyyRaxn1AG0sU33dujRlWdlNm++qpTblQESkg=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
@@ -204,7 +202,6 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 go.k6.io/k6 v0.37.1-0.20220426072701-d105f5474bc3/go.mod h1:1bTdDsXTT2V3in3ZgdR15MDW6SQQh5nWni59tirqNB8=
 go.k6.io/k6 v0.38.2/go.mod h1:1bTdDsXTT2V3in3ZgdR15MDW6SQQh5nWni59tirqNB8=
-go.k6.io/k6 v0.40.1-0.20221004102444-50bc9af81f3a/go.mod h1:/NkhZeFQazmfRxuD05zoqG2pUd5Wxa1D78IiSEq4Huk=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=

diff --git a/js/initcontext.go b/js/initcontext.go
@@ -34,7 +34,6 @@ import (
 
 	"github.com/grafana/xk6-redis/redis"
 	"github.com/grafana/xk6-timers/timers"
-	expws "github.com/grafana/xk6-websockets/websockets"
 )
 
 type programWithSource struct {
@@ -354,20 +353,19 @@ func (i *InitContext) allowOnlyOpenedFiles() {
 
 func getInternalJSModules() map[string]interface{} {
 	return map[string]interface{}{
-		"k6":                         k6.New(),
-		"k6/crypto":                  crypto.New(),
-		"k6/crypto/x509":             x509.New(),
-		"k6/data":                    data.New(),
-		"k6/encoding":                encoding.New(),
-		"k6/execution":               execution.New(),
-		"k6/experimental/redis":      redis.New(),
-		"k6/experimental/websockets": &expws.RootModule{},
-		"k6/experimental/timers":     timers.New(),
-		"k6/net/grpc":                grpc.New(),
-		"k6/html":                    html.New(),
-		"k6/http":                    http.New(),
-		"k6/metrics":                 metrics.New(),
-		"k6/ws":                      ws.New(),
+		"k6":                     k6.New(),
+		"k6/crypto":              crypto.New(),
+		"k6/crypto/x509":         x509.New(),
+		"k6/data":                data.New(),
+		"k6/encoding":            encoding.New(),
+		"k6/execution":           execution.New(),
+		"k6/experimental/redis":  redis.New(),
+		"k6/experimental/timers": timers.New(),
+		"k6/net/grpc":            grpc.New(),
+		"k6/html":                html.New(),
+		"k6/http":                http.New(),
+		"k6/metrics":             metrics.New(),
+		"k6/ws":                  ws.New(),
 	}
 }