Merge pull request #126 from jgiannuzzi/fix-linter

Upgrade `golangci-lint` to 1.61.0

.github/workflows/commit.yaml

@@ -25,7 +25,7 @@ jobs:
     strategy:
       matrix:
         go-version:  # Note: Go only supports 2 versions: https://go.dev/doc/devel/release#policy
-          - "1.20"
+          - "1.23"
 
     steps:
       - uses: actions/checkout@v3
@@ -51,7 +51,7 @@ jobs:
     strategy:
       matrix:
         go-version:  # Note: Go only supports 2 versions: https://go.dev/doc/devel/release#policy
-          - "1.20"
+          - "1.23"
 
     steps:
       - uses: actions/checkout@v3
@@ -67,9 +67,9 @@ jobs:
     strategy:
       matrix:
         go-version:  # Note: Go only supports 2 versions: https://go.dev/doc/devel/release#policy
-          - "1.20"
+          - "1.23"
         tinygo-version:  # Note: TinyGo only supports latest: https://github.com/tinygo-org/tinygo/releases
-          - "0.28.1"  # Latest
+          - "0.34.0"  # Latest
 
     steps:
       - uses: actions/checkout@v3

.github/workflows/testdata.yaml

@@ -27,9 +27,9 @@ jobs:
     strategy:
       matrix:
         go-version:  # Note: Go only supports 2 versions: https://go.dev/doc/devel/release#policy
-          - "1.20"
+          - "1.23"
         tinygo-version:  # Note: TinyGo only supports latest: https://github.com/tinygo-org/tinygo/releases
-          - "0.28.1"  # Latest
+          - "0.34.0"  # Latest
 
     steps:
       - uses: actions/checkout@v3

Makefile

@@ -1,6 +1,6 @@
 gofumpt       := mvdan.cc/[email protected]
 gosimports    := github.com/rinchsan/gosimports/cmd/[email protected]
-golangci_lint := github.com/golangci/golangci-lint/cmd/golangci-lint@v1.53.2
+golangci_lint := github.com/golangci/golangci-lint/cmd/golangci-lint@v1.61.0
 
 examples/advanced/main.wasm: examples/advanced/main.go
 	@(cd $(@D); tinygo build -o main.wasm -gc=custom -tags=custommalloc -scheduler=none --no-debug -target=wasi .)
@@ -33,7 +33,7 @@ bench-guest: guest/.tinygo-target.json
 # This makes a wasi target that uses the same wazero version as the scheduler.
 wazero_version := $(shell (cd scheduler; go list -f '{{ .Module.Version }}' github.com/tetratelabs/wazero))
 guest/.tinygo-target.json: scheduler/go.mod
-	@sed 's~"wasmtime.*"~"go run github.com/tetratelabs/wazero/cmd/wazero@$(wazero_version) run {}"~' $(shell tinygo env TINYGOROOT)/targets/wasi.json > $@
+	@jq '."emulator" = "go run github.com/tetratelabs/wazero/cmd/wazero@$(wazero_version) run {}"' $(shell tinygo env TINYGOROOT)/targets/wasi.json > $@
 
 .PHONY: build-wat
 build-wat: $(wildcard scheduler/test/testdata/*/*.wat)

scheduler/test/util.go

@@ -3,7 +3,6 @@ package test
 import (
 	"context"
 	"errors"
-	"fmt"
 
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -23,9 +22,9 @@ type FakeRecorder struct {
 func (f *FakeRecorder) Eventf(regarding runtime.Object, related runtime.Object, eventtype, reason, action, note string, args ...interface{}) {
 	obj, ok := regarding.(*v1.ObjectReference)
 	if !ok || obj.Name == "" {
-		f.EventMsg = fmt.Sprintf(eventtype + " " + reason + " " + action + " " + note)
+		f.EventMsg = eventtype + " " + reason + " " + action + " " + note
 	} else {
-		f.EventMsg = fmt.Sprintf(obj.Name + " " + eventtype + " " + reason + " " + action + " " + note)
+		f.EventMsg = obj.Name + " " + eventtype + " " + reason + " " + action + " " + note
 	}
 }