Skip to content

Commit 25b9330

Browse files
rkannan82claude
andauthored
Bump dependencies to address security CVEs for v1.29.4.1 (#9629)
## Summary Security dependency bumps for v1.29.4.1 security-only patch release. ### CVEs addressed | CVE | Severity | Fix | |-----|----------|-----| | CVE-2026-33186 | CRITICAL | grpc v1.79.3 | | CVE-2026-24051 | HIGH | otel/sdk v1.40.0 | | CVE-2025-22868 | HIGH | x/oauth2 v0.34.0 | | CVE-2026-25679 | HIGH | Go 1.25.8 (go directive) | Alpine CVE (CVE-2026-22184) handled in docker-builds repo. ### Changes - Dep bumps: grpc, otel/sdk (+ related), x/oauth2, x/net, x/crypto, x/sys, x/sync, x/text, x/exp, cel.dev/expr, uber/dig - `cache_test.go`: fix `EventuallyWithT` for otel/sdk v1.40.0 + testify v1.11.1 behavior change (move `release()` outside callback, add explicit sleep) - `caching_redirector_test.go`: wrap StaleTTL final assertion in `EventuallyWithT` to avoid hang under testify v1.11.1 - `worker_deployment_test.go`: fix `verifyDescribeWorkerDeployment` calls (missing `s.Require()` arg); add `proto.Equal` assertion during delete verification ### Notes - Dep bumps cherry-picked from #9610; test fixes adapted from #9442 and #9569 - `temporal.io/api` (v1.53.0) and `temporal.io/sdk` (v1.35.0) kept at 1.29.x versions - Pre-1.30 Dockerfiles excluded (managed in docker-builds repo) - Test changes from #9442/#9569 that reference API fields not in v1.53.0 (LastCurrentTime, ForceCANVersionSignalArgs, GetPollerAutoscaling) are not cherry-picked --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
1 parent bca7629 commit 25b9330

10 files changed

Lines changed: 221 additions & 180 deletions

client/history/caching_redirector_test.go

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"testing"
77
"time"
88

9+
"github.com/stretchr/testify/assert"
910
"github.com/stretchr/testify/require"
1011
"github.com/stretchr/testify/suite"
1112
"go.temporal.io/api/serviceerror"
@@ -397,8 +398,9 @@ func (s *cachingRedirectorSuite) TestStaleTTL() {
397398
defer r.mu.RUnlock()
398399
entry := r.mu.cache[shardID]
399400
return !entry.staleAt.IsZero()
400-
}, 4*staleTTL, staleTTL)
401+
}, 4*staleTTL, 10*time.Millisecond)
401402

403+
// Wait for the stale TTL to expire so clientForShardID re-resolves the shard owner.
402404
s.resolver.EXPECT().
403405
Lookup(convert.Int32ToString(shardID)).
404406
Return(membership.NewHostInfoFromAddress(string(testAddr2)), nil).
@@ -411,7 +413,12 @@ func (s *cachingRedirectorSuite) TestStaleTTL() {
411413
resetConnectBackoff(clientConn2).
412414
Times(1)
413415

414-
cli, err = r.clientForShardID(shardID)
415-
s.NoError(err)
416-
s.Equal(mockClient2, cli)
416+
s.EventuallyWithT(func(t *assert.CollectT) {
417+
cli, err = r.clientForShardID(shardID)
418+
assert.NoError(t, err)
419+
// Use == for pointer identity (not reflect.DeepEqual) since mock types have
420+
// cyclic recorder references that make DeepEqual incorrectly return true for
421+
// distinct mock instances.
422+
assert.True(t, cli == mockClient2, "expected mockClient2, got %v", cli)
423+
}, 4*staleTTL, 10*time.Millisecond)
417424
}

go.mod

Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module go.temporal.io/server
22

3-
go 1.25.7
3+
go 1.25.8
44

