agent: squash loops into a single one in desiredAgentState

Commit "fleetd: support conflict in global unit" split out the loop in
desiredAgentState() into 2 loops, one for non-global units and the
other for global units. To follow the maintainer's suggestion, squash
the loops again into a single one.

agent/reconcile.go

@@ -141,30 +141,20 @@ func desiredAgentState(a *Agent, reg registry.Registry) (*AgentState, error) {
 
 	for _, u := range units {
 		u := u
+		md := u.RequiredTargetMetadata()
 
 		if u.IsGlobal() {
-			continue
-		}
-
-		sUnit, ok := sUnitMap[u.Name]
-		if !ok || sUnit.TargetMachineID == "" || sUnit.TargetMachineID != ms.ID {
-			continue
+			if !machine.HasMetadata(&ms, md) {
+				log.Debugf("Agent unable to run global unit %s: missing required metadata", u.Name)
+				continue
+			}
 		}
 
-		as.Units[u.Name] = &u
-	}
-
-	for _, u := range units {
-		u := u
-		md := u.RequiredTargetMetadata()
-
 		if !u.IsGlobal() {
-			continue
-		}
-
-		if !machine.HasMetadata(&ms, md) {
-			log.Debugf("Agent unable to run global unit %s: missing required metadata", u.Name)
-			continue
+			sUnit, ok := sUnitMap[u.Name]
+			if !ok || sUnit.TargetMachineID == "" || sUnit.TargetMachineID != ms.ID {
+				continue
+			}
 		}
 
 		if cExists, _ := as.HasConflict(u.Name, u.Conflicts()); cExists {