kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-12 01:14:22 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #3546 from zhijianli88/master

Browse Source 
Fix ineffectual assignment to err
This commit is contained in:
Jeff Regan
2021-02-22 10:24:11 -08:00
committed by GitHub
parent c2b1ab8303 a167084ccf
commit 3265f64cd5
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
api/internal/crawl/index/elasticsearch.go
View File

@@ -191,7 +191,8 @@ func (idx *index) Put(uniqueID string, doc interface{}) error {
} }
if exists { if exists {
docBytes, err := json.Marshal(doc) var docBytes []byte
docBytes, err = json.Marshal(doc)
if err != nil { if err != nil {
return err return err
} }
@@ -204,12 +205,14 @@ func (idx *index) Put(uniqueID string, doc interface{}) error {
Body: bytes.NewReader(body), Body: bytes.NewReader(body),
DocumentID: uniqueID, DocumentID: uniqueID,
} }
res, err := req.Do(idx.ctx, idx.client) var res *esapi.Response
res, err = req.Do(idx.ctx, idx.client)
err = idx.responseErrorOrNil("could not update document", err = idx.responseErrorOrNil("could not update document",
res, err, ignoreResponseBody) res, err, ignoreResponseBody)
} else { } else {
body, err := json.Marshal(doc) var body []byte
body, err = json.Marshal(doc)
if err != nil { if err != nil {
return err return err
} }
@@ -219,7 +222,8 @@ func (idx *index) Put(uniqueID string, doc interface{}) error {
Body: bytes.NewReader(body), Body: bytes.NewReader(body),
DocumentID: uniqueID, DocumentID: uniqueID,
} }
res, err := req.Do(idx.ctx, idx.client) var res *esapi.Response
res, err = req.Do(idx.ctx, idx.client)
err = idx.responseErrorOrNil("could not insert document", err = idx.responseErrorOrNil("could not insert document",
res, err, ignoreResponseBody) res, err, ignoreResponseBody)