Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Relicense the bulk of our tables to ee #1464

Merged
merged 5 commits into from
Nov 28, 2023
Merged

Relicense the bulk of our tables to ee #1464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
592c08b
move dataflatten
directionless Nov 17, 2023
8c9c465
move tables
directionless Nov 17, 2023
9485a8c
move wmi
directionless Nov 17, 2023
5dd4ec8
add note to tables.ext
directionless Nov 17, 2023
fa2b7c1
gofmt
directionless Nov 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions cmd/launcher.ext/launcher-extension.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"flag"
"fmt"
"os"
"strings"
"time"

"github.com/apache/thrift/lib/go/thrift"
Expand All @@ -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", "", "")
Expand All @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion pkg/dataflatten/examples/flatten/main.go → ee/dataflatten/examples/flatten/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
0 pkg/dataflatten/flatten.go → ee/dataflatten/flatten.go
View file
Open in desktop
File renamed without changes.
0 pkg/dataflatten/flatten_test.go → ee/dataflatten/flatten_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/dataflatten/ini.go → ee/dataflatten/ini.go
View file
Open in desktop
File renamed without changes.
0 pkg/dataflatten/ini_test.go → ee/dataflatten/ini_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/dataflatten/json.go → ee/dataflatten/json.go
View file
Open in desktop
File renamed without changes.
0 pkg/dataflatten/jsonl.go → ee/dataflatten/jsonl.go
View file
Open in desktop
File renamed without changes.
0 pkg/dataflatten/jwt.go → ee/dataflatten/jwt.go
View file
Open in desktop
File renamed without changes.
0 pkg/dataflatten/plist.go → ee/dataflatten/plist.go
View file
Open in desktop
File renamed without changes.
0 pkg/dataflatten/plist_test.go → ee/dataflatten/plist_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/dataflatten/row.go → ee/dataflatten/row.go
View file
Open in desktop
File renamed without changes.
0 pkg/dataflatten/row_test.go → ee/dataflatten/row_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/dataflatten/string_delimited.go → ee/dataflatten/string_delimited.go
View file
Open in desktop
File renamed without changes.
0 pkg/dataflatten/testdata/animals.json → ee/dataflatten/testdata/animals.json
View file
Open in desktop
File renamed without changes.
0 pkg/dataflatten/testdata/animals.jsonl → ee/dataflatten/testdata/animals.jsonl
View file
Open in desktop
File renamed without changes.
0 pkg/dataflatten/testdata/animals.plist → ee/dataflatten/testdata/animals.plist
View file
Open in desktop
File renamed without changes.
0 pkg/dataflatten/testdata/animals.xml → ee/dataflatten/testdata/animals.xml
View file
Open in desktop
File renamed without changes.
0 pkg/dataflatten/testdata/complex2.json → ee/dataflatten/testdata/complex2.json
View file
Open in desktop
File renamed without changes.
0 pkg/dataflatten/testdata/nested.json → ee/dataflatten/testdata/nested.json
View file
Open in desktop
File renamed without changes.
0 pkg/dataflatten/testdata/nested/Makefile → ee/dataflatten/testdata/nested/Makefile
View file
Open in desktop
File renamed without changes.
0 pkg/dataflatten/testdata/nested/README.md → ee/dataflatten/testdata/nested/README.md
View file
Open in desktop
File renamed without changes.
0 pkg/dataflatten/testdata/nested/inner.json → ee/dataflatten/testdata/nested/inner.json
View file
Open in desktop
File renamed without changes.
0 pkg/dataflatten/testdata/nested/nested.plist → ee/dataflatten/testdata/nested/nested.plist
View file
Open in desktop
File renamed without changes.
0 ...atten/testdata/nested/nested.template.xml → ...atten/testdata/nested/nested.template.xml
View file
Open in desktop
File renamed without changes.
0 pkg/dataflatten/testdata/nested/nested.xml → ee/dataflatten/testdata/nested/nested.xml
View file
Open in desktop
File renamed without changes.
0 pkg/dataflatten/testdata/secdata.ini → ee/dataflatten/testdata/secdata.ini
View file
Open in desktop
File renamed without changes.
0 pkg/dataflatten/xml.go → ee/dataflatten/xml.go
View file
Open in desktop
File renamed without changes.
0 pkg/osquery/tables/airport/mocks/executor.go → ee/tables/airport/mocks/executor.go
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions pkg/osquery/tables/airport/table_darwin.go → ee/tables/airport/table_darwin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import (

"github.com/go-kit/kit/log"
"github.com/go-kit/kit/log/level"
"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/kolide/launcher/pkg/dataflatten"
"github.com/kolide/launcher/pkg/osquery/tables/dataflattentable"
"github.com/kolide/launcher/pkg/osquery/tables/tablehelpers"
"github.com/osquery/osquery-go/plugin/table"
)

