From 763e69bc81a8f063c437e68ec49687ea34f87074 Mon Sep 17 00:00:00 2001 From: Zach Wasserman Date: Wed, 23 Jun 2021 17:32:31 -0700 Subject: [PATCH] Use global options as default for new teams (#1184) When creating a new Team, copy the global options so that the Team is not initialized with null options. --- ee/server/service/service_teams.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/ee/server/service/service_teams.go b/ee/server/service/service_teams.go index 75f19e9eaf..bcebd3b882 100644 --- a/ee/server/service/service_teams.go +++ b/ee/server/service/service_teams.go @@ -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 }