From 592c08bbe82c3a7843b4bd280ec9185fba17fc39 Mon Sep 17 00:00:00 2001 From: seph Date: Fri, 17 Nov 2023 09:38:17 -0500 Subject: [PATCH 1/5] move dataflatten --- {pkg => ee}/dataflatten/examples/flatten/main.go | 2 +- {pkg => ee}/dataflatten/flatten.go | 0 {pkg => ee}/dataflatten/flatten_test.go | 0 {pkg => ee}/dataflatten/ini.go | 0 {pkg => ee}/dataflatten/ini_test.go | 0 {pkg => ee}/dataflatten/json.go | 0 {pkg => ee}/dataflatten/jsonl.go | 0 {pkg => ee}/dataflatten/jwt.go | 0 {pkg => ee}/dataflatten/plist.go | 0 {pkg => ee}/dataflatten/plist_test.go | 0 {pkg => ee}/dataflatten/row.go | 0 {pkg => ee}/dataflatten/row_test.go | 0 {pkg => ee}/dataflatten/string_delimited.go | 0 {pkg => ee}/dataflatten/testdata/animals.json | 0 {pkg => ee}/dataflatten/testdata/animals.jsonl | 0 {pkg => ee}/dataflatten/testdata/animals.plist | Bin {pkg => ee}/dataflatten/testdata/animals.xml | 0 {pkg => ee}/dataflatten/testdata/complex2.json | 0 {pkg => ee}/dataflatten/testdata/nested.json | 0 {pkg => ee}/dataflatten/testdata/nested/Makefile | 0 {pkg => ee}/dataflatten/testdata/nested/README.md | 0 {pkg => ee}/dataflatten/testdata/nested/inner.json | 0 .../dataflatten/testdata/nested/nested.plist | Bin .../dataflatten/testdata/nested/nested.template.xml | 0 {pkg => ee}/dataflatten/testdata/nested/nested.xml | 0 {pkg => ee}/dataflatten/testdata/secdata.ini | 0 {pkg => ee}/dataflatten/xml.go | 0 pkg/osquery/table/launcher_db_info.go | 2 +- pkg/osquery/tables/airport/table_darwin.go | 2 +- .../tables/apple_silicon_security_policy/table.go | 2 +- pkg/osquery/tables/crowdstrike/falconctl/table.go | 2 +- pkg/osquery/tables/cryptoinfotable/table.go | 2 +- pkg/osquery/tables/cryptsetup/table.go | 2 +- pkg/osquery/tables/dataflattentable/exec.go | 2 +- .../tables/dataflattentable/exec_and_parse.go | 2 +- .../dataflattentable/flattener_from_parser.go | 2 +- pkg/osquery/tables/dataflattentable/helpers.go | 2 +- pkg/osquery/tables/dataflattentable/plist_test.go | 2 +- pkg/osquery/tables/dataflattentable/tables.go | 2 +- pkg/osquery/tables/dataflattentable/tables_test.go | 2 +- .../dsim_default_associations.go | 2 +- pkg/osquery/tables/firefox_preferences/table.go | 2 +- pkg/osquery/tables/ioreg/ioreg.go | 4 ++-- .../available_products_table.go | 2 +- .../recommended_updates_table.go | 2 +- pkg/osquery/tables/mdmclient/mdmclient.go | 2 +- pkg/osquery/tables/profiles/profiles.go | 4 ++-- pkg/osquery/tables/pwpolicy/pwpolicy.go | 4 ++-- pkg/osquery/tables/secedit/secedit.go | 2 +- pkg/osquery/tables/systemprofiler/systemprofiler.go | 4 ++-- pkg/osquery/tables/tdebug/gc.go | 2 +- pkg/osquery/tables/wifi_networks/wifi_networks.go | 2 +- .../tables/windowsupdatetable/windowsupdate.go | 2 +- pkg/osquery/tables/wmitable/wmitable.go | 2 +- pkg/osquery/tables/xfconf/xfconf.go | 2 +- 55 files changed, 33 insertions(+), 33 deletions(-) rename {pkg => ee}/dataflatten/examples/flatten/main.go (97%) rename {pkg => ee}/dataflatten/flatten.go (100%) rename {pkg => ee}/dataflatten/flatten_test.go (100%) rename {pkg => ee}/dataflatten/ini.go (100%) rename {pkg => ee}/dataflatten/ini_test.go (100%) rename {pkg => ee}/dataflatten/json.go (100%) rename {pkg => ee}/dataflatten/jsonl.go (100%) rename {pkg => ee}/dataflatten/jwt.go (100%) rename {pkg => ee}/dataflatten/plist.go (100%) rename {pkg => ee}/dataflatten/plist_test.go (100%) rename {pkg => ee}/dataflatten/row.go (100%) rename {pkg => ee}/dataflatten/row_test.go (100%) rename {pkg => ee}/dataflatten/string_delimited.go (100%) rename {pkg => ee}/dataflatten/testdata/animals.json (100%) rename {pkg => ee}/dataflatten/testdata/animals.jsonl (100%) rename {pkg => ee}/dataflatten/testdata/animals.plist (100%) rename {pkg => ee}/dataflatten/testdata/animals.xml (100%) rename {pkg => ee}/dataflatten/testdata/complex2.json (100%) rename {pkg => ee}/dataflatten/testdata/nested.json (100%) rename {pkg => ee}/dataflatten/testdata/nested/Makefile (100%) rename {pkg => ee}/dataflatten/testdata/nested/README.md (100%) rename {pkg => ee}/dataflatten/testdata/nested/inner.json (100%) rename {pkg => ee}/dataflatten/testdata/nested/nested.plist (100%) rename {pkg => ee}/dataflatten/testdata/nested/nested.template.xml (100%) rename {pkg => ee}/dataflatten/testdata/nested/nested.xml (100%) rename {pkg => ee}/dataflatten/testdata/secdata.ini (100%) rename {pkg => ee}/dataflatten/xml.go (100%) diff --git a/pkg/dataflatten/examples/flatten/main.go b/ee/dataflatten/examples/flatten/main.go similarity index 97% rename from pkg/dataflatten/examples/flatten/main.go rename to ee/dataflatten/examples/flatten/main.go index 66221ad2a..cc5790f5e 100644 --- a/pkg/dataflatten/examples/flatten/main.go +++ b/ee/dataflatten/examples/flatten/main.go @@ -8,7 +8,7 @@ import ( "text/tabwriter" "github.com/kolide/kit/logutil" - "github.com/kolide/launcher/pkg/dataflatten" + "github.com/kolide/launcher/ee/dataflatten" "github.com/peterbourgon/ff/v3" ) diff --git a/pkg/dataflatten/flatten.go b/ee/dataflatten/flatten.go similarity index 100% rename from pkg/dataflatten/flatten.go rename to ee/dataflatten/flatten.go diff --git a/pkg/dataflatten/flatten_test.go b/ee/dataflatten/flatten_test.go similarity index 100% rename from pkg/dataflatten/flatten_test.go rename to ee/dataflatten/flatten_test.go diff --git a/pkg/dataflatten/ini.go b/ee/dataflatten/ini.go similarity index 100% rename from pkg/dataflatten/ini.go rename to ee/dataflatten/ini.go diff --git a/pkg/dataflatten/ini_test.go b/ee/dataflatten/ini_test.go similarity index 100% rename from pkg/dataflatten/ini_test.go rename to ee/dataflatten/ini_test.go diff --git a/pkg/dataflatten/json.go b/ee/dataflatten/json.go similarity index 100% rename from pkg/dataflatten/json.go rename to ee/dataflatten/json.go diff --git a/pkg/dataflatten/jsonl.go b/ee/dataflatten/jsonl.go similarity index 100% rename from pkg/dataflatten/jsonl.go rename to ee/dataflatten/jsonl.go diff --git a/pkg/dataflatten/jwt.go b/ee/dataflatten/jwt.go similarity index 100% rename from pkg/dataflatten/jwt.go rename to ee/dataflatten/jwt.go diff --git a/pkg/dataflatten/plist.go b/ee/dataflatten/plist.go similarity index 100% rename from pkg/dataflatten/plist.go rename to ee/dataflatten/plist.go diff --git a/pkg/dataflatten/plist_test.go b/ee/dataflatten/plist_test.go similarity index 100% rename from pkg/dataflatten/plist_test.go rename to ee/dataflatten/plist_test.go diff --git a/pkg/dataflatten/row.go b/ee/dataflatten/row.go similarity index 100% rename from pkg/dataflatten/row.go rename to ee/dataflatten/row.go diff --git a/pkg/dataflatten/row_test.go b/ee/dataflatten/row_test.go similarity index 100% rename from pkg/dataflatten/row_test.go rename to ee/dataflatten/row_test.go diff --git a/pkg/dataflatten/string_delimited.go b/ee/dataflatten/string_delimited.go similarity index 100% rename from pkg/dataflatten/string_delimited.go rename to ee/dataflatten/string_delimited.go diff --git a/pkg/dataflatten/testdata/animals.json b/ee/dataflatten/testdata/animals.json similarity index 100% rename from pkg/dataflatten/testdata/animals.json rename to ee/dataflatten/testdata/animals.json diff --git a/pkg/dataflatten/testdata/animals.jsonl b/ee/dataflatten/testdata/animals.jsonl similarity index 100% rename from pkg/dataflatten/testdata/animals.jsonl rename to ee/dataflatten/testdata/animals.jsonl diff --git a/pkg/dataflatten/testdata/animals.plist b/ee/dataflatten/testdata/animals.plist similarity index 100% rename from pkg/dataflatten/testdata/animals.plist rename to ee/dataflatten/testdata/animals.plist diff --git a/pkg/dataflatten/testdata/animals.xml b/ee/dataflatten/testdata/animals.xml similarity index 100% rename from pkg/dataflatten/testdata/animals.xml rename to ee/dataflatten/testdata/animals.xml diff --git a/pkg/dataflatten/testdata/complex2.json b/ee/dataflatten/testdata/complex2.json similarity index 100% rename from pkg/dataflatten/testdata/complex2.json rename to ee/dataflatten/testdata/complex2.json diff --git a/pkg/dataflatten/testdata/nested.json b/ee/dataflatten/testdata/nested.json similarity index 100% rename from pkg/dataflatten/testdata/nested.json rename to ee/dataflatten/testdata/nested.json diff --git a/pkg/dataflatten/testdata/nested/Makefile b/ee/dataflatten/testdata/nested/Makefile similarity index 100% rename from pkg/dataflatten/testdata/nested/Makefile rename to ee/dataflatten/testdata/nested/Makefile diff --git a/pkg/dataflatten/testdata/nested/README.md b/ee/dataflatten/testdata/nested/README.md similarity index 100% rename from pkg/dataflatten/testdata/nested/README.md rename to ee/dataflatten/testdata/nested/README.md diff --git a/pkg/dataflatten/testdata/nested/inner.json b/ee/dataflatten/testdata/nested/inner.json similarity index 100% rename from pkg/dataflatten/testdata/nested/inner.json rename to ee/dataflatten/testdata/nested/inner.json diff --git a/pkg/dataflatten/testdata/nested/nested.plist b/ee/dataflatten/testdata/nested/nested.plist similarity index 100% rename from pkg/dataflatten/testdata/nested/nested.plist rename to ee/dataflatten/testdata/nested/nested.plist diff --git a/pkg/dataflatten/testdata/nested/nested.template.xml b/ee/dataflatten/testdata/nested/nested.template.xml similarity index 100% rename from pkg/dataflatten/testdata/nested/nested.template.xml rename to ee/dataflatten/testdata/nested/nested.template.xml diff --git a/pkg/dataflatten/testdata/nested/nested.xml b/ee/dataflatten/testdata/nested/nested.xml similarity index 100% rename from pkg/dataflatten/testdata/nested/nested.xml rename to ee/dataflatten/testdata/nested/nested.xml diff --git a/pkg/dataflatten/testdata/secdata.ini b/ee/dataflatten/testdata/secdata.ini similarity index 100% rename from pkg/dataflatten/testdata/secdata.ini rename to ee/dataflatten/testdata/secdata.ini diff --git a/pkg/dataflatten/xml.go b/ee/dataflatten/xml.go similarity index 100% rename from pkg/dataflatten/xml.go rename to ee/dataflatten/xml.go diff --git a/pkg/osquery/table/launcher_db_info.go b/pkg/osquery/table/launcher_db_info.go index b9ee8b257..07102d485 100644 --- a/pkg/osquery/table/launcher_db_info.go +++ b/pkg/osquery/table/launcher_db_info.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/kolide/launcher/pkg/agent" - "github.com/kolide/launcher/pkg/dataflatten" + "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" diff --git a/pkg/osquery/tables/airport/table_darwin.go b/pkg/osquery/tables/airport/table_darwin.go index 5f2cb579c..baf69d337 100644 --- a/pkg/osquery/tables/airport/table_darwin.go +++ b/pkg/osquery/tables/airport/table_darwin.go @@ -14,7 +14,7 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" "github.com/kolide/launcher/pkg/allowedcmd" - "github.com/kolide/launcher/pkg/dataflatten" + "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" diff --git a/pkg/osquery/tables/apple_silicon_security_policy/table.go b/pkg/osquery/tables/apple_silicon_security_policy/table.go index 017300d29..a83bc185f 100644 --- a/pkg/osquery/tables/apple_silicon_security_policy/table.go +++ b/pkg/osquery/tables/apple_silicon_security_policy/table.go @@ -11,7 +11,7 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" "github.com/kolide/launcher/pkg/allowedcmd" - "github.com/kolide/launcher/pkg/dataflatten" + "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" diff --git a/pkg/osquery/tables/crowdstrike/falconctl/table.go b/pkg/osquery/tables/crowdstrike/falconctl/table.go index 11acfae1e..b6855a1c5 100644 --- a/pkg/osquery/tables/crowdstrike/falconctl/table.go +++ b/pkg/osquery/tables/crowdstrike/falconctl/table.go @@ -12,7 +12,7 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" "github.com/kolide/launcher/pkg/allowedcmd" - "github.com/kolide/launcher/pkg/dataflatten" + "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" diff --git a/pkg/osquery/tables/cryptoinfotable/table.go b/pkg/osquery/tables/cryptoinfotable/table.go index 1ced4ad24..cb2448127 100644 --- a/pkg/osquery/tables/cryptoinfotable/table.go +++ b/pkg/osquery/tables/cryptoinfotable/table.go @@ -12,7 +12,7 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" "github.com/kolide/launcher/pkg/cryptoinfo" - "github.com/kolide/launcher/pkg/dataflatten" + "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" diff --git a/pkg/osquery/tables/cryptsetup/table.go b/pkg/osquery/tables/cryptsetup/table.go index d0c5575db..f34909064 100644 --- a/pkg/osquery/tables/cryptsetup/table.go +++ b/pkg/osquery/tables/cryptsetup/table.go @@ -11,7 +11,7 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" "github.com/kolide/launcher/pkg/allowedcmd" - "github.com/kolide/launcher/pkg/dataflatten" + "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" diff --git a/pkg/osquery/tables/dataflattentable/exec.go b/pkg/osquery/tables/dataflattentable/exec.go index 5261c3fba..f06554b23 100644 --- a/pkg/osquery/tables/dataflattentable/exec.go +++ b/pkg/osquery/tables/dataflattentable/exec.go @@ -12,7 +12,7 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" "github.com/kolide/launcher/pkg/allowedcmd" - "github.com/kolide/launcher/pkg/dataflatten" + "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" "github.com/pkg/errors" diff --git a/pkg/osquery/tables/dataflattentable/exec_and_parse.go b/pkg/osquery/tables/dataflattentable/exec_and_parse.go index 9d3239239..2926561a7 100644 --- a/pkg/osquery/tables/dataflattentable/exec_and_parse.go +++ b/pkg/osquery/tables/dataflattentable/exec_and_parse.go @@ -8,7 +8,7 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" "github.com/kolide/launcher/pkg/allowedcmd" - "github.com/kolide/launcher/pkg/dataflatten" + "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" "github.com/kolide/launcher/pkg/traces" "github.com/osquery/osquery-go/plugin/table" diff --git a/pkg/osquery/tables/dataflattentable/flattener_from_parser.go b/pkg/osquery/tables/dataflattentable/flattener_from_parser.go index 38dd4891c..9db99caa0 100644 --- a/pkg/osquery/tables/dataflattentable/flattener_from_parser.go +++ b/pkg/osquery/tables/dataflattentable/flattener_from_parser.go @@ -6,7 +6,7 @@ import ( "fmt" "io" - "github.com/kolide/launcher/pkg/dataflatten" + "github.com/kolide/launcher/ee/dataflatten" ) type parser interface { diff --git a/pkg/osquery/tables/dataflattentable/helpers.go b/pkg/osquery/tables/dataflattentable/helpers.go index ddc2bcb79..accba3116 100644 --- a/pkg/osquery/tables/dataflattentable/helpers.go +++ b/pkg/osquery/tables/dataflattentable/helpers.go @@ -1,7 +1,7 @@ package dataflattentable import ( - "github.com/kolide/launcher/pkg/dataflatten" + "github.com/kolide/launcher/ee/dataflatten" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/pkg/osquery/tables/dataflattentable/plist_test.go b/pkg/osquery/tables/dataflattentable/plist_test.go index 33048f9be..327c9d7ba 100644 --- a/pkg/osquery/tables/dataflattentable/plist_test.go +++ b/pkg/osquery/tables/dataflattentable/plist_test.go @@ -6,7 +6,7 @@ import ( "sort" "testing" - "github.com/kolide/launcher/pkg/dataflatten" + "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" "github.com/stretchr/testify/require" ) diff --git a/pkg/osquery/tables/dataflattentable/tables.go b/pkg/osquery/tables/dataflattentable/tables.go index 3d32c9a9e..0672a8f3a 100644 --- a/pkg/osquery/tables/dataflattentable/tables.go +++ b/pkg/osquery/tables/dataflattentable/tables.go @@ -9,7 +9,7 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" "github.com/kolide/launcher/pkg/allowedcmd" - "github.com/kolide/launcher/pkg/dataflatten" + "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" "github.com/osquery/osquery-go" "github.com/osquery/osquery-go/plugin/table" diff --git a/pkg/osquery/tables/dataflattentable/tables_test.go b/pkg/osquery/tables/dataflattentable/tables_test.go index d51a80da7..e28bfb3dd 100644 --- a/pkg/osquery/tables/dataflattentable/tables_test.go +++ b/pkg/osquery/tables/dataflattentable/tables_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/go-kit/kit/log" - "github.com/kolide/launcher/pkg/dataflatten" + "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" "github.com/stretchr/testify/require" ) diff --git a/pkg/osquery/tables/dsim_default_associations/dsim_default_associations.go b/pkg/osquery/tables/dsim_default_associations/dsim_default_associations.go index 4e84be115..ea05c7d90 100644 --- a/pkg/osquery/tables/dsim_default_associations/dsim_default_associations.go +++ b/pkg/osquery/tables/dsim_default_associations/dsim_default_associations.go @@ -16,7 +16,7 @@ import ( "github.com/go-kit/kit/log/level" "github.com/kolide/launcher/pkg/agent" "github.com/kolide/launcher/pkg/allowedcmd" - "github.com/kolide/launcher/pkg/dataflatten" + "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" diff --git a/pkg/osquery/tables/firefox_preferences/table.go b/pkg/osquery/tables/firefox_preferences/table.go index 327acce7b..2fcd7ad8e 100644 --- a/pkg/osquery/tables/firefox_preferences/table.go +++ b/pkg/osquery/tables/firefox_preferences/table.go @@ -10,7 +10,7 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/kolide/launcher/pkg/dataflatten" + "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" diff --git a/pkg/osquery/tables/ioreg/ioreg.go b/pkg/osquery/tables/ioreg/ioreg.go index 2325df387..9c4893e47 100644 --- a/pkg/osquery/tables/ioreg/ioreg.go +++ b/pkg/osquery/tables/ioreg/ioreg.go @@ -6,7 +6,7 @@ // // As the returned data is a complex nested plist, this uses the // dataflatten tooling. (See -// https://godoc.org/github.com/kolide/launcher/pkg/dataflatten) +// https://godoc.org/github.com/kolide/launcher/ee/dataflatten) package ioreg @@ -17,7 +17,7 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" "github.com/kolide/launcher/pkg/allowedcmd" - "github.com/kolide/launcher/pkg/dataflatten" + "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" diff --git a/pkg/osquery/tables/macos_software_update/available_products_table.go b/pkg/osquery/tables/macos_software_update/available_products_table.go index 8cf0642ec..1b3e2bec2 100644 --- a/pkg/osquery/tables/macos_software_update/available_products_table.go +++ b/pkg/osquery/tables/macos_software_update/available_products_table.go @@ -18,7 +18,7 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/kolide/launcher/pkg/dataflatten" + "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" diff --git a/pkg/osquery/tables/macos_software_update/recommended_updates_table.go b/pkg/osquery/tables/macos_software_update/recommended_updates_table.go index 21db9821b..975ab2e41 100644 --- a/pkg/osquery/tables/macos_software_update/recommended_updates_table.go +++ b/pkg/osquery/tables/macos_software_update/recommended_updates_table.go @@ -17,7 +17,7 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/kolide/launcher/pkg/dataflatten" + "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" diff --git a/pkg/osquery/tables/mdmclient/mdmclient.go b/pkg/osquery/tables/mdmclient/mdmclient.go index 3b48cf2c5..7d143400c 100644 --- a/pkg/osquery/tables/mdmclient/mdmclient.go +++ b/pkg/osquery/tables/mdmclient/mdmclient.go @@ -17,7 +17,7 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" "github.com/kolide/launcher/pkg/allowedcmd" - "github.com/kolide/launcher/pkg/dataflatten" + "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" diff --git a/pkg/osquery/tables/profiles/profiles.go b/pkg/osquery/tables/profiles/profiles.go index e029c263a..1a3a9acc5 100644 --- a/pkg/osquery/tables/profiles/profiles.go +++ b/pkg/osquery/tables/profiles/profiles.go @@ -6,7 +6,7 @@ // // As the returned data is a complex nested plist, this uses the // dataflatten tooling. (See -// https://godoc.org/github.com/kolide/launcher/pkg/dataflatten) +// https://godoc.org/github.com/kolide/launcher/ee/dataflatten) package profiles @@ -22,7 +22,7 @@ import ( "github.com/go-kit/kit/log/level" "github.com/kolide/launcher/pkg/agent" "github.com/kolide/launcher/pkg/allowedcmd" - "github.com/kolide/launcher/pkg/dataflatten" + "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" diff --git a/pkg/osquery/tables/pwpolicy/pwpolicy.go b/pkg/osquery/tables/pwpolicy/pwpolicy.go index 08276418c..81c3af0fe 100644 --- a/pkg/osquery/tables/pwpolicy/pwpolicy.go +++ b/pkg/osquery/tables/pwpolicy/pwpolicy.go @@ -6,7 +6,7 @@ // // As the returned data is a complex nested plist, this uses the // dataflatten tooling. (See -// https://godoc.org/github.com/kolide/launcher/pkg/dataflatten) +// https://godoc.org/github.com/kolide/launcher/ee/dataflatten) package pwpolicy @@ -20,7 +20,7 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" "github.com/kolide/launcher/pkg/allowedcmd" - "github.com/kolide/launcher/pkg/dataflatten" + "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" diff --git a/pkg/osquery/tables/secedit/secedit.go b/pkg/osquery/tables/secedit/secedit.go index d43fe284a..c29bab17e 100644 --- a/pkg/osquery/tables/secedit/secedit.go +++ b/pkg/osquery/tables/secedit/secedit.go @@ -18,7 +18,7 @@ import ( "github.com/go-kit/kit/log/level" "github.com/kolide/launcher/pkg/agent" "github.com/kolide/launcher/pkg/allowedcmd" - "github.com/kolide/launcher/pkg/dataflatten" + "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" diff --git a/pkg/osquery/tables/systemprofiler/systemprofiler.go b/pkg/osquery/tables/systemprofiler/systemprofiler.go index 24755c04f..26dae1859 100644 --- a/pkg/osquery/tables/systemprofiler/systemprofiler.go +++ b/pkg/osquery/tables/systemprofiler/systemprofiler.go @@ -10,7 +10,7 @@ // // As the returned data is a complex nested plist, this uses the // dataflatten tooling. (See -// https://godoc.org/github.com/kolide/launcher/pkg/dataflatten) +// https://godoc.org/github.com/kolide/launcher/ee/dataflatten) // // Everything, minimal details: // @@ -48,7 +48,7 @@ import ( "github.com/go-kit/kit/log/level" "github.com/groob/plist" "github.com/kolide/launcher/pkg/allowedcmd" - "github.com/kolide/launcher/pkg/dataflatten" + "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/pkg/osquery/tables/tdebug/gc.go b/pkg/osquery/tables/tdebug/gc.go index da9895fb3..191198dd4 100644 --- a/pkg/osquery/tables/tdebug/gc.go +++ b/pkg/osquery/tables/tdebug/gc.go @@ -7,7 +7,7 @@ import ( "runtime/debug" "strings" - "github.com/kolide/launcher/pkg/dataflatten" + "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" diff --git a/pkg/osquery/tables/wifi_networks/wifi_networks.go b/pkg/osquery/tables/wifi_networks/wifi_networks.go index e5a1e5d2b..441454e8d 100644 --- a/pkg/osquery/tables/wifi_networks/wifi_networks.go +++ b/pkg/osquery/tables/wifi_networks/wifi_networks.go @@ -16,7 +16,7 @@ import ( "github.com/go-kit/kit/log/level" "github.com/kolide/launcher/pkg/agent" "github.com/kolide/launcher/pkg/allowedcmd" - "github.com/kolide/launcher/pkg/dataflatten" + "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/pkg/osquery/tables/windowsupdatetable/windowsupdate.go b/pkg/osquery/tables/windowsupdatetable/windowsupdate.go index e5ed5f474..e78105396 100644 --- a/pkg/osquery/tables/windowsupdatetable/windowsupdate.go +++ b/pkg/osquery/tables/windowsupdatetable/windowsupdate.go @@ -12,7 +12,7 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/kolide/launcher/pkg/dataflatten" + "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" "github.com/kolide/launcher/pkg/windows/windowsupdate" diff --git a/pkg/osquery/tables/wmitable/wmitable.go b/pkg/osquery/tables/wmitable/wmitable.go index e603a77ad..8f75d599c 100644 --- a/pkg/osquery/tables/wmitable/wmitable.go +++ b/pkg/osquery/tables/wmitable/wmitable.go @@ -10,7 +10,7 @@ import ( "time" "github.com/kolide/launcher/pkg/contexts/ctxlog" - "github.com/kolide/launcher/pkg/dataflatten" + "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" "github.com/kolide/launcher/pkg/wmi" diff --git a/pkg/osquery/tables/xfconf/xfconf.go b/pkg/osquery/tables/xfconf/xfconf.go index 1c0f294fc..1671cfb6a 100644 --- a/pkg/osquery/tables/xfconf/xfconf.go +++ b/pkg/osquery/tables/xfconf/xfconf.go @@ -14,7 +14,7 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/kolide/launcher/pkg/dataflatten" + "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" From 8c9c465f1d7df1d291aaa51ea1fbd053b4281f86 Mon Sep 17 00:00:00 2001 From: seph Date: Fri, 17 Nov 2023 10:32:41 -0500 Subject: [PATCH 2/5] move tables --- Makefile | 2 +- .../tables/airport/mocks/executor.go | 0 .../tables/airport/table_darwin.go | 4 +- .../tables/airport/table_darwin_test.go | 4 +- .../tables/airport/testdata/getinfo.input.txt | 0 .../airport/testdata/getinfo.output.json | 0 .../testdata/getinfo_and_scan.output.json | 0 .../getinfo_and_scan_with_query.output.json | 0 .../tables/airport/testdata/scan.input.txt | 0 .../tables/airport/testdata/scan.output.json | 0 .../testdata/scan_with_query.output.json | 0 .../tables/app-icons/app_icons_darwin.go | 0 .../apple_silicon_security_policy/parser.go | 0 .../apple_silicon_security_policy/table.go | 4 +- .../table_test.go | 0 .../test-data/bputil-failed-second-vol.txt | 0 .../test-data/bputil-multiple-boot-vol.txt | 0 .../test-data/bputil-one-boot-vol.txt | 0 .../crowdstrike/falcon_kernel_check/table.go | 2 +- .../falcon_kernel_check/table_test.go | 0 .../tables/crowdstrike/falconctl/parser.go | 0 .../crowdstrike/falconctl/parser_test.go | 0 .../tables/crowdstrike/falconctl/table.go | 4 +- .../crowdstrike/falconctl/table_test.go | 2 +- .../falconctl/test-data/cid-error.txt | 0 .../falconctl/test-data/options.txt | 0 .../tables/cryptoinfotable/table.go | 4 +- .../tables/cryptsetup/parser.go | 0 .../tables/cryptsetup/parser_test.go | 0 .../osquery => ee}/tables/cryptsetup/table.go | 4 +- .../testdata/status-active-luks1.txt | 0 .../testdata/status-active-luks2.txt | 0 .../testdata/status-active-mounted.txt | 0 .../testdata/status-active-umounted.txt | 0 .../cryptsetup/testdata/status-active.txt | 0 .../cryptsetup/testdata/status-error.txt | 0 .../cryptsetup/testdata/status-inactive.txt | 0 .../cryptsetup/testdata/status-unactive.txt | 0 .../tables/dataflattentable/exec.go | 2 +- .../tables/dataflattentable/exec_and_parse.go | 2 +- .../dataflattentable/flattener_from_parser.go | 0 .../flattener_from_parser_test.go | 2 +- .../tables/dataflattentable/helpers.go | 0 .../tables/dataflattentable/plist_test.go | 2 +- .../tables/dataflattentable/tables.go | 2 +- .../tables/dataflattentable/tables_test.go | 2 +- .../testdata/NetworkInterfaces.plist | 0 .../dataflattentable/testdata/animals.json | 0 .../dataflattentable/testdata/animals.plist | Bin .../dataflattentable/testdata/animals.xml | 0 .../com.apple.launchservices.secure.plist | 0 .../dataflattentable/testdata/secdata.ini | 0 .../dataflattentable/testdata/simple.xml | 0 .../tables/desktopprocs/desktopprocs.go | 0 .../dev_table_tooling/commands_darwin.go | 0 .../dev_table_tooling/commands_linux.go | 0 .../dev_table_tooling/commands_windows.go | 0 .../tables/dev_table_tooling/table.go | 2 +- .../tables/dev_table_tooling/table_test.go | 2 +- .../dsim_default_associations.go | 4 +- .../tables/execparsers/apt/apt.go | 0 .../tables/execparsers/apt/parser.go | 0 .../tables/execparsers/apt/parser_test.go | 0 .../apt/test-data/apt_upgradeable.txt | 0 .../tables/execparsers/dnf/dnf.go | 0 .../tables/execparsers/dnf/parser.go | 0 .../tables/execparsers/dnf/parser_test.go | 0 .../dnf/test-data/dnf_upgradeable.txt | 0 .../tables/execparsers/dpkg/dpkg.go | 0 .../tables/execparsers/dpkg/parser.go | 0 .../tables/execparsers/dpkg/parser_test.go | 0 .../execparsers/dpkg/test-data/dpkg_info.txt | 0 .../tables/execparsers/dsregcmd/dsregcmd.go | 0 .../tables/execparsers/dsregcmd/parse.go | 0 .../tables/execparsers/dsregcmd/parse_test.go | 0 .../test-data/error_header_missing_line3.txt | 0 .../test-data/error_lines_before_header.txt | 0 .../test-data/error_no_section_title.txt | 0 .../test-data/not_configured.expected.json | 0 .../dsregcmd/test-data/not_configured.txt | 0 .../execparsers/pacman/group/pacman_group.go | 0 .../tables/execparsers/pacman/group/parser.go | 0 .../execparsers/pacman/group/parser_test.go | 0 .../pacman/group/test-data/pacman_group.txt | 0 .../execparsers/pacman/info/pacman_info.go | 0 .../tables/execparsers/pacman/info/parser.go | 0 .../execparsers/pacman/info/parser_test.go | 0 .../pacman/info/test-data/pacman_info.txt | 0 .../pacman/upgradeable/pacman_upgradeable.go | 0 .../execparsers/pacman/upgradeable/parser.go | 0 .../pacman/upgradeable/parser_test.go | 0 .../test-data/pacman_upgradeable.txt | 0 .../tables/execparsers/remotectl/parse.go | 0 .../execparsers/remotectl/parse_test.go | 0 .../tables/execparsers/remotectl/remotectl.go | 0 .../test-data/dumpstate_with_features.txt | 0 .../malformed_dumpstate_at_top_level.txt | 0 .../malformed_dumpstate_in_properties.txt | 0 .../test-data/multiple_devices_dumpstate.txt | 0 .../test-data/single_device_dumpstate.txt | 0 .../tables/execparsers/repcli/parser.go | 0 .../tables/execparsers/repcli/parser_test.go | 0 .../tables/execparsers/repcli/repcli.go | 0 .../repcli/test-data/repcli_darwin.txt | 0 .../repcli/test-data/repcli_linux.txt | 0 .../tables/execparsers/rpm/parser.go | 0 .../tables/execparsers/rpm/parser_test.go | 0 .../tables/execparsers/rpm/rpm.go | 0 .../execparsers/rpm/test-data/rpm_info.txt | 0 .../tables/execparsers/simple_array/parser.go | 0 .../execparsers/simple_array/parser_test.go | 0 .../simple_array/test-data/complex.txt | 0 .../simple_array/test-data/simple.txt | 0 .../execparsers/softwareupdate/parse.go | 0 .../execparsers/softwareupdate/parse_test.go | 0 .../softwareupdate/softwareupdate.go | 0 .../beta-update-available-noscan.txt | 0 .../test-data/beta-update-available-scan.txt | 0 .../softwareupdate/test-data/error-scan.txt | 0 .../multiple-updates-available-noscan.txt | 0 .../test-data/no-update-available-noscan.txt | 0 .../test-data/no-update-available-scan.txt | 0 .../test-data/update-available-noscan.txt | 0 .../test-data/update-available-scan.txt | 0 .../tables/filevault/filevault.go | 2 +- .../tables/firefox_preferences/table.go | 4 +- .../tables/firefox_preferences/table_test.go | 2 +- .../testdata/output.file_with_bad_data.json | 0 .../testdata/output.multiple_paths.json | 0 .../testdata/output.single_path.json | 0 .../output.single_path_with_query.json | 0 .../firefox_preferences/testdata/prefs.js | 0 .../firefox_preferences/testdata/prefs2.js | 0 .../firefox_preferences/testdata/prefs3.js | 0 .../tables/firmwarepasswd/firmwarepasswd.go | 0 .../firmwarepasswd/firmwarepasswd_test.go | 0 .../tables/firmwarepasswd/parser.go | 0 .../firmwarepasswd/testdata/check-garbage.txt | 0 .../firmwarepasswd/testdata/check-no.txt | 0 .../firmwarepasswd/testdata/check-yes.txt | 0 .../firmwarepasswd/testdata/mode-command.txt | 0 .../firmwarepasswd/testdata/mode-none.txt | 0 .../tables/fscrypt_info/fscrypt_linux.go | 0 .../tables/fscrypt_info/generate.go | 0 .../tables/fscrypt_info/generate_linux.go | 2 +- .../tables/fscrypt_info/table.go | 0 .../tables/gsettings/gsettings.go | 2 +- .../tables/gsettings/gsettings_test.go | 2 +- .../tables/gsettings/metadata.go | 2 +- .../tables/gsettings/testdata/blank.txt | 0 .../tables/gsettings/testdata/listkeys.txt | 0 .../tables/gsettings/testdata/seph-athena.txt | 0 .../tables/gsettings/testdata/simple.txt | 0 {pkg/osquery => ee}/tables/ioreg/ioreg.go | 4 +- .../tables/launcher_db/launcher_db.go | 0 .../tables/launcher_db/launcher_db_test.go | 0 .../macos_software_update/SUScanController.h | 0 .../macos_software_update/SUSharedPrefs.h | 0 .../macos_software_update/SUUpdateProduct.h | 0 .../available_products_table.go | 4 +- .../recommended_updates_table.go | 4 +- .../recommended_updates_table_test.go | 2 +- .../software_update_table.go | 0 .../tables/macos_software_update/sus.h | 0 .../tables/macos_software_update/sus.m | 0 .../tables/mdmclient/mdmclient.go | 4 +- .../tables/mdmclient/mdmclient_test.go | 0 .../testdata/QueryDeviceInformation.output | 0 ...DeviceInformation_NullAgentResponse.output | 0 .../QueryDeviceInformation_WithHeader.output | 0 .../testdata/QueryInstalledProfiles.output | 0 .../testdata/QuerySecurityInfo.output | 0 {pkg/osquery => ee}/tables/munki/munki.go | 0 .../osquery => ee}/tables/munki/munki_test.go | 2 +- .../munki/testdata/ManagedInstallReport.plist | 0 .../osquery_instance_history.go | 0 .../tables/osquery_user_exec_table/table.go | 2 +- .../tables/profiles/profiles.go | 4 +- .../tables/pwpolicy/pwpolicy.go | 4 +- .../tables/pwpolicy/pwpolicy_test.go | 2 +- .../tables/pwpolicy/testdata/empty.output | 0 .../tables/pwpolicy/testdata/test1.output | 0 {pkg/osquery => ee}/tables/secedit/secedit.go | 4 +- .../osquery => ee}/tables/secureboot/table.go | 0 .../tables/systemprofiler/systemprofiler.go | 2 +- .../tables/tablehelpers/exec.go | 0 .../tablehelpers/exec_osquery_launchctl.go | 0 .../tables/tablehelpers/exec_test.go | 0 .../tables/tablehelpers/getconstraints.go | 0 .../tablehelpers/getconstraints_test.go | 0 .../tables/tablehelpers/mocks.go | 0 .../tables/tablehelpers/parser.go | 0 .../tables/tablehelpers/stanza_scanner.go | 0 {pkg/osquery => ee}/tables/tdebug/doc.go | 0 {pkg/osquery => ee}/tables/tdebug/gc.go | 4 +- .../tables/tufinfo/release_version.go | 0 .../tables/tufinfo/release_version_test.go | 0 .../wifi_networks/assets/get-networks.ps1 | 0 .../tables/wifi_networks/assets/nativewifi.cs | 0 .../tables/wifi_networks/wifi_networks.go | 2 +- .../windowsupdatetable/windowsupdate.go | 4 +- .../windowsupdatetable/windowsupdate_test.go | 2 +- .../tables/wmitable/wmitable.go | 4 +- .../tables/wmitable/wmitable_test.go | 2 +- {pkg/osquery => ee}/tables/xfconf/parser.go | 0 .../tables/xfconf/parser_test.go | 0 .../tables/xfconf/testdata/thunar-volman.xml | 0 .../testdata/xfce4-power-manager-default.xml | 0 .../xfconf/testdata/xfce4-power-manager.xml | 0 .../tables/xfconf/testdata/xfce4-session.xml | 0 {pkg/osquery => ee}/tables/xfconf/xfconf.go | 4 +- .../tables/xfconf/xfconf_test.go | 0 .../tables/xrdb/testdata/blank.txt | 0 .../tables/xrdb/testdata/example_query.sql | 0 .../tables/xrdb/testdata/results.txt | 0 {pkg/osquery => ee}/tables/xrdb/xrdb.go | 2 +- {pkg/osquery => ee}/tables/xrdb/xrdb_test.go | 2 +- {pkg/osquery => ee}/tables/zfs/tables.go | 2 +- {pkg/osquery => ee}/tables/zfs/tables_test.go | 0 .../tables/zfs/testdata/zfs.txt | 0 .../tables/zfs/testdata/zpool.txt | 0 pkg/debug/checkups/gnome_extensions_linux.go | 2 +- pkg/osquery/table/launcher_db_info.go | 4 +- pkg/osquery/table/platform_tables_darwin.go | 36 ++++++++--------- pkg/osquery/table/platform_tables_linux.go | 38 +++++++++--------- pkg/osquery/table/platform_tables_windows.go | 14 +++---- pkg/osquery/table/table.go | 18 ++++----- 227 files changed, 122 insertions(+), 122 deletions(-) rename {pkg/osquery => ee}/tables/airport/mocks/executor.go (100%) rename {pkg/osquery => ee}/tables/airport/table_darwin.go (98%) rename {pkg/osquery => ee}/tables/airport/table_darwin_test.go (98%) rename {pkg/osquery => ee}/tables/airport/testdata/getinfo.input.txt (100%) rename {pkg/osquery => ee}/tables/airport/testdata/getinfo.output.json (100%) rename {pkg/osquery => ee}/tables/airport/testdata/getinfo_and_scan.output.json (100%) rename {pkg/osquery => ee}/tables/airport/testdata/getinfo_and_scan_with_query.output.json (100%) rename {pkg/osquery => ee}/tables/airport/testdata/scan.input.txt (100%) rename {pkg/osquery => ee}/tables/airport/testdata/scan.output.json (100%) rename {pkg/osquery => ee}/tables/airport/testdata/scan_with_query.output.json (100%) rename {pkg/osquery => ee}/tables/app-icons/app_icons_darwin.go (100%) rename {pkg/osquery => ee}/tables/apple_silicon_security_policy/parser.go (100%) rename {pkg/osquery => ee}/tables/apple_silicon_security_policy/table.go (92%) rename {pkg/osquery => ee}/tables/apple_silicon_security_policy/table_test.go (100%) rename {pkg/osquery => ee}/tables/apple_silicon_security_policy/test-data/bputil-failed-second-vol.txt (100%) rename {pkg/osquery => ee}/tables/apple_silicon_security_policy/test-data/bputil-multiple-boot-vol.txt (100%) rename {pkg/osquery => ee}/tables/apple_silicon_security_policy/test-data/bputil-one-boot-vol.txt (100%) rename {pkg/osquery => ee}/tables/crowdstrike/falcon_kernel_check/table.go (97%) rename {pkg/osquery => ee}/tables/crowdstrike/falcon_kernel_check/table_test.go (100%) rename {pkg/osquery => ee}/tables/crowdstrike/falconctl/parser.go (100%) rename {pkg/osquery => ee}/tables/crowdstrike/falconctl/parser_test.go (100%) rename {pkg/osquery => ee}/tables/crowdstrike/falconctl/table.go (96%) rename {pkg/osquery => ee}/tables/crowdstrike/falconctl/table_test.go (97%) rename {pkg/osquery => ee}/tables/crowdstrike/falconctl/test-data/cid-error.txt (100%) rename {pkg/osquery => ee}/tables/crowdstrike/falconctl/test-data/options.txt (100%) rename {pkg/osquery => ee}/tables/cryptoinfotable/table.go (95%) rename {pkg/osquery => ee}/tables/cryptsetup/parser.go (100%) rename {pkg/osquery => ee}/tables/cryptsetup/parser_test.go (100%) rename {pkg/osquery => ee}/tables/cryptsetup/table.go (94%) rename {pkg/osquery => ee}/tables/cryptsetup/testdata/status-active-luks1.txt (100%) rename {pkg/osquery => ee}/tables/cryptsetup/testdata/status-active-luks2.txt (100%) rename {pkg/osquery => ee}/tables/cryptsetup/testdata/status-active-mounted.txt (100%) rename {pkg/osquery => ee}/tables/cryptsetup/testdata/status-active-umounted.txt (100%) rename {pkg/osquery => ee}/tables/cryptsetup/testdata/status-active.txt (100%) rename {pkg/osquery => ee}/tables/cryptsetup/testdata/status-error.txt (100%) rename {pkg/osquery => ee}/tables/cryptsetup/testdata/status-inactive.txt (100%) rename {pkg/osquery => ee}/tables/cryptsetup/testdata/status-unactive.txt (100%) rename {pkg/osquery => ee}/tables/dataflattentable/exec.go (98%) rename {pkg/osquery => ee}/tables/dataflattentable/exec_and_parse.go (97%) rename {pkg/osquery => ee}/tables/dataflattentable/flattener_from_parser.go (100%) rename {pkg/osquery => ee}/tables/dataflattentable/flattener_from_parser_test.go (94%) rename {pkg/osquery => ee}/tables/dataflattentable/helpers.go (100%) rename {pkg/osquery => ee}/tables/dataflattentable/plist_test.go (97%) rename {pkg/osquery => ee}/tables/dataflattentable/tables.go (98%) rename {pkg/osquery => ee}/tables/dataflattentable/tables_test.go (98%) rename {pkg/osquery => ee}/tables/dataflattentable/testdata/NetworkInterfaces.plist (100%) rename {pkg/osquery => ee}/tables/dataflattentable/testdata/animals.json (100%) rename {pkg/osquery => ee}/tables/dataflattentable/testdata/animals.plist (100%) rename {pkg/osquery => ee}/tables/dataflattentable/testdata/animals.xml (100%) rename {pkg/osquery => ee}/tables/dataflattentable/testdata/com.apple.launchservices.secure.plist (100%) rename {pkg/osquery => ee}/tables/dataflattentable/testdata/secdata.ini (100%) rename {pkg/osquery => ee}/tables/dataflattentable/testdata/simple.xml (100%) rename {pkg/osquery => ee}/tables/desktopprocs/desktopprocs.go (100%) rename {pkg/osquery => ee}/tables/dev_table_tooling/commands_darwin.go (100%) rename {pkg/osquery => ee}/tables/dev_table_tooling/commands_linux.go (100%) rename {pkg/osquery => ee}/tables/dev_table_tooling/commands_windows.go (100%) rename {pkg/osquery => ee}/tables/dev_table_tooling/table.go (96%) rename {pkg/osquery => ee}/tables/dev_table_tooling/table_test.go (96%) rename {pkg/osquery => ee}/tables/dsim_default_associations/dsim_default_associations.go (95%) rename {pkg/osquery => ee}/tables/execparsers/apt/apt.go (100%) rename {pkg/osquery => ee}/tables/execparsers/apt/parser.go (100%) rename {pkg/osquery => ee}/tables/execparsers/apt/parser_test.go (100%) rename {pkg/osquery => ee}/tables/execparsers/apt/test-data/apt_upgradeable.txt (100%) rename {pkg/osquery => ee}/tables/execparsers/dnf/dnf.go (100%) rename {pkg/osquery => ee}/tables/execparsers/dnf/parser.go (100%) rename {pkg/osquery => ee}/tables/execparsers/dnf/parser_test.go (100%) rename {pkg/osquery => ee}/tables/execparsers/dnf/test-data/dnf_upgradeable.txt (100%) rename {pkg/osquery => ee}/tables/execparsers/dpkg/dpkg.go (100%) rename {pkg/osquery => ee}/tables/execparsers/dpkg/parser.go (100%) rename {pkg/osquery => ee}/tables/execparsers/dpkg/parser_test.go (100%) rename {pkg/osquery => ee}/tables/execparsers/dpkg/test-data/dpkg_info.txt (100%) rename {pkg/osquery => ee}/tables/execparsers/dsregcmd/dsregcmd.go (100%) rename {pkg/osquery => ee}/tables/execparsers/dsregcmd/parse.go (100%) rename {pkg/osquery => ee}/tables/execparsers/dsregcmd/parse_test.go (100%) rename {pkg/osquery => ee}/tables/execparsers/dsregcmd/test-data/error_header_missing_line3.txt (100%) rename {pkg/osquery => ee}/tables/execparsers/dsregcmd/test-data/error_lines_before_header.txt (100%) rename {pkg/osquery => ee}/tables/execparsers/dsregcmd/test-data/error_no_section_title.txt (100%) rename {pkg/osquery => ee}/tables/execparsers/dsregcmd/test-data/not_configured.expected.json (100%) rename {pkg/osquery => ee}/tables/execparsers/dsregcmd/test-data/not_configured.txt (100%) rename {pkg/osquery => ee}/tables/execparsers/pacman/group/pacman_group.go (100%) rename {pkg/osquery => ee}/tables/execparsers/pacman/group/parser.go (100%) rename {pkg/osquery => ee}/tables/execparsers/pacman/group/parser_test.go (100%) rename {pkg/osquery => ee}/tables/execparsers/pacman/group/test-data/pacman_group.txt (100%) rename {pkg/osquery => ee}/tables/execparsers/pacman/info/pacman_info.go (100%) rename {pkg/osquery => ee}/tables/execparsers/pacman/info/parser.go (100%) rename {pkg/osquery => ee}/tables/execparsers/pacman/info/parser_test.go (100%) rename {pkg/osquery => ee}/tables/execparsers/pacman/info/test-data/pacman_info.txt (100%) rename {pkg/osquery => ee}/tables/execparsers/pacman/upgradeable/pacman_upgradeable.go (100%) rename {pkg/osquery => ee}/tables/execparsers/pacman/upgradeable/parser.go (100%) rename {pkg/osquery => ee}/tables/execparsers/pacman/upgradeable/parser_test.go (100%) rename {pkg/osquery => ee}/tables/execparsers/pacman/upgradeable/test-data/pacman_upgradeable.txt (100%) rename {pkg/osquery => ee}/tables/execparsers/remotectl/parse.go (100%) rename {pkg/osquery => ee}/tables/execparsers/remotectl/parse_test.go (100%) rename {pkg/osquery => ee}/tables/execparsers/remotectl/remotectl.go (100%) rename {pkg/osquery => ee}/tables/execparsers/remotectl/test-data/dumpstate_with_features.txt (100%) rename {pkg/osquery => ee}/tables/execparsers/remotectl/test-data/malformed_dumpstate_at_top_level.txt (100%) rename {pkg/osquery => ee}/tables/execparsers/remotectl/test-data/malformed_dumpstate_in_properties.txt (100%) rename {pkg/osquery => ee}/tables/execparsers/remotectl/test-data/multiple_devices_dumpstate.txt (100%) rename {pkg/osquery => ee}/tables/execparsers/remotectl/test-data/single_device_dumpstate.txt (100%) rename {pkg/osquery => ee}/tables/execparsers/repcli/parser.go (100%) rename {pkg/osquery => ee}/tables/execparsers/repcli/parser_test.go (100%) rename {pkg/osquery => ee}/tables/execparsers/repcli/repcli.go (100%) rename {pkg/osquery => ee}/tables/execparsers/repcli/test-data/repcli_darwin.txt (100%) rename {pkg/osquery => ee}/tables/execparsers/repcli/test-data/repcli_linux.txt (100%) rename {pkg/osquery => ee}/tables/execparsers/rpm/parser.go (100%) rename {pkg/osquery => ee}/tables/execparsers/rpm/parser_test.go (100%) rename {pkg/osquery => ee}/tables/execparsers/rpm/rpm.go (100%) rename {pkg/osquery => ee}/tables/execparsers/rpm/test-data/rpm_info.txt (100%) rename {pkg/osquery => ee}/tables/execparsers/simple_array/parser.go (100%) rename {pkg/osquery => ee}/tables/execparsers/simple_array/parser_test.go (100%) rename {pkg/osquery => ee}/tables/execparsers/simple_array/test-data/complex.txt (100%) rename {pkg/osquery => ee}/tables/execparsers/simple_array/test-data/simple.txt (100%) rename {pkg/osquery => ee}/tables/execparsers/softwareupdate/parse.go (100%) rename {pkg/osquery => ee}/tables/execparsers/softwareupdate/parse_test.go (100%) rename {pkg/osquery => ee}/tables/execparsers/softwareupdate/softwareupdate.go (100%) rename {pkg/osquery => ee}/tables/execparsers/softwareupdate/test-data/beta-update-available-noscan.txt (100%) rename {pkg/osquery => ee}/tables/execparsers/softwareupdate/test-data/beta-update-available-scan.txt (100%) rename {pkg/osquery => ee}/tables/execparsers/softwareupdate/test-data/error-scan.txt (100%) rename {pkg/osquery => ee}/tables/execparsers/softwareupdate/test-data/multiple-updates-available-noscan.txt (100%) rename {pkg/osquery => ee}/tables/execparsers/softwareupdate/test-data/no-update-available-noscan.txt (100%) rename {pkg/osquery => ee}/tables/execparsers/softwareupdate/test-data/no-update-available-scan.txt (100%) rename {pkg/osquery => ee}/tables/execparsers/softwareupdate/test-data/update-available-noscan.txt (100%) rename {pkg/osquery => ee}/tables/execparsers/softwareupdate/test-data/update-available-scan.txt (100%) rename {pkg/osquery => ee}/tables/filevault/filevault.go (95%) rename {pkg/osquery => ee}/tables/firefox_preferences/table.go (96%) rename {pkg/osquery => ee}/tables/firefox_preferences/table_test.go (97%) rename {pkg/osquery => ee}/tables/firefox_preferences/testdata/output.file_with_bad_data.json (100%) rename {pkg/osquery => ee}/tables/firefox_preferences/testdata/output.multiple_paths.json (100%) rename {pkg/osquery => ee}/tables/firefox_preferences/testdata/output.single_path.json (100%) rename {pkg/osquery => ee}/tables/firefox_preferences/testdata/output.single_path_with_query.json (100%) rename {pkg/osquery => ee}/tables/firefox_preferences/testdata/prefs.js (100%) rename {pkg/osquery => ee}/tables/firefox_preferences/testdata/prefs2.js (100%) rename {pkg/osquery => ee}/tables/firefox_preferences/testdata/prefs3.js (100%) rename {pkg/osquery => ee}/tables/firmwarepasswd/firmwarepasswd.go (100%) rename {pkg/osquery => ee}/tables/firmwarepasswd/firmwarepasswd_test.go (100%) rename {pkg/osquery => ee}/tables/firmwarepasswd/parser.go (100%) rename {pkg/osquery => ee}/tables/firmwarepasswd/testdata/check-garbage.txt (100%) rename {pkg/osquery => ee}/tables/firmwarepasswd/testdata/check-no.txt (100%) rename {pkg/osquery => ee}/tables/firmwarepasswd/testdata/check-yes.txt (100%) rename {pkg/osquery => ee}/tables/firmwarepasswd/testdata/mode-command.txt (100%) rename {pkg/osquery => ee}/tables/firmwarepasswd/testdata/mode-none.txt (100%) rename {pkg/osquery => ee}/tables/fscrypt_info/fscrypt_linux.go (100%) rename {pkg/osquery => ee}/tables/fscrypt_info/generate.go (100%) rename {pkg/osquery => ee}/tables/fscrypt_info/generate_linux.go (95%) rename {pkg/osquery => ee}/tables/fscrypt_info/table.go (100%) rename {pkg/osquery => ee}/tables/gsettings/gsettings.go (98%) rename {pkg/osquery => ee}/tables/gsettings/gsettings_test.go (99%) rename {pkg/osquery => ee}/tables/gsettings/metadata.go (99%) rename {pkg/osquery => ee}/tables/gsettings/testdata/blank.txt (100%) rename {pkg/osquery => ee}/tables/gsettings/testdata/listkeys.txt (100%) rename {pkg/osquery => ee}/tables/gsettings/testdata/seph-athena.txt (100%) rename {pkg/osquery => ee}/tables/gsettings/testdata/simple.txt (100%) rename {pkg/osquery => ee}/tables/ioreg/ioreg.go (96%) rename {pkg/osquery => ee}/tables/launcher_db/launcher_db.go (100%) rename {pkg/osquery => ee}/tables/launcher_db/launcher_db_test.go (100%) rename {pkg/osquery => ee}/tables/macos_software_update/SUScanController.h (100%) rename {pkg/osquery => ee}/tables/macos_software_update/SUSharedPrefs.h (100%) rename {pkg/osquery => ee}/tables/macos_software_update/SUUpdateProduct.h (100%) rename {pkg/osquery => ee}/tables/macos_software_update/available_products_table.go (96%) rename {pkg/osquery => ee}/tables/macos_software_update/recommended_updates_table.go (94%) rename {pkg/osquery => ee}/tables/macos_software_update/recommended_updates_table_test.go (88%) rename {pkg/osquery => ee}/tables/macos_software_update/software_update_table.go (100%) rename {pkg/osquery => ee}/tables/macos_software_update/sus.h (100%) rename {pkg/osquery => ee}/tables/macos_software_update/sus.m (100%) rename {pkg/osquery => ee}/tables/mdmclient/mdmclient.go (98%) rename {pkg/osquery => ee}/tables/mdmclient/mdmclient_test.go (100%) rename {pkg/osquery => ee}/tables/mdmclient/testdata/QueryDeviceInformation.output (100%) rename {pkg/osquery => ee}/tables/mdmclient/testdata/QueryDeviceInformation_NullAgentResponse.output (100%) rename {pkg/osquery => ee}/tables/mdmclient/testdata/QueryDeviceInformation_WithHeader.output (100%) rename {pkg/osquery => ee}/tables/mdmclient/testdata/QueryInstalledProfiles.output (100%) rename {pkg/osquery => ee}/tables/mdmclient/testdata/QuerySecurityInfo.output (100%) rename {pkg/osquery => ee}/tables/munki/munki.go (100%) rename {pkg/osquery => ee}/tables/munki/munki_test.go (96%) rename {pkg/osquery => ee}/tables/munki/testdata/ManagedInstallReport.plist (100%) rename {pkg/osquery => ee}/tables/osquery_instance_history/osquery_instance_history.go (100%) rename {pkg/osquery => ee}/tables/osquery_user_exec_table/table.go (97%) rename {pkg/osquery => ee}/tables/profiles/profiles.go (97%) rename {pkg/osquery => ee}/tables/pwpolicy/pwpolicy.go (95%) rename {pkg/osquery => ee}/tables/pwpolicy/pwpolicy_test.go (96%) rename {pkg/osquery => ee}/tables/pwpolicy/testdata/empty.output (100%) rename {pkg/osquery => ee}/tables/pwpolicy/testdata/test1.output (100%) rename {pkg/osquery => ee}/tables/secedit/secedit.go (96%) rename {pkg/osquery => ee}/tables/secureboot/table.go (100%) rename {pkg/osquery => ee}/tables/systemprofiler/systemprofiler.go (99%) rename {pkg/osquery => ee}/tables/tablehelpers/exec.go (100%) rename {pkg/osquery => ee}/tables/tablehelpers/exec_osquery_launchctl.go (100%) rename {pkg/osquery => ee}/tables/tablehelpers/exec_test.go (100%) rename {pkg/osquery => ee}/tables/tablehelpers/getconstraints.go (100%) rename {pkg/osquery => ee}/tables/tablehelpers/getconstraints_test.go (100%) rename {pkg/osquery => ee}/tables/tablehelpers/mocks.go (100%) rename {pkg/osquery => ee}/tables/tablehelpers/parser.go (100%) rename {pkg/osquery => ee}/tables/tablehelpers/stanza_scanner.go (100%) rename {pkg/osquery => ee}/tables/tdebug/doc.go (100%) rename {pkg/osquery => ee}/tables/tdebug/gc.go (92%) rename {pkg/osquery => ee}/tables/tufinfo/release_version.go (100%) rename {pkg/osquery => ee}/tables/tufinfo/release_version_test.go (100%) rename {pkg/osquery => ee}/tables/wifi_networks/assets/get-networks.ps1 (100%) rename {pkg/osquery => ee}/tables/wifi_networks/assets/nativewifi.cs (100%) rename {pkg/osquery => ee}/tables/wifi_networks/wifi_networks.go (98%) rename {pkg/osquery => ee}/tables/windowsupdatetable/windowsupdate.go (97%) rename {pkg/osquery => ee}/tables/windowsupdatetable/windowsupdate_test.go (93%) rename {pkg/osquery => ee}/tables/wmitable/wmitable.go (97%) rename {pkg/osquery => ee}/tables/wmitable/wmitable_test.go (98%) rename {pkg/osquery => ee}/tables/xfconf/parser.go (100%) rename {pkg/osquery => ee}/tables/xfconf/parser_test.go (100%) rename {pkg/osquery => ee}/tables/xfconf/testdata/thunar-volman.xml (100%) rename {pkg/osquery => ee}/tables/xfconf/testdata/xfce4-power-manager-default.xml (100%) rename {pkg/osquery => ee}/tables/xfconf/testdata/xfce4-power-manager.xml (100%) rename {pkg/osquery => ee}/tables/xfconf/testdata/xfce4-session.xml (100%) rename {pkg/osquery => ee}/tables/xfconf/xfconf.go (98%) rename {pkg/osquery => ee}/tables/xfconf/xfconf_test.go (100%) rename {pkg/osquery => ee}/tables/xrdb/testdata/blank.txt (100%) rename {pkg/osquery => ee}/tables/xrdb/testdata/example_query.sql (100%) rename {pkg/osquery => ee}/tables/xrdb/testdata/results.txt (100%) rename {pkg/osquery => ee}/tables/xrdb/xrdb.go (98%) rename {pkg/osquery => ee}/tables/xrdb/xrdb_test.go (97%) rename {pkg/osquery => ee}/tables/zfs/tables.go (97%) rename {pkg/osquery => ee}/tables/zfs/tables_test.go (100%) rename {pkg/osquery => ee}/tables/zfs/testdata/zfs.txt (100%) rename {pkg/osquery => ee}/tables/zfs/testdata/zpool.txt (100%) diff --git a/Makefile b/Makefile index a0f04e1ff..472eee6dd 100644 --- a/Makefile +++ b/Makefile @@ -231,7 +231,7 @@ deps: deps-go generate .PHONY: generate generate: deps-go - go generate ./pkg/packagekit/... ./pkg/packaging/... ./pkg/osquery/tables/... ./pkg/augeas/... + go generate ./pkg/packagekit/... ./pkg/packaging/... ./ee/tables/... ./pkg/augeas/... go run cmd/make/make.go -targets=generate-tuf .PHONY: proto diff --git a/pkg/osquery/tables/airport/mocks/executor.go b/ee/tables/airport/mocks/executor.go similarity index 100% rename from pkg/osquery/tables/airport/mocks/executor.go rename to ee/tables/airport/mocks/executor.go diff --git a/pkg/osquery/tables/airport/table_darwin.go b/ee/tables/airport/table_darwin.go similarity index 98% rename from pkg/osquery/tables/airport/table_darwin.go rename to ee/tables/airport/table_darwin.go index baf69d337..ce208eb9b 100644 --- a/pkg/osquery/tables/airport/table_darwin.go +++ b/ee/tables/airport/table_darwin.go @@ -15,8 +15,8 @@ import ( "github.com/go-kit/kit/log/level" "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/ee/dataflatten" - "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/dataflattentable" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/pkg/osquery/tables/airport/table_darwin_test.go b/ee/tables/airport/table_darwin_test.go similarity index 98% rename from pkg/osquery/tables/airport/table_darwin_test.go rename to ee/tables/airport/table_darwin_test.go index 22aace190..51f475ab8 100644 --- a/pkg/osquery/tables/airport/table_darwin_test.go +++ b/ee/tables/airport/table_darwin_test.go @@ -12,8 +12,8 @@ import ( "testing" "github.com/go-kit/kit/log" - "github.com/kolide/launcher/pkg/osquery/tables/airport/mocks" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/airport/mocks" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" "github.com/stretchr/testify/assert" diff --git a/pkg/osquery/tables/airport/testdata/getinfo.input.txt b/ee/tables/airport/testdata/getinfo.input.txt similarity index 100% rename from pkg/osquery/tables/airport/testdata/getinfo.input.txt rename to ee/tables/airport/testdata/getinfo.input.txt diff --git a/pkg/osquery/tables/airport/testdata/getinfo.output.json b/ee/tables/airport/testdata/getinfo.output.json similarity index 100% rename from pkg/osquery/tables/airport/testdata/getinfo.output.json rename to ee/tables/airport/testdata/getinfo.output.json diff --git a/pkg/osquery/tables/airport/testdata/getinfo_and_scan.output.json b/ee/tables/airport/testdata/getinfo_and_scan.output.json similarity index 100% rename from pkg/osquery/tables/airport/testdata/getinfo_and_scan.output.json rename to ee/tables/airport/testdata/getinfo_and_scan.output.json diff --git a/pkg/osquery/tables/airport/testdata/getinfo_and_scan_with_query.output.json b/ee/tables/airport/testdata/getinfo_and_scan_with_query.output.json similarity index 100% rename from pkg/osquery/tables/airport/testdata/getinfo_and_scan_with_query.output.json rename to ee/tables/airport/testdata/getinfo_and_scan_with_query.output.json diff --git a/pkg/osquery/tables/airport/testdata/scan.input.txt b/ee/tables/airport/testdata/scan.input.txt similarity index 100% rename from pkg/osquery/tables/airport/testdata/scan.input.txt rename to ee/tables/airport/testdata/scan.input.txt diff --git a/pkg/osquery/tables/airport/testdata/scan.output.json b/ee/tables/airport/testdata/scan.output.json similarity index 100% rename from pkg/osquery/tables/airport/testdata/scan.output.json rename to ee/tables/airport/testdata/scan.output.json diff --git a/pkg/osquery/tables/airport/testdata/scan_with_query.output.json b/ee/tables/airport/testdata/scan_with_query.output.json similarity index 100% rename from pkg/osquery/tables/airport/testdata/scan_with_query.output.json rename to ee/tables/airport/testdata/scan_with_query.output.json diff --git a/pkg/osquery/tables/app-icons/app_icons_darwin.go b/ee/tables/app-icons/app_icons_darwin.go similarity index 100% rename from pkg/osquery/tables/app-icons/app_icons_darwin.go rename to ee/tables/app-icons/app_icons_darwin.go diff --git a/pkg/osquery/tables/apple_silicon_security_policy/parser.go b/ee/tables/apple_silicon_security_policy/parser.go similarity index 100% rename from pkg/osquery/tables/apple_silicon_security_policy/parser.go rename to ee/tables/apple_silicon_security_policy/parser.go diff --git a/pkg/osquery/tables/apple_silicon_security_policy/table.go b/ee/tables/apple_silicon_security_policy/table.go similarity index 92% rename from pkg/osquery/tables/apple_silicon_security_policy/table.go rename to ee/tables/apple_silicon_security_policy/table.go index a83bc185f..1858f68cc 100644 --- a/pkg/osquery/tables/apple_silicon_security_policy/table.go +++ b/ee/tables/apple_silicon_security_policy/table.go @@ -12,8 +12,8 @@ import ( "github.com/go-kit/kit/log/level" "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/ee/dataflatten" - "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/dataflattentable" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/pkg/osquery/tables/apple_silicon_security_policy/table_test.go b/ee/tables/apple_silicon_security_policy/table_test.go similarity index 100% rename from pkg/osquery/tables/apple_silicon_security_policy/table_test.go rename to ee/tables/apple_silicon_security_policy/table_test.go diff --git a/pkg/osquery/tables/apple_silicon_security_policy/test-data/bputil-failed-second-vol.txt b/ee/tables/apple_silicon_security_policy/test-data/bputil-failed-second-vol.txt similarity index 100% rename from pkg/osquery/tables/apple_silicon_security_policy/test-data/bputil-failed-second-vol.txt rename to ee/tables/apple_silicon_security_policy/test-data/bputil-failed-second-vol.txt diff --git a/pkg/osquery/tables/apple_silicon_security_policy/test-data/bputil-multiple-boot-vol.txt b/ee/tables/apple_silicon_security_policy/test-data/bputil-multiple-boot-vol.txt similarity index 100% rename from pkg/osquery/tables/apple_silicon_security_policy/test-data/bputil-multiple-boot-vol.txt rename to ee/tables/apple_silicon_security_policy/test-data/bputil-multiple-boot-vol.txt diff --git a/pkg/osquery/tables/apple_silicon_security_policy/test-data/bputil-one-boot-vol.txt b/ee/tables/apple_silicon_security_policy/test-data/bputil-one-boot-vol.txt similarity index 100% rename from pkg/osquery/tables/apple_silicon_security_policy/test-data/bputil-one-boot-vol.txt rename to ee/tables/apple_silicon_security_policy/test-data/bputil-one-boot-vol.txt diff --git a/pkg/osquery/tables/crowdstrike/falcon_kernel_check/table.go b/ee/tables/crowdstrike/falcon_kernel_check/table.go similarity index 97% rename from pkg/osquery/tables/crowdstrike/falcon_kernel_check/table.go rename to ee/tables/crowdstrike/falcon_kernel_check/table.go index 79b60d3a9..ac10a7fa4 100644 --- a/pkg/osquery/tables/crowdstrike/falcon_kernel_check/table.go +++ b/ee/tables/crowdstrike/falcon_kernel_check/table.go @@ -11,7 +11,7 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" "github.com/kolide/launcher/pkg/allowedcmd" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/pkg/osquery/tables/crowdstrike/falcon_kernel_check/table_test.go b/ee/tables/crowdstrike/falcon_kernel_check/table_test.go similarity index 100% rename from pkg/osquery/tables/crowdstrike/falcon_kernel_check/table_test.go rename to ee/tables/crowdstrike/falcon_kernel_check/table_test.go diff --git a/pkg/osquery/tables/crowdstrike/falconctl/parser.go b/ee/tables/crowdstrike/falconctl/parser.go similarity index 100% rename from pkg/osquery/tables/crowdstrike/falconctl/parser.go rename to ee/tables/crowdstrike/falconctl/parser.go diff --git a/pkg/osquery/tables/crowdstrike/falconctl/parser_test.go b/ee/tables/crowdstrike/falconctl/parser_test.go similarity index 100% rename from pkg/osquery/tables/crowdstrike/falconctl/parser_test.go rename to ee/tables/crowdstrike/falconctl/parser_test.go diff --git a/pkg/osquery/tables/crowdstrike/falconctl/table.go b/ee/tables/crowdstrike/falconctl/table.go similarity index 96% rename from pkg/osquery/tables/crowdstrike/falconctl/table.go rename to ee/tables/crowdstrike/falconctl/table.go index b6855a1c5..280db69e8 100644 --- a/pkg/osquery/tables/crowdstrike/falconctl/table.go +++ b/ee/tables/crowdstrike/falconctl/table.go @@ -13,8 +13,8 @@ import ( "github.com/go-kit/kit/log/level" "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/ee/dataflatten" - "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/dataflattentable" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/pkg/osquery/tables/crowdstrike/falconctl/table_test.go b/ee/tables/crowdstrike/falconctl/table_test.go similarity index 97% rename from pkg/osquery/tables/crowdstrike/falconctl/table_test.go rename to ee/tables/crowdstrike/falconctl/table_test.go index 81c6b7421..bb0486f06 100644 --- a/pkg/osquery/tables/crowdstrike/falconctl/table_test.go +++ b/ee/tables/crowdstrike/falconctl/table_test.go @@ -11,7 +11,7 @@ import ( "github.com/go-kit/kit/log" "github.com/kolide/launcher/pkg/allowedcmd" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/stretchr/testify/require" ) diff --git a/pkg/osquery/tables/crowdstrike/falconctl/test-data/cid-error.txt b/ee/tables/crowdstrike/falconctl/test-data/cid-error.txt similarity index 100% rename from pkg/osquery/tables/crowdstrike/falconctl/test-data/cid-error.txt rename to ee/tables/crowdstrike/falconctl/test-data/cid-error.txt diff --git a/pkg/osquery/tables/crowdstrike/falconctl/test-data/options.txt b/ee/tables/crowdstrike/falconctl/test-data/options.txt similarity index 100% rename from pkg/osquery/tables/crowdstrike/falconctl/test-data/options.txt rename to ee/tables/crowdstrike/falconctl/test-data/options.txt diff --git a/pkg/osquery/tables/cryptoinfotable/table.go b/ee/tables/cryptoinfotable/table.go similarity index 95% rename from pkg/osquery/tables/cryptoinfotable/table.go rename to ee/tables/cryptoinfotable/table.go index cb2448127..55a2f4ff9 100644 --- a/pkg/osquery/tables/cryptoinfotable/table.go +++ b/ee/tables/cryptoinfotable/table.go @@ -13,8 +13,8 @@ import ( "github.com/go-kit/kit/log/level" "github.com/kolide/launcher/pkg/cryptoinfo" "github.com/kolide/launcher/ee/dataflatten" - "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/dataflattentable" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/pkg/osquery/tables/cryptsetup/parser.go b/ee/tables/cryptsetup/parser.go similarity index 100% rename from pkg/osquery/tables/cryptsetup/parser.go rename to ee/tables/cryptsetup/parser.go diff --git a/pkg/osquery/tables/cryptsetup/parser_test.go b/ee/tables/cryptsetup/parser_test.go similarity index 100% rename from pkg/osquery/tables/cryptsetup/parser_test.go rename to ee/tables/cryptsetup/parser_test.go diff --git a/pkg/osquery/tables/cryptsetup/table.go b/ee/tables/cryptsetup/table.go similarity index 94% rename from pkg/osquery/tables/cryptsetup/table.go rename to ee/tables/cryptsetup/table.go index f34909064..24123c6fb 100644 --- a/pkg/osquery/tables/cryptsetup/table.go +++ b/ee/tables/cryptsetup/table.go @@ -12,8 +12,8 @@ import ( "github.com/go-kit/kit/log/level" "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/ee/dataflatten" - "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/dataflattentable" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/pkg/osquery/tables/cryptsetup/testdata/status-active-luks1.txt b/ee/tables/cryptsetup/testdata/status-active-luks1.txt similarity index 100% rename from pkg/osquery/tables/cryptsetup/testdata/status-active-luks1.txt rename to ee/tables/cryptsetup/testdata/status-active-luks1.txt diff --git a/pkg/osquery/tables/cryptsetup/testdata/status-active-luks2.txt b/ee/tables/cryptsetup/testdata/status-active-luks2.txt similarity index 100% rename from pkg/osquery/tables/cryptsetup/testdata/status-active-luks2.txt rename to ee/tables/cryptsetup/testdata/status-active-luks2.txt diff --git a/pkg/osquery/tables/cryptsetup/testdata/status-active-mounted.txt b/ee/tables/cryptsetup/testdata/status-active-mounted.txt similarity index 100% rename from pkg/osquery/tables/cryptsetup/testdata/status-active-mounted.txt rename to ee/tables/cryptsetup/testdata/status-active-mounted.txt diff --git a/pkg/osquery/tables/cryptsetup/testdata/status-active-umounted.txt b/ee/tables/cryptsetup/testdata/status-active-umounted.txt similarity index 100% rename from pkg/osquery/tables/cryptsetup/testdata/status-active-umounted.txt rename to ee/tables/cryptsetup/testdata/status-active-umounted.txt diff --git a/pkg/osquery/tables/cryptsetup/testdata/status-active.txt b/ee/tables/cryptsetup/testdata/status-active.txt similarity index 100% rename from pkg/osquery/tables/cryptsetup/testdata/status-active.txt rename to ee/tables/cryptsetup/testdata/status-active.txt diff --git a/pkg/osquery/tables/cryptsetup/testdata/status-error.txt b/ee/tables/cryptsetup/testdata/status-error.txt similarity index 100% rename from pkg/osquery/tables/cryptsetup/testdata/status-error.txt rename to ee/tables/cryptsetup/testdata/status-error.txt diff --git a/pkg/osquery/tables/cryptsetup/testdata/status-inactive.txt b/ee/tables/cryptsetup/testdata/status-inactive.txt similarity index 100% rename from pkg/osquery/tables/cryptsetup/testdata/status-inactive.txt rename to ee/tables/cryptsetup/testdata/status-inactive.txt diff --git a/pkg/osquery/tables/cryptsetup/testdata/status-unactive.txt b/ee/tables/cryptsetup/testdata/status-unactive.txt similarity index 100% rename from pkg/osquery/tables/cryptsetup/testdata/status-unactive.txt rename to ee/tables/cryptsetup/testdata/status-unactive.txt diff --git a/pkg/osquery/tables/dataflattentable/exec.go b/ee/tables/dataflattentable/exec.go similarity index 98% rename from pkg/osquery/tables/dataflattentable/exec.go rename to ee/tables/dataflattentable/exec.go index f06554b23..1ceee099e 100644 --- a/pkg/osquery/tables/dataflattentable/exec.go +++ b/ee/tables/dataflattentable/exec.go @@ -13,7 +13,7 @@ import ( "github.com/go-kit/kit/log/level" "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/ee/dataflatten" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" "github.com/pkg/errors" ) diff --git a/pkg/osquery/tables/dataflattentable/exec_and_parse.go b/ee/tables/dataflattentable/exec_and_parse.go similarity index 97% rename from pkg/osquery/tables/dataflattentable/exec_and_parse.go rename to ee/tables/dataflattentable/exec_and_parse.go index 2926561a7..1832936ea 100644 --- a/pkg/osquery/tables/dataflattentable/exec_and_parse.go +++ b/ee/tables/dataflattentable/exec_and_parse.go @@ -9,7 +9,7 @@ import ( "github.com/go-kit/kit/log/level" "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/ee/dataflatten" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/kolide/launcher/pkg/traces" "github.com/osquery/osquery-go/plugin/table" "github.com/pkg/errors" diff --git a/pkg/osquery/tables/dataflattentable/flattener_from_parser.go b/ee/tables/dataflattentable/flattener_from_parser.go similarity index 100% rename from pkg/osquery/tables/dataflattentable/flattener_from_parser.go rename to ee/tables/dataflattentable/flattener_from_parser.go diff --git a/pkg/osquery/tables/dataflattentable/flattener_from_parser_test.go b/ee/tables/dataflattentable/flattener_from_parser_test.go similarity index 94% rename from pkg/osquery/tables/dataflattentable/flattener_from_parser_test.go rename to ee/tables/dataflattentable/flattener_from_parser_test.go index 185db884e..2c8cef14b 100644 --- a/pkg/osquery/tables/dataflattentable/flattener_from_parser_test.go +++ b/ee/tables/dataflattentable/flattener_from_parser_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/kolide/launcher/pkg/osquery/tables/execparsers/dsregcmd" + "github.com/kolide/launcher/ee/tables/execparsers/dsregcmd" "github.com/stretchr/testify/require" ) diff --git a/pkg/osquery/tables/dataflattentable/helpers.go b/ee/tables/dataflattentable/helpers.go similarity index 100% rename from pkg/osquery/tables/dataflattentable/helpers.go rename to ee/tables/dataflattentable/helpers.go diff --git a/pkg/osquery/tables/dataflattentable/plist_test.go b/ee/tables/dataflattentable/plist_test.go similarity index 97% rename from pkg/osquery/tables/dataflattentable/plist_test.go rename to ee/tables/dataflattentable/plist_test.go index 327c9d7ba..b056d2fab 100644 --- a/pkg/osquery/tables/dataflattentable/plist_test.go +++ b/ee/tables/dataflattentable/plist_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/kolide/launcher/ee/dataflatten" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/stretchr/testify/require" ) diff --git a/pkg/osquery/tables/dataflattentable/tables.go b/ee/tables/dataflattentable/tables.go similarity index 98% rename from pkg/osquery/tables/dataflattentable/tables.go rename to ee/tables/dataflattentable/tables.go index 0672a8f3a..43c47084a 100644 --- a/pkg/osquery/tables/dataflattentable/tables.go +++ b/ee/tables/dataflattentable/tables.go @@ -10,7 +10,7 @@ import ( "github.com/go-kit/kit/log/level" "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/ee/dataflatten" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/osquery/osquery-go" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/pkg/osquery/tables/dataflattentable/tables_test.go b/ee/tables/dataflattentable/tables_test.go similarity index 98% rename from pkg/osquery/tables/dataflattentable/tables_test.go rename to ee/tables/dataflattentable/tables_test.go index e28bfb3dd..d3d4f4671 100644 --- a/pkg/osquery/tables/dataflattentable/tables_test.go +++ b/ee/tables/dataflattentable/tables_test.go @@ -10,7 +10,7 @@ import ( "github.com/go-kit/kit/log" "github.com/kolide/launcher/ee/dataflatten" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/stretchr/testify/require" ) diff --git a/pkg/osquery/tables/dataflattentable/testdata/NetworkInterfaces.plist b/ee/tables/dataflattentable/testdata/NetworkInterfaces.plist similarity index 100% rename from pkg/osquery/tables/dataflattentable/testdata/NetworkInterfaces.plist rename to ee/tables/dataflattentable/testdata/NetworkInterfaces.plist diff --git a/pkg/osquery/tables/dataflattentable/testdata/animals.json b/ee/tables/dataflattentable/testdata/animals.json similarity index 100% rename from pkg/osquery/tables/dataflattentable/testdata/animals.json rename to ee/tables/dataflattentable/testdata/animals.json diff --git a/pkg/osquery/tables/dataflattentable/testdata/animals.plist b/ee/tables/dataflattentable/testdata/animals.plist similarity index 100% rename from pkg/osquery/tables/dataflattentable/testdata/animals.plist rename to ee/tables/dataflattentable/testdata/animals.plist diff --git a/pkg/osquery/tables/dataflattentable/testdata/animals.xml b/ee/tables/dataflattentable/testdata/animals.xml similarity index 100% rename from pkg/osquery/tables/dataflattentable/testdata/animals.xml rename to ee/tables/dataflattentable/testdata/animals.xml diff --git a/pkg/osquery/tables/dataflattentable/testdata/com.apple.launchservices.secure.plist b/ee/tables/dataflattentable/testdata/com.apple.launchservices.secure.plist similarity index 100% rename from pkg/osquery/tables/dataflattentable/testdata/com.apple.launchservices.secure.plist rename to ee/tables/dataflattentable/testdata/com.apple.launchservices.secure.plist diff --git a/pkg/osquery/tables/dataflattentable/testdata/secdata.ini b/ee/tables/dataflattentable/testdata/secdata.ini similarity index 100% rename from pkg/osquery/tables/dataflattentable/testdata/secdata.ini rename to ee/tables/dataflattentable/testdata/secdata.ini diff --git a/pkg/osquery/tables/dataflattentable/testdata/simple.xml b/ee/tables/dataflattentable/testdata/simple.xml similarity index 100% rename from pkg/osquery/tables/dataflattentable/testdata/simple.xml rename to ee/tables/dataflattentable/testdata/simple.xml diff --git a/pkg/osquery/tables/desktopprocs/desktopprocs.go b/ee/tables/desktopprocs/desktopprocs.go similarity index 100% rename from pkg/osquery/tables/desktopprocs/desktopprocs.go rename to ee/tables/desktopprocs/desktopprocs.go diff --git a/pkg/osquery/tables/dev_table_tooling/commands_darwin.go b/ee/tables/dev_table_tooling/commands_darwin.go similarity index 100% rename from pkg/osquery/tables/dev_table_tooling/commands_darwin.go rename to ee/tables/dev_table_tooling/commands_darwin.go diff --git a/pkg/osquery/tables/dev_table_tooling/commands_linux.go b/ee/tables/dev_table_tooling/commands_linux.go similarity index 100% rename from pkg/osquery/tables/dev_table_tooling/commands_linux.go rename to ee/tables/dev_table_tooling/commands_linux.go diff --git a/pkg/osquery/tables/dev_table_tooling/commands_windows.go b/ee/tables/dev_table_tooling/commands_windows.go similarity index 100% rename from pkg/osquery/tables/dev_table_tooling/commands_windows.go rename to ee/tables/dev_table_tooling/commands_windows.go diff --git a/pkg/osquery/tables/dev_table_tooling/table.go b/ee/tables/dev_table_tooling/table.go similarity index 96% rename from pkg/osquery/tables/dev_table_tooling/table.go rename to ee/tables/dev_table_tooling/table.go index 5d9028c84..30e94a274 100644 --- a/pkg/osquery/tables/dev_table_tooling/table.go +++ b/ee/tables/dev_table_tooling/table.go @@ -8,7 +8,7 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" "github.com/kolide/launcher/pkg/allowedcmd" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/pkg/osquery/tables/dev_table_tooling/table_test.go b/ee/tables/dev_table_tooling/table_test.go similarity index 96% rename from pkg/osquery/tables/dev_table_tooling/table_test.go rename to ee/tables/dev_table_tooling/table_test.go index 4c57402c1..9c3771906 100644 --- a/pkg/osquery/tables/dev_table_tooling/table_test.go +++ b/ee/tables/dev_table_tooling/table_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/go-kit/kit/log" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/stretchr/testify/assert" ) diff --git a/pkg/osquery/tables/dsim_default_associations/dsim_default_associations.go b/ee/tables/dsim_default_associations/dsim_default_associations.go similarity index 95% rename from pkg/osquery/tables/dsim_default_associations/dsim_default_associations.go rename to ee/tables/dsim_default_associations/dsim_default_associations.go index ea05c7d90..6ed91c166 100644 --- a/pkg/osquery/tables/dsim_default_associations/dsim_default_associations.go +++ b/ee/tables/dsim_default_associations/dsim_default_associations.go @@ -17,8 +17,8 @@ import ( "github.com/kolide/launcher/pkg/agent" "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/ee/dataflatten" - "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/dataflattentable" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/pkg/osquery/tables/execparsers/apt/apt.go b/ee/tables/execparsers/apt/apt.go similarity index 100% rename from pkg/osquery/tables/execparsers/apt/apt.go rename to ee/tables/execparsers/apt/apt.go diff --git a/pkg/osquery/tables/execparsers/apt/parser.go b/ee/tables/execparsers/apt/parser.go similarity index 100% rename from pkg/osquery/tables/execparsers/apt/parser.go rename to ee/tables/execparsers/apt/parser.go diff --git a/pkg/osquery/tables/execparsers/apt/parser_test.go b/ee/tables/execparsers/apt/parser_test.go similarity index 100% rename from pkg/osquery/tables/execparsers/apt/parser_test.go rename to ee/tables/execparsers/apt/parser_test.go diff --git a/pkg/osquery/tables/execparsers/apt/test-data/apt_upgradeable.txt b/ee/tables/execparsers/apt/test-data/apt_upgradeable.txt similarity index 100% rename from pkg/osquery/tables/execparsers/apt/test-data/apt_upgradeable.txt rename to ee/tables/execparsers/apt/test-data/apt_upgradeable.txt diff --git a/pkg/osquery/tables/execparsers/dnf/dnf.go b/ee/tables/execparsers/dnf/dnf.go similarity index 100% rename from pkg/osquery/tables/execparsers/dnf/dnf.go rename to ee/tables/execparsers/dnf/dnf.go diff --git a/pkg/osquery/tables/execparsers/dnf/parser.go b/ee/tables/execparsers/dnf/parser.go similarity index 100% rename from pkg/osquery/tables/execparsers/dnf/parser.go rename to ee/tables/execparsers/dnf/parser.go diff --git a/pkg/osquery/tables/execparsers/dnf/parser_test.go b/ee/tables/execparsers/dnf/parser_test.go similarity index 100% rename from pkg/osquery/tables/execparsers/dnf/parser_test.go rename to ee/tables/execparsers/dnf/parser_test.go diff --git a/pkg/osquery/tables/execparsers/dnf/test-data/dnf_upgradeable.txt b/ee/tables/execparsers/dnf/test-data/dnf_upgradeable.txt similarity index 100% rename from pkg/osquery/tables/execparsers/dnf/test-data/dnf_upgradeable.txt rename to ee/tables/execparsers/dnf/test-data/dnf_upgradeable.txt diff --git a/pkg/osquery/tables/execparsers/dpkg/dpkg.go b/ee/tables/execparsers/dpkg/dpkg.go similarity index 100% rename from pkg/osquery/tables/execparsers/dpkg/dpkg.go rename to ee/tables/execparsers/dpkg/dpkg.go diff --git a/pkg/osquery/tables/execparsers/dpkg/parser.go b/ee/tables/execparsers/dpkg/parser.go similarity index 100% rename from pkg/osquery/tables/execparsers/dpkg/parser.go rename to ee/tables/execparsers/dpkg/parser.go diff --git a/pkg/osquery/tables/execparsers/dpkg/parser_test.go b/ee/tables/execparsers/dpkg/parser_test.go similarity index 100% rename from pkg/osquery/tables/execparsers/dpkg/parser_test.go rename to ee/tables/execparsers/dpkg/parser_test.go diff --git a/pkg/osquery/tables/execparsers/dpkg/test-data/dpkg_info.txt b/ee/tables/execparsers/dpkg/test-data/dpkg_info.txt similarity index 100% rename from pkg/osquery/tables/execparsers/dpkg/test-data/dpkg_info.txt rename to ee/tables/execparsers/dpkg/test-data/dpkg_info.txt diff --git a/pkg/osquery/tables/execparsers/dsregcmd/dsregcmd.go b/ee/tables/execparsers/dsregcmd/dsregcmd.go similarity index 100% rename from pkg/osquery/tables/execparsers/dsregcmd/dsregcmd.go rename to ee/tables/execparsers/dsregcmd/dsregcmd.go diff --git a/pkg/osquery/tables/execparsers/dsregcmd/parse.go b/ee/tables/execparsers/dsregcmd/parse.go similarity index 100% rename from pkg/osquery/tables/execparsers/dsregcmd/parse.go rename to ee/tables/execparsers/dsregcmd/parse.go diff --git a/pkg/osquery/tables/execparsers/dsregcmd/parse_test.go b/ee/tables/execparsers/dsregcmd/parse_test.go similarity index 100% rename from pkg/osquery/tables/execparsers/dsregcmd/parse_test.go rename to ee/tables/execparsers/dsregcmd/parse_test.go diff --git a/pkg/osquery/tables/execparsers/dsregcmd/test-data/error_header_missing_line3.txt b/ee/tables/execparsers/dsregcmd/test-data/error_header_missing_line3.txt similarity index 100% rename from pkg/osquery/tables/execparsers/dsregcmd/test-data/error_header_missing_line3.txt rename to ee/tables/execparsers/dsregcmd/test-data/error_header_missing_line3.txt diff --git a/pkg/osquery/tables/execparsers/dsregcmd/test-data/error_lines_before_header.txt b/ee/tables/execparsers/dsregcmd/test-data/error_lines_before_header.txt similarity index 100% rename from pkg/osquery/tables/execparsers/dsregcmd/test-data/error_lines_before_header.txt rename to ee/tables/execparsers/dsregcmd/test-data/error_lines_before_header.txt diff --git a/pkg/osquery/tables/execparsers/dsregcmd/test-data/error_no_section_title.txt b/ee/tables/execparsers/dsregcmd/test-data/error_no_section_title.txt similarity index 100% rename from pkg/osquery/tables/execparsers/dsregcmd/test-data/error_no_section_title.txt rename to ee/tables/execparsers/dsregcmd/test-data/error_no_section_title.txt diff --git a/pkg/osquery/tables/execparsers/dsregcmd/test-data/not_configured.expected.json b/ee/tables/execparsers/dsregcmd/test-data/not_configured.expected.json similarity index 100% rename from pkg/osquery/tables/execparsers/dsregcmd/test-data/not_configured.expected.json rename to ee/tables/execparsers/dsregcmd/test-data/not_configured.expected.json diff --git a/pkg/osquery/tables/execparsers/dsregcmd/test-data/not_configured.txt b/ee/tables/execparsers/dsregcmd/test-data/not_configured.txt similarity index 100% rename from pkg/osquery/tables/execparsers/dsregcmd/test-data/not_configured.txt rename to ee/tables/execparsers/dsregcmd/test-data/not_configured.txt diff --git a/pkg/osquery/tables/execparsers/pacman/group/pacman_group.go b/ee/tables/execparsers/pacman/group/pacman_group.go similarity index 100% rename from pkg/osquery/tables/execparsers/pacman/group/pacman_group.go rename to ee/tables/execparsers/pacman/group/pacman_group.go diff --git a/pkg/osquery/tables/execparsers/pacman/group/parser.go b/ee/tables/execparsers/pacman/group/parser.go similarity index 100% rename from pkg/osquery/tables/execparsers/pacman/group/parser.go rename to ee/tables/execparsers/pacman/group/parser.go diff --git a/pkg/osquery/tables/execparsers/pacman/group/parser_test.go b/ee/tables/execparsers/pacman/group/parser_test.go similarity index 100% rename from pkg/osquery/tables/execparsers/pacman/group/parser_test.go rename to ee/tables/execparsers/pacman/group/parser_test.go diff --git a/pkg/osquery/tables/execparsers/pacman/group/test-data/pacman_group.txt b/ee/tables/execparsers/pacman/group/test-data/pacman_group.txt similarity index 100% rename from pkg/osquery/tables/execparsers/pacman/group/test-data/pacman_group.txt rename to ee/tables/execparsers/pacman/group/test-data/pacman_group.txt diff --git a/pkg/osquery/tables/execparsers/pacman/info/pacman_info.go b/ee/tables/execparsers/pacman/info/pacman_info.go similarity index 100% rename from pkg/osquery/tables/execparsers/pacman/info/pacman_info.go rename to ee/tables/execparsers/pacman/info/pacman_info.go diff --git a/pkg/osquery/tables/execparsers/pacman/info/parser.go b/ee/tables/execparsers/pacman/info/parser.go similarity index 100% rename from pkg/osquery/tables/execparsers/pacman/info/parser.go rename to ee/tables/execparsers/pacman/info/parser.go diff --git a/pkg/osquery/tables/execparsers/pacman/info/parser_test.go b/ee/tables/execparsers/pacman/info/parser_test.go similarity index 100% rename from pkg/osquery/tables/execparsers/pacman/info/parser_test.go rename to ee/tables/execparsers/pacman/info/parser_test.go diff --git a/pkg/osquery/tables/execparsers/pacman/info/test-data/pacman_info.txt b/ee/tables/execparsers/pacman/info/test-data/pacman_info.txt similarity index 100% rename from pkg/osquery/tables/execparsers/pacman/info/test-data/pacman_info.txt rename to ee/tables/execparsers/pacman/info/test-data/pacman_info.txt diff --git a/pkg/osquery/tables/execparsers/pacman/upgradeable/pacman_upgradeable.go b/ee/tables/execparsers/pacman/upgradeable/pacman_upgradeable.go similarity index 100% rename from pkg/osquery/tables/execparsers/pacman/upgradeable/pacman_upgradeable.go rename to ee/tables/execparsers/pacman/upgradeable/pacman_upgradeable.go diff --git a/pkg/osquery/tables/execparsers/pacman/upgradeable/parser.go b/ee/tables/execparsers/pacman/upgradeable/parser.go similarity index 100% rename from pkg/osquery/tables/execparsers/pacman/upgradeable/parser.go rename to ee/tables/execparsers/pacman/upgradeable/parser.go diff --git a/pkg/osquery/tables/execparsers/pacman/upgradeable/parser_test.go b/ee/tables/execparsers/pacman/upgradeable/parser_test.go similarity index 100% rename from pkg/osquery/tables/execparsers/pacman/upgradeable/parser_test.go rename to ee/tables/execparsers/pacman/upgradeable/parser_test.go diff --git a/pkg/osquery/tables/execparsers/pacman/upgradeable/test-data/pacman_upgradeable.txt b/ee/tables/execparsers/pacman/upgradeable/test-data/pacman_upgradeable.txt similarity index 100% rename from pkg/osquery/tables/execparsers/pacman/upgradeable/test-data/pacman_upgradeable.txt rename to ee/tables/execparsers/pacman/upgradeable/test-data/pacman_upgradeable.txt diff --git a/pkg/osquery/tables/execparsers/remotectl/parse.go b/ee/tables/execparsers/remotectl/parse.go similarity index 100% rename from pkg/osquery/tables/execparsers/remotectl/parse.go rename to ee/tables/execparsers/remotectl/parse.go diff --git a/pkg/osquery/tables/execparsers/remotectl/parse_test.go b/ee/tables/execparsers/remotectl/parse_test.go similarity index 100% rename from pkg/osquery/tables/execparsers/remotectl/parse_test.go rename to ee/tables/execparsers/remotectl/parse_test.go diff --git a/pkg/osquery/tables/execparsers/remotectl/remotectl.go b/ee/tables/execparsers/remotectl/remotectl.go similarity index 100% rename from pkg/osquery/tables/execparsers/remotectl/remotectl.go rename to ee/tables/execparsers/remotectl/remotectl.go diff --git a/pkg/osquery/tables/execparsers/remotectl/test-data/dumpstate_with_features.txt b/ee/tables/execparsers/remotectl/test-data/dumpstate_with_features.txt similarity index 100% rename from pkg/osquery/tables/execparsers/remotectl/test-data/dumpstate_with_features.txt rename to ee/tables/execparsers/remotectl/test-data/dumpstate_with_features.txt diff --git a/pkg/osquery/tables/execparsers/remotectl/test-data/malformed_dumpstate_at_top_level.txt b/ee/tables/execparsers/remotectl/test-data/malformed_dumpstate_at_top_level.txt similarity index 100% rename from pkg/osquery/tables/execparsers/remotectl/test-data/malformed_dumpstate_at_top_level.txt rename to ee/tables/execparsers/remotectl/test-data/malformed_dumpstate_at_top_level.txt diff --git a/pkg/osquery/tables/execparsers/remotectl/test-data/malformed_dumpstate_in_properties.txt b/ee/tables/execparsers/remotectl/test-data/malformed_dumpstate_in_properties.txt similarity index 100% rename from pkg/osquery/tables/execparsers/remotectl/test-data/malformed_dumpstate_in_properties.txt rename to ee/tables/execparsers/remotectl/test-data/malformed_dumpstate_in_properties.txt diff --git a/pkg/osquery/tables/execparsers/remotectl/test-data/multiple_devices_dumpstate.txt b/ee/tables/execparsers/remotectl/test-data/multiple_devices_dumpstate.txt similarity index 100% rename from pkg/osquery/tables/execparsers/remotectl/test-data/multiple_devices_dumpstate.txt rename to ee/tables/execparsers/remotectl/test-data/multiple_devices_dumpstate.txt diff --git a/pkg/osquery/tables/execparsers/remotectl/test-data/single_device_dumpstate.txt b/ee/tables/execparsers/remotectl/test-data/single_device_dumpstate.txt similarity index 100% rename from pkg/osquery/tables/execparsers/remotectl/test-data/single_device_dumpstate.txt rename to ee/tables/execparsers/remotectl/test-data/single_device_dumpstate.txt diff --git a/pkg/osquery/tables/execparsers/repcli/parser.go b/ee/tables/execparsers/repcli/parser.go similarity index 100% rename from pkg/osquery/tables/execparsers/repcli/parser.go rename to ee/tables/execparsers/repcli/parser.go diff --git a/pkg/osquery/tables/execparsers/repcli/parser_test.go b/ee/tables/execparsers/repcli/parser_test.go similarity index 100% rename from pkg/osquery/tables/execparsers/repcli/parser_test.go rename to ee/tables/execparsers/repcli/parser_test.go diff --git a/pkg/osquery/tables/execparsers/repcli/repcli.go b/ee/tables/execparsers/repcli/repcli.go similarity index 100% rename from pkg/osquery/tables/execparsers/repcli/repcli.go rename to ee/tables/execparsers/repcli/repcli.go diff --git a/pkg/osquery/tables/execparsers/repcli/test-data/repcli_darwin.txt b/ee/tables/execparsers/repcli/test-data/repcli_darwin.txt similarity index 100% rename from pkg/osquery/tables/execparsers/repcli/test-data/repcli_darwin.txt rename to ee/tables/execparsers/repcli/test-data/repcli_darwin.txt diff --git a/pkg/osquery/tables/execparsers/repcli/test-data/repcli_linux.txt b/ee/tables/execparsers/repcli/test-data/repcli_linux.txt similarity index 100% rename from pkg/osquery/tables/execparsers/repcli/test-data/repcli_linux.txt rename to ee/tables/execparsers/repcli/test-data/repcli_linux.txt diff --git a/pkg/osquery/tables/execparsers/rpm/parser.go b/ee/tables/execparsers/rpm/parser.go similarity index 100% rename from pkg/osquery/tables/execparsers/rpm/parser.go rename to ee/tables/execparsers/rpm/parser.go diff --git a/pkg/osquery/tables/execparsers/rpm/parser_test.go b/ee/tables/execparsers/rpm/parser_test.go similarity index 100% rename from pkg/osquery/tables/execparsers/rpm/parser_test.go rename to ee/tables/execparsers/rpm/parser_test.go diff --git a/pkg/osquery/tables/execparsers/rpm/rpm.go b/ee/tables/execparsers/rpm/rpm.go similarity index 100% rename from pkg/osquery/tables/execparsers/rpm/rpm.go rename to ee/tables/execparsers/rpm/rpm.go diff --git a/pkg/osquery/tables/execparsers/rpm/test-data/rpm_info.txt b/ee/tables/execparsers/rpm/test-data/rpm_info.txt similarity index 100% rename from pkg/osquery/tables/execparsers/rpm/test-data/rpm_info.txt rename to ee/tables/execparsers/rpm/test-data/rpm_info.txt diff --git a/pkg/osquery/tables/execparsers/simple_array/parser.go b/ee/tables/execparsers/simple_array/parser.go similarity index 100% rename from pkg/osquery/tables/execparsers/simple_array/parser.go rename to ee/tables/execparsers/simple_array/parser.go diff --git a/pkg/osquery/tables/execparsers/simple_array/parser_test.go b/ee/tables/execparsers/simple_array/parser_test.go similarity index 100% rename from pkg/osquery/tables/execparsers/simple_array/parser_test.go rename to ee/tables/execparsers/simple_array/parser_test.go diff --git a/pkg/osquery/tables/execparsers/simple_array/test-data/complex.txt b/ee/tables/execparsers/simple_array/test-data/complex.txt similarity index 100% rename from pkg/osquery/tables/execparsers/simple_array/test-data/complex.txt rename to ee/tables/execparsers/simple_array/test-data/complex.txt diff --git a/pkg/osquery/tables/execparsers/simple_array/test-data/simple.txt b/ee/tables/execparsers/simple_array/test-data/simple.txt similarity index 100% rename from pkg/osquery/tables/execparsers/simple_array/test-data/simple.txt rename to ee/tables/execparsers/simple_array/test-data/simple.txt diff --git a/pkg/osquery/tables/execparsers/softwareupdate/parse.go b/ee/tables/execparsers/softwareupdate/parse.go similarity index 100% rename from pkg/osquery/tables/execparsers/softwareupdate/parse.go rename to ee/tables/execparsers/softwareupdate/parse.go diff --git a/pkg/osquery/tables/execparsers/softwareupdate/parse_test.go b/ee/tables/execparsers/softwareupdate/parse_test.go similarity index 100% rename from pkg/osquery/tables/execparsers/softwareupdate/parse_test.go rename to ee/tables/execparsers/softwareupdate/parse_test.go diff --git a/pkg/osquery/tables/execparsers/softwareupdate/softwareupdate.go b/ee/tables/execparsers/softwareupdate/softwareupdate.go similarity index 100% rename from pkg/osquery/tables/execparsers/softwareupdate/softwareupdate.go rename to ee/tables/execparsers/softwareupdate/softwareupdate.go diff --git a/pkg/osquery/tables/execparsers/softwareupdate/test-data/beta-update-available-noscan.txt b/ee/tables/execparsers/softwareupdate/test-data/beta-update-available-noscan.txt similarity index 100% rename from pkg/osquery/tables/execparsers/softwareupdate/test-data/beta-update-available-noscan.txt rename to ee/tables/execparsers/softwareupdate/test-data/beta-update-available-noscan.txt diff --git a/pkg/osquery/tables/execparsers/softwareupdate/test-data/beta-update-available-scan.txt b/ee/tables/execparsers/softwareupdate/test-data/beta-update-available-scan.txt similarity index 100% rename from pkg/osquery/tables/execparsers/softwareupdate/test-data/beta-update-available-scan.txt rename to ee/tables/execparsers/softwareupdate/test-data/beta-update-available-scan.txt diff --git a/pkg/osquery/tables/execparsers/softwareupdate/test-data/error-scan.txt b/ee/tables/execparsers/softwareupdate/test-data/error-scan.txt similarity index 100% rename from pkg/osquery/tables/execparsers/softwareupdate/test-data/error-scan.txt rename to ee/tables/execparsers/softwareupdate/test-data/error-scan.txt diff --git a/pkg/osquery/tables/execparsers/softwareupdate/test-data/multiple-updates-available-noscan.txt b/ee/tables/execparsers/softwareupdate/test-data/multiple-updates-available-noscan.txt similarity index 100% rename from pkg/osquery/tables/execparsers/softwareupdate/test-data/multiple-updates-available-noscan.txt rename to ee/tables/execparsers/softwareupdate/test-data/multiple-updates-available-noscan.txt diff --git a/pkg/osquery/tables/execparsers/softwareupdate/test-data/no-update-available-noscan.txt b/ee/tables/execparsers/softwareupdate/test-data/no-update-available-noscan.txt similarity index 100% rename from pkg/osquery/tables/execparsers/softwareupdate/test-data/no-update-available-noscan.txt rename to ee/tables/execparsers/softwareupdate/test-data/no-update-available-noscan.txt diff --git a/pkg/osquery/tables/execparsers/softwareupdate/test-data/no-update-available-scan.txt b/ee/tables/execparsers/softwareupdate/test-data/no-update-available-scan.txt similarity index 100% rename from pkg/osquery/tables/execparsers/softwareupdate/test-data/no-update-available-scan.txt rename to ee/tables/execparsers/softwareupdate/test-data/no-update-available-scan.txt diff --git a/pkg/osquery/tables/execparsers/softwareupdate/test-data/update-available-noscan.txt b/ee/tables/execparsers/softwareupdate/test-data/update-available-noscan.txt similarity index 100% rename from pkg/osquery/tables/execparsers/softwareupdate/test-data/update-available-noscan.txt rename to ee/tables/execparsers/softwareupdate/test-data/update-available-noscan.txt diff --git a/pkg/osquery/tables/execparsers/softwareupdate/test-data/update-available-scan.txt b/ee/tables/execparsers/softwareupdate/test-data/update-available-scan.txt similarity index 100% rename from pkg/osquery/tables/execparsers/softwareupdate/test-data/update-available-scan.txt rename to ee/tables/execparsers/softwareupdate/test-data/update-available-scan.txt diff --git a/pkg/osquery/tables/filevault/filevault.go b/ee/tables/filevault/filevault.go similarity index 95% rename from pkg/osquery/tables/filevault/filevault.go rename to ee/tables/filevault/filevault.go index d018eda94..7696baf14 100644 --- a/pkg/osquery/tables/filevault/filevault.go +++ b/ee/tables/filevault/filevault.go @@ -12,7 +12,7 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" "github.com/kolide/launcher/pkg/allowedcmd" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" "github.com/pkg/errors" ) diff --git a/pkg/osquery/tables/firefox_preferences/table.go b/ee/tables/firefox_preferences/table.go similarity index 96% rename from pkg/osquery/tables/firefox_preferences/table.go rename to ee/tables/firefox_preferences/table.go index 2fcd7ad8e..bdc80e154 100644 --- a/pkg/osquery/tables/firefox_preferences/table.go +++ b/ee/tables/firefox_preferences/table.go @@ -11,8 +11,8 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" "github.com/kolide/launcher/ee/dataflatten" - "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/dataflattentable" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/pkg/osquery/tables/firefox_preferences/table_test.go b/ee/tables/firefox_preferences/table_test.go similarity index 97% rename from pkg/osquery/tables/firefox_preferences/table_test.go rename to ee/tables/firefox_preferences/table_test.go index a1896b8b3..532b0ff54 100644 --- a/pkg/osquery/tables/firefox_preferences/table_test.go +++ b/ee/tables/firefox_preferences/table_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/go-kit/kit/log" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/osquery/tables/firefox_preferences/testdata/output.file_with_bad_data.json b/ee/tables/firefox_preferences/testdata/output.file_with_bad_data.json similarity index 100% rename from pkg/osquery/tables/firefox_preferences/testdata/output.file_with_bad_data.json rename to ee/tables/firefox_preferences/testdata/output.file_with_bad_data.json diff --git a/pkg/osquery/tables/firefox_preferences/testdata/output.multiple_paths.json b/ee/tables/firefox_preferences/testdata/output.multiple_paths.json similarity index 100% rename from pkg/osquery/tables/firefox_preferences/testdata/output.multiple_paths.json rename to ee/tables/firefox_preferences/testdata/output.multiple_paths.json diff --git a/pkg/osquery/tables/firefox_preferences/testdata/output.single_path.json b/ee/tables/firefox_preferences/testdata/output.single_path.json similarity index 100% rename from pkg/osquery/tables/firefox_preferences/testdata/output.single_path.json rename to ee/tables/firefox_preferences/testdata/output.single_path.json diff --git a/pkg/osquery/tables/firefox_preferences/testdata/output.single_path_with_query.json b/ee/tables/firefox_preferences/testdata/output.single_path_with_query.json similarity index 100% rename from pkg/osquery/tables/firefox_preferences/testdata/output.single_path_with_query.json rename to ee/tables/firefox_preferences/testdata/output.single_path_with_query.json diff --git a/pkg/osquery/tables/firefox_preferences/testdata/prefs.js b/ee/tables/firefox_preferences/testdata/prefs.js similarity index 100% rename from pkg/osquery/tables/firefox_preferences/testdata/prefs.js rename to ee/tables/firefox_preferences/testdata/prefs.js diff --git a/pkg/osquery/tables/firefox_preferences/testdata/prefs2.js b/ee/tables/firefox_preferences/testdata/prefs2.js similarity index 100% rename from pkg/osquery/tables/firefox_preferences/testdata/prefs2.js rename to ee/tables/firefox_preferences/testdata/prefs2.js diff --git a/pkg/osquery/tables/firefox_preferences/testdata/prefs3.js b/ee/tables/firefox_preferences/testdata/prefs3.js similarity index 100% rename from pkg/osquery/tables/firefox_preferences/testdata/prefs3.js rename to ee/tables/firefox_preferences/testdata/prefs3.js diff --git a/pkg/osquery/tables/firmwarepasswd/firmwarepasswd.go b/ee/tables/firmwarepasswd/firmwarepasswd.go similarity index 100% rename from pkg/osquery/tables/firmwarepasswd/firmwarepasswd.go rename to ee/tables/firmwarepasswd/firmwarepasswd.go diff --git a/pkg/osquery/tables/firmwarepasswd/firmwarepasswd_test.go b/ee/tables/firmwarepasswd/firmwarepasswd_test.go similarity index 100% rename from pkg/osquery/tables/firmwarepasswd/firmwarepasswd_test.go rename to ee/tables/firmwarepasswd/firmwarepasswd_test.go diff --git a/pkg/osquery/tables/firmwarepasswd/parser.go b/ee/tables/firmwarepasswd/parser.go similarity index 100% rename from pkg/osquery/tables/firmwarepasswd/parser.go rename to ee/tables/firmwarepasswd/parser.go diff --git a/pkg/osquery/tables/firmwarepasswd/testdata/check-garbage.txt b/ee/tables/firmwarepasswd/testdata/check-garbage.txt similarity index 100% rename from pkg/osquery/tables/firmwarepasswd/testdata/check-garbage.txt rename to ee/tables/firmwarepasswd/testdata/check-garbage.txt diff --git a/pkg/osquery/tables/firmwarepasswd/testdata/check-no.txt b/ee/tables/firmwarepasswd/testdata/check-no.txt similarity index 100% rename from pkg/osquery/tables/firmwarepasswd/testdata/check-no.txt rename to ee/tables/firmwarepasswd/testdata/check-no.txt diff --git a/pkg/osquery/tables/firmwarepasswd/testdata/check-yes.txt b/ee/tables/firmwarepasswd/testdata/check-yes.txt similarity index 100% rename from pkg/osquery/tables/firmwarepasswd/testdata/check-yes.txt rename to ee/tables/firmwarepasswd/testdata/check-yes.txt diff --git a/pkg/osquery/tables/firmwarepasswd/testdata/mode-command.txt b/ee/tables/firmwarepasswd/testdata/mode-command.txt similarity index 100% rename from pkg/osquery/tables/firmwarepasswd/testdata/mode-command.txt rename to ee/tables/firmwarepasswd/testdata/mode-command.txt diff --git a/pkg/osquery/tables/firmwarepasswd/testdata/mode-none.txt b/ee/tables/firmwarepasswd/testdata/mode-none.txt similarity index 100% rename from pkg/osquery/tables/firmwarepasswd/testdata/mode-none.txt rename to ee/tables/firmwarepasswd/testdata/mode-none.txt diff --git a/pkg/osquery/tables/fscrypt_info/fscrypt_linux.go b/ee/tables/fscrypt_info/fscrypt_linux.go similarity index 100% rename from pkg/osquery/tables/fscrypt_info/fscrypt_linux.go rename to ee/tables/fscrypt_info/fscrypt_linux.go diff --git a/pkg/osquery/tables/fscrypt_info/generate.go b/ee/tables/fscrypt_info/generate.go similarity index 100% rename from pkg/osquery/tables/fscrypt_info/generate.go rename to ee/tables/fscrypt_info/generate.go diff --git a/pkg/osquery/tables/fscrypt_info/generate_linux.go b/ee/tables/fscrypt_info/generate_linux.go similarity index 95% rename from pkg/osquery/tables/fscrypt_info/generate_linux.go rename to ee/tables/fscrypt_info/generate_linux.go index 66256408a..8af4271d6 100644 --- a/pkg/osquery/tables/fscrypt_info/generate_linux.go +++ b/ee/tables/fscrypt_info/generate_linux.go @@ -8,7 +8,7 @@ import ( "errors" "github.com/go-kit/kit/log/level" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/pkg/osquery/tables/fscrypt_info/table.go b/ee/tables/fscrypt_info/table.go similarity index 100% rename from pkg/osquery/tables/fscrypt_info/table.go rename to ee/tables/fscrypt_info/table.go diff --git a/pkg/osquery/tables/gsettings/gsettings.go b/ee/tables/gsettings/gsettings.go similarity index 98% rename from pkg/osquery/tables/gsettings/gsettings.go rename to ee/tables/gsettings/gsettings.go index e78cb84ec..7b2853dce 100644 --- a/pkg/osquery/tables/gsettings/gsettings.go +++ b/ee/tables/gsettings/gsettings.go @@ -21,7 +21,7 @@ import ( "github.com/go-kit/kit/log/level" "github.com/kolide/launcher/pkg/agent" "github.com/kolide/launcher/pkg/allowedcmd" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/pkg/osquery/tables/gsettings/gsettings_test.go b/ee/tables/gsettings/gsettings_test.go similarity index 99% rename from pkg/osquery/tables/gsettings/gsettings_test.go rename to ee/tables/gsettings/gsettings_test.go index f3eacacda..b2802e5f6 100644 --- a/pkg/osquery/tables/gsettings/gsettings_test.go +++ b/ee/tables/gsettings/gsettings_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/go-kit/kit/log" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/stretchr/testify/require" ) diff --git a/pkg/osquery/tables/gsettings/metadata.go b/ee/tables/gsettings/metadata.go similarity index 99% rename from pkg/osquery/tables/gsettings/metadata.go rename to ee/tables/gsettings/metadata.go index d4d6d3bd4..9cf13c901 100644 --- a/pkg/osquery/tables/gsettings/metadata.go +++ b/ee/tables/gsettings/metadata.go @@ -17,7 +17,7 @@ import ( "github.com/go-kit/kit/log/level" "github.com/kolide/launcher/pkg/agent" "github.com/kolide/launcher/pkg/allowedcmd" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/pkg/osquery/tables/gsettings/testdata/blank.txt b/ee/tables/gsettings/testdata/blank.txt similarity index 100% rename from pkg/osquery/tables/gsettings/testdata/blank.txt rename to ee/tables/gsettings/testdata/blank.txt diff --git a/pkg/osquery/tables/gsettings/testdata/listkeys.txt b/ee/tables/gsettings/testdata/listkeys.txt similarity index 100% rename from pkg/osquery/tables/gsettings/testdata/listkeys.txt rename to ee/tables/gsettings/testdata/listkeys.txt diff --git a/pkg/osquery/tables/gsettings/testdata/seph-athena.txt b/ee/tables/gsettings/testdata/seph-athena.txt similarity index 100% rename from pkg/osquery/tables/gsettings/testdata/seph-athena.txt rename to ee/tables/gsettings/testdata/seph-athena.txt diff --git a/pkg/osquery/tables/gsettings/testdata/simple.txt b/ee/tables/gsettings/testdata/simple.txt similarity index 100% rename from pkg/osquery/tables/gsettings/testdata/simple.txt rename to ee/tables/gsettings/testdata/simple.txt diff --git a/pkg/osquery/tables/ioreg/ioreg.go b/ee/tables/ioreg/ioreg.go similarity index 96% rename from pkg/osquery/tables/ioreg/ioreg.go rename to ee/tables/ioreg/ioreg.go index 9c4893e47..35f656a42 100644 --- a/pkg/osquery/tables/ioreg/ioreg.go +++ b/ee/tables/ioreg/ioreg.go @@ -18,8 +18,8 @@ import ( "github.com/go-kit/kit/log/level" "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/ee/dataflatten" - "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/dataflattentable" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/pkg/osquery/tables/launcher_db/launcher_db.go b/ee/tables/launcher_db/launcher_db.go similarity index 100% rename from pkg/osquery/tables/launcher_db/launcher_db.go rename to ee/tables/launcher_db/launcher_db.go diff --git a/pkg/osquery/tables/launcher_db/launcher_db_test.go b/ee/tables/launcher_db/launcher_db_test.go similarity index 100% rename from pkg/osquery/tables/launcher_db/launcher_db_test.go rename to ee/tables/launcher_db/launcher_db_test.go diff --git a/pkg/osquery/tables/macos_software_update/SUScanController.h b/ee/tables/macos_software_update/SUScanController.h similarity index 100% rename from pkg/osquery/tables/macos_software_update/SUScanController.h rename to ee/tables/macos_software_update/SUScanController.h diff --git a/pkg/osquery/tables/macos_software_update/SUSharedPrefs.h b/ee/tables/macos_software_update/SUSharedPrefs.h similarity index 100% rename from pkg/osquery/tables/macos_software_update/SUSharedPrefs.h rename to ee/tables/macos_software_update/SUSharedPrefs.h diff --git a/pkg/osquery/tables/macos_software_update/SUUpdateProduct.h b/ee/tables/macos_software_update/SUUpdateProduct.h similarity index 100% rename from pkg/osquery/tables/macos_software_update/SUUpdateProduct.h rename to ee/tables/macos_software_update/SUUpdateProduct.h diff --git a/pkg/osquery/tables/macos_software_update/available_products_table.go b/ee/tables/macos_software_update/available_products_table.go similarity index 96% rename from pkg/osquery/tables/macos_software_update/available_products_table.go rename to ee/tables/macos_software_update/available_products_table.go index 1b3e2bec2..b6e949958 100644 --- a/pkg/osquery/tables/macos_software_update/available_products_table.go +++ b/ee/tables/macos_software_update/available_products_table.go @@ -19,8 +19,8 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" "github.com/kolide/launcher/ee/dataflatten" - "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/dataflattentable" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/pkg/osquery/tables/macos_software_update/recommended_updates_table.go b/ee/tables/macos_software_update/recommended_updates_table.go similarity index 94% rename from pkg/osquery/tables/macos_software_update/recommended_updates_table.go rename to ee/tables/macos_software_update/recommended_updates_table.go index 975ab2e41..13f807350 100644 --- a/pkg/osquery/tables/macos_software_update/recommended_updates_table.go +++ b/ee/tables/macos_software_update/recommended_updates_table.go @@ -18,8 +18,8 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" "github.com/kolide/launcher/ee/dataflatten" - "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/dataflattentable" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/pkg/osquery/tables/macos_software_update/recommended_updates_table_test.go b/ee/tables/macos_software_update/recommended_updates_table_test.go similarity index 88% rename from pkg/osquery/tables/macos_software_update/recommended_updates_table_test.go rename to ee/tables/macos_software_update/recommended_updates_table_test.go index 558c721da..558161c5a 100644 --- a/pkg/osquery/tables/macos_software_update/recommended_updates_table_test.go +++ b/ee/tables/macos_software_update/recommended_updates_table_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/go-kit/kit/log" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/stretchr/testify/require" ) diff --git a/pkg/osquery/tables/macos_software_update/software_update_table.go b/ee/tables/macos_software_update/software_update_table.go similarity index 100% rename from pkg/osquery/tables/macos_software_update/software_update_table.go rename to ee/tables/macos_software_update/software_update_table.go diff --git a/pkg/osquery/tables/macos_software_update/sus.h b/ee/tables/macos_software_update/sus.h similarity index 100% rename from pkg/osquery/tables/macos_software_update/sus.h rename to ee/tables/macos_software_update/sus.h diff --git a/pkg/osquery/tables/macos_software_update/sus.m b/ee/tables/macos_software_update/sus.m similarity index 100% rename from pkg/osquery/tables/macos_software_update/sus.m rename to ee/tables/macos_software_update/sus.m diff --git a/pkg/osquery/tables/mdmclient/mdmclient.go b/ee/tables/mdmclient/mdmclient.go similarity index 98% rename from pkg/osquery/tables/mdmclient/mdmclient.go rename to ee/tables/mdmclient/mdmclient.go index 7d143400c..829badb93 100644 --- a/pkg/osquery/tables/mdmclient/mdmclient.go +++ b/ee/tables/mdmclient/mdmclient.go @@ -18,8 +18,8 @@ import ( "github.com/go-kit/kit/log/level" "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/ee/dataflatten" - "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/dataflattentable" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/pkg/osquery/tables/mdmclient/mdmclient_test.go b/ee/tables/mdmclient/mdmclient_test.go similarity index 100% rename from pkg/osquery/tables/mdmclient/mdmclient_test.go rename to ee/tables/mdmclient/mdmclient_test.go diff --git a/pkg/osquery/tables/mdmclient/testdata/QueryDeviceInformation.output b/ee/tables/mdmclient/testdata/QueryDeviceInformation.output similarity index 100% rename from pkg/osquery/tables/mdmclient/testdata/QueryDeviceInformation.output rename to ee/tables/mdmclient/testdata/QueryDeviceInformation.output diff --git a/pkg/osquery/tables/mdmclient/testdata/QueryDeviceInformation_NullAgentResponse.output b/ee/tables/mdmclient/testdata/QueryDeviceInformation_NullAgentResponse.output similarity index 100% rename from pkg/osquery/tables/mdmclient/testdata/QueryDeviceInformation_NullAgentResponse.output rename to ee/tables/mdmclient/testdata/QueryDeviceInformation_NullAgentResponse.output diff --git a/pkg/osquery/tables/mdmclient/testdata/QueryDeviceInformation_WithHeader.output b/ee/tables/mdmclient/testdata/QueryDeviceInformation_WithHeader.output similarity index 100% rename from pkg/osquery/tables/mdmclient/testdata/QueryDeviceInformation_WithHeader.output rename to ee/tables/mdmclient/testdata/QueryDeviceInformation_WithHeader.output diff --git a/pkg/osquery/tables/mdmclient/testdata/QueryInstalledProfiles.output b/ee/tables/mdmclient/testdata/QueryInstalledProfiles.output similarity index 100% rename from pkg/osquery/tables/mdmclient/testdata/QueryInstalledProfiles.output rename to ee/tables/mdmclient/testdata/QueryInstalledProfiles.output diff --git a/pkg/osquery/tables/mdmclient/testdata/QuerySecurityInfo.output b/ee/tables/mdmclient/testdata/QuerySecurityInfo.output similarity index 100% rename from pkg/osquery/tables/mdmclient/testdata/QuerySecurityInfo.output rename to ee/tables/mdmclient/testdata/QuerySecurityInfo.output diff --git a/pkg/osquery/tables/munki/munki.go b/ee/tables/munki/munki.go similarity index 100% rename from pkg/osquery/tables/munki/munki.go rename to ee/tables/munki/munki.go diff --git a/pkg/osquery/tables/munki/munki_test.go b/ee/tables/munki/munki_test.go similarity index 96% rename from pkg/osquery/tables/munki/munki_test.go rename to ee/tables/munki/munki_test.go index e770a0f57..08dc393ab 100644 --- a/pkg/osquery/tables/munki/munki_test.go +++ b/ee/tables/munki/munki_test.go @@ -7,7 +7,7 @@ import ( "context" "testing" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/osquery/tables/munki/testdata/ManagedInstallReport.plist b/ee/tables/munki/testdata/ManagedInstallReport.plist similarity index 100% rename from pkg/osquery/tables/munki/testdata/ManagedInstallReport.plist rename to ee/tables/munki/testdata/ManagedInstallReport.plist diff --git a/pkg/osquery/tables/osquery_instance_history/osquery_instance_history.go b/ee/tables/osquery_instance_history/osquery_instance_history.go similarity index 100% rename from pkg/osquery/tables/osquery_instance_history/osquery_instance_history.go rename to ee/tables/osquery_instance_history/osquery_instance_history.go diff --git a/pkg/osquery/tables/osquery_user_exec_table/table.go b/ee/tables/osquery_user_exec_table/table.go similarity index 97% rename from pkg/osquery/tables/osquery_user_exec_table/table.go rename to ee/tables/osquery_user_exec_table/table.go index 790a5ea97..ae60f0ee0 100644 --- a/pkg/osquery/tables/osquery_user_exec_table/table.go +++ b/ee/tables/osquery_user_exec_table/table.go @@ -22,7 +22,7 @@ import ( "fmt" "github.com/go-kit/kit/log" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/pkg/osquery/tables/profiles/profiles.go b/ee/tables/profiles/profiles.go similarity index 97% rename from pkg/osquery/tables/profiles/profiles.go rename to ee/tables/profiles/profiles.go index 1a3a9acc5..ea4e9f142 100644 --- a/pkg/osquery/tables/profiles/profiles.go +++ b/ee/tables/profiles/profiles.go @@ -23,8 +23,8 @@ import ( "github.com/kolide/launcher/pkg/agent" "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/ee/dataflatten" - "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/dataflattentable" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/pkg/osquery/tables/pwpolicy/pwpolicy.go b/ee/tables/pwpolicy/pwpolicy.go similarity index 95% rename from pkg/osquery/tables/pwpolicy/pwpolicy.go rename to ee/tables/pwpolicy/pwpolicy.go index 81c3af0fe..5aff1d99b 100644 --- a/pkg/osquery/tables/pwpolicy/pwpolicy.go +++ b/ee/tables/pwpolicy/pwpolicy.go @@ -21,8 +21,8 @@ import ( "github.com/go-kit/kit/log/level" "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/ee/dataflatten" - "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/dataflattentable" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/pkg/osquery/tables/pwpolicy/pwpolicy_test.go b/ee/tables/pwpolicy/pwpolicy_test.go similarity index 96% rename from pkg/osquery/tables/pwpolicy/pwpolicy_test.go rename to ee/tables/pwpolicy/pwpolicy_test.go index dd193af6c..16a6384a8 100644 --- a/pkg/osquery/tables/pwpolicy/pwpolicy_test.go +++ b/ee/tables/pwpolicy/pwpolicy_test.go @@ -10,7 +10,7 @@ import ( "testing" "github.com/go-kit/kit/log" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/osquery/tables/pwpolicy/testdata/empty.output b/ee/tables/pwpolicy/testdata/empty.output similarity index 100% rename from pkg/osquery/tables/pwpolicy/testdata/empty.output rename to ee/tables/pwpolicy/testdata/empty.output diff --git a/pkg/osquery/tables/pwpolicy/testdata/test1.output b/ee/tables/pwpolicy/testdata/test1.output similarity index 100% rename from pkg/osquery/tables/pwpolicy/testdata/test1.output rename to ee/tables/pwpolicy/testdata/test1.output diff --git a/pkg/osquery/tables/secedit/secedit.go b/ee/tables/secedit/secedit.go similarity index 96% rename from pkg/osquery/tables/secedit/secedit.go rename to ee/tables/secedit/secedit.go index c29bab17e..11a39c200 100644 --- a/pkg/osquery/tables/secedit/secedit.go +++ b/ee/tables/secedit/secedit.go @@ -19,8 +19,8 @@ import ( "github.com/kolide/launcher/pkg/agent" "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/ee/dataflatten" - "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/dataflattentable" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" "golang.org/x/text/encoding/unicode" diff --git a/pkg/osquery/tables/secureboot/table.go b/ee/tables/secureboot/table.go similarity index 100% rename from pkg/osquery/tables/secureboot/table.go rename to ee/tables/secureboot/table.go diff --git a/pkg/osquery/tables/systemprofiler/systemprofiler.go b/ee/tables/systemprofiler/systemprofiler.go similarity index 99% rename from pkg/osquery/tables/systemprofiler/systemprofiler.go rename to ee/tables/systemprofiler/systemprofiler.go index 26dae1859..ea76b0b91 100644 --- a/pkg/osquery/tables/systemprofiler/systemprofiler.go +++ b/ee/tables/systemprofiler/systemprofiler.go @@ -49,7 +49,7 @@ import ( "github.com/groob/plist" "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/ee/dataflatten" - "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" + "github.com/kolide/launcher/ee/tables/dataflattentable" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/pkg/osquery/tables/tablehelpers/exec.go b/ee/tables/tablehelpers/exec.go similarity index 100% rename from pkg/osquery/tables/tablehelpers/exec.go rename to ee/tables/tablehelpers/exec.go diff --git a/pkg/osquery/tables/tablehelpers/exec_osquery_launchctl.go b/ee/tables/tablehelpers/exec_osquery_launchctl.go similarity index 100% rename from pkg/osquery/tables/tablehelpers/exec_osquery_launchctl.go rename to ee/tables/tablehelpers/exec_osquery_launchctl.go diff --git a/pkg/osquery/tables/tablehelpers/exec_test.go b/ee/tables/tablehelpers/exec_test.go similarity index 100% rename from pkg/osquery/tables/tablehelpers/exec_test.go rename to ee/tables/tablehelpers/exec_test.go diff --git a/pkg/osquery/tables/tablehelpers/getconstraints.go b/ee/tables/tablehelpers/getconstraints.go similarity index 100% rename from pkg/osquery/tables/tablehelpers/getconstraints.go rename to ee/tables/tablehelpers/getconstraints.go diff --git a/pkg/osquery/tables/tablehelpers/getconstraints_test.go b/ee/tables/tablehelpers/getconstraints_test.go similarity index 100% rename from pkg/osquery/tables/tablehelpers/getconstraints_test.go rename to ee/tables/tablehelpers/getconstraints_test.go diff --git a/pkg/osquery/tables/tablehelpers/mocks.go b/ee/tables/tablehelpers/mocks.go similarity index 100% rename from pkg/osquery/tables/tablehelpers/mocks.go rename to ee/tables/tablehelpers/mocks.go diff --git a/pkg/osquery/tables/tablehelpers/parser.go b/ee/tables/tablehelpers/parser.go similarity index 100% rename from pkg/osquery/tables/tablehelpers/parser.go rename to ee/tables/tablehelpers/parser.go diff --git a/pkg/osquery/tables/tablehelpers/stanza_scanner.go b/ee/tables/tablehelpers/stanza_scanner.go similarity index 100% rename from pkg/osquery/tables/tablehelpers/stanza_scanner.go rename to ee/tables/tablehelpers/stanza_scanner.go diff --git a/pkg/osquery/tables/tdebug/doc.go b/ee/tables/tdebug/doc.go similarity index 100% rename from pkg/osquery/tables/tdebug/doc.go rename to ee/tables/tdebug/doc.go diff --git a/pkg/osquery/tables/tdebug/gc.go b/ee/tables/tdebug/gc.go similarity index 92% rename from pkg/osquery/tables/tdebug/gc.go rename to ee/tables/tdebug/gc.go index 191198dd4..054030af2 100644 --- a/pkg/osquery/tables/tdebug/gc.go +++ b/ee/tables/tdebug/gc.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/kolide/launcher/ee/dataflatten" - "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/dataflattentable" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" diff --git a/pkg/osquery/tables/tufinfo/release_version.go b/ee/tables/tufinfo/release_version.go similarity index 100% rename from pkg/osquery/tables/tufinfo/release_version.go rename to ee/tables/tufinfo/release_version.go diff --git a/pkg/osquery/tables/tufinfo/release_version_test.go b/ee/tables/tufinfo/release_version_test.go similarity index 100% rename from pkg/osquery/tables/tufinfo/release_version_test.go rename to ee/tables/tufinfo/release_version_test.go diff --git a/pkg/osquery/tables/wifi_networks/assets/get-networks.ps1 b/ee/tables/wifi_networks/assets/get-networks.ps1 similarity index 100% rename from pkg/osquery/tables/wifi_networks/assets/get-networks.ps1 rename to ee/tables/wifi_networks/assets/get-networks.ps1 diff --git a/pkg/osquery/tables/wifi_networks/assets/nativewifi.cs b/ee/tables/wifi_networks/assets/nativewifi.cs similarity index 100% rename from pkg/osquery/tables/wifi_networks/assets/nativewifi.cs rename to ee/tables/wifi_networks/assets/nativewifi.cs diff --git a/pkg/osquery/tables/wifi_networks/wifi_networks.go b/ee/tables/wifi_networks/wifi_networks.go similarity index 98% rename from pkg/osquery/tables/wifi_networks/wifi_networks.go rename to ee/tables/wifi_networks/wifi_networks.go index 441454e8d..9e833d0ae 100644 --- a/pkg/osquery/tables/wifi_networks/wifi_networks.go +++ b/ee/tables/wifi_networks/wifi_networks.go @@ -17,7 +17,7 @@ import ( "github.com/kolide/launcher/pkg/agent" "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/ee/dataflatten" - "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" + "github.com/kolide/launcher/ee/tables/dataflattentable" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/pkg/osquery/tables/windowsupdatetable/windowsupdate.go b/ee/tables/windowsupdatetable/windowsupdate.go similarity index 97% rename from pkg/osquery/tables/windowsupdatetable/windowsupdate.go rename to ee/tables/windowsupdatetable/windowsupdate.go index e78105396..ba502216f 100644 --- a/pkg/osquery/tables/windowsupdatetable/windowsupdate.go +++ b/ee/tables/windowsupdatetable/windowsupdate.go @@ -13,8 +13,8 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" "github.com/kolide/launcher/ee/dataflatten" - "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/dataflattentable" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/kolide/launcher/pkg/windows/windowsupdate" "github.com/osquery/osquery-go/plugin/table" "github.com/scjalliance/comshim" diff --git a/pkg/osquery/tables/windowsupdatetable/windowsupdate_test.go b/ee/tables/windowsupdatetable/windowsupdate_test.go similarity index 93% rename from pkg/osquery/tables/windowsupdatetable/windowsupdate_test.go rename to ee/tables/windowsupdatetable/windowsupdate_test.go index c48b404b2..2e636eb66 100644 --- a/pkg/osquery/tables/windowsupdatetable/windowsupdate_test.go +++ b/ee/tables/windowsupdatetable/windowsupdate_test.go @@ -9,7 +9,7 @@ import ( "time" "github.com/go-kit/kit/log" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/stretchr/testify/require" ) diff --git a/pkg/osquery/tables/wmitable/wmitable.go b/ee/tables/wmitable/wmitable.go similarity index 97% rename from pkg/osquery/tables/wmitable/wmitable.go rename to ee/tables/wmitable/wmitable.go index 8f75d599c..5490fd63e 100644 --- a/pkg/osquery/tables/wmitable/wmitable.go +++ b/ee/tables/wmitable/wmitable.go @@ -11,8 +11,8 @@ import ( "github.com/kolide/launcher/pkg/contexts/ctxlog" "github.com/kolide/launcher/ee/dataflatten" - "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/dataflattentable" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/kolide/launcher/pkg/wmi" "github.com/go-kit/kit/log" diff --git a/pkg/osquery/tables/wmitable/wmitable_test.go b/ee/tables/wmitable/wmitable_test.go similarity index 98% rename from pkg/osquery/tables/wmitable/wmitable_test.go rename to ee/tables/wmitable/wmitable_test.go index efd528d06..c414cf899 100644 --- a/pkg/osquery/tables/wmitable/wmitable_test.go +++ b/ee/tables/wmitable/wmitable_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/go-kit/kit/log" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/osquery/tables/xfconf/parser.go b/ee/tables/xfconf/parser.go similarity index 100% rename from pkg/osquery/tables/xfconf/parser.go rename to ee/tables/xfconf/parser.go diff --git a/pkg/osquery/tables/xfconf/parser_test.go b/ee/tables/xfconf/parser_test.go similarity index 100% rename from pkg/osquery/tables/xfconf/parser_test.go rename to ee/tables/xfconf/parser_test.go diff --git a/pkg/osquery/tables/xfconf/testdata/thunar-volman.xml b/ee/tables/xfconf/testdata/thunar-volman.xml similarity index 100% rename from pkg/osquery/tables/xfconf/testdata/thunar-volman.xml rename to ee/tables/xfconf/testdata/thunar-volman.xml diff --git a/pkg/osquery/tables/xfconf/testdata/xfce4-power-manager-default.xml b/ee/tables/xfconf/testdata/xfce4-power-manager-default.xml similarity index 100% rename from pkg/osquery/tables/xfconf/testdata/xfce4-power-manager-default.xml rename to ee/tables/xfconf/testdata/xfce4-power-manager-default.xml diff --git a/pkg/osquery/tables/xfconf/testdata/xfce4-power-manager.xml b/ee/tables/xfconf/testdata/xfce4-power-manager.xml similarity index 100% rename from pkg/osquery/tables/xfconf/testdata/xfce4-power-manager.xml rename to ee/tables/xfconf/testdata/xfce4-power-manager.xml diff --git a/pkg/osquery/tables/xfconf/testdata/xfce4-session.xml b/ee/tables/xfconf/testdata/xfce4-session.xml similarity index 100% rename from pkg/osquery/tables/xfconf/testdata/xfce4-session.xml rename to ee/tables/xfconf/testdata/xfce4-session.xml diff --git a/pkg/osquery/tables/xfconf/xfconf.go b/ee/tables/xfconf/xfconf.go similarity index 98% rename from pkg/osquery/tables/xfconf/xfconf.go rename to ee/tables/xfconf/xfconf.go index 1671cfb6a..0f5239eb8 100644 --- a/pkg/osquery/tables/xfconf/xfconf.go +++ b/ee/tables/xfconf/xfconf.go @@ -15,8 +15,8 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" "github.com/kolide/launcher/ee/dataflatten" - "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/dataflattentable" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" "golang.org/x/exp/maps" ) diff --git a/pkg/osquery/tables/xfconf/xfconf_test.go b/ee/tables/xfconf/xfconf_test.go similarity index 100% rename from pkg/osquery/tables/xfconf/xfconf_test.go rename to ee/tables/xfconf/xfconf_test.go diff --git a/pkg/osquery/tables/xrdb/testdata/blank.txt b/ee/tables/xrdb/testdata/blank.txt similarity index 100% rename from pkg/osquery/tables/xrdb/testdata/blank.txt rename to ee/tables/xrdb/testdata/blank.txt diff --git a/pkg/osquery/tables/xrdb/testdata/example_query.sql b/ee/tables/xrdb/testdata/example_query.sql similarity index 100% rename from pkg/osquery/tables/xrdb/testdata/example_query.sql rename to ee/tables/xrdb/testdata/example_query.sql diff --git a/pkg/osquery/tables/xrdb/testdata/results.txt b/ee/tables/xrdb/testdata/results.txt similarity index 100% rename from pkg/osquery/tables/xrdb/testdata/results.txt rename to ee/tables/xrdb/testdata/results.txt diff --git a/pkg/osquery/tables/xrdb/xrdb.go b/ee/tables/xrdb/xrdb.go similarity index 98% rename from pkg/osquery/tables/xrdb/xrdb.go rename to ee/tables/xrdb/xrdb.go index 2fc027339..1a6cce818 100644 --- a/pkg/osquery/tables/xrdb/xrdb.go +++ b/ee/tables/xrdb/xrdb.go @@ -21,7 +21,7 @@ import ( "github.com/go-kit/kit/log/level" "github.com/kolide/launcher/pkg/agent" "github.com/kolide/launcher/pkg/allowedcmd" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/pkg/osquery/tables/xrdb/xrdb_test.go b/ee/tables/xrdb/xrdb_test.go similarity index 97% rename from pkg/osquery/tables/xrdb/xrdb_test.go rename to ee/tables/xrdb/xrdb_test.go index 8cb91562b..6cdc52f5a 100644 --- a/pkg/osquery/tables/xrdb/xrdb_test.go +++ b/ee/tables/xrdb/xrdb_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/go-kit/kit/log" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/stretchr/testify/require" ) diff --git a/pkg/osquery/tables/zfs/tables.go b/ee/tables/zfs/tables.go similarity index 97% rename from pkg/osquery/tables/zfs/tables.go rename to ee/tables/zfs/tables.go index 4e8abd884..dea04e069 100644 --- a/pkg/osquery/tables/zfs/tables.go +++ b/ee/tables/zfs/tables.go @@ -14,7 +14,7 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" "github.com/kolide/launcher/pkg/allowedcmd" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" "github.com/pkg/errors" ) diff --git a/pkg/osquery/tables/zfs/tables_test.go b/ee/tables/zfs/tables_test.go similarity index 100% rename from pkg/osquery/tables/zfs/tables_test.go rename to ee/tables/zfs/tables_test.go diff --git a/pkg/osquery/tables/zfs/testdata/zfs.txt b/ee/tables/zfs/testdata/zfs.txt similarity index 100% rename from pkg/osquery/tables/zfs/testdata/zfs.txt rename to ee/tables/zfs/testdata/zfs.txt diff --git a/pkg/osquery/tables/zfs/testdata/zpool.txt b/ee/tables/zfs/testdata/zpool.txt similarity index 100% rename from pkg/osquery/tables/zfs/testdata/zpool.txt rename to ee/tables/zfs/testdata/zpool.txt diff --git a/pkg/debug/checkups/gnome_extensions_linux.go b/pkg/debug/checkups/gnome_extensions_linux.go index f79e2ed18..9b2d8cf68 100644 --- a/pkg/debug/checkups/gnome_extensions_linux.go +++ b/pkg/debug/checkups/gnome_extensions_linux.go @@ -90,7 +90,7 @@ func execGnomeExtension(ctx context.Context, extraWriter io.Writer, rundir strin defer cancel() // TODO: Need to figure out how to make this run per user - // pkg/osquery/tables/gsettings/gsettings.go probably has appropriate prior art. + // ee/tables/gsettings/gsettings.go probably has appropriate prior art. // But do we really want the forloop? cmd, err := allowedcmd.GnomeExtensions(ctx, args...) diff --git a/pkg/osquery/table/launcher_db_info.go b/pkg/osquery/table/launcher_db_info.go index 07102d485..db8e52108 100644 --- a/pkg/osquery/table/launcher_db_info.go +++ b/pkg/osquery/table/launcher_db_info.go @@ -8,8 +8,8 @@ import ( "github.com/kolide/launcher/pkg/agent" "github.com/kolide/launcher/ee/dataflatten" - "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" - "github.com/kolide/launcher/pkg/osquery/tables/tablehelpers" + "github.com/kolide/launcher/ee/tables/dataflattentable" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" "go.etcd.io/bbolt" ) diff --git a/pkg/osquery/table/platform_tables_darwin.go b/pkg/osquery/table/platform_tables_darwin.go index d6522213b..fd8d93a0f 100644 --- a/pkg/osquery/table/platform_tables_darwin.go +++ b/pkg/osquery/table/platform_tables_darwin.go @@ -8,24 +8,24 @@ import ( "github.com/knightsc/system_policy/osquery/table/kextpolicy" "github.com/knightsc/system_policy/osquery/table/legacyexec" "github.com/kolide/launcher/pkg/allowedcmd" - "github.com/kolide/launcher/pkg/osquery/tables/airport" - appicons "github.com/kolide/launcher/pkg/osquery/tables/app-icons" - "github.com/kolide/launcher/pkg/osquery/tables/apple_silicon_security_policy" - "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" - "github.com/kolide/launcher/pkg/osquery/tables/execparsers/remotectl" - "github.com/kolide/launcher/pkg/osquery/tables/execparsers/repcli" - "github.com/kolide/launcher/pkg/osquery/tables/execparsers/softwareupdate" - "github.com/kolide/launcher/pkg/osquery/tables/filevault" - "github.com/kolide/launcher/pkg/osquery/tables/firmwarepasswd" - "github.com/kolide/launcher/pkg/osquery/tables/ioreg" - "github.com/kolide/launcher/pkg/osquery/tables/macos_software_update" - "github.com/kolide/launcher/pkg/osquery/tables/mdmclient" - "github.com/kolide/launcher/pkg/osquery/tables/munki" - "github.com/kolide/launcher/pkg/osquery/tables/osquery_user_exec_table" - "github.com/kolide/launcher/pkg/osquery/tables/profiles" - "github.com/kolide/launcher/pkg/osquery/tables/pwpolicy" - "github.com/kolide/launcher/pkg/osquery/tables/systemprofiler" - "github.com/kolide/launcher/pkg/osquery/tables/zfs" + "github.com/kolide/launcher/ee/tables/airport" + appicons "github.com/kolide/launcher/ee/tables/app-icons" + "github.com/kolide/launcher/ee/tables/apple_silicon_security_policy" + "github.com/kolide/launcher/ee/tables/dataflattentable" + "github.com/kolide/launcher/ee/tables/execparsers/remotectl" + "github.com/kolide/launcher/ee/tables/execparsers/repcli" + "github.com/kolide/launcher/ee/tables/execparsers/softwareupdate" + "github.com/kolide/launcher/ee/tables/filevault" + "github.com/kolide/launcher/ee/tables/firmwarepasswd" + "github.com/kolide/launcher/ee/tables/ioreg" + "github.com/kolide/launcher/ee/tables/macos_software_update" + "github.com/kolide/launcher/ee/tables/mdmclient" + "github.com/kolide/launcher/ee/tables/munki" + "github.com/kolide/launcher/ee/tables/osquery_user_exec_table" + "github.com/kolide/launcher/ee/tables/profiles" + "github.com/kolide/launcher/ee/tables/pwpolicy" + "github.com/kolide/launcher/ee/tables/systemprofiler" + "github.com/kolide/launcher/ee/tables/zfs" _ "github.com/mattn/go-sqlite3" osquery "github.com/osquery/osquery-go" "github.com/osquery/osquery-go/plugin/table" diff --git a/pkg/osquery/table/platform_tables_linux.go b/pkg/osquery/table/platform_tables_linux.go index a55f5a1cb..c84bd6d67 100644 --- a/pkg/osquery/table/platform_tables_linux.go +++ b/pkg/osquery/table/platform_tables_linux.go @@ -6,25 +6,25 @@ package table import ( "github.com/go-kit/kit/log" "github.com/kolide/launcher/pkg/allowedcmd" - "github.com/kolide/launcher/pkg/osquery/tables/crowdstrike/falcon_kernel_check" - "github.com/kolide/launcher/pkg/osquery/tables/crowdstrike/falconctl" - "github.com/kolide/launcher/pkg/osquery/tables/cryptsetup" - "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" - "github.com/kolide/launcher/pkg/osquery/tables/execparsers/apt" - "github.com/kolide/launcher/pkg/osquery/tables/execparsers/dnf" - "github.com/kolide/launcher/pkg/osquery/tables/execparsers/dpkg" - pacman_group "github.com/kolide/launcher/pkg/osquery/tables/execparsers/pacman/group" - pacman_info "github.com/kolide/launcher/pkg/osquery/tables/execparsers/pacman/info" - pacman_upgradeable "github.com/kolide/launcher/pkg/osquery/tables/execparsers/pacman/upgradeable" - "github.com/kolide/launcher/pkg/osquery/tables/execparsers/repcli" - "github.com/kolide/launcher/pkg/osquery/tables/execparsers/rpm" - "github.com/kolide/launcher/pkg/osquery/tables/execparsers/simple_array" - "github.com/kolide/launcher/pkg/osquery/tables/fscrypt_info" - "github.com/kolide/launcher/pkg/osquery/tables/gsettings" - "github.com/kolide/launcher/pkg/osquery/tables/secureboot" - "github.com/kolide/launcher/pkg/osquery/tables/xfconf" - "github.com/kolide/launcher/pkg/osquery/tables/xrdb" - "github.com/kolide/launcher/pkg/osquery/tables/zfs" + "github.com/kolide/launcher/ee/tables/crowdstrike/falcon_kernel_check" + "github.com/kolide/launcher/ee/tables/crowdstrike/falconctl" + "github.com/kolide/launcher/ee/tables/cryptsetup" + "github.com/kolide/launcher/ee/tables/dataflattentable" + "github.com/kolide/launcher/ee/tables/execparsers/apt" + "github.com/kolide/launcher/ee/tables/execparsers/dnf" + "github.com/kolide/launcher/ee/tables/execparsers/dpkg" + pacman_group "github.com/kolide/launcher/ee/tables/execparsers/pacman/group" + pacman_info "github.com/kolide/launcher/ee/tables/execparsers/pacman/info" + pacman_upgradeable "github.com/kolide/launcher/ee/tables/execparsers/pacman/upgradeable" + "github.com/kolide/launcher/ee/tables/execparsers/repcli" + "github.com/kolide/launcher/ee/tables/execparsers/rpm" + "github.com/kolide/launcher/ee/tables/execparsers/simple_array" + "github.com/kolide/launcher/ee/tables/fscrypt_info" + "github.com/kolide/launcher/ee/tables/gsettings" + "github.com/kolide/launcher/ee/tables/secureboot" + "github.com/kolide/launcher/ee/tables/xfconf" + "github.com/kolide/launcher/ee/tables/xrdb" + "github.com/kolide/launcher/ee/tables/zfs" osquery "github.com/osquery/osquery-go" ) diff --git a/pkg/osquery/table/platform_tables_windows.go b/pkg/osquery/table/platform_tables_windows.go index 4d2289600..a3bb90621 100644 --- a/pkg/osquery/table/platform_tables_windows.go +++ b/pkg/osquery/table/platform_tables_windows.go @@ -5,13 +5,13 @@ package table import ( "github.com/kolide/launcher/pkg/allowedcmd" - "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" - "github.com/kolide/launcher/pkg/osquery/tables/dsim_default_associations" - "github.com/kolide/launcher/pkg/osquery/tables/execparsers/dsregcmd" - "github.com/kolide/launcher/pkg/osquery/tables/secedit" - "github.com/kolide/launcher/pkg/osquery/tables/wifi_networks" - "github.com/kolide/launcher/pkg/osquery/tables/windowsupdatetable" - "github.com/kolide/launcher/pkg/osquery/tables/wmitable" + "github.com/kolide/launcher/ee/tables/dataflattentable" + "github.com/kolide/launcher/ee/tables/dsim_default_associations" + "github.com/kolide/launcher/ee/tables/execparsers/dsregcmd" + "github.com/kolide/launcher/ee/tables/secedit" + "github.com/kolide/launcher/ee/tables/wifi_networks" + "github.com/kolide/launcher/ee/tables/windowsupdatetable" + "github.com/kolide/launcher/ee/tables/wmitable" "github.com/go-kit/kit/log" osquery "github.com/osquery/osquery-go" diff --git a/pkg/osquery/table/table.go b/pkg/osquery/table/table.go index 2afc9da33..a7a9a94d6 100644 --- a/pkg/osquery/table/table.go +++ b/pkg/osquery/table/table.go @@ -3,15 +3,15 @@ package table import ( "github.com/kolide/launcher/pkg/agent/types" "github.com/kolide/launcher/pkg/allowedcmd" - "github.com/kolide/launcher/pkg/osquery/tables/cryptoinfotable" - "github.com/kolide/launcher/pkg/osquery/tables/dataflattentable" - "github.com/kolide/launcher/pkg/osquery/tables/desktopprocs" - "github.com/kolide/launcher/pkg/osquery/tables/dev_table_tooling" - "github.com/kolide/launcher/pkg/osquery/tables/firefox_preferences" - "github.com/kolide/launcher/pkg/osquery/tables/launcher_db" - "github.com/kolide/launcher/pkg/osquery/tables/osquery_instance_history" - "github.com/kolide/launcher/pkg/osquery/tables/tdebug" - "github.com/kolide/launcher/pkg/osquery/tables/tufinfo" + "github.com/kolide/launcher/ee/tables/cryptoinfotable" + "github.com/kolide/launcher/ee/tables/dataflattentable" + "github.com/kolide/launcher/ee/tables/desktopprocs" + "github.com/kolide/launcher/ee/tables/dev_table_tooling" + "github.com/kolide/launcher/ee/tables/firefox_preferences" + "github.com/kolide/launcher/ee/tables/launcher_db" + "github.com/kolide/launcher/ee/tables/osquery_instance_history" + "github.com/kolide/launcher/ee/tables/tdebug" + "github.com/kolide/launcher/ee/tables/tufinfo" "github.com/go-kit/kit/log" osquery "github.com/osquery/osquery-go" From 9485a8c875f499a3359493f2ec1dbad07a179862 Mon Sep 17 00:00:00 2001 From: seph Date: Fri, 17 Nov 2023 12:36:16 -0500 Subject: [PATCH 3/5] move wmi --- ee/tables/wmitable/wmitable.go | 2 +- {pkg => ee}/wmi/wmi.go | 0 {pkg => ee}/wmi/wmi_test.go | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename {pkg => ee}/wmi/wmi.go (100%) rename {pkg => ee}/wmi/wmi_test.go (100%) diff --git a/ee/tables/wmitable/wmitable.go b/ee/tables/wmitable/wmitable.go index 5490fd63e..f76fcf60e 100644 --- a/ee/tables/wmitable/wmitable.go +++ b/ee/tables/wmitable/wmitable.go @@ -13,7 +13,7 @@ import ( "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/ee/tables/dataflattentable" "github.com/kolide/launcher/ee/tables/tablehelpers" - "github.com/kolide/launcher/pkg/wmi" + "github.com/kolide/launcher/ee/wmi" "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" diff --git a/pkg/wmi/wmi.go b/ee/wmi/wmi.go similarity index 100% rename from pkg/wmi/wmi.go rename to ee/wmi/wmi.go diff --git a/pkg/wmi/wmi_test.go b/ee/wmi/wmi_test.go similarity index 100% rename from pkg/wmi/wmi_test.go rename to ee/wmi/wmi_test.go From 5dd4ec853d9dc7ca3e89a573e60f6c7344c31dfc Mon Sep 17 00:00:00 2001 From: seph Date: Fri, 17 Nov 2023 13:15:08 -0500 Subject: [PATCH 4/5] add note to tables.ext --- cmd/launcher.ext/launcher-extension.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cmd/launcher.ext/launcher-extension.go b/cmd/launcher.ext/launcher-extension.go index dd2db11e5..9be8a70db 100644 --- a/cmd/launcher.ext/launcher-extension.go +++ b/cmd/launcher.ext/launcher-extension.go @@ -4,6 +4,7 @@ import ( "flag" "fmt" "os" + "strings" "time" "github.com/apache/thrift/lib/go/thrift" @@ -14,6 +15,12 @@ import ( osquery "github.com/osquery/osquery-go" ) +var licenseNote = ` +This Kolide Agent extension is provided as a convinience to customers. It includes components that are only +licensed for use with a Kolide Subscription. Refer to the software licensing for details. +https://github.com/kolide/launcher/blob/main/ee/LICENSE +` + func main() { var ( flSocketPath = flag.String("socket", "", "") @@ -33,6 +40,8 @@ func main() { timeout := time.Duration(*flTimeout) * time.Second + level.Info(logger).Log("msg", strings.ReplaceAll(licenseNote, "\n", "")) + // allow for osqueryd to create the socket path time.Sleep(2 * time.Second) From fa2b7c1f61a580ce8c2d00fe444e181d70579582 Mon Sep 17 00:00:00 2001 From: seph Date: Fri, 17 Nov 2023 15:45:36 -0500 Subject: [PATCH 5/5] gofmt --- ee/tables/airport/table_darwin.go | 2 +- ee/tables/apple_silicon_security_policy/table.go | 2 +- ee/tables/crowdstrike/falcon_kernel_check/table.go | 2 +- ee/tables/crowdstrike/falconctl/table.go | 2 +- ee/tables/crowdstrike/falconctl/table_test.go | 2 +- ee/tables/cryptoinfotable/table.go | 2 +- ee/tables/cryptsetup/table.go | 2 +- ee/tables/dataflattentable/exec.go | 2 +- ee/tables/dataflattentable/exec_and_parse.go | 2 +- ee/tables/dataflattentable/tables.go | 2 +- ee/tables/dev_table_tooling/table.go | 2 +- .../dsim_default_associations/dsim_default_associations.go | 4 ++-- ee/tables/filevault/filevault.go | 2 +- ee/tables/gsettings/gsettings.go | 2 +- ee/tables/gsettings/metadata.go | 2 +- ee/tables/ioreg/ioreg.go | 2 +- ee/tables/mdmclient/mdmclient.go | 2 +- ee/tables/profiles/profiles.go | 4 ++-- ee/tables/pwpolicy/pwpolicy.go | 2 +- ee/tables/secedit/secedit.go | 4 ++-- ee/tables/systemprofiler/systemprofiler.go | 2 +- ee/tables/wifi_networks/wifi_networks.go | 4 ++-- ee/tables/wmitable/wmitable.go | 2 +- ee/tables/xrdb/xrdb.go | 2 +- ee/tables/zfs/tables.go | 2 +- pkg/osquery/table/launcher_db_info.go | 2 +- pkg/osquery/table/platform_tables_darwin.go | 2 +- pkg/osquery/table/platform_tables_linux.go | 2 +- pkg/osquery/table/platform_tables_windows.go | 2 +- pkg/osquery/table/table.go | 4 ++-- 30 files changed, 35 insertions(+), 35 deletions(-) diff --git a/ee/tables/airport/table_darwin.go b/ee/tables/airport/table_darwin.go index ce208eb9b..bcf94833c 100644 --- a/ee/tables/airport/table_darwin.go +++ b/ee/tables/airport/table_darwin.go @@ -13,10 +13,10 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/ee/tables/dataflattentable" "github.com/kolide/launcher/ee/tables/tablehelpers" + "github.com/kolide/launcher/pkg/allowedcmd" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/ee/tables/apple_silicon_security_policy/table.go b/ee/tables/apple_silicon_security_policy/table.go index 1858f68cc..5c35554a3 100644 --- a/ee/tables/apple_silicon_security_policy/table.go +++ b/ee/tables/apple_silicon_security_policy/table.go @@ -10,10 +10,10 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/ee/tables/dataflattentable" "github.com/kolide/launcher/ee/tables/tablehelpers" + "github.com/kolide/launcher/pkg/allowedcmd" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/ee/tables/crowdstrike/falcon_kernel_check/table.go b/ee/tables/crowdstrike/falcon_kernel_check/table.go index ac10a7fa4..657dd780e 100644 --- a/ee/tables/crowdstrike/falcon_kernel_check/table.go +++ b/ee/tables/crowdstrike/falcon_kernel_check/table.go @@ -10,8 +10,8 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/ee/tables/tablehelpers" + "github.com/kolide/launcher/pkg/allowedcmd" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/ee/tables/crowdstrike/falconctl/table.go b/ee/tables/crowdstrike/falconctl/table.go index 280db69e8..178447cae 100644 --- a/ee/tables/crowdstrike/falconctl/table.go +++ b/ee/tables/crowdstrike/falconctl/table.go @@ -11,10 +11,10 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/ee/tables/dataflattentable" "github.com/kolide/launcher/ee/tables/tablehelpers" + "github.com/kolide/launcher/pkg/allowedcmd" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/ee/tables/crowdstrike/falconctl/table_test.go b/ee/tables/crowdstrike/falconctl/table_test.go index bb0486f06..e0c1a8554 100644 --- a/ee/tables/crowdstrike/falconctl/table_test.go +++ b/ee/tables/crowdstrike/falconctl/table_test.go @@ -10,8 +10,8 @@ import ( "testing" "github.com/go-kit/kit/log" - "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/ee/tables/tablehelpers" + "github.com/kolide/launcher/pkg/allowedcmd" "github.com/stretchr/testify/require" ) diff --git a/ee/tables/cryptoinfotable/table.go b/ee/tables/cryptoinfotable/table.go index 55a2f4ff9..399c4d4ac 100644 --- a/ee/tables/cryptoinfotable/table.go +++ b/ee/tables/cryptoinfotable/table.go @@ -11,10 +11,10 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/kolide/launcher/pkg/cryptoinfo" "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/ee/tables/dataflattentable" "github.com/kolide/launcher/ee/tables/tablehelpers" + "github.com/kolide/launcher/pkg/cryptoinfo" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/ee/tables/cryptsetup/table.go b/ee/tables/cryptsetup/table.go index 24123c6fb..8c1f675dc 100644 --- a/ee/tables/cryptsetup/table.go +++ b/ee/tables/cryptsetup/table.go @@ -10,10 +10,10 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/ee/tables/dataflattentable" "github.com/kolide/launcher/ee/tables/tablehelpers" + "github.com/kolide/launcher/pkg/allowedcmd" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/ee/tables/dataflattentable/exec.go b/ee/tables/dataflattentable/exec.go index 1ceee099e..ca16da38a 100644 --- a/ee/tables/dataflattentable/exec.go +++ b/ee/tables/dataflattentable/exec.go @@ -11,9 +11,9 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/ee/tables/tablehelpers" + "github.com/kolide/launcher/pkg/allowedcmd" "github.com/osquery/osquery-go/plugin/table" "github.com/pkg/errors" ) diff --git a/ee/tables/dataflattentable/exec_and_parse.go b/ee/tables/dataflattentable/exec_and_parse.go index 1832936ea..a91f55b98 100644 --- a/ee/tables/dataflattentable/exec_and_parse.go +++ b/ee/tables/dataflattentable/exec_and_parse.go @@ -7,9 +7,9 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/ee/tables/tablehelpers" + "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/pkg/traces" "github.com/osquery/osquery-go/plugin/table" "github.com/pkg/errors" diff --git a/ee/tables/dataflattentable/tables.go b/ee/tables/dataflattentable/tables.go index 43c47084a..e6aee2e17 100644 --- a/ee/tables/dataflattentable/tables.go +++ b/ee/tables/dataflattentable/tables.go @@ -8,9 +8,9 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/ee/tables/tablehelpers" + "github.com/kolide/launcher/pkg/allowedcmd" "github.com/osquery/osquery-go" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/ee/tables/dev_table_tooling/table.go b/ee/tables/dev_table_tooling/table.go index 30e94a274..449161efe 100644 --- a/ee/tables/dev_table_tooling/table.go +++ b/ee/tables/dev_table_tooling/table.go @@ -7,8 +7,8 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/ee/tables/tablehelpers" + "github.com/kolide/launcher/pkg/allowedcmd" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/ee/tables/dsim_default_associations/dsim_default_associations.go b/ee/tables/dsim_default_associations/dsim_default_associations.go index 6ed91c166..b19f592e7 100644 --- a/ee/tables/dsim_default_associations/dsim_default_associations.go +++ b/ee/tables/dsim_default_associations/dsim_default_associations.go @@ -14,11 +14,11 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/kolide/launcher/pkg/agent" - "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/ee/tables/dataflattentable" "github.com/kolide/launcher/ee/tables/tablehelpers" + "github.com/kolide/launcher/pkg/agent" + "github.com/kolide/launcher/pkg/allowedcmd" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/ee/tables/filevault/filevault.go b/ee/tables/filevault/filevault.go index 7696baf14..ee5a8fe04 100644 --- a/ee/tables/filevault/filevault.go +++ b/ee/tables/filevault/filevault.go @@ -11,8 +11,8 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/ee/tables/tablehelpers" + "github.com/kolide/launcher/pkg/allowedcmd" "github.com/osquery/osquery-go/plugin/table" "github.com/pkg/errors" ) diff --git a/ee/tables/gsettings/gsettings.go b/ee/tables/gsettings/gsettings.go index 7b2853dce..3ed8a0e81 100644 --- a/ee/tables/gsettings/gsettings.go +++ b/ee/tables/gsettings/gsettings.go @@ -19,9 +19,9 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/kolide/launcher/pkg/agent" "github.com/kolide/launcher/pkg/allowedcmd" - "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/ee/tables/gsettings/metadata.go b/ee/tables/gsettings/metadata.go index 9cf13c901..091ebe3c1 100644 --- a/ee/tables/gsettings/metadata.go +++ b/ee/tables/gsettings/metadata.go @@ -15,9 +15,9 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/kolide/launcher/pkg/agent" "github.com/kolide/launcher/pkg/allowedcmd" - "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/ee/tables/ioreg/ioreg.go b/ee/tables/ioreg/ioreg.go index 35f656a42..7cd1b16a6 100644 --- a/ee/tables/ioreg/ioreg.go +++ b/ee/tables/ioreg/ioreg.go @@ -16,10 +16,10 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/ee/tables/dataflattentable" "github.com/kolide/launcher/ee/tables/tablehelpers" + "github.com/kolide/launcher/pkg/allowedcmd" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/ee/tables/mdmclient/mdmclient.go b/ee/tables/mdmclient/mdmclient.go index 829badb93..b208726a8 100644 --- a/ee/tables/mdmclient/mdmclient.go +++ b/ee/tables/mdmclient/mdmclient.go @@ -16,10 +16,10 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/ee/tables/dataflattentable" "github.com/kolide/launcher/ee/tables/tablehelpers" + "github.com/kolide/launcher/pkg/allowedcmd" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/ee/tables/profiles/profiles.go b/ee/tables/profiles/profiles.go index ea4e9f142..fab6a015a 100644 --- a/ee/tables/profiles/profiles.go +++ b/ee/tables/profiles/profiles.go @@ -20,11 +20,11 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/kolide/launcher/pkg/agent" - "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/ee/tables/dataflattentable" "github.com/kolide/launcher/ee/tables/tablehelpers" + "github.com/kolide/launcher/pkg/agent" + "github.com/kolide/launcher/pkg/allowedcmd" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/ee/tables/pwpolicy/pwpolicy.go b/ee/tables/pwpolicy/pwpolicy.go index 5aff1d99b..dc15b04c3 100644 --- a/ee/tables/pwpolicy/pwpolicy.go +++ b/ee/tables/pwpolicy/pwpolicy.go @@ -19,10 +19,10 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/ee/tables/dataflattentable" "github.com/kolide/launcher/ee/tables/tablehelpers" + "github.com/kolide/launcher/pkg/allowedcmd" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/ee/tables/secedit/secedit.go b/ee/tables/secedit/secedit.go index 11a39c200..c06a252ed 100644 --- a/ee/tables/secedit/secedit.go +++ b/ee/tables/secedit/secedit.go @@ -16,11 +16,11 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/kolide/launcher/pkg/agent" - "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/ee/tables/dataflattentable" "github.com/kolide/launcher/ee/tables/tablehelpers" + "github.com/kolide/launcher/pkg/agent" + "github.com/kolide/launcher/pkg/allowedcmd" "github.com/osquery/osquery-go/plugin/table" "golang.org/x/text/encoding/unicode" diff --git a/ee/tables/systemprofiler/systemprofiler.go b/ee/tables/systemprofiler/systemprofiler.go index ea76b0b91..dbded3e33 100644 --- a/ee/tables/systemprofiler/systemprofiler.go +++ b/ee/tables/systemprofiler/systemprofiler.go @@ -47,9 +47,9 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" "github.com/groob/plist" - "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/ee/tables/dataflattentable" + "github.com/kolide/launcher/pkg/allowedcmd" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/ee/tables/wifi_networks/wifi_networks.go b/ee/tables/wifi_networks/wifi_networks.go index 9e833d0ae..b14579851 100644 --- a/ee/tables/wifi_networks/wifi_networks.go +++ b/ee/tables/wifi_networks/wifi_networks.go @@ -14,10 +14,10 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/kolide/launcher/pkg/agent" - "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/ee/tables/dataflattentable" + "github.com/kolide/launcher/pkg/agent" + "github.com/kolide/launcher/pkg/allowedcmd" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/ee/tables/wmitable/wmitable.go b/ee/tables/wmitable/wmitable.go index f76fcf60e..7ac7d8f22 100644 --- a/ee/tables/wmitable/wmitable.go +++ b/ee/tables/wmitable/wmitable.go @@ -9,11 +9,11 @@ import ( "strings" "time" - "github.com/kolide/launcher/pkg/contexts/ctxlog" "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/ee/tables/dataflattentable" "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/kolide/launcher/ee/wmi" + "github.com/kolide/launcher/pkg/contexts/ctxlog" "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" diff --git a/ee/tables/xrdb/xrdb.go b/ee/tables/xrdb/xrdb.go index 1a6cce818..e35a6108c 100644 --- a/ee/tables/xrdb/xrdb.go +++ b/ee/tables/xrdb/xrdb.go @@ -19,9 +19,9 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" + "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/kolide/launcher/pkg/agent" "github.com/kolide/launcher/pkg/allowedcmd" - "github.com/kolide/launcher/ee/tables/tablehelpers" "github.com/osquery/osquery-go/plugin/table" ) diff --git a/ee/tables/zfs/tables.go b/ee/tables/zfs/tables.go index dea04e069..6bbe728fe 100644 --- a/ee/tables/zfs/tables.go +++ b/ee/tables/zfs/tables.go @@ -13,8 +13,8 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/ee/tables/tablehelpers" + "github.com/kolide/launcher/pkg/allowedcmd" "github.com/osquery/osquery-go/plugin/table" "github.com/pkg/errors" ) diff --git a/pkg/osquery/table/launcher_db_info.go b/pkg/osquery/table/launcher_db_info.go index db8e52108..c860a908d 100644 --- a/pkg/osquery/table/launcher_db_info.go +++ b/pkg/osquery/table/launcher_db_info.go @@ -6,10 +6,10 @@ import ( "fmt" "strings" - "github.com/kolide/launcher/pkg/agent" "github.com/kolide/launcher/ee/dataflatten" "github.com/kolide/launcher/ee/tables/dataflattentable" "github.com/kolide/launcher/ee/tables/tablehelpers" + "github.com/kolide/launcher/pkg/agent" "github.com/osquery/osquery-go/plugin/table" "go.etcd.io/bbolt" ) diff --git a/pkg/osquery/table/platform_tables_darwin.go b/pkg/osquery/table/platform_tables_darwin.go index fd8d93a0f..744de15aa 100644 --- a/pkg/osquery/table/platform_tables_darwin.go +++ b/pkg/osquery/table/platform_tables_darwin.go @@ -7,7 +7,6 @@ import ( "github.com/go-kit/kit/log" "github.com/knightsc/system_policy/osquery/table/kextpolicy" "github.com/knightsc/system_policy/osquery/table/legacyexec" - "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/ee/tables/airport" appicons "github.com/kolide/launcher/ee/tables/app-icons" "github.com/kolide/launcher/ee/tables/apple_silicon_security_policy" @@ -26,6 +25,7 @@ import ( "github.com/kolide/launcher/ee/tables/pwpolicy" "github.com/kolide/launcher/ee/tables/systemprofiler" "github.com/kolide/launcher/ee/tables/zfs" + "github.com/kolide/launcher/pkg/allowedcmd" _ "github.com/mattn/go-sqlite3" osquery "github.com/osquery/osquery-go" "github.com/osquery/osquery-go/plugin/table" diff --git a/pkg/osquery/table/platform_tables_linux.go b/pkg/osquery/table/platform_tables_linux.go index c84bd6d67..3fcf4fc13 100644 --- a/pkg/osquery/table/platform_tables_linux.go +++ b/pkg/osquery/table/platform_tables_linux.go @@ -5,7 +5,6 @@ package table import ( "github.com/go-kit/kit/log" - "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/ee/tables/crowdstrike/falcon_kernel_check" "github.com/kolide/launcher/ee/tables/crowdstrike/falconctl" "github.com/kolide/launcher/ee/tables/cryptsetup" @@ -25,6 +24,7 @@ import ( "github.com/kolide/launcher/ee/tables/xfconf" "github.com/kolide/launcher/ee/tables/xrdb" "github.com/kolide/launcher/ee/tables/zfs" + "github.com/kolide/launcher/pkg/allowedcmd" osquery "github.com/osquery/osquery-go" ) diff --git a/pkg/osquery/table/platform_tables_windows.go b/pkg/osquery/table/platform_tables_windows.go index a3bb90621..4f3f68f11 100644 --- a/pkg/osquery/table/platform_tables_windows.go +++ b/pkg/osquery/table/platform_tables_windows.go @@ -4,7 +4,6 @@ package table import ( - "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/ee/tables/dataflattentable" "github.com/kolide/launcher/ee/tables/dsim_default_associations" "github.com/kolide/launcher/ee/tables/execparsers/dsregcmd" @@ -12,6 +11,7 @@ import ( "github.com/kolide/launcher/ee/tables/wifi_networks" "github.com/kolide/launcher/ee/tables/windowsupdatetable" "github.com/kolide/launcher/ee/tables/wmitable" + "github.com/kolide/launcher/pkg/allowedcmd" "github.com/go-kit/kit/log" osquery "github.com/osquery/osquery-go" diff --git a/pkg/osquery/table/table.go b/pkg/osquery/table/table.go index a7a9a94d6..1317cb3c8 100644 --- a/pkg/osquery/table/table.go +++ b/pkg/osquery/table/table.go @@ -1,8 +1,6 @@ package table import ( - "github.com/kolide/launcher/pkg/agent/types" - "github.com/kolide/launcher/pkg/allowedcmd" "github.com/kolide/launcher/ee/tables/cryptoinfotable" "github.com/kolide/launcher/ee/tables/dataflattentable" "github.com/kolide/launcher/ee/tables/desktopprocs" @@ -12,6 +10,8 @@ import ( "github.com/kolide/launcher/ee/tables/osquery_instance_history" "github.com/kolide/launcher/ee/tables/tdebug" "github.com/kolide/launcher/ee/tables/tufinfo" + "github.com/kolide/launcher/pkg/agent/types" + "github.com/kolide/launcher/pkg/allowedcmd" "github.com/go-kit/kit/log" osquery "github.com/osquery/osquery-go"