Skip to content

Commit 4a9f69d

Browse files
committed
fix shadowed err
Signed-off-by: KS. Yim <ks.yim@linecorp.com>
1 parent 27b216a commit 4a9f69d

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

pkg/argocd/update.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@ import (
99
"text/template"
1010
"time"
1111

12+
"golang.org/x/exp/slices"
13+
1214
"github.com/argoproj-labs/argocd-image-updater/ext/git"
1315
"github.com/argoproj-labs/argocd-image-updater/pkg/common"
1416
"github.com/argoproj-labs/argocd-image-updater/pkg/image"
1517
"github.com/argoproj-labs/argocd-image-updater/pkg/kube"
1618
"github.com/argoproj-labs/argocd-image-updater/pkg/log"
1719
"github.com/argoproj-labs/argocd-image-updater/pkg/registry"
1820
"github.com/argoproj-labs/argocd-image-updater/pkg/tag"
19-
"golang.org/x/exp/slices"
2021

2122
"github.com/argoproj/argo-cd/v2/pkg/apiclient/application"
2223
"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
@@ -420,7 +421,7 @@ func marshalParamsOverride(app *v1alpha1.Application, originalData []byte) ([]by
420421
override, err = yaml.Marshal(newParams)
421422
break
422423
}
423-
err := yaml.Unmarshal(originalData, &params)
424+
err = yaml.Unmarshal(originalData, &params)
424425
if err != nil {
425426
override, err = yaml.Marshal(newParams)
426427
break

0 commit comments

Comments
 (0)