Skip to content

Support report/fleet as spec "kinds" #40586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sgress454 merged 3 commits into from
Feb 26, 2026
Merged

Support report/fleet as spec "kinds" #40586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08c8054
support report/fleet as spec "kinds"
sgress454 Feb 25, 2026
ba16ffe
log deprecation warnings
sgress454 Feb 26, 2026
5636515
fix tests
sgress454 Feb 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
116 changes: 58 additions & 58 deletions cmd/fleetctl/fleetctl/apply_test.go
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion cmd/fleetctl/fleetctl/convert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ func convertCommand() *cli.Command {
}

meta := spec.Metadata{
Kind: fleet.QueryKind,
Kind: fleet.ReportKind,
Version: fleet.ApiVersion,
Spec: specBytes,
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/fleetctl/fleetctl/get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
Expand Down Expand Up @@ -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,
Expand Down
40 changes: 20 additions & 20 deletions cmd/fleetctl/fleetctl/get_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1616,7 +1616,7 @@ func TestGetQueries(t *testing.T) {

expectedYAMLGlobal := `---
apiVersion: v1
kind: query
kind: report
spec:
automations_enabled: false
description: some desc
Expand All @@ -1632,7 +1632,7 @@ spec:
team: ""
---
apiVersion: v1
kind: query
kind: report
spec:
automations_enabled: false
description: some desc 2
Expand All @@ -1651,7 +1651,7 @@ spec:
team: ""
---
apiVersion: v1
kind: query
kind: report
spec:
automations_enabled: true
description: some desc 4
Expand All @@ -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 := `+--------+-------------+-----------+--------+----------------------------+
Expand All @@ -1690,7 +1690,7 @@ spec:

expectedYAMLTeam := `---
apiVersion: v1
kind: query
kind: report
spec:
automations_enabled: false
description: some desc 3
Expand All @@ -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"}))
Expand Down Expand Up @@ -1786,7 +1786,7 @@ func TestGetQuery(t *testing.T) {

expectedYaml := `---
apiVersion: v1
kind: query
kind: report
spec:
automations_enabled: false
description: some desc
Expand All @@ -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"}))
Expand All @@ -1810,7 +1810,7 @@ spec:

expectedYaml = `---
apiVersion: v1
kind: query
kind: report
spec:
automations_enabled: true
description: some team desc
Expand All @@ -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"}))
Expand Down Expand Up @@ -1931,7 +1931,7 @@ func TestGetQueriesAsObserver(t *testing.T) {
`
expectedYaml := `---
apiVersion: v1
kind: query
kind: report
spec:
automations_enabled: false
description: some desc 2
Expand All @@ -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"}))
Expand Down Expand Up @@ -2016,7 +2016,7 @@ spec:
`
expectedYaml := `---
apiVersion: v1
kind: query
kind: report
spec:
automations_enabled: false
description: some desc
Expand All @@ -2032,7 +2032,7 @@ spec:
team: ""
---
apiVersion: v1
kind: query
kind: report
spec:
automations_enabled: false
description: some desc 2
Expand All @@ -2048,7 +2048,7 @@ spec:
team: ""
---
apiVersion: v1
kind: query
kind: report
spec:
automations_enabled: false
description: some desc 3
Expand All @@ -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"}))
Expand Down
Loading
Loading