Fix output from gitops to use "fleets" instead of "teams", "queries" instead of "reports" (#40610)
<!-- Add the related story/sub-task/bug number, like Resolves #123, or remove if NA --> **Related issue:** Resolves #40621 # Details This PR updates the output from `fleetctl gitops` and `fleetctl apply` to use the correct terminology: * "fleet" instead of "team" * "report" instead of "query" (where appropriate) * "for unassigned hosts" in place of "No Team" where possible, and "for fleet Unassigned" otherwise. All changes other than tests are in `client.go` and are text-only; no functional code is changed (and no code relies on the strings besides tests). # Checklist for submitter If some of the following don't apply, delete the relevant line. - [ ] Changes file added for user-visible changes in `changes/`, `orbit/changes/` or `ee/fleetd-chrome/changes`. See [Changes files](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/guides/committing-changes.md#changes-files) for more information. n/a ## Testing - [X] Added/updated automated tests - [ ] QA'd all new/changed functionality manually I did a `fleetctl generate-gitops` and a `fleetctl gitops` run and saw the updated logs: ``` [+] would've applied EULA [+] would've applied certificate authorities [+] would've applied fleet config [+] would've applied MDM profiles [+] would've applied enroll secrets [+] would've applied 1 report [+] would've applied 1 software package for fleet 'Unassigned' [+] would've applied 0 app store apps for fleet 'Unassigned' [+] would've applied webhook settings for unassigned hosts [+] would've applied 1 policy [!] gitops dry run succeeded ``` but I did not go through and try and replicate every log or error message. I think the best we can do on this one is eyeball the code changes for mistakes.
This commit is contained in:
@@ -72,8 +72,8 @@ func TestGitOpsTeamSoftwareInstallers(t *testing.T) {
|
||||
{"testdata/gitops/team_setup_software_defined_in_conflicting_places.yml", " Setup experience may only be specified directly on software or within macos_setup, but not both."},
|
||||
{"testdata/gitops/team_setup_software_defined_in_conflicting_places_vpp.yml", " Setup experience may only be specified directly on software or within macos_setup, but not both."},
|
||||
{"testdata/gitops/team_setup_software_invalid_script.yml", "no_such_script.sh: no such file"},
|
||||
{"testdata/gitops/team_setup_software_invalid_software_package.yml", "no_such_software.yml\" does not exist for that team"},
|
||||
{"testdata/gitops/team_setup_software_invalid_vpp_app.yml", "\"no_such_app\" does not exist for that team"},
|
||||
{"testdata/gitops/team_setup_software_invalid_software_package.yml", "no_such_software.yml\" does not exist for that fleet"},
|
||||
{"testdata/gitops/team_setup_software_invalid_vpp_app.yml", "\"no_such_app\" does not exist for that fleet"},
|
||||
{"testdata/gitops/team_software_installer_valid_ipa.yml", ""},
|
||||
{"testdata/gitops/team_software_installer_subdir_ipa.yml", ""},
|
||||
}
|
||||
@@ -371,8 +371,8 @@ func TestGitOpsNoTeamSoftwareInstallers(t *testing.T) {
|
||||
// No team tests for setup experience software/script
|
||||
{"testdata/gitops/no_team_setup_software_valid.yml", ""},
|
||||
{"testdata/gitops/no_team_setup_software_invalid_script.yml", "no_such_script.sh: no such file"},
|
||||
{"testdata/gitops/no_team_setup_software_invalid_software_package.yml", "no_such_software.yml\" does not exist for that team"},
|
||||
{"testdata/gitops/no_team_setup_software_invalid_vpp_app.yml", "\"no_such_app\" does not exist for that team"},
|
||||
{"testdata/gitops/no_team_setup_software_invalid_software_package.yml", "no_such_software.yml\" does not exist for that fleet"},
|
||||
{"testdata/gitops/no_team_setup_software_invalid_vpp_app.yml", "\"no_such_app\" does not exist for that fleet"},
|
||||
{"testdata/gitops/no_team_software_installer_valid_ipa.yml", ""},
|
||||
{"testdata/gitops/no_team_software_installer_subdir_ipa.yml", ""},
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user