Merge pull request #40018 from sttts/sttts-genericapiserver-storage-dep

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)

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

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