From 92ca079daf2d0af53f1ad7c7e5b71dce12e7c5a1 Mon Sep 17 00:00:00 2001 From: "David Muto (pseudomuto)" Date: Wed, 21 Oct 2026 09:43:47 -0400 Subject: [PATCH] [build]: Bump Go Versions Bumping Go to 1.26.10 and 1.27.3 to address a security issue. --- examples/go.mod | 4 +- go.mod | 4 +- internal/router/handler_test.go | 2 +- internal/server/server_test.go | 16 +++---- mise.lock | 76 ++++++++++++++++----------------- mise.toml | 28 ++++++------ 6 files changed, 65 insertions(+), 65 deletions(-) diff --git a/examples/go.mod b/examples/go.mod index fc3decf..e173a46 100644 --- a/examples/go.mod +++ b/examples/go.mod @@ -1,8 +1,8 @@ module go.temporal.io/proxy/examples -go 1.26.0 +go 1.26.10 -toolchain go1.27.1 +toolchain go1.27.3 // The examples build against this working tree because pkg/api/kms/v1, which the // kms example serves, is not in a released tag yet. Outside this repository, drop diff --git a/go.mod b/go.mod index eaa417b..d1f22d8 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module go.temporal.io/proxy -go 1.26.0 +go 1.26.10 -toolchain go1.27.1 +toolchain go1.27.3 require ( github.com/MicahParks/jwkset v0.11.3 diff --git a/internal/router/handler_test.go b/internal/router/handler_test.go index 9021fad..cd87bdd 100644 --- a/internal/router/handler_test.go +++ b/internal/router/handler_test.go @@ -446,7 +446,7 @@ func TestHandlerCoHostsLocalHealthWithForwarding(t *testing.T) { require.Equal(t, grpc_health_v1.HealthCheckResponse_SERVING, eResp.GetStatus()) require.NoError(t, svr.Stop(t.Context())) - <-errCh + require.NoError(t, <-errCh) } func TestForwardToReturnsStreamSetupFailure(t *testing.T) { diff --git a/internal/server/server_test.go b/internal/server/server_test.go index 3046f94..36e3c16 100644 --- a/internal/server/server_test.go +++ b/internal/server/server_test.go @@ -91,7 +91,7 @@ func TestNew(t *testing.T) { }, time.Second, 10*time.Millisecond) require.NoError(t, svr.Stop(t.Context())) - <-errCh + require.NoError(t, <-errCh) require.True(t, log.Contains("Shutting down"), "expected shutdown to be logged") }) @@ -121,7 +121,7 @@ func TestServerInsecureWarning(t *testing.T) { }, time.Second, 10*time.Millisecond) require.NoError(t, svr.Stop(t.Context())) - <-errCh + require.NoError(t, <-errCh) }) t.Run("does not warn when credentials are secure", func(t *testing.T) { @@ -145,7 +145,7 @@ func TestServerInsecureWarning(t *testing.T) { }, time.Second, 10*time.Millisecond) require.NoError(t, svr.Stop(t.Context())) - <-errCh + require.NoError(t, <-errCh) require.False(t, log.Contains(insecureMessage)) }) @@ -191,7 +191,7 @@ func TestWithStreamInterceptor(t *testing.T) { require.True(t, called.Load()) require.NoError(t, svr.Stop(t.Context())) - <-errCh + require.NoError(t, <-errCh) } func TestWithUnknownServiceHandler(t *testing.T) { @@ -224,7 +224,7 @@ func TestWithUnknownServiceHandler(t *testing.T) { require.ErrorContains(t, err, "reached-unknown-handler") require.NoError(t, svr.Stop(t.Context())) - <-errCh + require.NoError(t, <-errCh) } func TestWithServerCodec(t *testing.T) { @@ -250,7 +250,7 @@ func TestWithServerCodec(t *testing.T) { require.Equal(t, grpc_health_v1.HealthCheckResponse_SERVING, resp.GetStatus()) require.NoError(t, svr.Stop(t.Context())) - <-errCh + require.NoError(t, <-errCh) require.Positive(t, rec.calls.Load(), "forced server codec should be exercised") } @@ -315,7 +315,7 @@ func TestWithHealthServices(t *testing.T) { } require.NoError(t, svr.Stop(t.Context())) - <-errCh + require.NoError(t, <-errCh) } func TestServerStartAndStop(t *testing.T) { @@ -506,7 +506,7 @@ func TestStopDrainsCleanlyWhenNothingIsInFlight(t *testing.T) { }, time.Second, 10*time.Millisecond) require.NoError(t, svr.Stop(t.Context())) - <-errCh + require.NoError(t, <-errCh) // Guards against the forced path becoming unconditional: with nothing to wait // on, the drain must finish on its own. diff --git a/mise.lock b/mise.lock index ebb29e6..a03907c 100644 --- a/mise.lock +++ b/mise.lock @@ -130,37 +130,37 @@ url = "https://github.com/temporalio/cli/releases/download/v1.9.1/temporal_cli_1 url_api = "https://api.github.com/repos/temporalio/cli/releases/assets/564295042" [[tools.go]] -version = "1.27.1" +version = "1.27.3" backend = "core:go" specifiers = ["1.27"] [tools.go."platforms.linux-arm64"] -checksum = "sha256:3450b45a3f9ee8568792736a5c5e70a1f2e9b36c35a8f74958c03e51d7d92bec" -url = "https://dl.google.com/go/go1.27.1.linux-arm64.tar.gz" +checksum = "sha256:a06e99309dbcbdca1a8ccd2282c3ee146e55930886e26b4f1193269587165f49" +url = "https://dl.google.com/go/go1.27.3.linux-arm64.tar.gz" [tools.go."platforms.linux-arm64-musl"] -checksum = "sha256:3450b45a3f9ee8568792736a5c5e70a1f2e9b36c35a8f74958c03e51d7d92bec" -url = "https://dl.google.com/go/go1.27.1.linux-arm64.tar.gz" +checksum = "sha256:a06e99309dbcbdca1a8ccd2282c3ee146e55930886e26b4f1193269587165f49" +url = "https://dl.google.com/go/go1.27.3.linux-arm64.tar.gz" [tools.go."platforms.linux-x64"] -checksum = "sha256:63d339f0da5ab53635a56f2490a7984dfe12dfcff22ad749f63edaf590168445" -url = "https://dl.google.com/go/go1.27.1.linux-amd64.tar.gz" +checksum = "sha256:65efbc80fdc1fa2cd2631cad5b481777a68e8725f34e89f50fc6ac714e379b40" +url = "https://dl.google.com/go/go1.27.3.linux-amd64.tar.gz" [tools.go."platforms.linux-x64-musl"] -checksum = "sha256:63d339f0da5ab53635a56f2490a7984dfe12dfcff22ad749f63edaf590168445" -url = "https://dl.google.com/go/go1.27.1.linux-amd64.tar.gz" +checksum = "sha256:65efbc80fdc1fa2cd2631cad5b481777a68e8725f34e89f50fc6ac714e379b40" +url = "https://dl.google.com/go/go1.27.3.linux-amd64.tar.gz" [tools.go."platforms.macos-arm64"] -checksum = "sha256:ee215d57e0ec269c60cc9ceca68e6bda321ba9ee5afe24f4b0988703c2d87d12" -url = "https://dl.google.com/go/go1.27.1.darwin-arm64.tar.gz" +checksum = "sha256:dd3908cf20959d798c1e06ebe5b72213f0505ce01373b40ce3110975a6cd99c2" +url = "https://dl.google.com/go/go1.27.3.darwin-arm64.tar.gz" [tools.go."platforms.macos-x64"] -checksum = "sha256:8f8f52c6649542cf027bbc9b9c68d1ec042f9f34808a40413f0b8b3f66f3caa4" -url = "https://dl.google.com/go/go1.27.1.darwin-amd64.tar.gz" +checksum = "sha256:b6f8e931e4ab497fcde6da8ae4499a58f9d258e55c8a80824a516eae5950a750" +url = "https://dl.google.com/go/go1.27.3.darwin-amd64.tar.gz" [tools.go."platforms.windows-x64"] -checksum = "sha256:a3911b5e0e1b1053f25ed0675f4c1c6aad1e2bfcf253df2b9be4caabd2edd95d" -url = "https://dl.google.com/go/go1.27.1.windows-amd64.zip" +checksum = "sha256:f26081f438319757f8a1b46d7d0b2c5ec7583d4038e485e0aa725cfde7885fff" +url = "https://dl.google.com/go/go1.27.3.windows-amd64.zip" [[tools."go:golang.org/x/perf/cmd/benchstat"]] version = "v0.0.0-20261009192801-be2c69fb417e" @@ -168,50 +168,50 @@ backend = "go:golang.org/x/perf/cmd/benchstat" specifiers = ["latest"] [[tools.golangci-lint]] -version = "2.13.2" +version = "2.15.0" backend = "aqua:golangci/golangci-lint" -specifiers = ["2.13"] +specifiers = ["2.15"] [tools.golangci-lint."platforms.linux-arm64"] -checksum = "sha256:a2a4e0065aa41be71f7c5ac90f271b61751331e5d04314e62afe4027855f0893" -url = "https://github.com/golangci/golangci-lint/releases/download/v2.13.2/golangci-lint-2.13.2-linux-arm64.tar.gz" -url_api = "https://api.github.com/repos/golangci/golangci-lint/releases/assets/532995442" +checksum = "sha256:b4d8f17068b35ee6060cc2f69a16fb48740d706fbba81661c318649c114a6998" +url = "https://github.com/golangci/golangci-lint/releases/download/v2.15.0/golangci-lint-2.15.0-linux-arm64.tar.gz" +url_api = "https://api.github.com/repos/golangci/golangci-lint/releases/assets/647132775" provenance = "github-attestations" [tools.golangci-lint."platforms.linux-arm64-musl"] -checksum = "sha256:a2a4e0065aa41be71f7c5ac90f271b61751331e5d04314e62afe4027855f0893" -url = "https://github.com/golangci/golangci-lint/releases/download/v2.13.2/golangci-lint-2.13.2-linux-arm64.tar.gz" -url_api = "https://api.github.com/repos/golangci/golangci-lint/releases/assets/532995442" +checksum = "sha256:b4d8f17068b35ee6060cc2f69a16fb48740d706fbba81661c318649c114a6998" +url = "https://github.com/golangci/golangci-lint/releases/download/v2.15.0/golangci-lint-2.15.0-linux-arm64.tar.gz" +url_api = "https://api.github.com/repos/golangci/golangci-lint/releases/assets/647132775" provenance = "github-attestations" [tools.golangci-lint."platforms.linux-x64"] -checksum = "sha256:2277d43b98ec0054280f2ac26b53268bae97682444678a59a657dd565da021d6" -url = "https://github.com/golangci/golangci-lint/releases/download/v2.13.2/golangci-lint-2.13.2-linux-amd64.tar.gz" -url_api = "https://api.github.com/repos/golangci/golangci-lint/releases/assets/532995333" +checksum = "sha256:9b7fe6a6bf6334b98decf8d86b11415ea7889afdabdd1959fdce23af2a9ebcea" +url = "https://github.com/golangci/golangci-lint/releases/download/v2.15.0/golangci-lint-2.15.0-linux-amd64.tar.gz" +url_api = "https://api.github.com/repos/golangci/golangci-lint/releases/assets/647132535" provenance = "github-attestations" [tools.golangci-lint."platforms.linux-x64-musl"] -checksum = "sha256:2277d43b98ec0054280f2ac26b53268bae97682444678a59a657dd565da021d6" -url = "https://github.com/golangci/golangci-lint/releases/download/v2.13.2/golangci-lint-2.13.2-linux-amd64.tar.gz" -url_api = "https://api.github.com/repos/golangci/golangci-lint/releases/assets/532995333" +checksum = "sha256:9b7fe6a6bf6334b98decf8d86b11415ea7889afdabdd1959fdce23af2a9ebcea" +url = "https://github.com/golangci/golangci-lint/releases/download/v2.15.0/golangci-lint-2.15.0-linux-amd64.tar.gz" +url_api = "https://api.github.com/repos/golangci/golangci-lint/releases/assets/647132535" provenance = "github-attestations" [tools.golangci-lint."platforms.macos-arm64"] -checksum = "sha256:f4bf83f0b64f055c42b28fc9a38861839f69c096e61c788e72dfaae412011789" -url = "https://github.com/golangci/golangci-lint/releases/download/v2.13.2/golangci-lint-2.13.2-darwin-arm64.tar.gz" -url_api = "https://api.github.com/repos/golangci/golangci-lint/releases/assets/532995398" +checksum = "sha256:d1e409481a8ca846c4bc97e781eb5cb1bd5c23353a0b3977a1cbda1b1b6447d5" +url = "https://github.com/golangci/golangci-lint/releases/download/v2.15.0/golangci-lint-2.15.0-darwin-arm64.tar.gz" +url_api = "https://api.github.com/repos/golangci/golangci-lint/releases/assets/647132534" provenance = "github-attestations" [tools.golangci-lint."platforms.macos-x64"] -checksum = "sha256:8a13aaf9cbbb1dee52824e862cf0d0720e5bb97c1f4260d1e51623a09492b57b" -url = "https://github.com/golangci/golangci-lint/releases/download/v2.13.2/golangci-lint-2.13.2-darwin-amd64.tar.gz" -url_api = "https://api.github.com/repos/golangci/golangci-lint/releases/assets/532995222" +checksum = "sha256:767b899a28285e88ded2823d5dcc4bc5ef681173eb2d80f029a7b17ee4ece3b8" +url = "https://github.com/golangci/golangci-lint/releases/download/v2.15.0/golangci-lint-2.15.0-darwin-amd64.tar.gz" +url_api = "https://api.github.com/repos/golangci/golangci-lint/releases/assets/647132753" provenance = "github-attestations" [tools.golangci-lint."platforms.windows-x64"] -checksum = "sha256:4735fdc8e84a0cfb7a15a1c364a650942f88215e0d36c674ebc4024f7b554524" -url = "https://github.com/golangci/golangci-lint/releases/download/v2.13.2/golangci-lint-2.13.2-windows-amd64.zip" -url_api = "https://api.github.com/repos/golangci/golangci-lint/releases/assets/532995335" +checksum = "sha256:cd7ea6063c95de245e17e5246e42bdc14bb221792c429dbd239ab3a6ade6ca6a" +url = "https://github.com/golangci/golangci-lint/releases/download/v2.15.0/golangci-lint-2.15.0-windows-amd64.zip" +url_api = "https://api.github.com/repos/golangci/golangci-lint/releases/assets/647132900" provenance = "github-attestations" [[tools.goreleaser]] diff --git a/mise.toml b/mise.toml index 27530cc..76d3182 100644 --- a/mise.toml +++ b/mise.toml @@ -9,7 +9,7 @@ lockfile = true "go:golang.org/x/perf/cmd/benchstat" = "latest" buf = "1.72" go = "1.27" -golangci-lint = "2.13" +golangci-lint = "2.15" goreleaser = "2.18" markdownlint-cli2 = "0.23" mkcert = "1.4" @@ -74,10 +74,10 @@ buf curl --protocol grpc --http2-prior-knowledge \ [tasks.lint] description = "Lint files" run = [ - { task = "lint:go" }, - { task = "lint:md" }, - { task = "lint:protos" }, - { task = "lint:terms" }, + { task = "lint:go" }, + { task = "lint:md" }, + { task = "lint:protos" }, + { task = "lint:terms" }, ] [tasks."lint:go"] @@ -100,9 +100,9 @@ run = ["buf lint"] [tasks.format] description = "Format files" run = [ - { task = "format:go" }, - { task = "format:md" }, - { task = "format:protos" }, + { task = "format:go" }, + { task = "format:md" }, + { task = "format:protos" }, ] [tasks."format:go"] @@ -133,12 +133,12 @@ env.CAROOT = "." sources = ["mise.toml"] outputs = ["server.crt", "client.crt", "extserver.crt", "ca.crt"] run = [ - "rm -f *.pem *.key *.crt", - "mkcert -key-file server.key -cert-file server.crt localhost 127.0.0.1 ::1 2>/dev/null", - "mkcert -client -key-file client.key -cert-file client.crt client 2>/dev/null", - "mkcert -key-file extserver.key -cert-file extserver.crt extserver localhost 127.0.0.1 ::1 2>/dev/null", - "mv rootCA.pem ca.crt", - "rm -f rootCA-key.pem", + "rm -f *.pem *.key *.crt", + "mkcert -key-file server.key -cert-file server.crt localhost 127.0.0.1 ::1 2>/dev/null", + "mkcert -client -key-file client.key -cert-file client.crt client 2>/dev/null", + "mkcert -key-file extserver.key -cert-file extserver.crt extserver localhost 127.0.0.1 ::1 2>/dev/null", + "mv rootCA.pem ca.crt", + "rm -f rootCA-key.pem", ] [tasks."gen:protos"]