mirror of
https://github.com/fleetdm/fleet
synced 2026-05-23 08:58:41 +00:00
Filter out macOS updates ddm from list profiles
This commit is contained in:
parent
19057fff10
commit
b979eddcfc
2 changed files with 19 additions and 4 deletions
|
|
@ -181,12 +181,11 @@ FROM (
|
|||
created_at,
|
||||
uploaded_at
|
||||
FROM mdm_apple_declarations
|
||||
WHERE team_id = ?
|
||||
WHERE team_id = ? AND
|
||||
name NOT IN (?)
|
||||
) as combined_profiles
|
||||
`
|
||||
|
||||
// TODO(mna): filter-out the reserved OS updates DDM
|
||||
|
||||
var globalOrTeamID uint
|
||||
if teamID != nil {
|
||||
globalOrTeamID = *teamID
|
||||
|
|
@ -203,7 +202,7 @@ FROM (
|
|||
fleetNames = append(fleetNames, k)
|
||||
}
|
||||
|
||||
args := []any{globalOrTeamID, fleetIdentifiers, globalOrTeamID, fleetNames, globalOrTeamID}
|
||||
args := []any{globalOrTeamID, fleetIdentifiers, globalOrTeamID, fleetNames, globalOrTeamID, fleetNames}
|
||||
stmt, args := appendListOptionsWithCursorToSQL(selectStmt, args, &opt)
|
||||
|
||||
stmt, args, err := sqlx.In(stmt, args...)
|
||||
|
|
|
|||
|
|
@ -9154,6 +9154,22 @@ func (s *integrationMDMTestSuite) TestListMDMConfigProfiles() {
|
|||
tm3, err := s.ds.NewTeam(ctx, &fleet.Team{Name: "team3"})
|
||||
require.NoError(t, err)
|
||||
|
||||
// set OS Updates settings for team 1 for both macOS and Windows, should not
|
||||
// be returned by the list profiles endpoint.
|
||||
var tmResp teamResponse
|
||||
s.DoJSON("PATCH", fmt.Sprintf("/api/latest/fleet/teams/%d", tm1.ID), fleet.TeamPayload{
|
||||
MDM: &fleet.TeamPayloadMDM{
|
||||
MacOSUpdates: &fleet.MacOSUpdates{
|
||||
Deadline: optjson.SetString("1992-01-01"),
|
||||
MinimumVersion: optjson.SetString("13.1.1"),
|
||||
},
|
||||
WindowsUpdates: &fleet.WindowsUpdates{
|
||||
DeadlineDays: optjson.SetInt(5),
|
||||
GracePeriodDays: optjson.SetInt(2),
|
||||
},
|
||||
},
|
||||
}, http.StatusOK, &tmResp)
|
||||
|
||||
// create 5 profiles for no team and team 1, names are A, B, C ... for global and
|
||||
// tA, tB, tC ... for team 1. Alternate macOS and Windows profiles.
|
||||
for i := 0; i < 5; i++ {
|
||||
|
|
|
|||
Loading…
Reference in a new issue