s3: use static configuration by default

So that users can still use the previous configuration files.

If leave it empty, s3 will try to use the version from filer
This commit is contained in:
Chris Lu 2020-12-10 00:59:04 -08:00
parent 765b3ef1be
commit 26731694f8

View file

@ -38,13 +38,14 @@ func NewIdentityAccessManagement(option *S3ApiServerOption) *IdentityAccessManag
iam := &IdentityAccessManagement{
domain: option.DomainName,
}
if err := iam.loadS3ApiConfigurationFromFiler(option); err != nil {
glog.Warningf("fail to load config: %v", err)
}
if len(iam.identities) == 0 && option.Config != "" {
if option.Config != "" {
if err := iam.loadS3ApiConfigurationFromFile(option.Config); err != nil {
glog.Fatalf("fail to load config file %s: %v", option.Config, err)
}
} else {
if err := iam.loadS3ApiConfigurationFromFiler(option); err != nil {
glog.Warningf("fail to load config: %v", err)
}
}
return iam
}