From 2872a12be59d8eb9d38a779f3398abe62799aaeb Mon Sep 17 00:00:00 2001 From: Microsoft Corporation Date: Mon, 20 Apr 2026 10:39:26 -0700 Subject: [PATCH 1/2] Fix golangci-lint compatibility with Go 1.26 Upgrade from golangci-lint v1 to v2 to fix the pre-existing CI lint failure where v1 (built with Go 1.25) cannot lint code targeting Go 1.26. Changes: - Migrate .golangci.yml to v2 format (version field, restructured config) - Update Makefile to install golangci-lint v2 import path Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .golangci.yml | 43 +++++++++++++++++++++++++------------------ Makefile | 2 +- 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 03614168..0bd5ca29 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,22 +1,29 @@ - +version: "2" run: - timeout: 15m - tests: false # Exclude test files from linting - -# Linter options and descriptions: https://golangci-lint.run/usage/linters/ + tests: false linters: - enable: - - errcheck - - govet - - ineffassign - - staticcheck disable: - # Disabling these two default linters for now as their checks are not a priority - - gosimple - unused - -linters-settings: - staticcheck: - checks: - - all - - -SA1019 # Ignore pkg deprecation warnings from staticcheck \ No newline at end of file + settings: + staticcheck: + checks: + - all + - -SA1019 + exclusions: + generated: lax + presets: + - comments + - common-false-positives + - legacy + - std-error-handling + paths: + - third_party$ + - builtin$ + - examples$ +formatters: + exclusions: + generated: lax + paths: + - third_party$ + - builtin$ + - examples$ diff --git a/Makefile b/Makefile index 9a6b00a4..94fc52ca 100644 --- a/Makefile +++ b/Makefile @@ -56,5 +56,5 @@ mocks: golangci-lint: tidy rm -f $(GOPATH_BIN)/golangci-lint $(GOCMD) clean -cache - $(GOCMD) install github.com/golangci/golangci-lint/cmd/golangci-lint@latest + $(GOCMD) install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@latest $(GOPATH_BIN)/golangci-lint run --config .golangci.yml From f52e55d1c396cf183608172e25b38622f170db77 Mon Sep 17 00:00:00 2001 From: Microsoft Corporation Date: Mon, 20 Apr 2026 11:05:33 -0700 Subject: [PATCH 2/2] Upgrade google.golang.org/grpc v1.79.3 to v1.80.0 Bump gRPC to v1.80.0 to address CG alert for authorization bypass CVE. Also updates x/net (v0.48.0->v0.49.0) and x/sys (v0.39.0->v0.40.0). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- go.mod | 6 +++--- go.sum | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index f5a6fa0d..fcf34fb9 100644 --- a/go.mod +++ b/go.mod @@ -12,15 +12,15 @@ require ( github.com/pkg/errors v0.9.1 github.com/stretchr/testify v1.8.3 go.uber.org/multierr v1.11.0 - google.golang.org/grpc v1.79.3 + google.golang.org/grpc v1.80.0 gopkg.in/yaml.v3 v3.0.1 ) require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - golang.org/x/net v0.48.0 // indirect - golang.org/x/sys v0.39.0 // indirect + golang.org/x/net v0.49.0 // indirect + golang.org/x/sys v0.40.0 // indirect golang.org/x/text v0.33.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20260120221211-b8f7ae30c516 // indirect google.golang.org/protobuf v1.36.11 // indirect diff --git a/go.sum b/go.sum index 8440453b..891bf2d1 100644 --- a/go.sum +++ b/go.sum @@ -104,12 +104,12 @@ golang.org/x/tools v0.39.0/go.mod h1:JnefbkDPyD8UU2kI5fuf8ZX4/yUeh9W877ZeBONxUqQ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk= -gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E= +gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4= +gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E= google.golang.org/genproto/googleapis/rpc v0.0.0-20260120221211-b8f7ae30c516 h1:sNrWoksmOyF5bvJUcnmbeAmQi8baNhqg5IWaI3llQqU= google.golang.org/genproto/googleapis/rpc v0.0.0-20260120221211-b8f7ae30c516/go.mod h1:j9x/tPzZkyxcgEFkiKEEGxfvyumM01BEtsW8xzOahRQ= -google.golang.org/grpc v1.79.3 h1:sybAEdRIEtvcD68Gx7dmnwjZKlyfuc61Dyo9pGXXkKE= -google.golang.org/grpc v1.79.3/go.mod h1:KmT0Kjez+0dde/v2j9vzwoAScgEPx/Bw1CYChhHLrHQ= +google.golang.org/grpc v1.80.0 h1:Xr6m2WmWZLETvUNvIUmeD5OAagMw3FiKmMlTdViWsHM= +google.golang.org/grpc v1.80.0/go.mod h1:ho/dLnxwi3EDJA4Zghp7k2Ec1+c2jqup0bFkw07bwF4= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=