Rename project to Kolide Fleet (#1529)
This commit is contained in:
@@ -86,12 +86,12 @@ build: export GOGC = off
|
||||
build: export CGO_ENABLED=0
|
||||
build: .prefix
|
||||
go build -i -o ${OUTPUT} -ldflags "\
|
||||
-X github.com/kolide/kolide/server/version.version=${VERSION} \
|
||||
-X github.com/kolide/kolide/server/version.branch=${BRANCH} \
|
||||
-X github.com/kolide/kolide/server/version.revision=${REVISION} \
|
||||
-X github.com/kolide/kolide/server/version.buildDate=${NOW} \
|
||||
-X github.com/kolide/kolide/server/version.buildUser=${USER} \
|
||||
-X github.com/kolide/kolide/server/version.goVersion=${GOVERSION}"
|
||||
-X github.com/kolide/fleet/server/version.version=${VERSION} \
|
||||
-X github.com/kolide/fleet/server/version.branch=${BRANCH} \
|
||||
-X github.com/kolide/fleet/server/version.revision=${REVISION} \
|
||||
-X github.com/kolide/fleet/server/version.buildDate=${NOW} \
|
||||
-X github.com/kolide/fleet/server/version.buildUser=${USER} \
|
||||
-X github.com/kolide/fleet/server/version.goVersion=${GOVERSION}"
|
||||
|
||||
lint-js:
|
||||
eslint frontend --ext .js,.jsx
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Kolide [](https://circleci.com/gh/kolide/kolide)
|
||||
# Kolide Fleet [](https://circleci.com/gh/kolide/kolide)
|
||||
|
||||
### Effective Endpoint Security. At Any Scale.
|
||||
|
||||
|
||||
+3
-3
@@ -25,14 +25,14 @@ dependencies:
|
||||
|
||||
override:
|
||||
# workaround for https://github.com/yarnpkg/yarn/issues/1981
|
||||
- docker run -v $(pwd):/go/src/github.com/kolide/kolide -v /home/ubuntu/.go_workspace/pkg:/go/pkg --entrypoint /usr/bin/yarn kolide/kolide-builder:1.8 add --force node-sass
|
||||
- docker run -v $(pwd):/go/src/github.com/kolide/kolide -v /home/ubuntu/.go_workspace/pkg:/go/pkg kolide/kolide-builder:1.8 --deps
|
||||
- docker run -v $(pwd):/go/src/github.com/kolide/fleet -v /home/ubuntu/.go_workspace/pkg:/go/pkg --entrypoint /usr/bin/yarn kolide/kolide-builder:1.8 add --force node-sass
|
||||
- docker run -v $(pwd):/go/src/github.com/kolide/fleet -v /home/ubuntu/.go_workspace/pkg:/go/pkg kolide/kolide-builder:1.8 --deps
|
||||
|
||||
test:
|
||||
override:
|
||||
- docker run -d --name redis redis
|
||||
- docker run -d --name mysql -e MYSQL_ROOT_PASSWORD=toor -e MYSQL_DATABASE=kolide -e MYSQL_USER=kolide -e MYSQL_PASSWORD=kolide mysql:5.7
|
||||
- docker run --link redis:redis --link mysql:mysql -e MYSQL_TEST=true -e REDIS_TEST=true -v $(pwd):/go/src/github.com/kolide/kolide -v /home/ubuntu/.go_workspace/pkg:/go/pkg kolide/kolide-builder:1.8 --build
|
||||
- docker run --link redis:redis --link mysql:mysql -e MYSQL_TEST=true -e REDIS_TEST=true -v $(pwd):/go/src/github.com/kolide/fleet -v /home/ubuntu/.go_workspace/pkg:/go/pkg kolide/kolide-builder:1.8 --build
|
||||
- ./tools/ci/verify-dependencies-docs.sh
|
||||
- docker stop $(docker ps -a -q)
|
||||
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@ package cli
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/kolide/kolide/server/config"
|
||||
"github.com/kolide/fleet/server/config"
|
||||
|
||||
"github.com/spf13/cobra"
|
||||
"gopkg.in/yaml.v2"
|
||||
|
||||
+5
-5
@@ -8,11 +8,11 @@ import (
|
||||
|
||||
"github.com/WatchBeam/clock"
|
||||
kitlog "github.com/go-kit/kit/log"
|
||||
"github.com/kolide/kolide/server/config"
|
||||
"github.com/kolide/kolide/server/datastore/mysql"
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/kolide/server/pubsub"
|
||||
"github.com/kolide/kolide/server/service"
|
||||
"github.com/kolide/fleet/server/config"
|
||||
"github.com/kolide/fleet/server/datastore/mysql"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/kolide/fleet/server/pubsub"
|
||||
"github.com/kolide/fleet/server/service"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@ import (
|
||||
"fmt"
|
||||
"os"
|
||||
|
||||
"github.com/kolide/kolide/server/config"
|
||||
"github.com/kolide/fleet/server/config"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
|
||||
+9
-9
@@ -16,15 +16,15 @@ import (
|
||||
"github.com/e-dard/netbug"
|
||||
kitlog "github.com/go-kit/kit/log"
|
||||
kitprometheus "github.com/go-kit/kit/metrics/prometheus"
|
||||
"github.com/kolide/kolide/server/config"
|
||||
"github.com/kolide/kolide/server/datastore/mysql"
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/kolide/server/license"
|
||||
"github.com/kolide/kolide/server/mail"
|
||||
"github.com/kolide/kolide/server/pubsub"
|
||||
"github.com/kolide/kolide/server/service"
|
||||
"github.com/kolide/kolide/server/sso"
|
||||
"github.com/kolide/kolide/server/version"
|
||||
"github.com/kolide/fleet/server/config"
|
||||
"github.com/kolide/fleet/server/datastore/mysql"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/kolide/fleet/server/license"
|
||||
"github.com/kolide/fleet/server/mail"
|
||||
"github.com/kolide/fleet/server/pubsub"
|
||||
"github.com/kolide/fleet/server/service"
|
||||
"github.com/kolide/fleet/server/sso"
|
||||
"github.com/kolide/fleet/server/version"
|
||||
"github.com/prometheus/client_golang/prometheus"
|
||||
"github.com/prometheus/client_golang/prometheus/promhttp"
|
||||
"github.com/spf13/cobra"
|
||||
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
package cli
|
||||
|
||||
import (
|
||||
"github.com/kolide/kolide/server/config"
|
||||
"github.com/kolide/kolide/server/version"
|
||||
"github.com/kolide/fleet/server/config"
|
||||
"github.com/kolide/fleet/server/version"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
|
||||
+4
-4
@@ -10,7 +10,7 @@ The Kolide application is powered by a Go API server which serves three types of
|
||||
Only osquery agents should interact with the osquery API, but we'd like to support the eventual use of the Kolide API extensively. The API is not very well documented at all right now, but we have plans to:
|
||||
|
||||
- Generate and publish detailed documentation via a tool built using [test2doc](https://github.com/adams-sarah/test2doc) (or something competitive).
|
||||
- Release a JavaScript Kolide API client library (which would be derived from the [current](https://github.com/kolide/kolide/blob/master/frontend/kolide/index.js) JavaScript API client).
|
||||
- Release a JavaScript Kolide API client library (which would be derived from the [current](https://github.com/kolide/fleet/blob/master/frontend/kolide/index.js) JavaScript API client).
|
||||
- Commit to a stable, standardized API format that we can commit to supporting.
|
||||
|
||||
## Current API
|
||||
@@ -32,7 +32,7 @@ Each set of objects follows a similar REST access pattern.
|
||||
|
||||
Queries, packs, scheduled queries, labels, invites, users, sessions all behave this way. Some objects, like invites, have additional HTTP methods for additional functionality. Some objects, such as scheduled queries, are merely a relationship between two other objects (in this case, a query and a pack) with some details attached.
|
||||
|
||||
All of these objects are put together and distributed to the appropriate osquery agents at the appropriate time. At this time, the best source of truth for the API is the [HTTP handler file](https://github.com/kolide/kolide/blob/master/server/service/handler.go) in the Go application. The REST API is exposed via a transport layer on top of an RPC service which is implemented using a micro-service library called [Go Kit](https://github.com/go-kit/kit). If using the Kolide API is important to you right now, being familiar with Go Kit would definitely be helpful.
|
||||
All of these objects are put together and distributed to the appropriate osquery agents at the appropriate time. At this time, the best source of truth for the API is the [HTTP handler file](https://github.com/kolide/fleet/blob/master/server/service/handler.go) in the Go application. The REST API is exposed via a transport layer on top of an RPC service which is implemented using a micro-service library called [Go Kit](https://github.com/go-kit/kit). If using the Kolide API is important to you right now, being familiar with Go Kit would definitely be helpful.
|
||||
|
||||
Like it was said above, we have plans to include richer API documentation in the near future, so stay tuned. If using this API is important to you, please contact us at [support@kolide.co](mailto:support@kolide.co) and tell us, so that we can prioritize creating stable API documentation.
|
||||
|
||||
@@ -50,7 +50,7 @@ You can load packs, queries and other settings from an existing [Osquery configu
|
||||
|
||||
/api/v1/kolide/osquery/config/import
|
||||
```
|
||||
We provide [a utility program](https://github.com/kolide/configimporter) that will import the configuration automatically.
|
||||
We provide [a utility program](https://github.com/kolide/configimporter) that will import the configuration automatically.
|
||||
If you opt to manually import your Osquery configuration you will need to include the contents of externally
|
||||
referenced packs in your main Osquery configuration file before posting it to Kolide. If you reference packs
|
||||
in a file like the example below, you will need to get the pack from `external_pack.conf`
|
||||
@@ -88,4 +88,4 @@ and include it in the main configuration.
|
||||
}
|
||||
```
|
||||
Once the configuration file and all the external packs it references are consolidated, post the stringified contents of the configuration
|
||||
file to Kolide.
|
||||
file to Kolide.
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package: github.com/kolide/kolide
|
||||
package: github.com/kolide/fleet
|
||||
import:
|
||||
- package: github.com/alecthomas/template
|
||||
version: a0175ee3bccc567396460bf5acd36800cb10c49c
|
||||
|
||||
@@ -5,7 +5,7 @@ import (
|
||||
"time"
|
||||
|
||||
_ "github.com/go-sql-driver/mysql"
|
||||
"github.com/kolide/kolide/cli"
|
||||
"github.com/kolide/fleet/cli"
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
||||
@@ -5,7 +5,7 @@ package host
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
)
|
||||
|
||||
type key int
|
||||
|
||||
@@ -5,7 +5,7 @@ package viewer
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
)
|
||||
|
||||
type key int
|
||||
|
||||
@@ -3,7 +3,7 @@ package datastore
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
@@ -5,8 +5,8 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/WatchBeam/clock"
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/kolide/server/test"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/kolide/fleet/server/test"
|
||||
"github.com/patrickmn/sortutil"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
@@ -3,7 +3,7 @@ package datastore
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
@@ -3,7 +3,7 @@ package datastore
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
@@ -7,8 +7,8 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/WatchBeam/clock"
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/kolide/server/test"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/kolide/fleet/server/test"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
@@ -632,7 +632,7 @@ func testMarkHostSeen(t *testing.T, ds kolide.Datastore) {
|
||||
}
|
||||
|
||||
func testFlappingNetworkInterfaces(t *testing.T, ds kolide.Datastore) {
|
||||
// See https://github.com/kolide/kolide/issues/1278
|
||||
// See https://github.com/kolide/fleet/issues/1278
|
||||
host, err := ds.NewHost(&kolide.Host{
|
||||
DetailUpdateTime: time.Now(),
|
||||
SeenTime: time.Now(),
|
||||
|
||||
@@ -5,7 +5,7 @@ import (
|
||||
"fmt"
|
||||
"testing"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
@@ -7,7 +7,7 @@ import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
@@ -5,7 +5,7 @@ import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
@@ -3,7 +3,7 @@ package datastore
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
@@ -5,8 +5,8 @@ import (
|
||||
"sort"
|
||||
"testing"
|
||||
|
||||
"github.com/kolide/kolide/server/datastore/internal/appstate"
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/datastore/internal/appstate"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
@@ -4,8 +4,8 @@ import (
|
||||
"testing"
|
||||
|
||||
"github.com/WatchBeam/clock"
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/kolide/server/test"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/kolide/fleet/server/test"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
@@ -4,7 +4,7 @@ import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
|
||||
@@ -4,8 +4,8 @@ import (
|
||||
"fmt"
|
||||
"testing"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/kolide/server/test"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/kolide/fleet/server/test"
|
||||
"github.com/patrickmn/sortutil"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
@@ -3,8 +3,8 @@ package datastore
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/kolide/server/test"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/kolide/fleet/server/test"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
@@ -6,7 +6,7 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/WatchBeam/clock"
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
@@ -6,7 +6,7 @@ import (
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
)
|
||||
|
||||
func functionName(f func(*testing.T, kolide.Datastore)) string {
|
||||
|
||||
@@ -4,7 +4,7 @@ import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
@@ -4,7 +4,7 @@ import (
|
||||
"fmt"
|
||||
"testing"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ package datastore
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
@@ -3,7 +3,7 @@ package datastore
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package inmem
|
||||
|
||||
import "github.com/kolide/kolide/server/kolide"
|
||||
import "github.com/kolide/fleet/server/kolide"
|
||||
|
||||
func (d *Datastore) NewAppConfig(info *kolide.AppConfig) (*kolide.AppConfig, error) {
|
||||
d.mtx.Lock()
|
||||
|
||||
@@ -4,7 +4,7 @@ import (
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
)
|
||||
|
||||
func (d *Datastore) NewDistributedQueryCampaign(camp *kolide.DistributedQueryCampaign) (*kolide.DistributedQueryCampaign, error) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package inmem
|
||||
|
||||
import "github.com/kolide/kolide/server/kolide"
|
||||
import "github.com/kolide/fleet/server/kolide"
|
||||
|
||||
func (d *Datastore) SaveDecorator(dec *kolide.Decorator, opts ...kolide.OptionalArg) error {
|
||||
d.mtx.Lock()
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package inmem
|
||||
|
||||
import (
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
)
|
||||
|
||||
func (d *Datastore) NewFIMSection(fp *kolide.FIMSection, opts ...kolide.OptionalArg) (*kolide.FIMSection, error) {
|
||||
|
||||
@@ -6,7 +6,7 @@ import (
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/patrickmn/sortutil"
|
||||
)
|
||||
|
||||
|
||||
@@ -7,9 +7,9 @@ import (
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/kolide/kolide/server/config"
|
||||
"github.com/kolide/kolide/server/datastore/internal/appstate"
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/config"
|
||||
"github.com/kolide/fleet/server/datastore/internal/appstate"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/patrickmn/sortutil"
|
||||
)
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ package inmem
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ import (
|
||||
"sort"
|
||||
"time"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
)
|
||||
|
||||
// NewInvite creates and stores a new invitation in a DB.
|
||||
|
||||
@@ -7,7 +7,7 @@ import (
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/patrickmn/sortutil"
|
||||
)
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package inmem
|
||||
|
||||
import "github.com/kolide/kolide/server/kolide"
|
||||
import "github.com/kolide/fleet/server/kolide"
|
||||
|
||||
func (ds *Datastore) SaveLicense(token, key string) (*kolide.License, error) {
|
||||
panic("inmem is being deprecated")
|
||||
|
||||
@@ -3,7 +3,7 @@ package inmem
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/patrickmn/sortutil"
|
||||
)
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ package inmem
|
||||
import (
|
||||
"sort"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
)
|
||||
|
||||
func (d *Datastore) PackByName(name string, opts ...kolide.OptionalArg) (*kolide.Pack, bool, error) {
|
||||
|
||||
@@ -3,7 +3,7 @@ package inmem
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
)
|
||||
|
||||
func (d *Datastore) NewPasswordResetRequest(req *kolide.PasswordResetRequest) (*kolide.PasswordResetRequest, error) {
|
||||
|
||||
@@ -3,7 +3,7 @@ package inmem
|
||||
import (
|
||||
"sort"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ package inmem
|
||||
import (
|
||||
"sort"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
)
|
||||
|
||||
func (d *Datastore) NewScheduledQuery(sq *kolide.ScheduledQuery, opts ...kolide.OptionalArg) (*kolide.ScheduledQuery, error) {
|
||||
|
||||
@@ -3,7 +3,7 @@ package inmem
|
||||
import (
|
||||
"time"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
)
|
||||
|
||||
func (d *Datastore) SessionByKey(key string) (*kolide.Session, error) {
|
||||
|
||||
@@ -4,7 +4,7 @@ import (
|
||||
"fmt"
|
||||
"sort"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
)
|
||||
|
||||
func (d *Datastore) NewUser(user *kolide.User) (*kolide.User, error) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package inmem
|
||||
|
||||
import "github.com/kolide/kolide/server/kolide"
|
||||
import "github.com/kolide/fleet/server/kolide"
|
||||
|
||||
func (d *Datastore) NewYARASignatureGroup(ysg *kolide.YARASignatureGroup, opts ...kolide.OptionalArg) (*kolide.YARASignatureGroup, error) {
|
||||
d.mtx.Lock()
|
||||
|
||||
@@ -3,8 +3,8 @@ package datastore
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/kolide/kolide/server/config"
|
||||
"github.com/kolide/kolide/server/datastore/inmem"
|
||||
"github.com/kolide/fleet/server/config"
|
||||
"github.com/kolide/fleet/server/datastore/inmem"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package appstate
|
||||
|
||||
import "github.com/kolide/kolide/server/kolide"
|
||||
import "github.com/kolide/fleet/server/kolide"
|
||||
|
||||
// Labels is the set of builtin labels that should be populated in the
|
||||
// datastore
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package appstate
|
||||
|
||||
import "github.com/kolide/kolide/server/kolide"
|
||||
import "github.com/kolide/fleet/server/kolide"
|
||||
|
||||
// Options is the set of builtin osquery options that should be populated in
|
||||
// the datastore
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package mysql
|
||||
|
||||
import (
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ import (
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ package mysql
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
)
|
||||
|
||||
func TestAppendListOptionsToSQL(t *testing.T) {
|
||||
|
||||
@@ -5,7 +5,7 @@ import (
|
||||
|
||||
"github.com/pkg/errors"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
)
|
||||
|
||||
func (ds *Datastore) SaveDecorator(dec *kolide.Decorator, opts ...kolide.OptionalArg) error {
|
||||
|
||||
@@ -3,7 +3,7 @@ package mysql
|
||||
import (
|
||||
"database/sql"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/jmoiron/sqlx"
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/patrickmn/sortutil"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
@@ -4,7 +4,7 @@ import (
|
||||
"database/sql"
|
||||
"fmt"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/jmoiron/sqlx"
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ import (
|
||||
"fmt"
|
||||
|
||||
jwt "github.com/dgrijalva/jwt-go"
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
|
||||
@@ -3,8 +3,8 @@ package data
|
||||
import (
|
||||
"database/sql"
|
||||
|
||||
"github.com/kolide/kolide/server/datastore/internal/appstate"
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/datastore/internal/appstate"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
||||
@@ -3,7 +3,7 @@ package data
|
||||
import (
|
||||
"database/sql"
|
||||
|
||||
"github.com/kolide/kolide/server/datastore/internal/appstate"
|
||||
"github.com/kolide/fleet/server/datastore/internal/appstate"
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
||||
@@ -6,7 +6,7 @@ import (
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"github.com/kolide/kolide/server/datastore/internal/appstate"
|
||||
"github.com/kolide/fleet/server/datastore/internal/appstate"
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
||||
@@ -3,7 +3,7 @@ package data
|
||||
import (
|
||||
"database/sql"
|
||||
|
||||
"github.com/kolide/kolide/server/datastore/internal/appstate"
|
||||
"github.com/kolide/fleet/server/datastore/internal/appstate"
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
||||
@@ -3,7 +3,7 @@ package data
|
||||
import (
|
||||
"database/sql"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ package data
|
||||
import (
|
||||
"database/sql"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
||||
@@ -3,7 +3,7 @@ package data
|
||||
import (
|
||||
"database/sql"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
||||
@@ -4,7 +4,7 @@ import (
|
||||
"database/sql"
|
||||
"fmt"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
||||
@@ -12,10 +12,10 @@ import (
|
||||
"github.com/go-kit/kit/log"
|
||||
"github.com/go-sql-driver/mysql"
|
||||
"github.com/jmoiron/sqlx"
|
||||
"github.com/kolide/kolide/server/config"
|
||||
"github.com/kolide/kolide/server/datastore/mysql/migrations/data"
|
||||
"github.com/kolide/kolide/server/datastore/mysql/migrations/tables"
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/config"
|
||||
"github.com/kolide/fleet/server/datastore/mysql/migrations/data"
|
||||
"github.com/kolide/fleet/server/datastore/mysql/migrations/tables"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
|
||||
@@ -4,8 +4,8 @@ import (
|
||||
"database/sql"
|
||||
"fmt"
|
||||
|
||||
"github.com/kolide/kolide/server/datastore/internal/appstate"
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/datastore/internal/appstate"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ import (
|
||||
"database/sql"
|
||||
"fmt"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package mysql
|
||||
|
||||
import (
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ import (
|
||||
"database/sql"
|
||||
|
||||
"github.com/jmoiron/sqlx"
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ package mysql
|
||||
import (
|
||||
"database/sql"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package mysql
|
||||
|
||||
import (
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/jmoiron/sqlx"
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ import (
|
||||
"database/sql"
|
||||
"fmt"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ package mysql
|
||||
import (
|
||||
"database/sql"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
|
||||
@@ -7,8 +7,8 @@ import (
|
||||
"github.com/WatchBeam/clock"
|
||||
"github.com/go-kit/kit/log"
|
||||
_ "github.com/go-sql-driver/mysql"
|
||||
"github.com/kolide/kolide/server/config"
|
||||
"github.com/kolide/kolide/server/datastore/mysql"
|
||||
"github.com/kolide/fleet/server/config"
|
||||
"github.com/kolide/fleet/server/datastore/mysql"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ import (
|
||||
"context"
|
||||
"time"
|
||||
|
||||
"github.com/kolide/kolide/server/websocket"
|
||||
"github.com/kolide/fleet/server/websocket"
|
||||
)
|
||||
|
||||
// CampaignStore defines the distributed query campaign related datastore
|
||||
|
||||
@@ -11,8 +11,8 @@ import (
|
||||
|
||||
"github.com/WatchBeam/clock"
|
||||
"github.com/go-kit/kit/log"
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/kolide/server/version"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/kolide/fleet/server/version"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
|
||||
@@ -13,8 +13,8 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/WatchBeam/clock"
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/kolide/server/mock"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/kolide/fleet/server/mock"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@ import (
|
||||
"net/smtp"
|
||||
"time"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ import (
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ package mock
|
||||
//go:generate mockimpl -o datastore_packs.go "s *PackStore" "kolide.PackStore"
|
||||
//go:generate mockimpl -o datastore_hosts.go "s *HostStore" "kolide.HostStore"
|
||||
|
||||
import "github.com/kolide/kolide/server/kolide"
|
||||
import "github.com/kolide/fleet/server/kolide"
|
||||
|
||||
var _ kolide.Datastore = (*Store)(nil)
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
package mock
|
||||
|
||||
import "github.com/kolide/kolide/server/kolide"
|
||||
import "github.com/kolide/fleet/server/kolide"
|
||||
|
||||
var _ kolide.AppConfigStore = (*AppConfigStore)(nil)
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package mock
|
||||
|
||||
import "github.com/kolide/kolide/server/kolide"
|
||||
import "github.com/kolide/fleet/server/kolide"
|
||||
|
||||
func ReturnFakeAppConfig(fake *kolide.AppConfig) AppConfigFunc {
|
||||
return func() (*kolide.AppConfig, error) {
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
package mock
|
||||
|
||||
import "github.com/kolide/kolide/server/kolide"
|
||||
import "github.com/kolide/fleet/server/kolide"
|
||||
|
||||
var _ kolide.DecoratorStore = (*DecoratorStore)(nil)
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ package mock
|
||||
import (
|
||||
"time"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
)
|
||||
|
||||
var _ kolide.HostStore = (*HostStore)(nil)
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
package mock
|
||||
|
||||
import "github.com/kolide/kolide/server/kolide"
|
||||
import "github.com/kolide/fleet/server/kolide"
|
||||
|
||||
var _ kolide.InviteStore = (*InviteStore)(nil)
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package mock
|
||||
|
||||
import "github.com/kolide/kolide/server/kolide"
|
||||
import "github.com/kolide/fleet/server/kolide"
|
||||
|
||||
func ReturnNewInivite(fake *kolide.Invite) NewInviteFunc {
|
||||
return func(i *kolide.Invite) (*kolide.Invite, error) {
|
||||
|
||||
@@ -5,7 +5,7 @@ package mock
|
||||
import (
|
||||
"time"
|
||||
|
||||
"github.com/kolide/kolide/server/kolide"
|
||||
"github.com/kolide/fleet/server/kolide"
|
||||
)
|
||||
|
||||
var _ kolide.LabelStore = (*LabelStore)(nil)
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
package mock
|
||||
|
||||
import "github.com/kolide/kolide/server/kolide"
|
||||
import "github.com/kolide/fleet/server/kolide"
|
||||
|
||||
var _ kolide.LicenseStore = (*LicenseStore)(nil)
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
package mock
|
||||
|
||||
import "github.com/kolide/kolide/server/kolide"
|
||||
import "github.com/kolide/fleet/server/kolide"
|
||||
|
||||
var _ kolide.OptionStore = (*OptionStore)(nil)
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
package mock
|
||||
|
||||
import "github.com/kolide/kolide/server/kolide"
|
||||
import "github.com/kolide/fleet/server/kolide"
|
||||
|
||||
var _ kolide.PackStore = (*PackStore)(nil)
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
package mock
|
||||
|
||||
import "github.com/kolide/kolide/server/kolide"
|
||||
import "github.com/kolide/fleet/server/kolide"
|
||||
|
||||
var _ kolide.UserStore = (*UserStore)(nil)
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package mock
|
||||
|
||||
import "github.com/kolide/kolide/server/kolide"
|
||||
import "github.com/kolide/fleet/server/kolide"
|
||||
|
||||
func UserByEmailWithUser(u *kolide.User) UserByEmailFunc {
|
||||
return func(email string) (*kolide.User, error) {
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user