Merge branch 'main' into renovate/github.com-cli-go-gh-v2-2.x

Author: szkiba

.devcontainer/devcontainer.json

@@ -19,8 +19,8 @@
   "features": {
     "ghcr.io/devcontainers/features/github-cli:1": {},
     "ghcr.io/devcontainers/features/go:1": {
-      "version": "1.24",
-      "golangciLintVersion": "2.1.2"
+      "version": "1.25",
+      "golangciLintVersion": "2.4.0"
     },
     "ghcr.io/guiyomh/features/goreleaser:0": { "version": "2.8.2" },
     "ghcr.io/szkiba/devcontainer-features/gosec:1": { "version": "2.22.3" },

.github/dependabot.yml

@@ -9,12 +9,12 @@ permissions: {}
 jobs:
   release:
     name: Release
-    uses: grafana/xk6/.github/workflows/tooling-release.yml@v1.2.4
+    uses: grafana/xk6/.github/workflows/tooling-release.yml@da8eccb3592e057e56d1017218ba5fd7a91927aa # v1.3.2
     permissions:
       contents: write
       packages: write
       id-token: write
     with:
-      go-version: "1.24.x"
+      go-version: "1.25.x"
       goreleaser-version: "2.8.2"
       k6-versions: '["v1.2.3","v1.0.0"]'

.github/workflows/release.yml

@@ -12,13 +12,11 @@ permissions: {}
 jobs:
   validate:
     name: Validate
-    uses: grafana/xk6/.github/workflows/tooling-validate.yml@v1.2.4
-    secrets:
-      codecov-token: ${{secrets.CODECOV_TOKEN}}
+    uses: grafana/xk6/.github/workflows/tooling-validate.yml@da8eccb3592e057e56d1017218ba5fd7a91927aa # v1.3.2
     with:
-      go-version: "1.24.x"
-      go-versions: '["1.24.x","1.25.x"]'
-      golangci-lint-version: "v2.1.2"
+      go-version: "1.25.x"
+      go-versions: '["1.25.x"]'
+      golangci-lint-version: "v2.4.0"
       goreleaser-version: "2.8.2"
       platforms: '["ubuntu-latest", "windows-latest", "macos-latest"]'
       k6-versions: '["v1.2.3","v1.0.0"]'

.github/workflows/validate.yml

@@ -12,6 +12,12 @@ linters:
     # Except for general-purpose public APIs,
     # wrapping errors is more inconvenient and error prone than useful.
     - wrapcheck
+
+    # Deprecated linters
+    - wsl
+
+    # Temporary mitigaion.
+    - noinlineerr
   settings:
     # Temporary mitigation.
     cyclop:
@@ -32,18 +38,14 @@ linters:
             - github.com/xeipuuv/gojsonschema
             - gitlab.com/gitlab-org/api/client-go
             - github.com/cli/go-gh/v2
-            - github.com/google/go-github/v62/github
+            - github.com/google/go-github/v81/github
             - github.com/go-git/go-git/v5
             - github.com/sirupsen/logrus
             - github.com/samber/slog-logrus/v2
             - golang.org/x/term
             - github.com/adrg/xdg
             - github.com/narqo/go-badge
 
-  exclusions:
-    paths:
-      # adopted from fixuid source: https://github.com/boxboat/fixuid
-      - internal/fixids
 issues:
   max-issues-per-linter: 0
   max-same-issues: 0

.golangci.yml

@@ -18,11 +18,12 @@ import (
 var help string
 
 type options struct {
+	loadOptions
+
 	out     string
 	compact bool
 	quiet   bool
 	verbose bool
-	loadOptions
 }
 
 // New creates new cobra command for exec command.
@@ -93,7 +94,6 @@ func schemaCmd() *cobra.Command {
 	}
 }
 
-//nolint:funlen
 func run(ctx context.Context, args []string, opts *options) (result error) {
 	input := os.Stdin
 

cmd/cmd.go

@@ -13,7 +13,7 @@ import (
 	"github.com/cli/go-gh/v2/pkg/api"
 	"github.com/cli/go-gh/v2/pkg/auth"
 	"github.com/cli/go-gh/v2/pkg/config"
-	"github.com/google/go-github/v62/github"
+	"github.com/google/go-github/v81/github"
 )
 
 type githubClientKey struct{}

cmd/context.go

@@ -48,6 +48,3 @@ func newCmd(args []string, levelVar *slog.LevelVar) *cobra.Command {
 
 	return cmd
 }
-
-func runCmd(cmd *cobra.Command) {
-}

cmd/k6registry/main.go

@@ -101,11 +101,11 @@ func saveCompliance(ctx context.Context, module string, version string, comp *Co
 	return os.WriteFile(filename, data, permFile)
 }
 
+//nolint:funlen
 func checkCompliance(
 	ctx context.Context,
 	module string,
 	version string,
-	official bool,
 	checks []string,
 	cloneURL string,
 	tstamp int64,
@@ -147,7 +147,7 @@ func checkCompliance(
 		lintArgs = append(lintArgs, "--enable-only", strings.Join(checks, ","))
 	}
 
-	lintCmd := exec.Command(xk6Binary, lintArgs...)
+	lintCmd := exec.CommandContext(ctx, xk6Binary, lintArgs...)
 
 	lintCmd.Stdout = lintOut
 	lintCmd.Stderr = lintErr
@@ -164,6 +164,7 @@ func checkCompliance(
 	}
 
 	compliance := &Compliance{}
+
 	err = json.Unmarshal(lintOut.Bytes(), compliance)
 	if err != nil {
 		return nil, err

cmd/lint.go

@@ -14,7 +14,7 @@ import (
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/config"
 	"github.com/go-git/go-git/v5/plumbing"
-	"github.com/google/go-github/v62/github"
+	"github.com/google/go-github/v81/github"
 	"github.com/grafana/k6registry"
 	gitlab "gitlab.com/gitlab-org/api/client-go"
 	"gopkg.in/yaml.v3"
@@ -100,14 +100,12 @@ func loadOne(ctx context.Context, ext *k6registry.Extension, lint bool, checks [
 	}
 
 	complianceErrors := []error{}
-	for _, version := range ext.Versions {
-		official := ext.Tier == k6registry.TierOfficial
 
+	for _, version := range ext.Versions {
 		compliance, err := checkCompliance(
 			ctx,
 			ext.Module,
 			version,
-			official,
 			checks,
 			repo.CloneURL,
 			int64(repo.Timestamp),
@@ -120,7 +118,7 @@ func loadOne(ctx context.Context, ext *k6registry.Extension, lint bool, checks [
 
 		for _, check := range compliance.Checks {
 			if !check.Passed {
-				issues = append(issues, string(check.ID))
+				issues = append(issues, check.ID)
 			}
 		}
 
@@ -147,6 +145,7 @@ func load(
 	}
 
 	compliancedErrors := []error{}
+
 	for idx := range registry {
 		ext := &registry[idx]
 
@@ -234,6 +233,7 @@ func moduleToOwnerAndName(module string) (string, string) {
 	}
 
 	const maxParts = 4
+
 	parts := strings.SplitN(module, "/", maxParts)
 
 	return parts[1], parts[2]