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

Fix deleting rule_types..again.. #1168

Merged
merged 1 commit into from
Oct 11, 2023
Merged

Fix deleting rule_types..again.. #1168

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
16 changes: 9 additions & 7 deletions internal/controlplane/handlers_profile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,14 +823,16 @@ func (s *Server) DeleteRuleType(

profileInfo, err := s.store.ListProfilesInstantiatingRuleType(ctx, ruletype.ID)
// We have profiles that use this rule type, so we can't delete it
if err == nil && len(profileInfo) > 0 {
profiles := make([]string, 0, len(profileInfo))
for _, p := range profileInfo {
profiles = append(profiles, p.Name)
}
if err == nil {
if len(profileInfo) > 0 {
profiles := make([]string, 0, len(profileInfo))
for _, p := range profileInfo {
profiles = append(profiles, p.Name)
}

return nil, util.UserVisibleError(codes.FailedPrecondition,
fmt.Sprintf("cannot delete: rule type %s is used by profiles %s", in.GetId(), strings.Join(profiles, ", ")))
return nil, util.UserVisibleError(codes.FailedPrecondition,
fmt.Sprintf("cannot delete: rule type %s is used by profiles %s", in.GetId(), strings.Join(profiles, ", ")))
}
} else if !errors.Is(err, sql.ErrNoRows) {
// If we failed for another reason, return an error
return nil, status.Errorf(codes.Unknown, "failed to get profiles: %s", err)
Expand Down