mirror of
https://github.com/fleetdm/fleet
synced 2026-04-21 13:37:30 +00:00
Support report/fleet as spec "kinds" (#40586)
<!-- Add the related story/sub-task/bug number, like Resolves #123, or remove if NA --> **Related issue:** For #39314 **Related issue:** For #39238 # Details This PR allows the use of "fleet" and "report" as spec "kinds", deprecating the use of "team" and "query". # 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 - [X] QA'd all new/changed functionality manually Deprecation logs assume `--enable-log-topics=deprecated-field-names` is used in the command - [ ] `fleetctl apply -f /path/to/spec` should add/update a fleet when used with a spec containing `kind: fleet` - [ ] `fleetctl apply -f /path/to/spec` should add/update a report when used with a spec containing `kind: report` - [ ] `fleetctl apply -f /path/to/spec` should add/update a fleet when used with a spec containing `kind: team`, and log a deprecation warning - [ ] `fleetctl apply -f /path/to/spec` should add/update a report when used with a spec containing `kind: query`, , and log a deprecation warning
This commit is contained in:
Scott Gress
GitHub
parent
2eeb11dc6a
commit
55b65e2559
16 changed files with 133 additions and 125 deletions
|
|
@ -303,13 +303,13 @@ func TestApplyTeamSpecs(t *testing.T) {
|
|||
filename := writeTmpYml(t, `
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: team2
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
agent_options:
|
||||
|
|
@ -354,7 +354,7 @@ spec:
|
|||
filename = writeTmpYml(t, `
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: team1
|
||||
|
|
@ -383,7 +383,7 @@ spec:
|
|||
mobileCfgPath := writeTmpMobileconfig(t, "N1")
|
||||
filename = writeTmpYml(t, fmt.Sprintf(`
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: team1
|
||||
|
|
@ -422,7 +422,7 @@ spec:
|
|||
|
||||
filename = writeTmpYml(t, `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
agent_options:
|
||||
|
|
@ -477,7 +477,7 @@ spec:
|
|||
|
||||
filename = writeTmpYml(t, `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
agent_options:
|
||||
|
|
@ -498,7 +498,7 @@ spec:
|
|||
|
||||
filename = writeTmpYml(t, `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: team1
|
||||
|
|
@ -513,7 +513,7 @@ spec:
|
|||
|
||||
filename = writeTmpYml(t, `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: team1
|
||||
|
|
@ -571,7 +571,7 @@ spec:
|
|||
filename = writeTmpYml(
|
||||
t, `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: team1
|
||||
|
|
@ -602,7 +602,7 @@ spec:
|
|||
filename = writeTmpYml(
|
||||
t, `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: team1
|
||||
|
|
@ -625,7 +625,7 @@ spec:
|
|||
filename = writeTmpYml(
|
||||
t, `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: team1
|
||||
|
|
@ -648,7 +648,7 @@ spec:
|
|||
filename = writeTmpYml(
|
||||
t, `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: team1
|
||||
|
|
@ -1255,7 +1255,7 @@ spec:
|
|||
`
|
||||
queriesSpec = `---
|
||||
apiVersion: v1
|
||||
kind: query
|
||||
kind: report
|
||||
spec:
|
||||
description: Retrieves the list of application scheme/protocol-based IPC handlers.
|
||||
name: app_schemes
|
||||
|
|
@ -1620,7 +1620,7 @@ spec:
|
|||
// Apply team config.
|
||||
name = writeTmpYml(t, fmt.Sprintf(`
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
agent_options:
|
||||
|
|
@ -1673,7 +1673,7 @@ spec:
|
|||
// add macos setup assistant to team
|
||||
name = writeTmpYml(t, fmt.Sprintf(`
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: Team1
|
||||
|
|
@ -1713,7 +1713,7 @@ spec:
|
|||
// add bootstrap package to team
|
||||
name = writeTmpYml(t, fmt.Sprintf(`
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: Team1
|
||||
|
|
@ -2323,7 +2323,7 @@ spec:
|
|||
`
|
||||
team1Spec = `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: tm1
|
||||
|
|
@ -2338,7 +2338,7 @@ spec:
|
|||
`
|
||||
team1NoKeySpec = `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: tm1
|
||||
|
|
@ -2347,7 +2347,7 @@ spec:
|
|||
`
|
||||
team1And2Spec = `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: tm1
|
||||
|
|
@ -2357,7 +2357,7 @@ spec:
|
|||
macos_setup_assistant: %s
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: tm2
|
||||
|
|
@ -2368,7 +2368,7 @@ spec:
|
|||
`
|
||||
team1SpecEnableEndUserAuth = `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: tm1
|
||||
|
|
@ -3020,7 +3020,7 @@ func TestApplySpecs(t *testing.T) {
|
|||
desc: "empty team spec",
|
||||
spec: `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
`,
|
||||
wantOutput: "[+] applied 1 team",
|
||||
|
|
@ -3029,7 +3029,7 @@ spec:
|
|||
desc: "empty team name",
|
||||
spec: `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: ""
|
||||
|
|
@ -3040,7 +3040,7 @@ spec:
|
|||
desc: "invalid agent options for existing team",
|
||||
spec: `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: team1
|
||||
|
|
@ -3054,7 +3054,7 @@ spec:
|
|||
desc: "invalid top-level key for team",
|
||||
spec: `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: team1
|
||||
|
|
@ -3066,7 +3066,7 @@ spec:
|
|||
desc: "invalid known key's value type for team cannot be forced",
|
||||
spec: `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: 123
|
||||
|
|
@ -3078,7 +3078,7 @@ spec:
|
|||
desc: "unknown key for team can be forced",
|
||||
spec: `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: team1
|
||||
|
|
@ -3091,7 +3091,7 @@ spec:
|
|||
desc: "invalid agent options for new team",
|
||||
spec: `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: teamNEW
|
||||
|
|
@ -3105,7 +3105,7 @@ spec:
|
|||
desc: "invalid agent options dry-run",
|
||||
spec: `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: teamNEW
|
||||
|
|
@ -3120,7 +3120,7 @@ spec:
|
|||
desc: "invalid agent options force",
|
||||
spec: `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: teamNEW
|
||||
|
|
@ -3135,7 +3135,7 @@ spec:
|
|||
desc: "invalid agent options field type",
|
||||
spec: `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: teamNEW
|
||||
|
|
@ -3151,7 +3151,7 @@ spec:
|
|||
desc: "invalid team agent options command-line flag",
|
||||
spec: `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: teamNEW
|
||||
|
|
@ -3165,7 +3165,7 @@ spec:
|
|||
desc: "valid team agent options command-line flag",
|
||||
spec: `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: teamNEW
|
||||
|
|
@ -3179,7 +3179,7 @@ spec:
|
|||
desc: "invalid agent options field type in overrides",
|
||||
spec: `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: teamNEW
|
||||
|
|
@ -3341,7 +3341,7 @@ spec:
|
|||
desc: "dry-run set with various specs, appconfig warning for legacy",
|
||||
spec: `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: teamNEW
|
||||
|
|
@ -3366,7 +3366,7 @@ spec:
|
|||
desc: "dry-run set with various specs, no errors",
|
||||
spec: `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: teamNEW
|
||||
|
|
@ -3392,7 +3392,7 @@ spec:
|
|||
desc: "macos_updates deadline set but minimum_version empty",
|
||||
spec: `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: team1
|
||||
|
|
@ -3406,7 +3406,7 @@ spec:
|
|||
desc: "macos_updates minimum_version set but deadline empty",
|
||||
spec: `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: team1
|
||||
|
|
@ -3420,7 +3420,7 @@ spec:
|
|||
desc: "macos_updates.minimum_version with build version",
|
||||
spec: `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: team1
|
||||
|
|
@ -3435,7 +3435,7 @@ spec:
|
|||
desc: "macos_updates.deadline with timestamp",
|
||||
spec: `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: team1
|
||||
|
|
@ -3450,7 +3450,7 @@ spec:
|
|||
desc: "macos_updates.deadline with invalid date",
|
||||
spec: `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: team1
|
||||
|
|
@ -3465,7 +3465,7 @@ spec:
|
|||
desc: "macos_updates.deadline with incomplete date",
|
||||
spec: `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: team1
|
||||
|
|
@ -3480,7 +3480,7 @@ spec:
|
|||
desc: "windows_updates.deadline_days but grace period empty",
|
||||
spec: `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: team1
|
||||
|
|
@ -3494,7 +3494,7 @@ spec:
|
|||
desc: "windows_updates.grace_period_days but deadline empty",
|
||||
spec: `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: team1
|
||||
|
|
@ -3508,7 +3508,7 @@ spec:
|
|||
desc: "windows_updates.deadline_days out of range",
|
||||
spec: `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: team1
|
||||
|
|
@ -3523,7 +3523,7 @@ spec:
|
|||
desc: "windows_updates.grace_period_days out of range",
|
||||
spec: `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: team1
|
||||
|
|
@ -3538,7 +3538,7 @@ spec:
|
|||
desc: "windows_updates.deadline_days not a number",
|
||||
spec: `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: team1
|
||||
|
|
@ -3553,7 +3553,7 @@ spec:
|
|||
desc: "windows_updates.grace_period_days not a number",
|
||||
spec: `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: team1
|
||||
|
|
@ -3568,7 +3568,7 @@ spec:
|
|||
desc: "windows_updates valid",
|
||||
spec: `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: team1
|
||||
|
|
@ -3583,7 +3583,7 @@ spec:
|
|||
desc: "windows_updates unset valid",
|
||||
spec: `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: team1
|
||||
|
|
@ -3953,7 +3953,7 @@ spec:
|
|||
desc: "team config macos_settings.enable_disk_encryption without a value",
|
||||
spec: `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: team1
|
||||
|
|
@ -3967,7 +3967,7 @@ spec:
|
|||
desc: "team config macos_settings.enable_disk_encryption with invalid value type",
|
||||
spec: `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: team1
|
||||
|
|
@ -3981,7 +3981,7 @@ spec:
|
|||
desc: "team config macos_settings.enable_disk_encryption true",
|
||||
spec: `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: team1
|
||||
|
|
@ -3995,7 +3995,7 @@ spec:
|
|||
desc: "team config macos_settings.enable_disk_encryption false",
|
||||
spec: `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: team1
|
||||
|
|
@ -4009,7 +4009,7 @@ spec:
|
|||
desc: "team config mac setup assistant",
|
||||
spec: fmt.Sprintf(`
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: team1
|
||||
|
|
@ -4271,7 +4271,7 @@ func TestApplyWindowsUpdates(t *testing.T) {
|
|||
|
||||
filename := writeTmpYml(t, `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: Team1
|
||||
|
|
@ -4300,7 +4300,7 @@ spec:
|
|||
|
||||
filename := writeTmpYml(t, `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: Team1
|
||||
|
|
@ -4328,7 +4328,7 @@ spec:
|
|||
|
||||
filename := writeTmpYml(t, `
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
team:
|
||||
name: Team1
|
||||
|
|
|
|||
|
|
@ -219,7 +219,7 @@ func convertCommand() *cli.Command {
|
|||
}
|
||||
|
||||
meta := spec.Metadata{
|
||||
Kind: fleet.QueryKind,
|
||||
Kind: fleet.ReportKind,
|
||||
Version: fleet.ApiVersion,
|
||||
Spec: specBytes,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ func printLabel(c *cli.Context, label *fleet.LabelSpec) error {
|
|||
|
||||
func printQuerySpec(c *cli.Context, query *fleet.QuerySpec) error {
|
||||
spec := specGeneric{
|
||||
Kind: fleet.QueryKind,
|
||||
Kind: fleet.ReportKind,
|
||||
Version: fleet.ApiVersion,
|
||||
Spec: query,
|
||||
}
|
||||
|
|
@ -259,7 +259,7 @@ func printTeams(c *cli.Context, teams []fleet.Team) error {
|
|||
teamItem = teamSpec
|
||||
}
|
||||
spec := specGeneric{
|
||||
Kind: fleet.TeamKind,
|
||||
Kind: fleet.FleetKind,
|
||||
Version: fleet.ApiVersion,
|
||||
Spec: map[string]interface{}{
|
||||
"team": teamItem,
|
||||
|
|
|
|||
|
|
@ -1616,7 +1616,7 @@ func TestGetQueries(t *testing.T) {
|
|||
|
||||
expectedYAMLGlobal := `---
|
||||
apiVersion: v1
|
||||
kind: query
|
||||
kind: report
|
||||
spec:
|
||||
automations_enabled: false
|
||||
description: some desc
|
||||
|
|
@ -1632,7 +1632,7 @@ spec:
|
|||
team: ""
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: query
|
||||
kind: report
|
||||
spec:
|
||||
automations_enabled: false
|
||||
description: some desc 2
|
||||
|
|
@ -1651,7 +1651,7 @@ spec:
|
|||
team: ""
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: query
|
||||
kind: report
|
||||
spec:
|
||||
automations_enabled: true
|
||||
description: some desc 4
|
||||
|
|
@ -1666,9 +1666,9 @@ spec:
|
|||
query: select 4;
|
||||
team: ""
|
||||
`
|
||||
expectedJSONGlobal := `{"kind":"query","apiVersion":"v1","spec":{"automations_enabled":false,"description":"some desc","discard_data":false,"fleet":"","interval":0,"logging":"","min_osquery_version":"","name":"query1","observer_can_run":false,"platform":"","query":"select 1;","team":""}}
|
||||
{"kind":"query","apiVersion":"v1","spec":{"automations_enabled":false,"description":"some desc 2","discard_data":true,"fleet":"","interval":0,"labels_include_any":["label1","label2"],"logging":"","min_osquery_version":"","name":"query2","observer_can_run":false,"platform":"","query":"select 2;","team":""}}
|
||||
{"kind":"query","apiVersion":"v1","spec":{"automations_enabled":true,"description":"some desc 4","discard_data":false,"fleet":"","interval":60,"logging":"differential_ignore_removals","min_osquery_version":"5.3.0","name":"query4","observer_can_run":true,"platform":"darwin,windows","query":"select 4;","team":""}}
|
||||
expectedJSONGlobal := `{"kind":"report","apiVersion":"v1","spec":{"automations_enabled":false,"description":"some desc","discard_data":false,"fleet":"","interval":0,"logging":"","min_osquery_version":"","name":"query1","observer_can_run":false,"platform":"","query":"select 1;","team":""}}
|
||||
{"kind":"report","apiVersion":"v1","spec":{"automations_enabled":false,"description":"some desc 2","discard_data":true,"fleet":"","interval":0,"labels_include_any":["label1","label2"],"logging":"","min_osquery_version":"","name":"query2","observer_can_run":false,"platform":"","query":"select 2;","team":""}}
|
||||
{"kind":"report","apiVersion":"v1","spec":{"automations_enabled":true,"description":"some desc 4","discard_data":false,"fleet":"","interval":60,"logging":"differential_ignore_removals","min_osquery_version":"5.3.0","name":"query4","observer_can_run":true,"platform":"darwin,windows","query":"select 4;","team":""}}
|
||||
`
|
||||
|
||||
expectedTeam := `+--------+-------------+-----------+--------+----------------------------+
|
||||
|
|
@ -1690,7 +1690,7 @@ spec:
|
|||
|
||||
expectedYAMLTeam := `---
|
||||
apiVersion: v1
|
||||
kind: query
|
||||
kind: report
|
||||
spec:
|
||||
automations_enabled: false
|
||||
description: some desc 3
|
||||
|
|
@ -1705,7 +1705,7 @@ spec:
|
|||
query: select 3;
|
||||
team: Foobar
|
||||
`
|
||||
expectedJSONTeam := `{"kind":"query","apiVersion":"v1","spec":{"automations_enabled":false,"description":"some desc 3","discard_data":false,"fleet":"Foobar","interval":3600,"logging":"snapshot","min_osquery_version":"5.4.0","name":"query3","observer_can_run":true,"platform":"darwin","query":"select 3;","team":"Foobar"}}
|
||||
expectedJSONTeam := `{"kind":"report","apiVersion":"v1","spec":{"automations_enabled":false,"description":"some desc 3","discard_data":false,"fleet":"Foobar","interval":3600,"logging":"snapshot","min_osquery_version":"5.4.0","name":"query3","observer_can_run":true,"platform":"darwin","query":"select 3;","team":"Foobar"}}
|
||||
`
|
||||
|
||||
assert.Equal(t, expectedGlobal, RunAppForTest(t, []string{"get", "queries"}))
|
||||
|
|
@ -1786,7 +1786,7 @@ func TestGetQuery(t *testing.T) {
|
|||
|
||||
expectedYaml := `---
|
||||
apiVersion: v1
|
||||
kind: query
|
||||
kind: report
|
||||
spec:
|
||||
automations_enabled: false
|
||||
description: some desc
|
||||
|
|
@ -1801,7 +1801,7 @@ spec:
|
|||
query: select 1;
|
||||
team: ""
|
||||
`
|
||||
expectedJson := `{"kind":"query","apiVersion":"v1","spec":{"automations_enabled":false,"description":"some desc","discard_data":false,"fleet":"","interval":0,"logging":"","min_osquery_version":"","name":"globalQuery1","observer_can_run":false,"platform":"","query":"select 1;","team":""}}
|
||||
expectedJson := `{"kind":"report","apiVersion":"v1","spec":{"automations_enabled":false,"description":"some desc","discard_data":false,"fleet":"","interval":0,"logging":"","min_osquery_version":"","name":"globalQuery1","observer_can_run":false,"platform":"","query":"select 1;","team":""}}
|
||||
`
|
||||
|
||||
assert.Equal(t, expectedYaml, RunAppForTest(t, []string{"get", "query", "globalQuery1"}))
|
||||
|
|
@ -1810,7 +1810,7 @@ spec:
|
|||
|
||||
expectedYaml = `---
|
||||
apiVersion: v1
|
||||
kind: query
|
||||
kind: report
|
||||
spec:
|
||||
automations_enabled: true
|
||||
description: some team desc
|
||||
|
|
@ -1825,7 +1825,7 @@ spec:
|
|||
query: select 2;
|
||||
team: Foobar
|
||||
`
|
||||
expectedJson = `{"kind":"query","apiVersion":"v1","spec":{"automations_enabled":true,"description":"some team desc","discard_data":false,"fleet":"Foobar","interval":3600,"logging":"differential","min_osquery_version":"5.2.0","name":"teamQuery1","observer_can_run":true,"platform":"linux","query":"select 2;","team":"Foobar"}}
|
||||
expectedJson = `{"kind":"report","apiVersion":"v1","spec":{"automations_enabled":true,"description":"some team desc","discard_data":false,"fleet":"Foobar","interval":3600,"logging":"differential","min_osquery_version":"5.2.0","name":"teamQuery1","observer_can_run":true,"platform":"linux","query":"select 2;","team":"Foobar"}}
|
||||
`
|
||||
|
||||
assert.Equal(t, expectedYaml, RunAppForTest(t, []string{"get", "query", "--team", "1", "teamQuery1"}))
|
||||
|
|
@ -1931,7 +1931,7 @@ func TestGetQueriesAsObserver(t *testing.T) {
|
|||
`
|
||||
expectedYaml := `---
|
||||
apiVersion: v1
|
||||
kind: query
|
||||
kind: report
|
||||
spec:
|
||||
automations_enabled: false
|
||||
description: some desc 2
|
||||
|
|
@ -1946,7 +1946,7 @@ spec:
|
|||
query: select 2;
|
||||
team: ""
|
||||
`
|
||||
expectedJson := `{"kind":"query","apiVersion":"v1","spec":{"automations_enabled":false,"description":"some desc 2","discard_data":false,"fleet":"","interval":0,"logging":"","min_osquery_version":"","name":"query2","observer_can_run":true,"platform":"","query":"select 2;","team":""}}
|
||||
expectedJson := `{"kind":"report","apiVersion":"v1","spec":{"automations_enabled":false,"description":"some desc 2","discard_data":false,"fleet":"","interval":0,"logging":"","min_osquery_version":"","name":"query2","observer_can_run":true,"platform":"","query":"select 2;","team":""}}
|
||||
`
|
||||
|
||||
assert.Equal(t, expected, RunAppForTest(t, []string{"get", "queries"}))
|
||||
|
|
@ -2016,7 +2016,7 @@ spec:
|
|||
`
|
||||
expectedYaml := `---
|
||||
apiVersion: v1
|
||||
kind: query
|
||||
kind: report
|
||||
spec:
|
||||
automations_enabled: false
|
||||
description: some desc
|
||||
|
|
@ -2032,7 +2032,7 @@ spec:
|
|||
team: ""
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: query
|
||||
kind: report
|
||||
spec:
|
||||
automations_enabled: false
|
||||
description: some desc 2
|
||||
|
|
@ -2048,7 +2048,7 @@ spec:
|
|||
team: ""
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: query
|
||||
kind: report
|
||||
spec:
|
||||
automations_enabled: false
|
||||
description: some desc 3
|
||||
|
|
@ -2063,9 +2063,9 @@ spec:
|
|||
query: select 3;
|
||||
team: ""
|
||||
`
|
||||
expectedJson := `{"kind":"query","apiVersion":"v1","spec":{"automations_enabled":false,"description":"some desc","discard_data":false,"fleet":"","interval":0,"logging":"","min_osquery_version":"","name":"query1","observer_can_run":false,"platform":"","query":"select 1;","team":""}}
|
||||
{"kind":"query","apiVersion":"v1","spec":{"automations_enabled":false,"description":"some desc 2","discard_data":false,"fleet":"","interval":0,"logging":"","min_osquery_version":"","name":"query2","observer_can_run":true,"platform":"","query":"select 2;","team":""}}
|
||||
{"kind":"query","apiVersion":"v1","spec":{"automations_enabled":false,"description":"some desc 3","discard_data":false,"fleet":"","interval":0,"logging":"","min_osquery_version":"","name":"query3","observer_can_run":false,"platform":"","query":"select 3;","team":""}}
|
||||
expectedJson := `{"kind":"report","apiVersion":"v1","spec":{"automations_enabled":false,"description":"some desc","discard_data":false,"fleet":"","interval":0,"logging":"","min_osquery_version":"","name":"query1","observer_can_run":false,"platform":"","query":"select 1;","team":""}}
|
||||
{"kind":"report","apiVersion":"v1","spec":{"automations_enabled":false,"description":"some desc 2","discard_data":false,"fleet":"","interval":0,"logging":"","min_osquery_version":"","name":"query2","observer_can_run":true,"platform":"","query":"select 2;","team":""}}
|
||||
{"kind":"report","apiVersion":"v1","spec":{"automations_enabled":false,"description":"some desc 3","discard_data":false,"fleet":"","interval":0,"logging":"","min_osquery_version":"","name":"query3","observer_can_run":false,"platform":"","query":"select 3;","team":""}}
|
||||
`
|
||||
|
||||
assert.Equal(t, expected, RunAppForTest(t, []string{"get", "queries"}))
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
---
|
||||
apiVersion: v1
|
||||
kind: query
|
||||
kind: report
|
||||
spec:
|
||||
automations_enabled: false
|
||||
description: Retrieves the list of application scheme/protocol-based IPC handlers.
|
||||
|
|
@ -15,7 +15,7 @@ spec:
|
|||
fleet: ""
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: query
|
||||
kind: report
|
||||
spec:
|
||||
automations_enabled: false
|
||||
description: Retrieves the current disk encryption status for the target system.
|
||||
|
|
@ -30,7 +30,7 @@ spec:
|
|||
fleet: ""
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: query
|
||||
kind: report
|
||||
spec:
|
||||
automations_enabled: false
|
||||
description: Retrieves the current disk encryption status for the target system.
|
||||
|
|
@ -45,7 +45,7 @@ spec:
|
|||
fleet: ""
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: query
|
||||
kind: report
|
||||
spec:
|
||||
automations_enabled: false
|
||||
description: Retrieve basic information about the physical disks of a system.
|
||||
|
|
@ -60,7 +60,7 @@ spec:
|
|||
fleet: ""
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: query
|
||||
kind: report
|
||||
spec:
|
||||
automations_enabled: false
|
||||
description: Retrieves the current filters and chains per filter in the target system.
|
||||
|
|
@ -75,7 +75,7 @@ spec:
|
|||
fleet: ""
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: query
|
||||
kind: report
|
||||
spec:
|
||||
automations_enabled: false
|
||||
description:
|
||||
|
|
@ -92,7 +92,7 @@ spec:
|
|||
fleet: ""
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: query
|
||||
kind: report
|
||||
spec:
|
||||
automations_enabled: false
|
||||
description: Retrieves the list of listening ports.
|
||||
|
|
@ -107,7 +107,7 @@ spec:
|
|||
fleet: ""
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: query
|
||||
kind: report
|
||||
spec:
|
||||
automations_enabled: false
|
||||
description: Retrieves the list of listening ports.
|
||||
|
|
@ -122,7 +122,7 @@ spec:
|
|||
fleet: ""
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: query
|
||||
kind: report
|
||||
spec:
|
||||
automations_enabled: false
|
||||
description: Lists the application bundle that owns a sandbox label.
|
||||
|
|
@ -137,7 +137,7 @@ spec:
|
|||
fleet: ""
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: query
|
||||
kind: report
|
||||
spec:
|
||||
automations_enabled: false
|
||||
description: System resource usage limits.
|
||||
|
|
@ -152,7 +152,7 @@ spec:
|
|||
fleet: ""
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: query
|
||||
kind: report
|
||||
spec:
|
||||
automations_enabled: false
|
||||
description: System uptime.
|
||||
|
|
@ -167,7 +167,7 @@ spec:
|
|||
fleet: ""
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: query
|
||||
kind: report
|
||||
spec:
|
||||
automations_enabled: false
|
||||
description: System uptime.
|
||||
|
|
@ -182,7 +182,7 @@ spec:
|
|||
fleet: ""
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: query
|
||||
kind: report
|
||||
spec:
|
||||
automations_enabled: false
|
||||
description: System uptime.
|
||||
|
|
@ -197,7 +197,7 @@ spec:
|
|||
fleet: ""
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: query
|
||||
kind: report
|
||||
spec:
|
||||
automations_enabled: false
|
||||
description: System uptime.
|
||||
|
|
@ -212,7 +212,7 @@ spec:
|
|||
fleet: ""
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: query
|
||||
kind: report
|
||||
spec:
|
||||
automations_enabled: false
|
||||
description: Lists the application bundle that owns a sandbox label.
|
||||
|
|
@ -227,7 +227,7 @@ spec:
|
|||
fleet: ""
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: query
|
||||
kind: report
|
||||
spec:
|
||||
automations_enabled: false
|
||||
description: List of all user groups.
|
||||
|
|
@ -242,7 +242,7 @@ spec:
|
|||
fleet: ""
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: query
|
||||
kind: report
|
||||
spec:
|
||||
automations_enabled: false
|
||||
description: List of all user groups.
|
||||
|
|
@ -257,7 +257,7 @@ spec:
|
|||
fleet: ""
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: query
|
||||
kind: report
|
||||
spec:
|
||||
automations_enabled: false
|
||||
description: List of all user groups.
|
||||
|
|
@ -272,7 +272,7 @@ spec:
|
|||
fleet: ""
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: query
|
||||
kind: report
|
||||
spec:
|
||||
automations_enabled: false
|
||||
description: List of all user groups.
|
||||
|
|
@ -287,7 +287,7 @@ spec:
|
|||
fleet: ""
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: query
|
||||
kind: report
|
||||
spec:
|
||||
automations_enabled: false
|
||||
description: List of all user groups.
|
||||
|
|
@ -302,7 +302,7 @@ spec:
|
|||
fleet: ""
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: query
|
||||
kind: report
|
||||
spec:
|
||||
automations_enabled: false
|
||||
description: List of all user groups.
|
||||
|
|
@ -317,7 +317,7 @@ spec:
|
|||
fleet: ""
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: query
|
||||
kind: report
|
||||
spec:
|
||||
automations_enabled: false
|
||||
description: List of all user groups.
|
||||
|
|
@ -332,7 +332,7 @@ spec:
|
|||
fleet: ""
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: query
|
||||
kind: report
|
||||
spec:
|
||||
automations_enabled: false
|
||||
description: List of all user groups.
|
||||
|
|
@ -347,7 +347,7 @@ spec:
|
|||
fleet: ""
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: query
|
||||
kind: report
|
||||
spec:
|
||||
automations_enabled: false
|
||||
description: Extracted information from Windows crash logs (Minidumps).
|
||||
|
|
@ -362,7 +362,7 @@ spec:
|
|||
fleet: ""
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: query
|
||||
kind: report
|
||||
spec:
|
||||
automations_enabled: false
|
||||
description:
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"kind": "team",
|
||||
"kind": "fleet",
|
||||
"apiVersion": "v1",
|
||||
"spec": {
|
||||
"fleet": {
|
||||
|
|
@ -155,7 +155,7 @@
|
|||
}
|
||||
}
|
||||
{
|
||||
"kind": "team",
|
||||
"kind": "fleet",
|
||||
"apiVersion": "v1",
|
||||
"spec": {
|
||||
"fleet": {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
---
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
fleet:
|
||||
features:
|
||||
|
|
@ -104,7 +104,7 @@ spec:
|
|||
name: team1
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
fleet:
|
||||
agent_options:
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
---
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
fleet:
|
||||
features:
|
||||
|
|
@ -104,7 +104,7 @@ spec:
|
|||
name: tm1
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
fleet:
|
||||
features:
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
---
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
fleet:
|
||||
features:
|
||||
|
|
@ -104,7 +104,7 @@ spec:
|
|||
name: tm1
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
fleet:
|
||||
features:
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
---
|
||||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
fleet:
|
||||
host_expiry_settings:
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
apiVersion: v1
|
||||
kind: team
|
||||
kind: fleet
|
||||
spec:
|
||||
fleet:
|
||||
features:
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@ func writeQuerySpecsToFile(filename string, specs []*fleet.QuerySpec) error {
|
|||
qYaml := fleet.QueryObject{
|
||||
ObjectMetadata: fleet.ObjectMetadata{
|
||||
ApiVersion: fleet.ApiVersion,
|
||||
Kind: fleet.QueryKind,
|
||||
Kind: fleet.ReportKind,
|
||||
},
|
||||
Spec: *spec,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -325,7 +325,7 @@ func TestFleetctlUpgradePacks_NonEmpty(t *testing.T) {
|
|||
|
||||
const expected = `
|
||||
apiVersion: v1
|
||||
kind: query
|
||||
kind: report
|
||||
spec:
|
||||
automations_enabled: false
|
||||
description: (converted from pack "p1", query "q1")
|
||||
|
|
@ -340,7 +340,7 @@ spec:
|
|||
query: select 1
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: query
|
||||
kind: report
|
||||
spec:
|
||||
automations_enabled: true
|
||||
description: (converted from pack "p2", query "q2")
|
||||
|
|
@ -355,7 +355,7 @@ spec:
|
|||
query: select 2
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: query
|
||||
kind: report
|
||||
spec:
|
||||
automations_enabled: true
|
||||
description: (converted from pack "p2", query "q2")
|
||||
|
|
|
|||
|
|
@ -92,7 +92,10 @@ func GroupFromBytes(b []byte, options ...GroupFromBytesOpts) (*Group, error) {
|
|||
|
||||
var deprecatedKeysMap map[string]string
|
||||
switch kind {
|
||||
case fleet.QueryKind:
|
||||
case fleet.QueryKind, fleet.ReportKind:
|
||||
if logFn != nil && kind == fleet.QueryKind {
|
||||
logFn("[!] `kind: query` is deprecated, please use `kind: report` instead.\n")
|
||||
}
|
||||
var err error
|
||||
s.Spec, deprecatedKeysMap, err = rewriteNewToOldKeys(s.Spec, fleet.QuerySpec{})
|
||||
if err != nil {
|
||||
|
|
@ -179,7 +182,10 @@ func GroupFromBytes(b []byte, options ...GroupFromBytesOpts) (*Group, error) {
|
|||
}
|
||||
specs.UsersRoles = userRoleSpec
|
||||
|
||||
case fleet.TeamKind:
|
||||
case fleet.TeamKind, fleet.FleetKind:
|
||||
if logFn != nil && kind == fleet.TeamKind {
|
||||
logFn("[!] `kind: team` is deprecated, please use `kind: fleet` instead.\n")
|
||||
}
|
||||
// unmarshal to a raw map as we don't want to strip away unknown/invalid
|
||||
// fields at this point - that validation is done in the apply spec/teams
|
||||
// endpoint so that it is enforced for both the API and the CLI.
|
||||
|
|
|
|||
|
|
@ -334,7 +334,8 @@ func verifyQueryPlatforms(platforms string) error {
|
|||
}
|
||||
|
||||
const (
|
||||
QueryKind = "query"
|
||||
QueryKind = "query"
|
||||
ReportKind = "report"
|
||||
)
|
||||
|
||||
type QueryObject struct {
|
||||
|
|
@ -407,7 +408,7 @@ func WriteQueriesToYaml(queries []*Query) (string, error) {
|
|||
qYaml := QueryObject{
|
||||
ObjectMetadata: ObjectMetadata{
|
||||
ApiVersion: ApiVersion,
|
||||
Kind: QueryKind,
|
||||
Kind: ReportKind,
|
||||
},
|
||||
Spec: QuerySpec{
|
||||
Name: q.Name,
|
||||
|
|
|
|||
|
|
@ -631,7 +631,8 @@ func (f TeamFilter) UserCanAccessSelectedTeam() bool {
|
|||
}
|
||||
|
||||
const (
|
||||
TeamKind = "team"
|
||||
TeamKind = "team"
|
||||
FleetKind = "fleet"
|
||||
)
|
||||
|
||||
type TeamSpec struct {
|
||||
|
|
|
|||
Loading…
Reference in a new issue