Skip to content

Commit

Permalink
chore: fix lint (envoyproxy#2484)
Browse files Browse the repository at this point in the history
Signed-off-by: zirain <[email protected]>
  • Loading branch information
zirain authored Jan 23, 2024
1 parent 50db4a0 commit f2b62b2
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions internal/xds/translator/jsonpatch.go
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ func processJSONPatches(tCtx *types.ResourceVersionTable, envoyPatchPolicies []*
}
if resourceJSON, err = m.Marshal(secret); err != nil {
err = fmt.Errorf("unable to marshal xds resource %s: %s, err: %w", p.Type, p.Name, err)
errs = multierror.Append(errs, err)
errs = errors.Join(errs, err)
continue
}
}
Expand Down Expand Up @@ -320,7 +320,7 @@ func processJSONPatches(tCtx *types.ResourceVersionTable, envoyPatchPolicies []*
}
if err = deepCopyPtr(temp, secret); err != nil {
err := fmt.Errorf("unable to copy xds resource %s, err: %w", string(modifiedJSON), err)
errs = multierror.Append(errs, err)
errs = errors.Join(errs, err)
continue
}
}
Expand Down

0 comments on commit f2b62b2

Please sign in to comment.