Expand Down
4 changes: 2 additions & 2 deletions ...query/tables/airport/table_darwin_test.go → ee/tables/airport/table_darwin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
0 ...tables/airport/testdata/getinfo.input.txt → ee/tables/airport/testdata/getinfo.input.txt
View file
Open in desktop
File renamed without changes.
0 ...bles/airport/testdata/getinfo.output.json → ...bles/airport/testdata/getinfo.output.json
View file
Open in desktop
File renamed without changes.
0 ...ort/testdata/getinfo_and_scan.output.json → ...ort/testdata/getinfo_and_scan.output.json
View file
Open in desktop
File renamed without changes.
0 ...a/getinfo_and_scan_with_query.output.json → ...a/getinfo_and_scan_with_query.output.json
View file
Open in desktop
File renamed without changes.
0 ...ry/tables/airport/testdata/scan.input.txt → ee/tables/airport/testdata/scan.input.txt
View file
Open in desktop
File renamed without changes.
0 .../tables/airport/testdata/scan.output.json → ee/tables/airport/testdata/scan.output.json
View file
Open in desktop
File renamed without changes.
0 ...port/testdata/scan_with_query.output.json → ...port/testdata/scan_with_query.output.json
View file
Open in desktop
File renamed without changes.
0 ...uery/tables/app-icons/app_icons_darwin.go → ee/tables/app-icons/app_icons_darwin.go
View file
Open in desktop
File renamed without changes.
0 ...s/apple_silicon_security_policy/parser.go → ...s/apple_silicon_security_policy/parser.go
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...es/apple_silicon_security_policy/table.go → ...es/apple_silicon_security_policy/table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (

"github.com/go-kit/kit/log"
"github.com/go-kit/kit/log/level"
"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/kolide/launcher/pkg/dataflatten"
"github.com/kolide/launcher/pkg/osquery/tables/dataflattentable"
"github.com/kolide/launcher/pkg/osquery/tables/tablehelpers"
"github.com/osquery/osquery-go/plugin/table"
)

Expand Down
0 ...ple_silicon_security_policy/table_test.go → ...ple_silicon_security_policy/table_test.go
View file
Open in desktop
File renamed without changes.
0 ...cy/test-data/bputil-failed-second-vol.txt → ...cy/test-data/bputil-failed-second-vol.txt
View file
Open in desktop
File renamed without changes.
0 ...cy/test-data/bputil-multiple-boot-vol.txt → ...cy/test-data/bputil-multiple-boot-vol.txt
View file
Open in desktop
File renamed without changes.
0 ..._policy/test-data/bputil-one-boot-vol.txt → ..._policy/test-data/bputil-one-boot-vol.txt
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .../crowdstrike/falcon_kernel_check/table.go → .../crowdstrike/falcon_kernel_check/table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ 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/allowedcmd"
"github.com/kolide/launcher/pkg/osquery/tables/tablehelpers"
"github.com/osquery/osquery-go/plugin/table"
)

Expand Down
0 ...dstrike/falcon_kernel_check/table_test.go → ...dstrike/falcon_kernel_check/table_test.go
View file
Open in desktop
File renamed without changes.
0 ...ry/tables/crowdstrike/falconctl/parser.go → ee/tables/crowdstrike/falconctl/parser.go
View file
Open in desktop
File renamed without changes.
0 ...bles/crowdstrike/falconctl/parser_test.go → ...bles/crowdstrike/falconctl/parser_test.go
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...ery/tables/crowdstrike/falconctl/table.go → ee/tables/crowdstrike/falconctl/table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (

"github.com/go-kit/kit/log"
"github.com/go-kit/kit/log/level"
"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/kolide/launcher/pkg/dataflatten"
"github.com/kolide/launcher/pkg/osquery/tables/dataflattentable"
"github.com/kolide/launcher/pkg/osquery/tables/tablehelpers"
"github.com/osquery/osquery-go/plugin/table"
)

Expand Down
2 changes: 1 addition & 1 deletion ...ables/crowdstrike/falconctl/table_test.go → ...ables/crowdstrike/falconctl/table_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"testing"

"github.com/go-kit/kit/log"
"github.com/kolide/launcher/ee/tables/tablehelpers"
"github.com/kolide/launcher/pkg/allowedcmd"
"github.com/kolide/launcher/pkg/osquery/tables/tablehelpers"
"github.com/stretchr/testify/require"
)

