Migrate from iodine to probe

pkg/auth/auth.go

@@ -19,6 +19,8 @@ package auth
 import (
 	"crypto/rand"
 	"encoding/base64"
+
+	"github.com/minio/minio/pkg/probe"
 )
 
 // Static alphaNumeric table used for generating unique keys
@@ -26,11 +28,11 @@ var alphaNumericTable = []byte("0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ")
 
 // GenerateAccessKeyID - generate random alpha numeric value using only uppercase characters
 // takes input as size in integer
-func GenerateAccessKeyID() ([]byte, error) {
+func GenerateAccessKeyID() ([]byte, *probe.Error) {
 	alpha := make([]byte, MinioAccessID)
 	_, err := rand.Read(alpha)
 	if err != nil {
-		return nil, err
+		return nil, probe.New(err)
 	}
 	for i := 0; i < MinioAccessID; i++ {
 		alpha[i] = alphaNumericTable[alpha[i]%byte(len(alphaNumericTable))]
@@ -39,11 +41,11 @@ func GenerateAccessKeyID() ([]byte, error) {
 }
 
 // GenerateSecretAccessKey - generate random base64 numeric value from a random seed.
-func GenerateSecretAccessKey() ([]byte, error) {
+func GenerateSecretAccessKey() ([]byte, *probe.Error) {
 	rb := make([]byte, MinioSecretID)
 	_, err := rand.Read(rb)
 	if err != nil {
-		return nil, err
+		return nil, probe.New(err)
 	}
 	return []byte(base64.StdEncoding.EncodeToString(rb))[:MinioSecretID], nil
 }

pkg/auth/config.go

@@ -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
 }