Skip to content

Commit 17d150a

Browse files
committed
Use early returns for marshalParamsOverride
1 parent 6ec2b5a commit 17d150a

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

pkg/argocd/update.go

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -543,22 +543,14 @@ func marshalHelmOverride(app *v1alpha1.Application, originalData []byte) (overri
543543
// marshalParamsOverride marshals the parameter overrides of a given application
544544
// into YAML bytes
545545
func marshalParamsOverride(app *v1alpha1.Application, originalData []byte) ([]byte, error) {
546-
var override []byte
547-
var err error
548-
549546
switch GetApplicationType(app) {
550547
case ApplicationTypeKustomize:
551-
override, err = marshalKustomizeOverride(app, originalData)
548+
return marshalKustomizeOverride(app, originalData)
552549
case ApplicationTypeHelm:
553-
override, err = marshalHelmOverride(app, originalData)
550+
return marshalHelmOverride(app, originalData)
554551
default:
555-
err = fmt.Errorf("unsupported application type")
556-
}
557-
if err != nil {
558-
return nil, err
552+
return nil, fmt.Errorf("unsupported application type")
559553
}
560-
561-
return override, nil
562554
}
563555

564556
func mergeHelmOverride(t *helmOverride, o *helmOverride) {

0 commit comments

Comments
 (0)