Expand Down
0 ...dstrike/falconctl/test-data/cid-error.txt → ...dstrike/falconctl/test-data/cid-error.txt
View file
Open in desktop
File renamed without changes.
0 ...owdstrike/falconctl/test-data/options.txt → ...owdstrike/falconctl/test-data/options.txt
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions pkg/osquery/tables/cryptoinfotable/table.go → ee/tables/cryptoinfotable/table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (

"github.com/go-kit/kit/log"
"github.com/go-kit/kit/log/level"
"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/kolide/launcher/pkg/dataflatten"
"github.com/kolide/launcher/pkg/osquery/tables/dataflattentable"
"github.com/kolide/launcher/pkg/osquery/tables/tablehelpers"
"github.com/osquery/osquery-go/plugin/table"
)

Expand Down
0 pkg/osquery/tables/cryptsetup/parser.go → ee/tables/cryptsetup/parser.go
View file
Open in desktop
File renamed without changes.
0 pkg/osquery/tables/cryptsetup/parser_test.go → ee/tables/cryptsetup/parser_test.go
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions pkg/osquery/tables/cryptsetup/table.go → ee/tables/cryptsetup/table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (

"github.com/go-kit/kit/log"
"github.com/go-kit/kit/log/level"
"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/kolide/launcher/pkg/dataflatten"
"github.com/kolide/launcher/pkg/osquery/tables/dataflattentable"
"github.com/kolide/launcher/pkg/osquery/tables/tablehelpers"
"github.com/osquery/osquery-go/plugin/table"
)

Expand Down
0 ...yptsetup/testdata/status-active-luks1.txt → ...yptsetup/testdata/status-active-luks1.txt
View file
Open in desktop
File renamed without changes.
0 ...yptsetup/testdata/status-active-luks2.txt → ...yptsetup/testdata/status-active-luks2.txt
View file
Open in desktop
File renamed without changes.
0 ...tsetup/testdata/status-active-mounted.txt → ...tsetup/testdata/status-active-mounted.txt
View file
Open in desktop
File renamed without changes.
0 ...setup/testdata/status-active-umounted.txt → ...setup/testdata/status-active-umounted.txt
View file
Open in desktop
File renamed without changes.
0 ...les/cryptsetup/testdata/status-active.txt → ...les/cryptsetup/testdata/status-active.txt
View file
Open in desktop
File renamed without changes.
0 ...bles/cryptsetup/testdata/status-error.txt → ...bles/cryptsetup/testdata/status-error.txt
View file
Open in desktop
File renamed without changes.
0 ...s/cryptsetup/testdata/status-inactive.txt → ...s/cryptsetup/testdata/status-inactive.txt
View file
Open in desktop
File renamed without changes.
0 ...s/cryptsetup/testdata/status-unactive.txt → ...s/cryptsetup/testdata/status-unactive.txt
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions pkg/osquery/tables/dataflattentable/exec.go → ee/tables/dataflattentable/exec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (

"github.com/go-kit/kit/log"
"github.com/go-kit/kit/log/level"
"github.com/kolide/launcher/ee/dataflatten"
"github.com/kolide/launcher/ee/tables/tablehelpers"
"github.com/kolide/launcher/pkg/allowedcmd"
"github.com/kolide/launcher/pkg/dataflatten"
"github.com/kolide/launcher/pkg/osquery/tables/tablehelpers"
"github.com/osquery/osquery-go/plugin/table"
"github.com/pkg/errors"
)
Expand Down
4 changes: 2 additions & 2 deletions ...tables/dataflattentable/exec_and_parse.go → ee/tables/dataflattentable/exec_and_parse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (

"github.com/go-kit/kit/log"
"github.com/go-kit/kit/log/level"
"github.com/kolide/launcher/ee/dataflatten"
"github.com/kolide/launcher/ee/tables/tablehelpers"
"github.com/kolide/launcher/pkg/allowedcmd"
"github.com/kolide/launcher/pkg/dataflatten"
"github.com/kolide/launcher/pkg/osquery/tables/tablehelpers"
"github.com/kolide/launcher/pkg/traces"
"github.com/osquery/osquery-go/plugin/table"
"github.com/pkg/errors"
Expand Down
2 changes: 1 addition & 1 deletion ...dataflattentable/flattener_from_parser.go → ...dataflattentable/flattener_from_parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"fmt"
"io"

"github.com/kolide/launcher/pkg/dataflatten"
"github.com/kolide/launcher/ee/dataflatten"
)

