From f9bc43c4b5751ec85e1b643fd8b60a063f9c08f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20SZKIBA?= Date: Thu, 22 Aug 2024 16:43:53 +0200 Subject: [PATCH 1/4] fix: pin k6 version due to sobek error --- examples/combined.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/combined.js b/examples/combined.js index 9703b4b..d293258 100644 --- a/examples/combined.js +++ b/examples/combined.js @@ -1,4 +1,4 @@ -"use k6 >= 0.50"; +"use k6 = 0.52"; "use k6 with k6/x/faker >= 0.3.0"; "use k6 with k6/x/sql >= 0.4.0"; From c5e589a467d31581848416ecc31b7774be12b07a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20SZKIBA?= Date: Thu, 22 Aug 2024 16:44:20 +0200 Subject: [PATCH 2/4] feat: upgrade k6exec to v0.1.5 --- go.mod | 12 ++++++------ go.sum | 11 +++++++++++ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 96b845f..d1e8653 100644 --- a/go.mod +++ b/go.mod @@ -6,24 +6,24 @@ require ( github.com/briandowns/spinner v1.23.1 github.com/fatih/color v1.17.0 github.com/grafana/clireadme v0.1.0 - github.com/grafana/k6exec v0.1.4 + github.com/grafana/k6exec v0.1.5 github.com/samber/slog-logrus/v2 v2.5.0 github.com/sirupsen/logrus v1.9.3 github.com/spf13/cobra v1.8.1 - golang.org/x/term v0.22.0 + golang.org/x/term v0.23.0 ) require ( github.com/Masterminds/semver v1.5.0 // indirect github.com/Masterminds/semver/v3 v3.2.1 // indirect github.com/adrg/xdg v0.5.0 // indirect - github.com/evanw/esbuild v0.21.5 // indirect + github.com/evanw/esbuild v0.23.1 // indirect github.com/google/btree v1.1.2 // indirect github.com/grafana/k6build v0.2.3 // indirect github.com/grafana/k6catalog v0.1.0 // indirect - github.com/grafana/k6deps v0.1.3 // indirect + github.com/grafana/k6deps v0.1.4 // indirect github.com/grafana/k6foundry v0.2.0 // indirect - github.com/grafana/k6pack v0.2.1 // indirect + github.com/grafana/k6pack v0.2.2 // indirect github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/mattn/go-colorable v0.1.13 // indirect @@ -33,6 +33,6 @@ require ( github.com/samber/slog-common v0.17.0 // indirect github.com/spf13/pflag v1.0.5 // indirect golang.org/x/mod v0.18.0 // indirect - golang.org/x/sys v0.22.0 // indirect + golang.org/x/sys v0.23.0 // indirect golang.org/x/text v0.16.0 // indirect ) diff --git a/go.sum b/go.sum index 7eb2c1d..3b14d61 100644 --- a/go.sum +++ b/go.sum @@ -12,6 +12,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/evanw/esbuild v0.21.5 h1:oShm8TT5QUhf6vM7teg0nmd14eHu64dPmVluC2f4DMg= github.com/evanw/esbuild v0.21.5/go.mod h1:D2vIQZqV/vIf/VRHtViaUtViZmG7o+kKmlBfVQuRi48= +github.com/evanw/esbuild v0.23.1 h1:ociewhY6arjTarKLdrXfDTgy25oxhTZmzP8pfuBTfTA= +github.com/evanw/esbuild v0.23.1/go.mod h1:D2vIQZqV/vIf/VRHtViaUtViZmG7o+kKmlBfVQuRi48= github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4= github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI= github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU= @@ -26,12 +28,18 @@ github.com/grafana/k6catalog v0.1.0 h1:jLmbmB3EUJ+zyQG3hWy6dWbtMjvTkvJNx1d4LX8it github.com/grafana/k6catalog v0.1.0/go.mod h1:8R9eXAh2nb69+drkj0rZ4aemso0jcwCbPP6Q3E5LqCw= github.com/grafana/k6deps v0.1.3 h1:XDvMacuHQqmAenmhpcxtH8lJno/z5rGlkCG8lvSjPVw= github.com/grafana/k6deps v0.1.3/go.mod h1:edmPmMAsFVcwMhPRI/XPeJJCGilNqYMzEse7Q6+cZ6E= +github.com/grafana/k6deps v0.1.4 h1:rFlp2IMTSNk2RuztIfy17X5MO6HbQ6EebgvKvVPg+Po= +github.com/grafana/k6deps v0.1.4/go.mod h1:xeIBBsYUqrkcDc7lIqbAXSd45dmtljYkW+d/q4wb4sg= github.com/grafana/k6exec v0.1.4 h1:+T0bZG3EGlYfYW6Jm23bC7DNTK+KjcicoY4NTpylYm8= github.com/grafana/k6exec v0.1.4/go.mod h1:DTq8ulF1fs1JaWxI+Ojwssz/1EpTsBQW9vf26E2LI40= +github.com/grafana/k6exec v0.1.5 h1:krt+VU5PRrYAgBVHECA8w9//V57m7RX+SArCuePEVVI= +github.com/grafana/k6exec v0.1.5/go.mod h1:CE7E8cLwxyxwXVkoD6beaLdfDbRbOnTsho+Z/2GTDcE= github.com/grafana/k6foundry v0.2.0 h1:+aE5wuCP0XNGNsxM7UiPj9hyw4RdWeW929PuGwLWIlg= github.com/grafana/k6foundry v0.2.0/go.mod h1:b6n4InFgXl+3yPobmlyJfcJmLozU9CI9IIUuq8YqEiM= github.com/grafana/k6pack v0.2.1 h1:S9EkeFuRMnfwP/lHrKnlgctlNDiUKgKU1bEKbIfOUro= github.com/grafana/k6pack v0.2.1/go.mod h1:BEy4y0GE+gXbdp8EldJGXd1g1Py3wBBxDE2AwzHsMxI= +github.com/grafana/k6pack v0.2.2 h1:ynppjxOhLH6nuPe1O/I9qmWbcRusYA+D13OXWjLg5xE= +github.com/grafana/k6pack v0.2.2/go.mod h1:hlcxujzTi0reGuo00Z1MJ2Ax1CD4rM4jIjllEwxcaGs= github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA= github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= @@ -69,8 +77,11 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= +golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk= golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4= +golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= From 5051cce40b0e810e1e235f66d34af8e0938615cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20SZKIBA?= Date: Thu, 22 Aug 2024 16:44:31 +0200 Subject: [PATCH 3/4] docs: release notes --- releases/v0.4.2.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 releases/v0.4.2.md diff --git a/releases/v0.4.2.md b/releases/v0.4.2.md new file mode 100644 index 0000000..4ddc040 --- /dev/null +++ b/releases/v0.4.2.md @@ -0,0 +1,11 @@ + + +k6x `v0.4.2` is here 🎉! + +This is an internal maintenance release with dependency upgrades: + +- k6exec v0.1.5 From 7b5fdbc48dd2ad2fc4f4bff119cd5bde5816e722 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20SZKIBA?= Date: Thu, 22 Aug 2024 16:47:04 +0200 Subject: [PATCH 4/4] fix sum --- go.sum | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/go.sum b/go.sum index 3b14d61..eb20f4a 100644 --- a/go.sum +++ b/go.sum @@ -10,8 +10,6 @@ github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/evanw/esbuild v0.21.5 h1:oShm8TT5QUhf6vM7teg0nmd14eHu64dPmVluC2f4DMg= -github.com/evanw/esbuild v0.21.5/go.mod h1:D2vIQZqV/vIf/VRHtViaUtViZmG7o+kKmlBfVQuRi48= github.com/evanw/esbuild v0.23.1 h1:ociewhY6arjTarKLdrXfDTgy25oxhTZmzP8pfuBTfTA= github.com/evanw/esbuild v0.23.1/go.mod h1:D2vIQZqV/vIf/VRHtViaUtViZmG7o+kKmlBfVQuRi48= github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4= @@ -26,18 +24,12 @@ github.com/grafana/k6build v0.2.3 h1:nRNfOZbIABcoOgqOs+PWbzGVPbG6wWbwN8dACfF5mFo github.com/grafana/k6build v0.2.3/go.mod h1:LOlIAeWzZWR3Zff3Q6o4/spO2ROhvkLws8OgmEgGmVA= github.com/grafana/k6catalog v0.1.0 h1:jLmbmB3EUJ+zyQG3hWy6dWbtMjvTkvJNx1d4LX8it6I= github.com/grafana/k6catalog v0.1.0/go.mod h1:8R9eXAh2nb69+drkj0rZ4aemso0jcwCbPP6Q3E5LqCw= -github.com/grafana/k6deps v0.1.3 h1:XDvMacuHQqmAenmhpcxtH8lJno/z5rGlkCG8lvSjPVw= -github.com/grafana/k6deps v0.1.3/go.mod h1:edmPmMAsFVcwMhPRI/XPeJJCGilNqYMzEse7Q6+cZ6E= github.com/grafana/k6deps v0.1.4 h1:rFlp2IMTSNk2RuztIfy17X5MO6HbQ6EebgvKvVPg+Po= github.com/grafana/k6deps v0.1.4/go.mod h1:xeIBBsYUqrkcDc7lIqbAXSd45dmtljYkW+d/q4wb4sg= -github.com/grafana/k6exec v0.1.4 h1:+T0bZG3EGlYfYW6Jm23bC7DNTK+KjcicoY4NTpylYm8= -github.com/grafana/k6exec v0.1.4/go.mod h1:DTq8ulF1fs1JaWxI+Ojwssz/1EpTsBQW9vf26E2LI40= github.com/grafana/k6exec v0.1.5 h1:krt+VU5PRrYAgBVHECA8w9//V57m7RX+SArCuePEVVI= github.com/grafana/k6exec v0.1.5/go.mod h1:CE7E8cLwxyxwXVkoD6beaLdfDbRbOnTsho+Z/2GTDcE= github.com/grafana/k6foundry v0.2.0 h1:+aE5wuCP0XNGNsxM7UiPj9hyw4RdWeW929PuGwLWIlg= github.com/grafana/k6foundry v0.2.0/go.mod h1:b6n4InFgXl+3yPobmlyJfcJmLozU9CI9IIUuq8YqEiM= -github.com/grafana/k6pack v0.2.1 h1:S9EkeFuRMnfwP/lHrKnlgctlNDiUKgKU1bEKbIfOUro= -github.com/grafana/k6pack v0.2.1/go.mod h1:BEy4y0GE+gXbdp8EldJGXd1g1Py3wBBxDE2AwzHsMxI= github.com/grafana/k6pack v0.2.2 h1:ynppjxOhLH6nuPe1O/I9qmWbcRusYA+D13OXWjLg5xE= github.com/grafana/k6pack v0.2.2/go.mod h1:hlcxujzTi0reGuo00Z1MJ2Ax1CD4rM4jIjllEwxcaGs= github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA= @@ -75,12 +67,9 @@ golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= -golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk= -golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4= +golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU= golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=