Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion internal/router/handler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
16 changes: 8 additions & 8 deletions internal/server/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
})
Expand Down Expand Up @@ -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) {
Expand All @@ -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))
})
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand All @@ -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")
}
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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.
Expand Down
76 changes: 38 additions & 38 deletions mise.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 14 additions & 14 deletions mise.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ lockfile = true
"github:temporalio/cli" = "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"
Expand Down Expand Up @@ -73,10 +73,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"]
Expand All @@ -99,9 +99,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"]
Expand Down Expand Up @@ -141,12 +141,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"]
Expand Down
Loading