From 5105e1914b65edb93c77c48067570e8043d60145 Mon Sep 17 00:00:00 2001 From: Magnus Jensen Date: Thu, 23 Oct 2025 10:04:24 -0300 Subject: [PATCH] Windows Var Replacement: use updated profile contents instead of incoming (#34681) This fixes a bug, but also fixes the flaky test runs seen in [Slack](https://fleetdm.slack.com/archives/C019WG4GH0A/p1761192670589249). --- server/mdm/microsoft/profile_verifier.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/mdm/microsoft/profile_verifier.go b/server/mdm/microsoft/profile_verifier.go index 4938588dda..bb67cb4f99 100644 --- a/server/mdm/microsoft/profile_verifier.go +++ b/server/mdm/microsoft/profile_verifier.go @@ -353,7 +353,7 @@ func preprocessWindowsProfileContents(ctx context.Context, logger kitlog.Logger, if fleetVar == string(fleet.FleetVarHostUUID) { result = profiles.ReplaceFleetVariableInXML(fleet.FleetVarHostUUIDRegexp, result, hostUUID) } else if fleetVar == string(fleet.FleetVarHostEndUserEmailIDP) { - replacedContents, replacedVariable, err := profiles.ReplaceHostEndUserEmailIDPVariable(ctx, ds, profileContents, hostUUID) + replacedContents, replacedVariable, err := profiles.ReplaceHostEndUserEmailIDPVariable(ctx, ds, result, hostUUID) if err != nil { return profileContents, ctxerr.Wrap(ctx, err, "replacing host end user email IDP variable") }