type parser interface {
Expand Down
2 changes: 1 addition & 1 deletion ...lattentable/flattener_from_parser_test.go → ...lattentable/flattener_from_parser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion ...squery/tables/dataflattentable/helpers.go → ee/tables/dataflattentable/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions ...ery/tables/dataflattentable/plist_test.go → ee/tables/dataflattentable/plist_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"sort"
"testing"

"github.com/kolide/launcher/pkg/dataflatten"
"github.com/kolide/launcher/pkg/osquery/tables/tablehelpers"
"github.com/kolide/launcher/ee/dataflatten"
"github.com/kolide/launcher/ee/tables/tablehelpers"
"github.com/stretchr/testify/require"
)

Expand Down
4 changes: 2 additions & 2 deletions ...osquery/tables/dataflattentable/tables.go → ee/tables/dataflattentable/tables.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (

"github.com/go-kit/kit/log"
"github.com/go-kit/kit/log/level"
"github.com/kolide/launcher/ee/dataflatten"
"github.com/kolide/launcher/ee/tables/tablehelpers"
"github.com/kolide/launcher/pkg/allowedcmd"
"github.com/kolide/launcher/pkg/dataflatten"
"github.com/kolide/launcher/pkg/osquery/tables/tablehelpers"
"github.com/osquery/osquery-go"
"github.com/osquery/osquery-go/plugin/table"
)
Expand Down
4 changes: 2 additions & 2 deletions ...ry/tables/dataflattentable/tables_test.go → ee/tables/dataflattentable/tables_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"testing"

"github.com/go-kit/kit/log"
"github.com/kolide/launcher/pkg/dataflatten"
"github.com/kolide/launcher/pkg/osquery/tables/tablehelpers"
"github.com/kolide/launcher/ee/dataflatten"
"github.com/kolide/launcher/ee/tables/tablehelpers"
"github.com/stretchr/testify/require"
)

Expand Down
0 ...tentable/testdata/NetworkInterfaces.plist → ...tentable/testdata/NetworkInterfaces.plist
View file
Open in desktop
File renamed without changes.
0 ...es/dataflattentable/testdata/animals.json → ...es/dataflattentable/testdata/animals.json
View file
Open in desktop
File renamed without changes.
0 ...s/dataflattentable/testdata/animals.plist → ...s/dataflattentable/testdata/animals.plist
View file
Open in desktop
File renamed without changes.
0 ...les/dataflattentable/testdata/animals.xml → ...les/dataflattentable/testdata/animals.xml
View file
Open in desktop
File renamed without changes.
0 ...ata/com.apple.launchservices.secure.plist → ...ata/com.apple.launchservices.secure.plist
View file
Open in desktop
File renamed without changes.
0 ...les/dataflattentable/testdata/secdata.ini → ...les/dataflattentable/testdata/secdata.ini
View file
Open in desktop
File renamed without changes.
0 ...bles/dataflattentable/testdata/simple.xml → ...bles/dataflattentable/testdata/simple.xml
View file
Open in desktop
File renamed without changes.
0 ...query/tables/desktopprocs/desktopprocs.go → ee/tables/desktopprocs/desktopprocs.go
View file
Open in desktop
File renamed without changes.
0 ...bles/dev_table_tooling/commands_darwin.go → ...bles/dev_table_tooling/commands_darwin.go
View file
Open in desktop
File renamed without changes.
0 ...ables/dev_table_tooling/commands_linux.go → ...ables/dev_table_tooling/commands_linux.go
View file
Open in desktop
File renamed without changes.
0 ...les/dev_table_tooling/commands_windows.go → ...les/dev_table_tooling/commands_windows.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...osquery/tables/dev_table_tooling/table.go → ee/tables/dev_table_tooling/table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ 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/allowedcmd"
"github.com/kolide/launcher/pkg/osquery/tables/tablehelpers"
"github.com/osquery/osquery-go/plugin/table"
)

Expand Down
2 changes: 1 addition & 1 deletion ...ry/tables/dev_table_tooling/table_test.go → ee/tables/dev_table_tooling/table_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
6 changes: 3 additions & 3 deletions ...associations/dsim_default_associations.go → ...associations/dsim_default_associations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ import (

"github.com/go-kit/kit/log"
"github.com/go-kit/kit/log/level"
"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/kolide/launcher/pkg/dataflatten"
"github.com/kolide/launcher/pkg/osquery/tables/dataflattentable"
"github.com/kolide/launcher/pkg/osquery/tables/tablehelpers"
"github.com/osquery/osquery-go/plugin/table"
)

