From f2b62b2bde6df1ed09a9ac0f1a0d9c83c2d1caf5 Mon Sep 17 00:00:00 2001 From: zirain Date: Tue, 23 Jan 2024 10:00:57 +0800 Subject: [PATCH] chore: fix lint (#2484) Signed-off-by: zirain --- internal/xds/translator/jsonpatch.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/xds/translator/jsonpatch.go b/internal/xds/translator/jsonpatch.go index d1c7daa8055..2b1828f4c1e 100644 --- a/internal/xds/translator/jsonpatch.go +++ b/internal/xds/translator/jsonpatch.go @@ -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 } } @@ -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 } }