Revert "Merge pull request #10246 from nikhiljindal"

This reverts commit a902a2f014, reversing
changes made to 7df8d76a93.
This commit is contained in:
nikhiljindal
2015-07-01 11:07:18 -07:00
parent 09df440b79
commit d82d5d11a7
8 changed files with 22 additions and 59 deletions

View File

@@ -27,10 +27,8 @@ func InterpretGetError(err error, kind, name string) error {
switch {
case tools.IsEtcdNotFound(err):
return errors.NewNotFound(kind, name)
case errors.IsAPIStatusError(err):
return err
default:
return errors.NewInternalError(err)
return err
}
}
@@ -40,10 +38,8 @@ func InterpretCreateError(err error, kind, name string) error {
switch {
case tools.IsEtcdNodeExist(err):
return errors.NewAlreadyExists(kind, name)
case errors.IsAPIStatusError(err):
return err
default:
return errors.NewInternalError(err)
return err
}
}
@@ -53,10 +49,8 @@ func InterpretUpdateError(err error, kind, name string) error {
switch {
case tools.IsEtcdTestFailed(err), tools.IsEtcdNodeExist(err):
return errors.NewConflict(kind, name, err)
case errors.IsAPIStatusError(err):
return err
default:
return errors.NewInternalError(err)
return err
}
}
@@ -66,9 +60,7 @@ func InterpretDeleteError(err error, kind, name string) error {
switch {
case tools.IsEtcdNotFound(err):
return errors.NewNotFound(kind, name)
case errors.IsAPIStatusError(err):
return err
default:
return errors.NewInternalError(err)
return err
}
}