Pass the FS to k6deps

.github/dependabot.yml

@@ -39,9 +39,17 @@ updates:
       - dependency-name: "github.com/mattn/go-colorable"
       - dependency-name: "github.com/mstoykov/k6-taskqueue-lib"
       - dependency-name: "github.com/stretchr/testify"
-      - dependency-name: "go.opentelemetry.io/otel"
-      - dependency-name: "go.opentelemetry.io/otel/exporters/otlp/otlptrace"
-      - dependency-name: "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
-      - dependency-name: "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp"
-      - dependency-name: "go.opentelemetry.io/otel/sdk"
-      - dependency-name: "go.opentelemetry.io/otel/trace"
+      - dependency-name: "go.opentelemetry.io/*"
+
+  - package-ecosystem: "docker"
+    directory: "/"
+    schedule:
+      # We don't update immediately. We usually wait for `vX.Y.1` to be out.
+      interval: "quarterly"
+
+  # Update k6packager dependencies
+  - package-ecosystem: "docker"
+    directory: "/packaging"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10

.github/workflows/browser_e2e.yml

@@ -23,7 +23,7 @@ jobs:
       fail-fast: false
       matrix:
         go: [stable, tip]
-        platform: [ubuntu-latest, windows-latest, macos-latest]
+        platform: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, macos-latest]
     runs-on: ${{ matrix.platform }}
     steps:
       - name: Checkout code
@@ -35,6 +35,7 @@ jobs:
         with:
           go-version: 1.x
       - name: Install Go tip
+        if: matrix.go == 'tip'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
@@ -44,6 +45,12 @@ jobs:
           echo "GOPATH=$HOME/go" >> "$GITHUB_ENV"
           echo "$HOME/go/bin" >> "$GITHUB_PATH"
           echo "$HOME/sdk/gotip/bin" >> "$GITHUB_PATH"
+      - name: Install chromium
+        # This is only needed on arm images, chromium comes preinstalled on amd64 runner images.
+        if: contains(matrix.platform, 'arm')
+        run: |
+          sudo apt update && sudo apt install chromium-browser
+          chromium --version
       - name: Build k6
         run: |
           which go
@@ -54,10 +61,11 @@ jobs:
       - name: Run E2E tests
         run: |
           set -x
-          if [ "$RUNNER_OS" == "Linux" ]; then
+          if [ "$RUNNER_OS" == "Linux" ] && [ "$RUNNER_ARCH" == "X64" ]; then
             export K6_BROWSER_EXECUTABLE_PATH=/usr/bin/google-chrome
           fi
           export K6_BROWSER_HEADLESS=true
