[18.09 backport] Include old error-message for backward compatibility#2801
Merged
dperny merged 1 commit intoJan 7, 2019
Merged
Conversation
Commit 2061af7 fixed the API returning incorrect status-codes, but also changed the error message for conflicting service-names to be in line with other objects (secrets, configs); "service XX already exists". Unfortunately, there are existing consumers of the API that perform string-matching, and changing the error-message resulted in a breaking change. This patch prepends the `ErrNameConflict` error-message to the error-message, so that those consumers still find the original message, but preserves the enhancement made in 2061af7 (inclusion of the conflicting service name). With this patch applied, the error message will look like this; name conflicts with an existing object: service myservice already exists Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 2bbdeec) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Member
Author
Codecov Report
@@ Coverage Diff @@
## bump_v18.09 #2801 +/- ##
===============================================
- Coverage 61.87% 61.87% -0.01%
===============================================
Files 134 134
Lines 21868 21868
===============================================
- Hits 13531 13530 -1
- Misses 6883 6884 +1
Partials 1454 1454 |
wsong
approved these changes
Jan 7, 2019
Collaborator
|
LGTM |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport of #2797 for 18.09
cherry-pick was clean
Commit 2061af7 (#2779) fixed the API returning incorrect status codes, but also changed the error message for conflicting service-names to be in line with other objects (secrets, configs); "service XX already exists".
Unfortunately, there are existing consumers of the API that perform string-matching, and changing the error-message resulted in a breaking change.
This patch prepends the
ErrNameConflicterror-message to the error-message, so that those consumers still find the original message, but preserves the enhancement made in 2061af7 (inclusion of the conflicting service name).With this patch applied, the error message will look like this;
- Description for the changelog