projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
19234: s3v2 + non-aws: default to us-east-1 signing settings.
[arvados.git]
/
services
/
keepstore
/
s3aws_volume.go
diff --git
a/services/keepstore/s3aws_volume.go
b/services/keepstore/s3aws_volume.go
index f7cff6d33ea4d7c764ba74f06e49c8815f021fa9..d068dde074ea254ef814aea38eefa6f63102d7e3 100644
(file)
--- a/
services/keepstore/s3aws_volume.go
+++ b/
services/keepstore/s3aws_volume.go
@@
-184,19
+184,25
@@
func (v *S3AWSVolume) check(ec2metadataHostname string) error {
if v.Endpoint != "" && service == "s3" {
return aws.Endpoint{
URL: v.Endpoint,
if v.Endpoint != "" && service == "s3" {
return aws.Endpoint{
URL: v.Endpoint,
- SigningRegion:
v.R
egion,
+ SigningRegion:
r
egion,
}, nil
} else if service == "ec2metadata" && ec2metadataHostname != "" {
return aws.Endpoint{
URL: ec2metadataHostname,
}, nil
}, nil
} else if service == "ec2metadata" && ec2metadataHostname != "" {
return aws.Endpoint{
URL: ec2metadataHostname,
}, nil
+ } else {
+ return defaultResolver.ResolveEndpoint(service, region)
}
}
-
- return defaultResolver.ResolveEndpoint(service, region)
}
cfg.EndpointResolver = aws.EndpointResolverFunc(myCustomResolver)
}
}
cfg.EndpointResolver = aws.EndpointResolverFunc(myCustomResolver)
}
-
+ if v.Region == "" {
+ // Endpoint is already specified (otherwise we would
+ // have errored out above), but Region is also
+ // required by the aws sdk, in order to determine
+ // SignatureVersions.
+ v.Region = "us-east-1"
+ }
cfg.Region = v.Region
// Zero timeouts mean "wait forever", which is a bad
cfg.Region = v.Region
// Zero timeouts mean "wait forever", which is a bad