use microerror (#80)

* use microerror

* fix tests

command/command.go

@@ -5,9 +5,9 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
+	"github.com/giantswarm/microerror"
 	"github.com/giantswarm/microkit/command/daemon"
 	"github.com/giantswarm/microkit/command/version"
-	microerror "github.com/giantswarm/microkit/error"
 	"github.com/giantswarm/microkit/logger"
 )
 
@@ -56,7 +56,7 @@ func New(config Config) (Command, error) {
 
 		daemonCommand, err = daemon.New(daemonConfig)
 		if err != nil {
-			return nil, microerror.MaskAny(err)
+			return nil, microerror.Mask(err)
 		}
 	}
 
@@ -71,7 +71,7 @@ func New(config Config) (Command, error) {
 
 		versionCommand, err = version.New(versionConfig)
 		if err != nil {
-			return nil, microerror.MaskAny(err)
+			return nil, microerror.Mask(err)
 		}
 	}
 

command/daemon/command.go

@@ -9,8 +9,8 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
+	"github.com/giantswarm/microerror"
 	"github.com/giantswarm/microkit/command/daemon/flag"
-	microerror "github.com/giantswarm/microkit/error"
 	microflag "github.com/giantswarm/microkit/flag"
 	"github.com/giantswarm/microkit/logger"
 	"github.com/giantswarm/microkit/server"
