diff --git a/Makefile b/Makefile index 47a3ab1aa5..a5941e8467 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/README.md b/README.md index d6efd58b10..adb7fdddeb 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Kolide [![CircleCI](https://circleci.com/gh/kolide/kolide.svg?style=svg&circle-token=2573c239b7f18967040d2dec95ca5f71cfc90693)](https://circleci.com/gh/kolide/kolide) +# Kolide Fleet [![CircleCI](https://circleci.com/gh/kolide/kolide.svg?style=svg&circle-token=2573c239b7f18967040d2dec95ca5f71cfc90693)](https://circleci.com/gh/kolide/kolide) ### Effective Endpoint Security. At Any Scale. diff --git a/circle.yml b/circle.yml index b4a7869961..6044366b7c 100644 --- a/circle.yml +++ b/circle.yml @@ -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) diff --git a/cli/config_dump.go b/cli/config_dump.go index be977c045f..2ecaf837f5 100644 --- a/cli/config_dump.go +++ b/cli/config_dump.go @@ -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" diff --git a/cli/prepare.go b/cli/prepare.go index f46d78d2e9..d41cae6e3c 100644 --- a/cli/prepare.go +++ b/cli/prepare.go @@ -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" ) diff --git a/cli/root.go b/cli/root.go index afc82c28bf..e483c265e5 100644 --- a/cli/root.go +++ b/cli/root.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/kolide/kolide/server/config" + "github.com/kolide/fleet/server/config" "github.com/spf13/cobra" ) diff --git a/cli/serve.go b/cli/serve.go index d9e7e6ddaa..5d15e6f6f1 100644 --- a/cli/serve.go +++ b/cli/serve.go @@ -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" diff --git a/cli/version.go b/cli/version.go index 01f5fecb75..e654332df4 100644 --- a/cli/version.go +++ b/cli/version.go @@ -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" ) diff --git a/docs/api/README.md b/docs/api/README.md index 1d7b182bff..ad20025056 100644 --- a/docs/api/README.md +++ b/docs/api/README.md @@ -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. diff --git a/glide.yaml b/glide.yaml index 4c7d2cee38..aaf004ff4d 100644 --- a/glide.yaml +++ b/glide.yaml @@ -1,4 +1,4 @@ -package: github.com/kolide/kolide +package: github.com/kolide/fleet import: - package: github.com/alecthomas/template version: a0175ee3bccc567396460bf5acd36800cb10c49c diff --git a/main.go b/main.go index 8e132b8c4c..4563a61d7e 100644 --- a/main.go +++ b/main.go @@ -5,7 +5,7 @@ import ( "time" _ "github.com/go-sql-driver/mysql" - "github.com/kolide/kolide/cli" + "github.com/kolide/fleet/cli" ) func init() { diff --git a/server/contexts/host/host.go b/server/contexts/host/host.go index 4e5f11ad72..e235b28890 100644 --- a/server/contexts/host/host.go +++ b/server/contexts/host/host.go @@ -5,7 +5,7 @@ package host import ( "context" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) type key int diff --git a/server/contexts/viewer/viewer.go b/server/contexts/viewer/viewer.go index dc35ca8cef..41a9affde1 100644 --- a/server/contexts/viewer/viewer.go +++ b/server/contexts/viewer/viewer.go @@ -5,7 +5,7 @@ package viewer import ( "context" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) type key int diff --git a/server/datastore/datastore_app_test.go b/server/datastore/datastore_app_test.go index 879823c782..639363e34d 100644 --- a/server/datastore/datastore_app_test.go +++ b/server/datastore/datastore_app_test.go @@ -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" ) diff --git a/server/datastore/datastore_campaigns_test.go b/server/datastore/datastore_campaigns_test.go index 5fed074ee5..531a5e5950 100644 --- a/server/datastore/datastore_campaigns_test.go +++ b/server/datastore/datastore_campaigns_test.go @@ -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" diff --git a/server/datastore/datastore_decorators_test.go b/server/datastore/datastore_decorators_test.go index 216bf71914..d125e748b1 100644 --- a/server/datastore/datastore_decorators_test.go +++ b/server/datastore/datastore_decorators_test.go @@ -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" ) diff --git a/server/datastore/datastore_email_changes_test.go b/server/datastore/datastore_email_changes_test.go index 089f8f7dcf..2796851500 100644 --- a/server/datastore/datastore_email_changes_test.go +++ b/server/datastore/datastore_email_changes_test.go @@ -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" ) diff --git a/server/datastore/datastore_hosts_test.go b/server/datastore/datastore_hosts_test.go index 62201ef486..6d3832b976 100644 --- a/server/datastore/datastore_hosts_test.go +++ b/server/datastore/datastore_hosts_test.go @@ -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(), diff --git a/server/datastore/datastore_invites_test.go b/server/datastore/datastore_invites_test.go index a0dc9220d3..78516ae649 100644 --- a/server/datastore/datastore_invites_test.go +++ b/server/datastore/datastore_invites_test.go @@ -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" ) diff --git a/server/datastore/datastore_labels_test.go b/server/datastore/datastore_labels_test.go index c89ef9fe4d..785d7e03c7 100644 --- a/server/datastore/datastore_labels_test.go +++ b/server/datastore/datastore_labels_test.go @@ -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" ) diff --git a/server/datastore/datastore_licenses_test.go b/server/datastore/datastore_licenses_test.go index d231c11711..5e859096a3 100644 --- a/server/datastore/datastore_licenses_test.go +++ b/server/datastore/datastore_licenses_test.go @@ -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" ) diff --git a/server/datastore/datastore_migrations_test.go b/server/datastore/datastore_migrations_test.go index 1054dfc2a4..0fe23f393e 100644 --- a/server/datastore/datastore_migrations_test.go +++ b/server/datastore/datastore_migrations_test.go @@ -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" ) diff --git a/server/datastore/datastore_options_test.go b/server/datastore/datastore_options_test.go index 553d7fcacf..bc9c91cb73 100644 --- a/server/datastore/datastore_options_test.go +++ b/server/datastore/datastore_options_test.go @@ -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" ) diff --git a/server/datastore/datastore_packs_test.go b/server/datastore/datastore_packs_test.go index 826cb00154..616450ed5c 100644 --- a/server/datastore/datastore_packs_test.go +++ b/server/datastore/datastore_packs_test.go @@ -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" ) diff --git a/server/datastore/datastore_password_reset_test.go b/server/datastore/datastore_password_reset_test.go index 96e162638e..a96ea40f8b 100644 --- a/server/datastore/datastore_password_reset_test.go +++ b/server/datastore/datastore_password_reset_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" "github.com/stretchr/testify/assert" ) diff --git a/server/datastore/datastore_queries_test.go b/server/datastore/datastore_queries_test.go index c355583231..5f9eca7916 100644 --- a/server/datastore/datastore_queries_test.go +++ b/server/datastore/datastore_queries_test.go @@ -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" diff --git a/server/datastore/datastore_scheduled_queries_test.go b/server/datastore/datastore_scheduled_queries_test.go index 4005ed966b..ea9f6e98ca 100644 --- a/server/datastore/datastore_scheduled_queries_test.go +++ b/server/datastore/datastore_scheduled_queries_test.go @@ -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" ) diff --git a/server/datastore/datastore_targets_test.go b/server/datastore/datastore_targets_test.go index b54b1515be..5c7a9860ed 100644 --- a/server/datastore/datastore_targets_test.go +++ b/server/datastore/datastore_targets_test.go @@ -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" ) diff --git a/server/datastore/datastore_test.go b/server/datastore/datastore_test.go index 040d2196d7..b17adff7a2 100644 --- a/server/datastore/datastore_test.go +++ b/server/datastore/datastore_test.go @@ -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 { diff --git a/server/datastore/datastore_unicode_test.go b/server/datastore/datastore_unicode_test.go index 049569f70d..5b9351cda5 100644 --- a/server/datastore/datastore_unicode_test.go +++ b/server/datastore/datastore_unicode_test.go @@ -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" ) diff --git a/server/datastore/datastore_users_test.go b/server/datastore/datastore_users_test.go index ab4bef9ba5..dffdd6ba20 100644 --- a/server/datastore/datastore_users_test.go +++ b/server/datastore/datastore_users_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" "github.com/stretchr/testify/assert" ) diff --git a/server/datastore/datastore_yara_test.go b/server/datastore/datastore_yara_test.go index 85af901eea..2ff92e6463 100644 --- a/server/datastore/datastore_yara_test.go +++ b/server/datastore/datastore_yara_test.go @@ -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" ) diff --git a/server/datastore/file_integrity_monitoring_test.go b/server/datastore/file_integrity_monitoring_test.go index fd314cd199..556bb580e9 100644 --- a/server/datastore/file_integrity_monitoring_test.go +++ b/server/datastore/file_integrity_monitoring_test.go @@ -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" ) diff --git a/server/datastore/inmem/app.go b/server/datastore/inmem/app.go index 0b32a29905..1b7ac76ece 100644 --- a/server/datastore/inmem/app.go +++ b/server/datastore/inmem/app.go @@ -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() diff --git a/server/datastore/inmem/campaigns.go b/server/datastore/inmem/campaigns.go index 52c9d6c0d6..f99e4f7912 100644 --- a/server/datastore/inmem/campaigns.go +++ b/server/datastore/inmem/campaigns.go @@ -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) { diff --git a/server/datastore/inmem/decorators.go b/server/datastore/inmem/decorators.go index 0430675f17..bb56a14dde 100644 --- a/server/datastore/inmem/decorators.go +++ b/server/datastore/inmem/decorators.go @@ -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() diff --git a/server/datastore/inmem/file_integrity_monitoring.go b/server/datastore/inmem/file_integrity_monitoring.go index 1d8935fd08..40e5a6c890 100644 --- a/server/datastore/inmem/file_integrity_monitoring.go +++ b/server/datastore/inmem/file_integrity_monitoring.go @@ -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) { diff --git a/server/datastore/inmem/hosts.go b/server/datastore/inmem/hosts.go index 9a3d06e3aa..74edd29eea 100644 --- a/server/datastore/inmem/hosts.go +++ b/server/datastore/inmem/hosts.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" "github.com/patrickmn/sortutil" ) diff --git a/server/datastore/inmem/inmem.go b/server/datastore/inmem/inmem.go index a0ed7660a9..f9bef1cfae 100644 --- a/server/datastore/inmem/inmem.go +++ b/server/datastore/inmem/inmem.go @@ -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" ) diff --git a/server/datastore/inmem/inmem_test.go b/server/datastore/inmem/inmem_test.go index f74a7afd82..7617e9de82 100644 --- a/server/datastore/inmem/inmem_test.go +++ b/server/datastore/inmem/inmem_test.go @@ -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" ) diff --git a/server/datastore/inmem/invites.go b/server/datastore/inmem/invites.go index 2938b062d6..5d8f14ba37 100644 --- a/server/datastore/inmem/invites.go +++ b/server/datastore/inmem/invites.go @@ -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. diff --git a/server/datastore/inmem/labels.go b/server/datastore/inmem/labels.go index 05ced669f1..5cd6c200ea 100644 --- a/server/datastore/inmem/labels.go +++ b/server/datastore/inmem/labels.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" "github.com/patrickmn/sortutil" ) diff --git a/server/datastore/inmem/licensure.go b/server/datastore/inmem/licensure.go index cc178e39c9..67e52e1140 100644 --- a/server/datastore/inmem/licensure.go +++ b/server/datastore/inmem/licensure.go @@ -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") diff --git a/server/datastore/inmem/options.go b/server/datastore/inmem/options.go index 98be4c09aa..ab41e6c611 100644 --- a/server/datastore/inmem/options.go +++ b/server/datastore/inmem/options.go @@ -3,7 +3,7 @@ package inmem import ( "fmt" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" "github.com/patrickmn/sortutil" ) diff --git a/server/datastore/inmem/packs.go b/server/datastore/inmem/packs.go index 33daaeecd4..f386f46712 100644 --- a/server/datastore/inmem/packs.go +++ b/server/datastore/inmem/packs.go @@ -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) { diff --git a/server/datastore/inmem/password_reset.go b/server/datastore/inmem/password_reset.go index 0167d8a4de..618dcf5a4f 100644 --- a/server/datastore/inmem/password_reset.go +++ b/server/datastore/inmem/password_reset.go @@ -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) { diff --git a/server/datastore/inmem/queries.go b/server/datastore/inmem/queries.go index a70d31540d..3c4805e082 100644 --- a/server/datastore/inmem/queries.go +++ b/server/datastore/inmem/queries.go @@ -3,7 +3,7 @@ package inmem import ( "sort" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" "github.com/pkg/errors" ) diff --git a/server/datastore/inmem/scheduled_queries.go b/server/datastore/inmem/scheduled_queries.go index 9de3de7ba8..89f0b9c8c1 100644 --- a/server/datastore/inmem/scheduled_queries.go +++ b/server/datastore/inmem/scheduled_queries.go @@ -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) { diff --git a/server/datastore/inmem/sessions.go b/server/datastore/inmem/sessions.go index cfa82fe21b..6d985d3a5f 100644 --- a/server/datastore/inmem/sessions.go +++ b/server/datastore/inmem/sessions.go @@ -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) { diff --git a/server/datastore/inmem/users.go b/server/datastore/inmem/users.go index ca8473697c..560b4adac4 100644 --- a/server/datastore/inmem/users.go +++ b/server/datastore/inmem/users.go @@ -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) { diff --git a/server/datastore/inmem/yara.go b/server/datastore/inmem/yara.go index 17b4724b15..8969231a61 100644 --- a/server/datastore/inmem/yara.go +++ b/server/datastore/inmem/yara.go @@ -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() diff --git a/server/datastore/inmem_test.go b/server/datastore/inmem_test.go index 4385a2c2d5..9da25d1c6f 100644 --- a/server/datastore/inmem_test.go +++ b/server/datastore/inmem_test.go @@ -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" ) diff --git a/server/datastore/internal/appstate/labels.go b/server/datastore/internal/appstate/labels.go index 248cc5949c..ece20a5166 100644 --- a/server/datastore/internal/appstate/labels.go +++ b/server/datastore/internal/appstate/labels.go @@ -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 diff --git a/server/datastore/internal/appstate/options.go b/server/datastore/internal/appstate/options.go index 32b535b4b2..1a11f057eb 100644 --- a/server/datastore/internal/appstate/options.go +++ b/server/datastore/internal/appstate/options.go @@ -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 diff --git a/server/datastore/mysql/app_configs.go b/server/datastore/mysql/app_configs.go index 68cd36cf35..fbc170b0f1 100644 --- a/server/datastore/mysql/app_configs.go +++ b/server/datastore/mysql/app_configs.go @@ -1,7 +1,7 @@ package mysql import ( - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" "github.com/pkg/errors" ) diff --git a/server/datastore/mysql/campaigns.go b/server/datastore/mysql/campaigns.go index 75b655e21e..619a2f5d39 100644 --- a/server/datastore/mysql/campaigns.go +++ b/server/datastore/mysql/campaigns.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" "github.com/pkg/errors" ) diff --git a/server/datastore/mysql/datastore_test.go b/server/datastore/mysql/datastore_test.go index dc931e5060..21296e500a 100644 --- a/server/datastore/mysql/datastore_test.go +++ b/server/datastore/mysql/datastore_test.go @@ -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) { diff --git a/server/datastore/mysql/decorators.go b/server/datastore/mysql/decorators.go index e9de9c1529..455b59b077 100644 --- a/server/datastore/mysql/decorators.go +++ b/server/datastore/mysql/decorators.go @@ -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 { diff --git a/server/datastore/mysql/file_integrity_monitoring.go b/server/datastore/mysql/file_integrity_monitoring.go index 23d871c45e..946b3ad62a 100644 --- a/server/datastore/mysql/file_integrity_monitoring.go +++ b/server/datastore/mysql/file_integrity_monitoring.go @@ -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" ) diff --git a/server/datastore/mysql/hosts.go b/server/datastore/mysql/hosts.go index acbd88746c..23292a5695 100644 --- a/server/datastore/mysql/hosts.go +++ b/server/datastore/mysql/hosts.go @@ -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" ) diff --git a/server/datastore/mysql/invites.go b/server/datastore/mysql/invites.go index 1e30230882..c0551d7d21 100644 --- a/server/datastore/mysql/invites.go +++ b/server/datastore/mysql/invites.go @@ -4,7 +4,7 @@ import ( "database/sql" "fmt" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" "github.com/pkg/errors" ) diff --git a/server/datastore/mysql/labels.go b/server/datastore/mysql/labels.go index 859a15aed0..7f39f79231 100644 --- a/server/datastore/mysql/labels.go +++ b/server/datastore/mysql/labels.go @@ -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" ) diff --git a/server/datastore/mysql/licenses.go b/server/datastore/mysql/licenses.go index 844bd2dee8..c29c5fb5d0 100644 --- a/server/datastore/mysql/licenses.go +++ b/server/datastore/mysql/licenses.go @@ -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" ) diff --git a/server/datastore/mysql/migrations/data/20161223115449_InsertOsqueryOptions.go b/server/datastore/mysql/migrations/data/20161223115449_InsertOsqueryOptions.go index a835312421..6bf500a510 100644 --- a/server/datastore/mysql/migrations/data/20161223115449_InsertOsqueryOptions.go +++ b/server/datastore/mysql/migrations/data/20161223115449_InsertOsqueryOptions.go @@ -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() { diff --git a/server/datastore/mysql/migrations/data/20161229171615_InsertBuiltinLabels.go b/server/datastore/mysql/migrations/data/20161229171615_InsertBuiltinLabels.go index dcd6939c2f..f1f6a4a9a0 100644 --- a/server/datastore/mysql/migrations/data/20161229171615_InsertBuiltinLabels.go +++ b/server/datastore/mysql/migrations/data/20161229171615_InsertBuiltinLabels.go @@ -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() { diff --git a/server/datastore/mysql/migrations/data/20170127020455_InsertLicensure.go b/server/datastore/mysql/migrations/data/20170127020455_InsertLicensure.go index 8982e8ac94..21b68aa0b2 100644 --- a/server/datastore/mysql/migrations/data/20170127020455_InsertLicensure.go +++ b/server/datastore/mysql/migrations/data/20170127020455_InsertLicensure.go @@ -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() { diff --git a/server/datastore/mysql/migrations/data/20170223171234_UpdateBuiltinLabels.go b/server/datastore/mysql/migrations/data/20170223171234_UpdateBuiltinLabels.go index 43174b6c4b..98791f8551 100644 --- a/server/datastore/mysql/migrations/data/20170223171234_UpdateBuiltinLabels.go +++ b/server/datastore/mysql/migrations/data/20170223171234_UpdateBuiltinLabels.go @@ -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() { diff --git a/server/datastore/mysql/migrations/data/20170301093653_AddAllHostsToAllHostsLabel.go b/server/datastore/mysql/migrations/data/20170301093653_AddAllHostsToAllHostsLabel.go index 8e22166877..cce3225a77 100644 --- a/server/datastore/mysql/migrations/data/20170301093653_AddAllHostsToAllHostsLabel.go +++ b/server/datastore/mysql/migrations/data/20170301093653_AddAllHostsToAllHostsLabel.go @@ -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" ) diff --git a/server/datastore/mysql/migrations/data/20170309091824_AddBuiltInDecorators.go b/server/datastore/mysql/migrations/data/20170309091824_AddBuiltInDecorators.go index c10bc29280..8e61693371 100644 --- a/server/datastore/mysql/migrations/data/20170309091824_AddBuiltInDecorators.go +++ b/server/datastore/mysql/migrations/data/20170309091824_AddBuiltInDecorators.go @@ -3,7 +3,7 @@ package data import ( "database/sql" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) func init() { diff --git a/server/datastore/mysql/migrations/data/20170314151620_FixCentosLabel.go b/server/datastore/mysql/migrations/data/20170314151620_FixCentosLabel.go index c800da192b..db922e5300 100644 --- a/server/datastore/mysql/migrations/data/20170314151620_FixCentosLabel.go +++ b/server/datastore/mysql/migrations/data/20170314151620_FixCentosLabel.go @@ -3,7 +3,7 @@ package data import ( "database/sql" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) func init() { diff --git a/server/datastore/mysql/migrations/tables/20161118212557_CreateTableLabels.go b/server/datastore/mysql/migrations/tables/20161118212557_CreateTableLabels.go index 3403ed1677..a6b7116ee1 100644 --- a/server/datastore/mysql/migrations/tables/20161118212557_CreateTableLabels.go +++ b/server/datastore/mysql/migrations/tables/20161118212557_CreateTableLabels.go @@ -4,7 +4,7 @@ import ( "database/sql" "fmt" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) func init() { diff --git a/server/datastore/mysql/mysql.go b/server/datastore/mysql/mysql.go index 3085bd5ad3..88ec70b449 100644 --- a/server/datastore/mysql/mysql.go +++ b/server/datastore/mysql/mysql.go @@ -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" ) diff --git a/server/datastore/mysql/options.go b/server/datastore/mysql/options.go index 23e1a5ffba..e5237a434e 100644 --- a/server/datastore/mysql/options.go +++ b/server/datastore/mysql/options.go @@ -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" ) diff --git a/server/datastore/mysql/packs.go b/server/datastore/mysql/packs.go index e376d0facb..0580119ff3 100644 --- a/server/datastore/mysql/packs.go +++ b/server/datastore/mysql/packs.go @@ -4,7 +4,7 @@ import ( "database/sql" "fmt" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" "github.com/pkg/errors" ) diff --git a/server/datastore/mysql/password_reset.go b/server/datastore/mysql/password_reset.go index 2f18aded80..a2a14e93d7 100644 --- a/server/datastore/mysql/password_reset.go +++ b/server/datastore/mysql/password_reset.go @@ -1,7 +1,7 @@ package mysql import ( - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" "github.com/pkg/errors" ) diff --git a/server/datastore/mysql/queries.go b/server/datastore/mysql/queries.go index b95811e031..c226a5d11b 100644 --- a/server/datastore/mysql/queries.go +++ b/server/datastore/mysql/queries.go @@ -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" ) diff --git a/server/datastore/mysql/scheduled_queries.go b/server/datastore/mysql/scheduled_queries.go index 9334c06064..83d00e2d09 100644 --- a/server/datastore/mysql/scheduled_queries.go +++ b/server/datastore/mysql/scheduled_queries.go @@ -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" ) diff --git a/server/datastore/mysql/sessions.go b/server/datastore/mysql/sessions.go index 49b9a42889..c5c00fd9c0 100644 --- a/server/datastore/mysql/sessions.go +++ b/server/datastore/mysql/sessions.go @@ -1,7 +1,7 @@ package mysql import ( - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" "github.com/pkg/errors" ) diff --git a/server/datastore/mysql/targets.go b/server/datastore/mysql/targets.go index be68511a77..8cef3a8271 100644 --- a/server/datastore/mysql/targets.go +++ b/server/datastore/mysql/targets.go @@ -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" ) diff --git a/server/datastore/mysql/users.go b/server/datastore/mysql/users.go index a7ff8dca61..d9686d8ea4 100644 --- a/server/datastore/mysql/users.go +++ b/server/datastore/mysql/users.go @@ -4,7 +4,7 @@ import ( "database/sql" "fmt" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" "github.com/pkg/errors" ) diff --git a/server/datastore/mysql/yara.go b/server/datastore/mysql/yara.go index b139f6a9fb..6c400ef72e 100644 --- a/server/datastore/mysql/yara.go +++ b/server/datastore/mysql/yara.go @@ -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" ) diff --git a/server/datastore/mysql_test.go b/server/datastore/mysql_test.go index ef8cf4dc3a..c22aee20d2 100644 --- a/server/datastore/mysql_test.go +++ b/server/datastore/mysql_test.go @@ -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" ) diff --git a/server/kolide/campaigns.go b/server/kolide/campaigns.go index be5b4693da..b916cb8ffa 100644 --- a/server/kolide/campaigns.go +++ b/server/kolide/campaigns.go @@ -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 diff --git a/server/license/checker.go b/server/license/checker.go index f1d1395674..5704a36bff 100644 --- a/server/license/checker.go +++ b/server/license/checker.go @@ -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" ) diff --git a/server/license/checker_test.go b/server/license/checker_test.go index 7ee6a5f0f2..eb1f39ba0c 100644 --- a/server/license/checker_test.go +++ b/server/license/checker_test.go @@ -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" ) diff --git a/server/mail/mail.go b/server/mail/mail.go index 438181a37f..88c4dc04c6 100644 --- a/server/mail/mail.go +++ b/server/mail/mail.go @@ -8,7 +8,7 @@ import ( "net/smtp" "time" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" "github.com/pkg/errors" ) diff --git a/server/mail/mail_test.go b/server/mail/mail_test.go index c7605e68c1..5293e62a28 100644 --- a/server/mail/mail_test.go +++ b/server/mail/mail_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" "github.com/stretchr/testify/assert" ) diff --git a/server/mock/datastore.go b/server/mock/datastore.go index f8e49b99d7..d26c7a2610 100644 --- a/server/mock/datastore.go +++ b/server/mock/datastore.go @@ -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) diff --git a/server/mock/datastore_appconfig.go b/server/mock/datastore_appconfig.go index f193e587c1..89fec941f3 100644 --- a/server/mock/datastore_appconfig.go +++ b/server/mock/datastore_appconfig.go @@ -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) diff --git a/server/mock/datastore_appconfig_helpers.go b/server/mock/datastore_appconfig_helpers.go index 58e319238f..7794764390 100644 --- a/server/mock/datastore_appconfig_helpers.go +++ b/server/mock/datastore_appconfig_helpers.go @@ -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) { diff --git a/server/mock/datastore_decorators.go b/server/mock/datastore_decorators.go index 18db734579..deb43e0107 100644 --- a/server/mock/datastore_decorators.go +++ b/server/mock/datastore_decorators.go @@ -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) diff --git a/server/mock/datastore_hosts.go b/server/mock/datastore_hosts.go index f8a9231e9c..f7a27b2dd8 100644 --- a/server/mock/datastore_hosts.go +++ b/server/mock/datastore_hosts.go @@ -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) diff --git a/server/mock/datastore_invites.go b/server/mock/datastore_invites.go index 24e8529089..eb85e87fc6 100644 --- a/server/mock/datastore_invites.go +++ b/server/mock/datastore_invites.go @@ -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) diff --git a/server/mock/datastore_invites_helpers.go b/server/mock/datastore_invites_helpers.go index 4c90104f7a..87e6b5a668 100644 --- a/server/mock/datastore_invites_helpers.go +++ b/server/mock/datastore_invites_helpers.go @@ -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) { diff --git a/server/mock/datastore_labels.go b/server/mock/datastore_labels.go index 2bfe36c617..0711fdb5a5 100644 --- a/server/mock/datastore_labels.go +++ b/server/mock/datastore_labels.go @@ -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) diff --git a/server/mock/datastore_licenses.go b/server/mock/datastore_licenses.go index fb94a47200..4a3f2a0ed9 100644 --- a/server/mock/datastore_licenses.go +++ b/server/mock/datastore_licenses.go @@ -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) diff --git a/server/mock/datastore_options.go b/server/mock/datastore_options.go index 2a9396f564..c768f80464 100644 --- a/server/mock/datastore_options.go +++ b/server/mock/datastore_options.go @@ -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) diff --git a/server/mock/datastore_packs.go b/server/mock/datastore_packs.go index ab45f9f38a..24bb6c3a43 100644 --- a/server/mock/datastore_packs.go +++ b/server/mock/datastore_packs.go @@ -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) diff --git a/server/mock/datastore_users.go b/server/mock/datastore_users.go index 2410b82e92..c70f884881 100644 --- a/server/mock/datastore_users.go +++ b/server/mock/datastore_users.go @@ -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) diff --git a/server/mock/datastore_users_helpers.go b/server/mock/datastore_users_helpers.go index 808c303bfd..76d03901d6 100644 --- a/server/mock/datastore_users_helpers.go +++ b/server/mock/datastore_users_helpers.go @@ -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) { diff --git a/server/pubsub/inmem_query_results.go b/server/pubsub/inmem_query_results.go index 985a940a76..b560538443 100644 --- a/server/pubsub/inmem_query_results.go +++ b/server/pubsub/inmem_query_results.go @@ -5,7 +5,7 @@ import ( "strconv" "sync" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) type inmemQueryResults struct { diff --git a/server/pubsub/query_results_test.go b/server/pubsub/query_results_test.go index c31e788d7c..ef2d7a4141 100644 --- a/server/pubsub/query_results_test.go +++ b/server/pubsub/query_results_test.go @@ -11,7 +11,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" ) diff --git a/server/pubsub/redis_query_results.go b/server/pubsub/redis_query_results.go index a35b5a70a0..84a52133ff 100644 --- a/server/pubsub/redis_query_results.go +++ b/server/pubsub/redis_query_results.go @@ -7,7 +7,7 @@ import ( "time" "github.com/garyburd/redigo/redis" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" "github.com/pkg/errors" ) diff --git a/server/service/endpoint_appconfig.go b/server/service/endpoint_appconfig.go index ef505d7bc3..90b2ce0636 100644 --- a/server/service/endpoint_appconfig.go +++ b/server/service/endpoint_appconfig.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/go-kit/kit/endpoint" - "github.com/kolide/kolide/server/contexts/viewer" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/contexts/viewer" + "github.com/kolide/fleet/server/kolide" ) type appConfigRequest struct { diff --git a/server/service/endpoint_appconfig_test.go b/server/service/endpoint_appconfig_test.go index 6fc60c7cd7..64920ee46f 100644 --- a/server/service/endpoint_appconfig_test.go +++ b/server/service/endpoint_appconfig_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/server/service/endpoint_campaigns.go b/server/service/endpoint_campaigns.go index 17ebe80901..4cbb672cca 100644 --- a/server/service/endpoint_campaigns.go +++ b/server/service/endpoint_campaigns.go @@ -8,9 +8,9 @@ import ( "github.com/go-kit/kit/endpoint" kitlog "github.com/go-kit/kit/log" "github.com/igm/sockjs-go/sockjs" - "github.com/kolide/kolide/server/contexts/viewer" - "github.com/kolide/kolide/server/kolide" - "github.com/kolide/kolide/server/websocket" + "github.com/kolide/fleet/server/contexts/viewer" + "github.com/kolide/fleet/server/kolide" + "github.com/kolide/fleet/server/websocket" ) //////////////////////////////////////////////////////////////////////////////// diff --git a/server/service/endpoint_certificate.go b/server/service/endpoint_certificate.go index 14e200cf74..38a667f273 100644 --- a/server/service/endpoint_certificate.go +++ b/server/service/endpoint_certificate.go @@ -4,7 +4,7 @@ import ( "context" "github.com/go-kit/kit/endpoint" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) type certificateResponse struct { diff --git a/server/service/endpoint_change_email.go b/server/service/endpoint_change_email.go index dc98d17360..ef374ea836 100644 --- a/server/service/endpoint_change_email.go +++ b/server/service/endpoint_change_email.go @@ -4,7 +4,7 @@ import ( "context" "github.com/go-kit/kit/endpoint" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) type changeEmailRequest struct { diff --git a/server/service/endpoint_decorators.go b/server/service/endpoint_decorators.go index 891ef47986..a5d8dad7ce 100644 --- a/server/service/endpoint_decorators.go +++ b/server/service/endpoint_decorators.go @@ -4,7 +4,7 @@ import ( "context" "github.com/go-kit/kit/endpoint" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) type listDecoratorResponse struct { diff --git a/server/service/endpoint_decorators_test.go b/server/service/endpoint_decorators_test.go index 722e2cfffb..ab156f5ab8 100644 --- a/server/service/endpoint_decorators_test.go +++ b/server/service/endpoint_decorators_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/server/service/endpoint_hosts.go b/server/service/endpoint_hosts.go index 823a896398..be08ae3e45 100644 --- a/server/service/endpoint_hosts.go +++ b/server/service/endpoint_hosts.go @@ -5,7 +5,7 @@ import ( "time" "github.com/go-kit/kit/endpoint" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) type hostResponse struct { diff --git a/server/service/endpoint_import_config.go b/server/service/endpoint_import_config.go index 35df56d504..a15b8df854 100644 --- a/server/service/endpoint_import_config.go +++ b/server/service/endpoint_import_config.go @@ -4,7 +4,7 @@ import ( "context" "github.com/go-kit/kit/endpoint" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) type importRequest struct { diff --git a/server/service/endpoint_import_config_test.go b/server/service/endpoint_import_config_test.go index 2f27b402aa..8c7c1ba1a4 100644 --- a/server/service/endpoint_import_config_test.go +++ b/server/service/endpoint_import_config_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/server/service/endpoint_invites.go b/server/service/endpoint_invites.go index 68f44a620e..ce4bfb41d5 100644 --- a/server/service/endpoint_invites.go +++ b/server/service/endpoint_invites.go @@ -4,7 +4,7 @@ import ( "context" "github.com/go-kit/kit/endpoint" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) type createInviteRequest struct { diff --git a/server/service/endpoint_labels.go b/server/service/endpoint_labels.go index 953eaa0c99..5266630b02 100644 --- a/server/service/endpoint_labels.go +++ b/server/service/endpoint_labels.go @@ -4,7 +4,7 @@ import ( "context" "github.com/go-kit/kit/endpoint" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) type getLabelRequest struct { diff --git a/server/service/endpoint_licenses.go b/server/service/endpoint_licenses.go index f304d0bd8d..c53fc3d63f 100644 --- a/server/service/endpoint_licenses.go +++ b/server/service/endpoint_licenses.go @@ -5,7 +5,7 @@ import ( "time" "github.com/go-kit/kit/endpoint" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) type licenseRequest struct { diff --git a/server/service/endpoint_middleware.go b/server/service/endpoint_middleware.go index e7864a647e..f06d9e6823 100644 --- a/server/service/endpoint_middleware.go +++ b/server/service/endpoint_middleware.go @@ -9,10 +9,10 @@ import ( jwt "github.com/dgrijalva/jwt-go" "github.com/go-kit/kit/endpoint" - hostctx "github.com/kolide/kolide/server/contexts/host" - "github.com/kolide/kolide/server/contexts/token" - "github.com/kolide/kolide/server/contexts/viewer" - "github.com/kolide/kolide/server/kolide" + hostctx "github.com/kolide/fleet/server/contexts/host" + "github.com/kolide/fleet/server/contexts/token" + "github.com/kolide/fleet/server/contexts/viewer" + "github.com/kolide/fleet/server/kolide" ) var errNoContext = errors.New("context key not set") diff --git a/server/service/endpoint_middleware_test.go b/server/service/endpoint_middleware_test.go index 18de93e4b1..74f30cc30d 100644 --- a/server/service/endpoint_middleware_test.go +++ b/server/service/endpoint_middleware_test.go @@ -5,10 +5,10 @@ import ( "testing" "github.com/go-kit/kit/endpoint" - "github.com/kolide/kolide/server/config" - "github.com/kolide/kolide/server/contexts/viewer" - "github.com/kolide/kolide/server/datastore/inmem" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/config" + "github.com/kolide/fleet/server/contexts/viewer" + "github.com/kolide/fleet/server/datastore/inmem" + "github.com/kolide/fleet/server/kolide" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/server/service/endpoint_options.go b/server/service/endpoint_options.go index 608d5ad272..45133d3a5a 100644 --- a/server/service/endpoint_options.go +++ b/server/service/endpoint_options.go @@ -4,7 +4,7 @@ import ( "context" "github.com/go-kit/kit/endpoint" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) type optionsResponse struct { diff --git a/server/service/endpoint_osquery.go b/server/service/endpoint_osquery.go index 41fc5b1454..95e7e9b787 100644 --- a/server/service/endpoint_osquery.go +++ b/server/service/endpoint_osquery.go @@ -5,7 +5,7 @@ import ( "encoding/json" "github.com/go-kit/kit/endpoint" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) //////////////////////////////////////////////////////////////////////////////// diff --git a/server/service/endpoint_packs.go b/server/service/endpoint_packs.go index 0ac158ea93..2bbef3b78c 100644 --- a/server/service/endpoint_packs.go +++ b/server/service/endpoint_packs.go @@ -4,7 +4,7 @@ import ( "context" "github.com/go-kit/kit/endpoint" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) type packResponse struct { diff --git a/server/service/endpoint_queries.go b/server/service/endpoint_queries.go index 296eec16bd..fc101776db 100644 --- a/server/service/endpoint_queries.go +++ b/server/service/endpoint_queries.go @@ -4,7 +4,7 @@ import ( "context" "github.com/go-kit/kit/endpoint" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) //////////////////////////////////////////////////////////////////////////////// diff --git a/server/service/endpoint_scheduled_queries.go b/server/service/endpoint_scheduled_queries.go index 281bcbaf3a..391c6fd8f3 100644 --- a/server/service/endpoint_scheduled_queries.go +++ b/server/service/endpoint_scheduled_queries.go @@ -4,7 +4,7 @@ import ( "context" "github.com/go-kit/kit/endpoint" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) //////////////////////////////////////////////////////////////////////////////// diff --git a/server/service/endpoint_sessions.go b/server/service/endpoint_sessions.go index 712643fbef..e02ad93f48 100644 --- a/server/service/endpoint_sessions.go +++ b/server/service/endpoint_sessions.go @@ -7,7 +7,7 @@ import ( "time" "github.com/go-kit/kit/endpoint" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) //////////////////////////////////////////////////////////////////////////////// diff --git a/server/service/endpoint_setup.go b/server/service/endpoint_setup.go index eb337cfb2d..91b85f7269 100644 --- a/server/service/endpoint_setup.go +++ b/server/service/endpoint_setup.go @@ -4,7 +4,7 @@ import ( "context" "github.com/go-kit/kit/endpoint" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) type setupRequest struct { diff --git a/server/service/endpoint_targets.go b/server/service/endpoint_targets.go index 3d16b0f4d6..4bf9816867 100644 --- a/server/service/endpoint_targets.go +++ b/server/service/endpoint_targets.go @@ -5,7 +5,7 @@ import ( "time" "github.com/go-kit/kit/endpoint" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) //////////////////////////////////////////////////////////////////////////////// diff --git a/server/service/endpoint_test.go b/server/service/endpoint_test.go index c6f0a970e7..2c04957c19 100644 --- a/server/service/endpoint_test.go +++ b/server/service/endpoint_test.go @@ -13,9 +13,9 @@ import ( "testing" kitlog "github.com/go-kit/kit/log" - "github.com/kolide/kolide/server/config" - "github.com/kolide/kolide/server/datastore/inmem" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/config" + "github.com/kolide/fleet/server/datastore/inmem" + "github.com/kolide/fleet/server/kolide" "github.com/stretchr/testify/require" ) diff --git a/server/service/endpoint_users.go b/server/service/endpoint_users.go index 763734fad5..2544bcfa19 100644 --- a/server/service/endpoint_users.go +++ b/server/service/endpoint_users.go @@ -5,7 +5,7 @@ import ( "net/http" "github.com/go-kit/kit/endpoint" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) //////////////////////////////////////////////////////////////////////////////// diff --git a/server/service/handler.go b/server/service/handler.go index a34181bc0c..bdc2a68272 100644 --- a/server/service/handler.go +++ b/server/service/handler.go @@ -9,7 +9,7 @@ import ( kitlog "github.com/go-kit/kit/log" kithttp "github.com/go-kit/kit/transport/http" "github.com/gorilla/mux" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" "github.com/prometheus/client_golang/prometheus" ) diff --git a/server/service/handler_test.go b/server/service/handler_test.go index 7fd4ee8508..a3f92a6437 100644 --- a/server/service/handler_test.go +++ b/server/service/handler_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/gorilla/mux" - "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/assert" ) diff --git a/server/service/http_auth.go b/server/service/http_auth.go index fb3c532d2f..7c6f0aad8b 100644 --- a/server/service/http_auth.go +++ b/server/service/http_auth.go @@ -6,9 +6,9 @@ import ( "strings" kithttp "github.com/go-kit/kit/transport/http" - "github.com/kolide/kolide/server/contexts/token" - "github.com/kolide/kolide/server/contexts/viewer" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/contexts/token" + "github.com/kolide/fleet/server/contexts/viewer" + "github.com/kolide/fleet/server/kolide" ) // setRequestsContexts updates the request with necessary context values for a request diff --git a/server/service/http_auth_test.go b/server/service/http_auth_test.go index f4c1a7d461..e83e4a7c6c 100644 --- a/server/service/http_auth_test.go +++ b/server/service/http_auth_test.go @@ -15,9 +15,9 @@ import ( kitlog "github.com/go-kit/kit/log" kithttp "github.com/go-kit/kit/transport/http" "github.com/gorilla/mux" - "github.com/kolide/kolide/server/config" - "github.com/kolide/kolide/server/datastore/inmem" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/config" + "github.com/kolide/fleet/server/datastore/inmem" + "github.com/kolide/fleet/server/kolide" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/server/service/logging.go b/server/service/logging.go index 1bd5c84993..733620ac0b 100644 --- a/server/service/logging.go +++ b/server/service/logging.go @@ -2,7 +2,7 @@ package service import ( kitlog "github.com/go-kit/kit/log" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) // logging middleware logs the service actions diff --git a/server/service/logging_appconfig.go b/server/service/logging_appconfig.go index fee6cf9018..5ae346ae13 100644 --- a/server/service/logging_appconfig.go +++ b/server/service/logging_appconfig.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) func (mw loggingMiddleware) NewAppConfig(ctx context.Context, p kolide.AppConfigPayload) (*kolide.AppConfig, error) { diff --git a/server/service/logging_decorators.go b/server/service/logging_decorators.go index f091b40ac9..bd370a0ce1 100644 --- a/server/service/logging_decorators.go +++ b/server/service/logging_decorators.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) func (mw loggingMiddleware) ListDecorators(ctx context.Context) ([]*kolide.Decorator, error) { diff --git a/server/service/logging_hosts.go b/server/service/logging_hosts.go index d64256345b..133709459b 100644 --- a/server/service/logging_hosts.go +++ b/server/service/logging_hosts.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) func (mw loggingMiddleware) ListHosts(ctx context.Context, opt kolide.ListOptions) ([]*kolide.Host, error) { diff --git a/server/service/logging_import_config.go b/server/service/logging_import_config.go index 9ab500bb48..33d72dcbaa 100644 --- a/server/service/logging_import_config.go +++ b/server/service/logging_import_config.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) func (mw loggingMiddleware) ImportConfig(ctx context.Context, cfg *kolide.ImportConfig) (*kolide.ImportConfigResponse, error) { diff --git a/server/service/logging_invites.go b/server/service/logging_invites.go index aa7932af8e..068606d2e2 100644 --- a/server/service/logging_invites.go +++ b/server/service/logging_invites.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/kolide/kolide/server/contexts/viewer" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/contexts/viewer" + "github.com/kolide/fleet/server/kolide" ) func (mw loggingMiddleware) InviteNewUser(ctx context.Context, payload kolide.InvitePayload) (*kolide.Invite, error) { diff --git a/server/service/logging_labels.go b/server/service/logging_labels.go index db330c4f09..c91f28d505 100644 --- a/server/service/logging_labels.go +++ b/server/service/logging_labels.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) func (mw loggingMiddleware) ModifyLabel(ctx context.Context, id uint, p kolide.ModifyLabelPayload) (*kolide.Label, error) { diff --git a/server/service/logging_licenses.go b/server/service/logging_licenses.go index b72f351d91..8254c10783 100644 --- a/server/service/logging_licenses.go +++ b/server/service/logging_licenses.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) func (mw loggingMiddleware) SaveLicense(ctx context.Context, jwtToken string) (*kolide.License, error) { diff --git a/server/service/logging_options.go b/server/service/logging_options.go index 425d5ceb0b..d05540fcda 100644 --- a/server/service/logging_options.go +++ b/server/service/logging_options.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) func (mw loggingMiddleware) GetOptions(ctx context.Context) ([]kolide.Option, error) { diff --git a/server/service/logging_osquery.go b/server/service/logging_osquery.go index 14bb847896..e2c1bcf3b3 100644 --- a/server/service/logging_osquery.go +++ b/server/service/logging_osquery.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) func (mw loggingMiddleware) EnrollAgent(ctx context.Context, enrollSecret string, hostIdentifier string) (string, error) { diff --git a/server/service/logging_packs.go b/server/service/logging_packs.go index 96e4b16e09..46e54e1609 100644 --- a/server/service/logging_packs.go +++ b/server/service/logging_packs.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) func (mw loggingMiddleware) ListPacks(ctx context.Context, opt kolide.ListOptions) ([]*kolide.Pack, error) { diff --git a/server/service/logging_scheduled_queries.go b/server/service/logging_scheduled_queries.go index 8c016dad45..64023ba8f4 100644 --- a/server/service/logging_scheduled_queries.go +++ b/server/service/logging_scheduled_queries.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) func (mw loggingMiddleware) GetScheduledQuery(ctx context.Context, id uint) (*kolide.ScheduledQuery, error) { diff --git a/server/service/logging_sessions.go b/server/service/logging_sessions.go index 543a5c7fbd..e795d65c01 100644 --- a/server/service/logging_sessions.go +++ b/server/service/logging_sessions.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) func (mw loggingMiddleware) Login(ctx context.Context, username, password string) (user *kolide.User, token string, err error) { diff --git a/server/service/logging_users.go b/server/service/logging_users.go index a25de830d7..69817f8421 100644 --- a/server/service/logging_users.go +++ b/server/service/logging_users.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/kolide/kolide/server/contexts/viewer" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/contexts/viewer" + "github.com/kolide/fleet/server/kolide" ) func (mw loggingMiddleware) ChangeUserAdmin(ctx context.Context, id uint, isAdmin bool) (*kolide.User, error) { diff --git a/server/service/metrics.go b/server/service/metrics.go index 9df822d082..569f15838a 100644 --- a/server/service/metrics.go +++ b/server/service/metrics.go @@ -2,7 +2,7 @@ package service import ( "github.com/go-kit/kit/metrics" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) type metricsMiddleware struct { diff --git a/server/service/metrics_appconfig.go b/server/service/metrics_appconfig.go index 969454a306..8cfcb15739 100644 --- a/server/service/metrics_appconfig.go +++ b/server/service/metrics_appconfig.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) func (mw metricsMiddleware) NewAppConfig(ctx context.Context, p kolide.AppConfigPayload) (*kolide.AppConfig, error) { diff --git a/server/service/metrics_decorators.go b/server/service/metrics_decorators.go index b2a96a2d76..60b44ffafd 100644 --- a/server/service/metrics_decorators.go +++ b/server/service/metrics_decorators.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) func (mw metricsMiddleware) ListDecorators(ctx context.Context) ([]*kolide.Decorator, error) { diff --git a/server/service/metrics_import_config.go b/server/service/metrics_import_config.go index a84b3980d3..63d5d4ea89 100644 --- a/server/service/metrics_import_config.go +++ b/server/service/metrics_import_config.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) func (mw metricsMiddleware) ImportConfig(ctx context.Context, cfg *kolide.ImportConfig) (*kolide.ImportConfigResponse, error) { diff --git a/server/service/metrics_invites.go b/server/service/metrics_invites.go index 8a67c86821..23e74298d2 100644 --- a/server/service/metrics_invites.go +++ b/server/service/metrics_invites.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) func (mw metricsMiddleware) InviteNewUser(ctx context.Context, payload kolide.InvitePayload) (*kolide.Invite, error) { diff --git a/server/service/metrics_labels.go b/server/service/metrics_labels.go index f32f5195da..6cfe31098b 100644 --- a/server/service/metrics_labels.go +++ b/server/service/metrics_labels.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) func (mw metricsMiddleware) ModifyLabel(ctx context.Context, id uint, p kolide.ModifyLabelPayload) (*kolide.Label, error) { diff --git a/server/service/metrics_licenses.go b/server/service/metrics_licenses.go index 2c7924c27c..59a692c4bc 100644 --- a/server/service/metrics_licenses.go +++ b/server/service/metrics_licenses.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) func (mw metricsMiddleware) SaveLicense(ctx context.Context, jwtToken string) (*kolide.License, error) { diff --git a/server/service/metrics_options.go b/server/service/metrics_options.go index 6fb2d8333a..01bfb50a2f 100644 --- a/server/service/metrics_options.go +++ b/server/service/metrics_options.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) func (mw metricsMiddleware) GetOptions(ctx context.Context) ([]kolide.Option, error) { diff --git a/server/service/metrics_sessions.go b/server/service/metrics_sessions.go index 1087740e21..c2a4956c2d 100644 --- a/server/service/metrics_sessions.go +++ b/server/service/metrics_sessions.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) func (mw metricsMiddleware) SSOSettings(ctx context.Context) (settings *kolide.SSOSettings, err error) { diff --git a/server/service/metrics_users.go b/server/service/metrics_users.go index daa0b4a933..440246b896 100644 --- a/server/service/metrics_users.go +++ b/server/service/metrics_users.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) func (mw metricsMiddleware) ChangeUserAdmin(ctx context.Context, id uint, isAdmin bool) (*kolide.User, error) { diff --git a/server/service/service.go b/server/service/service.go index 5c039f5ce3..39f46967e5 100644 --- a/server/service/service.go +++ b/server/service/service.go @@ -10,10 +10,10 @@ import ( "github.com/WatchBeam/clock" kitlog "github.com/go-kit/kit/log" - "github.com/kolide/kolide/server/config" - "github.com/kolide/kolide/server/kolide" - "github.com/kolide/kolide/server/logwriter" - "github.com/kolide/kolide/server/sso" + "github.com/kolide/fleet/server/config" + "github.com/kolide/fleet/server/kolide" + "github.com/kolide/fleet/server/logwriter" + "github.com/kolide/fleet/server/sso" lumberjack "gopkg.in/natefinch/lumberjack.v2" ) diff --git a/server/service/service_appconfig.go b/server/service/service_appconfig.go index 84a70adf0d..bda6c5fa23 100644 --- a/server/service/service_appconfig.go +++ b/server/service/service_appconfig.go @@ -5,9 +5,9 @@ import ( "fmt" "strings" - "github.com/kolide/kolide/server/contexts/viewer" - "github.com/kolide/kolide/server/kolide" - "github.com/kolide/kolide/server/mail" + "github.com/kolide/fleet/server/contexts/viewer" + "github.com/kolide/fleet/server/kolide" + "github.com/kolide/fleet/server/mail" "github.com/pkg/errors" ) diff --git a/server/service/service_appconfig_test.go b/server/service/service_appconfig_test.go index 4cc4e4273a..ca00ae5f0a 100644 --- a/server/service/service_appconfig_test.go +++ b/server/service/service_appconfig_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/kolide/kolide/server/config" - "github.com/kolide/kolide/server/datastore/inmem" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/config" + "github.com/kolide/fleet/server/datastore/inmem" + "github.com/kolide/fleet/server/kolide" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/server/service/service_campaigns.go b/server/service/service_campaigns.go index b202ab9c2a..08e8489ecc 100644 --- a/server/service/service_campaigns.go +++ b/server/service/service_campaigns.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - "github.com/kolide/kolide/server/contexts/viewer" - "github.com/kolide/kolide/server/kolide" - "github.com/kolide/kolide/server/websocket" + "github.com/kolide/fleet/server/contexts/viewer" + "github.com/kolide/fleet/server/kolide" + "github.com/kolide/fleet/server/websocket" "github.com/pkg/errors" ) diff --git a/server/service/service_decorators.go b/server/service/service_decorators.go index c6227c4b77..403970649f 100644 --- a/server/service/service_decorators.go +++ b/server/service/service_decorators.go @@ -3,7 +3,7 @@ package service import ( "context" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) func (svc service) ListDecorators(ctx context.Context) ([]*kolide.Decorator, error) { diff --git a/server/service/service_hosts.go b/server/service/service_hosts.go index 1b8e39afa5..8dc5144236 100644 --- a/server/service/service_hosts.go +++ b/server/service/service_hosts.go @@ -3,7 +3,7 @@ package service import ( "context" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) func (svc service) ListHosts(ctx context.Context, opt kolide.ListOptions) ([]*kolide.Host, error) { diff --git a/server/service/service_hosts_test.go b/server/service/service_hosts_test.go index 6eaf6b42f1..042a39f41a 100644 --- a/server/service/service_hosts_test.go +++ b/server/service/service_hosts_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/kolide/kolide/server/config" - "github.com/kolide/kolide/server/datastore/inmem" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/config" + "github.com/kolide/fleet/server/datastore/inmem" + "github.com/kolide/fleet/server/kolide" "github.com/stretchr/testify/assert" ) diff --git a/server/service/service_import_config.go b/server/service/service_import_config.go index 2ba1404b90..ab62f1fb71 100644 --- a/server/service/service_import_config.go +++ b/server/service/service_import_config.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "github.com/kolide/kolide/server/contexts/viewer" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/contexts/viewer" + "github.com/kolide/fleet/server/kolide" "github.com/pkg/errors" ) diff --git a/server/service/service_import_config_test.go b/server/service/service_import_config_test.go index 305581031b..3ee2b23bff 100644 --- a/server/service/service_import_config_test.go +++ b/server/service/service_import_config_test.go @@ -3,9 +3,9 @@ package service import ( "testing" - "github.com/kolide/kolide/server/config" - "github.com/kolide/kolide/server/datastore/inmem" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/config" + "github.com/kolide/fleet/server/datastore/inmem" + "github.com/kolide/fleet/server/kolide" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/server/service/service_invites.go b/server/service/service_invites.go index f9f191ee1d..32bb971f98 100644 --- a/server/service/service_invites.go +++ b/server/service/service_invites.go @@ -5,7 +5,7 @@ import ( "encoding/base64" "html/template" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) func (svc service) InviteNewUser(ctx context.Context, payload kolide.InvitePayload) (*kolide.Invite, error) { diff --git a/server/service/service_invites_test.go b/server/service/service_invites_test.go index 86527a880d..efec0bbdaf 100644 --- a/server/service/service_invites_test.go +++ b/server/service/service_invites_test.go @@ -6,9 +6,9 @@ import ( "time" "github.com/WatchBeam/clock" - "github.com/kolide/kolide/server/config" - "github.com/kolide/kolide/server/kolide" - "github.com/kolide/kolide/server/mock" + "github.com/kolide/fleet/server/config" + "github.com/kolide/fleet/server/kolide" + "github.com/kolide/fleet/server/mock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/server/service/service_labels.go b/server/service/service_labels.go index 685b8ad299..85c0cd3b78 100644 --- a/server/service/service_labels.go +++ b/server/service/service_labels.go @@ -3,7 +3,7 @@ package service import ( "context" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) func (svc service) ListLabels(ctx context.Context, opt kolide.ListOptions) ([]*kolide.Label, error) { diff --git a/server/service/service_labels_test.go b/server/service/service_labels_test.go index 1db3221ae7..b99d4d2f74 100644 --- a/server/service/service_labels_test.go +++ b/server/service/service_labels_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - "github.com/kolide/kolide/server/config" - "github.com/kolide/kolide/server/datastore/inmem" - "github.com/kolide/kolide/server/kolide" - "github.com/kolide/kolide/server/mock" + "github.com/kolide/fleet/server/config" + "github.com/kolide/fleet/server/datastore/inmem" + "github.com/kolide/fleet/server/kolide" + "github.com/kolide/fleet/server/mock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/server/service/service_licenses.go b/server/service/service_licenses.go index ebba65cbcc..e273c4ffa4 100644 --- a/server/service/service_licenses.go +++ b/server/service/service_licenses.go @@ -3,7 +3,7 @@ package service import ( "context" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) func (svc service) License(ctx context.Context) (*kolide.License, error) { diff --git a/server/service/service_licenses_test.go b/server/service/service_licenses_test.go index 7a09ae1d2d..32abcbcd37 100644 --- a/server/service/service_licenses_test.go +++ b/server/service/service_licenses_test.go @@ -6,8 +6,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" ) diff --git a/server/service/service_options.go b/server/service/service_options.go index 9f0b6b5b57..8828290b4c 100644 --- a/server/service/service_options.go +++ b/server/service/service_options.go @@ -3,7 +3,7 @@ package service import ( "context" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) func (svc service) ResetOptions(ctx context.Context) ([]kolide.Option, error) { diff --git a/server/service/service_osquery.go b/server/service/service_osquery.go index 3d712cffe3..c20a297b17 100644 --- a/server/service/service_osquery.go +++ b/server/service/service_osquery.go @@ -9,9 +9,9 @@ import ( "time" "github.com/go-kit/kit/log" - hostctx "github.com/kolide/kolide/server/contexts/host" - "github.com/kolide/kolide/server/kolide" - "github.com/kolide/kolide/server/pubsub" + hostctx "github.com/kolide/fleet/server/contexts/host" + "github.com/kolide/fleet/server/kolide" + "github.com/kolide/fleet/server/pubsub" "github.com/pkg/errors" "github.com/spf13/cast" ) diff --git a/server/service/service_osquery_test.go b/server/service/service_osquery_test.go index 0d16e32d90..349a87a08c 100644 --- a/server/service/service_osquery_test.go +++ b/server/service/service_osquery_test.go @@ -13,14 +13,14 @@ import ( "time" "github.com/WatchBeam/clock" - "github.com/kolide/kolide/server/config" - hostctx "github.com/kolide/kolide/server/contexts/host" - "github.com/kolide/kolide/server/contexts/viewer" - "github.com/kolide/kolide/server/datastore/inmem" - "github.com/kolide/kolide/server/kolide" - "github.com/kolide/kolide/server/mock" - "github.com/kolide/kolide/server/pubsub" - "github.com/kolide/kolide/server/test" + "github.com/kolide/fleet/server/config" + hostctx "github.com/kolide/fleet/server/contexts/host" + "github.com/kolide/fleet/server/contexts/viewer" + "github.com/kolide/fleet/server/datastore/inmem" + "github.com/kolide/fleet/server/kolide" + "github.com/kolide/fleet/server/mock" + "github.com/kolide/fleet/server/pubsub" + "github.com/kolide/fleet/server/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/server/service/service_packs.go b/server/service/service_packs.go index eac5f80582..e88cc21fba 100644 --- a/server/service/service_packs.go +++ b/server/service/service_packs.go @@ -3,8 +3,8 @@ package service import ( "context" - "github.com/kolide/kolide/server/contexts/viewer" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/contexts/viewer" + "github.com/kolide/fleet/server/kolide" ) func (svc service) ListPacks(ctx context.Context, opt kolide.ListOptions) ([]*kolide.Pack, error) { diff --git a/server/service/service_packs_test.go b/server/service/service_packs_test.go index 80b4621b83..ec5ae1e581 100644 --- a/server/service/service_packs_test.go +++ b/server/service/service_packs_test.go @@ -5,10 +5,10 @@ import ( "testing" "github.com/WatchBeam/clock" - "github.com/kolide/kolide/server/config" - "github.com/kolide/kolide/server/datastore/inmem" - "github.com/kolide/kolide/server/kolide" - "github.com/kolide/kolide/server/test" + "github.com/kolide/fleet/server/config" + "github.com/kolide/fleet/server/datastore/inmem" + "github.com/kolide/fleet/server/kolide" + "github.com/kolide/fleet/server/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/server/service/service_queries.go b/server/service/service_queries.go index c2f071360e..7d4fcc389e 100644 --- a/server/service/service_queries.go +++ b/server/service/service_queries.go @@ -3,8 +3,8 @@ package service import ( "context" - "github.com/kolide/kolide/server/contexts/viewer" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/contexts/viewer" + "github.com/kolide/fleet/server/kolide" ) func (svc service) ListQueries(ctx context.Context, opt kolide.ListOptions) ([]*kolide.Query, error) { diff --git a/server/service/service_queries_test.go b/server/service/service_queries_test.go index 50bdbd7ff3..42904aa26a 100644 --- a/server/service/service_queries_test.go +++ b/server/service/service_queries_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - "github.com/kolide/kolide/server/config" - "github.com/kolide/kolide/server/contexts/viewer" - "github.com/kolide/kolide/server/datastore/inmem" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/config" + "github.com/kolide/fleet/server/contexts/viewer" + "github.com/kolide/fleet/server/datastore/inmem" + "github.com/kolide/fleet/server/kolide" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/server/service/service_scheduled_queries.go b/server/service/service_scheduled_queries.go index d823473bf7..ce570699c4 100644 --- a/server/service/service_scheduled_queries.go +++ b/server/service/service_scheduled_queries.go @@ -3,7 +3,7 @@ package service import ( "context" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" "github.com/pkg/errors" ) diff --git a/server/service/service_scheduled_queries_test.go b/server/service/service_scheduled_queries_test.go index 7f5a81bc74..6a1888c55d 100644 --- a/server/service/service_scheduled_queries_test.go +++ b/server/service/service_scheduled_queries_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - "github.com/kolide/kolide/server/config" - "github.com/kolide/kolide/server/datastore/inmem" - "github.com/kolide/kolide/server/kolide" - "github.com/kolide/kolide/server/test" + "github.com/kolide/fleet/server/config" + "github.com/kolide/fleet/server/datastore/inmem" + "github.com/kolide/fleet/server/kolide" + "github.com/kolide/fleet/server/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/server/service/service_sessions.go b/server/service/service_sessions.go index d1099b7c54..74c287d9ed 100644 --- a/server/service/service_sessions.go +++ b/server/service/service_sessions.go @@ -9,9 +9,9 @@ import ( "time" jwt "github.com/dgrijalva/jwt-go" - "github.com/kolide/kolide/server/contexts/viewer" - "github.com/kolide/kolide/server/kolide" - "github.com/kolide/kolide/server/sso" + "github.com/kolide/fleet/server/contexts/viewer" + "github.com/kolide/fleet/server/kolide" + "github.com/kolide/fleet/server/sso" "github.com/pkg/errors" ) diff --git a/server/service/service_sessions_test.go b/server/service/service_sessions_test.go index 1b34066cde..2dbd84dae8 100644 --- a/server/service/service_sessions_test.go +++ b/server/service/service_sessions_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" - "github.com/kolide/kolide/server/config" - "github.com/kolide/kolide/server/contexts/token" - "github.com/kolide/kolide/server/datastore/inmem" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/config" + "github.com/kolide/fleet/server/contexts/token" + "github.com/kolide/fleet/server/datastore/inmem" + "github.com/kolide/fleet/server/kolide" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/server/service/service_targets.go b/server/service/service_targets.go index d9e1736109..4893d3f1e7 100644 --- a/server/service/service_targets.go +++ b/server/service/service_targets.go @@ -3,7 +3,7 @@ package service import ( "context" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) func (svc service) SearchTargets(ctx context.Context, query string, selectedHostIDs []uint, selectedLabelIDs []uint) (*kolide.TargetSearchResults, error) { diff --git a/server/service/service_targets_test.go b/server/service/service_targets_test.go index fba481ba88..995b725669 100644 --- a/server/service/service_targets_test.go +++ b/server/service/service_targets_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "github.com/kolide/kolide/server/config" - "github.com/kolide/kolide/server/datastore/inmem" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/config" + "github.com/kolide/fleet/server/datastore/inmem" + "github.com/kolide/fleet/server/kolide" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/server/service/service_users.go b/server/service/service_users.go index 942aaeb76f..7b8abcf69e 100644 --- a/server/service/service_users.go +++ b/server/service/service_users.go @@ -7,8 +7,8 @@ import ( "html/template" "time" - "github.com/kolide/kolide/server/contexts/viewer" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/contexts/viewer" + "github.com/kolide/fleet/server/kolide" "github.com/pkg/errors" ) diff --git a/server/service/service_users_test.go b/server/service/service_users_test.go index 469d042226..2d56429b80 100644 --- a/server/service/service_users_test.go +++ b/server/service/service_users_test.go @@ -6,13 +6,13 @@ import ( "testing" "time" - "github.com/kolide/kolide/server/config" - "github.com/kolide/kolide/server/contexts/viewer" - "github.com/kolide/kolide/server/datastore/inmem" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/config" + "github.com/kolide/fleet/server/contexts/viewer" + "github.com/kolide/fleet/server/datastore/inmem" + "github.com/kolide/fleet/server/kolide" "github.com/WatchBeam/clock" - "github.com/kolide/kolide/server/mock" + "github.com/kolide/fleet/server/mock" pkg_errors "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/server/service/transport.go b/server/service/transport.go index 25aa981cba..dc43f50f4d 100644 --- a/server/service/transport.go +++ b/server/service/transport.go @@ -9,7 +9,7 @@ import ( "strconv" "github.com/gorilla/mux" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) var ( diff --git a/server/service/transport_appconfig.go b/server/service/transport_appconfig.go index dc954d38f8..cd5b77c3f8 100644 --- a/server/service/transport_appconfig.go +++ b/server/service/transport_appconfig.go @@ -5,7 +5,7 @@ import ( "encoding/json" "net/http" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) func decodeModifyAppConfigRequest(ctx context.Context, r *http.Request) (interface{}, error) { diff --git a/server/service/transport_import_config.go b/server/service/transport_import_config.go index 80d2cb890e..a0292547ba 100644 --- a/server/service/transport_import_config.go +++ b/server/service/transport_import_config.go @@ -5,7 +5,7 @@ import ( "encoding/json" "net/http" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) func decodeImportConfigRequest(ctx context.Context, r *http.Request) (interface{}, error) { diff --git a/server/service/transport_options.go b/server/service/transport_options.go index 57fea9a714..c38b2969ac 100644 --- a/server/service/transport_options.go +++ b/server/service/transport_options.go @@ -5,7 +5,7 @@ import ( "encoding/json" "net/http" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) func decodeModifyOptionsRequest(ctx context.Context, r *http.Request) (interface{}, error) { diff --git a/server/service/transport_osquery.go b/server/service/transport_osquery.go index 1fb0ec9dbe..79bac372f8 100644 --- a/server/service/transport_osquery.go +++ b/server/service/transport_osquery.go @@ -6,7 +6,7 @@ import ( "encoding/json" "net/http" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" "github.com/pkg/errors" ) diff --git a/server/service/transport_osquery_test.go b/server/service/transport_osquery_test.go index 9dc3cfa019..594d5a7be8 100644 --- a/server/service/transport_osquery_test.go +++ b/server/service/transport_osquery_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/gorilla/mux" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/server/service/transport_sessions.go b/server/service/transport_sessions.go index c11af7a5e8..1acc3b2c37 100644 --- a/server/service/transport_sessions.go +++ b/server/service/transport_sessions.go @@ -6,7 +6,7 @@ import ( "net/http" "strings" - "github.com/kolide/kolide/server/sso" + "github.com/kolide/fleet/server/sso" "github.com/pkg/errors" ) diff --git a/server/service/transport_test.go b/server/service/transport_test.go index c7e5cb08c0..e886e3e2db 100644 --- a/server/service/transport_test.go +++ b/server/service/transport_test.go @@ -5,7 +5,7 @@ import ( "net/url" "testing" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" "github.com/stretchr/testify/assert" ) diff --git a/server/service/util_test.go b/server/service/util_test.go index 62b1e85be0..0f4b2fe996 100644 --- a/server/service/util_test.go +++ b/server/service/util_test.go @@ -5,8 +5,8 @@ import ( "github.com/WatchBeam/clock" kitlog "github.com/go-kit/kit/log" - "github.com/kolide/kolide/server/config" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/config" + "github.com/kolide/fleet/server/kolide" "github.com/stretchr/testify/require" ) diff --git a/server/service/validation_app_config.go b/server/service/validation_app_config.go index 5e7b051731..2ac4236179 100644 --- a/server/service/validation_app_config.go +++ b/server/service/validation_app_config.go @@ -3,7 +3,7 @@ package service import ( "context" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" "github.com/pkg/errors" ) diff --git a/server/service/validation_app_config_test.go b/server/service/validation_app_config_test.go index af3e14404a..b3a8c1e922 100644 --- a/server/service/validation_app_config_test.go +++ b/server/service/validation_app_config_test.go @@ -3,7 +3,7 @@ package service import ( "testing" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/server/service/validation_decorators.go b/server/service/validation_decorators.go index f0b6ffbcde..70bb11909a 100644 --- a/server/service/validation_decorators.go +++ b/server/service/validation_decorators.go @@ -3,7 +3,7 @@ package service import ( "context" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) func validateNewDecoratorType(payload kolide.DecoratorPayload, invalid *invalidArgumentError) { diff --git a/server/service/validation_decorators_test.go b/server/service/validation_decorators_test.go index 536d97316c..b1e09361fa 100644 --- a/server/service/validation_decorators_test.go +++ b/server/service/validation_decorators_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "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" ) diff --git a/server/service/validation_import_config.go b/server/service/validation_import_config.go index 78fb2d8958..98c247611e 100644 --- a/server/service/validation_import_config.go +++ b/server/service/validation_import_config.go @@ -4,7 +4,7 @@ import ( "context" "strconv" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) func (vm validationMiddleware) ImportConfig(ctx context.Context, cfg *kolide.ImportConfig) (*kolide.ImportConfigResponse, error) { diff --git a/server/service/validation_invites.go b/server/service/validation_invites.go index ab3503c1e7..c943c67bf6 100644 --- a/server/service/validation_invites.go +++ b/server/service/validation_invites.go @@ -3,7 +3,7 @@ package service import ( "context" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) func (mw validationMiddleware) InviteNewUser(ctx context.Context, payload kolide.InvitePayload) (*kolide.Invite, error) { diff --git a/server/service/validation_options.go b/server/service/validation_options.go index 5c79024d3c..37bf384f66 100644 --- a/server/service/validation_options.go +++ b/server/service/validation_options.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) func (mw validationMiddleware) ModifyOptions(ctx context.Context, req kolide.OptionRequest) ([]kolide.Option, error) { diff --git a/server/service/validation_sessions.go b/server/service/validation_sessions.go index 1b46c31c5c..b57f7abbe2 100644 --- a/server/service/validation_sessions.go +++ b/server/service/validation_sessions.go @@ -3,8 +3,8 @@ package service import ( "context" - "github.com/kolide/kolide/server/kolide" - "github.com/kolide/kolide/server/sso" + "github.com/kolide/fleet/server/kolide" + "github.com/kolide/fleet/server/sso" "github.com/pkg/errors" ) diff --git a/server/service/validation_setup.go b/server/service/validation_setup.go index dd9c4469ac..9970874ae6 100644 --- a/server/service/validation_setup.go +++ b/server/service/validation_setup.go @@ -5,7 +5,7 @@ import ( "fmt" "net/url" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" ) func (mw validationMiddleware) NewAppConfig(ctx context.Context, payload kolide.AppConfigPayload) (*kolide.AppConfig, error) { diff --git a/server/service/validation_users.go b/server/service/validation_users.go index 1f8bdb9fe8..7438ad0424 100644 --- a/server/service/validation_users.go +++ b/server/service/validation_users.go @@ -6,8 +6,8 @@ import ( "strings" "unicode" - "github.com/kolide/kolide/server/contexts/viewer" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/contexts/viewer" + "github.com/kolide/fleet/server/kolide" ) func (mw validationMiddleware) NewUser(ctx context.Context, p kolide.UserPayload) (*kolide.User, error) { diff --git a/server/sso/authorization_request.go b/server/sso/authorization_request.go index ea871560a9..32bcb2b0d3 100644 --- a/server/sso/authorization_request.go +++ b/server/sso/authorization_request.go @@ -8,7 +8,7 @@ import ( "net/url" "time" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" "github.com/pkg/errors" ) diff --git a/server/sso/authorization_response.go b/server/sso/authorization_response.go index b5d2439423..e0c18a72c2 100644 --- a/server/sso/authorization_response.go +++ b/server/sso/authorization_response.go @@ -5,7 +5,7 @@ import ( "encoding/base64" "encoding/xml" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" "github.com/pkg/errors" ) diff --git a/server/sso/session_store_test.go b/server/sso/session_store_test.go index 03e0e3c367..f31383695a 100644 --- a/server/sso/session_store_test.go +++ b/server/sso/session_store_test.go @@ -7,7 +7,7 @@ import ( "time" "github.com/garyburd/redigo/redis" - "github.com/kolide/kolide/server/pubsub" + "github.com/kolide/fleet/server/pubsub" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/server/sso/validate.go b/server/sso/validate.go index a99ee70b9d..98c72641e2 100644 --- a/server/sso/validate.go +++ b/server/sso/validate.go @@ -7,7 +7,7 @@ import ( "time" "github.com/beevik/etree" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" "github.com/pkg/errors" gosamltypes "github.com/russellhaering/gosaml2/types" dsig "github.com/russellhaering/goxmldsig" diff --git a/server/test/new_objects.go b/server/test/new_objects.go index 4ca47c4432..b08d883d67 100644 --- a/server/test/new_objects.go +++ b/server/test/new_objects.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/kolide/kolide/server/kolide" + "github.com/kolide/fleet/server/kolide" "github.com/stretchr/testify/require" ) diff --git a/server/version/version.go b/server/version/version.go index 3f5eb99d7e..4780582e52 100644 --- a/server/version/version.go +++ b/server/version/version.go @@ -10,7 +10,7 @@ import ( // info vars // set at build time with ldflags // example: -// go build -ldflags "-X github.com/kolide/kolide/version.version=1.0.0-development" +// go build -ldflags "-X github.com/kolide/fleet/version.version=1.0.0-development" var ( version = "unknown" branch = "unknown" diff --git a/server/websocket/websocket.go b/server/websocket/websocket.go index 6fd2665818..7624e2eb28 100644 --- a/server/websocket/websocket.go +++ b/server/websocket/websocket.go @@ -8,7 +8,7 @@ import ( "github.com/igm/sockjs-go/sockjs" - "github.com/kolide/kolide/server/contexts/token" + "github.com/kolide/fleet/server/contexts/token" "github.com/pkg/errors" ) diff --git a/tools/app/development.yml b/tools/app/development.yml index e51ca4254b..a73037c805 100644 --- a/tools/app/development.yml +++ b/tools/app/development.yml @@ -24,4 +24,4 @@ test: command: - -C volumes: - - ./:/go/src/github.com/kolide/kolide + - ./:/go/src/github.com/kolide/fleet diff --git a/tools/ci/docker/kolide-builder/1.8/Dockerfile b/tools/ci/docker/kolide-builder/1.8/Dockerfile index ad9a2bc101..423d93ef82 100644 --- a/tools/ci/docker/kolide-builder/1.8/Dockerfile +++ b/tools/ci/docker/kolide-builder/1.8/Dockerfile @@ -20,8 +20,8 @@ RUN git config --global http.https://gopkg.in.followRedirects true COPY rootfs / -VOLUME /go/src/github.com/kolide/kolide -WORKDIR /go/src/github.com/kolide/kolide +VOLUME /go/src/github.com/kolide/fleet +WORKDIR /go/src/github.com/kolide/fleet EXPOSE 8080 diff --git a/tools/ci/docker/kolide-builder/README.md b/tools/ci/docker/kolide-builder/README.md index ba7979d1be..8f5aa69901 100644 --- a/tools/ci/docker/kolide-builder/README.md +++ b/tools/ci/docker/kolide-builder/README.md @@ -9,7 +9,7 @@ Usage: builder.sh [args] ### Caching pkg folder If you're repeatedly testing the build on a development machine, it makes sense to mount the `$GOPATH/pkg` along with your source. ``` -docker run --rm -it -v (pwd):/go/src/github.com/kolide/kolide-ose -v $GOPATH/pkg:/go/pkg kolide-builder -T +docker run --rm -it -v (pwd):/go/src/github.com/kolide/fleet -v $GOPATH/pkg:/go/pkg kolide-builder -T ``` The first time the container runs, `go install` will compile all the dependencies under `$GOPATH/pkg/linux_amd64/...` making future test runs faster. diff --git a/tools/lint_license/license_settings.yaml b/tools/lint_license/license_settings.yaml index 6bf7c7592b..baf528544e 100644 --- a/tools/lint_license/license_settings.yaml +++ b/tools/lint_license/license_settings.yaml @@ -51,7 +51,7 @@ allowed_licenses: # Packages that are detected as dependencies because they have a package.json, # but are actually tests for their parent directories. These packages are # covered under the license of their parent directory, and will not be listed -# as dependencies. Path should be relative to $GOPATH/github.com/kolide/kolide. +# as dependencies. Path should be relative to $GOPATH/github.com/kolide/fleet. tests: ? node_modules/in-publish/test ? node_modules/readdirp/examples @@ -67,7 +67,7 @@ tests: # Packages for which automatic license detection fails. The given license type # will be used. Usually this license is manually determined from the README or -# license file. Path should be relative to $GOPATH/github.com/kolide/kolide. +# license file. Path should be relative to $GOPATH/github.com/kolide/fleet. overrides: # loader-utils package.json says "JSF" but the license is actually MIT. See https://goo.gl/ptgu4y node_modules/css-loader/node_modules/loader-utils: diff --git a/tools/lint_license/lint_license.go b/tools/lint_license/lint_license.go index efe82237b3..4d16f8cc9c 100644 --- a/tools/lint_license/lint_license.go +++ b/tools/lint_license/lint_license.go @@ -58,12 +58,12 @@ type dependency struct { } // absolutePath concatenates the provided path onto -// $GOPATH/src/github.com/kolide/kolide +// $GOPATH/src/github.com/kolide/fleet func absolutePath(path string) string { - return filepath.Join(os.Getenv("GOPATH"), "src/github.com/kolide/kolide", path) + return filepath.Join(os.Getenv("GOPATH"), "src/github.com/kolide/fleet", path) } -// relativePath strips the leading $GOPATH/src/github.com/kolide/kolide from +// relativePath strips the leading $GOPATH/src/github.com/kolide/fleet from // the provided path. If it fails, the original path is returned. func relativePath(path string) string { rel, err := filepath.Rel(absolutePath(""), path) diff --git a/tools/lint_license/lint_license_test.go b/tools/lint_license/lint_license_test.go index 5f005da85b..5362c078e3 100644 --- a/tools/lint_license/lint_license_test.go +++ b/tools/lint_license/lint_license_test.go @@ -17,7 +17,7 @@ func TestPathFunctions(t *testing.T) { gopath := "/gopath" os.Setenv("GOPATH", gopath) - expectedPrefix := filepath.Join(gopath, "src/github.com/kolide/kolide") + expectedPrefix := filepath.Join(gopath, "src/github.com/kolide/fleet") assert.Equal(t, filepath.Join(expectedPrefix, "foo/bar"), absolutePath("foo/bar")) assert.Equal(t, "foo/bar/baz", relativePath(absolutePath("foo/bar/baz"))) diff --git a/tools/pkgrepos/build-release.sh b/tools/pkgrepos/build-release.sh index 525005ae60..b82d155596 100755 --- a/tools/pkgrepos/build-release.sh +++ b/tools/pkgrepos/build-release.sh @@ -4,7 +4,7 @@ VERSION="$(git describe --tags --always --dirty)" GPG_PATH="/Users/${USER}/.gnupg" build_binaries() { - cd $GOPATH/src/github.com/kolide/kolide + cd $GOPATH/src/github.com/kolide/fleet make generate GOOS=darwin CGO_ENABLED=0 make build