Skip to content

Change CheckValidParam from bool to use err #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JazminElkan-Gonzalez merged 1 commit into from
Jun 14, 2018
Merged

Change CheckValidParam from bool to use err #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions cmd/argocd/commands/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,13 +220,13 @@ func printParams(app *argoappv1.Application) {
}

// CheckValidParam checks if the parameter passed is overridable for the given app
func CheckValidParam(app *argoappv1.Application, param string) bool {
func CheckValidParam(app *argoappv1.Application, newParam argoappv1.ComponentParameter) error {
for _, p := range app.Status.Parameters {
if p.Name == param {
return true
if p.Name == newParam.Name {
return nil
}
}
return false
return fmt.Errorf("Parameter '%s' does not exist in ksonnet", newParam.Name)
}

// NewApplicationSetCommand returns a new instance of an `argocd app set` command
Expand Down Expand Up @@ -270,7 +270,6 @@ func NewApplicationSetCommand(clientOpts *argocdclient.ClientOptions) *cobra.Com
c.HelpFunc()(c, args)
os.Exit(1)
}
CheckValidParam(app, appOpts.parameters)
setParameterOverrides(app, appOpts.parameters)
_, err = appIf.UpdateSpec(context.Background(), &application.ApplicationUpdateSpecRequest{
Name: &app.Name,
Expand Down Expand Up @@ -712,6 +711,10 @@ func setParameterOverrides(app *argoappv1.Application, parameters []string) {
Name: parts[1],
Value: parts[2],
}
err := CheckValidParam(app, newParam)
if err != nil {
log.Fatal(err)
}
index := -1
for i, cp := range newParams {
if cp.Component == newParam.Component && cp.Name == newParam.Name {
Expand Down