Skip to content

various profile fixes #11084

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
roperzh merged 11 commits into from
Apr 9, 2023
Merged

various profile fixes #11084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
07332b2
various profile fixes
roperzh Apr 8, 2023
532fc36
adjust reports
roperzh Apr 8, 2023
2a0253d
right query building
roperzh Apr 8, 2023
de5056e
fixes
roperzh Apr 8, 2023
5c0557c
fix bugs and a bunch of tests
roperzh Apr 8, 2023
559edd3
port changes from sarah's branch
roperzh Apr 8, 2023
fb27fc1
fix integration tests
roperzh Apr 8, 2023
a79acc8
last test fixes
roperzh Apr 8, 2023
de95d11
add missing migration tests
roperzh Apr 8, 2023
25bd81f
lint
roperzh Apr 9, 2023
6b1ddef
fetch hosts before deleting team
roperzh Apr 9, 2023
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
18 changes: 18 additions & 0 deletions ee/server/service/teams.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,20 @@ func (svc *Service) DeleteTeam(ctx context.Context, teamID uint) error {
}
name := team.Name

vc, ok := viewer.FromContext(ctx)
if !ok {
return fleet.ErrNoContext
}
filter := fleet.TeamFilter{User: vc.User, IncludeObserver: true}
hosts, err := svc.ds.ListHosts(ctx, filter, fleet.HostListOptions{TeamFilter: &teamID})
Comment thread
roperzh marked this conversation as resolved.
if err != nil {
return ctxerr.Wrap(ctx, err, "list hosts for reconcile profiles on team change")
}
hostIDs := make([]uint, 0, len(hosts))
for _, host := range hosts {
hostIDs = append(hostIDs, host.ID)
}

if err := svc.ds.DeleteTeam(ctx, teamID); err != nil {
return err
}
Expand All @@ -391,6 +405,10 @@ func (svc *Service) DeleteTeam(ctx context.Context, teamID uint) error {
return ctxerr.Wrap(ctx, err, "bulk set pending host profiles")
}

if err := svc.ds.CleanupDiskEncryptionKeysOnTeamChange(ctx, hostIDs, ptr.Uint(0)); err != nil {
return ctxerr.Wrap(ctx, err, "reconcile profiles on team change cleanup disk encryption keys")
}

logging.WithExtras(ctx, "id", teamID)

if err := svc.ds.NewActivity(
Expand Down
Loading