Expand Down
0 pkg/osquery/tables/execparsers/apt/apt.go → ee/tables/execparsers/apt/apt.go
View file
Open in desktop
File renamed without changes.
0 pkg/osquery/tables/execparsers/apt/parser.go → ee/tables/execparsers/apt/parser.go
View file
Open in desktop
File renamed without changes.
0 ...ery/tables/execparsers/apt/parser_test.go → ee/tables/execparsers/apt/parser_test.go
View file
Open in desktop
File renamed without changes.
0 ...parsers/apt/test-data/apt_upgradeable.txt → ...parsers/apt/test-data/apt_upgradeable.txt
View file
Open in desktop
File renamed without changes.
0 pkg/osquery/tables/execparsers/dnf/dnf.go → ee/tables/execparsers/dnf/dnf.go
View file
Open in desktop
File renamed without changes.
0 pkg/osquery/tables/execparsers/dnf/parser.go → ee/tables/execparsers/dnf/parser.go
View file
Open in desktop
File renamed without changes.
0 ...ery/tables/execparsers/dnf/parser_test.go → ee/tables/execparsers/dnf/parser_test.go
View file
Open in desktop
File renamed without changes.
0 ...parsers/dnf/test-data/dnf_upgradeable.txt → ...parsers/dnf/test-data/dnf_upgradeable.txt
View file
Open in desktop
File renamed without changes.
0 pkg/osquery/tables/execparsers/dpkg/dpkg.go → ee/tables/execparsers/dpkg/dpkg.go
View file
Open in desktop
File renamed without changes.
0 ...osquery/tables/execparsers/dpkg/parser.go → ee/tables/execparsers/dpkg/parser.go
View file
Open in desktop
File renamed without changes.
0 ...ry/tables/execparsers/dpkg/parser_test.go → ee/tables/execparsers/dpkg/parser_test.go
View file
Open in desktop
File renamed without changes.
0 .../execparsers/dpkg/test-data/dpkg_info.txt → .../execparsers/dpkg/test-data/dpkg_info.txt
View file
Open in desktop
File renamed without changes.
0 ...y/tables/execparsers/dsregcmd/dsregcmd.go → ee/tables/execparsers/dsregcmd/dsregcmd.go
View file
Open in desktop
File renamed without changes.
0 ...uery/tables/execparsers/dsregcmd/parse.go → ee/tables/execparsers/dsregcmd/parse.go
View file
Open in desktop
File renamed without changes.
0 ...tables/execparsers/dsregcmd/parse_test.go → ee/tables/execparsers/dsregcmd/parse_test.go
View file
Open in desktop
File renamed without changes.
0 .../test-data/error_header_missing_line3.txt → .../test-data/error_header_missing_line3.txt
View file
Open in desktop
File renamed without changes.
0 ...d/test-data/error_lines_before_header.txt → ...d/test-data/error_lines_before_header.txt
View file
Open in desktop
File renamed without changes.
0 ...gcmd/test-data/error_no_section_title.txt → ...gcmd/test-data/error_no_section_title.txt
View file
Open in desktop
File renamed without changes.
0 ...md/test-data/not_configured.expected.json → ...md/test-data/not_configured.expected.json
View file
Open in desktop
File renamed without changes.
0 ...ers/dsregcmd/test-data/not_configured.txt → ...ers/dsregcmd/test-data/not_configured.txt
View file
Open in desktop
File renamed without changes.
0 .../execparsers/pacman/group/pacman_group.go → .../execparsers/pacman/group/pacman_group.go
View file
Open in desktop
File renamed without changes.
0 ...tables/execparsers/pacman/group/parser.go → ee/tables/execparsers/pacman/group/parser.go
View file
Open in desktop
File renamed without changes.
0 ...s/execparsers/pacman/group/parser_test.go → ...s/execparsers/pacman/group/parser_test.go
View file
Open in desktop
File renamed without changes.
0 ...s/pacman/group/test-data/pacman_group.txt → ...s/pacman/group/test-data/pacman_group.txt
View file
Open in desktop
File renamed without changes.
0 ...es/execparsers/pacman/info/pacman_info.go → ...es/execparsers/pacman/info/pacman_info.go
View file
Open in desktop
File renamed without changes.
0 .../tables/execparsers/pacman/info/parser.go → ee/tables/execparsers/pacman/info/parser.go
View file
Open in desktop
File renamed without changes.
0 ...es/execparsers/pacman/info/parser_test.go → ...es/execparsers/pacman/info/parser_test.go
View file
Open in desktop
File renamed without changes.
0 ...ers/pacman/info/test-data/pacman_info.txt → ...ers/pacman/info/test-data/pacman_info.txt
View file
Open in desktop
File renamed without changes.
0 .../pacman/upgradeable/pacman_upgradeable.go → .../pacman/upgradeable/pacman_upgradeable.go
View file
Open in desktop
File renamed without changes.
0 .../execparsers/pacman/upgradeable/parser.go → .../execparsers/pacman/upgradeable/parser.go
View file
Open in desktop
File renamed without changes.
0 ...parsers/pacman/upgradeable/parser_test.go → ...parsers/pacman/upgradeable/parser_test.go
View file
Open in desktop
File renamed without changes.
0 ...radeable/test-data/pacman_upgradeable.txt → ...radeable/test-data/pacman_upgradeable.txt
View file
Open in desktop
File renamed without changes.
0 ...ery/tables/execparsers/remotectl/parse.go → ee/tables/execparsers/remotectl/parse.go
View file
Open in desktop
File renamed without changes.
0 ...ables/execparsers/remotectl/parse_test.go → ...ables/execparsers/remotectl/parse_test.go
View file
Open in desktop
File renamed without changes.
0 ...tables/execparsers/remotectl/remotectl.go → ee/tables/execparsers/remotectl/remotectl.go
View file
Open in desktop
File renamed without changes.
0 ...ctl/test-data/dumpstate_with_features.txt → ...ctl/test-data/dumpstate_with_features.txt
View file
Open in desktop
File renamed without changes.
0 ...data/malformed_dumpstate_at_top_level.txt → ...data/malformed_dumpstate_at_top_level.txt
View file
Open in desktop
File renamed without changes.
0 ...ata/malformed_dumpstate_in_properties.txt → ...ata/malformed_dumpstate_in_properties.txt
View file
Open in desktop
File renamed without changes.
0 .../test-data/multiple_devices_dumpstate.txt → .../test-data/multiple_devices_dumpstate.txt
View file
Open in desktop
File renamed without changes.
0 ...ctl/test-data/single_device_dumpstate.txt → ...ctl/test-data/single_device_dumpstate.txt
View file
Open in desktop
File renamed without changes.
0 ...query/tables/execparsers/repcli/parser.go → ee/tables/execparsers/repcli/parser.go
View file
Open in desktop
File renamed without changes.
0 .../tables/execparsers/repcli/parser_test.go → ee/tables/execparsers/repcli/parser_test.go
View file
Open in desktop
File renamed without changes.
0 ...query/tables/execparsers/repcli/repcli.go → ee/tables/execparsers/repcli/repcli.go
View file
Open in desktop
File renamed without changes.
0 ...arsers/repcli/test-data/repcli_darwin.txt → ...arsers/repcli/test-data/repcli_darwin.txt
View file
Open in desktop
File renamed without changes.
0 ...parsers/repcli/test-data/repcli_linux.txt → ...parsers/repcli/test-data/repcli_linux.txt
View file
Open in desktop
File renamed without changes.
0 pkg/osquery/tables/execparsers/rpm/parser.go → ee/tables/execparsers/rpm/parser.go
View file
Open in desktop
File renamed without changes.
0 ...ery/tables/execparsers/rpm/parser_test.go → ee/tables/execparsers/rpm/parser_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/osquery/tables/execparsers/rpm/rpm.go → ee/tables/execparsers/rpm/rpm.go
View file
Open in desktop
File renamed without changes.
0 ...es/execparsers/rpm/test-data/rpm_info.txt → ...es/execparsers/rpm/test-data/rpm_info.txt
View file
Open in desktop
File renamed without changes.
0 ...tables/execparsers/simple_array/parser.go → ee/tables/execparsers/simple_array/parser.go
View file
Open in desktop
File renamed without changes.
0 ...s/execparsers/simple_array/parser_test.go → ...s/execparsers/simple_array/parser_test.go
View file
Open in desktop
File renamed without changes.
0 ...arsers/simple_array/test-data/complex.txt → ...arsers/simple_array/test-data/complex.txt
View file
Open in desktop
File renamed without changes.
0 ...parsers/simple_array/test-data/simple.txt → ...parsers/simple_array/test-data/simple.txt
View file
Open in desktop
File renamed without changes.
0 ...ables/execparsers/softwareupdate/parse.go → ...ables/execparsers/softwareupdate/parse.go
View file
Open in desktop
File renamed without changes.
0 .../execparsers/softwareupdate/parse_test.go → .../execparsers/softwareupdate/parse_test.go
View file
Open in desktop
File renamed without changes.
0 ...cparsers/softwareupdate/softwareupdate.go → ...cparsers/softwareupdate/softwareupdate.go
View file
Open in desktop
File renamed without changes.
0 ...est-data/beta-update-available-noscan.txt → ...est-data/beta-update-available-noscan.txt
View file
Open in desktop
File renamed without changes.
0 .../test-data/beta-update-available-scan.txt → .../test-data/beta-update-available-scan.txt
View file
Open in desktop
File renamed without changes.
0 ...s/softwareupdate/test-data/error-scan.txt → ...s/softwareupdate/test-data/error-scan.txt
View file
Open in desktop
File renamed without changes.
0 ...ata/multiple-updates-available-noscan.txt → ...ata/multiple-updates-available-noscan.txt
View file
Open in desktop
File renamed without changes.
0 .../test-data/no-update-available-noscan.txt → .../test-data/no-update-available-noscan.txt
View file
Open in desktop
File renamed without changes.
0 ...te/test-data/no-update-available-scan.txt → ...te/test-data/no-update-available-scan.txt
View file
Open in desktop
File renamed without changes.
0 ...ate/test-data/update-available-noscan.txt → ...ate/test-data/update-available-noscan.txt
View file
Open in desktop
File renamed without changes.
0 ...pdate/test-data/update-available-scan.txt → ...pdate/test-data/update-available-scan.txt
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/osquery/tables/filevault/filevault.go → ee/tables/filevault/filevault.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ 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/allowedcmd"
"github.com/kolide/launcher/pkg/osquery/tables/tablehelpers"
"github.com/osquery/osquery-go/plugin/table"
"github.com/pkg/errors"
)
Expand Down
6 changes: 3 additions & 3 deletions ...query/tables/firefox_preferences/table.go → ee/tables/firefox_preferences/table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (

"github.com/go-kit/kit/log"
"github.com/go-kit/kit/log/level"
"github.com/kolide/launcher/pkg/dataflatten"
"github.com/kolide/launcher/pkg/osquery/tables/dataflattentable"
"github.com/kolide/launcher/pkg/osquery/tables/tablehelpers"
"github.com/kolide/launcher/ee/dataflatten"
"github.com/kolide/launcher/ee/tables/dataflattentable"
"github.com/kolide/launcher/ee/tables/tablehelpers"
"github.com/osquery/osquery-go/plugin/table"
)

