|
|
@@ -31,25 +31,21 @@ type Client struct {
|
|
|
// NewS3Store initialises store for S3 provider. It takes in the AWS configuration
|
|
|
// and sets up the `simples3` client to interact with AWS APIs for all bucket operations.
|
|
|
func NewS3Store(opt Opt) (media.Store, error) {
|
|
|
- var (
|
|
|
- cl *simples3.S3
|
|
|
- err error
|
|
|
- )
|
|
|
+ var cl *simples3.S3
|
|
|
if opt.URL == "" {
|
|
|
opt.URL = fmt.Sprintf("https://s3.%s.amazonaws.com", opt.Region)
|
|
|
}
|
|
|
opt.URL = strings.TrimRight(opt.URL, "/")
|
|
|
|
|
|
- // Use Access Key/Secret Key if specified in config.
|
|
|
- if opt.AccessKey != "" && opt.SecretKey != "" {
|
|
|
- cl = simples3.New(opt.Region, opt.AccessKey, opt.SecretKey)
|
|
|
- } else {
|
|
|
+ if opt.AccessKey == "" && opt.SecretKey == "" {
|
|
|
// fallback to IAM role if no access key/secret key is provided.
|
|
|
- cl, err = simples3.NewUsingIAM(opt.Region)
|
|
|
- if err != nil {
|
|
|
- return nil, err
|
|
|
- }
|
|
|
+ cl, _ = simples3.NewUsingIAM(opt.Region)
|
|
|
}
|
|
|
+
|
|
|
+ if cl == nil {
|
|
|
+ cl = simples3.New(opt.Region, opt.AccessKey, opt.SecretKey)
|
|
|
+ }
|
|
|
+
|
|
|
cl.SetEndpoint(opt.URL)
|
|
|
|
|
|
return &Client{
|
Kailash Nadh