Some pointers for implementation

ee/server/service/software_installers.go

@@ -1368,6 +1368,15 @@ func (svc *Service) softwareBatchUpload(
 		}
 	}
 
+	// TODO(mna): the goal would be to get that list of installers to include
+	// the "include_during_setup" flag if it was set in the gitops yaml. Otherwise
+	// storing the installers and setting the "install_during_setup" flags would be
+	// two distinct steps with the possibility of inconsistencies.
+	//
+	// The alternative is to batch-set the include_during_setup after the installers
+	// have been processed. Could be done too, but note that it means dry-run would
+	// not be able to catch that a software marked as during setup that does not exist.
+
 	if err := svc.ds.BatchSetSoftwareInstallers(ctx, teamID, installers); err != nil {
 		batchErr = fmt.Errorf("batch set software installers: %w", err)
 		return

server/service/client.go

@@ -702,6 +702,7 @@ func (c *Client) ApplyGroup(
 			for tmName, apps := range tmSoftwareAppsPayloads {
 				// For non-dry run, currentTeamName and tmName are the same
 				currentTeamName := getTeamName(tmName)
+				logfn("[+] applying %d app store apps for team %s\n", len(apps), tmName)
 				if err := c.ApplyTeamAppStoreAppsAssociation(currentTeamName, apps, opts.ApplySpecOptions); err != nil {
 					return nil, nil, nil, fmt.Errorf("applying app store apps for team: %q: %w", tmName, err)
 				}