Expand Down
2 changes: 1 addition & 1 deletion .../tables/firefox_preferences/table_test.go → ee/tables/firefox_preferences/table_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
0 ...s/testdata/output.file_with_bad_data.json → ...s/testdata/output.file_with_bad_data.json
View file
Open in desktop
File renamed without changes.
0 ...ences/testdata/output.multiple_paths.json → ...ences/testdata/output.multiple_paths.json
View file
Open in desktop
File renamed without changes.
0 ...ferences/testdata/output.single_path.json → ...ferences/testdata/output.single_path.json
View file
Open in desktop
File renamed without changes.
0 ...stdata/output.single_path_with_query.json → ...stdata/output.single_path_with_query.json
View file
Open in desktop
File renamed without changes.
0 ...les/firefox_preferences/testdata/prefs.js → ...les/firefox_preferences/testdata/prefs.js
View file
Open in desktop
File renamed without changes.
0 ...es/firefox_preferences/testdata/prefs2.js → ...es/firefox_preferences/testdata/prefs2.js
View file
Open in desktop
File renamed without changes.
0 ...es/firefox_preferences/testdata/prefs3.js → ...es/firefox_preferences/testdata/prefs3.js
View file
Open in desktop
File renamed without changes.
0 ...y/tables/firmwarepasswd/firmwarepasswd.go → ee/tables/firmwarepasswd/firmwarepasswd.go
View file
Open in desktop
File renamed without changes.
0 ...les/firmwarepasswd/firmwarepasswd_test.go → ...les/firmwarepasswd/firmwarepasswd_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/osquery/tables/firmwarepasswd/parser.go → ee/tables/firmwarepasswd/parser.go
View file
Open in desktop
File renamed without changes.
0 ...firmwarepasswd/testdata/check-garbage.txt → ...firmwarepasswd/testdata/check-garbage.txt
View file
Open in desktop
File renamed without changes.
0 ...bles/firmwarepasswd/testdata/check-no.txt → ...bles/firmwarepasswd/testdata/check-no.txt
View file
Open in desktop
File renamed without changes.
0 ...les/firmwarepasswd/testdata/check-yes.txt → ...les/firmwarepasswd/testdata/check-yes.txt
View file
Open in desktop
File renamed without changes.
0 .../firmwarepasswd/testdata/mode-command.txt → .../firmwarepasswd/testdata/mode-command.txt
View file
Open in desktop
File renamed without changes.
0 ...les/firmwarepasswd/testdata/mode-none.txt → ...les/firmwarepasswd/testdata/mode-none.txt
View file
Open in desktop
File renamed without changes.
0 ...uery/tables/fscrypt_info/fscrypt_linux.go → ee/tables/fscrypt_info/fscrypt_linux.go
View file
Open in desktop
File renamed without changes.
0 pkg/osquery/tables/fscrypt_info/generate.go → ee/tables/fscrypt_info/generate.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ery/tables/fscrypt_info/generate_linux.go → ee/tables/fscrypt_info/generate_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
0 pkg/osquery/tables/fscrypt_info/table.go → ee/tables/fscrypt_info/table.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/osquery/tables/gsettings/gsettings.go → ee/tables/gsettings/gsettings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/pkg/osquery/tables/tablehelpers"
"github.com/osquery/osquery-go/plugin/table"
)

