Skip to content

Commit 53ccd8d

Browse files
authored
all: update deps, including a breaking S3 change (#3342)
1 parent fa413a3 commit 53ccd8d

File tree

113 files changed

+11495
-8831
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+11495
-8831
lines changed

aws/aws_test.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,7 @@ func TestV2ConfigFromURLParams(t *testing.T) {
165165
query: url.Values{"region": {"my_region"}},
166166
wantRegion: "my_region",
167167
},
168-
{
169-
name: "Profile",
170-
query: url.Values{"profile": {"my_profile"}},
171-
// Hard to verify.
172-
},
168+
// Can't test "profile", since AWS validates that the profile exists.
173169
}
174170

175171
for _, test := range tests {

blob/s3blob/s3blob.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ func (b *bucket) ListPaged(ctx context.Context, opts *driver.ListOptions) (*driv
408408
if b.useV2 {
409409
in := &s3v2.ListObjectsV2Input{
410410
Bucket: aws.String(b.name),
411-
MaxKeys: int32(pageSize),
411+
MaxKeys: aws.Int32(int32(pageSize)),
412412
}
413413
if len(opts.PageToken) > 0 {
414414
in.ContinuationToken = aws.String(string(opts.PageToken))
@@ -434,7 +434,7 @@ func (b *bucket) ListPaged(ctx context.Context, opts *driver.ListOptions) (*driv
434434
page.Objects[i] = &driver.ListObject{
435435
Key: unescapeKey(aws.StringValue(obj.Key)),
436436
ModTime: *obj.LastModified,
437-
Size: obj.Size,
437+
Size: aws.Int64Value(obj.Size),
438438
MD5: eTagToMD5(obj.ETag),
439439
AsFunc: func(i interface{}) bool {
440440
p, ok := i.(*typesv2.Object)
@@ -589,7 +589,7 @@ func (b *bucket) listObjectsV2(ctx context.Context, in *s3v2.ListObjectsV2Input,
589589
var nextContinuationToken *string
590590
if legacyResp.NextMarker != nil {
591591
nextContinuationToken = legacyResp.NextMarker
592-
} else if legacyResp.IsTruncated {
592+
} else if aws.BoolValue(legacyResp.IsTruncated) {
593593
nextContinuationToken = aws.String(aws.StringValue(legacyResp.Contents[len(legacyResp.Contents)-1].Key))
594594
}
595595
return &s3v2.ListObjectsV2Output{
@@ -718,7 +718,7 @@ func (b *bucket) Attributes(ctx context.Context, key string) (*driver.Attributes
718718
Metadata: md,
719719
// CreateTime not supported; left as the zero time.
720720
ModTime: aws.TimeValue(resp.LastModified),
721-
Size: resp.ContentLength,
721+
Size: aws.Int64Value(resp.ContentLength),
722722
MD5: eTagToMD5(resp.ETag),
723723
ETag: aws.StringValue(resp.ETag),
724724
AsFunc: func(i interface{}) bool {
@@ -820,7 +820,7 @@ func (b *bucket) NewRangeReader(ctx context.Context, key string, offset, length
820820
attrs: driver.ReaderAttributes{
821821
ContentType: aws.StringValue(resp.ContentType),
822822
ModTime: aws.TimeValue(resp.LastModified),
823-
Size: getSize(resp.ContentLength, aws.StringValue(resp.ContentRange)),
823+
Size: getSize(aws.Int64Value(resp.ContentLength), aws.StringValue(resp.ContentRange)),
824824
},
825825
rawV2: resp,
826826
}, nil

docstore/mongodocstore/go.mod

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -19,55 +19,56 @@ go 1.20
1919
require (
2020
github.com/google/go-cmp v0.6.0
2121
github.com/google/wire v0.5.0
22-
go.mongodb.org/mongo-driver v1.12.1
22+
go.mongodb.org/mongo-driver v1.13.0
2323
gocloud.dev v0.34.0
2424
)
2525

2626
require (
27-
cloud.google.com/go/compute v1.23.0 // indirect
27+
cloud.google.com/go/compute v1.23.3 // indirect
2828
cloud.google.com/go/compute/metadata v0.2.3 // indirect
29-
github.com/aws/aws-sdk-go v1.45.24 // indirect
30-
github.com/aws/aws-sdk-go-v2 v1.21.1 // indirect
31-
github.com/aws/aws-sdk-go-v2/config v1.18.44 // indirect
32-
github.com/aws/aws-sdk-go-v2/credentials v1.13.42 // indirect
33-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12 // indirect
34-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42 // indirect
35-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 // indirect
36-
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 // indirect
37-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 // indirect
38-
github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 // indirect
39-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2 // indirect
40-
github.com/aws/aws-sdk-go-v2/service/sts v1.23.1 // indirect
41-
github.com/aws/smithy-go v1.15.0 // indirect
29+
github.com/aws/aws-sdk-go v1.48.3 // indirect
30+
github.com/aws/aws-sdk-go-v2 v1.23.1 // indirect
31+
github.com/aws/aws-sdk-go-v2/config v1.25.5 // indirect
32+
github.com/aws/aws-sdk-go-v2/credentials v1.16.4 // indirect
33+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.5 // indirect
34+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.4 // indirect
35+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.4 // indirect
36+
github.com/aws/aws-sdk-go-v2/internal/ini v1.7.1 // indirect
37+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.1 // indirect
38+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.4 // indirect
39+
github.com/aws/aws-sdk-go-v2/service/sso v1.17.3 // indirect
40+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.20.1 // indirect
41+
github.com/aws/aws-sdk-go-v2/service/sts v1.25.4 // indirect
42+
github.com/aws/smithy-go v1.17.0 // indirect
4243
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4344
github.com/golang/protobuf v1.5.3 // indirect
4445
github.com/golang/snappy v0.0.4 // indirect
4546
github.com/google/go-replayers/grpcreplay v1.1.0 // indirect
4647
github.com/google/go-replayers/httpreplay v1.2.0 // indirect
4748
github.com/google/martian/v3 v3.3.2 // indirect
4849
github.com/google/s2a-go v0.1.7 // indirect
49-
github.com/google/uuid v1.3.1 // indirect
50-
github.com/googleapis/enterprise-certificate-proxy v0.3.1 // indirect
50+
github.com/google/uuid v1.4.0 // indirect
51+
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
5152
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
5253
github.com/jmespath/go-jmespath v0.4.0 // indirect
53-
github.com/klauspost/compress v1.17.0 // indirect
54+
github.com/klauspost/compress v1.17.3 // indirect
5455
github.com/montanaflynn/stats v0.7.1 // indirect
5556
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
5657
github.com/xdg-go/scram v1.1.2 // indirect
5758
github.com/xdg-go/stringprep v1.0.4 // indirect
5859
github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
5960
go.opencensus.io v0.24.0 // indirect
60-
golang.org/x/crypto v0.14.0 // indirect
61-
golang.org/x/net v0.17.0 // indirect
62-
golang.org/x/oauth2 v0.13.0 // indirect
63-
golang.org/x/sync v0.4.0 // indirect
64-
golang.org/x/sys v0.13.0 // indirect
65-
golang.org/x/text v0.13.0 // indirect
66-
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
67-
google.golang.org/api v0.146.0 // indirect
61+
golang.org/x/crypto v0.15.0 // indirect
62+
golang.org/x/net v0.18.0 // indirect
63+
golang.org/x/oauth2 v0.14.0 // indirect
64+
golang.org/x/sync v0.5.0 // indirect
65+
golang.org/x/sys v0.14.0 // indirect
66+
golang.org/x/text v0.14.0 // indirect
67+
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
68+
google.golang.org/api v0.151.0 // indirect
6869
google.golang.org/appengine v1.6.8 // indirect
69-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231009173412-8bfb1ae86b6c // indirect
70-
google.golang.org/grpc v1.58.3 // indirect
70+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
71+
google.golang.org/grpc v1.59.0 // indirect
7172
google.golang.org/protobuf v1.31.0 // indirect
7273
)
7374

0 commit comments

Comments
 (0)