Skip to content

Issue #404 - Unset application parameters #405

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
alexmt merged 1 commit into from
Jul 13, 2018
Merged

Issue #404 - Unset application parameters #405

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
40 changes: 12 additions & 28 deletions server/application/application.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,43 +246,27 @@ func (s *Server) Update(ctx context.Context, q *ApplicationUpdateRequest) (*appv
return s.appclientset.ArgoprojV1alpha1().Applications(s.ns).Update(a)
}

// removeInvalidOverrides removes any prameter overrides that are no longer valid
// removeInvalidOverrides removes any parameter overrides that are no longer valid
// drops old overrides that are invalid
// throws an error is passed override is invalid
// if passed override and old overrides are invalid, throws error, old overrides not dropped
func (s *Server) removeInvalidOverrides(a *appv1.Application, q *ApplicationUpdateSpecRequest) (*ApplicationUpdateSpecRequest, error) {
oldParams := argo.ParamToMap(a.Spec.Source.ComponentParameterOverrides)
validAppSet := argo.ParamToMap(a.Status.Parameters)
invalidOldParams := make(map[string]map[string]bool)
var overrideParams []appv1.ComponentParameter
for _, unvettedExistingParam := range a.Spec.Source.ComponentParameterOverrides {
if argo.CheckValidParam(validAppSet, unvettedExistingParam) {
overrideParams = append(overrideParams, unvettedExistingParam)
} else {
if invalidOldParams[unvettedExistingParam.Component] == nil {
invalidOldParams[unvettedExistingParam.Component] = make(map[string]bool)
}
invalidOldParams[unvettedExistingParam.Component][unvettedExistingParam.Name] = true
}
}
for _, unvettedRequestedParam := range q.Spec.Source.ComponentParameterOverrides {
if argo.CheckValidParam(validAppSet, unvettedRequestedParam) {
paramExists := false
for _, overrideParam := range overrideParams {
if unvettedRequestedParam.Component == overrideParam.Component && unvettedRequestedParam.Name == overrideParam.Name && unvettedRequestedParam.Value == overrideParam.Value {
paramExists = true
}
}
if !paramExists {
overrideParams = append(overrideParams, unvettedRequestedParam)
}
} else {
if !argo.CheckValidParam(invalidOldParams, unvettedRequestedParam) {
return nil, status.Errorf(codes.InvalidArgument, "Parameter '%s' in '%s' does not exist in ksonnet", unvettedRequestedParam.Name, unvettedRequestedParam.Component)

params := make([]appv1.ComponentParameter, 0)
for i := range q.Spec.Source.ComponentParameterOverrides {
param := q.Spec.Source.ComponentParameterOverrides[i]
if !argo.CheckValidParam(validAppSet, param) {
alreadySet := argo.CheckValidParam(oldParams, param)
if !alreadySet {
return nil, status.Errorf(codes.InvalidArgument, "Parameter '%s' in '%s' does not exist in ksonnet", param.Name, param.Component)
}
} else {
params = append(params, param)
}
}
q.Spec.Source.ComponentParameterOverrides = overrideParams
q.Spec.Source.ComponentParameterOverrides = params
return q, nil
}

Expand Down