fix shadowed err

ks-yim · ks-yim · commit f22b5f9e31a1 · 2023-07-08T12:31:01.000+09:00
Signed-off-by: KS. Yim &lt;ks.yim@linecorp.com&gt;
diff --git a/pkg/argocd/update.go b/pkg/argocd/update.go
@@ -20,7 +20,6 @@ import (
 
 	"github.com/argoproj/argo-cd/v2/pkg/apiclient/application"
 	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	"gopkg.in/yaml.v2"
 )
 
 // Stores some statistics about the results of a run
@@ -420,7 +419,7 @@ func marshalParamsOverride(app *v1alpha1.Application, originalData []byte) ([]by
 			override, err = yaml.Marshal(newParams)
 			break
 		}
-		err := yaml.Unmarshal(originalData, &params)
+		err = yaml.Unmarshal(originalData, &params)
 		if err != nil {
 			override, err = yaml.Marshal(newParams)
 			break

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@ import (`
`20`	`20`
`21`	`21`	`"github.com/argoproj/argo-cd/v2/pkg/apiclient/application"`
`22`	`22`	`"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"`
`23`		`- "gopkg.in/yaml.v2"`
`24`	`23`	`)`
`25`	`24`
`26`	`25`	`// Stores some statistics about the results of a run`
`@@ -420,7 +419,7 @@ func marshalParamsOverride(app *v1alpha1.Application, originalData []byte) ([]by`
`420`	`419`	`override, err = yaml.Marshal(newParams)`
`421`	`420`	`break`
`422`	`421`	`}`
`423`		`- err := yaml.Unmarshal(originalData, &params)`
	`422`	`+ err = yaml.Unmarshal(originalData, &params)`
`424`	`423`	`if err != nil {`
`425`	`424`	`override, err = yaml.Marshal(newParams)`
`426`	`425`	`break`