@@ -47,13 +47,13 @@ func DefaultConfig() Config {
 func New(config Config) (Command, error) {
 	// Dependencies.
 	if config.Logger == nil {
-		return nil, microerror.MaskAnyf(invalidConfigError, "logger must not be empty")
+		return nil, microerror.Maskf(invalidConfigError, "logger must not be empty")
 	}
 	if config.ServerFactory == nil {
-		return nil, microerror.MaskAnyf(invalidConfigError, "server factory must not be empty")
+		return nil, microerror.Maskf(invalidConfigError, "server factory must not be empty")
 	}
 	if config.Viper == nil {
-		return nil, microerror.MaskAnyf(invalidConfigError, "viper must not be empty")
+		return nil, microerror.Maskf(invalidConfigError, "viper must not be empty")
 	}
 
 	newCommand := &command{

command/daemon/error.go

@@ -1,19 +1,19 @@
 package daemon
 
 import (
-	"github.com/juju/errgo"
+	"github.com/giantswarm/microerror"
 )
 
-var invalidConfigError = errgo.New("invalid config")
+var invalidConfigError = microerror.New("invalid config")
 
 // IsInvalidConfig asserts invalidConfigError.
 func IsInvalidConfig(err error) bool {
-	return errgo.Cause(err) == invalidConfigError
+	return microerror.Cause(err) == invalidConfigError
 }
 
-var invalidFlagError = errgo.New("invalid flag")
+var invalidFlagError = microerror.New("invalid flag")
 
 // IsInvalidFlag asserts invalidFlagError.
 func IsInvalidFlag(err error) bool {
-	return errgo.Cause(err) == invalidFlagError
+	return microerror.Cause(err) == invalidFlagError
 }

command/error.go

@@ -1,12 +1,12 @@
 package command
 
 import (
-	"github.com/juju/errgo"
+	"github.com/giantswarm/microerror"
 )
 
-var invalidConfigError = errgo.New("invalid config")
+var invalidConfigError = microerror.New("invalid config")
 
 // IsInvalidConfig asserts invalidConfigError.
 func IsInvalidConfig(err error) bool {
-	return errgo.Cause(err) == invalidConfigError
+	return microerror.Cause(err) == invalidConfigError
 }

command/version/command.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	microerror "github.com/giantswarm/microkit/error"
+	"github.com/giantswarm/microerror"
 )
 
 // Config represents the configuration used to create a new version command.
@@ -35,16 +35,16 @@ func DefaultConfig() Config {
 func New(config Config) (Command, error) {
 	// Settings.
 	if config.Description == "" {
-		return nil, microerror.MaskAnyf(invalidConfigError, "description commit must not be empty")
+		return nil, microerror.Maskf(invalidConfigError, "description commit must not be empty")
 	}
 	if config.GitCommit == "" {
-		return nil, microerror.MaskAnyf(invalidConfigError, "git commit must not be empty")
+		return nil, microerror.Maskf(invalidConfigError, "git commit must not be empty")
 	}
 	if config.Name == "" {
-		return nil, microerror.MaskAnyf(invalidConfigError, "name must not be empty")
+		return nil, microerror.Maskf(invalidConfigError, "name must not be empty")
 	}
 	if config.Source == "" {
-		return nil, microerror.MaskAnyf(invalidConfigError, "name must not be empty")
+		return nil, microerror.Maskf(invalidConfigError, "name must not be empty")
 	}
 
 	newCommand := &command{

command/version/error.go

@@ -1,12 +1,12 @@
 package version
 
 import (
-	"github.com/juju/errgo"
+	"github.com/giantswarm/microerror"
 )
 
-var invalidConfigError = errgo.New("invalid config")
+var invalidConfigError = microerror.New("invalid config")
 
 // IsInvalidConfig asserts invalidConfigError.
 func IsInvalidConfig(err error) bool {
-	return errgo.Cause(err) == invalidConfigError
+	return microerror.Cause(err) == invalidConfigError
 }

flag/flag.go

@@ -7,7 +7,7 @@ import (
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
 
-	microerror "github.com/giantswarm/microkit/error"
+	"github.com/giantswarm/microerror"
 )
 
 func Init(f interface{}) {
@@ -58,7 +58,7 @@ func Merge(v *viper.Viper, fs *pflag.FlagSet, dirs, files []string) error {
 				// the other ones. If we do not find any configuration using config
 				// files, we go ahead to check the process environment.
 			} else {
-				return microerror.MaskAny(err)
+				return microerror.Mask(err)
 			}
 		}
 

glide.yaml

@@ -2,18 +2,10 @@ package: github.com/giantswarm/microkit
 import:
 - package: github.com/go-kit/kit
   version: v0.5.0
-  subpackages:
-  - endpoint
-  - log
-  - transport/http
 - package: github.com/gorilla/mux
   version: ~1.1.0
-- package: github.com/juju/errgo
 - package: github.com/prometheus/client_golang
   version: ~0.8.0
-  subpackages:
-  - prometheus
-  - prometheus/promhttp
 - package: github.com/spf13/cobra
   version: master
 - package: github.com/spf13/pflag
@@ -23,13 +15,9 @@ import:
 - package: github.com/tylerb/graceful
   version: ~1.2.13
 - package: golang.org/x/net
-  subpackages:
-  - context
 - package: github.com/go-stack/stack
   version: ~1.5.2
 - package: github.com/coreos/etcd
   version: 3.2.1
-  subpackages:
-  - client
 - package: golang.org/x/text
   version: 4ee4af566555f5fbe026368b75596286a312663a

logger/error.go

@@ -1,12 +1,12 @@
 package logger
 
 import (
-	"github.com/juju/errgo"
+	"github.com/giantswarm/microerror"
 )
 
-var invalidConfigError = errgo.New("invalid config")
+var invalidConfigError = microerror.New("invalid config")
 
 // IsInvalidConfig asserts invalidConfigError.
 func IsInvalidConfig(err error) bool {
-	return errgo.Cause(err) == invalidConfigError
+	return microerror.Cause(err) == invalidConfigError
 }

logger/logger.go

@@ -10,7 +10,7 @@ import (
 	kitlog "github.com/go-kit/kit/log"
 	"github.com/go-stack/stack"
 
-	microerror "github.com/giantswarm/microkit/error"
+	"github.com/giantswarm/microerror"
 )
 
 // Config represents the configuration used to create a new logger.
@@ -41,10 +41,10 @@ func DefaultConfig() Config {
 func New(config Config) (Logger, error) {
 	// Settings.
 	if config.Caller == nil {
-		return nil, microerror.MaskAnyf(invalidConfigError, "caller must not be empty")
+		return nil, microerror.Maskf(invalidConfigError, "caller must not be empty")
 	}
 	if config.TimestampFormatter == nil {
-		return nil, microerror.MaskAnyf(invalidConfigError, "timestamp formatter must not be empty")
+		return nil, microerror.Maskf(invalidConfigError, "timestamp formatter must not be empty")
 	}
 
 	kitLogger := kitlog.NewJSONLogger(kitlog.NewSyncWriter(config.IOWriter))

server/error.go

@@ -1,6 +1,7 @@
 package server
 
 import (
+	"github.com/giantswarm/microerror"
 	"github.com/juju/errgo"
 )
 
@@ -12,23 +13,23 @@ func errorTrace(err error) string {
 	return "n/a"
 }
 
-var invalidConfigError = errgo.New("invalid config")
+var invalidConfigError = microerror.New("invalid config")
 
 // IsInvalidConfig asserts invalidConfigError.
 func IsInvalidConfig(err error) bool {
-	return errgo.Cause(err) == invalidConfigError
+	return microerror.Cause(err) == invalidConfigError
 }
 
-var invalidContextError = errgo.New("invalid context")
+var invalidContextError = microerror.New("invalid context")
 
 // IsInvalidContext asserts invalidContextError.
 func IsInvalidContext(err error) bool {
-	return errgo.Cause(err) == invalidContextError
+	return microerror.Cause(err) == invalidContextError
 }
 
-var invalidTransactionIDError = errgo.New("invalid transaction ID")
+var invalidTransactionIDError = microerror.New("invalid transaction ID")
 
 // IsInvalidTransactionID asserts invalidTransactionIDError.
 func IsInvalidTransactionID(err error) bool {
-	return errgo.Cause(err) == invalidTransactionIDError
+	return microerror.Cause(err) == invalidTransactionIDError
 }

server/response_error.go

@@ -1,7 +1,7 @@
 package server
 
 import (
-	microerror "github.com/giantswarm/microkit/error"
+	"github.com/giantswarm/microerror"
 )
 
 // ResponseErrorConfig represents the configuration used to create a new
@@ -24,7 +24,7 @@ func DefaultResponseErrorConfig() ResponseErrorConfig {
 func NewResponseError(config ResponseErrorConfig) (ResponseError, error) {
 	// Settings.
 	if config.Underlying == nil {
-		return nil, microerror.MaskAnyf(invalidConfigError, "underlying must not be empty")
+		return nil, microerror.Maskf(invalidConfigError, "underlying must not be empty")
 	}
 
 	newResponseError := &responseError{