Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-24 01:18:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 84

Use global options as default for new teams (#1184)

Browse source 
When creating a new Team, copy the global options so that the Team is
not initialized with null options.
This commit is contained in:
Zach Wasserman 2021-06-23 17:32:31 -07:00 committed by GitHub
parent 1417d01407
commit 763e69bc81
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ee/server/service/service_teams.go
View file

@ -15,7 +15,14 @@ func (svc *Service) NewTeam(ctx context.Context, p fleet.TeamPayload) (*fleet.Te
return nil, err
}
team := &fleet.Team{}
// Copy team options from global options
globalConfig, err := svc.ds.AppConfig()
if err != nil {
return nil, err
}
team := &fleet.Team{
AgentOptions: globalConfig.AgentOptions,
}
if p.Name == nil {
return nil, fleet.NewInvalidArgumentError("name", "missing required argument")
@ -39,7 +46,8 @@ func (svc *Service) NewTeam(ctx context.Context, p fleet.TeamPayload) (*fleet.Te
}
team.Secrets = []*fleet.EnrollSecret{{Secret: secret}}
}
team, err := svc.ds.NewTeam(team)
team, err = svc.ds.NewTeam(team)
if err != nil {
return nil, err
}