55
retract (
66
v1.26.1 // Contains retractions only.
@@ -17,14 +17,14 @@ require (
1717
github.com/emirpasic/gods v1.18.1
1818
github.com/fatih/color v1.18.0
1919
github.com/go-faker/faker/v4 v4.6.0
20-
github.com/go-jose/go-jose/v4 v4.0.5
20+
github.com/go-jose/go-jose/v4 v4.1.3
2121
github.com/go-sql-driver/mysql v1.9.0
2222
github.com/gocql/gocql v1.7.0
2323
github.com/golang-jwt/jwt/v4 v4.5.2
2424
github.com/google/go-cmp v0.7.0
2525
github.com/google/uuid v1.6.0
2626
github.com/gorilla/mux v1.8.1
27-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1
27+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1
2828
github.com/iancoleman/strcase v0.3.0
2929
github.com/jackc/pgx/v5 v5.7.2
3030
github.com/jmoiron/sqlx v1.4.0
@@ -38,11 +38,11 @@ require (
3838
github.com/pborman/uuid v1.2.1
3939
github.com/pkg/errors v0.9.1
4040
github.com/prometheus/client_golang v1.21.0
41-
github.com/prometheus/client_model v0.6.1
41+
github.com/prometheus/client_model v0.6.2
4242
github.com/prometheus/common v0.62.0
4343
github.com/robfig/cron/v3 v3.0.1
4444
github.com/sony/gobreaker v1.0.0
45-
github.com/stretchr/testify v1.10.0
45+
github.com/stretchr/testify v1.11.1
4646
github.com/temporalio/ringpop-go v0.0.0-20250130211428-b97329e994f7
4747
github.com/temporalio/sqlparser v0.0.0-20231115171017-f4060bcfa6cb
4848
github.com/temporalio/tchannel-go v1.22.1-0.20240528171429-1db37fdea938
@@ -52,44 +52,44 @@ require (
5252
github.com/urfave/cli/v2 v2.27.5
5353
go.opentelemetry.io/collector/pdata v1.34.0
5454
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0
55-
go.opentelemetry.io/otel v1.34.0
55+
go.opentelemetry.io/otel v1.40.0
5656
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.34.0
5757
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0
5858
go.opentelemetry.io/otel/exporters/prometheus v0.56.0
59-
go.opentelemetry.io/otel/metric v1.34.0
60-
go.opentelemetry.io/otel/sdk v1.34.0
61-
go.opentelemetry.io/otel/sdk/metric v1.34.0
62-
go.opentelemetry.io/otel/trace v1.34.0
59+
go.opentelemetry.io/otel/metric v1.40.0
60+
go.opentelemetry.io/otel/sdk v1.40.0
61+
go.opentelemetry.io/otel/sdk/metric v1.40.0
62+
go.opentelemetry.io/otel/trace v1.40.0
6363
go.temporal.io/api v1.53.0
6464
go.temporal.io/sdk v1.35.0
6565
go.uber.org/fx v1.23.0
6666
go.uber.org/mock v0.5.0
6767
go.uber.org/multierr v1.11.0
6868
go.uber.org/zap v1.27.0
69-
golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa
70-
golang.org/x/oauth2 v0.28.0
71-
golang.org/x/sync v0.18.0
72-
golang.org/x/text v0.31.0
69+
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b
70+
golang.org/x/oauth2 v0.34.0
71+
golang.org/x/sync v0.19.0
72+
golang.org/x/text v0.32.0
7373
golang.org/x/time v0.10.0
7474
google.golang.org/api v0.224.0
75-
google.golang.org/grpc v1.72.2
76-
google.golang.org/protobuf v1.36.6
75+
google.golang.org/grpc v1.79.3
76+
google.golang.org/protobuf v1.36.10
7777
gopkg.in/validator.v2 v2.0.1
7878
gopkg.in/yaml.v3 v3.0.1
7979
modernc.org/sqlite v1.34.1
8080
)
8181

8282
require (
83-
cel.dev/expr v0.20.0 // indirect
83+
cel.dev/expr v0.25.1 // indirect
8484
cloud.google.com/go v0.118.3 // indirect; indirect e
8585
cloud.google.com/go/auth v0.15.0 // indirect
8686
cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
87-
cloud.google.com/go/compute/metadata v0.6.0 // indirect
87+
cloud.google.com/go/compute/metadata v0.9.0 // indirect
8888
cloud.google.com/go/iam v1.4.2 // indirect
8989
cloud.google.com/go/monitoring v1.24.1 // indirect
9090
dario.cat/mergo v1.0.1 // indirect
9191
filippo.io/edwards25519 v1.1.0 // indirect
92-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 // indirect
92+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0 // indirect
9393
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0 // indirect
9494
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 // indirect
9595
github.com/Masterminds/goutils v1.1.1 // indirect
@@ -100,15 +100,15 @@ require (
100100
github.com/cactus/go-statsd-client/statsd v0.0.0-20200423205355-cb0885a1018c // indirect
101101
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
102102
github.com/cespare/xxhash/v2 v2.3.0 // indirect
103-
github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42 // indirect
103+
github.com/cncf/xds/go v0.0.0-20251210132809-ee656c7534f5 // indirect
104104
github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
105-
github.com/davecgh/go-spew v1.1.1 // indirect
105+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
106106
github.com/dustin/go-humanize v1.0.1 // indirect
107-
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
108-
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
107+
github.com/envoyproxy/go-control-plane/envoy v1.36.0 // indirect
108+
github.com/envoyproxy/protoc-gen-validate v1.3.0 // indirect
109109
github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a // indirect
110110
github.com/felixge/httpsnoop v1.0.4 // indirect
111-
github.com/go-logr/logr v1.4.2 // indirect
111+
github.com/go-logr/logr v1.4.3 // indirect
112112
github.com/go-logr/stdr v1.2.2 // indirect
113113
github.com/gogo/protobuf v1.3.2 // indirect
114114
github.com/golang/mock v1.6.0 // indirect
@@ -140,7 +140,7 @@ require (
140140
github.com/ncruces/go-strftime v0.1.9 // indirect
141141
github.com/opentracing/opentracing-go v1.2.0 // indirect
142142
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
143-
github.com/pmezard/go-difflib v1.0.0 // indirect
143+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
144144
github.com/prometheus/procfs v0.15.1 // indirect
145145
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
146146
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
@@ -150,25 +150,24 @@ require (
150150
github.com/shopspring/decimal v1.4.0 // indirect
151151
github.com/sirupsen/logrus v1.9.3 // indirect
152152
github.com/spf13/cast v1.7.0 // indirect
153-
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
153+
github.com/spiffe/go-spiffe/v2 v2.6.0 // indirect
154154
github.com/stretchr/objx v0.5.2 // indirect
155155
github.com/twmb/murmur3 v1.1.8 // indirect
156156
github.com/uber-common/bark v1.3.0 // indirect
157157
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
158-
github.com/zeebo/errs v1.4.0 // indirect
159-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
160-
go.opentelemetry.io/contrib/detectors/gcp v1.34.0 // indirect
158+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
159+
go.opentelemetry.io/contrib/detectors/gcp v1.39.0 // indirect
161160
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
162161
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0
163-
go.opentelemetry.io/proto/otlp v1.5.0
162+
go.opentelemetry.io/proto/otlp v1.7.1
164163
go.uber.org/atomic v1.11.0 // indirect
165-
go.uber.org/dig v1.18.0 // indirect
166-
golang.org/x/crypto v0.45.0 // indirect
167-
golang.org/x/net v0.47.0 // indirect
168-
golang.org/x/sys v0.38.0 // indirect
164+
go.uber.org/dig v1.19.0 // indirect
165+
golang.org/x/crypto v0.46.0 // indirect
166+
golang.org/x/net v0.48.0 // indirect
167+
golang.org/x/sys v0.40.0 // indirect
169168
google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb // indirect
170-
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
171-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
169+
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect
170+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
172171
gopkg.in/inf.v0 v0.9.1 // indirect
173172
modernc.org/cc/v4 v4.24.4 // indirect
174173
modernc.org/ccgo/v4 v4.20.4 // indirect

0 commit comments

Comments
 (0)