Skip to content

Cherry pick: Followup for enforcing manual agent install restrictions in gitops #40533

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
jkatz01 merged 1 commit into from
Feb 25, 2026
Merged

Cherry pick: Followup for enforcing manual agent install restrictions in gitops #40533

Show file tree
Hide file tree
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
20 changes: 13 additions & 7 deletions cmd/fleetctl/integrationtest/gitops/gitops_enterprise_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3389,7 +3389,7 @@ controls:
queries:
`

testAll := `
testVPP := `
controls:
macos_setup:
manual_agent_install: true
Expand All @@ -3413,7 +3413,7 @@ team_settings:
`

//nolint:gosec // test code
testPackagesFail := `
testPackages := `
controls:
macos_setup:
manual_agent_install: true
Expand Down Expand Up @@ -3442,23 +3442,30 @@ team_settings:
testName: "All VPP with setup experience",
VPPTeam: "All teams",
teamName: teamName,
teamTemplate: testAll,
teamTemplate: testVPP,
teamSettings: `secrets: [{"secret":"enroll_secret"}]`,
errContains: ptr.String("Couldn't edit software."),
},
{
testName: "Packages fail",
VPPTeam: "All teams",
teamName: teamName,
teamTemplate: testPackagesFail,
teamTemplate: testPackages,
teamSettings: `secrets: [{"secret":"enroll_secret"}]`,
errContains: ptr.String("Couldn't edit software."),
},
{
testName: "No team",
testName: "No team VPP",
VPPTeam: "No team",
teamName: "No team",
teamTemplate: testAll,
teamTemplate: testVPP,
errContains: ptr.String("Couldn't edit software."),
},
{
testName: "No team Installers",
VPPTeam: "No team",
teamName: "No team",
teamTemplate: testPackages,
errContains: ptr.String("Couldn't edit software."),
},
// left out more possible combinations of setup experience being set for different platforms
Expand Down Expand Up @@ -3493,7 +3500,6 @@ team_settings:
testing_utils.StartAndServeVPPServer(t)

// Don't attempt dry runs because they would not actually create the team, so the config would not be found

_, err = fleetctl.RunAppNoChecks([]string{"gitops", "--config", fleetctlConfig.Name(), "-f", globalFile.Name(), "-f", teamFileName})

if tc.errContains != nil {
Expand Down
20 changes: 15 additions & 5 deletions ee/server/service/software_installers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2218,13 +2218,23 @@ func (svc *Service) softwareBatchUpload(
return resp, tfr, nil
}

var manualAgentInstall bool
tmID := ptr.ValOrZero(teamID)
team, err := svc.ds.TeamLite(ctx, tmID)
if err != nil {
batchErr = fmt.Errorf("Couldn't get team for team ID %d: %w", tmID, err)
return
if tmID == 0 {
ac, err := svc.ds.AppConfig(ctx)
if err != nil {
batchErr = fmt.Errorf("Couldn't get app config: %w", err)
return
}
manualAgentInstall = ac.MDM.MacOSSetup.ManualAgentInstall.Value
} else {
team, err := svc.ds.TeamLite(ctx, tmID)
if err != nil {
batchErr = fmt.Errorf("Couldn't get team for team ID %d: %w", tmID, err)
return
}
manualAgentInstall = team.Config.MDM.MacOSSetup.ManualAgentInstall.Value
}
manualAgentInstall := team.Config.MDM.MacOSSetup.ManualAgentInstall.Value

var g errgroup.Group
g.SetLimit(1) // TODO: consider whether we can increase this limit, see https://github.com/fleetdm/fleet/issues/22704#issuecomment-2397407837
Expand Down
Loading