From 543979b720e032d15e7d60811729936416666f40 Mon Sep 17 00:00:00 2001 From: Zach Wasserman Date: Sun, 6 Jun 2021 15:29:41 -0700 Subject: [PATCH 1/2] Update module name in go.mod Prior to this change and since the move from kolide/osquery-go to osquery/osquery-go, attempting to use this package could result in an error such as: go: downloading github.com/osquery/osquery-go v0.0.0-20200604192029-b019be7063ac go get: github.com/osquery/osquery-go@none updating to github.com/osquery/osquery-go@v0.0.0-20200604192029-b019be7063ac: parsing go.mod: module declares its path as: github.com/kolide/osquery-go but was required as: github.com/osquery/osquery-go --- Makefile | 2 +- README.md | 14 +++++++------- client.go | 4 ++-- client_test.go | 4 ++-- examples/call/main.go | 2 +- examples/config/main.go | 4 ++-- examples/distributed/main.go | 4 ++-- examples/logger/main.go | 4 ++-- examples/query/main.go | 2 +- examples/table/main.go | 4 ++-- go.mod | 6 +++--- go.sum | 10 ++++------ mock/osquery.go | 2 +- mock_manager.go | 2 +- plugin/config/config.go | 2 +- plugin/config/config_test.go | 2 +- plugin/distributed/distributed.go | 2 +- plugin/distributed/distributed_test.go | 2 +- plugin/logger/logger.go | 2 +- plugin/logger/logger_test.go | 2 +- plugin/table/table.go | 2 +- plugin/table/table_test.go | 2 +- server.go | 4 ++-- server_test.go | 4 ++-- 24 files changed, 43 insertions(+), 45 deletions(-) diff --git a/Makefile b/Makefile index 0075cce..6cb92dd 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ deps: deps-go gen: ./osquery.thrift mkdir -p ./gen - thrift --gen go:package_prefix=github.com/kolide/osquery-go/gen/ -out ./gen ./osquery.thrift + thrift --gen go:package_prefix=github.com/osquery/osquery-go/gen/ -out ./gen ./osquery.thrift rm -rf gen/osquery/extension-remote gen/osquery/extension_manager-remote gofmt -w ./gen diff --git a/README.md b/README.md index a4ffd27..e37bfec 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # osquery-go -[![CircleCI](https://circleci.com/gh/kolide/osquery-go/tree/master.svg?style=svg)](https://circleci.com/gh/kolide/osquery-go/tree/master) -[![GoDoc](https://godoc.org/github.com/kolide/osquery-go?status.svg)](http://godoc.org/github.com/kolide/osquery-go) +[![CircleCI](https://circleci.com/gh/osquery/osquery-go/tree/master.svg?style=svg)](https://circleci.com/gh/osquery/osquery-go/tree/master) +[![GoDoc](https://godoc.org/github.com/osquery/osquery-go?status.svg)](http://godoc.org/github.com/osquery/osquery-go) [osquery](https://github.com/facebook/osquery) exposes an operating system as a high-performance relational database. This allows you to write SQL-based queries to explore operating system data. With osquery, SQL tables represent abstract concepts such as running processes, loaded kernel modules, open network connections, browser plugins, hardware events or file hashes. @@ -17,8 +17,8 @@ To install this library in your `GOPATH`: ``` mkdir -p $GOPATH/src/github.com/kolide/ -git clone git@github.com:kolide/osquery-go.git $GOPATH/src/github.com/kolide/osquery-go -cd $GOPATH/src/github.com/kolide/osquery-go +git clone git@github.com:osquery/osquery-go.git $GOPATH/src/github.com/osquery/osquery-go +cd $GOPATH/src/github.com/osquery/osquery-go make deps ``` @@ -40,8 +40,8 @@ import ( "os" "flag" - "github.com/kolide/osquery-go" - "github.com/kolide/osquery-go/plugin/table" + "github.com/osquery/osquery-go" + "github.com/osquery/osquery-go/plugin/table" ) func main() { @@ -194,7 +194,7 @@ import ( "os" "time" - "github.com/kolide/osquery-go" + "github.com/osquery/osquery-go" ) func main() { diff --git a/client.go b/client.go index 35a67e2..905669b 100644 --- a/client.go +++ b/client.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/kolide/osquery-go/gen/osquery" - "github.com/kolide/osquery-go/transport" + "github.com/osquery/osquery-go/gen/osquery" + "github.com/osquery/osquery-go/transport" "github.com/pkg/errors" "github.com/apache/thrift/lib/go/thrift" diff --git a/client_test.go b/client_test.go index 126b124..dd14187 100644 --- a/client_test.go +++ b/client_test.go @@ -5,8 +5,8 @@ import ( "errors" "testing" - "github.com/kolide/osquery-go/gen/osquery" - "github.com/kolide/osquery-go/mock" + "github.com/osquery/osquery-go/gen/osquery" + "github.com/osquery/osquery-go/mock" "github.com/stretchr/testify/assert" ) diff --git a/examples/call/main.go b/examples/call/main.go index e0b7e0e..31f7c93 100644 --- a/examples/call/main.go +++ b/examples/call/main.go @@ -5,7 +5,7 @@ import ( "os" "time" - "github.com/kolide/osquery-go" + "github.com/osquery/osquery-go" ) func main() { diff --git a/examples/config/main.go b/examples/config/main.go index fa3518f..80e74af 100644 --- a/examples/config/main.go +++ b/examples/config/main.go @@ -6,8 +6,8 @@ import ( "log" "time" - "github.com/kolide/osquery-go" - "github.com/kolide/osquery-go/plugin/config" + "github.com/osquery/osquery-go" + "github.com/osquery/osquery-go/plugin/config" ) var ( diff --git a/examples/distributed/main.go b/examples/distributed/main.go index ff43171..84369d1 100644 --- a/examples/distributed/main.go +++ b/examples/distributed/main.go @@ -6,8 +6,8 @@ import ( "fmt" "log" - "github.com/kolide/osquery-go" - "github.com/kolide/osquery-go/plugin/distributed" + "github.com/osquery/osquery-go" + "github.com/osquery/osquery-go/plugin/distributed" ) func main() { diff --git a/examples/logger/main.go b/examples/logger/main.go index b42ca55..6ee77d1 100644 --- a/examples/logger/main.go +++ b/examples/logger/main.go @@ -5,8 +5,8 @@ import ( "flag" "log" - "github.com/kolide/osquery-go" - "github.com/kolide/osquery-go/plugin/logger" + "github.com/osquery/osquery-go" + "github.com/osquery/osquery-go/plugin/logger" ) func main() { diff --git a/examples/query/main.go b/examples/query/main.go index 3ca51dd..bf50b14 100644 --- a/examples/query/main.go +++ b/examples/query/main.go @@ -5,7 +5,7 @@ import ( "os" "time" - "github.com/kolide/osquery-go" + "github.com/osquery/osquery-go" ) func main() { diff --git a/examples/table/main.go b/examples/table/main.go index d4f5d16..ed6eba5 100644 --- a/examples/table/main.go +++ b/examples/table/main.go @@ -6,8 +6,8 @@ import ( "log" "time" - "github.com/kolide/osquery-go" - "github.com/kolide/osquery-go/plugin/table" + "github.com/osquery/osquery-go" + "github.com/osquery/osquery-go/plugin/table" ) var ( diff --git a/go.mod b/go.mod index 78c5b4c..396b123 100644 --- a/go.mod +++ b/go.mod @@ -1,13 +1,13 @@ -module github.com/kolide/osquery-go +module github.com/osquery/osquery-go require ( github.com/Microsoft/go-winio v0.4.9 github.com/apache/thrift v0.13.1-0.20200603211036-eac4d0c79a5f - github.com/davecgh/go-spew v1.1.0 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect github.com/pkg/errors v0.8.0 github.com/pmezard/go-difflib v1.0.0 // indirect github.com/stretchr/testify v1.2.2 - golang.org/x/sys v0.0.0-20180815093151-14742f9018cd // indirect + golang.org/x/sys v0.0.0-20210603125802-9665404d3644 // indirect ) go 1.13 diff --git a/go.sum b/go.sum index a81fb25..bbfae80 100644 --- a/go.sum +++ b/go.sum @@ -1,16 +1,14 @@ github.com/Microsoft/go-winio v0.4.9 h1:3RbgqgGVqmcpbOiwrjbVtDHLlJBGF6aE+yHmNtBNsFQ= github.com/Microsoft/go-winio v0.4.9/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= -github.com/apache/thrift v0.13.0 h1:5hryIiq9gtn+MiLVn0wP37kb/uTeRZgN08WoCsAhIhI= -github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apache/thrift v0.13.1-0.20200603211036-eac4d0c79a5f h1:33BV5v3u8I6dA2dEoPuXWCsAaHHOJfPtdxZhAMQV4uo= github.com/apache/thrift v0.13.1-0.20200603211036-eac4d0c79a5f/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -golang.org/x/sys v0.0.0-20180815093151-14742f9018cd h1:Vdp9FdQnZJQQF78wgpudgkchp80Nu37AWr8+mprtgAo= -golang.org/x/sys v0.0.0-20180815093151-14742f9018cd/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20210603125802-9665404d3644 h1:CA1DEQ4NdKphKeL70tvsWNdT5oFh1lOjihRcEDROi0I= +golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/mock/osquery.go b/mock/osquery.go index 3b0707e..701b794 100644 --- a/mock/osquery.go +++ b/mock/osquery.go @@ -5,7 +5,7 @@ package mock import ( "context" - "github.com/kolide/osquery-go/gen/osquery" + "github.com/osquery/osquery-go/gen/osquery" ) var _ osquery.ExtensionManager = (*ExtensionManager)(nil) diff --git a/mock_manager.go b/mock_manager.go index 81ff76c..d602435 100644 --- a/mock_manager.go +++ b/mock_manager.go @@ -2,7 +2,7 @@ package osquery -import "github.com/kolide/osquery-go/gen/osquery" +import "github.com/osquery/osquery-go/gen/osquery" var _ ExtensionManager = (*MockExtensionManager)(nil) diff --git a/plugin/config/config.go b/plugin/config/config.go index 7d96e7c..e4007c2 100644 --- a/plugin/config/config.go +++ b/plugin/config/config.go @@ -6,7 +6,7 @@ package config import ( "context" - "github.com/kolide/osquery-go/gen/osquery" + "github.com/osquery/osquery-go/gen/osquery" ) // GenerateConfigsFunc returns the configurations generated by this plugin. diff --git a/plugin/config/config_test.go b/plugin/config/config_test.go index 8808794..81c160a 100644 --- a/plugin/config/config_test.go +++ b/plugin/config/config_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/kolide/osquery-go/gen/osquery" + "github.com/osquery/osquery-go/gen/osquery" "github.com/stretchr/testify/assert" ) diff --git a/plugin/distributed/distributed.go b/plugin/distributed/distributed.go index cee2669..fdb7128 100644 --- a/plugin/distributed/distributed.go +++ b/plugin/distributed/distributed.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "github.com/kolide/osquery-go/gen/osquery" + "github.com/osquery/osquery-go/gen/osquery" ) // GetQueriesResult contains the information about which queries the diff --git a/plugin/distributed/distributed_test.go b/plugin/distributed/distributed_test.go index 1ff3d3d..3666993 100644 --- a/plugin/distributed/distributed_test.go +++ b/plugin/distributed/distributed_test.go @@ -9,7 +9,7 @@ import ( "sort" "testing" - "github.com/kolide/osquery-go/gen/osquery" + "github.com/osquery/osquery-go/gen/osquery" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/plugin/logger/logger.go b/plugin/logger/logger.go index 1160812..58b1a6a 100644 --- a/plugin/logger/logger.go +++ b/plugin/logger/logger.go @@ -8,7 +8,7 @@ import ( "context" "encoding/json" - "github.com/kolide/osquery-go/gen/osquery" + "github.com/osquery/osquery-go/gen/osquery" ) // LogFunc is the logger function used by an osquery Logger plugin. diff --git a/plugin/logger/logger_test.go b/plugin/logger/logger_test.go index 80a5529..ecc6d90 100644 --- a/plugin/logger/logger_test.go +++ b/plugin/logger/logger_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/kolide/osquery-go/gen/osquery" + "github.com/osquery/osquery-go/gen/osquery" "github.com/stretchr/testify/assert" ) diff --git a/plugin/table/table.go b/plugin/table/table.go index 8caf106..92fd27b 100644 --- a/plugin/table/table.go +++ b/plugin/table/table.go @@ -6,7 +6,7 @@ import ( "encoding/json" "strconv" - "github.com/kolide/osquery-go/gen/osquery" + "github.com/osquery/osquery-go/gen/osquery" "github.com/pkg/errors" ) diff --git a/plugin/table/table_test.go b/plugin/table/table_test.go index fa78832..4530e3e 100644 --- a/plugin/table/table_test.go +++ b/plugin/table/table_test.go @@ -6,7 +6,7 @@ import ( "errors" "testing" - "github.com/kolide/osquery-go/gen/osquery" + "github.com/osquery/osquery-go/gen/osquery" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/server.go b/server.go index 8e87881..f1ea4e8 100644 --- a/server.go +++ b/server.go @@ -8,8 +8,8 @@ import ( "github.com/apache/thrift/lib/go/thrift" - "github.com/kolide/osquery-go/gen/osquery" - "github.com/kolide/osquery-go/transport" + "github.com/osquery/osquery-go/gen/osquery" + "github.com/osquery/osquery-go/transport" "github.com/pkg/errors" ) diff --git a/server_test.go b/server_test.go index af29b70..3c97b26 100644 --- a/server_test.go +++ b/server_test.go @@ -14,8 +14,8 @@ import ( "github.com/apache/thrift/lib/go/thrift" - "github.com/kolide/osquery-go/gen/osquery" - "github.com/kolide/osquery-go/plugin/logger" + "github.com/osquery/osquery-go/gen/osquery" + "github.com/osquery/osquery-go/plugin/logger" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) From 363089414cc2eb8b74619e5f56f442c9f96271fa Mon Sep 17 00:00:00 2001 From: Zach Wasserman Date: Sun, 6 Jun 2021 18:26:19 -0700 Subject: [PATCH 2/2] Update readme --- README.md | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index e37bfec..5879e06 100644 --- a/README.md +++ b/README.md @@ -13,16 +13,11 @@ In osquery, SQL tables, configuration retrieval, log handling, etc. are implemen ## Install -To install this library in your `GOPATH`: +This library is compatible with Go Modules. To install: +``` go +go get github.com/osquery/osquery-go ``` -mkdir -p $GOPATH/src/github.com/kolide/ -git clone git@github.com:osquery/osquery-go.git $GOPATH/src/github.com/osquery/osquery-go -cd $GOPATH/src/github.com/osquery/osquery-go -make deps -``` - -Alternatively, if you're using this in a project that uses a dependency management tool like [Glide](https://github.com/Masterminds/glide) or [Dep](https://github.com/golang/dep), then follow the relevant instructions provided by that tool. ## Using the library