Skip to content
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

Jump to bottom

fix: application exist panic when execute api call #8188

Merged
merged 9 commits into from
Jan 15, 2022
Merged

fix: application exist panic when execute api call #8188

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d0e2135
move projects
pasha-codefresh Dec 6, 2021
7a82176
Revert "move projects"
pasha-codefresh Dec 6, 2021
c7f55e5
Merge branch 'argoproj:master' into master
pasha-codefresh Dec 10, 2021
27f1b48
Merge branch 'argoproj:master' into master
pasha-codefresh Dec 13, 2021
7e90d1a
Merge branch 'argoproj:master' into master
pasha-codefresh Dec 16, 2021
f3fd16b
Merge branch 'argoproj:master' into master
pasha-codefresh Dec 17, 2021
71afa78
Merge branch 'argoproj:master' into master
pasha-codefresh Dec 28, 2021
f53882e
Merge branch 'master' of https://github.com/argoproj/argo-cd
pasha-codefresh Jan 14, 2022
8b872a8
not execute diff for applications
pasha-codefresh Jan 14, 2022
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
2 changes: 1 addition & 1 deletion server/application/application.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ func (s *Server) Create(ctx context.Context, q *application.ApplicationCreateReq
return existing, nil
}
if q.Upsert == nil || !*q.Upsert {
return nil, status.Errorf(codes.InvalidArgument, argo.GenerateSpecIsDifferentErrorMessage("application", existing.Spec, a.Spec))
return nil, status.Errorf(codes.InvalidArgument, "existing application spec is different, use upsert flag to force update")
}
if err := s.enf.EnforceErr(ctx.Value("claims"), rbacpolicy.ResourceApplications, rbacpolicy.ActionUpdate, appRBACName(a)); err != nil {
return nil, err
Expand Down