From a000751bfe7bf946cf876902bddceb916c625f4a Mon Sep 17 00:00:00 2001 From: Mike Arpaia Date: Wed, 1 Feb 2017 10:20:50 -0700 Subject: [PATCH] renaming kolide-ose to kolide (#1143) --- .gitignore | 2 +- Makefile | 12 ++++++------ README.md | 2 +- circle.yml | 4 ++-- cli/config_dump.go | 2 +- cli/prepare.go | 10 +++++----- cli/root.go | 2 +- cli/serve.go | 14 +++++++------- cli/version.go | 4 ++-- docs/api/README.md | 4 ++-- docs/infrastructure/kolide-on-centos.md | 4 ++-- docs/infrastructure/kolide-on-ubuntu.md | 4 ++-- glide.yaml | 2 +- main.go | 2 +- server/contexts/host/host.go | 2 +- server/contexts/viewer/viewer.go | 2 +- server/datastore/datastore_app_test.go | 2 +- server/datastore/datastore_campaigns_test.go | 4 ++-- server/datastore/datastore_decorators_test.go | 2 +- server/datastore/datastore_email_changes_test.go | 2 +- server/datastore/datastore_hosts_test.go | 4 ++-- server/datastore/datastore_invites_test.go | 2 +- server/datastore/datastore_labels_test.go | 2 +- server/datastore/datastore_options_test.go | 4 ++-- server/datastore/datastore_packs_test.go | 4 ++-- server/datastore/datastore_password_reset_test.go | 2 +- server/datastore/datastore_queries_test.go | 4 ++-- .../datastore/datastore_scheduled_queries_test.go | 4 ++-- server/datastore/datastore_test.go | 2 +- server/datastore/datastore_users_test.go | 2 +- server/datastore/datastore_yara_test.go | 2 +- server/datastore/file_integrity_monitoring_test.go | 2 +- server/datastore/inmem/app.go | 2 +- server/datastore/inmem/campaigns.go | 2 +- server/datastore/inmem/decorators.go | 2 +- .../datastore/inmem/file_integrity_monitoring.go | 2 +- server/datastore/inmem/hosts.go | 2 +- server/datastore/inmem/inmem.go | 6 +++--- server/datastore/inmem/inmem_test.go | 2 +- server/datastore/inmem/invites.go | 2 +- server/datastore/inmem/labels.go | 2 +- server/datastore/inmem/options.go | 2 +- server/datastore/inmem/packs.go | 2 +- server/datastore/inmem/password_reset.go | 2 +- server/datastore/inmem/queries.go | 2 +- server/datastore/inmem/scheduled_queries.go | 2 +- server/datastore/inmem/sessions.go | 2 +- server/datastore/inmem/users.go | 2 +- server/datastore/inmem/yara.go | 2 +- server/datastore/inmem_test.go | 4 ++-- server/datastore/internal/appstate/labels.go | 2 +- server/datastore/internal/appstate/options.go | 2 +- server/datastore/mysql/app_configs.go | 2 +- server/datastore/mysql/campaigns.go | 2 +- server/datastore/mysql/datastore_test.go | 2 +- server/datastore/mysql/decorators.go | 2 +- .../datastore/mysql/file_integrity_monitoring.go | 2 +- server/datastore/mysql/hosts.go | 2 +- server/datastore/mysql/invites.go | 2 +- server/datastore/mysql/labels.go | 2 +- .../data/20161223115449_InsertOsqueryOptions.go | 4 ++-- .../data/20161229171615_InsertBuiltinLabels.go | 2 +- .../tables/20161118212557_CreateTableLabels.go | 2 +- server/datastore/mysql/mysql.go | 8 ++++---- server/datastore/mysql/options.go | 2 +- server/datastore/mysql/packs.go | 2 +- server/datastore/mysql/password_reset.go | 2 +- server/datastore/mysql/queries.go | 2 +- server/datastore/mysql/scheduled_queries.go | 2 +- server/datastore/mysql/sessions.go | 2 +- server/datastore/mysql/users.go | 2 +- server/datastore/mysql/yara.go | 2 +- server/datastore/mysql_test.go | 4 ++-- server/kolide/campaigns.go | 2 +- server/mail/mail.go | 2 +- server/mail/mail_test.go | 2 +- server/mock/datastore.go | 2 +- server/mock/datastore_appconfig.go | 2 +- server/mock/datastore_appconfig_helpers.go | 2 +- server/mock/datastore_invites.go | 2 +- server/mock/datastore_invites_helpers.go | 2 +- server/mock/datastore_users.go | 2 +- server/mock/datastore_users_helpers.go | 2 +- server/pubsub/inmem_query_results.go | 2 +- server/pubsub/query_results_test.go | 2 +- server/pubsub/redis_query_results.go | 2 +- server/service/endpoint_appconfig.go | 4 ++-- server/service/endpoint_appconfig_test.go | 2 +- server/service/endpoint_campaigns.go | 6 +++--- server/service/endpoint_certificate.go | 2 +- server/service/endpoint_change_email.go | 2 +- server/service/endpoint_hosts.go | 2 +- server/service/endpoint_import_config.go | 2 +- server/service/endpoint_import_config_test.go | 2 +- server/service/endpoint_invites.go | 2 +- server/service/endpoint_labels.go | 2 +- server/service/endpoint_middleware.go | 8 ++++---- server/service/endpoint_middleware_test.go | 8 ++++---- server/service/endpoint_options.go | 2 +- server/service/endpoint_osquery.go | 2 +- server/service/endpoint_packs.go | 2 +- server/service/endpoint_queries.go | 2 +- server/service/endpoint_scheduled_queries.go | 2 +- server/service/endpoint_sessions.go | 2 +- server/service/endpoint_setup.go | 2 +- server/service/endpoint_targets.go | 2 +- server/service/endpoint_test.go | 6 +++--- server/service/endpoint_users.go | 2 +- server/service/handler.go | 2 +- server/service/handler_test.go | 4 ++-- server/service/http_auth.go | 6 +++--- server/service/http_auth_test.go | 6 +++--- server/service/logging.go | 2 +- server/service/logging_appconfig.go | 2 +- server/service/logging_hosts.go | 2 +- server/service/logging_invites.go | 4 ++-- server/service/logging_labels.go | 2 +- server/service/logging_osquery.go | 2 +- server/service/logging_packs.go | 2 +- server/service/logging_scheduled_queries.go | 2 +- server/service/logging_sessions.go | 2 +- server/service/logging_users.go | 4 ++-- server/service/metrics.go | 2 +- server/service/metrics_appconfig.go | 2 +- server/service/metrics_invites.go | 2 +- server/service/metrics_sessions.go | 2 +- server/service/metrics_users.go | 2 +- server/service/service.go | 4 ++-- server/service/service_appconfig.go | 6 +++--- server/service/service_appconfig_test.go | 6 +++--- server/service/service_campaigns.go | 6 +++--- server/service/service_hosts.go | 2 +- server/service/service_hosts_test.go | 6 +++--- server/service/service_import_config.go | 4 ++-- server/service/service_import_config_test.go | 6 +++--- server/service/service_invites.go | 2 +- server/service/service_invites_test.go | 6 +++--- server/service/service_labels.go | 2 +- server/service/service_labels_test.go | 6 +++--- server/service/service_options.go | 2 +- server/service/service_osquery.go | 6 +++--- server/service/service_osquery_test.go | 14 +++++++------- server/service/service_packs.go | 4 ++-- server/service/service_packs_test.go | 8 ++++---- server/service/service_queries.go | 4 ++-- server/service/service_queries_test.go | 8 ++++---- server/service/service_scheduled_queries.go | 2 +- server/service/service_scheduled_queries_test.go | 8 ++++---- server/service/service_sessions.go | 4 ++-- server/service/service_sessions_test.go | 8 ++++---- server/service/service_targets.go | 2 +- server/service/service_targets_test.go | 6 +++--- server/service/service_users.go | 4 ++-- server/service/service_users_test.go | 10 +++++----- server/service/transport.go | 2 +- server/service/transport_appconfig.go | 2 +- server/service/transport_import_config.go | 2 +- server/service/transport_options.go | 2 +- server/service/transport_osquery.go | 2 +- server/service/transport_osquery_test.go | 2 +- server/service/transport_test.go | 2 +- server/service/util_test.go | 4 ++-- server/service/validation_import_config.go | 2 +- server/service/validation_invites.go | 2 +- server/service/validation_options.go | 2 +- server/service/validation_setup.go | 2 +- server/service/validation_users.go | 4 ++-- server/test/new_objects.go | 2 +- server/version/version.go | 2 +- server/websocket/websocket.go | 2 +- server/websocket/websocket_test.go | 2 +- tools/app/development.yml | 2 +- 172 files changed, 272 insertions(+), 272 deletions(-) diff --git a/.gitignore b/.gitignore index 7d47bb3c3b..82a0160ea1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ # binaries -kolide-ose +kolide *.exe # output directories diff --git a/Makefile b/Makefile index 8ae3182a56..7d88fa9219 100644 --- a/Makefile +++ b/Makefile @@ -76,12 +76,12 @@ endif build: export GOGC = off build: .prefix go build -i -o ${OUTPUT} -ldflags "\ - -X github.com/kolide/kolide-ose/server/version.version=${VERSION} \ - -X github.com/kolide/kolide-ose/server/version.branch=${BRANCH} \ - -X github.com/kolide/kolide-ose/server/version.revision=${REVISION} \ - -X github.com/kolide/kolide-ose/server/version.buildDate=${NOW} \ - -X github.com/kolide/kolide-ose/server/version.buildUser=${USER} \ - -X github.com/kolide/kolide-ose/server/version.goVersion=${GOVERSION}" + -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}" lint-js: eslint frontend --ext .js,.jsx diff --git a/README.md b/README.md index fa3727fda4..1003f16264 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Kolide [![CircleCI](https://circleci.com/gh/kolide/kolide-ose.svg?style=svg&circle-token=2573c239b7f18967040d2dec95ca5f71cfc90693)](https://circleci.com/gh/kolide/kolide-ose) +# Kolide [![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 74018417e8..d98bb9ec5b 100644 --- a/circle.yml +++ b/circle.yml @@ -13,7 +13,7 @@ dependencies: - docker pull redis - docker pull mysql:5.7 - docker pull kolide/kolide-builder:1.8 - - docker run -v $(pwd):/go/src/github.com/kolide/kolide-ose -v /home/ubuntu/.go_workspace/pkg:/go/pkg kolide/kolide-builder:1.8 --deps + - docker run -v $(pwd):/go/src/github.com/kolide/kolide -v /home/ubuntu/.go_workspace/pkg:/go/pkg kolide/kolide-builder:1.8 --deps cache_directories: - "vendor" - "node_modules" @@ -22,7 +22,7 @@ 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-ose -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/kolide -v /home/ubuntu/.go_workspace/pkg:/go/pkg kolide/kolide-builder:1.8 --build - docker stop $(docker ps -a -q) deployment: diff --git a/cli/config_dump.go b/cli/config_dump.go index 4bbf06ae4f..be977c045f 100644 --- a/cli/config_dump.go +++ b/cli/config_dump.go @@ -3,7 +3,7 @@ package cli import ( "fmt" - "github.com/kolide/kolide-ose/server/config" + "github.com/kolide/kolide/server/config" "github.com/spf13/cobra" "gopkg.in/yaml.v2" diff --git a/cli/prepare.go b/cli/prepare.go index 156bd879bf..3e411aa6fd 100644 --- a/cli/prepare.go +++ b/cli/prepare.go @@ -3,11 +3,11 @@ package cli import ( "github.com/WatchBeam/clock" kitlog "github.com/go-kit/kit/log" - "github.com/kolide/kolide-ose/server/config" - "github.com/kolide/kolide-ose/server/datastore/mysql" - "github.com/kolide/kolide-ose/server/kolide" - "github.com/kolide/kolide-ose/server/pubsub" - "github.com/kolide/kolide-ose/server/service" + "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/spf13/cobra" "golang.org/x/net/context" ) diff --git a/cli/root.go b/cli/root.go index b72de0b37c..afc82c28bf 100644 --- a/cli/root.go +++ b/cli/root.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/kolide/kolide-ose/server/config" + "github.com/kolide/kolide/server/config" "github.com/spf13/cobra" ) diff --git a/cli/serve.go b/cli/serve.go index a004191104..24ce211012 100644 --- a/cli/serve.go +++ b/cli/serve.go @@ -12,13 +12,13 @@ import ( "github.com/WatchBeam/clock" kitlog "github.com/go-kit/kit/log" kitprometheus "github.com/go-kit/kit/metrics/prometheus" - "github.com/kolide/kolide-ose/server/config" - "github.com/kolide/kolide-ose/server/datastore/mysql" - "github.com/kolide/kolide-ose/server/kolide" - "github.com/kolide/kolide-ose/server/mail" - "github.com/kolide/kolide-ose/server/pubsub" - "github.com/kolide/kolide-ose/server/service" - "github.com/kolide/kolide-ose/server/version" + "github.com/kolide/kolide/server/config" + "github.com/kolide/kolide/server/datastore/mysql" + "github.com/kolide/kolide/server/kolide" + "github.com/kolide/kolide/server/mail" + "github.com/kolide/kolide/server/pubsub" + "github.com/kolide/kolide/server/service" + "github.com/kolide/kolide/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 09d231a2cd..01f5fecb75 100644 --- a/cli/version.go +++ b/cli/version.go @@ -1,8 +1,8 @@ package cli import ( - "github.com/kolide/kolide-ose/server/config" - "github.com/kolide/kolide-ose/server/version" + "github.com/kolide/kolide/server/config" + "github.com/kolide/kolide/server/version" "github.com/spf13/cobra" ) diff --git a/docs/api/README.md b/docs/api/README.md index c907ff2246..81f8d65094 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-ose/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/kolide/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,6 +32,6 @@ 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-ose/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/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. 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. diff --git a/docs/infrastructure/kolide-on-centos.md b/docs/infrastructure/kolide-on-centos.md index 6f564dea5c..e30051a252 100644 --- a/docs/infrastructure/kolide-on-centos.md +++ b/docs/infrastructure/kolide-on-centos.md @@ -18,10 +18,10 @@ $ vagrant ssh ## Installing Kolide -To install Kolide, go to the [GitHub Releases Page](https://github.com/kolide/kolide-ose/releases) to select the most recent deb package. You can install it on your host by using: +To install Kolide, go to the [GitHub Releases Page](https://github.com/kolide/kolide/releases) to select the most recent deb package. You can install it on your host by using: ``` -$ wget https://github.com/kolide/kolide-ose/releases/download/1.0.0-rc1/kolide-1.0.0_rc1-1.x86_64.rpm +$ wget https://github.com/kolide/kolide/releases/download/1.0.0-rc1/kolide-1.0.0_rc1-1.x86_64.rpm $ sudo rpm -i kolide-1.0.0_rc1-1.x86_64.rpm ``` diff --git a/docs/infrastructure/kolide-on-ubuntu.md b/docs/infrastructure/kolide-on-ubuntu.md index 9ebd2c3bf1..b843e12a4a 100644 --- a/docs/infrastructure/kolide-on-ubuntu.md +++ b/docs/infrastructure/kolide-on-ubuntu.md @@ -18,10 +18,10 @@ $ vagrant ssh ## Installing Kolide -To install Kolide, go to the [GitHub Releases Page](https://github.com/kolide/kolide-ose/releases) to select the most recent deb package. You can install it on your host by using: +To install Kolide, go to the [GitHub Releases Page](https://github.com/kolide/kolide/releases) to select the most recent deb package. You can install it on your host by using: ``` -$ wget https://github.com/kolide/kolide-ose/releases/download/1.0.0-rc1/kolide_1.0.0-rc1_amd64.deb +$ wget https://github.com/kolide/kolide/releases/download/1.0.0-rc1/kolide_1.0.0-rc1_amd64.deb $ sudo dpkg -i kolide_1.0.0-rc1_amd64.deb ``` diff --git a/glide.yaml b/glide.yaml index 1ab6755c89..68a69ca276 100644 --- a/glide.yaml +++ b/glide.yaml @@ -1,4 +1,4 @@ -package: github.com/kolide/kolide-ose +package: github.com/kolide/kolide import: - package: github.com/alecthomas/template version: a0175ee3bccc567396460bf5acd36800cb10c49c diff --git a/main.go b/main.go index 1963b0be05..8e132b8c4c 100644 --- a/main.go +++ b/main.go @@ -5,7 +5,7 @@ import ( "time" _ "github.com/go-sql-driver/mysql" - "github.com/kolide/kolide-ose/cli" + "github.com/kolide/kolide/cli" ) func init() { diff --git a/server/contexts/host/host.go b/server/contexts/host/host.go index 3343a0c2e6..048d2bb378 100644 --- a/server/contexts/host/host.go +++ b/server/contexts/host/host.go @@ -3,7 +3,7 @@ package host import ( - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/contexts/viewer/viewer.go b/server/contexts/viewer/viewer.go index 5f28ec619b..637e3bf24d 100644 --- a/server/contexts/viewer/viewer.go +++ b/server/contexts/viewer/viewer.go @@ -3,7 +3,7 @@ package viewer import ( - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/datastore/datastore_app_test.go b/server/datastore/datastore_app_test.go index 2aff6a5078..4eac5c997f 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-ose/server/kolide" + "github.com/kolide/kolide/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 be3f912047..5fed074ee5 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-ose/server/kolide" - "github.com/kolide/kolide-ose/server/test" + "github.com/kolide/kolide/server/kolide" + "github.com/kolide/kolide/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 6ced6e60ec..d80ffac82e 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-ose/server/kolide" + "github.com/kolide/kolide/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 4847199f8e..adf48d1902 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-ose/server/kolide" + "github.com/kolide/kolide/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 7337354711..99d16017db 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-ose/server/kolide" - "github.com/kolide/kolide-ose/server/test" + "github.com/kolide/kolide/server/kolide" + "github.com/kolide/kolide/server/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/server/datastore/datastore_invites_test.go b/server/datastore/datastore_invites_test.go index fdbc403cb0..a0dc9220d3 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-ose/server/kolide" + "github.com/kolide/kolide/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 fec2b07dbe..8d4ca37730 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-ose/server/kolide" + "github.com/kolide/kolide/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 f4ef2147bd..6efe2a0637 100644 --- a/server/datastore/datastore_options_test.go +++ b/server/datastore/datastore_options_test.go @@ -4,8 +4,8 @@ import ( "reflect" "testing" - "github.com/kolide/kolide-ose/server/datastore/internal/appstate" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/datastore/internal/appstate" + "github.com/kolide/kolide/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 e0c553ad69..71267eb537 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-ose/server/kolide" - "github.com/kolide/kolide-ose/server/test" + "github.com/kolide/kolide/server/kolide" + "github.com/kolide/kolide/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 b23a5e6292..96e162638e 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-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "github.com/stretchr/testify/assert" ) diff --git a/server/datastore/datastore_queries_test.go b/server/datastore/datastore_queries_test.go index 93d8a69503..21fd9b0001 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-ose/server/kolide" - "github.com/kolide/kolide-ose/server/test" + "github.com/kolide/kolide/server/kolide" + "github.com/kolide/kolide/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 47dc79697c..beaaea3a20 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-ose/server/kolide" - "github.com/kolide/kolide-ose/server/test" + "github.com/kolide/kolide/server/kolide" + "github.com/kolide/kolide/server/test" "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 446127d101..421f7e6dbc 100644 --- a/server/datastore/datastore_test.go +++ b/server/datastore/datastore_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" ) func functionName(f func(*testing.T, kolide.Datastore)) string { diff --git a/server/datastore/datastore_users_test.go b/server/datastore/datastore_users_test.go index 46fd452ee7..6aed59e4ff 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-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "github.com/stretchr/testify/assert" ) diff --git a/server/datastore/datastore_yara_test.go b/server/datastore/datastore_yara_test.go index 454efdf5af..96468b9065 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-ose/server/kolide" + "github.com/kolide/kolide/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 5680ea40a6..fd314cd199 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-ose/server/kolide" + "github.com/kolide/kolide/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 8830263748..0b32a29905 100644 --- a/server/datastore/inmem/app.go +++ b/server/datastore/inmem/app.go @@ -1,6 +1,6 @@ package inmem -import "github.com/kolide/kolide-ose/server/kolide" +import "github.com/kolide/kolide/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 fa63e87be5..52c9d6c0d6 100644 --- a/server/datastore/inmem/campaigns.go +++ b/server/datastore/inmem/campaigns.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/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 c22058fa09..4c2e19b735 100644 --- a/server/datastore/inmem/decorators.go +++ b/server/datastore/inmem/decorators.go @@ -1,6 +1,6 @@ package inmem -import "github.com/kolide/kolide-ose/server/kolide" +import "github.com/kolide/kolide/server/kolide" func (d *Datastore) NewDecorator(decorator *kolide.Decorator) (*kolide.Decorator, error) { d.mtx.Lock() diff --git a/server/datastore/inmem/file_integrity_monitoring.go b/server/datastore/inmem/file_integrity_monitoring.go index a37eb3f2b6..0bcedef112 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-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" ) func (d *Datastore) NewFIMSection(fp *kolide.FIMSection) (*kolide.FIMSection, error) { diff --git a/server/datastore/inmem/hosts.go b/server/datastore/inmem/hosts.go index 63490bdf2b..9a3d06e3aa 100644 --- a/server/datastore/inmem/hosts.go +++ b/server/datastore/inmem/hosts.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "github.com/patrickmn/sortutil" ) diff --git a/server/datastore/inmem/inmem.go b/server/datastore/inmem/inmem.go index 40d31ad58e..de03e42701 100644 --- a/server/datastore/inmem/inmem.go +++ b/server/datastore/inmem/inmem.go @@ -7,9 +7,9 @@ import ( "sync" "time" - "github.com/kolide/kolide-ose/server/config" - "github.com/kolide/kolide-ose/server/datastore/internal/appstate" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/config" + "github.com/kolide/kolide/server/datastore/internal/appstate" + "github.com/kolide/kolide/server/kolide" "github.com/patrickmn/sortutil" ) diff --git a/server/datastore/inmem/inmem_test.go b/server/datastore/inmem/inmem_test.go index b3030f7e02..f74a7afd82 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-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "github.com/stretchr/testify/assert" ) diff --git a/server/datastore/inmem/invites.go b/server/datastore/inmem/invites.go index 1cb93d1cc8..2938b062d6 100644 --- a/server/datastore/inmem/invites.go +++ b/server/datastore/inmem/invites.go @@ -5,7 +5,7 @@ import ( "sort" "time" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/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 191e13ba85..51dec2c7ab 100644 --- a/server/datastore/inmem/labels.go +++ b/server/datastore/inmem/labels.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "github.com/patrickmn/sortutil" ) diff --git a/server/datastore/inmem/options.go b/server/datastore/inmem/options.go index 3e35e61a78..bf66a8cbfb 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-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "github.com/patrickmn/sortutil" ) diff --git a/server/datastore/inmem/packs.go b/server/datastore/inmem/packs.go index 935d2a70c3..a8fdee4093 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-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" ) func (d *Datastore) PackByName(name string) (*kolide.Pack, bool, error) { diff --git a/server/datastore/inmem/password_reset.go b/server/datastore/inmem/password_reset.go index e8c4b73cba..0167d8a4de 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-ose/server/kolide" + "github.com/kolide/kolide/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 0696197026..dad7766efc 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-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "github.com/pkg/errors" ) diff --git a/server/datastore/inmem/scheduled_queries.go b/server/datastore/inmem/scheduled_queries.go index 59a8eb3bc7..9d9ff825be 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-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" ) func (d *Datastore) NewScheduledQuery(sq *kolide.ScheduledQuery) (*kolide.ScheduledQuery, error) { diff --git a/server/datastore/inmem/sessions.go b/server/datastore/inmem/sessions.go index e61e8dedcc..cfa82fe21b 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-ose/server/kolide" + "github.com/kolide/kolide/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 20f628fc4e..ca8473697c 100644 --- a/server/datastore/inmem/users.go +++ b/server/datastore/inmem/users.go @@ -4,7 +4,7 @@ import ( "fmt" "sort" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/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 356929a5f4..4d5ae0bd1a 100644 --- a/server/datastore/inmem/yara.go +++ b/server/datastore/inmem/yara.go @@ -1,6 +1,6 @@ package inmem -import "github.com/kolide/kolide-ose/server/kolide" +import "github.com/kolide/kolide/server/kolide" func (d *Datastore) NewYARASignatureGroup(ysg *kolide.YARASignatureGroup) (*kolide.YARASignatureGroup, error) { d.mtx.Lock() diff --git a/server/datastore/inmem_test.go b/server/datastore/inmem_test.go index 8fa6efd188..4385a2c2d5 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-ose/server/config" - "github.com/kolide/kolide-ose/server/datastore/inmem" + "github.com/kolide/kolide/server/config" + "github.com/kolide/kolide/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 4039cbd531..adcbe440a8 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-ose/server/kolide" +import "github.com/kolide/kolide/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 0f10f5bcaa..32b535b4b2 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-ose/server/kolide" +import "github.com/kolide/kolide/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 8248692246..3badcce7f3 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-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "github.com/pkg/errors" ) diff --git a/server/datastore/mysql/campaigns.go b/server/datastore/mysql/campaigns.go index 569f6535b8..1c65c65994 100644 --- a/server/datastore/mysql/campaigns.go +++ b/server/datastore/mysql/campaigns.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "github.com/pkg/errors" ) diff --git a/server/datastore/mysql/datastore_test.go b/server/datastore/mysql/datastore_test.go index b98f9f58b0..065510cf9a 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-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" ) func TestAppendListOptionsToSQL(t *testing.T) { diff --git a/server/datastore/mysql/decorators.go b/server/datastore/mysql/decorators.go index 17649509f3..4eeaf5ec69 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-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" ) func (ds *Datastore) NewDecorator(decorator *kolide.Decorator) (*kolide.Decorator, error) { diff --git a/server/datastore/mysql/file_integrity_monitoring.go b/server/datastore/mysql/file_integrity_monitoring.go index 4fcdb1bd45..0775d74b2d 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-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "github.com/pkg/errors" ) diff --git a/server/datastore/mysql/hosts.go b/server/datastore/mysql/hosts.go index f5fce72ac2..9d0ebea191 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-ose/server/kolide" + "github.com/kolide/kolide/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 7c378b8e19..67c58c14fd 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-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "github.com/pkg/errors" ) diff --git a/server/datastore/mysql/labels.go b/server/datastore/mysql/labels.go index 890e160c76..81e0c40c11 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-ose/server/kolide" + "github.com/kolide/kolide/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 6c51d03664..a835312421 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-ose/server/datastore/internal/appstate" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/datastore/internal/appstate" + "github.com/kolide/kolide/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 664c6e0752..497124a877 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-ose/server/datastore/internal/appstate" + "github.com/kolide/kolide/server/datastore/internal/appstate" ) func init() { diff --git a/server/datastore/mysql/migrations/tables/20161118212557_CreateTableLabels.go b/server/datastore/mysql/migrations/tables/20161118212557_CreateTableLabels.go index c309f76540..3403ed1677 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-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" ) func init() { diff --git a/server/datastore/mysql/mysql.go b/server/datastore/mysql/mysql.go index aae65ac9aa..f926f1cf58 100644 --- a/server/datastore/mysql/mysql.go +++ b/server/datastore/mysql/mysql.go @@ -7,10 +7,10 @@ import ( "github.com/WatchBeam/clock" "github.com/go-kit/kit/log" "github.com/jmoiron/sqlx" - "github.com/kolide/kolide-ose/server/config" - "github.com/kolide/kolide-ose/server/datastore/mysql/migrations/data" - "github.com/kolide/kolide-ose/server/datastore/mysql/migrations/tables" - "github.com/kolide/kolide-ose/server/kolide" + "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" ) const ( diff --git a/server/datastore/mysql/options.go b/server/datastore/mysql/options.go index 644db50482..3f1d5990e4 100644 --- a/server/datastore/mysql/options.go +++ b/server/datastore/mysql/options.go @@ -3,7 +3,7 @@ package mysql import ( "database/sql" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "github.com/pkg/errors" ) diff --git a/server/datastore/mysql/packs.go b/server/datastore/mysql/packs.go index 3a7caa8ceb..bd2d35b51f 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-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "github.com/pkg/errors" ) diff --git a/server/datastore/mysql/password_reset.go b/server/datastore/mysql/password_reset.go index 2bfbb9546b..1483f1284d 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-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "github.com/pkg/errors" ) diff --git a/server/datastore/mysql/queries.go b/server/datastore/mysql/queries.go index 43cfa72d69..50730e09ab 100644 --- a/server/datastore/mysql/queries.go +++ b/server/datastore/mysql/queries.go @@ -6,7 +6,7 @@ import ( "github.com/VividCortex/mysqlerr" "github.com/go-sql-driver/mysql" "github.com/jmoiron/sqlx" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "github.com/pkg/errors" ) diff --git a/server/datastore/mysql/scheduled_queries.go b/server/datastore/mysql/scheduled_queries.go index 2596ff17a4..c4082e7db3 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-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "github.com/pkg/errors" ) diff --git a/server/datastore/mysql/sessions.go b/server/datastore/mysql/sessions.go index 02376ee88c..97c1d6c7e9 100644 --- a/server/datastore/mysql/sessions.go +++ b/server/datastore/mysql/sessions.go @@ -1,7 +1,7 @@ package mysql import ( - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "github.com/pkg/errors" ) diff --git a/server/datastore/mysql/users.go b/server/datastore/mysql/users.go index 355aa1fd75..46c9c76667 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-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "github.com/pkg/errors" ) diff --git a/server/datastore/mysql/yara.go b/server/datastore/mysql/yara.go index 2fa39dc61d..7215a89664 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-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "github.com/pkg/errors" ) diff --git a/server/datastore/mysql_test.go b/server/datastore/mysql_test.go index 83928ece0e..3b15e226c3 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-ose/server/config" - "github.com/kolide/kolide-ose/server/datastore/mysql" + "github.com/kolide/kolide/server/config" + "github.com/kolide/kolide/server/datastore/mysql" "github.com/stretchr/testify/require" ) diff --git a/server/kolide/campaigns.go b/server/kolide/campaigns.go index 7be241315d..a1b0a33dd0 100644 --- a/server/kolide/campaigns.go +++ b/server/kolide/campaigns.go @@ -3,7 +3,7 @@ package kolide import ( "time" - "github.com/kolide/kolide-ose/server/websocket" + "github.com/kolide/kolide/server/websocket" "golang.org/x/net/context" ) diff --git a/server/mail/mail.go b/server/mail/mail.go index fa0215271b..438181a37f 100644 --- a/server/mail/mail.go +++ b/server/mail/mail.go @@ -8,7 +8,7 @@ import ( "net/smtp" "time" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "github.com/pkg/errors" ) diff --git a/server/mail/mail_test.go b/server/mail/mail_test.go index 2a624c0044..c7605e68c1 100644 --- a/server/mail/mail_test.go +++ b/server/mail/mail_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "github.com/stretchr/testify/assert" ) diff --git a/server/mock/datastore.go b/server/mock/datastore.go index ff4f8bc797..ba6acfe0c2 100644 --- a/server/mock/datastore.go +++ b/server/mock/datastore.go @@ -4,7 +4,7 @@ package mock //go:generate mockimpl -o datastore_invites.go "s *InviteStore" "kolide.InviteStore" //go:generate mockimpl -o datastore_appconfig.go "s *AppConfigStore" "kolide.AppConfigStore" -import "github.com/kolide/kolide-ose/server/kolide" +import "github.com/kolide/kolide/server/kolide" var _ kolide.Datastore = (*Store)(nil) diff --git a/server/mock/datastore_appconfig.go b/server/mock/datastore_appconfig.go index 982628d566..f193e587c1 100644 --- a/server/mock/datastore_appconfig.go +++ b/server/mock/datastore_appconfig.go @@ -2,7 +2,7 @@ package mock -import "github.com/kolide/kolide-ose/server/kolide" +import "github.com/kolide/kolide/server/kolide" var _ kolide.AppConfigStore = (*AppConfigStore)(nil) diff --git a/server/mock/datastore_appconfig_helpers.go b/server/mock/datastore_appconfig_helpers.go index ea197ab34b..58e319238f 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-ose/server/kolide" +import "github.com/kolide/kolide/server/kolide" func ReturnFakeAppConfig(fake *kolide.AppConfig) AppConfigFunc { return func() (*kolide.AppConfig, error) { diff --git a/server/mock/datastore_invites.go b/server/mock/datastore_invites.go index 04723c2cc2..24e8529089 100644 --- a/server/mock/datastore_invites.go +++ b/server/mock/datastore_invites.go @@ -2,7 +2,7 @@ package mock -import "github.com/kolide/kolide-ose/server/kolide" +import "github.com/kolide/kolide/server/kolide" var _ kolide.InviteStore = (*InviteStore)(nil) diff --git a/server/mock/datastore_invites_helpers.go b/server/mock/datastore_invites_helpers.go index 80e10a523f..4c90104f7a 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-ose/server/kolide" +import "github.com/kolide/kolide/server/kolide" func ReturnNewInivite(fake *kolide.Invite) NewInviteFunc { return func(i *kolide.Invite) (*kolide.Invite, error) { diff --git a/server/mock/datastore_users.go b/server/mock/datastore_users.go index 1880c46632..e432cbc1e0 100644 --- a/server/mock/datastore_users.go +++ b/server/mock/datastore_users.go @@ -2,7 +2,7 @@ package mock -import "github.com/kolide/kolide-ose/server/kolide" +import "github.com/kolide/kolide/server/kolide" var _ kolide.UserStore = (*UserStore)(nil) diff --git a/server/mock/datastore_users_helpers.go b/server/mock/datastore_users_helpers.go index 1c2cd3d85a..808c303bfd 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-ose/server/kolide" +import "github.com/kolide/kolide/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 59af988e7c..0647fed419 100644 --- a/server/pubsub/inmem_query_results.go +++ b/server/pubsub/inmem_query_results.go @@ -6,7 +6,7 @@ import ( "golang.org/x/net/context" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" ) type inmemQueryResults struct { diff --git a/server/pubsub/query_results_test.go b/server/pubsub/query_results_test.go index c0bcd35fed..15afffae91 100644 --- a/server/pubsub/query_results_test.go +++ b/server/pubsub/query_results_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/net/context" diff --git a/server/pubsub/redis_query_results.go b/server/pubsub/redis_query_results.go index b3018bed90..aadb11a3a5 100644 --- a/server/pubsub/redis_query_results.go +++ b/server/pubsub/redis_query_results.go @@ -8,7 +8,7 @@ import ( "golang.org/x/net/context" "github.com/garyburd/redigo/redis" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "github.com/pkg/errors" ) diff --git a/server/service/endpoint_appconfig.go b/server/service/endpoint_appconfig.go index 7c74162d78..70b442aabf 100644 --- a/server/service/endpoint_appconfig.go +++ b/server/service/endpoint_appconfig.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/go-kit/kit/endpoint" - "github.com/kolide/kolide-ose/server/contexts/viewer" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/contexts/viewer" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/endpoint_appconfig_test.go b/server/service/endpoint_appconfig_test.go index f87e85fd81..a2c84ae4ca 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-ose/server/kolide" + "github.com/kolide/kolide/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 5859eed61c..fb8f81d2b3 100644 --- a/server/service/endpoint_campaigns.go +++ b/server/service/endpoint_campaigns.go @@ -5,9 +5,9 @@ import ( "github.com/go-kit/kit/endpoint" kitlog "github.com/go-kit/kit/log" - "github.com/kolide/kolide-ose/server/contexts/viewer" - "github.com/kolide/kolide-ose/server/kolide" - "github.com/kolide/kolide-ose/server/websocket" + "github.com/kolide/kolide/server/contexts/viewer" + "github.com/kolide/kolide/server/kolide" + "github.com/kolide/kolide/server/websocket" "golang.org/x/net/context" ) diff --git a/server/service/endpoint_certificate.go b/server/service/endpoint_certificate.go index 0d66eb6b26..e204ca2b8a 100644 --- a/server/service/endpoint_certificate.go +++ b/server/service/endpoint_certificate.go @@ -2,7 +2,7 @@ package service import ( "github.com/go-kit/kit/endpoint" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/endpoint_change_email.go b/server/service/endpoint_change_email.go index b2439674a4..8ee4442a81 100644 --- a/server/service/endpoint_change_email.go +++ b/server/service/endpoint_change_email.go @@ -2,7 +2,7 @@ package service import ( "github.com/go-kit/kit/endpoint" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/endpoint_hosts.go b/server/service/endpoint_hosts.go index f6fd325df2..853fd105f6 100644 --- a/server/service/endpoint_hosts.go +++ b/server/service/endpoint_hosts.go @@ -4,7 +4,7 @@ import ( "time" "github.com/go-kit/kit/endpoint" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/endpoint_import_config.go b/server/service/endpoint_import_config.go index e1c25bb8bf..792c0922af 100644 --- a/server/service/endpoint_import_config.go +++ b/server/service/endpoint_import_config.go @@ -2,7 +2,7 @@ package service import ( "github.com/go-kit/kit/endpoint" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/endpoint_import_config_test.go b/server/service/endpoint_import_config_test.go index 2dbc38588c..2e41d42f9a 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-ose/server/kolide" + "github.com/kolide/kolide/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 b12ea51fb1..9f2830e49b 100644 --- a/server/service/endpoint_invites.go +++ b/server/service/endpoint_invites.go @@ -2,7 +2,7 @@ package service import ( "github.com/go-kit/kit/endpoint" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/endpoint_labels.go b/server/service/endpoint_labels.go index f97520b328..ac84942e66 100644 --- a/server/service/endpoint_labels.go +++ b/server/service/endpoint_labels.go @@ -2,7 +2,7 @@ package service import ( "github.com/go-kit/kit/endpoint" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/endpoint_middleware.go b/server/service/endpoint_middleware.go index de704bd686..17919b7406 100644 --- a/server/service/endpoint_middleware.go +++ b/server/service/endpoint_middleware.go @@ -7,10 +7,10 @@ import ( jwt "github.com/dgrijalva/jwt-go" "github.com/go-kit/kit/endpoint" - hostctx "github.com/kolide/kolide-ose/server/contexts/host" - "github.com/kolide/kolide-ose/server/contexts/token" - "github.com/kolide/kolide-ose/server/contexts/viewer" - "github.com/kolide/kolide-ose/server/kolide" + 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" "golang.org/x/net/context" ) diff --git a/server/service/endpoint_middleware_test.go b/server/service/endpoint_middleware_test.go index e4bb9d6ba5..ec3e61ffe3 100644 --- a/server/service/endpoint_middleware_test.go +++ b/server/service/endpoint_middleware_test.go @@ -4,10 +4,10 @@ import ( "testing" "github.com/go-kit/kit/endpoint" - "github.com/kolide/kolide-ose/server/config" - "github.com/kolide/kolide-ose/server/contexts/viewer" - "github.com/kolide/kolide-ose/server/datastore/inmem" - "github.com/kolide/kolide-ose/server/kolide" + "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/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/net/context" diff --git a/server/service/endpoint_options.go b/server/service/endpoint_options.go index 63197b444f..087241b688 100644 --- a/server/service/endpoint_options.go +++ b/server/service/endpoint_options.go @@ -2,7 +2,7 @@ package service import ( "github.com/go-kit/kit/endpoint" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/endpoint_osquery.go b/server/service/endpoint_osquery.go index ed1cebfe6f..d6efe2e467 100644 --- a/server/service/endpoint_osquery.go +++ b/server/service/endpoint_osquery.go @@ -4,7 +4,7 @@ import ( "encoding/json" "github.com/go-kit/kit/endpoint" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/endpoint_packs.go b/server/service/endpoint_packs.go index 0bfcd26897..ba2b04c709 100644 --- a/server/service/endpoint_packs.go +++ b/server/service/endpoint_packs.go @@ -2,7 +2,7 @@ package service import ( "github.com/go-kit/kit/endpoint" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/endpoint_queries.go b/server/service/endpoint_queries.go index 9f9407188e..b4e15e97c5 100644 --- a/server/service/endpoint_queries.go +++ b/server/service/endpoint_queries.go @@ -2,7 +2,7 @@ package service import ( "github.com/go-kit/kit/endpoint" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/endpoint_scheduled_queries.go b/server/service/endpoint_scheduled_queries.go index 12ead7a581..f8e97f5dce 100644 --- a/server/service/endpoint_scheduled_queries.go +++ b/server/service/endpoint_scheduled_queries.go @@ -2,7 +2,7 @@ package service import ( "github.com/go-kit/kit/endpoint" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/endpoint_sessions.go b/server/service/endpoint_sessions.go index 8f2474ee98..31975d8921 100644 --- a/server/service/endpoint_sessions.go +++ b/server/service/endpoint_sessions.go @@ -4,7 +4,7 @@ import ( "time" "github.com/go-kit/kit/endpoint" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/endpoint_setup.go b/server/service/endpoint_setup.go index 155cde719f..6459a43706 100644 --- a/server/service/endpoint_setup.go +++ b/server/service/endpoint_setup.go @@ -4,7 +4,7 @@ import ( "golang.org/x/net/context" "github.com/go-kit/kit/endpoint" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" ) type setupRequest struct { diff --git a/server/service/endpoint_targets.go b/server/service/endpoint_targets.go index c346611b13..6bba0429d7 100644 --- a/server/service/endpoint_targets.go +++ b/server/service/endpoint_targets.go @@ -4,7 +4,7 @@ import ( "time" "github.com/go-kit/kit/endpoint" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/endpoint_test.go b/server/service/endpoint_test.go index f928185034..782110930f 100644 --- a/server/service/endpoint_test.go +++ b/server/service/endpoint_test.go @@ -14,9 +14,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-ose/server/config" - "github.com/kolide/kolide-ose/server/datastore/inmem" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/config" + "github.com/kolide/kolide/server/datastore/inmem" + "github.com/kolide/kolide/server/kolide" "github.com/stretchr/testify/require" "golang.org/x/net/context" ) diff --git a/server/service/endpoint_users.go b/server/service/endpoint_users.go index e4ea5a0c16..cda5260c8d 100644 --- a/server/service/endpoint_users.go +++ b/server/service/endpoint_users.go @@ -4,7 +4,7 @@ import ( "net/http" "github.com/go-kit/kit/endpoint" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/handler.go b/server/service/handler.go index 6099c306b3..098cc7530c 100644 --- a/server/service/handler.go +++ b/server/service/handler.go @@ -8,7 +8,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-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "github.com/prometheus/client_golang/prometheus" "golang.org/x/net/context" ) diff --git a/server/service/handler_test.go b/server/service/handler_test.go index c113d4a3c4..d9c4b43873 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-ose/server/config" - "github.com/kolide/kolide-ose/server/datastore/inmem" + "github.com/kolide/kolide/server/config" + "github.com/kolide/kolide/server/datastore/inmem" "github.com/stretchr/testify/assert" "golang.org/x/net/context" ) diff --git a/server/service/http_auth.go b/server/service/http_auth.go index 703835dc32..ed29fbb0dc 100644 --- a/server/service/http_auth.go +++ b/server/service/http_auth.go @@ -5,9 +5,9 @@ import ( "strings" kithttp "github.com/go-kit/kit/transport/http" - "github.com/kolide/kolide-ose/server/contexts/token" - "github.com/kolide/kolide-ose/server/contexts/viewer" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/contexts/token" + "github.com/kolide/kolide/server/contexts/viewer" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/http_auth_test.go b/server/service/http_auth_test.go index f59a61590e..9bf48aaee8 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-ose/server/config" - "github.com/kolide/kolide-ose/server/datastore/inmem" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/config" + "github.com/kolide/kolide/server/datastore/inmem" + "github.com/kolide/kolide/server/kolide" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/net/context" diff --git a/server/service/logging.go b/server/service/logging.go index a1b43fb9b5..1bd5c84993 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-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" ) // logging middleware logs the service actions diff --git a/server/service/logging_appconfig.go b/server/service/logging_appconfig.go index 9d8bf5d34c..dc62da2687 100644 --- a/server/service/logging_appconfig.go +++ b/server/service/logging_appconfig.go @@ -3,7 +3,7 @@ package service import ( "time" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/logging_hosts.go b/server/service/logging_hosts.go index 657d0d1c73..fb1dfd5dcb 100644 --- a/server/service/logging_hosts.go +++ b/server/service/logging_hosts.go @@ -3,7 +3,7 @@ package service import ( "time" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/logging_invites.go b/server/service/logging_invites.go index 7c726156f5..1c42780696 100644 --- a/server/service/logging_invites.go +++ b/server/service/logging_invites.go @@ -3,8 +3,8 @@ package service import ( "time" - "github.com/kolide/kolide-ose/server/contexts/viewer" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/contexts/viewer" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/logging_labels.go b/server/service/logging_labels.go index ed8d4241e0..649c96bb19 100644 --- a/server/service/logging_labels.go +++ b/server/service/logging_labels.go @@ -3,7 +3,7 @@ package service import ( "time" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/logging_osquery.go b/server/service/logging_osquery.go index 808af09c99..1354a9e072 100644 --- a/server/service/logging_osquery.go +++ b/server/service/logging_osquery.go @@ -3,7 +3,7 @@ package service import ( "time" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/logging_packs.go b/server/service/logging_packs.go index 2181b937b1..1ccb6da504 100644 --- a/server/service/logging_packs.go +++ b/server/service/logging_packs.go @@ -3,7 +3,7 @@ package service import ( "time" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/logging_scheduled_queries.go b/server/service/logging_scheduled_queries.go index ee76cbdc6d..326e56ddc5 100644 --- a/server/service/logging_scheduled_queries.go +++ b/server/service/logging_scheduled_queries.go @@ -3,7 +3,7 @@ package service import ( "time" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/logging_sessions.go b/server/service/logging_sessions.go index 4fb92f755f..f22b5920e3 100644 --- a/server/service/logging_sessions.go +++ b/server/service/logging_sessions.go @@ -3,7 +3,7 @@ package service import ( "time" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/logging_users.go b/server/service/logging_users.go index efed6b0cca..2d8d617bdd 100644 --- a/server/service/logging_users.go +++ b/server/service/logging_users.go @@ -3,8 +3,8 @@ package service import ( "time" - "github.com/kolide/kolide-ose/server/contexts/viewer" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/contexts/viewer" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/metrics.go b/server/service/metrics.go index 4f6fc0c2d1..9df822d082 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-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" ) type metricsMiddleware struct { diff --git a/server/service/metrics_appconfig.go b/server/service/metrics_appconfig.go index d8c809371e..2bbc9528fc 100644 --- a/server/service/metrics_appconfig.go +++ b/server/service/metrics_appconfig.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/metrics_invites.go b/server/service/metrics_invites.go index 7eee009969..9adb34b9b3 100644 --- a/server/service/metrics_invites.go +++ b/server/service/metrics_invites.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/metrics_sessions.go b/server/service/metrics_sessions.go index 32b688b05e..6d53c91f33 100644 --- a/server/service/metrics_sessions.go +++ b/server/service/metrics_sessions.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/metrics_users.go b/server/service/metrics_users.go index e52fa0e36a..eb0370ff58 100644 --- a/server/service/metrics_users.go +++ b/server/service/metrics_users.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/service.go b/server/service/service.go index 4af61745e0..aab68949c2 100644 --- a/server/service/service.go +++ b/server/service/service.go @@ -7,8 +7,8 @@ import ( "github.com/WatchBeam/clock" kitlog "github.com/go-kit/kit/log" - "github.com/kolide/kolide-ose/server/config" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/config" + "github.com/kolide/kolide/server/kolide" lumberjack "gopkg.in/natefinch/lumberjack.v2" ) diff --git a/server/service/service_appconfig.go b/server/service/service_appconfig.go index 5499a7f593..4b860295e3 100644 --- a/server/service/service_appconfig.go +++ b/server/service/service_appconfig.go @@ -3,9 +3,9 @@ package service import ( "fmt" - "github.com/kolide/kolide-ose/server/contexts/viewer" - "github.com/kolide/kolide-ose/server/kolide" - "github.com/kolide/kolide-ose/server/mail" + "github.com/kolide/kolide/server/contexts/viewer" + "github.com/kolide/kolide/server/kolide" + "github.com/kolide/kolide/server/mail" "github.com/pkg/errors" "golang.org/x/net/context" ) diff --git a/server/service/service_appconfig_test.go b/server/service/service_appconfig_test.go index ca038d4a31..eb969cbfdc 100644 --- a/server/service/service_appconfig_test.go +++ b/server/service/service_appconfig_test.go @@ -3,9 +3,9 @@ package service import ( "testing" - "github.com/kolide/kolide-ose/server/config" - "github.com/kolide/kolide-ose/server/datastore/inmem" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/config" + "github.com/kolide/kolide/server/datastore/inmem" + "github.com/kolide/kolide/server/kolide" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/net/context" diff --git a/server/service/service_campaigns.go b/server/service/service_campaigns.go index 83e908d0a6..4f3de7fa93 100644 --- a/server/service/service_campaigns.go +++ b/server/service/service_campaigns.go @@ -4,9 +4,9 @@ import ( "fmt" "time" - "github.com/kolide/kolide-ose/server/contexts/viewer" - "github.com/kolide/kolide-ose/server/kolide" - "github.com/kolide/kolide-ose/server/websocket" + "github.com/kolide/kolide/server/contexts/viewer" + "github.com/kolide/kolide/server/kolide" + "github.com/kolide/kolide/server/websocket" "github.com/pkg/errors" "golang.org/x/net/context" ) diff --git a/server/service/service_hosts.go b/server/service/service_hosts.go index b048af6217..31e655a5fe 100644 --- a/server/service/service_hosts.go +++ b/server/service/service_hosts.go @@ -1,7 +1,7 @@ package service import ( - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/service_hosts_test.go b/server/service/service_hosts_test.go index 960d850540..616b026242 100644 --- a/server/service/service_hosts_test.go +++ b/server/service/service_hosts_test.go @@ -3,9 +3,9 @@ package service import ( "testing" - "github.com/kolide/kolide-ose/server/config" - "github.com/kolide/kolide-ose/server/datastore/inmem" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/config" + "github.com/kolide/kolide/server/datastore/inmem" + "github.com/kolide/kolide/server/kolide" "github.com/stretchr/testify/assert" "golang.org/x/net/context" ) diff --git a/server/service/service_import_config.go b/server/service/service_import_config.go index 120acab787..ada1804243 100644 --- a/server/service/service_import_config.go +++ b/server/service/service_import_config.go @@ -5,8 +5,8 @@ import ( "strconv" "strings" - "github.com/kolide/kolide-ose/server/contexts/viewer" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/contexts/viewer" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/service_import_config_test.go b/server/service/service_import_config_test.go index 6b9fdb6d4a..bce1b00033 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-ose/server/config" - "github.com/kolide/kolide-ose/server/datastore/inmem" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/config" + "github.com/kolide/kolide/server/datastore/inmem" + "github.com/kolide/kolide/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 8312ff4a8b..840ae46235 100644 --- a/server/service/service_invites.go +++ b/server/service/service_invites.go @@ -4,7 +4,7 @@ import ( "encoding/base64" "html/template" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/service_invites_test.go b/server/service/service_invites_test.go index 7ef1a62c16..8f2fadbcb3 100644 --- a/server/service/service_invites_test.go +++ b/server/service/service_invites_test.go @@ -5,9 +5,9 @@ import ( "time" "github.com/WatchBeam/clock" - "github.com/kolide/kolide-ose/server/config" - "github.com/kolide/kolide-ose/server/kolide" - "github.com/kolide/kolide-ose/server/mock" + "github.com/kolide/kolide/server/config" + "github.com/kolide/kolide/server/kolide" + "github.com/kolide/kolide/server/mock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/net/context" diff --git a/server/service/service_labels.go b/server/service/service_labels.go index 61cba88abe..645d1023dd 100644 --- a/server/service/service_labels.go +++ b/server/service/service_labels.go @@ -1,7 +1,7 @@ package service import ( - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/service_labels_test.go b/server/service/service_labels_test.go index 782f966b37..4e52a1643a 100644 --- a/server/service/service_labels_test.go +++ b/server/service/service_labels_test.go @@ -3,9 +3,9 @@ package service import ( "testing" - "github.com/kolide/kolide-ose/server/config" - "github.com/kolide/kolide-ose/server/datastore/inmem" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/config" + "github.com/kolide/kolide/server/datastore/inmem" + "github.com/kolide/kolide/server/kolide" "github.com/stretchr/testify/assert" "golang.org/x/net/context" ) diff --git a/server/service/service_options.go b/server/service/service_options.go index 8eecccae4b..d4032e6b85 100644 --- a/server/service/service_options.go +++ b/server/service/service_options.go @@ -1,7 +1,7 @@ package service import ( - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "github.com/pkg/errors" "golang.org/x/net/context" ) diff --git a/server/service/service_osquery.go b/server/service/service_osquery.go index e64572a278..1f1d26c0f2 100644 --- a/server/service/service_osquery.go +++ b/server/service/service_osquery.go @@ -8,9 +8,9 @@ import ( "time" "github.com/go-kit/kit/log" - hostctx "github.com/kolide/kolide-ose/server/contexts/host" - "github.com/kolide/kolide-ose/server/kolide" - "github.com/kolide/kolide-ose/server/pubsub" + hostctx "github.com/kolide/kolide/server/contexts/host" + "github.com/kolide/kolide/server/kolide" + "github.com/kolide/kolide/server/pubsub" "github.com/pkg/errors" "golang.org/x/net/context" ) diff --git a/server/service/service_osquery_test.go b/server/service/service_osquery_test.go index e198e80e34..77975b833f 100644 --- a/server/service/service_osquery_test.go +++ b/server/service/service_osquery_test.go @@ -12,13 +12,13 @@ import ( "golang.org/x/net/context" "github.com/WatchBeam/clock" - "github.com/kolide/kolide-ose/server/config" - hostctx "github.com/kolide/kolide-ose/server/contexts/host" - "github.com/kolide/kolide-ose/server/contexts/viewer" - "github.com/kolide/kolide-ose/server/datastore/inmem" - "github.com/kolide/kolide-ose/server/kolide" - "github.com/kolide/kolide-ose/server/pubsub" - "github.com/kolide/kolide-ose/server/test" + "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/pubsub" + "github.com/kolide/kolide/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 248ef38fba..0a4ba6f7e1 100644 --- a/server/service/service_packs.go +++ b/server/service/service_packs.go @@ -1,8 +1,8 @@ package service import ( - "github.com/kolide/kolide-ose/server/contexts/viewer" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/contexts/viewer" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/service_packs_test.go b/server/service/service_packs_test.go index b32d4eb090..b6e918de8f 100644 --- a/server/service/service_packs_test.go +++ b/server/service/service_packs_test.go @@ -4,10 +4,10 @@ import ( "testing" "github.com/WatchBeam/clock" - "github.com/kolide/kolide-ose/server/config" - "github.com/kolide/kolide-ose/server/datastore/inmem" - "github.com/kolide/kolide-ose/server/kolide" - "github.com/kolide/kolide-ose/server/test" + "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/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/net/context" diff --git a/server/service/service_queries.go b/server/service/service_queries.go index c990b42219..1e5c130db2 100644 --- a/server/service/service_queries.go +++ b/server/service/service_queries.go @@ -1,8 +1,8 @@ package service import ( - "github.com/kolide/kolide-ose/server/contexts/viewer" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/contexts/viewer" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/service_queries_test.go b/server/service/service_queries_test.go index 69077d34fd..ff45e5759e 100644 --- a/server/service/service_queries_test.go +++ b/server/service/service_queries_test.go @@ -3,10 +3,10 @@ package service import ( "testing" - "github.com/kolide/kolide-ose/server/config" - "github.com/kolide/kolide-ose/server/contexts/viewer" - "github.com/kolide/kolide-ose/server/datastore/inmem" - "github.com/kolide/kolide-ose/server/kolide" + "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/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/net/context" diff --git a/server/service/service_scheduled_queries.go b/server/service/service_scheduled_queries.go index b5587b480d..7314aa7862 100644 --- a/server/service/service_scheduled_queries.go +++ b/server/service/service_scheduled_queries.go @@ -1,7 +1,7 @@ package service import ( - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/service_scheduled_queries_test.go b/server/service/service_scheduled_queries_test.go index fca1688229..c81f7161c8 100644 --- a/server/service/service_scheduled_queries_test.go +++ b/server/service/service_scheduled_queries_test.go @@ -3,10 +3,10 @@ package service import ( "testing" - "github.com/kolide/kolide-ose/server/config" - "github.com/kolide/kolide-ose/server/datastore/inmem" - "github.com/kolide/kolide-ose/server/kolide" - "github.com/kolide/kolide-ose/server/test" + "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/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/net/context" diff --git a/server/service/service_sessions.go b/server/service/service_sessions.go index d7e3453b46..03035f060d 100644 --- a/server/service/service_sessions.go +++ b/server/service/service_sessions.go @@ -7,8 +7,8 @@ import ( "time" jwt "github.com/dgrijalva/jwt-go" - "github.com/kolide/kolide-ose/server/contexts/viewer" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/contexts/viewer" + "github.com/kolide/kolide/server/kolide" "github.com/pkg/errors" "golang.org/x/net/context" ) diff --git a/server/service/service_sessions_test.go b/server/service/service_sessions_test.go index 5f08ad7eb9..c959318efb 100644 --- a/server/service/service_sessions_test.go +++ b/server/service/service_sessions_test.go @@ -4,10 +4,10 @@ import ( "testing" "time" - "github.com/kolide/kolide-ose/server/config" - "github.com/kolide/kolide-ose/server/contexts/token" - "github.com/kolide/kolide-ose/server/datastore/inmem" - "github.com/kolide/kolide-ose/server/kolide" + "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/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/net/context" diff --git a/server/service/service_targets.go b/server/service/service_targets.go index 3b5d15ded0..ffe1b122b9 100644 --- a/server/service/service_targets.go +++ b/server/service/service_targets.go @@ -1,7 +1,7 @@ package service import ( - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/service_targets_test.go b/server/service/service_targets_test.go index 0adccd58a4..511d769924 100644 --- a/server/service/service_targets_test.go +++ b/server/service/service_targets_test.go @@ -6,9 +6,9 @@ import ( "time" "github.com/WatchBeam/clock" - "github.com/kolide/kolide-ose/server/config" - "github.com/kolide/kolide-ose/server/datastore/inmem" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/config" + "github.com/kolide/kolide/server/datastore/inmem" + "github.com/kolide/kolide/server/kolide" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/net/context" diff --git a/server/service/service_users.go b/server/service/service_users.go index 0ebb780810..98fab13861 100644 --- a/server/service/service_users.go +++ b/server/service/service_users.go @@ -6,8 +6,8 @@ import ( "html/template" "time" - "github.com/kolide/kolide-ose/server/contexts/viewer" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/contexts/viewer" + "github.com/kolide/kolide/server/kolide" "github.com/pkg/errors" "golang.org/x/net/context" ) diff --git a/server/service/service_users_test.go b/server/service/service_users_test.go index 95d5baf03e..ea4d57550c 100644 --- a/server/service/service_users_test.go +++ b/server/service/service_users_test.go @@ -6,11 +6,11 @@ import ( "time" "github.com/WatchBeam/clock" - "github.com/kolide/kolide-ose/server/config" - "github.com/kolide/kolide-ose/server/contexts/viewer" - "github.com/kolide/kolide-ose/server/datastore/inmem" - "github.com/kolide/kolide-ose/server/kolide" - "github.com/kolide/kolide-ose/server/mock" + "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/kolide/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 52d91aae86..b504b1f037 100644 --- a/server/service/transport.go +++ b/server/service/transport.go @@ -7,7 +7,7 @@ import ( "strconv" "github.com/gorilla/mux" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/transport_appconfig.go b/server/service/transport_appconfig.go index 91b1c9e5be..7ae1e3db9f 100644 --- a/server/service/transport_appconfig.go +++ b/server/service/transport_appconfig.go @@ -4,7 +4,7 @@ import ( "encoding/json" "net/http" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/transport_import_config.go b/server/service/transport_import_config.go index bcfb042163..2c9e31d80e 100644 --- a/server/service/transport_import_config.go +++ b/server/service/transport_import_config.go @@ -4,7 +4,7 @@ import ( "encoding/json" "net/http" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/transport_options.go b/server/service/transport_options.go index d418c33947..29fae8ec88 100644 --- a/server/service/transport_options.go +++ b/server/service/transport_options.go @@ -4,7 +4,7 @@ import ( "encoding/json" "net/http" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/transport_osquery.go b/server/service/transport_osquery.go index 73d5319609..7368c5dcc2 100644 --- a/server/service/transport_osquery.go +++ b/server/service/transport_osquery.go @@ -4,7 +4,7 @@ import ( "encoding/json" "net/http" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/transport_osquery_test.go b/server/service/transport_osquery_test.go index e9a55ba03f..33e4a9c3ee 100644 --- a/server/service/transport_osquery_test.go +++ b/server/service/transport_osquery_test.go @@ -9,7 +9,7 @@ import ( "golang.org/x/net/context" "github.com/gorilla/mux" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "github.com/stretchr/testify/assert" ) diff --git a/server/service/transport_test.go b/server/service/transport_test.go index 9c7ec0d8b1..c7e5cb08c0 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-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "github.com/stretchr/testify/assert" ) diff --git a/server/service/util_test.go b/server/service/util_test.go index eef063f2e1..c6461dd123 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-ose/server/config" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/config" + "github.com/kolide/kolide/server/kolide" "github.com/stretchr/testify/require" ) diff --git a/server/service/validation_import_config.go b/server/service/validation_import_config.go index fffc050fec..94092f2897 100644 --- a/server/service/validation_import_config.go +++ b/server/service/validation_import_config.go @@ -3,7 +3,7 @@ package service import ( "strconv" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/validation_invites.go b/server/service/validation_invites.go index ff11c8d7c2..f322af62ce 100644 --- a/server/service/validation_invites.go +++ b/server/service/validation_invites.go @@ -1,7 +1,7 @@ package service import ( - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/validation_options.go b/server/service/validation_options.go index 990d021041..288f0b0651 100644 --- a/server/service/validation_options.go +++ b/server/service/validation_options.go @@ -3,7 +3,7 @@ package service import ( "errors" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/validation_setup.go b/server/service/validation_setup.go index e403702cb1..c4784e4cb7 100644 --- a/server/service/validation_setup.go +++ b/server/service/validation_setup.go @@ -4,7 +4,7 @@ import ( "fmt" "net/url" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/service/validation_users.go b/server/service/validation_users.go index b0b603f650..01732167fb 100644 --- a/server/service/validation_users.go +++ b/server/service/validation_users.go @@ -5,8 +5,8 @@ import ( "strings" "unicode" - "github.com/kolide/kolide-ose/server/contexts/viewer" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/contexts/viewer" + "github.com/kolide/kolide/server/kolide" "golang.org/x/net/context" ) diff --git a/server/test/new_objects.go b/server/test/new_objects.go index 19d26aab80..4ca47c4432 100644 --- a/server/test/new_objects.go +++ b/server/test/new_objects.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/kolide/kolide-ose/server/kolide" + "github.com/kolide/kolide/server/kolide" "github.com/stretchr/testify/require" ) diff --git a/server/version/version.go b/server/version/version.go index 6328e3f891..3f5eb99d7e 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-ose/version.version=1.0.0-development" +// go build -ldflags "-X github.com/kolide/kolide/version.version=1.0.0-development" var ( version = "unknown" branch = "unknown" diff --git a/server/websocket/websocket.go b/server/websocket/websocket.go index b86a14dd5f..b25b0d7501 100644 --- a/server/websocket/websocket.go +++ b/server/websocket/websocket.go @@ -8,7 +8,7 @@ import ( "time" "github.com/gorilla/websocket" - "github.com/kolide/kolide-ose/server/contexts/token" + "github.com/kolide/kolide/server/contexts/token" "github.com/pkg/errors" ) diff --git a/server/websocket/websocket_test.go b/server/websocket/websocket_test.go index 6620c7e9c8..ef851fe986 100644 --- a/server/websocket/websocket_test.go +++ b/server/websocket/websocket_test.go @@ -10,7 +10,7 @@ import ( "time" "github.com/gorilla/websocket" - "github.com/kolide/kolide-ose/server/contexts/token" + "github.com/kolide/kolide/server/contexts/token" "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tools/app/development.yml b/tools/app/development.yml index 8b8b320f1e..e51ca4254b 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-ose + - ./:/go/src/github.com/kolide/kolide