projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
17154: Make sure most current user record is loaded.
[arvados.git]
/
services
/
keepstore
/
s3aws_volume.go
diff --git
a/services/keepstore/s3aws_volume.go
b/services/keepstore/s3aws_volume.go
index d07d23c3c219c630f61881bf75df1d233f0b67a6..8d999e7472ff14f03985e80a2b774632eebe7346 100644
(file)
--- a/
services/keepstore/s3aws_volume.go
+++ b/
services/keepstore/s3aws_volume.go
@@
-33,7
+33,7
@@
import (
"github.com/sirupsen/logrus"
)
"github.com/sirupsen/logrus"
)
-// S3Volume implements Volume using an S3 bucket.
+// S3
AWS
Volume implements Volume using an S3 bucket.
type S3AWSVolume struct {
arvados.S3VolumeDriverParameters
AuthToken string // populated automatically when IAMRole is used
type S3AWSVolume struct {
arvados.S3VolumeDriverParameters
AuthToken string // populated automatically when IAMRole is used
@@
-69,10
+69,9
@@
func chooseS3VolumeDriver(cluster *arvados.Cluster, volume arvados.Volume, logge
if v.UseAWSS3v2Driver {
logger.Debugln("Using AWS S3 v2 driver")
return newS3AWSVolume(cluster, volume, logger, metrics)
if v.UseAWSS3v2Driver {
logger.Debugln("Using AWS S3 v2 driver")
return newS3AWSVolume(cluster, volume, logger, metrics)
- } else {
- logger.Debugln("Using goamz S3 driver")
- return newS3Volume(cluster, volume, logger, metrics)
}
}
+ logger.Debugln("Using goamz S3 driver")
+ return newS3Volume(cluster, volume, logger, metrics)
}
const (
}
const (