review comments

Author: MagnusHJensen

changes/44082-add-script-output-to-gitops

@@ -1 +1 @@
-- Added output to GitOps for scripts, indicating how many would or be applied when running.
+- Added output to GitOps for scripts, indicating how many scripts would be applied (dry run) or were applied.

cmd/fleetctl/fleetctl/gitops_test.go

@@ -6676,5 +6676,5 @@ software:
 	// Real run.
 	logs = RunAppForTest(t, []string{"gitops", "-f", globalPath, "-f", teamPath})
 	assert.Contains(t, logs, "[+] applied 1 script\n")
-	assert.Contains(t, logs, fmt.Sprintf("[+] applying 1 script for fleet %s\n", teamName))
+	assert.Contains(t, logs, fmt.Sprintf("[+] applied 1 script for fleet %s\n", teamName))
 }

server/service/client.go

@@ -527,6 +527,7 @@ const (
 	dryRunAppliedFormat     = "[+] would've applied %s\n"
 	appliedFormat           = "[+] applied %s\n"
 	applyingTeamFormat      = "[+] applying %s for fleet %s\n"
+	appliedTeamFormat       = "[+] applied %s for fleet %s\n"
 	dryRunAppliedTeamFormat = "[+] would've applied %s for fleet %s\n"
 )
 
@@ -1074,10 +1075,10 @@ func (c *Client) ApplyGroup(
 				teamsScripts[tmName] = scriptResponses
 				if opts.DryRun {
 					// We split here on dry-run to capture the number we want to apply
-					logfn(format, numberWithPluralization(len(scripts), "script", "scripts"), tmName)
+					logfn(dryRunAppliedTeamFormat, numberWithPluralization(len(scripts), "script", "scripts"), tmName)
 				} else {
 					// vs. the number that actually got applied and returned by the server
-					logfn(format, numberWithPluralization(len(scriptResponses), "script", "scripts"), tmName)
+					logfn(appliedTeamFormat, numberWithPluralization(len(scriptResponses), "script", "scripts"), tmName)
 				}
 			}
 		}