Expand Down
2 changes: 1 addition & 1 deletion ...squery/tables/gsettings/gsettings_test.go → ee/tables/gsettings/gsettings_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/osquery/tables/gsettings/metadata.go → ee/tables/gsettings/metadata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/pkg/osquery/tables/tablehelpers"
"github.com/osquery/osquery-go/plugin/table"
)

Expand Down
0 ...query/tables/gsettings/testdata/blank.txt → ee/tables/gsettings/testdata/blank.txt
View file
Open in desktop
File renamed without changes.
0 ...ry/tables/gsettings/testdata/listkeys.txt → ee/tables/gsettings/testdata/listkeys.txt
View file
Open in desktop
File renamed without changes.
0 ...tables/gsettings/testdata/seph-athena.txt → ee/tables/gsettings/testdata/seph-athena.txt
View file
Open in desktop
File renamed without changes.
0 ...uery/tables/gsettings/testdata/simple.txt → ee/tables/gsettings/testdata/simple.txt
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions pkg/osquery/tables/ioreg/ioreg.go → ee/tables/ioreg/ioreg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -16,10 +16,10 @@ import (

"github.com/go-kit/kit/log"
"github.com/go-kit/kit/log/level"
"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/kolide/launcher/pkg/dataflatten"
"github.com/kolide/launcher/pkg/osquery/tables/dataflattentable"
"github.com/kolide/launcher/pkg/osquery/tables/tablehelpers"
"github.com/osquery/osquery-go/plugin/table"
)