+          export K6_NO_USAGE_REPORT=true
           for f in examples/browser/*.js; do
             if [ "$f" == "examples/browser/hosts.js" ] && [ "$RUNNER_OS" == "Windows" ]; then
               echo "skipping $f on Windows"

.github/workflows/build.yml

@@ -232,6 +232,7 @@ jobs:
     permissions:
       contents: read
       actions: read
+      id-token: write # Required for Vault
 
     runs-on: windows-latest
     defaults:
@@ -272,27 +273,34 @@ jobs:
           cd .\packaging
           candle.exe -arch x64 "-dVERSION=$env:VERSION" k6.wxs
           light.exe -ext WixUIExtension k6.wixobj
+
+      # GH secrets are unavailable when building from project forks, so this
+      # will fail for external PRs, even if we wanted to do it. And we don't.
+      # We are only going to sign packages that are built from master or a
+      # version tag, or manually triggered dev builds, so we have enough
+      # assurance that package signing works, but don't sign every PR build.
+      - if: ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v') || github.event_name == 'workflow_dispatch' }}
+        uses: grafana/shared-workflows/actions/get-vault-secrets@get-vault-secrets/v1.2.1
+        with:
+          repo_secrets: |
+            WIN_SIGN_CERT=winsign:WIN_SIGN_CERT
+            WIN_SIGN_PASS=winsign:WIN_SIGN_PASS
 
       - name: Sign Windows binary and .msi package
-        # GH secrets are unavailable when building from project forks, so this
-        # will fail for external PRs, even if we wanted to do it. And we don't.
-        # We are only going to sign packages that are built from master or a
-        # version tag, or manually triggered dev builds, so we have enough
-        # assurance that package signing works, but don't sign every PR build.
-        if: ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v') || github.event_name == 'workflow_dispatch' }}
+        if: ${{ env.WIN_SIGN_CERT != '' && env.WIN_SIGN_PASS != '' }}
         run: |
           # Convert base64 certificate to PFX
-          $bytes = [Convert]::FromBase64String("${{ secrets.WIN_SIGN_CERT }}")
+          $bytes = [Convert]::FromBase64String("${{ env.WIN_SIGN_CERT }}")
           [IO.File]::WriteAllBytes("k6.pfx", $bytes)
 
           # Get the latest signtool executable
           $SignTool = Get-ChildItem -Path "${env:ProgramFiles(x86)}\Windows Kits\10\bin" -Recurse -Filter signtool.exe | Where-Object { $_.DirectoryName -like "*\x64" } | Sort-Object -Descending | Select-Object -First 1
 
           # Sign the Windows binary
-          & $SignTool sign /f k6.pfx /p "${{ secrets.WIN_SIGN_PASS }}" /tr "http://timestamp.digicert.com" /td sha256 /fd sha256 "packaging\k6.exe"
+          & $SignTool sign /f k6.pfx /p "${{ env.WIN_SIGN_PASS }}" /tr "http://timestamp.digicert.com" /td sha256 /fd sha256 "packaging\k6.exe"
 
           # Sign the MSI package
-          & $SignTool sign /f k6.pfx /p "${{ secrets.WIN_SIGN_PASS }}" /tr "http://timestamp.digicert.com" /td sha256 /fd sha256 "packaging\k6.msi"
+          & $SignTool sign /f k6.pfx /p "${{ env.WIN_SIGN_PASS }}" /tr "http://timestamp.digicert.com" /td sha256 /fd sha256 "packaging\k6.msi"
 
           # Cleanup signing artifacts
           del k6.pfx
@@ -363,6 +371,7 @@ jobs:
       actions: read
       contents: read
       packages: read
+      id-token: write # Required for Vault
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -384,16 +393,31 @@ jobs:
           mv "dist/k6-$VERSION-windows-amd64.msi" "dist/k6-$VERSION-amd64.msi"
           mv "dist/k6-$VERSION-linux-amd64.rpm" "dist/k6-$VERSION-amd64.rpm"
           mv "dist/k6-$VERSION-linux-amd64.deb" "dist/k6-$VERSION-amd64.deb"
+      - uses: grafana/shared-workflows/actions/get-vault-secrets@get-vault-secrets/v1.2.1
+        with:
+          repo_secrets: |
+            IAM_ROLE_ARN=deploy:packager-iam-role
+            AWS_CF_DISTRIBUTION=cloudfront:AWS_CF_DISTRIBUTION
+            PGP_SIGN_KEY_PASSPHRASE=pgp:PGP_SIGN_KEY_PASSPHRASE
+            PGP_SIGN_KEY=pgp:PGP_SIGN_KEY
+            S3_BUCKET=s3:AWS_S3_BUCKET
+      - uses: grafana/shared-workflows/actions/aws-auth@aws-auth/v1.0.2
+        with:
+          aws-region: "us-east-2"
+          role-arn: ${{ env.IAM_ROLE_ARN }}
+          set-creds-in-environment: true
       - name: Setup docker compose environment
         run: |
           cat > packaging/.env <<EOF
-          AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          AWS_DEFAULT_REGION=us-east-1
-          AWS_CF_DISTRIBUTION="${{ secrets.AWS_CF_DISTRIBUTION }}"
-          PGP_SIGN_KEY_PASSPHRASE=${{ secrets.PGP_SIGN_KEY_PASSPHRASE }}
+          AWS_ACCESS_KEY_ID=${{ env.AWS_ACCESS_KEY_ID }}
+          AWS_CF_DISTRIBUTION="${{ env.AWS_CF_DISTRIBUTION }}"
+          AWS_DEFAULT_REGION=us-east-2
+          AWS_SECRET_ACCESS_KEY=${{ env.AWS_SECRET_ACCESS_KEY }}
+          AWS_SESSION_TOKEN=${{ env.AWS_SESSION_TOKEN }}
+          PGP_SIGN_KEY_PASSPHRASE=${{ env.PGP_SIGN_KEY_PASSPHRASE }}
+          S3_BUCKET=${{ env.S3_BUCKET }}
           EOF
-          echo "${{ secrets.PGP_SIGN_KEY }}" > packaging/sign-key.gpg
+          echo "${{ env.PGP_SIGN_KEY }}" > packaging/sign-key.gpg
       - name: Publish packages
         env:
           GITHUB_ACTOR: ${{ github.actor }}

.github/workflows/lint.yml

@@ -32,9 +32,8 @@ jobs:
             go mod verify
       - name: Check code generation
         run: |
-          go install github.com/alvaroloes/enumer@v1.1.2
-          go install github.com/mailru/easyjson/easyjson@v0.7.7
-          test -z "$(go generate ./... && git status --porcelain)"
+          make generate
+          test -z "$(git status --porcelain | tee >(cat 1>&2))"
 
   lint:
     runs-on: ubuntu-latest

.github/workflows/packager.yml

@@ -13,9 +13,7 @@ jobs:
   publish-packager:
     runs-on: ubuntu-latest
     env:
-      VERSION: 0.0.3
-      AWSCLI_VERSION: 2.1.36
-      S3CMD_VERSION: 2.1.0
+      VERSION: 0.0.4
       DOCKER_IMAGE_ID: ghcr.io/grafana/k6packager
       GITHUB_ACTOR: ${{ github.actor }}
     permissions:

.github/workflows/test.yml

@@ -18,7 +18,7 @@ jobs:
       fail-fast: false
       matrix:
         go-version: [1.23.x]
-        platform: [ubuntu-22.04, windows-latest]
+        platform: [ubuntu-22.04, ubuntu-24.04-arm, windows-latest]
     runs-on: ${{ matrix.platform }}
     steps:
       - name: Checkout code
@@ -35,6 +35,12 @@ jobs:
         with:
           go-version: ${{ matrix.go-version }}
           check-latest: true
+      - name: Install chromium
+        # This is only needed on arm images, chromium comes preinstalled on amd64 runner images.
+        if: contains(matrix.platform, 'arm')
+        run: |
+          sudo apt update && sudo apt install chromium-browser
+          chromium --version
       - name: Run tests
         run: |
           set -x
@@ -53,7 +59,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [ubuntu-22.04, windows-latest]
+        platform: [ubuntu-22.04, ubuntu-24.04-arm, windows-latest]
     runs-on: ${{ matrix.platform }}
     continue-on-error: true
     steps:
@@ -73,6 +79,12 @@ jobs:
           echo "GOPATH=$HOME/go" >> "$GITHUB_ENV"
           echo "$HOME/go/bin" >> "$GITHUB_PATH"
           echo "$HOME/sdk/gotip/bin" >> "$GITHUB_PATH"
+      - name: Install chromium
+        # This is only needed on arm images, chromium comes preinstalled on amd64 runner images.
+        if: contains(matrix.platform, 'arm')
+        run: |
+          sudo apt update && sudo apt install chromium-browser
+          chromium --version
       - name: Run tests
         run: |
           set -x
@@ -93,7 +105,10 @@ jobs:
       fail-fast: false
       matrix:
         go-version: [1.24.x]
-        platform: [ubuntu-22.04, windows-latest]
+        platform: [ubuntu-22.04, ubuntu-24.04-arm, windows-latest]
+    permissions: # required for Vault
+      id-token: write
+      contents: read
     runs-on: ${{ matrix.platform }}
     steps:
       - name: Checkout code
@@ -105,6 +120,12 @@ jobs:
         with:
           go-version: ${{ matrix.go-version }}
           check-latest: true
+      - name: Install chromium
+        # This is only needed on arm images, chromium comes preinstalled on amd64 runner images.
+        if: contains(matrix.platform, 'arm')
+        run: |
+          sudo apt update && sudo apt install chromium-browser
+          chromium --version
       - name: Run tests with code coverage
         run: |
           go version
@@ -127,11 +148,19 @@ jobs:
           done
           grep -h -v "^mode:" *.coverage >> coverage.txt
           rm -f *.coverage
+      # Sets CODECOV_TOKEN as an environment variable for the next step
+      - name: Get Codecov token
+        # Skip this step if the PR is from a fork, as we can't fetch secrets for forks.
+        if: github.event.pull_request.head.repo.full_name == github.repository
+        uses: grafana/shared-workflows/actions/get-vault-secrets@get-vault-secrets/v1.2.1
+        with:
+          repo_secrets: |
+            CODECOV_TOKEN=CODECOV_TOKEN:CODECOV_TOKEN
       - name: Upload coverage to Codecov
+        if: github.event.pull_request.head.repo.full_name == github.repository
         env:
           CODECOV_BASH_VERSION: 1.0.1
           CODECOV_BASH_SHA512SUM: d075b412a362a9a2b7aedfec3b8b9a9a927b3b99e98c7c15a2b76ef09862aeb005e91d76a5fd71b511141496d0fd23d1b42095f722ebcd509d768fba030f159e
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         run: |
           if [[ "${{ matrix.platform }}" == macos* ]]; then
             shopt -s expand_aliases

.github/workflows/xk6.yml

@@ -20,7 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         go: [stable, tip]
-        platform: [ubuntu-latest, windows-latest, macos-latest]
+        platform: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, macos-latest]
     runs-on: ${{ matrix.platform }}
     steps:
       - name: Checkout code
@@ -79,6 +79,7 @@ jobs:
             --output ./k6ext \
             --with github.com/grafana/xk6-js-test="$(pwd)/xk6-js-test" \
             --with github.com/grafana/xk6-output-test="$(pwd)/xk6-output-test"
+          export K6_NO_USAGE_REPORT=true
           ./k6ext version
           ./k6ext run --out outputtest=output-results.txt xk6-test.js
 

.gitignore

@@ -5,6 +5,7 @@
 /internal/js/tc39/TestTC39
 /internal/js/modules/k6/experimental/streams/tests/wpt
 /internal/js/modules/k6/webcrypto/tests/wpt/
+/.protoc
 
 .vscode
 *.sublime-workspace

Dockerfile

@@ -1,17 +1,17 @@
-FROM --platform=$BUILDPLATFORM golang:1.24-alpine3.21 as builder
+FROM --platform=$BUILDPLATFORM golang:1.24-alpine3.22 as builder
 WORKDIR $GOPATH/src/go.k6.io/k6
 COPY . .
 ARG TARGETOS TARGETARCH
 RUN apk --no-cache add git=~2
 RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -trimpath -o /usr/bin/k6
 
 # Runtime stage
-FROM alpine:3.21 as release
+FROM alpine:3.22 as release
 
 RUN adduser -D -u 12345 -g 12345 k6
 COPY --from=builder /usr/bin/k6 /usr/bin/k6
 
-USER k6
+USER 12345
 WORKDIR /home/k6
 
 ENTRYPOINT ["k6"]
@@ -24,7 +24,7 @@ USER root
 COPY --from=release /usr/bin/k6 /usr/bin/k6
 RUN apk --no-cache add chromium-swiftshader
 
-USER k6
+USER 12345
 
 ENV CHROME_BIN=/usr/bin/chromium-browser
 ENV CHROME_PATH=/usr/lib/chromium/

Makefile

@@ -1,5 +1,29 @@
 MAKEFLAGS += --silent
 GOLANGCI_LINT_VERSION = $(shell head -n 1 .golangci.yml | tr -d '\# ')
+PROTOC_VERSION := 21.12
+PROTOC_ARCHIVE := protoc-$(PROTOC_VERSION)-linux-x86_64.zip
+PROTOC_DOWNLOAD_URL := https://github.com/protocolbuffers/protobuf/releases/download/v$(PROTOC_VERSION)/$(PROTOC_ARCHIVE)
+
+proto-dependencies:
+	go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.31.0
+	go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
+	@if [ "$$(uname)" != "Linux" ]; then \
+		echo "Error: Can't install protoc on your OS, please install protoc-$(PROTOC_VERSION) manually." >&2; \
+		exit 1; \
+	fi
+	@echo "Downloading $(PROTOC_ARCHIVE)"
+	curl --show-error --fail --no-location -LO $(PROTOC_DOWNLOAD_URL)
+	unzip -o $(PROTOC_ARCHIVE) -d ./.protoc
+	rm $(PROTOC_ARCHIVE)
+
+generate-tools-installs: proto-dependencies
+	go install github.com/mstoykov/enumer@v0.0.1 # TODO figure out if we shouldn't move to a different fork
+	go install mvdan.cc/gofumpt@v0.8.0 # TODO maybe just use go fmt for this case
+	go install github.com/mailru/easyjson/easyjson@v0.7.7 # TODO remove this in the future
+
+generate: generate-tools-installs
+	PATH="$(PWD)/.protoc/bin:$(PATH)" go generate ./...
+
 
 all: clean format tests build
 

README.md

@@ -83,6 +83,11 @@ export default function () {
 
 You can run scripts like this on the CLI, or in your CI, or across a Kubernetes cluster.
 
+> [!NOTE]
+> Don't want to write code ?
+> 
+> We got you! Meet [k6 Studio](https://github.com/grafana/k6-studio), a desktop application made to help you generate k6 scripts without having to touch code!
+
 ## Documentation
 
 The docs cover all aspects of using k6. Some highlights include:

cmd/execute.go

@@ -13,16 +13,5 @@ import (
 func Execute() {
 	gs := state.NewGlobalState(context.Background())
 
-	if gs.Flags.BinaryProvisioning {
-		internalcmd.NewLauncher(gs).Launch()
-		return
-	}
-
-	// If Binary Provisioning is not enabled, continue with the regular k6 execution path
-
-	// TODO: this is temporary defensive programming
-	// The Launcher has already the support for this specific execution path, but we decided to play safe here.
-	// After the v1.0 release, we want to fully delegate this control to the Launcher.
-	gs.Logger.Debug("Binary Provisioning feature is disabled.")
 	internalcmd.ExecuteWithGlobalState(gs)
 }