Merge pull request #176 from grafana/175-update-dependencies

Update dependencies and switch to go 1.24

Author: szkiba

.devcontainer/devcontainer.json

@@ -23,12 +23,12 @@
     "ghcr.io/devcontainers/features/github-cli:1": {},
     "ghcr.io/devcontainers/features/docker-in-docker:2": {},
     "ghcr.io/devcontainers/features/go:1": {
-      "version": "1.23",
-      "golangciLintVersion": "2.0.2"
+      "version": "1.24",
+      "golangciLintVersion": "2.1.2"
     },
-    "ghcr.io/guiyomh/features/goreleaser:0": { "version": "2.6.1" },
+    "ghcr.io/guiyomh/features/goreleaser:0": { "version": "2.8.2" },
     "ghcr.io/guiyomh/features/gotestsum:0": { "version": "1.12.1" },
-    "ghcr.io/szkiba/devcontainer-features/gosec:1": { "version": "2.22.2" },
+    "ghcr.io/szkiba/devcontainer-features/gosec:1": { "version": "2.22.3" },
     "ghcr.io/szkiba/devcontainer-features/govulncheck:1": { "version": "1.1.4" },
     "ghcr.io/szkiba/devcontainer-features/bats:1": { "version": "1.11.1" },
     "ghcr.io/szkiba/devcontainer-features/cdo:1": { "version": "0.1.2" },

Dockerfile

@@ -1,5 +1,5 @@
 
-ARG GO_VERSION=1.23.7
+ARG GO_VERSION=1.24.2
 ARG VARIANT=alpine3.21
 FROM golang:${GO_VERSION}-${VARIANT} AS builder
 

Dockerfile.goreleaser

@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.23.7
+ARG GO_VERSION=1.24.2
 ARG VARIANT=alpine3.21
 
 FROM golang:${GO_VERSION}-${VARIANT}

docs/workflows/README.md