Expand Down
0 ...osquery/tables/launcher_db/launcher_db.go → ee/tables/launcher_db/launcher_db.go
View file
Open in desktop
File renamed without changes.
0 ...ry/tables/launcher_db/launcher_db_test.go → ee/tables/launcher_db/launcher_db_test.go
View file
Open in desktop
File renamed without changes.
0 .../macos_software_update/SUScanController.h → .../macos_software_update/SUScanController.h
View file
Open in desktop
File renamed without changes.
0 ...les/macos_software_update/SUSharedPrefs.h → ...les/macos_software_update/SUSharedPrefs.h
View file
Open in desktop
File renamed without changes.
0 ...s/macos_software_update/SUUpdateProduct.h → ...s/macos_software_update/SUUpdateProduct.h
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...ftware_update/available_products_table.go → ...ftware_update/available_products_table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import (

"github.com/go-kit/kit/log"
"github.com/go-kit/kit/log/level"
"github.com/kolide/launcher/pkg/dataflatten"
"github.com/kolide/launcher/pkg/osquery/tables/dataflattentable"
"github.com/kolide/launcher/pkg/osquery/tables/tablehelpers"
"github.com/kolide/launcher/ee/dataflatten"
"github.com/kolide/launcher/ee/tables/dataflattentable"
"github.com/kolide/launcher/ee/tables/tablehelpers"
"github.com/osquery/osquery-go/plugin/table"
)

Expand Down
6 changes: 3 additions & 3 deletions ...tware_update/recommended_updates_table.go → ...tware_update/recommended_updates_table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import (

"github.com/go-kit/kit/log"
"github.com/go-kit/kit/log/level"
"github.com/kolide/launcher/pkg/dataflatten"
"github.com/kolide/launcher/pkg/osquery/tables/dataflattentable"
"github.com/kolide/launcher/pkg/osquery/tables/tablehelpers"
"github.com/kolide/launcher/ee/dataflatten"
"github.com/kolide/launcher/ee/tables/dataflattentable"
"github.com/kolide/launcher/ee/tables/tablehelpers"
"github.com/osquery/osquery-go/plugin/table"
)

Expand Down
2 changes: 1 addition & 1 deletion ..._update/recommended_updates_table_test.go → ..._update/recommended_updates_table_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
0 ..._software_update/software_update_table.go → ..._software_update/software_update_table.go
View file
Open in desktop
File renamed without changes.
0 ...squery/tables/macos_software_update/sus.h → ee/tables/macos_software_update/sus.h
View file
Open in desktop
File renamed without changes.
0 ...squery/tables/macos_software_update/sus.m → ee/tables/macos_software_update/sus.m
View file
Open in desktop
File renamed without changes.
Loading
Loading