Skip to content

Commit

Permalink
Fix error when raw error is retrieved (#2079)
Browse files Browse the repository at this point in the history
Fix error when raw error is retrieved (#2079)
  • Loading branch information
michalpristas authored Nov 14, 2022
1 parent 528a00b commit 12f6499
Show file tree
Hide file tree
Showing 13 changed files with 702 additions and 409 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# Kind can be one of:
# - breaking-change: a change to previously-documented behavior
# - deprecation: functionality that is being removed in a later release
# - bug-fix: fixes a problem in a previous version
# - enhancement: extends functionality but does not break or fix existing behavior
# - feature: new functionality
# - known-issue: problems that we are aware of in a given version
# - security: impacts on the security of a product or a user’s deployment.
# - upgrade: important information for someone upgrading from a prior version
# - other: does not fit into any of the other categories
kind: feature

# Change summary; a 80ish characters long description of the change.
summary: Accept raw errors as a fallback to detailed error type

# Long description; in case the summary is not enough to describe the change
# this field accommodate a description without length limits.
#description:

# Affected component; a word indicating the component this changeset affects.
component:

# PR number; optional; the PR number that added the changeset.
# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
# Please provide it if you are adding a fragment for a different PR.
pr: 2079

# Issue number; optional; the GitHub issue related to this changeset (either closes or is part of).
# If not present is automatically filled by the tooling with the issue linked to the PR number.
issue: https://github.com/elastic/elastic-agent/issues/931
2 changes: 1 addition & 1 deletion internal/pkg/bulk/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func (u UpdateFields) Marshal() ([]byte, error) {
func parseError(res *esapi.Response) error {

var e struct {
Err *es.ErrorT `json:"error"`
Err json.RawMessage `json:"error"`
}

decoder := json.NewDecoder(res.Body)
Expand Down
4 changes: 2 additions & 2 deletions internal/pkg/bulk/schema.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ type BulkIndexerResponseItem struct {
// Failed int `json:"failed"`
// } `json:"_shards"`

Error *es.ErrorT `json:"error,omitempty"`
Error json.RawMessage `json:"error,omitempty"`
}

func (b *BulkIndexerResponseItem) deriveError() error {
Expand Down Expand Up @@ -110,7 +110,7 @@ type MsearchResponseItem struct {
Hits es.HitsT `json:"hits"`
Aggregations map[string]es.Aggregation `json:"aggregations,omitempty"`

Error *es.ErrorT `json:"error,omitempty"`
Error json.RawMessage `json:"error,omitempty"`
}

//easyjson:json
Expand Down
Loading

0 comments on commit 12f6499

Please sign in to comment.