fix shadowed err

ks-yim · ks-yim · commit d46e5a6ea631 · 2023-07-09T09:11:53.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
@@ -420,7 +420,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
`@@ -420,7 +420,7 @@ func marshalParamsOverride(app *v1alpha1.Application, originalData []byte) ([]by`
`420`	`420`	`override, err = yaml.Marshal(newParams)`
`421`	`421`	`break`
`422`	`422`	`}`
`423`		`- err := yaml.Unmarshal(originalData, &params)`
	`423`	`+ err = yaml.Unmarshal(originalData, &params)`
`424`	`424`	`if err != nil {`
`425`	`425`	`override, err = yaml.Marshal(newParams)`
`426`	`426`	`break`