From 727192140504ad76414932dd584366d50f2ff8a9 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Tue, 17 Jan 2017 13:18:11 +0100 Subject: [PATCH] Fix wrong rename pkg/storage.Is{TestFail -> Conflict} --- pkg/api/errors/storage/storage.go | 4 ++-- pkg/genericapiserver/api/handlers/responsewriters/status.go | 2 +- pkg/storage/errors.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/api/errors/storage/storage.go b/pkg/api/errors/storage/storage.go index 2ec787e25ce..7dd1bcd8843 100644 --- a/pkg/api/errors/storage/storage.go +++ b/pkg/api/errors/storage/storage.go @@ -65,7 +65,7 @@ func InterpretCreateError(err error, qualifiedResource schema.GroupResource, nam // operation into the appropriate API error. func InterpretUpdateError(err error, qualifiedResource schema.GroupResource, name string) error { switch { - case storage.IsTestFailed(err), storage.IsNodeExist(err), storage.IsInvalidObj(err): + case storage.IsConflict(err), storage.IsNodeExist(err), storage.IsInvalidObj(err): return errors.NewConflict(qualifiedResource, name, err) case storage.IsUnreachable(err): return errors.NewServerTimeout(qualifiedResource, "update", 2) // TODO: make configurable or handled at a higher level @@ -86,7 +86,7 @@ func InterpretDeleteError(err error, qualifiedResource schema.GroupResource, nam return errors.NewNotFound(qualifiedResource, name) case storage.IsUnreachable(err): return errors.NewServerTimeout(qualifiedResource, "delete", 2) // TODO: make configurable or handled at a higher level - case storage.IsTestFailed(err), storage.IsNodeExist(err), storage.IsInvalidObj(err): + case storage.IsConflict(err), storage.IsNodeExist(err), storage.IsInvalidObj(err): return errors.NewConflict(qualifiedResource, name, err) case storage.IsInternalError(err): return errors.NewInternalError(err) diff --git a/pkg/genericapiserver/api/handlers/responsewriters/status.go b/pkg/genericapiserver/api/handlers/responsewriters/status.go index 8bf7919b357..93a29341f90 100755 --- a/pkg/genericapiserver/api/handlers/responsewriters/status.go +++ b/pkg/genericapiserver/api/handlers/responsewriters/status.go @@ -52,7 +52,7 @@ func apiStatus(err error) *metav1.Status { status := http.StatusInternalServerError switch { //TODO: replace me with NewConflictErr - case storage.IsTestFailed(err): + case storage.IsConflict(err): status = http.StatusConflict } // Log errors that were not converted to an error status diff --git a/pkg/storage/errors.go b/pkg/storage/errors.go index 7d91bfd2633..a4d134ac991 100644 --- a/pkg/storage/errors.go +++ b/pkg/storage/errors.go @@ -105,8 +105,8 @@ func IsUnreachable(err error) bool { return isErrCode(err, ErrCodeUnreachable) } -// IsTestFailed returns true if and only if err is a write conflict. -func IsTestFailed(err error) bool { +// IsConflict returns true if and only if err is a write conflict. +func IsConflict(err error) bool { return isErrCode(err, ErrCodeResourceVersionConflicts) }