@@ -343,4 +343,8 @@ The **Extension Release** ([`extension-release.yml`](../../.github/workflows/ext
       private:
         description: The repository is private
         type: boolean
+      bats:
+        description: The bats scripts to use for integration testing. Space-separated file names or patterns.
+        type: string
+        required: false
 ```

go.mod

@@ -1,15 +1,13 @@
 module go.k6.io/xk6
 
-go 1.23.0
-
-toolchain go1.23.8
+go 1.24.0
 
 require (
 	github.com/Masterminds/semver/v3 v3.3.1
 	github.com/fatih/color v1.18.0
 	github.com/go-enry/go-license-detector/v4 v4.3.1
-	github.com/go-git/go-git/v5 v5.15.0
-	github.com/grafana/k6foundry v0.4.5
+	github.com/go-git/go-git/v5 v5.16.0
+	github.com/grafana/k6foundry v0.4.6
 	github.com/lmittmann/tint v1.0.7
 	github.com/mattn/go-colorable v0.1.14
 	github.com/mattn/go-isatty v0.0.20

go.sum

@@ -45,15 +45,15 @@ github.com/go-git/go-billy/v5 v5.6.2 h1:6Q86EsPXMa7c3YZ3aLAQsMA0VlWmy43r6FHqa/UN
 github.com/go-git/go-billy/v5 v5.6.2/go.mod h1:rcFC2rAsp/erv7CMz9GczHcuD0D32fWzH+MJAU+jaUU=
 github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4=
 github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII=
-github.com/go-git/go-git/v5 v5.15.0 h1:f5Qn0W0F7ry1iN0ZwIU5m/n7/BKB4hiZfc+zlZx7ly0=
-github.com/go-git/go-git/v5 v5.15.0/go.mod h1:4Ge4alE/5gPs30F2H1esi2gPd69R0C39lolkucHBOp8=
+github.com/go-git/go-git/v5 v5.16.0 h1:k3kuOEpkc0DeY7xlL6NaaNg39xdgQbtH5mwCafHO9AQ=
+github.com/go-git/go-git/v5 v5.16.0/go.mod h1:4Ge4alE/5gPs30F2H1esi2gPd69R0C39lolkucHBOp8=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
 github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ=
 github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
-github.com/grafana/k6foundry v0.4.5 h1:wus8L3e1vTiECOoR5CCexCDHt9wGASyffF7iujZmh+U=
-github.com/grafana/k6foundry v0.4.5/go.mod h1:GDmBp/h370ZDMhjIhx54LpvGCIfmy/cMOLpeU+W+FOk=
+github.com/grafana/k6foundry v0.4.6 h1:fFgR72Pw0dzo8wVWyggu35SGGjdt31Dktil1bDE1MCM=
+github.com/grafana/k6foundry v0.4.6/go.mod h1:eLsr0whhH+5Y1y7YpDxJi3Jv5wHMuf+80vdRyMH10pg=
 github.com/hhatto/gorst v0.0.0-20181029133204-ca9f730cac5b h1:Jdu2tbAxkRouSILp2EbposIb8h4gO+2QuZEn3d9sKAc=
 github.com/hhatto/gorst v0.0.0-20181029133204-ca9f730cac5b/go.mod h1:HmaZGXHdSwQh1jnUlBGN2BeEYOHACLVGzYOXCbsLvxY=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=

internal/legacy/builder.go

@@ -55,6 +55,76 @@ func FromOSEnv() Builder {
 	return parseEnv(env)
 }
 
+// Build builds k6 at the configured version with the
+// configured extensions and writes a binary at outputFile.
+func (b Builder) Build(ctx context.Context, log *slog.Logger, outfile string) error {
+	if outfile == "" {
+		return errMissingOutputFile
+	}
+
+	log.Info("Building k6")
+
+	opts := k6foundry.NativeFoundryOpts{
+		GoOpts: k6foundry.GoOpts{
+			GoGetTimeout:   b.TimeoutGet,
+			GOBuildTimeout: b.TimeoutBuild,
+			CopyGoEnv:      true,
+			Env:            b.newBuilderEnv(log),
+		},
+		K6Repo:      b.K6Repo,
+		SkipCleanup: b.SkipCleanup,
+		Stdout:      os.Stdout,
+		Stderr:      os.Stderr,
+		Logger:      log,
+	}
+
+	k6b, err := k6foundry.NewNativeFoundry(ctx, opts)
+	if err != nil {
+		return err
+	}
+
+	// the user's specified output file might be relative, and
+	// because the `go build` command is executed in a different,
+	// temporary folder, we convert the user's input to an
+	// absolute path so it goes the expected place
+	absOutputFile, err := filepath.Abs(outfile)
+	if err != nil {
+		return err
+	}
+
+	const outFilePerm = 0o777
+
+	outFile, err := os.OpenFile(absOutputFile, os.O_WRONLY|os.O_CREATE, outFilePerm) // #nosec G302 G304
+	if err != nil {
+		return err
+	}
+	defer outFile.Close() //nolint:errcheck
+
+	platform, err := b.parsePlatform()
+	if err != nil {
+		return err
+	}
+
+	mods, err := b.getModules()
+	if err != nil {
+		return err
+	}
+
+	reps, err := b.getReplacements()
+	if err != nil {
+		return err
+	}
+
+	k6Version := b.K6Version
+	if k6Version == "" {
+		k6Version = "latest"
+	}
+
+	_, err = k6b.Build(ctx, platform, k6Version, mods, reps, buildCommandArgs(b.BuildFlags), outFile)
+
+	return err
+}
+
 func parseEnv(env map[string]string) Builder {
 	return Builder{
 		Compile: Compile{
@@ -146,76 +216,6 @@ func (b Builder) parsePlatform() (k6foundry.Platform, error) {
 	return k6foundry.ParsePlatform(os + "/" + arch)
 }
 
-// Build builds k6 at the configured version with the
-// configured extensions and writes a binary at outputFile.
-func (b Builder) Build(ctx context.Context, log *slog.Logger, outfile string) error {
-	if outfile == "" {
-		return errMissingOutputFile
-	}
-
-	log.Info("Building k6")
-
-	opts := k6foundry.NativeFoundryOpts{
-		GoOpts: k6foundry.GoOpts{
-			GoGetTimeout:   b.TimeoutGet,
-			GOBuildTimeout: b.TimeoutBuild,
-			CopyGoEnv:      true,
-			Env:            b.newBuilderEnv(log),
-		},
-		K6Repo:      b.K6Repo,
-		SkipCleanup: b.SkipCleanup,
-		Stdout:      os.Stdout,
-		Stderr:      os.Stderr,
-		Logger:      log,
-	}
-
-	k6b, err := k6foundry.NewNativeFoundry(ctx, opts)
-	if err != nil {
-		return err
-	}
-
-	// the user's specified output file might be relative, and
-	// because the `go build` command is executed in a different,
-	// temporary folder, we convert the user's input to an
-	// absolute path so it goes the expected place
-	absOutputFile, err := filepath.Abs(outfile)
-	if err != nil {
-		return err
-	}
-
-	const outFilePerm = 0o777
-
-	outFile, err := os.OpenFile(absOutputFile, os.O_WRONLY|os.O_CREATE, outFilePerm) // #nosec G302 G304
-	if err != nil {
-		return err
-	}
-	defer outFile.Close() //nolint:errcheck
-
-	platform, err := b.parsePlatform()
-	if err != nil {
-		return err
-	}
-
-	mods, err := b.getModules()
-	if err != nil {
-		return err
-	}
-
-	reps, err := b.getReplacements()
-	if err != nil {
-		return err
-	}
-
-	k6Version := b.K6Version
-	if k6Version == "" {
-		k6Version = "latest"
-	}
-
-	_, err = k6b.Build(ctx, platform, k6Version, mods, reps, buildCommandArgs(b.BuildFlags), outFile)
-
-	return err
-}
-
 func envOrDefaultValue(env map[string]string, name, defaultValue string) string {
 	s, ok := env[name]
 	if !ok {

releases/v0.19.0.md

@@ -2,6 +2,7 @@
 
 This release includes:
   - reusable extension development workflows
+  - update dependencies and switch to go 1.24
 
 ## New features
 
@@ -10,3 +11,28 @@ This release includes:
 The reusable extension development workflows have been moved from the [grafana/k6-extension-workflows](https://github.com/grafana/k6-extension-workflows) repository.
 
 Check `docs/workflows/README.md` for more information.
+
+### Update dependencies and switch to go 1.24 [#175](https://github.com/grafana/xk6/issues/175)
+
+Switched to go 1.24 because some k6 extensions require it. Along with this, a general dependency update was made.
+
+
+In `go.mod`
+- remove unnecessary toolchain entry from `go.mod` file
+- update `k6foundry` to `v0.4.6`
+- update `go-git` to `v5.16.0`
+
+In Dockerfiles:
+- update  base image  to go  `1.24.2`
+
+In Dev Containers config:
+- update `go` to `1.24.2`
+- update `golangci-lint` to `2.1.2`
+- update `goreleaser` to `2.8.2`
+- update `gosec` to `2.22.3`
+
+In repository settings:
+- update `GO_VERSION` to `1.24`
+- update `GOLANGCI_LINT_VERSION` to `v2.1.2`
+- update `GORELEASER_VERSION` to `2.8.2`
+- update `GOSEC_VERSION` to `v2.22.3`