unistack-org/micro-store-s3
4
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 6 Wiki Activity

rearrange init code

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов 2021-02-04 10:36:59 +03:00
parent 560cb01564
commit 0e452f4dc7
1 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
s3.go
View File

@ -81,6 +81,27 @@ func (s *s3Store) Init(opts ...store.Option) error {
} }
if v, ok := s.opts.Context.Value(endpointKey{}).(string); ok && v != "" { if v, ok := s.opts.Context.Value(endpointKey{}).(string); ok && v != "" {
endpoint = v endpoint = v
var secure bool
if strings.HasPrefix(endpoint, "https://") || s.opts.TLSConfig != nil {
secure = true
}
if u, err := url.Parse(endpoint); err == nil && u.Host != "" {
endpoint = u.Host
}
ts, err := minio.DefaultTransport(secure)
if err != nil {
return fmt.Errorf("init error: %w", err)
}
if s.opts.TLSConfig != nil {
ts.TLSClientConfig = s.opts.TLSConfig
}
s.mopts.Transport = ts
s.mopts.Secure = secure
s.endpoint = endpoint
} }
if v, ok := s.opts.Context.Value(regionKey{}).(string); ok && v != "" { if v, ok := s.opts.Context.Value(regionKey{}).(string); ok && v != "" {
region = v region = v
@ -92,33 +113,8 @@ func (s *s3Store) Init(opts ...store.Option) error {
s.mopts.Creds = creds.NewStaticV2(akey, skey, "") s.mopts.Creds = creds.NewStaticV2(akey, skey, "")
} }
if len(endpoint) == 0 {
return fmt.Errorf("missing Endpoint option")
}
var secure bool
if strings.HasPrefix(endpoint, "https://") || s.opts.TLSConfig != nil {
secure = true
}
if u, err := url.Parse(endpoint); err == nil && u.Host != "" {
endpoint = u.Host
}
ts, err := minio.DefaultTransport(secure)
if err != nil {
return fmt.Errorf("init error: %w", err)
}
if s.opts.TLSConfig != nil {
ts.TLSClientConfig = s.opts.TLSConfig
}
s.mopts.Transport = ts
s.mopts.Region = region s.mopts.Region = region
s.endpoint = endpoint
return nil return nil
} }