mirror of
https://github.com/minio/minio.git
synced 2025-12-02 06:07:51 -05:00
Migrate from iodine to probe
This commit is contained in:
@@ -20,7 +20,7 @@ import (
|
||||
"os/user"
|
||||
"path/filepath"
|
||||
|
||||
"github.com/minio/minio/pkg/iodine"
|
||||
"github.com/minio/minio/pkg/probe"
|
||||
"github.com/minio/minio/pkg/quick"
|
||||
)
|
||||
|
||||
@@ -38,13 +38,13 @@ type Config struct {
|
||||
}
|
||||
|
||||
// getAuthConfigPath get donut config file path
|
||||
func getAuthConfigPath() (string, error) {
|
||||
func getAuthConfigPath() (string, *probe.Error) {
|
||||
if customConfigPath != "" {
|
||||
return customConfigPath, nil
|
||||
}
|
||||
u, err := user.Current()
|
||||
if err != nil {
|
||||
return "", iodine.New(err, nil)
|
||||
return "", probe.New(err)
|
||||
}
|
||||
authConfigPath := filepath.Join(u.HomeDir, ".minio", "users.json")
|
||||
return authConfigPath, nil
|
||||
@@ -59,36 +59,36 @@ func SetAuthConfigPath(configPath string) {
|
||||
}
|
||||
|
||||
// SaveConfig save donut config
|
||||
func SaveConfig(a *Config) error {
|
||||
func SaveConfig(a *Config) *probe.Error {
|
||||
authConfigPath, err := getAuthConfigPath()
|
||||
if err != nil {
|
||||
return iodine.New(err, nil)
|
||||
return err.Trace()
|
||||
}
|
||||
qc, err := quick.New(a)
|
||||
if err != nil {
|
||||
return iodine.New(err, nil)
|
||||
return err.Trace()
|
||||
}
|
||||
if err := qc.Save(authConfigPath); err != nil {
|
||||
return iodine.New(err, nil)
|
||||
return err.Trace()
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// LoadConfig load donut config
|
||||
func LoadConfig() (*Config, error) {
|
||||
func LoadConfig() (*Config, *probe.Error) {
|
||||
authConfigPath, err := getAuthConfigPath()
|
||||
if err != nil {
|
||||
return nil, iodine.New(err, nil)
|
||||
return nil, err.Trace()
|
||||
}
|
||||
a := &Config{}
|
||||
a.Version = "0.0.1"
|
||||
a.Users = make(map[string]*User)
|
||||
qc, err := quick.New(a)
|
||||
if err != nil {
|
||||
return nil, iodine.New(err, nil)
|
||||
return nil, err.Trace()
|
||||
}
|
||||
if err := qc.Load(authConfigPath); err != nil {
|
||||
return nil, iodine.New(err, nil)
|
||||
return nil, err.Trace()
|
||||
}
|
||||
return qc.Data().(*Config), nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user