feat(api,sdk): Fix some issue with error wrap #3493
Merged
Conversation
This file contains 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
richardlt
requested review from
bnjjj,
fsamin,
sguiheux and
yesnault
as code owners
richardlt
commented
Oct 22, 2018
| @@ -104,15 +104,15 @@ func createNewVulnerabilityReport(db gorp.SqlExecutor, cache cache.Store, proj * | |||
|
|
|||
| // Get summary from previous run | |||
| previousRunReport, err := loadPreviousRunVulnerabilityReport(db, nr) | |||
| if err != nil && err != sdk.ErrNotFound { | |||
| if err != nil && sdk.ErrorIs(err, sdk.ErrNotFound) { | |||
| return sdk.WrapError(err, "Unable to get previous vulnerability report") | ||
| } | ||
| nodeRunReport.Report.PreviousRunSummary = previousRunReport | ||
|
|
||
| // Get summary from default branch | ||
| if defaultBranch != "" && defaultBranch != nr.VCSBranch { | ||
| defaultBranchReport, err := loadLatestRunVulnerabilityReport(db, nr, defaultBranch) | ||
| if err != nil && err != sdk.ErrNotFound { | ||
| if err != nil && sdk.ErrorIs(err, sdk.ErrNotFound) { |
bnjjj
approved these changes
Oct 23, 2018
yesnault
approved these changes
Oct 23, 2018
sguiheux
requested changes
Oct 23, 2018
sdk/exportentities/common.go
Outdated
| @@ -9,6 +9,7 @@ import ( | |||
| "strings" | |||
| "time" | |||
|
|
|||
| "github.com/ovh/cds/sdk" | |||
bnjjj
approved these changes
Oct 23, 2018
fsamin
requested changes
Oct 23, 2018
| return service.WriteJSON(w, msgListString, myError.Status) | ||
| globalError = sdk.WrapError(globalError, "Unable to import environment %s", eenv.Name) | ||
| if sdk.ErrorIs(globalError, sdk.ErrUnknownError) { | ||
| return globalError |
There was a problem hiding this comment.
it's not exactly the same thing here...
There was a problem hiding this comment.
I created a sdk.ErrorIsUnknown and updated the ErrorIs to return true is an error not known (not from our sdk) is compared with ErrUnknownError.
engine/api/pipeline_import.go
Outdated
| if ok { | ||
| return service.WriteJSON(w, msgListString, myError.Status) | ||
| globalError = sdk.WrapError(globalError, "Unable to import pipeline") | ||
| if sdk.ErrorIs(globalError, sdk.ErrUnknownError) { |
richardlt
changed the title
richardlt
changed the title
- Add cause in http error message - Replace all compare to sdk.Err by sdk.ErrorIs - Create empty error and fmt.Errorf when wrapping sdk.Err to prevent message duplication - Improve error log for some import handlers
richardlt
force-pushed
the
feat-improve-errors-next
branch
from
4508ae4 to
b33d7f8
Compare
fsamin
approved these changes
Oct 29, 2018
sguiheux
approved these changes
Oct 29, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
message duplication
@ovh/cds