From 52c1217e5bb334ee6fa492cf279b657af4805b18 Mon Sep 17 00:00:00 2001 From: "qubesome-renovate[bot]" <243215653+qubesome-renovate[bot]@users.noreply.github.com> Date: Sun, 17 May 2026 07:31:45 +0000 Subject: [PATCH 1/2] chore(deps): update dependency golangci/golangci-lint to v2.12.2 --- hack/base.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/base.mk b/hack/base.mk index 1519051..0af7d04 100644 --- a/hack/base.mk +++ b/hack/base.mk @@ -1,5 +1,5 @@ # renovate: datasource=github-tags depName=golangci/golangci-lint -GOLANGCI_VERSION ?= v2.11.4 +GOLANGCI_VERSION ?= v2.12.2 # renovate: datasource=github-tags depName=protocolbuffers/protobuf PROTOC_VERSION ?= v34.1 TOOLS_BIN := $(shell mkdir -p build/tools && realpath build/tools) From d4fa0506535ff804fbcdb75e3446e1897b58c448 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 18 May 2026 09:33:52 +0000 Subject: [PATCH 2/2] fix: resolve make verify failures with golangci v2.12.2 Agent-Logs-Url: https://github.com/qubesome/cli/sessions/44acf5b4-3fc3-42e9-aaa1-f8136c70fd97 Co-authored-by: pjbgf <5452977+pjbgf@users.noreply.github.com> --- .golangci.yaml | 6 +++++- internal/profiles/profiles.go | 8 ++++---- internal/runners/docker/run.go | 2 +- internal/runners/podman/run.go | 2 +- pkg/inception/proto/host.pb.go | 2 +- pkg/inception/proto/host_grpc.pb.go | 4 ++-- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.golangci.yaml b/.golangci.yaml index 8830aff..df3a58e 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -24,7 +24,7 @@ linters: - gochecksumtype - goconst - goheader - - gomodguard + - gomodguard_v2 - goprintffuncname - gosec - gosmopolitan @@ -76,6 +76,10 @@ linters: - third_party$ - builtin$ - examples$ + settings: + goconst: + ignore-tests: true + min-occurrences: 10 formatters: enable: - gofmt diff --git a/internal/profiles/profiles.go b/internal/profiles/profiles.go index 02b56e2..1be1c1f 100644 --- a/internal/profiles/profiles.go +++ b/internal/profiles/profiles.go @@ -249,7 +249,7 @@ func Start(runner string, profile *types.Profile, cfg *types.Config, interactive } } - if len(imgs) > 1 && term.IsTerminal(int(os.Stdout.Fd())) { //nolint:gosec // G115: fd values fit in int + if len(imgs) > 1 && term.IsTerminal(int(os.Stdout.Fd())) { if proceed("Not all workload images are present. Start loading them on the background?") { go images.PreemptWorkloadImages(binary, cfg) } @@ -417,8 +417,8 @@ func createMagicCookie(profile *types.Profile) error { xauthority = os.ExpandEnv("${HOME}/.XAUTHORITY") } - slog.Debug("opening parent xauthority", "path", xauthority) //nolint:gosec // G706: path is from trusted env var - parent, err := os.Open(xauthority) //nolint:gosec // G703: path is from trusted env var + slog.Debug("opening parent xauthority", "path", xauthority) + parent, err := os.Open(xauthority) //nolint:gosec // G703: path is from trusted env var if err != nil { slog.Debug("failed to open parent xauthority", "error", err) return err @@ -670,7 +670,7 @@ func createNewDisplay(bin string, ca, cert, key []byte, profile *types.Profile, grabberShortcut()) } - slog.Debug("exec", "binary", bin, "args", dockerArgs) //nolint:gosec // G706: binary path is from trusted config + slog.Debug("exec", "binary", bin, "args", dockerArgs) cmd := execabs.Command(bin, dockerArgs...) cmd.Env = append(cmd.Env, os.Environ()...) diff --git a/internal/runners/docker/run.go b/internal/runners/docker/run.go index 9ae908b..b92c0c2 100644 --- a/internal/runners/docker/run.go +++ b/internal/runners/docker/run.go @@ -263,7 +263,7 @@ func Run(ew types.EffectiveWorkload) error { args = append(args, wl.Command) args = append(args, wl.Args...) - slog.Debug("exec", "binary", runnerBinary, "args", args) //nolint:gosec // G706: binary path is from trusted config + slog.Debug("exec", "binary", runnerBinary, "args", args) cmd := execabs.Command(runnerBinary, args...) if ew.Workload.HostAccess.Mime { diff --git a/internal/runners/podman/run.go b/internal/runners/podman/run.go index dbbab84..23b4620 100644 --- a/internal/runners/podman/run.go +++ b/internal/runners/podman/run.go @@ -251,7 +251,7 @@ func Run(ew types.EffectiveWorkload) error { args = append(args, wl.Command) args = append(args, wl.Args...) - slog.Debug("exec", "binary", runnerBinary, "args", args) //nolint:gosec // G706: binary path is from trusted config + slog.Debug("exec", "binary", runnerBinary, "args", args) cmd := execabs.Command(runnerBinary, args...) if ew.Workload.HostAccess.Mime { diff --git a/pkg/inception/proto/host.pb.go b/pkg/inception/proto/host.pb.go index 924f3cf..570e9a4 100644 --- a/pkg/inception/proto/host.pb.go +++ b/pkg/inception/proto/host.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.11 -// protoc v6.33.5 +// protoc v7.34.1 // source: pkg/inception/proto/host.proto package proto diff --git a/pkg/inception/proto/host_grpc.pb.go b/pkg/inception/proto/host_grpc.pb.go index efc64f5..5276f2b 100644 --- a/pkg/inception/proto/host_grpc.pb.go +++ b/pkg/inception/proto/host_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.6.1 -// - protoc v6.33.5 +// - protoc-gen-go-grpc v1.6.2 +// - protoc v7.34.1 // source: pkg/inception/proto/host.proto package proto