Skip to content

Commit

Permalink
all: update deps, including a breaking S3 change (#3342)
Browse files Browse the repository at this point in the history
  • Loading branch information
@vangent
vangent committed Nov 22, 2023
1 parent fa413a3 commit 53ccd8d
Show file tree
Hide file tree
Showing 113 changed files with 11,495 additions and 8,831 deletions.
6 changes: 1 addition & 5 deletions aws/aws_test.go
View file
Expand Up @@ -165,11 +165,7 @@ func TestV2ConfigFromURLParams(t *testing.T) {
query: url.Values{"region": {"my_region"}},
wantRegion: "my_region",
},
{
name: "Profile",
query: url.Values{"profile": {"my_profile"}},
// Hard to verify.
},
// Can't test "profile", since AWS validates that the profile exists.
}

for _, test := range tests {
Expand Down
10 changes: 5 additions & 5 deletions blob/s3blob/s3blob.go
View file
Expand Up @@ -408,7 +408,7 @@ func (b *bucket) ListPaged(ctx context.Context, opts *driver.ListOptions) (*driv
if b.useV2 {
in := &s3v2.ListObjectsV2Input{
Bucket: aws.String(b.name),
MaxKeys: int32(pageSize),
MaxKeys: aws.Int32(int32(pageSize)),
}
if len(opts.PageToken) > 0 {
in.ContinuationToken = aws.String(string(opts.PageToken))
Expand All @@ -434,7 +434,7 @@ func (b *bucket) ListPaged(ctx context.Context, opts *driver.ListOptions) (*driv
page.Objects[i] = &driver.ListObject{
Key: unescapeKey(aws.StringValue(obj.Key)),
ModTime: *obj.LastModified,
Size: obj.Size,
Size: aws.Int64Value(obj.Size),
MD5: eTagToMD5(obj.ETag),
AsFunc: func(i interface{}) bool {
p, ok := i.(*typesv2.Object)
Expand Down Expand Up @@ -589,7 +589,7 @@ func (b *bucket) listObjectsV2(ctx context.Context, in *s3v2.ListObjectsV2Input,
var nextContinuationToken *string
if legacyResp.NextMarker != nil {
nextContinuationToken = legacyResp.NextMarker
} else if legacyResp.IsTruncated {
} else if aws.BoolValue(legacyResp.IsTruncated) {
nextContinuationToken = aws.String(aws.StringValue(legacyResp.Contents[len(legacyResp.Contents)-1].Key))
}
return &s3v2.ListObjectsV2Output{
Expand Down Expand Up @@ -718,7 +718,7 @@ func (b *bucket) Attributes(ctx context.Context, key string) (*driver.Attributes
Metadata: md,
// CreateTime not supported; left as the zero time.
ModTime: aws.TimeValue(resp.LastModified),
Size: resp.ContentLength,
Size: aws.Int64Value(resp.ContentLength),
MD5: eTagToMD5(resp.ETag),
ETag: aws.StringValue(resp.ETag),
AsFunc: func(i interface{}) bool {
Expand Down Expand Up @@ -820,7 +820,7 @@ func (b *bucket) NewRangeReader(ctx context.Context, key string, offset, length
attrs: driver.ReaderAttributes{
ContentType: aws.StringValue(resp.ContentType),
ModTime: aws.TimeValue(resp.LastModified),
Size: getSize(resp.ContentLength, aws.StringValue(resp.ContentRange)),
Size: getSize(aws.Int64Value(resp.ContentLength), aws.StringValue(resp.ContentRange)),
},
rawV2: resp,
}, nil
Expand Down
57 changes: 29 additions & 28 deletions docstore/mongodocstore/go.mod
View file
Expand Up @@ -19,55 +19,56 @@ go 1.20
require (
github.com/google/go-cmp v0.6.0
github.com/google/wire v0.5.0
go.mongodb.org/mongo-driver v1.12.1
go.mongodb.org/mongo-driver v1.13.0
gocloud.dev v0.34.0
)

require (
cloud.google.com/go/compute v1.23.0 // indirect
cloud.google.com/go/compute v1.23.3 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
github.com/aws/aws-sdk-go v1.45.24 // indirect
github.com/aws/aws-sdk-go-v2 v1.21.1 // indirect
github.com/aws/aws-sdk-go-v2/config v1.18.44 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.13.42 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.23.1 // indirect
github.com/aws/smithy-go v1.15.0 // indirect
github.com/aws/aws-sdk-go v1.48.3 // indirect
github.com/aws/aws-sdk-go-v2 v1.23.1 // indirect
github.com/aws/aws-sdk-go-v2/config v1.25.5 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.16.4 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.5 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.4 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.4 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.7.1 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.1 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.4 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.17.3 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.20.1 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.25.4 // indirect
github.com/aws/smithy-go v1.17.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/go-replayers/grpcreplay v1.1.0 // indirect
github.com/google/go-replayers/httpreplay v1.2.0 // indirect
github.com/google/martian/v3 v3.3.2 // indirect
github.com/google/s2a-go v0.1.7 // indirect
github.com/google/uuid v1.3.1 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.1 // indirect
github.com/google/uuid v1.4.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/klauspost/compress v1.17.0 // indirect
github.com/klauspost/compress v1.17.3 // indirect
github.com/montanaflynn/stats v0.7.1 // indirect
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
github.com/xdg-go/scram v1.1.2 // indirect
github.com/xdg-go/stringprep v1.0.4 // indirect
github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
go.opencensus.io v0.24.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.13.0 // indirect
golang.org/x/sync v0.4.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/api v0.146.0 // indirect
golang.org/x/crypto v0.15.0 // indirect
golang.org/x/net v0.18.0 // indirect
golang.org/x/oauth2 v0.14.0 // indirect
golang.org/x/sync v0.5.0 // indirect
golang.org/x/sys v0.14.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
google.golang.org/api v0.151.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231009173412-8bfb1ae86b6c // indirect
google.golang.org/grpc v1.58.3 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
google.golang.org/grpc v1.59.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
)

Expand Down

0 comments on commit 53ccd8d

Please sign in to comment.