Skip to content

Commit 1bb03b7

Browse files
yycpttyycptt
committed
Update dependencies (#5789)
<!-- Describe what has changed in this PR --> - `make update-dependency` - Update go-jose package to v2.6.3. NOTE: the original repo from square has been archived. <!-- Tell your future self why have you made these changes --> - Update dependencies and security patch. <!-- How have you verified this change? Tested locally? Added a unit test? Checked in staging env? --> - Existing tests <!-- Assuming the worst case, what can be broken when deploying this change to production? --> <!-- Have you made sure this change doesn't falsify anything currently stated in `docs/`? If significant new behavior is added, have you described that in `docs/`? --> <!-- Is this PR a hotfix candidate or does it require a notification to be sent to the broader community? (Yes/No) -->
1 parent 9701ef0 commit 1bb03b7

File tree

5 files changed

+399
-269
lines changed

5 files changed

+399
-269
lines changed

‎common/archiver/s3store/mocks/s3api.go‎

Lines changed: 133 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎common/authorization/default_token_key_provider.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import (
3636

3737
"github.com/golang-jwt/jwt/v4"
3838
"go.uber.org/multierr"
39-
"gopkg.in/square/go-jose.v2"
39+
"gopkg.in/go-jose/go-jose.v2"
4040

4141
"go.temporal.io/server/common/config"
4242
"go.temporal.io/server/common/log"

‎develop/buildkite/third_party_deps.txt‎

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
cloud.google.com/go/auth
2+
cloud.google.com/go/auth/credentials
3+
cloud.google.com/go/auth/credentials/internal/externalaccount
4+
cloud.google.com/go/auth/credentials/internal/externalaccountuser
5+
cloud.google.com/go/auth/credentials/internal/gdch
6+
cloud.google.com/go/auth/credentials/internal/impersonate
7+
cloud.google.com/go/auth/credentials/internal/stsexchange
8+
cloud.google.com/go/auth/grpctransport
9+
cloud.google.com/go/auth/httptransport
10+
cloud.google.com/go/auth/internal
11+
cloud.google.com/go/auth/internal/credsfile
12+
cloud.google.com/go/auth/internal/jwt
13+
cloud.google.com/go/auth/internal/transport
14+
cloud.google.com/go/auth/internal/transport/cert
15+
cloud.google.com/go/auth/oauth2adapt
116
cloud.google.com/go/compute/metadata
217
cloud.google.com/go/iam
318
cloud.google.com/go/iam/apiv1/iampb
@@ -12,6 +27,7 @@ cloud.google.com/go/storage/internal/apiv2/storagepb
1227
github.com/apache/thrift/lib/go/thrift
1328
github.com/aws/aws-sdk-go/aws
1429
github.com/aws/aws-sdk-go/aws/arn
30+
github.com/aws/aws-sdk-go/aws/auth/bearer
1531
github.com/aws/aws-sdk-go/aws/awserr
1632
github.com/aws/aws-sdk-go/aws/awsutil
1733
github.com/aws/aws-sdk-go/aws/client
@@ -57,6 +73,7 @@ github.com/aws/aws-sdk-go/service/s3
5773
github.com/aws/aws-sdk-go/service/s3/s3iface
5874
github.com/aws/aws-sdk-go/service/sso
5975
github.com/aws/aws-sdk-go/service/sso/ssoiface
76+
github.com/aws/aws-sdk-go/service/ssooidc
6077
github.com/aws/aws-sdk-go/service/sts
6178
github.com/aws/aws-sdk-go/service/sts/stsiface
6279
github.com/benbjohnson/clock
@@ -88,12 +105,8 @@ github.com/gogo/protobuf/types
88105
github.com/golang-jwt/jwt/v4
89106
github.com/golang/groupcache/lru
90107
github.com/golang/mock/gomock
91-
github.com/golang/protobuf/jsonpb
108+
github.com/golang/mock/mockgen/model
92109
github.com/golang/protobuf/proto
93-
github.com/golang/protobuf/ptypes
94-
github.com/golang/protobuf/ptypes/any
95-
github.com/golang/protobuf/ptypes/duration
96-
github.com/golang/protobuf/ptypes/timestamp
97110
github.com/golang/snappy
98111
github.com/google/go-cmp/cmp
99112
github.com/google/go-cmp/cmp/cmpopts
@@ -151,7 +164,10 @@ github.com/jackc/pgx/v5/pgconn/internal/bgreader
151164
github.com/jackc/pgx/v5/pgconn/internal/ctxwatch
152165
github.com/jackc/pgx/v5/pgproto3
153166
github.com/jackc/pgx/v5/pgtype
167+
github.com/jackc/pgx/v5/pgxpool
154168
github.com/jackc/pgx/v5/stdlib
169+
github.com/jackc/puddle/v2
170+
github.com/jackc/puddle/v2/internal/genstack
155171
github.com/jmespath/go-jmespath
156172
github.com/jmoiron/sqlx
157173
github.com/jmoiron/sqlx/reflectx
@@ -166,7 +182,6 @@ github.com/mailru/easyjson/jwriter
166182
github.com/mattn/go-colorable
167183
github.com/mattn/go-isatty
168184
github.com/mattn/go-runewidth
169-
github.com/matttproud/golang_protobuf_extensions/pbutil
170185
github.com/olekukonko/tablewriter
171186
github.com/olivere/elastic/v7
172187
github.com/olivere/elastic/v7/aws/v4
@@ -261,12 +276,12 @@ go.opencensus.io/trace/tracestate
261276
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc
262277
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/internal
263278
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp
279+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/internal/semconv
264280
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/internal/semconvutil
265281
go.opentelemetry.io/otel
266282
go.opentelemetry.io/otel/attribute
267283
go.opentelemetry.io/otel/baggage
268284
go.opentelemetry.io/otel/codes
269-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric
270285
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc
271286
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc/internal
272287
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc/internal/envconfig
@@ -296,13 +311,16 @@ go.opentelemetry.io/otel/sdk/internal/env
296311
go.opentelemetry.io/otel/sdk/metric
297312
go.opentelemetry.io/otel/sdk/metric/internal
298313
go.opentelemetry.io/otel/sdk/metric/internal/aggregate
314+
go.opentelemetry.io/otel/sdk/metric/internal/exemplar
315+
go.opentelemetry.io/otel/sdk/metric/internal/x
299316
go.opentelemetry.io/otel/sdk/metric/metricdata
300317
go.opentelemetry.io/otel/sdk/resource
301318
go.opentelemetry.io/otel/sdk/trace
302319
go.opentelemetry.io/otel/semconv/internal
303320
go.opentelemetry.io/otel/semconv/v1.10.0
304321
go.opentelemetry.io/otel/semconv/v1.17.0
305-
go.opentelemetry.io/otel/semconv/v1.21.0
322+
go.opentelemetry.io/otel/semconv/v1.20.0
323+
go.opentelemetry.io/otel/semconv/v1.24.0
306324
go.opentelemetry.io/otel/trace
307325
go.opentelemetry.io/otel/trace/embedded
308326
go.opentelemetry.io/otel/trace/noop
@@ -361,8 +379,9 @@ golang.org/x/net/trace
361379
golang.org/x/oauth2
362380
golang.org/x/oauth2/authhandler
363381
golang.org/x/oauth2/google
364-
golang.org/x/oauth2/google/internal/externalaccount
382+
golang.org/x/oauth2/google/externalaccount
365383
golang.org/x/oauth2/google/internal/externalaccountauthorizeduser
384+
golang.org/x/oauth2/google/internal/impersonate
366385
golang.org/x/oauth2/google/internal/stsexchange
367386
golang.org/x/oauth2/internal
368387
golang.org/x/oauth2/jws
@@ -465,6 +484,7 @@ google.golang.org/grpc/internal/status
465484
google.golang.org/grpc/internal/syscall
466485
google.golang.org/grpc/internal/transport
467486
google.golang.org/grpc/internal/transport/networktype
487+
google.golang.org/grpc/internal/xds
468488
google.golang.org/grpc/keepalive
469489
google.golang.org/grpc/metadata
470490
google.golang.org/grpc/peer
@@ -478,12 +498,14 @@ google.golang.org/grpc/serviceconfig
478498
google.golang.org/grpc/stats
479499
google.golang.org/grpc/status
480500
google.golang.org/grpc/tap
501+
google.golang.org/protobuf/encoding/protodelim
481502
google.golang.org/protobuf/encoding/protojson
482503
google.golang.org/protobuf/encoding/prototext
483504
google.golang.org/protobuf/encoding/protowire
484505
google.golang.org/protobuf/internal/descfmt
485506
google.golang.org/protobuf/internal/descopts
486507
google.golang.org/protobuf/internal/detrand
508+
google.golang.org/protobuf/internal/editiondefaults
487509
google.golang.org/protobuf/internal/encoding/defval
488510
google.golang.org/protobuf/internal/encoding/json
489511
google.golang.org/protobuf/internal/encoding/messageset
@@ -502,50 +524,30 @@ google.golang.org/protobuf/internal/set
502524
google.golang.org/protobuf/internal/strs
503525
google.golang.org/protobuf/internal/version
504526
google.golang.org/protobuf/proto
527+
google.golang.org/protobuf/protoadapt
505528
google.golang.org/protobuf/reflect/protodesc
506529
google.golang.org/protobuf/reflect/protoreflect
507530
google.golang.org/protobuf/reflect/protoregistry
508531
google.golang.org/protobuf/runtime/protoiface
509532
google.golang.org/protobuf/runtime/protoimpl
510533
google.golang.org/protobuf/testing/protocmp
511534
google.golang.org/protobuf/types/descriptorpb
535+
google.golang.org/protobuf/types/gofeaturespb
512536
google.golang.org/protobuf/types/known/anypb
513537
google.golang.org/protobuf/types/known/durationpb
514538
google.golang.org/protobuf/types/known/emptypb
515539
google.golang.org/protobuf/types/known/fieldmaskpb
516540
google.golang.org/protobuf/types/known/structpb
517541
google.golang.org/protobuf/types/known/timestamppb
518542
google.golang.org/protobuf/types/known/wrapperspb
543+
gopkg.in/go-jose/go-jose.v2
544+
gopkg.in/go-jose/go-jose.v2/cipher
545+
gopkg.in/go-jose/go-jose.v2/json
519546
gopkg.in/inf.v0
520-
gopkg.in/square/go-jose.v2
521-
gopkg.in/square/go-jose.v2/cipher
522-
gopkg.in/square/go-jose.v2/json
523547
gopkg.in/validator.v2
524548
gopkg.in/yaml.v3
525549
modernc.org/libc
526-
modernc.org/libc/errno
527-
modernc.org/libc/fcntl
528-
modernc.org/libc/fts
529-
modernc.org/libc/grp
530-
modernc.org/libc/honnef.co/go/netdb
531-
modernc.org/libc/langinfo
532-
modernc.org/libc/limits
533-
modernc.org/libc/netdb
534-
modernc.org/libc/netinet/in
535-
modernc.org/libc/poll
536-
modernc.org/libc/pthread
537-
modernc.org/libc/pwd
538-
modernc.org/libc/signal
539-
modernc.org/libc/stdio
540-
modernc.org/libc/stdlib
541-
modernc.org/libc/sys/socket
542-
modernc.org/libc/sys/stat
543550
modernc.org/libc/sys/types
544-
modernc.org/libc/termios
545-
modernc.org/libc/time
546-
modernc.org/libc/unistd
547-
modernc.org/libc/uuid/uuid
548-
modernc.org/libc/wctype
549551
modernc.org/mathutil
550552
modernc.org/memory
551553
modernc.org/sqlite

0 commit comments

Comments
 (0)