mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-08-19 05:36:58 +00:00
fix tests
This commit is contained in:
@@ -115,8 +115,8 @@ func (m *IAMManager) Initialize(config *IAMConfig) error {
|
||||
// createRoleStore creates a role store based on configuration
|
||||
func (m *IAMManager) createRoleStore(config *RoleStoreConfig) (RoleStore, error) {
|
||||
if config == nil {
|
||||
// Default to filer role store
|
||||
return NewFilerRoleStore(nil)
|
||||
// Default to memory role store when no config provided
|
||||
return NewMemoryRoleStore(), nil
|
||||
}
|
||||
|
||||
switch config.StoreType {
|
||||
|
||||
@@ -146,11 +146,18 @@ func NewFilerRoleStore(config map[string]interface{}) (*FilerRoleStore, error) {
|
||||
basePath: "/etc/iam/roles", // Default path for role storage - aligned with /etc/ convention
|
||||
}
|
||||
|
||||
// Parse configuration - only basePath and other settings, NOT filerAddress
|
||||
// Parse configuration
|
||||
if config != nil {
|
||||
if basePath, ok := config["basePath"].(string); ok && basePath != "" {
|
||||
store.basePath = strings.TrimSuffix(basePath, "/")
|
||||
}
|
||||
|
||||
// Validate that filerAddress is provided in config - required for distributed setup
|
||||
if _, ok := config["filerAddress"].(string); !ok {
|
||||
return nil, fmt.Errorf("filer address is required in configuration for FilerRoleStore")
|
||||
}
|
||||
} else {
|
||||
return nil, fmt.Errorf("filer address is required in configuration for FilerRoleStore")
|
||||
}
|
||||
|
||||
glog.V(2).Infof("Initialized FilerRoleStore with basePath %s", store.basePath)
|
||||
|
||||
@@ -158,11 +158,18 @@ func NewFilerPolicyStore(config map[string]interface{}) (*FilerPolicyStore, erro
|
||||
basePath: "/etc/iam/policies", // Default path for policy storage - aligned with /etc/ convention
|
||||
}
|
||||
|
||||
// Parse configuration - only basePath and other settings, NOT filerAddress
|
||||
// Parse configuration
|
||||
if config != nil {
|
||||
if basePath, ok := config["basePath"].(string); ok && basePath != "" {
|
||||
store.basePath = strings.TrimSuffix(basePath, "/")
|
||||
}
|
||||
|
||||
// Validate that filerAddress is provided in config - required for distributed setup
|
||||
if _, ok := config["filerAddress"].(string); !ok {
|
||||
return nil, fmt.Errorf("filer address is required in configuration for FilerPolicyStore")
|
||||
}
|
||||
} else {
|
||||
return nil, fmt.Errorf("filer address is required in configuration for FilerPolicyStore")
|
||||
}
|
||||
|
||||
glog.V(2).Infof("Initialized FilerPolicyStore with basePath %s", store.basePath)
|
||||
|
||||
Reference in New Issue
Block a user