diff --git a/.circleci/config.yml b/.circleci/config.yml index 1ec22e5b513..ceb372e8c7b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ jobs: jstest: docker: - image: circleci/golang:1.11-node-browsers - working_directory: /go/src/github.com/influxdata/platform + working_directory: /go/src/github.com/influxdata/influxdb steps: - checkout @@ -29,7 +29,7 @@ jobs: environment: GOCACHE: /tmp/go-cache GOFLAGS: "-mod=readonly -p=4" # Go on Circle thinks 32 CPUs are available, but there aren't. - working_directory: /go/src/github.com/influxdata/platform + working_directory: /go/src/github.com/influxdata/influxdb steps: - checkout @@ -81,7 +81,7 @@ jobs: environment: GOCACHE: /tmp/go-cache GOFLAGS: "-mod=readonly -p=4" # Go on Circle thinks 32 CPUs are available, but there aren't. - working_directory: /go/src/github.com/influxdata/platform + working_directory: /go/src/github.com/influxdata/influxdb steps: - checkout @@ -107,7 +107,7 @@ jobs: environment: GOCACHE: /tmp/go-cache GOFLAGS: "-mod=readonly -p=4" # Go on Circle thinks 32 CPUs are available, but there aren't. - working_directory: /go/src/github.com/influxdata/platform + working_directory: /go/src/github.com/influxdata/influxdb steps: - checkout diff --git a/auth.go b/auth.go index 94852dd7784..c641d395935 100644 --- a/auth.go +++ b/auth.go @@ -1,4 +1,4 @@ -package platform +package influxdb import ( "context" diff --git a/authz.go b/authz.go index 9aba1444b4d..c3d25bb82f5 100644 --- a/authz.go +++ b/authz.go @@ -1,4 +1,4 @@ -package platform +package influxdb import ( "errors" diff --git a/authz_test.go b/authz_test.go index 9f324bd3e42..8d27a4f2313 100644 --- a/authz_test.go +++ b/authz_test.go @@ -1,9 +1,9 @@ -package platform_test +package influxdb_test import ( "testing" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) func TestAuthorizer_PermissionAllowed(t *testing.T) { diff --git a/bolt/authorization.go b/bolt/authorization.go index f2702bd1bca..635ae862272 100644 --- a/bolt/authorization.go +++ b/bolt/authorization.go @@ -5,7 +5,7 @@ import ( "encoding/json" bolt "github.com/coreos/bbolt" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) var ( diff --git a/bolt/authorization_test.go b/bolt/authorization_test.go index 87765c3862f..c87b33d7909 100644 --- a/bolt/authorization_test.go +++ b/bolt/authorization_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/influxdata/platform" - "github.com/influxdata/platform/bolt" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/bolt" + platformtesting "github.com/influxdata/influxdb/testing" ) func initAuthorizationService(f platformtesting.AuthorizationFields, t *testing.T) (platform.AuthorizationService, string, func()) { diff --git a/bolt/basic_auth_service_test.go b/bolt/basic_auth_service_test.go index 7a0f67d671e..8887cb427fa 100644 --- a/bolt/basic_auth_service_test.go +++ b/bolt/basic_auth_service_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/influxdata/platform" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + platformtesting "github.com/influxdata/influxdb/testing" ) func initBasicAuthService(f platformtesting.UserFields, t *testing.T) (platform.BasicAuthService, func()) { diff --git a/bolt/bbolt.go b/bolt/bbolt.go index 15e696bf112..813e826b92a 100644 --- a/bolt/bbolt.go +++ b/bolt/bbolt.go @@ -8,9 +8,9 @@ import ( "time" "github.com/coreos/bbolt" - "github.com/influxdata/platform" - "github.com/influxdata/platform/rand" - "github.com/influxdata/platform/snowflake" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/rand" + "github.com/influxdata/influxdb/snowflake" "go.uber.org/zap" ) diff --git a/bolt/bbolt_test.go b/bolt/bbolt_test.go index 38af04ea0ee..6a2dee9be25 100644 --- a/bolt/bbolt_test.go +++ b/bolt/bbolt_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "testing" - "github.com/influxdata/platform/bolt" + "github.com/influxdata/influxdb/bolt" "golang.org/x/crypto/bcrypt" ) diff --git a/bolt/bucket.go b/bolt/bucket.go index 0a837c38426..0d8211687ed 100644 --- a/bolt/bucket.go +++ b/bolt/bucket.go @@ -7,8 +7,8 @@ import ( "time" bolt "github.com/coreos/bbolt" - "github.com/influxdata/platform" - platformcontext "github.com/influxdata/platform/context" + platform "github.com/influxdata/influxdb" + platformcontext "github.com/influxdata/influxdb/context" ) var ( diff --git a/bolt/bucket_test.go b/bolt/bucket_test.go index aac6a5b4872..f0094deab7b 100644 --- a/bolt/bucket_test.go +++ b/bolt/bucket_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/influxdata/platform" - "github.com/influxdata/platform/bolt" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/bolt" + platformtesting "github.com/influxdata/influxdb/testing" ) func initBucketService(f platformtesting.BucketFields, t *testing.T) (platform.BucketService, string, func()) { diff --git a/bolt/dashboard.go b/bolt/dashboard.go index 20f4c88e980..525dd7332e0 100644 --- a/bolt/dashboard.go +++ b/bolt/dashboard.go @@ -8,8 +8,8 @@ import ( "time" bolt "github.com/coreos/bbolt" - "github.com/influxdata/platform" - platformcontext "github.com/influxdata/platform/context" + platform "github.com/influxdata/influxdb" + platformcontext "github.com/influxdata/influxdb/context" ) var ( diff --git a/bolt/dashboard_test.go b/bolt/dashboard_test.go index b5260dbd67b..f265089e84b 100644 --- a/bolt/dashboard_test.go +++ b/bolt/dashboard_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/influxdata/platform" - "github.com/influxdata/platform/bolt" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/bolt" + platformtesting "github.com/influxdata/influxdb/testing" ) func initDashboardService(f platformtesting.DashboardFields, t *testing.T) (platform.DashboardService, string, func()) { diff --git a/bolt/keyvalue_log.go b/bolt/keyvalue_log.go index 13b299e03f7..0566fb68f0e 100644 --- a/bolt/keyvalue_log.go +++ b/bolt/keyvalue_log.go @@ -10,7 +10,7 @@ import ( "time" bolt "github.com/coreos/bbolt" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) var ( diff --git a/bolt/keyvalue_log_test.go b/bolt/keyvalue_log_test.go index 51ffc30ce0f..ab5f1f7816a 100644 --- a/bolt/keyvalue_log_test.go +++ b/bolt/keyvalue_log_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/influxdata/platform" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + platformtesting "github.com/influxdata/influxdb/testing" ) func initKeyValueLog(f platformtesting.KeyValueLogFields, t *testing.T) (platform.KeyValueLog, func()) { diff --git a/bolt/kv.go b/bolt/kv.go index 01e2a78aaaf..abfc06914c9 100644 --- a/bolt/kv.go +++ b/bolt/kv.go @@ -8,7 +8,7 @@ import ( "time" bolt "github.com/coreos/bbolt" - "github.com/influxdata/platform/kv" + "github.com/influxdata/influxdb/kv" "go.uber.org/zap" ) diff --git a/bolt/kv_test.go b/bolt/kv_test.go index 28512445821..871ca92a6f9 100644 --- a/bolt/kv_test.go +++ b/bolt/kv_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/influxdata/platform" - "github.com/influxdata/platform/kv" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/kv" + platformtesting "github.com/influxdata/influxdb/testing" ) func initKVStore(f platformtesting.KVStoreFields, t *testing.T) (kv.Store, func()) { diff --git a/bolt/label.go b/bolt/label.go index 6711a0a8a80..e518ad82fca 100644 --- a/bolt/label.go +++ b/bolt/label.go @@ -6,7 +6,7 @@ import ( "fmt" bolt "github.com/coreos/bbolt" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) var ( diff --git a/bolt/label_test.go b/bolt/label_test.go index 0fd62632b1f..bd4574bdc16 100644 --- a/bolt/label_test.go +++ b/bolt/label_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/influxdata/platform" - "github.com/influxdata/platform/bolt" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/bolt" + platformtesting "github.com/influxdata/influxdb/testing" ) func initLabelService(f platformtesting.LabelFields, t *testing.T) (platform.LabelService, string, func()) { diff --git a/bolt/lookup_service.go b/bolt/lookup_service.go index eb682533598..c995315c3fa 100644 --- a/bolt/lookup_service.go +++ b/bolt/lookup_service.go @@ -3,7 +3,7 @@ package bolt import ( "context" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) var _ platform.LookupService = (*Client)(nil) diff --git a/bolt/lookup_service_test.go b/bolt/lookup_service_test.go index f6f124c9a58..ff974369889 100644 --- a/bolt/lookup_service_test.go +++ b/bolt/lookup_service_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - "github.com/influxdata/platform" - "github.com/influxdata/platform/bolt" - "github.com/influxdata/platform/mock" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/bolt" + "github.com/influxdata/influxdb/mock" + platformtesting "github.com/influxdata/influxdb/testing" ) var ( diff --git a/bolt/macro.go b/bolt/macro.go index 85d0eafd9b6..ef92a81fd2e 100644 --- a/bolt/macro.go +++ b/bolt/macro.go @@ -5,7 +5,7 @@ import ( "encoding/json" bolt "github.com/coreos/bbolt" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) var ( diff --git a/bolt/macro_test.go b/bolt/macro_test.go index 0fcecb7e243..91ef3726489 100644 --- a/bolt/macro_test.go +++ b/bolt/macro_test.go @@ -2,11 +2,11 @@ package bolt_test import ( "context" - "github.com/influxdata/platform/bolt" "testing" - "github.com/influxdata/platform" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/bolt" + platformtesting "github.com/influxdata/influxdb/testing" ) func initMacroService(f platformtesting.MacroFields, t *testing.T) (platform.MacroService, string, func()) { diff --git a/bolt/onboarding.go b/bolt/onboarding.go index cb5d2e0d8bd..44cb4f46d56 100644 --- a/bolt/onboarding.go +++ b/bolt/onboarding.go @@ -6,7 +6,7 @@ import ( "time" bolt "github.com/coreos/bbolt" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) var onboardingBucket = []byte("onboardingv1") diff --git a/bolt/onboarding_test.go b/bolt/onboarding_test.go index 0142c9a6b13..b337f475c54 100644 --- a/bolt/onboarding_test.go +++ b/bolt/onboarding_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/influxdata/platform" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + platformtesting "github.com/influxdata/influxdb/testing" ) func initOnboardingService(f platformtesting.OnboardingFields, t *testing.T) (platform.OnboardingService, func()) { diff --git a/bolt/organization.go b/bolt/organization.go index 376c2c4dd3d..33ba1ecfbdb 100644 --- a/bolt/organization.go +++ b/bolt/organization.go @@ -7,8 +7,8 @@ import ( "time" bolt "github.com/coreos/bbolt" - "github.com/influxdata/platform" - platformcontext "github.com/influxdata/platform/context" + platform "github.com/influxdata/influxdb" + platformcontext "github.com/influxdata/influxdb/context" ) var ( diff --git a/bolt/organization_test.go b/bolt/organization_test.go index e8296b1d3bc..fa93b808be0 100644 --- a/bolt/organization_test.go +++ b/bolt/organization_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/influxdata/platform" - "github.com/influxdata/platform/bolt" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/bolt" + platformtesting "github.com/influxdata/influxdb/testing" ) func initOrganizationService(f platformtesting.OrganizationFields, t *testing.T) (platform.OrganizationService, string, func()) { diff --git a/bolt/scraper.go b/bolt/scraper.go index 8bb405c096c..b04c8e0e451 100644 --- a/bolt/scraper.go +++ b/bolt/scraper.go @@ -5,7 +5,7 @@ import ( "encoding/json" bolt "github.com/coreos/bbolt" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) var ( diff --git a/bolt/scraper_test.go b/bolt/scraper_test.go index 1cadbceb7cd..c7431602e9a 100644 --- a/bolt/scraper_test.go +++ b/bolt/scraper_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/influxdata/platform" - "github.com/influxdata/platform/bolt" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/bolt" + platformtesting "github.com/influxdata/influxdb/testing" ) func initScraperTargetStoreService(f platformtesting.TargetFields, t *testing.T) (platform.ScraperTargetStoreService, string, func()) { diff --git a/bolt/secret.go b/bolt/secret.go index 0a36d6e9846..2c1e139cd68 100644 --- a/bolt/secret.go +++ b/bolt/secret.go @@ -7,7 +7,7 @@ import ( "fmt" bolt "github.com/coreos/bbolt" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) var ( diff --git a/bolt/secret_test.go b/bolt/secret_test.go index b5483229967..9698dc125c4 100644 --- a/bolt/secret_test.go +++ b/bolt/secret_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/influxdata/platform" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + platformtesting "github.com/influxdata/influxdb/testing" ) func initSecretService(f platformtesting.SecretServiceFields, t *testing.T) (platform.SecretService, func()) { diff --git a/bolt/session.go b/bolt/session.go index e67567fc0aa..f164e35a104 100644 --- a/bolt/session.go +++ b/bolt/session.go @@ -6,7 +6,7 @@ import ( "time" bolt "github.com/coreos/bbolt" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) var ( diff --git a/bolt/session_test.go b/bolt/session_test.go index cfe25921bfd..1c5899020a0 100644 --- a/bolt/session_test.go +++ b/bolt/session_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/influxdata/platform" - "github.com/influxdata/platform/bolt" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/bolt" + platformtesting "github.com/influxdata/influxdb/testing" ) func initSessionService(f platformtesting.SessionFields, t *testing.T) (platform.SessionService, string, func()) { diff --git a/bolt/source.go b/bolt/source.go index a14e9c3f670..ae1aaf27014 100644 --- a/bolt/source.go +++ b/bolt/source.go @@ -6,7 +6,7 @@ import ( "fmt" bolt "github.com/coreos/bbolt" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) var ( diff --git a/bolt/source_test.go b/bolt/source_test.go index 4c74d2967ba..d7aec233ef6 100644 --- a/bolt/source_test.go +++ b/bolt/source_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/influxdata/platform" - "github.com/influxdata/platform/bolt" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/bolt" + platformtesting "github.com/influxdata/influxdb/testing" ) func initSourceService(f platformtesting.SourceFields, t *testing.T) (platform.SourceService, string, func()) { diff --git a/bolt/telegraf.go b/bolt/telegraf.go index d256f1b35ca..0cb1947b50c 100644 --- a/bolt/telegraf.go +++ b/bolt/telegraf.go @@ -6,7 +6,7 @@ import ( "fmt" bolt "github.com/coreos/bbolt" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) var ( diff --git a/bolt/telegraf_test.go b/bolt/telegraf_test.go index a1b55f088fc..733236c58d7 100644 --- a/bolt/telegraf_test.go +++ b/bolt/telegraf_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/influxdata/platform" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + platformtesting "github.com/influxdata/influxdb/testing" ) func initTelegrafConfigStore(f platformtesting.TelegrafConfigFields, t *testing.T) (platform.TelegrafConfigStore, func()) { diff --git a/bolt/user.go b/bolt/user.go index 3c077c35764..3565768e292 100644 --- a/bolt/user.go +++ b/bolt/user.go @@ -7,8 +7,8 @@ import ( "time" bolt "github.com/coreos/bbolt" - "github.com/influxdata/platform" - platformcontext "github.com/influxdata/platform/context" + platform "github.com/influxdata/influxdb" + platformcontext "github.com/influxdata/influxdb/context" ) var ( diff --git a/bolt/user_resource_mapping.go b/bolt/user_resource_mapping.go index 004ac183257..80efc951968 100644 --- a/bolt/user_resource_mapping.go +++ b/bolt/user_resource_mapping.go @@ -6,7 +6,7 @@ import ( "fmt" bolt "github.com/coreos/bbolt" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) var ( diff --git a/bolt/user_resource_mapping_test.go b/bolt/user_resource_mapping_test.go index 9989364a96d..2866cb6212a 100644 --- a/bolt/user_resource_mapping_test.go +++ b/bolt/user_resource_mapping_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/influxdata/platform" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + platformtesting "github.com/influxdata/influxdb/testing" ) func initUserResourceMappingService(f platformtesting.UserResourceFields, t *testing.T) (platform.UserResourceMappingService, func()) { diff --git a/bolt/user_test.go b/bolt/user_test.go index b3c529cc5c4..bc22f5681aa 100644 --- a/bolt/user_test.go +++ b/bolt/user_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/influxdata/platform" - "github.com/influxdata/platform/bolt" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/bolt" + platformtesting "github.com/influxdata/influxdb/testing" ) func initUserService(f platformtesting.UserFields, t *testing.T) (platform.UserService, string, func()) { diff --git a/bolt/view.go b/bolt/view.go index 5e7cc52e0b6..32338db25b5 100644 --- a/bolt/view.go +++ b/bolt/view.go @@ -6,7 +6,7 @@ import ( "sync" bolt "github.com/coreos/bbolt" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) var ( diff --git a/bolt/view_test.go b/bolt/view_test.go index 66415fe8930..758b2785535 100644 --- a/bolt/view_test.go +++ b/bolt/view_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/influxdata/platform" - "github.com/influxdata/platform/bolt" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/bolt" + platformtesting "github.com/influxdata/influxdb/testing" ) func initViewService(f platformtesting.ViewFields, t *testing.T) (platform.ViewService, string, func()) { diff --git a/bucket.go b/bucket.go index b9ddb3a4766..dd1336d2dbf 100644 --- a/bucket.go +++ b/bucket.go @@ -1,4 +1,4 @@ -package platform +package influxdb import ( "context" diff --git a/chronograf/.kapacitor/alerts.go b/chronograf/.kapacitor/alerts.go index 0a7adc080e4..7ade0babac0 100644 --- a/chronograf/.kapacitor/alerts.go +++ b/chronograf/.kapacitor/alerts.go @@ -6,9 +6,9 @@ import ( "regexp" "strings" + "github.com/influxdata/influxdb/chronograf" "github.com/influxdata/kapacitor/pipeline" "github.com/influxdata/kapacitor/pipeline/tick" - "github.com/influxdata/platform/chronograf" ) // AlertServices generates alert chaining methods to be attached to an alert from all rule Services diff --git a/chronograf/.kapacitor/alerts_test.go b/chronograf/.kapacitor/alerts_test.go index 11faded34d7..b9972f5cbab 100644 --- a/chronograf/.kapacitor/alerts_test.go +++ b/chronograf/.kapacitor/alerts_test.go @@ -3,7 +3,7 @@ package kapacitor import ( "testing" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) func TestAlertServices(t *testing.T) { diff --git a/chronograf/.kapacitor/ast.go b/chronograf/.kapacitor/ast.go index 9b2e80d84f3..778299c1fec 100644 --- a/chronograf/.kapacitor/ast.go +++ b/chronograf/.kapacitor/ast.go @@ -7,11 +7,11 @@ import ( "strings" "time" + "github.com/influxdata/influxdb/chronograf" "github.com/influxdata/kapacitor/pipeline" "github.com/influxdata/kapacitor/tick" "github.com/influxdata/kapacitor/tick/ast" "github.com/influxdata/kapacitor/tick/stateful" - "github.com/influxdata/platform/chronograf" ) func varString(kapaVar string, vars map[string]tick.Var) (string, bool) { diff --git a/chronograf/.kapacitor/ast_test.go b/chronograf/.kapacitor/ast_test.go index fe08f3aa9c9..77b5f39512d 100644 --- a/chronograf/.kapacitor/ast_test.go +++ b/chronograf/.kapacitor/ast_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) func TestReverse(t *testing.T) { diff --git a/chronograf/.kapacitor/client.go b/chronograf/.kapacitor/client.go index 68b105babd8..75fa51a7549 100644 --- a/chronograf/.kapacitor/client.go +++ b/chronograf/.kapacitor/client.go @@ -4,9 +4,9 @@ import ( "context" "fmt" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/id" client "github.com/influxdata/kapacitor/client/v1" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/id" ) const ( diff --git a/chronograf/.kapacitor/client_test.go b/chronograf/.kapacitor/client_test.go index 0a20ace88b6..f847ad886d9 100644 --- a/chronograf/.kapacitor/client_test.go +++ b/chronograf/.kapacitor/client_test.go @@ -8,8 +8,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" + "github.com/influxdata/influxdb/chronograf" client "github.com/influxdata/kapacitor/client/v1" - "github.com/influxdata/platform/chronograf" ) type MockKapa struct { diff --git a/chronograf/.kapacitor/data.go b/chronograf/.kapacitor/data.go index fac86b4b456..d0f3e48cbef 100644 --- a/chronograf/.kapacitor/data.go +++ b/chronograf/.kapacitor/data.go @@ -3,7 +3,7 @@ package kapacitor import ( "fmt" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // Data returns the tickscript data section for querying diff --git a/chronograf/.kapacitor/data_test.go b/chronograf/.kapacitor/data_test.go index b0576489958..3f7f495fdce 100644 --- a/chronograf/.kapacitor/data_test.go +++ b/chronograf/.kapacitor/data_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) var config = `{ diff --git a/chronograf/.kapacitor/http_out.go b/chronograf/.kapacitor/http_out.go index d77686eee1d..88e6ef6bc64 100644 --- a/chronograf/.kapacitor/http_out.go +++ b/chronograf/.kapacitor/http_out.go @@ -3,7 +3,7 @@ package kapacitor import ( "fmt" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // HTTPEndpoint is the default location of the tickscript output diff --git a/chronograf/.kapacitor/influxout.go b/chronograf/.kapacitor/influxout.go index 51ce0f42a7c..67baf2568f6 100644 --- a/chronograf/.kapacitor/influxout.go +++ b/chronograf/.kapacitor/influxout.go @@ -3,7 +3,7 @@ package kapacitor import ( "fmt" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // InfluxOut creates a kapacitor influxDBOut node to write alert data to Database, RP, Measurement. diff --git a/chronograf/.kapacitor/influxout_test.go b/chronograf/.kapacitor/influxout_test.go index b36cd31effd..5dd41f72194 100644 --- a/chronograf/.kapacitor/influxout_test.go +++ b/chronograf/.kapacitor/influxout_test.go @@ -1,7 +1,7 @@ package kapacitor import "testing" -import "github.com/influxdata/platform/chronograf" +import "github.com/influxdata/influxdb/chronograf" func TestInfluxOut(t *testing.T) { tests := []struct { diff --git a/chronograf/.kapacitor/kapa_client_benchmark_test.go b/chronograf/.kapacitor/kapa_client_benchmark_test.go index 8c7a38f3760..902bc656380 100644 --- a/chronograf/.kapacitor/kapa_client_benchmark_test.go +++ b/chronograf/.kapacitor/kapa_client_benchmark_test.go @@ -3,8 +3,8 @@ package kapacitor_test import ( "testing" - "github.com/influxdata/platform/chronograf/kapacitor" - "github.com/influxdata/platform/chronograf/mocks" + "github.com/influxdata/influxdb/chronograf/kapacitor" + "github.com/influxdata/influxdb/chronograf/mocks" client "github.com/influxdata/kapacitor/client/v1" ) diff --git a/chronograf/.kapacitor/kapa_client_test.go b/chronograf/.kapacitor/kapa_client_test.go index 59c86bed5df..e46d0c72797 100644 --- a/chronograf/.kapacitor/kapa_client_test.go +++ b/chronograf/.kapacitor/kapa_client_test.go @@ -3,8 +3,8 @@ package kapacitor_test import ( "testing" - "github.com/influxdata/platform/chronograf/kapacitor" - "github.com/influxdata/platform/chronograf/mocks" + "github.com/influxdata/influxdb/chronograf/kapacitor" + "github.com/influxdata/influxdb/chronograf/mocks" client "github.com/influxdata/kapacitor/client/v1" ) diff --git a/chronograf/.kapacitor/pipeline.go b/chronograf/.kapacitor/pipeline.go index a2997a7b4e7..d4453cebb17 100644 --- a/chronograf/.kapacitor/pipeline.go +++ b/chronograf/.kapacitor/pipeline.go @@ -4,9 +4,9 @@ import ( "bytes" "encoding/json" + "github.com/influxdata/influxdb/chronograf" "github.com/influxdata/kapacitor/pipeline" totick "github.com/influxdata/kapacitor/pipeline/tick" - "github.com/influxdata/platform/chronograf" ) // MarshalTICK converts tickscript to JSON representation diff --git a/chronograf/.kapacitor/tickscripts.go b/chronograf/.kapacitor/tickscripts.go index 60840ce6802..3b92ca946a7 100644 --- a/chronograf/.kapacitor/tickscripts.go +++ b/chronograf/.kapacitor/tickscripts.go @@ -3,7 +3,7 @@ package kapacitor import ( "fmt" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) var _ chronograf.Ticker = &Alert{} diff --git a/chronograf/.kapacitor/tickscripts_test.go b/chronograf/.kapacitor/tickscripts_test.go index 5c917f2211a..54abbef6122 100644 --- a/chronograf/.kapacitor/tickscripts_test.go +++ b/chronograf/.kapacitor/tickscripts_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" "github.com/sergi/go-diff/diffmatchpatch" ) diff --git a/chronograf/.kapacitor/triggers.go b/chronograf/.kapacitor/triggers.go index 141192ab73e..a3552d4a7e2 100644 --- a/chronograf/.kapacitor/triggers.go +++ b/chronograf/.kapacitor/triggers.go @@ -3,7 +3,7 @@ package kapacitor import ( "fmt" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) const ( diff --git a/chronograf/.kapacitor/triggers_test.go b/chronograf/.kapacitor/triggers_test.go index 389d6f4c1cf..69fa6c0443e 100644 --- a/chronograf/.kapacitor/triggers_test.go +++ b/chronograf/.kapacitor/triggers_test.go @@ -3,7 +3,7 @@ package kapacitor import ( "testing" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) func TestTrigger(t *testing.T) { diff --git a/chronograf/.kapacitor/validate.go b/chronograf/.kapacitor/validate.go index ffafed23616..9ea93a8d068 100644 --- a/chronograf/.kapacitor/validate.go +++ b/chronograf/.kapacitor/validate.go @@ -6,11 +6,11 @@ import ( "strings" "time" + "github.com/influxdata/influxdb/chronograf" "github.com/influxdata/kapacitor/pipeline" "github.com/influxdata/kapacitor/tick" "github.com/influxdata/kapacitor/tick/ast" "github.com/influxdata/kapacitor/tick/stateful" - "github.com/influxdata/platform/chronograf" ) // ValidateAlert checks if the alert is a valid kapacitor alert service. diff --git a/chronograf/.kapacitor/validate_test.go b/chronograf/.kapacitor/validate_test.go index 4ebc78db946..f17268ee02e 100644 --- a/chronograf/.kapacitor/validate_test.go +++ b/chronograf/.kapacitor/validate_test.go @@ -1,7 +1,7 @@ package kapacitor import "testing" -import "github.com/influxdata/platform/chronograf" +import "github.com/influxdata/influxdb/chronograf" func TestValidateAlert(t *testing.T) { tests := []struct { diff --git a/chronograf/.kapacitor/vars.go b/chronograf/.kapacitor/vars.go index 9982f4740cf..f31ad0c7e0f 100644 --- a/chronograf/.kapacitor/vars.go +++ b/chronograf/.kapacitor/vars.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) var ( diff --git a/chronograf/.kapacitor/vars_test.go b/chronograf/.kapacitor/vars_test.go index 90c2c24694f..06aaa4160e6 100644 --- a/chronograf/.kapacitor/vars_test.go +++ b/chronograf/.kapacitor/vars_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) func TestVarsCritStringEqual(t *testing.T) { diff --git a/chronograf/CONTRIBUTING.md b/chronograf/CONTRIBUTING.md index 4435c53a7dd..824a115c761 100644 --- a/chronograf/CONTRIBUTING.md +++ b/chronograf/CONTRIBUTING.md @@ -77,7 +77,7 @@ Setup the project structure and fetch the repo like so: ```bash mkdir $HOME/go export GOPATH=$HOME/go - go get github.com/influxdata/platform/chronograf + go get github.com/influxdata/influxdb/chronograf ``` You can add the line `export GOPATH=$HOME/go` to your bash/zsh file to be set for every shell instead of having to manually run it everytime. @@ -100,7 +100,7 @@ Retaining the directory structure `$GOPATH/src/github.com/influxdata` is necessa Make sure you have `go` and `yarn` installed and the project structure as shown above. We provide a `Makefile` to get up and running quickly, so all you'll need to do is run the following: ```bash - cd $GOPATH/src/github.com/influxdata/platform/chronograf + cd $GOPATH/src/github.com/influxdata/influxdb/chronograf make ``` @@ -109,10 +109,10 @@ The binaries will be located in `$GOPATH/bin`. To run the tests, execute the following command: ```bash - cd $GOPATH/src/github.com/influxdata/platform/chronograf + cd $GOPATH/src/github.com/influxdata/influxdb/chronograf make test ``` ## Continuous Integration testing -Chronograf uses CircleCI for continuous integration testing. To see how the code is built and tested, check out [this file](https://github.com/influxdata/platform/chronograf/blob/master/Makefile). It closely follows the build and test process outlined above. You can see the exact version of Go Chronograf uses for testing by consulting that file. +Chronograf uses CircleCI for continuous integration testing. To see how the code is built and tested, check out [this file](https://github.com/influxdata/influxdb/chronograf/blob/master/Makefile). It closely follows the build and test process outlined above. You can see the exact version of Go Chronograf uses for testing by consulting that file. diff --git a/chronograf/README.md b/chronograf/README.md index 63c4acfdf47..78781042186 100644 --- a/chronograf/README.md +++ b/chronograf/README.md @@ -5,7 +5,7 @@ provides the tools to visualize your monitoring data and easily create alerting and automation rules.

- +

## Features @@ -19,7 +19,7 @@ and automation rules. ### Dashboard Templates Chronograf's -[pre-canned dashboards](https://github.com/influxdata/platform/chronograf/tree/master/canned) +[pre-canned dashboards](https://github.com/influxdata/influxdb/chronograf/tree/master/canned) for the supported [Telegraf](https://github.com/influxdata/telegraf) input plugins. Currently, Chronograf offers dashboard templates for the following Telegraf input plugins: @@ -119,13 +119,13 @@ page. ### TLS/HTTPS Support See -[Chronograf with TLS](https://github.com/influxdata/platform/chronograf/blob/master/docs/tls.md) +[Chronograf with TLS](https://github.com/influxdata/influxdb/chronograf/blob/master/docs/tls.md) for more information. ### OAuth Login See -[Chronograf with OAuth 2.0](https://github.com/influxdata/platform/chronograf/blob/master/docs/auth.md) +[Chronograf with OAuth 2.0](https://github.com/influxdata/influxdb/chronograf/blob/master/docs/auth.md) for more information. ### Advanced Routing @@ -139,7 +139,7 @@ The most recent version of Chronograf is [v1.5.0.0](https://www.influxdata.com/downloads/). Spotted a bug or have a feature request? Please open -[an issue](https://github.com/influxdata/platform/chronograf/issues/new)! +[an issue](https://github.com/influxdata/influxdb/chronograf/issues/new)! ### Known Issues @@ -150,7 +150,7 @@ The Chronograf team has identified and is working on the following issues: and [system](https://github.com/influxdata/telegraf/blob/master/plugins/inputs/system/SYSTEM_README.md) plugins to ensure that all Apps appear on the - [HOST LIST](https://github.com/influxdata/platform/chronograf/blob/master/docs/GETTING_STARTED.md#host-list) + [HOST LIST](https://github.com/influxdata/influxdb/chronograf/blob/master/docs/GETTING_STARTED.md#host-list) page. ## Installation @@ -192,13 +192,13 @@ docker pull chronograf:1.5.0.0 1. [Setup your GOPATH](https://golang.org/doc/code.html#GOPATH) 1. Build the Chronograf package: ```bash - go get github.com/influxdata/platform/chronograf - cd $GOPATH/src/github.com/influxdata/platform/chronograf + go get github.com/influxdata/influxdb/chronograf + cd $GOPATH/src/github.com/influxdata/influxdb/chronograf make ``` 1. Install the newly built Chronograf package: ```bash - go install github.com/influxdata/platform/chronograf/cmd/chronograf + go install github.com/influxdata/influxdb/chronograf/cmd/chronograf ``` ## Documentation diff --git a/chronograf/bolt/bolt_test.go b/chronograf/bolt/bolt_test.go index 857e6f13553..5e6dd98fcec 100644 --- a/chronograf/bolt/bolt_test.go +++ b/chronograf/bolt/bolt_test.go @@ -7,9 +7,9 @@ import ( "os" "time" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/bolt" - "github.com/influxdata/platform/chronograf/mocks" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/bolt" + "github.com/influxdata/influxdb/chronograf/mocks" ) // TestNow is a set time for testing. diff --git a/chronograf/bolt/build.go b/chronograf/bolt/build.go index ecf89b77a1a..33baa800e5a 100644 --- a/chronograf/bolt/build.go +++ b/chronograf/bolt/build.go @@ -4,8 +4,8 @@ import ( "context" bolt "github.com/coreos/bbolt" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/bolt/internal" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/bolt/internal" ) // Ensure BuildStore struct implements chronograf.BuildStore interface diff --git a/chronograf/bolt/build_test.go b/chronograf/bolt/build_test.go index a84a88c03ba..7a29be442ed 100644 --- a/chronograf/bolt/build_test.go +++ b/chronograf/bolt/build_test.go @@ -4,7 +4,7 @@ package bolt_test // "testing" // "github.com/google/go-cmp/cmp" -// "github.com/influxdata/platform/chronograf" +// "github.com/influxdata/influxdb/chronograf" // ) // func diff --git a/chronograf/bolt/client.go b/chronograf/bolt/client.go index 62933d7dda0..c02b1dfbc2c 100644 --- a/chronograf/bolt/client.go +++ b/chronograf/bolt/client.go @@ -9,8 +9,8 @@ import ( "time" bolt "github.com/coreos/bbolt" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/id" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/id" ) // Client is a client for the boltDB data store. diff --git a/chronograf/bolt/config.go b/chronograf/bolt/config.go index 4127b8903fc..00a2859f05b 100644 --- a/chronograf/bolt/config.go +++ b/chronograf/bolt/config.go @@ -5,8 +5,8 @@ import ( "fmt" bolt "github.com/coreos/bbolt" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/bolt/internal" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/bolt/internal" ) // Ensure ConfigStore implements chronograf.ConfigStore. diff --git a/chronograf/bolt/config_test.go b/chronograf/bolt/config_test.go index 05382ef21ee..1cb9a381dce 100644 --- a/chronograf/bolt/config_test.go +++ b/chronograf/bolt/config_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) func TestConfig_Get(t *testing.T) { diff --git a/chronograf/bolt/dashboards.go b/chronograf/bolt/dashboards.go index a4cfe7741a6..9d55fabd767 100644 --- a/chronograf/bolt/dashboards.go +++ b/chronograf/bolt/dashboards.go @@ -5,8 +5,8 @@ import ( "strconv" bolt "github.com/coreos/bbolt" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/bolt/internal" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/bolt/internal" ) // Ensure DashboardsStore implements chronograf.DashboardsStore. diff --git a/chronograf/bolt/internal/internal.go b/chronograf/bolt/internal/internal.go index 1fe75098b60..8bf1a075e7c 100644 --- a/chronograf/bolt/internal/internal.go +++ b/chronograf/bolt/internal/internal.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/gogo/protobuf/proto" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) //go:generate protoc --plugin ../../../scripts/protoc-gen-gogo --gogo_out=. internal.proto diff --git a/chronograf/bolt/internal/internal_test.go b/chronograf/bolt/internal/internal_test.go index 66979bf2b57..4c64c71829e 100644 --- a/chronograf/bolt/internal/internal_test.go +++ b/chronograf/bolt/internal/internal_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/bolt/internal" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/bolt/internal" ) func TestMarshalSource(t *testing.T) { diff --git a/chronograf/bolt/layouts.go b/chronograf/bolt/layouts.go index 823a421bce6..e6ade5f0dbf 100644 --- a/chronograf/bolt/layouts.go +++ b/chronograf/bolt/layouts.go @@ -4,8 +4,8 @@ import ( "context" bolt "github.com/coreos/bbolt" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/bolt/internal" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/bolt/internal" ) // Ensure LayoutsStore implements chronograf.LayoutsStore. diff --git a/chronograf/bolt/mapping.go b/chronograf/bolt/mapping.go index 7cf1f915f4c..20b394844bd 100644 --- a/chronograf/bolt/mapping.go +++ b/chronograf/bolt/mapping.go @@ -5,8 +5,8 @@ import ( "fmt" bolt "github.com/coreos/bbolt" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/bolt/internal" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/bolt/internal" ) // Ensure MappingsStore implements chronograf.MappingsStore. diff --git a/chronograf/bolt/mapping_test.go b/chronograf/bolt/mapping_test.go index 0f81999518e..2fea0b52e83 100644 --- a/chronograf/bolt/mapping_test.go +++ b/chronograf/bolt/mapping_test.go @@ -6,7 +6,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) var mappingCmpOptions = cmp.Options{ diff --git a/chronograf/bolt/org_config.go b/chronograf/bolt/org_config.go index f5699ec8610..bb6044d300e 100644 --- a/chronograf/bolt/org_config.go +++ b/chronograf/bolt/org_config.go @@ -5,8 +5,8 @@ import ( "fmt" bolt "github.com/coreos/bbolt" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/bolt/internal" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/bolt/internal" ) // Ensure OrganizationConfigStore implements chronograf.OrganizationConfigStore. diff --git a/chronograf/bolt/org_config_test.go b/chronograf/bolt/org_config_test.go index a9d8d88ef41..e3857f083f4 100644 --- a/chronograf/bolt/org_config_test.go +++ b/chronograf/bolt/org_config_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) func TestOrganizationConfig_FindOrCreate(t *testing.T) { diff --git a/chronograf/bolt/organizations.go b/chronograf/bolt/organizations.go index 991c7011e94..31b66d74edb 100644 --- a/chronograf/bolt/organizations.go +++ b/chronograf/bolt/organizations.go @@ -5,9 +5,9 @@ import ( "fmt" bolt "github.com/coreos/bbolt" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/bolt/internal" - "github.com/influxdata/platform/chronograf/organizations" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/bolt/internal" + "github.com/influxdata/influxdb/chronograf/organizations" ) // Ensure OrganizationsStore implements chronograf.OrganizationsStore. diff --git a/chronograf/bolt/organizations_test.go b/chronograf/bolt/organizations_test.go index 4a534da12ea..996768bb5a2 100644 --- a/chronograf/bolt/organizations_test.go +++ b/chronograf/bolt/organizations_test.go @@ -6,9 +6,9 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/bolt" - "github.com/influxdata/platform/chronograf/roles" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/bolt" + "github.com/influxdata/influxdb/chronograf/roles" ) var orgCmpOptions = cmp.Options{ diff --git a/chronograf/bolt/servers.go b/chronograf/bolt/servers.go index f4b2ae55deb..4d3724f6140 100644 --- a/chronograf/bolt/servers.go +++ b/chronograf/bolt/servers.go @@ -4,8 +4,8 @@ import ( "context" bolt "github.com/coreos/bbolt" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/bolt/internal" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/bolt/internal" ) // Ensure ServersStore implements chronograf.ServersStore. diff --git a/chronograf/bolt/servers_test.go b/chronograf/bolt/servers_test.go index e235ab62eed..cc3f2144f1e 100644 --- a/chronograf/bolt/servers_test.go +++ b/chronograf/bolt/servers_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // Ensure an ServerStore can store, retrieve, update, and delete servers. diff --git a/chronograf/bolt/sources.go b/chronograf/bolt/sources.go index 34633aa6ce2..87ea581278a 100644 --- a/chronograf/bolt/sources.go +++ b/chronograf/bolt/sources.go @@ -5,9 +5,9 @@ import ( "math" bolt "github.com/coreos/bbolt" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/bolt/internal" - "github.com/influxdata/platform/chronograf/roles" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/bolt/internal" + "github.com/influxdata/influxdb/chronograf/roles" ) // Ensure SourcesStore implements chronograf.SourcesStore. diff --git a/chronograf/bolt/sources_test.go b/chronograf/bolt/sources_test.go index 6cb29e22127..5ea929e684d 100644 --- a/chronograf/bolt/sources_test.go +++ b/chronograf/bolt/sources_test.go @@ -5,8 +5,8 @@ import ( "reflect" "testing" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/bolt" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/bolt" ) // Ensure an SourceStore can store, retrieve, update, and delete sources. diff --git a/chronograf/bolt/users.go b/chronograf/bolt/users.go index 2f91fa71bc0..a195d2f2484 100644 --- a/chronograf/bolt/users.go +++ b/chronograf/bolt/users.go @@ -5,8 +5,8 @@ import ( "fmt" bolt "github.com/coreos/bbolt" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/bolt/internal" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/bolt/internal" ) // Ensure UsersStore implements chronograf.UsersStore. diff --git a/chronograf/bolt/users_test.go b/chronograf/bolt/users_test.go index 0df5b1b6ef4..4000b6582a0 100644 --- a/chronograf/bolt/users_test.go +++ b/chronograf/bolt/users_test.go @@ -6,7 +6,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // IgnoreFields is used because ID is created by BoltDB and cannot be predicted reliably diff --git a/chronograf/canned/bin.go b/chronograf/canned/bin.go index 8bd3d958bb4..05bcbfd668c 100644 --- a/chronograf/canned/bin.go +++ b/chronograf/canned/bin.go @@ -5,7 +5,7 @@ import ( "encoding/json" "fmt" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) //go:generate env GO111MODULE=on go run github.com/kevinburke/go-bindata/go-bindata -o bin_gen.go -tags assets -ignore README|apps|.sh|go -pkg canned . diff --git a/chronograf/cmd/chronoctl/add.go b/chronograf/cmd/chronoctl/add.go index 4524cd0726c..9c4d94498c9 100644 --- a/chronograf/cmd/chronoctl/add.go +++ b/chronograf/cmd/chronoctl/add.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) type AddCommand struct { diff --git a/chronograf/cmd/chronoctl/util.go b/chronograf/cmd/chronoctl/util.go index c86a0e9d244..f0c52c40783 100644 --- a/chronograf/cmd/chronoctl/util.go +++ b/chronograf/cmd/chronoctl/util.go @@ -8,9 +8,9 @@ import ( "strings" "text/tabwriter" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/bolt" - "github.com/influxdata/platform/chronograf/mocks" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/bolt" + "github.com/influxdata/influxdb/chronograf/mocks" ) func NewBoltClient(path string) (*bolt.Client, error) { diff --git a/chronograf/cmd/chronograf/main.go b/chronograf/cmd/chronograf/main.go index 2f5ff3e562a..174a74e2e17 100644 --- a/chronograf/cmd/chronograf/main.go +++ b/chronograf/cmd/chronograf/main.go @@ -5,8 +5,8 @@ import ( "log" "os" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/server" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/server" flags "github.com/jessevdk/go-flags" ) diff --git a/chronograf/docs/release.md b/chronograf/docs/release.md index 6b0d94029b8..124a4e9dbfc 100644 --- a/chronograf/docs/release.md +++ b/chronograf/docs/release.md @@ -1,5 +1,5 @@ ## Creating a release -The release process is handled via our [circle.yml](https://github.com/influxdata/platform/chronograf/blob/master/circle.yml). +The release process is handled via our [circle.yml](https://github.com/influxdata/influxdb/chronograf/blob/master/circle.yml). A release tag of the format `1.3.0.0` needs to be added. Afterwhich, circle will build our packages for all of our platforms. @@ -30,7 +30,7 @@ bumpversion --allow-dirty --new-version=1.4.0.0 minor The behavior of `bumpversion` is controlled by .bumpversion.cfg ### Creating Release tag -You can create a release tag from [Github](https://github.com/influxdata/platform/chronograf/releases) +You can create a release tag from [Github](https://github.com/influxdata/influxdb/chronograf/releases) or create an annotated tag: ```sh @@ -50,4 +50,4 @@ git push --tags * OS X * amd64 * Windows - * amd64 \ No newline at end of file + * amd64 diff --git a/chronograf/docs/slides/mnGo/go_and_react.slide b/chronograf/docs/slides/mnGo/go_and_react.slide index 5e3dedc7179..d0b30dda2c5 100644 --- a/chronograf/docs/slides/mnGo/go_and_react.slide +++ b/chronograf/docs/slides/mnGo/go_and_react.slide @@ -9,7 +9,7 @@ chris@influxdb.com @goller * Demo -- Source: [[https://github.com/influxdata/platform/chronograf]] +- Source: [[https://github.com/influxdata/influxdb/chronograf]] - [[http://localhost:8888]] * Chronograf Goals diff --git a/chronograf/docs/slides/mnGo/mux/mux_go b/chronograf/docs/slides/mnGo/mux/mux_go index 3f151072a24..b5bd70d135e 100644 --- a/chronograf/docs/slides/mnGo/mux/mux_go +++ b/chronograf/docs/slides/mnGo/mux/mux_go @@ -10,8 +10,8 @@ import ( "github.com/NYTimes/gziphandler" "github.com/bouk/httprouter" - "github.com/influxdata/platform/chronograf" // When julienschmidt/httprouter v2 w/ context is out, switch - "github.com/influxdata/platform/chronograf/oauth2" + "github.com/influxdata/influxdb/chronograf" // When julienschmidt/httprouter v2 w/ context is out, switch + "github.com/influxdata/influxdb/chronograf/oauth2" ) const ( diff --git a/chronograf/docs/slides/mnGo/prefixer/url_prefixer_go b/chronograf/docs/slides/mnGo/prefixer/url_prefixer_go index 55e7ec94bbc..96b8aed9188 100644 --- a/chronograf/docs/slides/mnGo/prefixer/url_prefixer_go +++ b/chronograf/docs/slides/mnGo/prefixer/url_prefixer_go @@ -7,7 +7,7 @@ import ( "io" "net/http" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // URLPrefixer is a wrapper for an http.Handler that will prefix all occurrences of a relative URL with the configured Prefix diff --git a/chronograf/enterprise/enterprise.go b/chronograf/enterprise/enterprise.go index 627fe571358..9a4e98f0930 100644 --- a/chronograf/enterprise/enterprise.go +++ b/chronograf/enterprise/enterprise.go @@ -7,8 +7,8 @@ import ( "context" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/influx" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/influx" ) var _ chronograf.TimeSeries = &Client{} diff --git a/chronograf/enterprise/enterprise_test.go b/chronograf/enterprise/enterprise_test.go index 7f799c5019b..746e167cfaa 100644 --- a/chronograf/enterprise/enterprise_test.go +++ b/chronograf/enterprise/enterprise_test.go @@ -7,9 +7,9 @@ import ( "reflect" "testing" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/enterprise" - "github.com/influxdata/platform/chronograf/influx" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/enterprise" + "github.com/influxdata/influxdb/chronograf/influx" ) func Test_Enterprise_FetchesDataNodes(t *testing.T) { diff --git a/chronograf/enterprise/meta.go b/chronograf/enterprise/meta.go index f079f8c1957..beb4b6d938f 100644 --- a/chronograf/enterprise/meta.go +++ b/chronograf/enterprise/meta.go @@ -13,8 +13,8 @@ import ( "net/url" "time" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/influx" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/influx" ) // Shared transports for all clients to prevent leaking connections diff --git a/chronograf/enterprise/meta_test.go b/chronograf/enterprise/meta_test.go index 8021d3d21c6..23a5e9f23d6 100644 --- a/chronograf/enterprise/meta_test.go +++ b/chronograf/enterprise/meta_test.go @@ -13,7 +13,7 @@ import ( "testing" "time" - "github.com/influxdata/platform/chronograf/influx" + "github.com/influxdata/influxdb/chronograf/influx" ) func TestMetaClient_ShowCluster(t *testing.T) { diff --git a/chronograf/enterprise/mocks_test.go b/chronograf/enterprise/mocks_test.go index 0836a3a4016..9e98741af8f 100644 --- a/chronograf/enterprise/mocks_test.go +++ b/chronograf/enterprise/mocks_test.go @@ -5,8 +5,8 @@ import ( "encoding/json" "net/url" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/enterprise" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/enterprise" ) type ControlClient struct { diff --git a/chronograf/enterprise/roles.go b/chronograf/enterprise/roles.go index 3827c5de5cd..3ff9ec8cc0b 100644 --- a/chronograf/enterprise/roles.go +++ b/chronograf/enterprise/roles.go @@ -3,7 +3,7 @@ package enterprise import ( "context" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // RolesStore uses a control client operate on Influx Enterprise roles. Roles are diff --git a/chronograf/enterprise/roles_test.go b/chronograf/enterprise/roles_test.go index c2314afc251..daeb0ce6f98 100644 --- a/chronograf/enterprise/roles_test.go +++ b/chronograf/enterprise/roles_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) func TestRoles_ToChronograf(t *testing.T) { diff --git a/chronograf/enterprise/users.go b/chronograf/enterprise/users.go index 343e272af62..b854f71035c 100644 --- a/chronograf/enterprise/users.go +++ b/chronograf/enterprise/users.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // UserStore uses a control client operate on Influx Enterprise users diff --git a/chronograf/enterprise/users_test.go b/chronograf/enterprise/users_test.go index 9d2f0e8bce2..a8b7ccb0be4 100644 --- a/chronograf/enterprise/users_test.go +++ b/chronograf/enterprise/users_test.go @@ -6,8 +6,8 @@ import ( "reflect" "testing" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/enterprise" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/enterprise" ) func TestClient_Add(t *testing.T) { diff --git a/chronograf/etc/Dockerfile_build b/chronograf/etc/Dockerfile_build index 73f36031816..2e91918bb11 100644 --- a/chronograf/etc/Dockerfile_build +++ b/chronograf/etc/Dockerfile_build @@ -34,11 +34,11 @@ RUN wget https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${GO_ARCH}. rm /go${GO_VERSION}.linux-${GO_ARCH}.tar.gz ENV PATH /usr/local/go/bin:$PATH -ENV PROJECT_DIR $GOPATH/src/github.com/influxdata/platform/chronograf +ENV PROJECT_DIR $GOPATH/src/github.com/influxdata/influxdb/chronograf ENV PATH $GOPATH/bin:$PATH RUN mkdir -p $PROJECT_DIR WORKDIR $PROJECT_DIR VOLUME $PROJECT_DIR -ENTRYPOINT [ "/root/go/src/github.com/influxdata/platform/chronograf/etc/build.py" ] +ENTRYPOINT [ "/root/go/src/github.com/influxdata/influxdb/chronograf/etc/build.py" ] diff --git a/chronograf/etc/build.py b/chronograf/etc/build.py index bb40c8f3ae0..439b8d7782c 100755 --- a/chronograf/etc/build.py +++ b/chronograf/etc/build.py @@ -41,7 +41,7 @@ ] PACKAGE_LICENSE = "AGPLv3" -PACKAGE_URL = "https://github.com/influxdata/platform/chronograf" +PACKAGE_URL = "https://github.com/influxdata/influxdb/chronograf" MAINTAINER = "contact@influxdb.com" VENDOR = "InfluxData" DESCRIPTION = "Open source monitoring and visualization UI for the entire TICK stack." diff --git a/chronograf/etc/scripts/docker/run.sh b/chronograf/etc/scripts/docker/run.sh index 39d6b671938..025952aec11 100755 --- a/chronograf/etc/scripts/docker/run.sh +++ b/chronograf/etc/scripts/docker/run.sh @@ -21,6 +21,6 @@ docker run \ -e AWS_SECRET_ACCESS_KEY \ -v $SSH_KEY_PATH:/root/.ssh/id_rsa \ -v ~/.ssh/known_hosts:/root/.ssh/known_hosts \ - -v $(pwd):/root/go/src/github.com/influxdata/platform/chronograf \ + -v $(pwd):/root/go/src/github.com/influxdata/influxdb/chronograf \ quay.io/influxdb/builder:$DOCKER_TAG \ "$@" diff --git a/chronograf/filestore/apps.go b/chronograf/filestore/apps.go index 903c764c488..9b912a04230 100644 --- a/chronograf/filestore/apps.go +++ b/chronograf/filestore/apps.go @@ -8,7 +8,7 @@ import ( "os" "path" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // AppExt is the the file extension searched for in the directory for layout files diff --git a/chronograf/filestore/apps_test.go b/chronograf/filestore/apps_test.go index bb87a1541e3..82995b36930 100644 --- a/chronograf/filestore/apps_test.go +++ b/chronograf/filestore/apps_test.go @@ -12,8 +12,8 @@ import ( "testing" "time" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/filestore" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/filestore" ) func TestAll(t *testing.T) { diff --git a/chronograf/filestore/dashboards.go b/chronograf/filestore/dashboards.go index b24a9796e49..b27e4ccb02d 100644 --- a/chronograf/filestore/dashboards.go +++ b/chronograf/filestore/dashboards.go @@ -9,7 +9,7 @@ import ( "path" "strconv" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // DashExt is the the file extension searched for in the directory for dashboard files diff --git a/chronograf/filestore/kapacitors.go b/chronograf/filestore/kapacitors.go index 4240e149cbb..e5dca293fbd 100644 --- a/chronograf/filestore/kapacitors.go +++ b/chronograf/filestore/kapacitors.go @@ -8,7 +8,7 @@ import ( "path" "strconv" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // KapExt is the the file extension searched for in the directory for kapacitor files diff --git a/chronograf/filestore/organizations.go b/chronograf/filestore/organizations.go index 6c6f1d43ff0..3f844b4eb31 100644 --- a/chronograf/filestore/organizations.go +++ b/chronograf/filestore/organizations.go @@ -7,7 +7,7 @@ import ( "os" "path" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // OrgExt is the the file extension searched for in the directory for org files diff --git a/chronograf/filestore/sources.go b/chronograf/filestore/sources.go index f057285e4cc..a9821d42172 100644 --- a/chronograf/filestore/sources.go +++ b/chronograf/filestore/sources.go @@ -8,7 +8,7 @@ import ( "path" "strconv" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // SrcExt is the the file extension searched for in the directory for source files diff --git a/chronograf/id/time.go b/chronograf/id/time.go index a51caf3d796..14966d8e867 100644 --- a/chronograf/id/time.go +++ b/chronograf/id/time.go @@ -4,7 +4,7 @@ import ( "strconv" "time" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // tm generates an id based on current time diff --git a/chronograf/id/uuid.go b/chronograf/id/uuid.go index 38b075049d8..ab48f30c99f 100644 --- a/chronograf/id/uuid.go +++ b/chronograf/id/uuid.go @@ -1,7 +1,7 @@ package id import ( - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" uuid "github.com/satori/go.uuid" ) diff --git a/chronograf/influx/annotations.go b/chronograf/influx/annotations.go index fc3946c7075..22ed5b30470 100644 --- a/chronograf/influx/annotations.go +++ b/chronograf/influx/annotations.go @@ -8,9 +8,8 @@ import ( "sort" "time" - "github.com/influxdata/platform/chronograf/id" - - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/id" ) const ( diff --git a/chronograf/influx/annotations_test.go b/chronograf/influx/annotations_test.go index 892ab856e63..29b8d03d5bc 100644 --- a/chronograf/influx/annotations_test.go +++ b/chronograf/influx/annotations_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/mocks" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/mocks" ) func Test_toPoint(t *testing.T) { diff --git a/chronograf/influx/authorization.go b/chronograf/influx/authorization.go index 62ef52fe1b3..50061d07344 100644 --- a/chronograf/influx/authorization.go +++ b/chronograf/influx/authorization.go @@ -6,7 +6,7 @@ import ( "time" jwt "github.com/dgrijalva/jwt-go" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // Authorizer adds optional authorization header to request diff --git a/chronograf/influx/databases.go b/chronograf/influx/databases.go index 13ce69d4572..d42f55166a3 100644 --- a/chronograf/influx/databases.go +++ b/chronograf/influx/databases.go @@ -6,7 +6,7 @@ import ( "encoding/json" "fmt" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // AllDB returns all databases from within Influx diff --git a/chronograf/influx/influx.go b/chronograf/influx/influx.go index 0fdc4478688..c8a0dea5a84 100644 --- a/chronograf/influx/influx.go +++ b/chronograf/influx/influx.go @@ -11,7 +11,7 @@ import ( "net/url" "strings" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) var _ chronograf.TimeSeries = &Client{} diff --git a/chronograf/influx/influx_test.go b/chronograf/influx/influx_test.go index e82403c7f34..cc1bba06362 100644 --- a/chronograf/influx/influx_test.go +++ b/chronograf/influx/influx_test.go @@ -11,9 +11,9 @@ import ( "time" gojwt "github.com/dgrijalva/jwt-go" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/influx" - "github.com/influxdata/platform/chronograf/mocks" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/influx" + "github.com/influxdata/influxdb/chronograf/mocks" ) // NewClient initializes an HTTP Client for InfluxDB. diff --git a/chronograf/influx/lineprotocol.go b/chronograf/influx/lineprotocol.go index 6dfaa133809..cadae2f1d2f 100644 --- a/chronograf/influx/lineprotocol.go +++ b/chronograf/influx/lineprotocol.go @@ -5,7 +5,7 @@ import ( "sort" "strings" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) var ( diff --git a/chronograf/influx/lineprotocol_test.go b/chronograf/influx/lineprotocol_test.go index c87104ae941..5abc33ef9ee 100644 --- a/chronograf/influx/lineprotocol_test.go +++ b/chronograf/influx/lineprotocol_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) func Test_toLineProtocol(t *testing.T) { diff --git a/chronograf/influx/permissions.go b/chronograf/influx/permissions.go index c24d1e19ab0..5e2f25040c3 100644 --- a/chronograf/influx/permissions.go +++ b/chronograf/influx/permissions.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) var ( diff --git a/chronograf/influx/permissions_test.go b/chronograf/influx/permissions_test.go index dc729a0d515..6c52d7cba58 100644 --- a/chronograf/influx/permissions_test.go +++ b/chronograf/influx/permissions_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) func TestDifference(t *testing.T) { diff --git a/chronograf/influx/query.go b/chronograf/influx/query.go index 51cf15445f4..1a144bd05d0 100644 --- a/chronograf/influx/query.go +++ b/chronograf/influx/query.go @@ -6,8 +6,8 @@ import ( "strings" "time" + "github.com/influxdata/influxdb/chronograf" "github.com/influxdata/influxql" - "github.com/influxdata/platform/chronograf" ) // TimeRangeAsEpochNano extracs the min and max epoch times from the expression diff --git a/chronograf/influx/query_test.go b/chronograf/influx/query_test.go index 7ec35a66cea..f4415f11dd3 100644 --- a/chronograf/influx/query_test.go +++ b/chronograf/influx/query_test.go @@ -5,7 +5,7 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) func TestConvert(t *testing.T) { diff --git a/chronograf/influx/users.go b/chronograf/influx/users.go index 9d796289d99..5c26e886726 100644 --- a/chronograf/influx/users.go +++ b/chronograf/influx/users.go @@ -5,7 +5,7 @@ import ( "encoding/json" "fmt" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // Add a new User in InfluxDB diff --git a/chronograf/influx/users_test.go b/chronograf/influx/users_test.go index 97f12db8948..b4ddcc9a850 100644 --- a/chronograf/influx/users_test.go +++ b/chronograf/influx/users_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) func TestClient_userPermissions(t *testing.T) { diff --git a/chronograf/integrations/server_test.go b/chronograf/integrations/server_test.go index 62346406fb6..140e2da6d38 100644 --- a/chronograf/integrations/server_test.go +++ b/chronograf/integrations/server_test.go @@ -15,10 +15,10 @@ import ( "testing" "time" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/bolt" - "github.com/influxdata/platform/chronograf/oauth2" - "github.com/influxdata/platform/chronograf/server" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/bolt" + "github.com/influxdata/influxdb/chronograf/oauth2" + "github.com/influxdata/influxdb/chronograf/server" ) func TestServer(t *testing.T) { @@ -1647,7 +1647,7 @@ func TestServer(t *testing.T) { // body: ` //{ // "code": 401, - // "message": "user does not have authorization required to set SuperAdmin status. See https://github.com/influxdata/platform/chronograf/issues/2601 for more information." + // "message": "user does not have authorization required to set SuperAdmin status. See https://github.com/influxdata/influxdb/chronograf/issues/2601 for more information." //}`, // }, // }, diff --git a/chronograf/memdb/kapacitors.go b/chronograf/memdb/kapacitors.go index 4a612c093fa..21a394933f0 100644 --- a/chronograf/memdb/kapacitors.go +++ b/chronograf/memdb/kapacitors.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // Ensure KapacitorStore implements chronograf.ServersStore. diff --git a/chronograf/memdb/kapacitors_test.go b/chronograf/memdb/kapacitors_test.go index 1282f533983..a254e14c31e 100644 --- a/chronograf/memdb/kapacitors_test.go +++ b/chronograf/memdb/kapacitors_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) func TestInterfaceImplementation(t *testing.T) { diff --git a/chronograf/memdb/sources.go b/chronograf/memdb/sources.go index 5e8fb1b4adb..6576c0ae686 100644 --- a/chronograf/memdb/sources.go +++ b/chronograf/memdb/sources.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // Ensure SourcesStore implements chronograf.SourcesStore. diff --git a/chronograf/memdb/sources_test.go b/chronograf/memdb/sources_test.go index 0802516697d..3cbcd85f80e 100644 --- a/chronograf/memdb/sources_test.go +++ b/chronograf/memdb/sources_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) func TestSourcesStore(t *testing.T) { diff --git a/chronograf/mocks/auth.go b/chronograf/mocks/auth.go index b29447d2e39..2fa980fe2d7 100644 --- a/chronograf/mocks/auth.go +++ b/chronograf/mocks/auth.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/influxdata/platform/chronograf/oauth2" + "github.com/influxdata/influxdb/chronograf/oauth2" ) // Authenticator implements a OAuth2 authenticator diff --git a/chronograf/mocks/config.go b/chronograf/mocks/config.go index 00f67c8d794..e78a2d01830 100644 --- a/chronograf/mocks/config.go +++ b/chronograf/mocks/config.go @@ -3,7 +3,7 @@ package mocks import ( "context" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // ConfigStore stores global application configuration diff --git a/chronograf/mocks/dashboards.go b/chronograf/mocks/dashboards.go index ff5765e3e6c..460d0946db7 100644 --- a/chronograf/mocks/dashboards.go +++ b/chronograf/mocks/dashboards.go @@ -3,7 +3,7 @@ package mocks import ( "context" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) var _ chronograf.DashboardsStore = &DashboardsStore{} diff --git a/chronograf/mocks/databases.go b/chronograf/mocks/databases.go index 90cc11e1020..6af071502ed 100644 --- a/chronograf/mocks/databases.go +++ b/chronograf/mocks/databases.go @@ -3,7 +3,7 @@ package mocks import ( "context" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) var _ chronograf.Databases = &Databases{} diff --git a/chronograf/mocks/layouts.go b/chronograf/mocks/layouts.go index 971d426d8c3..a9b81686d11 100644 --- a/chronograf/mocks/layouts.go +++ b/chronograf/mocks/layouts.go @@ -3,7 +3,7 @@ package mocks import ( "context" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) var _ chronograf.LayoutsStore = &LayoutsStore{} diff --git a/chronograf/mocks/logger.go b/chronograf/mocks/logger.go index e6ed01f7823..302cc00653c 100644 --- a/chronograf/mocks/logger.go +++ b/chronograf/mocks/logger.go @@ -5,7 +5,7 @@ import ( "io" "testing" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // NewLogger returns a mock logger that implements chronograf.Logger diff --git a/chronograf/mocks/mapping.go b/chronograf/mocks/mapping.go index 78ea69398a9..298f94c28d2 100644 --- a/chronograf/mocks/mapping.go +++ b/chronograf/mocks/mapping.go @@ -3,7 +3,7 @@ package mocks import ( "context" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) type MappingsStore struct { diff --git a/chronograf/mocks/org_config.go b/chronograf/mocks/org_config.go index 3a7cca2b981..ad8372dee76 100644 --- a/chronograf/mocks/org_config.go +++ b/chronograf/mocks/org_config.go @@ -3,7 +3,7 @@ package mocks import ( "context" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) var _ chronograf.OrganizationConfigStore = &OrganizationConfigStore{} diff --git a/chronograf/mocks/organizations.go b/chronograf/mocks/organizations.go index 2cdd9ad930c..11bb72a1cbf 100644 --- a/chronograf/mocks/organizations.go +++ b/chronograf/mocks/organizations.go @@ -3,7 +3,7 @@ package mocks import ( "context" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) var _ chronograf.OrganizationsStore = &OrganizationsStore{} diff --git a/chronograf/mocks/roles.go b/chronograf/mocks/roles.go index b6b1c12a91a..8bf0832e65b 100644 --- a/chronograf/mocks/roles.go +++ b/chronograf/mocks/roles.go @@ -3,7 +3,7 @@ package mocks import ( "context" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) var _ chronograf.RolesStore = &RolesStore{} diff --git a/chronograf/mocks/servers.go b/chronograf/mocks/servers.go index 1847b4e323f..b4e08910237 100644 --- a/chronograf/mocks/servers.go +++ b/chronograf/mocks/servers.go @@ -3,7 +3,7 @@ package mocks import ( "context" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) var _ chronograf.ServersStore = &ServersStore{} diff --git a/chronograf/mocks/sources.go b/chronograf/mocks/sources.go index 0a2c89c2319..117d9df82f9 100644 --- a/chronograf/mocks/sources.go +++ b/chronograf/mocks/sources.go @@ -3,7 +3,7 @@ package mocks import ( "context" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) var _ chronograf.SourcesStore = &SourcesStore{} diff --git a/chronograf/mocks/store.go b/chronograf/mocks/store.go index 8c22dcdc6e3..914ba99b704 100644 --- a/chronograf/mocks/store.go +++ b/chronograf/mocks/store.go @@ -3,7 +3,7 @@ package mocks import ( "context" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // Store is a server.DataStore diff --git a/chronograf/mocks/timeseries.go b/chronograf/mocks/timeseries.go index aa2dcaee462..e29df23c106 100644 --- a/chronograf/mocks/timeseries.go +++ b/chronograf/mocks/timeseries.go @@ -3,7 +3,7 @@ package mocks import ( "context" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) var _ chronograf.TimeSeries = &TimeSeries{} diff --git a/chronograf/mocks/users.go b/chronograf/mocks/users.go index ff968505e5f..df853b24852 100644 --- a/chronograf/mocks/users.go +++ b/chronograf/mocks/users.go @@ -3,7 +3,7 @@ package mocks import ( "context" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) var _ chronograf.UsersStore = &UsersStore{} diff --git a/chronograf/multistore/dashboards.go b/chronograf/multistore/dashboards.go index 4d81565c09b..07b2d0ffbb1 100644 --- a/chronograf/multistore/dashboards.go +++ b/chronograf/multistore/dashboards.go @@ -3,7 +3,7 @@ package multistore import ( "context" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // Ensure DashboardsStore implements chronograf.DashboardsStore. diff --git a/chronograf/multistore/kapacitors.go b/chronograf/multistore/kapacitors.go index 667f801397e..8fb0681f0d8 100644 --- a/chronograf/multistore/kapacitors.go +++ b/chronograf/multistore/kapacitors.go @@ -3,7 +3,7 @@ package multistore import ( "context" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // Ensure KapacitorStore implements chronograf.ServersStore. diff --git a/chronograf/multistore/kapacitors_test.go b/chronograf/multistore/kapacitors_test.go index 7154af613c7..969681656f0 100644 --- a/chronograf/multistore/kapacitors_test.go +++ b/chronograf/multistore/kapacitors_test.go @@ -3,7 +3,7 @@ package multistore import ( "testing" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) func TestInterfaceImplementation(t *testing.T) { diff --git a/chronograf/multistore/layouts.go b/chronograf/multistore/layouts.go index 1a5de253f5a..9f4dbe54a5b 100644 --- a/chronograf/multistore/layouts.go +++ b/chronograf/multistore/layouts.go @@ -3,7 +3,7 @@ package multistore import ( "context" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // Layouts is a LayoutsStore that contains multiple LayoutsStores diff --git a/chronograf/multistore/organizations.go b/chronograf/multistore/organizations.go index 12c2cbc7aeb..6fe6f5a00c0 100644 --- a/chronograf/multistore/organizations.go +++ b/chronograf/multistore/organizations.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // Ensure OrganizationsStore implements chronograf.OrganizationsStore. diff --git a/chronograf/multistore/sources.go b/chronograf/multistore/sources.go index 5a8ec944452..b8f90ee4280 100644 --- a/chronograf/multistore/sources.go +++ b/chronograf/multistore/sources.go @@ -3,7 +3,7 @@ package multistore import ( "context" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // Ensure SourcesStore implements chronograf.SourcesStore. diff --git a/chronograf/noop/config.go b/chronograf/noop/config.go index 51fc30098f7..30915fcdf0b 100644 --- a/chronograf/noop/config.go +++ b/chronograf/noop/config.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // ensure ConfigStore implements chronograf.ConfigStore diff --git a/chronograf/noop/dashboards.go b/chronograf/noop/dashboards.go index 7e1ffbea12b..cf37d6bbc3d 100644 --- a/chronograf/noop/dashboards.go +++ b/chronograf/noop/dashboards.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // ensure DashboardsStore implements chronograf.DashboardsStore diff --git a/chronograf/noop/layouts.go b/chronograf/noop/layouts.go index eefff0623b2..a4c3662c5dc 100644 --- a/chronograf/noop/layouts.go +++ b/chronograf/noop/layouts.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // ensure LayoutsStore implements chronograf.LayoutsStore diff --git a/chronograf/noop/mappings.go b/chronograf/noop/mappings.go index 5d9fdca6d0f..04a2e148a42 100644 --- a/chronograf/noop/mappings.go +++ b/chronograf/noop/mappings.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // ensure MappingsStore implements chronograf.MappingsStore diff --git a/chronograf/noop/org_config.go b/chronograf/noop/org_config.go index 33ac038ee9c..5fdda415e0b 100644 --- a/chronograf/noop/org_config.go +++ b/chronograf/noop/org_config.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // ensure OrganizationConfigStore implements chronograf.OrganizationConfigStore diff --git a/chronograf/noop/organizations.go b/chronograf/noop/organizations.go index db2b1b280ef..b1ed622c296 100644 --- a/chronograf/noop/organizations.go +++ b/chronograf/noop/organizations.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // ensure OrganizationsStore implements chronograf.OrganizationsStore diff --git a/chronograf/noop/servers.go b/chronograf/noop/servers.go index b892f1d19e4..41078181d3a 100644 --- a/chronograf/noop/servers.go +++ b/chronograf/noop/servers.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // ensure ServersStore implements chronograf.ServersStore diff --git a/chronograf/noop/sources.go b/chronograf/noop/sources.go index da81d88162f..08f70001fea 100644 --- a/chronograf/noop/sources.go +++ b/chronograf/noop/sources.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // ensure SourcesStore implements chronograf.SourcesStore diff --git a/chronograf/noop/users.go b/chronograf/noop/users.go index 4a39d420a54..ee732e99300 100644 --- a/chronograf/noop/users.go +++ b/chronograf/noop/users.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // ensure UsersStore implements chronograf.UsersStore diff --git a/chronograf/oauth2/auth0.go b/chronograf/oauth2/auth0.go index d426b22997c..87cddccd4ee 100644 --- a/chronograf/oauth2/auth0.go +++ b/chronograf/oauth2/auth0.go @@ -5,7 +5,7 @@ import ( "net/http" "net/url" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) var _ Provider = &Auth0{} diff --git a/chronograf/oauth2/auth0_test.go b/chronograf/oauth2/auth0_test.go index e93c517e44d..84db4917564 100644 --- a/chronograf/oauth2/auth0_test.go +++ b/chronograf/oauth2/auth0_test.go @@ -6,8 +6,8 @@ import ( "net/http/httptest" "testing" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/oauth2" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/oauth2" ) var auth0Tests = []struct { diff --git a/chronograf/oauth2/doc.go b/chronograf/oauth2/doc.go index a59d4556223..51b4754a8f1 100644 --- a/chronograf/oauth2/doc.go +++ b/chronograf/oauth2/doc.go @@ -4,7 +4,7 @@ // This is how the pieces of this package fit together: // // ┌────────────────────────────────────────┐ -// │github.com/influxdata/platform/chronograf/oauth2 │ +// │github.com/influxdata/influxdb/chronograf/oauth2 │ // ├────────────────────────────────────────┴────────────────────────────────────┐ // │┌────────────────────┐ │ // ││ <> │ ┌─────────────────────────┐ │ diff --git a/chronograf/oauth2/generic.go b/chronograf/oauth2/generic.go index c14d739e1fc..b245a53a7ae 100644 --- a/chronograf/oauth2/generic.go +++ b/chronograf/oauth2/generic.go @@ -8,7 +8,7 @@ import ( "strings" gojwt "github.com/dgrijalva/jwt-go" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" "golang.org/x/oauth2" ) diff --git a/chronograf/oauth2/generic_test.go b/chronograf/oauth2/generic_test.go index d0092ec808d..5600ea352bd 100644 --- a/chronograf/oauth2/generic_test.go +++ b/chronograf/oauth2/generic_test.go @@ -6,8 +6,8 @@ import ( "net/http/httptest" "testing" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/oauth2" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/oauth2" ) func TestGenericGroup_withNotEmail(t *testing.T) { diff --git a/chronograf/oauth2/github.go b/chronograf/oauth2/github.go index e77e6c8fe47..a6fe4fdaf87 100644 --- a/chronograf/oauth2/github.go +++ b/chronograf/oauth2/github.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/google/go-github/github" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" "golang.org/x/oauth2" ogh "golang.org/x/oauth2/github" ) diff --git a/chronograf/oauth2/github_test.go b/chronograf/oauth2/github_test.go index 44a7b58211d..413d87efb7b 100644 --- a/chronograf/oauth2/github_test.go +++ b/chronograf/oauth2/github_test.go @@ -6,8 +6,8 @@ import ( "net/http/httptest" "testing" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/oauth2" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/oauth2" ) func TestGithubPrincipalID(t *testing.T) { diff --git a/chronograf/oauth2/google.go b/chronograf/oauth2/google.go index 94833061201..41227c8e812 100644 --- a/chronograf/oauth2/google.go +++ b/chronograf/oauth2/google.go @@ -4,8 +4,7 @@ import ( "fmt" "net/http" - "github.com/influxdata/platform/chronograf" - + "github.com/influxdata/influxdb/chronograf" "golang.org/x/oauth2" goauth2 "google.golang.org/api/oauth2/v2" ) diff --git a/chronograf/oauth2/google_test.go b/chronograf/oauth2/google_test.go index 2dbc0c9882d..daac49c9727 100644 --- a/chronograf/oauth2/google_test.go +++ b/chronograf/oauth2/google_test.go @@ -6,8 +6,8 @@ import ( "net/http/httptest" "testing" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/oauth2" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/oauth2" ) func TestGooglePrincipalID(t *testing.T) { diff --git a/chronograf/oauth2/heroku.go b/chronograf/oauth2/heroku.go index 5e903c62bbc..f6255d0d91e 100644 --- a/chronograf/oauth2/heroku.go +++ b/chronograf/oauth2/heroku.go @@ -5,8 +5,7 @@ import ( "fmt" "net/http" - "github.com/influxdata/platform/chronograf" - + "github.com/influxdata/influxdb/chronograf" "golang.org/x/oauth2" hrk "golang.org/x/oauth2/heroku" ) diff --git a/chronograf/oauth2/heroku_test.go b/chronograf/oauth2/heroku_test.go index 99d57289316..430f3743705 100644 --- a/chronograf/oauth2/heroku_test.go +++ b/chronograf/oauth2/heroku_test.go @@ -6,8 +6,8 @@ import ( "net/http/httptest" "testing" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/oauth2" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/oauth2" ) func Test_Heroku_PrincipalID_ExtractsEmailAddress(t *testing.T) { diff --git a/chronograf/oauth2/jwt_test.go b/chronograf/oauth2/jwt_test.go index f640fe8af68..07050c50079 100644 --- a/chronograf/oauth2/jwt_test.go +++ b/chronograf/oauth2/jwt_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/influxdata/platform/chronograf/oauth2" + "github.com/influxdata/influxdb/chronograf/oauth2" ) func TestAuthenticate(t *testing.T) { diff --git a/chronograf/oauth2/mux.go b/chronograf/oauth2/mux.go index 8e949c60e35..deffa5338ed 100644 --- a/chronograf/oauth2/mux.go +++ b/chronograf/oauth2/mux.go @@ -5,7 +5,7 @@ import ( "path" "time" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" "golang.org/x/oauth2" ) diff --git a/chronograf/oauth2/mux_test.go b/chronograf/oauth2/mux_test.go index 43b74e3b90e..fac12a26696 100644 --- a/chronograf/oauth2/mux_test.go +++ b/chronograf/oauth2/mux_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) var testTime = time.Date(1985, time.October, 25, 18, 0, 0, 0, time.UTC) diff --git a/chronograf/oauth2/oauth2_test.go b/chronograf/oauth2/oauth2_test.go index f79053951a7..5bae9050515 100644 --- a/chronograf/oauth2/oauth2_test.go +++ b/chronograf/oauth2/oauth2_test.go @@ -11,7 +11,7 @@ import ( goauth "golang.org/x/oauth2" gojwt "github.com/dgrijalva/jwt-go" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) var _ Provider = &MockProvider{} diff --git a/chronograf/organizations/dashboards.go b/chronograf/organizations/dashboards.go index 241842b5e95..9a87466e18a 100644 --- a/chronograf/organizations/dashboards.go +++ b/chronograf/organizations/dashboards.go @@ -3,7 +3,7 @@ package organizations import ( "context" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // ensure that DashboardsStore implements chronograf.DashboardStore diff --git a/chronograf/organizations/dashboards_test.go b/chronograf/organizations/dashboards_test.go index 3fa31a97500..63848723eda 100644 --- a/chronograf/organizations/dashboards_test.go +++ b/chronograf/organizations/dashboards_test.go @@ -7,9 +7,9 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/mocks" - "github.com/influxdata/platform/chronograf/organizations" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/mocks" + "github.com/influxdata/influxdb/chronograf/organizations" ) // IgnoreFields is used because ID cannot be predicted reliably diff --git a/chronograf/organizations/org_config.go b/chronograf/organizations/org_config.go index 2d5906616d5..56b0c10e864 100644 --- a/chronograf/organizations/org_config.go +++ b/chronograf/organizations/org_config.go @@ -3,7 +3,7 @@ package organizations import ( "context" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // ensure that OrganizationConfig implements chronograf.OrganizationConfigStore diff --git a/chronograf/organizations/organizations.go b/chronograf/organizations/organizations.go index 00904d23324..42a56ee7bfc 100644 --- a/chronograf/organizations/organizations.go +++ b/chronograf/organizations/organizations.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) type contextKey string diff --git a/chronograf/organizations/organizations_test.go b/chronograf/organizations/organizations_test.go index 689129dbcf5..c00155c2729 100644 --- a/chronograf/organizations/organizations_test.go +++ b/chronograf/organizations/organizations_test.go @@ -7,9 +7,9 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/mocks" - "github.com/influxdata/platform/chronograf/organizations" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/mocks" + "github.com/influxdata/influxdb/chronograf/organizations" ) // IgnoreFields is used because ID cannot be predicted reliably diff --git a/chronograf/organizations/servers.go b/chronograf/organizations/servers.go index e437cdccbf1..7b09ac79dce 100644 --- a/chronograf/organizations/servers.go +++ b/chronograf/organizations/servers.go @@ -3,7 +3,7 @@ package organizations import ( "context" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // ensure that ServersStore implements chronograf.ServerStore diff --git a/chronograf/organizations/servers_test.go b/chronograf/organizations/servers_test.go index ab0dffa00f6..ac612fa25bb 100644 --- a/chronograf/organizations/servers_test.go +++ b/chronograf/organizations/servers_test.go @@ -7,9 +7,9 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/mocks" - "github.com/influxdata/platform/chronograf/organizations" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/mocks" + "github.com/influxdata/influxdb/chronograf/organizations" ) // IgnoreFields is used because ID cannot be predicted reliably diff --git a/chronograf/organizations/sources.go b/chronograf/organizations/sources.go index ee52cd1886f..32b6dfa2c58 100644 --- a/chronograf/organizations/sources.go +++ b/chronograf/organizations/sources.go @@ -3,7 +3,7 @@ package organizations import ( "context" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // ensure that SourcesStore implements chronograf.SourceStore diff --git a/chronograf/organizations/sources_test.go b/chronograf/organizations/sources_test.go index a8cc6ab420e..ab366ed3a85 100644 --- a/chronograf/organizations/sources_test.go +++ b/chronograf/organizations/sources_test.go @@ -7,9 +7,9 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/mocks" - "github.com/influxdata/platform/chronograf/organizations" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/mocks" + "github.com/influxdata/influxdb/chronograf/organizations" ) // IgnoreFields is used because ID cannot be predicted reliably diff --git a/chronograf/organizations/users.go b/chronograf/organizations/users.go index b2706c4dc75..ac0bfd577ae 100644 --- a/chronograf/organizations/users.go +++ b/chronograf/organizations/users.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // Ensure UsersStore implements chronograf.UsersStore. @@ -145,7 +145,7 @@ func (s *UsersStore) Add(ctx context.Context, u *chronograf.User) (*chronograf.U // u.SuperAdmin == true is logically equivalent to u.SuperAdmin, however // it is more clear on a conceptual level to check equality // - // TODO(desa): this should go away with https://github.com/influxdata/platform/chronograf/issues/2207 + // TODO(desa): this should go away with https://github.com/influxdata/influxdb/chronograf/issues/2207 // I do not like checking super admin here. The organization users store should only be // concerned about organizations. // diff --git a/chronograf/organizations/users_test.go b/chronograf/organizations/users_test.go index 25359fe7616..a1f2c5bf47c 100644 --- a/chronograf/organizations/users_test.go +++ b/chronograf/organizations/users_test.go @@ -6,9 +6,9 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/mocks" - "github.com/influxdata/platform/chronograf/organizations" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/mocks" + "github.com/influxdata/influxdb/chronograf/organizations" ) // IgnoreFields is used because ID cannot be predicted reliably diff --git a/chronograf/roles/roles.go b/chronograf/roles/roles.go index 385004de583..ec3b93f66ae 100644 --- a/chronograf/roles/roles.go +++ b/chronograf/roles/roles.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) type contextKey string diff --git a/chronograf/roles/sources.go b/chronograf/roles/sources.go index 550bc17072d..b4e84fcf6a6 100644 --- a/chronograf/roles/sources.go +++ b/chronograf/roles/sources.go @@ -3,13 +3,13 @@ package roles import ( "context" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // NOTE: // This code is currently unused. however, it has been left in place because we aniticipate // that it may be used in the future. It was originally developed as a misunderstanding of -// https://github.com/influxdata/platform/chronograf/issues/1915 +// https://github.com/influxdata/influxdb/chronograf/issues/1915 // ensure that SourcesStore implements chronograf.SourceStore var _ chronograf.SourcesStore = &SourcesStore{} diff --git a/chronograf/roles/sources_test.go b/chronograf/roles/sources_test.go index 7fd68bcb1a6..4b7192dc272 100644 --- a/chronograf/roles/sources_test.go +++ b/chronograf/roles/sources_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/mocks" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/mocks" ) func TestSources_Get(t *testing.T) { diff --git a/chronograf/server/annotations.go b/chronograf/server/annotations.go index 4abddaa13cd..650f4db5b85 100644 --- a/chronograf/server/annotations.go +++ b/chronograf/server/annotations.go @@ -7,8 +7,8 @@ import ( "net/url" "time" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/influx" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/influx" ) const ( diff --git a/chronograf/server/annotations_test.go b/chronograf/server/annotations_test.go index 699a9a50080..dde895e03dc 100644 --- a/chronograf/server/annotations_test.go +++ b/chronograf/server/annotations_test.go @@ -8,8 +8,8 @@ import ( "net/http/httptest" "testing" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/mocks" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/mocks" "github.com/julienschmidt/httprouter" ) diff --git a/chronograf/server/assets.go b/chronograf/server/assets.go index 64cb140fccb..35fa861c0f9 100644 --- a/chronograf/server/assets.go +++ b/chronograf/server/assets.go @@ -3,8 +3,8 @@ package server import ( "net/http" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/dist" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/dist" ) const ( diff --git a/chronograf/server/auth.go b/chronograf/server/auth.go index 3a4996824eb..be3b3606bce 100644 --- a/chronograf/server/auth.go +++ b/chronograf/server/auth.go @@ -5,10 +5,10 @@ import ( "fmt" "net/http" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/oauth2" - "github.com/influxdata/platform/chronograf/organizations" - "github.com/influxdata/platform/chronograf/roles" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/oauth2" + "github.com/influxdata/influxdb/chronograf/organizations" + "github.com/influxdata/influxdb/chronograf/roles" ) // HasAuthorizedToken extracts the token from a request and validates it using the authenticator. @@ -194,7 +194,7 @@ func AuthorizedUser( if hasAuthorizedRole(u, role) { if len(u.Roles) != 1 { - msg := `User %d has too many role in organization. User: %#v.Please report this log at https://github.com/influxdata/platform/chronograf/issues/new"` + msg := `User %d has too many role in organization. User: %#v.Please report this log at https://github.com/influxdata/influxdb/chronograf/issues/new"` log.Error(fmt.Sprint(msg, u.ID, u)) unknownErrorWithMessage(w, fmt.Errorf("please have administrator check logs and report error"), logger) return diff --git a/chronograf/server/auth_test.go b/chronograf/server/auth_test.go index 3432be1f958..0fb1abb60ff 100644 --- a/chronograf/server/auth_test.go +++ b/chronograf/server/auth_test.go @@ -8,10 +8,10 @@ import ( "net/http/httptest" "testing" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/mocks" - "github.com/influxdata/platform/chronograf/oauth2" - "github.com/influxdata/platform/chronograf/roles" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/mocks" + "github.com/influxdata/influxdb/chronograf/oauth2" + "github.com/influxdata/influxdb/chronograf/roles" ) func TestAuthorizedToken(t *testing.T) { diff --git a/chronograf/server/builders.go b/chronograf/server/builders.go index ec837636eda..f10eb3f63aa 100644 --- a/chronograf/server/builders.go +++ b/chronograf/server/builders.go @@ -1,11 +1,11 @@ package server import ( - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/canned" - "github.com/influxdata/platform/chronograf/filestore" - "github.com/influxdata/platform/chronograf/memdb" - "github.com/influxdata/platform/chronograf/multistore" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/canned" + "github.com/influxdata/influxdb/chronograf/filestore" + "github.com/influxdata/influxdb/chronograf/memdb" + "github.com/influxdata/influxdb/chronograf/multistore" ) // LayoutBuilder is responsible for building Layouts diff --git a/chronograf/server/builders_test.go b/chronograf/server/builders_test.go index 521781dddba..72bbfc4f782 100644 --- a/chronograf/server/builders_test.go +++ b/chronograf/server/builders_test.go @@ -3,7 +3,7 @@ package server_test import ( "testing" - "github.com/influxdata/platform/chronograf/server" + "github.com/influxdata/influxdb/chronograf/server" ) func TestLayoutBuilder(t *testing.T) { diff --git a/chronograf/server/cells.go b/chronograf/server/cells.go index 6d2e8cf78d3..916ebbcf3bb 100644 --- a/chronograf/server/cells.go +++ b/chronograf/server/cells.go @@ -5,8 +5,8 @@ import ( "fmt" "net/http" - "github.com/influxdata/platform/chronograf" - idgen "github.com/influxdata/platform/chronograf/id" + "github.com/influxdata/influxdb/chronograf" + idgen "github.com/influxdata/influxdb/chronograf/id" "github.com/julienschmidt/httprouter" ) diff --git a/chronograf/server/cells_test.go b/chronograf/server/cells_test.go index eea3557bd07..c4e5fc3f81a 100644 --- a/chronograf/server/cells_test.go +++ b/chronograf/server/cells_test.go @@ -13,8 +13,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/mocks" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/mocks" "github.com/julienschmidt/httprouter" ) diff --git a/chronograf/server/config.go b/chronograf/server/config.go index 93cb271e310..3747f9bff8b 100644 --- a/chronograf/server/config.go +++ b/chronograf/server/config.go @@ -4,7 +4,7 @@ import ( "encoding/json" "net/http" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) type configLinks struct { diff --git a/chronograf/server/config_test.go b/chronograf/server/config_test.go index abc96cb861d..224dd514b43 100644 --- a/chronograf/server/config_test.go +++ b/chronograf/server/config_test.go @@ -7,8 +7,8 @@ import ( "net/http/httptest" "testing" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/mocks" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/mocks" ) func TestConfig(t *testing.T) { diff --git a/chronograf/server/dashboards.go b/chronograf/server/dashboards.go index e4f87370b39..2ae0618f6cd 100644 --- a/chronograf/server/dashboards.go +++ b/chronograf/server/dashboards.go @@ -5,7 +5,7 @@ import ( "fmt" "net/http" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) type dashboardLinks struct { diff --git a/chronograf/server/dashboards_test.go b/chronograf/server/dashboards_test.go index d2d489d3f19..c74110a475e 100644 --- a/chronograf/server/dashboards_test.go +++ b/chronograf/server/dashboards_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) func TestCorrectWidthHeight(t *testing.T) { diff --git a/chronograf/server/databases.go b/chronograf/server/databases.go index 0c3bceb6476..577ff431d99 100644 --- a/chronograf/server/databases.go +++ b/chronograf/server/databases.go @@ -8,7 +8,7 @@ import ( "net/url" "strconv" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" "github.com/julienschmidt/httprouter" ) diff --git a/chronograf/server/databases_test.go b/chronograf/server/databases_test.go index 0a7b384adcc..c625c98e640 100644 --- a/chronograf/server/databases_test.go +++ b/chronograf/server/databases_test.go @@ -8,8 +8,8 @@ import ( "net/http/httptest" "testing" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/mocks" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/mocks" "github.com/julienschmidt/httprouter" ) diff --git a/chronograf/server/env.go b/chronograf/server/env.go index 30397dabe22..b1956947492 100644 --- a/chronograf/server/env.go +++ b/chronograf/server/env.go @@ -3,7 +3,7 @@ package server import ( "net/http" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) type envResponse struct { diff --git a/chronograf/server/env_test.go b/chronograf/server/env_test.go index b7f986ffc7d..3e39c7c6be5 100644 --- a/chronograf/server/env_test.go +++ b/chronograf/server/env_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) func TestEnvironment(t *testing.T) { diff --git a/chronograf/server/influx.go b/chronograf/server/influx.go index fda0deb2d83..212cad2b6a5 100644 --- a/chronograf/server/influx.go +++ b/chronograf/server/influx.go @@ -10,8 +10,8 @@ import ( "net/url" "time" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/influx" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/influx" ) // ValidInfluxRequest checks if queries specify a command. diff --git a/chronograf/server/influx_test.go b/chronograf/server/influx_test.go index 42458730696..e4318877e11 100644 --- a/chronograf/server/influx_test.go +++ b/chronograf/server/influx_test.go @@ -8,11 +8,9 @@ import ( "net/http/httptest" "testing" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/mocks" "github.com/julienschmidt/httprouter" - - "github.com/influxdata/platform/chronograf/mocks" - - "github.com/influxdata/platform/chronograf" ) func TestService_Influx(t *testing.T) { diff --git a/chronograf/server/layout.go b/chronograf/server/layout.go index 2f13c056a71..6869951ba55 100644 --- a/chronograf/server/layout.go +++ b/chronograf/server/layout.go @@ -5,7 +5,7 @@ import ( "net/http" "github.com/bouk/httprouter" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) type link struct { diff --git a/chronograf/server/layout_test.go b/chronograf/server/layout_test.go index bed4ac696d1..056f050fd32 100644 --- a/chronograf/server/layout_test.go +++ b/chronograf/server/layout_test.go @@ -9,9 +9,9 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/mocks" - "github.com/influxdata/platform/chronograf/server" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/mocks" + "github.com/influxdata/influxdb/chronograf/server" ) func Test_Layouts(t *testing.T) { diff --git a/chronograf/server/logger.go b/chronograf/server/logger.go index fec76feafba..a7b74ec6314 100644 --- a/chronograf/server/logger.go +++ b/chronograf/server/logger.go @@ -4,7 +4,7 @@ import ( "net/http" "time" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // statusWriterFlusher captures the status header of an http.ResponseWriter diff --git a/chronograf/server/mapping.go b/chronograf/server/mapping.go index 765698036e5..ed9765f8131 100644 --- a/chronograf/server/mapping.go +++ b/chronograf/server/mapping.go @@ -9,8 +9,8 @@ import ( "strings" "github.com/bouk/httprouter" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/oauth2" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/oauth2" ) func (s *Service) mapPrincipalToSuperAdmin(p oauth2.Principal) bool { diff --git a/chronograf/server/mapping_test.go b/chronograf/server/mapping_test.go index 1e17cb65a07..3cba9b88bff 100644 --- a/chronograf/server/mapping_test.go +++ b/chronograf/server/mapping_test.go @@ -9,9 +9,9 @@ import ( "testing" "github.com/bouk/httprouter" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/mocks" - "github.com/influxdata/platform/chronograf/roles" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/mocks" + "github.com/influxdata/influxdb/chronograf/roles" ) func TestMappings_All(t *testing.T) { diff --git a/chronograf/server/me.go b/chronograf/server/me.go index 4525e593b98..9ee532cd01a 100644 --- a/chronograf/server/me.go +++ b/chronograf/server/me.go @@ -6,11 +6,10 @@ import ( "net/http" "sort" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/oauth2" + "github.com/influxdata/influxdb/chronograf/organizations" "golang.org/x/net/context" - - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/oauth2" - "github.com/influxdata/platform/chronograf/organizations" ) type meLinks struct { diff --git a/chronograf/server/me_test.go b/chronograf/server/me_test.go index 9b920f5ab52..881471de713 100644 --- a/chronograf/server/me_test.go +++ b/chronograf/server/me_test.go @@ -10,10 +10,10 @@ import ( "net/http/httptest" "testing" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/mocks" - "github.com/influxdata/platform/chronograf/oauth2" - "github.com/influxdata/platform/chronograf/roles" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/mocks" + "github.com/influxdata/influxdb/chronograf/oauth2" + "github.com/influxdata/influxdb/chronograf/roles" ) func TestService_Me(t *testing.T) { diff --git a/chronograf/server/middle.go b/chronograf/server/middle.go index 82d1577cbd5..d148878f871 100644 --- a/chronograf/server/middle.go +++ b/chronograf/server/middle.go @@ -4,7 +4,7 @@ import ( "net/http" "github.com/bouk/httprouter" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // RouteMatchesPrincipal checks that the organization on context matches the organization diff --git a/chronograf/server/middle_test.go b/chronograf/server/middle_test.go index a4f203a6a12..376337378c0 100644 --- a/chronograf/server/middle_test.go +++ b/chronograf/server/middle_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/bouk/httprouter" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/mocks" - "github.com/influxdata/platform/chronograf/oauth2" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/mocks" + "github.com/influxdata/influxdb/chronograf/oauth2" ) func TestRouteMatchesPrincipal(t *testing.T) { diff --git a/chronograf/server/mountable_router.go b/chronograf/server/mountable_router.go index 1048f226e59..d985c5097e8 100644 --- a/chronograf/server/mountable_router.go +++ b/chronograf/server/mountable_router.go @@ -4,7 +4,7 @@ import ( "net/http" libpath "path" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) var _ chronograf.Router = &MountableRouter{} diff --git a/chronograf/server/mountable_router_test.go b/chronograf/server/mountable_router_test.go index dc3c55b4df2..6904b9dac80 100644 --- a/chronograf/server/mountable_router_test.go +++ b/chronograf/server/mountable_router_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/bouk/httprouter" - "github.com/influxdata/platform/chronograf/server" + "github.com/influxdata/influxdb/chronograf/server" ) func Test_MountableRouter_MountsRoutesUnderPrefix(t *testing.T) { diff --git a/chronograf/server/mux.go b/chronograf/server/mux.go index 98333cc1d98..e46a9b7f99d 100644 --- a/chronograf/server/mux.go +++ b/chronograf/server/mux.go @@ -12,9 +12,9 @@ import ( "github.com/NYTimes/gziphandler" "github.com/bouk/httprouter" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/oauth2" - "github.com/influxdata/platform/chronograf/roles" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/oauth2" + "github.com/influxdata/influxdb/chronograf/roles" jhttprouter "github.com/julienschmidt/httprouter" ) diff --git a/chronograf/server/org_config.go b/chronograf/server/org_config.go index b668ae5708f..fc354698cd0 100644 --- a/chronograf/server/org_config.go +++ b/chronograf/server/org_config.go @@ -5,7 +5,7 @@ import ( "fmt" "net/http" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) type organizationConfigLinks struct { diff --git a/chronograf/server/org_config_test.go b/chronograf/server/org_config_test.go index 398583e196b..613de26033b 100644 --- a/chronograf/server/org_config_test.go +++ b/chronograf/server/org_config_test.go @@ -8,9 +8,9 @@ import ( "net/http/httptest" "testing" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/mocks" - "github.com/influxdata/platform/chronograf/organizations" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/mocks" + "github.com/influxdata/influxdb/chronograf/organizations" ) func TestOrganizationConfig(t *testing.T) { diff --git a/chronograf/server/organizations.go b/chronograf/server/organizations.go index 418ebbf640b..f3d543873df 100644 --- a/chronograf/server/organizations.go +++ b/chronograf/server/organizations.go @@ -7,9 +7,9 @@ import ( "net/http" "github.com/bouk/httprouter" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/organizations" - "github.com/influxdata/platform/chronograf/roles" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/organizations" + "github.com/influxdata/influxdb/chronograf/roles" ) type organizationRequest struct { diff --git a/chronograf/server/organizations_test.go b/chronograf/server/organizations_test.go index 3a2b5062dd6..227668c800a 100644 --- a/chronograf/server/organizations_test.go +++ b/chronograf/server/organizations_test.go @@ -11,9 +11,9 @@ import ( "testing" "github.com/bouk/httprouter" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/mocks" - "github.com/influxdata/platform/chronograf/roles" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/mocks" + "github.com/influxdata/influxdb/chronograf/roles" ) func TestService_OrganizationID(t *testing.T) { diff --git a/chronograf/server/permissions.go b/chronograf/server/permissions.go index 3328e5993c1..1df20baca98 100644 --- a/chronograf/server/permissions.go +++ b/chronograf/server/permissions.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // Permissions returns all possible permissions for this source. diff --git a/chronograf/server/permissions_test.go b/chronograf/server/permissions_test.go index c59d54346bc..ae7331da6e8 100644 --- a/chronograf/server/permissions_test.go +++ b/chronograf/server/permissions_test.go @@ -8,8 +8,8 @@ import ( "net/http/httptest" "testing" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/mocks" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/mocks" "github.com/julienschmidt/httprouter" ) diff --git a/chronograf/server/queries.go b/chronograf/server/queries.go index 8a48b29927d..ec9444f559d 100644 --- a/chronograf/server/queries.go +++ b/chronograf/server/queries.go @@ -8,9 +8,9 @@ import ( "golang.org/x/net/context" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/influx" - "github.com/influxdata/platform/chronograf/influx/queries" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/influx" + "github.com/influxdata/influxdb/chronograf/influx/queries" ) // QueryRequest is query that will be converted to a queryConfig diff --git a/chronograf/server/queries_test.go b/chronograf/server/queries_test.go index f4bbc4ac00f..406443118af 100644 --- a/chronograf/server/queries_test.go +++ b/chronograf/server/queries_test.go @@ -7,8 +7,8 @@ import ( "net/http/httptest" "testing" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/mocks" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/mocks" "github.com/julienschmidt/httprouter" ) diff --git a/chronograf/server/queryconfig.go b/chronograf/server/queryconfig.go index 15b33c70d6b..0795f854944 100644 --- a/chronograf/server/queryconfig.go +++ b/chronograf/server/queryconfig.go @@ -3,8 +3,8 @@ package server import ( "fmt" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/influx" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/influx" ) // ToQueryConfig converts InfluxQL into queryconfigs diff --git a/chronograf/server/queryconfig_test.go b/chronograf/server/queryconfig_test.go index 1ee33338d01..b486f6545e6 100644 --- a/chronograf/server/queryconfig_test.go +++ b/chronograf/server/queryconfig_test.go @@ -3,7 +3,7 @@ package server import ( "testing" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) func TestValidateQueryConfig(t *testing.T) { diff --git a/chronograf/server/routes.go b/chronograf/server/routes.go index 659b3e2292d..2ac3ce94b3f 100644 --- a/chronograf/server/routes.go +++ b/chronograf/server/routes.go @@ -4,8 +4,8 @@ import ( "fmt" "net/http" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/oauth2" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/oauth2" ) // AuthRoute are the routes for each type of OAuth2 provider diff --git a/chronograf/server/routes_test.go b/chronograf/server/routes_test.go index 9b366ff6875..076ff5e3661 100644 --- a/chronograf/server/routes_test.go +++ b/chronograf/server/routes_test.go @@ -6,7 +6,7 @@ import ( "net/http/httptest" "testing" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) func TestAllRoutes(t *testing.T) { diff --git a/chronograf/server/server.go b/chronograf/server/server.go index 84f491a0bb2..8395c849d33 100644 --- a/chronograf/server/server.go +++ b/chronograf/server/server.go @@ -17,11 +17,11 @@ import ( "time" bbolt "github.com/coreos/bbolt" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/bolt" - idgen "github.com/influxdata/platform/chronograf/id" - "github.com/influxdata/platform/chronograf/influx" - "github.com/influxdata/platform/chronograf/oauth2" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/bolt" + idgen "github.com/influxdata/influxdb/chronograf/id" + "github.com/influxdata/influxdb/chronograf/influx" + "github.com/influxdata/influxdb/chronograf/oauth2" client "github.com/influxdata/usage-client/v1" flags "github.com/jessevdk/go-flags" "github.com/tylerb/graceful" @@ -94,7 +94,7 @@ type Server struct { Auth0SuperAdminOrg string `long:"auth0-superadmin-org" description:"Auth0 organization from which users are automatically granted SuperAdmin status" env:"AUTH0_SUPERADMIN_ORG"` StatusFeedURL string `long:"status-feed-url" description:"URL of a JSON Feed to display as a News Feed on the client Status page." default:"https://www.influxdata.com/feed/json" env:"STATUS_FEED_URL"` - CustomLinks map[string]string `long:"custom-link" description:"Custom link to be added to the client User menu. Multiple links can be added by using multiple of the same flag with different 'name:url' values, or as an environment variable with comma-separated 'name:url' values. E.g. via flags: '--custom-link=InfluxData:https://www.influxdata.com --custom-link=Chronograf:https://github.com/influxdata/platform/chronograf'. E.g. via environment variable: 'export CUSTOM_LINKS=InfluxData:https://www.influxdata.com,Chronograf:https://github.com/influxdata/platform/chronograf'" env:"CUSTOM_LINKS" env-delim:","` + CustomLinks map[string]string `long:"custom-link" description:"Custom link to be added to the client User menu. Multiple links can be added by using multiple of the same flag with different 'name:url' values, or as an environment variable with comma-separated 'name:url' values. E.g. via flags: '--custom-link=InfluxData:https://www.influxdata.com --custom-link=Chronograf:https://github.com/influxdata/influxdb/chronograf'. E.g. via environment variable: 'export CUSTOM_LINKS=InfluxData:https://www.influxdata.com,Chronograf:https://github.com/influxdata/influxdb/chronograf'" env:"CUSTOM_LINKS" env-delim:","` TelegrafSystemInterval time.Duration `long:"telegraf-system-interval" default:"1m" description:"Duration used in the GROUP BY time interval for the hosts list" env:"TELEGRAF_SYSTEM_INTERVAL"` ReportingDisabled bool `short:"r" long:"reporting-disabled" description:"Disable reporting of usage stats (os,arch,version,cluster_id,uptime) once every 24hr" env:"REPORTING_DISABLED"` diff --git a/chronograf/server/service.go b/chronograf/server/service.go index dc335e747c3..fd5a3a07288 100644 --- a/chronograf/server/service.go +++ b/chronograf/server/service.go @@ -4,9 +4,9 @@ import ( "context" "strings" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/enterprise" - "github.com/influxdata/platform/chronograf/influx" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/enterprise" + "github.com/influxdata/influxdb/chronograf/influx" ) // Service handles REST calls to the persistence diff --git a/chronograf/server/services.go b/chronograf/server/services.go index 02dfea94f14..c12ed5650a8 100644 --- a/chronograf/server/services.go +++ b/chronograf/server/services.go @@ -7,8 +7,8 @@ import ( "net/http" "net/url" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/flux" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/flux" ) type postServiceRequest struct { diff --git a/chronograf/server/sources.go b/chronograf/server/sources.go index 8c9a3ca6931..19a53e06d2f 100644 --- a/chronograf/server/sources.go +++ b/chronograf/server/sources.go @@ -7,12 +7,11 @@ import ( "net/http" "net/url" - "github.com/influxdata/platform/chronograf/enterprise" - "github.com/influxdata/platform/chronograf/organizations" - "github.com/bouk/httprouter" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/influx" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/enterprise" + "github.com/influxdata/influxdb/chronograf/influx" + "github.com/influxdata/influxdb/chronograf/organizations" ) type sourceLinks struct { diff --git a/chronograf/server/sources_test.go b/chronograf/server/sources_test.go index 984c4171201..f1eeb5da015 100644 --- a/chronograf/server/sources_test.go +++ b/chronograf/server/sources_test.go @@ -11,8 +11,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/mocks" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/mocks" "github.com/julienschmidt/httprouter" ) diff --git a/chronograf/server/stores.go b/chronograf/server/stores.go index 4404304269e..90ebe307b2b 100644 --- a/chronograf/server/stores.go +++ b/chronograf/server/stores.go @@ -3,10 +3,10 @@ package server import ( "context" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/noop" - "github.com/influxdata/platform/chronograf/organizations" - "github.com/influxdata/platform/chronograf/roles" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/noop" + "github.com/influxdata/influxdb/chronograf/organizations" + "github.com/influxdata/influxdb/chronograf/roles" ) // hasOrganizationContext retrieves organization specified on context diff --git a/chronograf/server/stores_test.go b/chronograf/server/stores_test.go index 7e0cd8fc462..fe6d471f0ff 100644 --- a/chronograf/server/stores_test.go +++ b/chronograf/server/stores_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/mocks" - "github.com/influxdata/platform/chronograf/organizations" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/mocks" + "github.com/influxdata/influxdb/chronograf/organizations" ) func TestStore_SourcesGet(t *testing.T) { diff --git a/chronograf/server/templates.go b/chronograf/server/templates.go index 21a38a2f317..b5dd151a48b 100644 --- a/chronograf/server/templates.go +++ b/chronograf/server/templates.go @@ -6,8 +6,8 @@ import ( "net/http" "github.com/bouk/httprouter" - "github.com/influxdata/platform/chronograf" - idgen "github.com/influxdata/platform/chronograf/id" + "github.com/influxdata/influxdb/chronograf" + idgen "github.com/influxdata/influxdb/chronograf/id" ) // ValidTemplateRequest checks if the request sent to the server is the correct format. diff --git a/chronograf/server/templates_test.go b/chronograf/server/templates_test.go index cc14e53d10c..30ff6d5a0a5 100644 --- a/chronograf/server/templates_test.go +++ b/chronograf/server/templates_test.go @@ -3,7 +3,7 @@ package server import ( "testing" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) func TestValidTemplateRequest(t *testing.T) { diff --git a/chronograf/server/url_prefixer.go b/chronograf/server/url_prefixer.go index 4ce593d230b..0baae6c9f02 100644 --- a/chronograf/server/url_prefixer.go +++ b/chronograf/server/url_prefixer.go @@ -7,7 +7,7 @@ import ( "net/http" "regexp" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) const ( diff --git a/chronograf/server/url_prefixer_test.go b/chronograf/server/url_prefixer_test.go index 6db8870b88c..824989f6fa5 100644 --- a/chronograf/server/url_prefixer_test.go +++ b/chronograf/server/url_prefixer_test.go @@ -7,8 +7,8 @@ import ( "net/http/httptest" "testing" - "github.com/influxdata/platform/chronograf/mocks" - "github.com/influxdata/platform/chronograf/server" + "github.com/influxdata/influxdb/chronograf/mocks" + "github.com/influxdata/influxdb/chronograf/server" ) var prefixerTests = []struct { diff --git a/chronograf/server/users.go b/chronograf/server/users.go index 44e4bb7b40f..a674bed7d3b 100644 --- a/chronograf/server/users.go +++ b/chronograf/server/users.go @@ -9,8 +9,8 @@ import ( "strconv" "github.com/bouk/httprouter" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/roles" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/roles" ) type userRequest struct { @@ -350,13 +350,13 @@ func setSuperAdmin(ctx context.Context, req userRequest, user *chronograf.User) // changes were requested. // Only allow users to set SuperAdmin if they have the superadmin context - // TODO(desa): Refactor this https://github.com/influxdata/platform/chronograf/issues/2207 + // TODO(desa): Refactor this https://github.com/influxdata/influxdb/chronograf/issues/2207 if isSuperAdmin := hasSuperAdminContext(ctx); isSuperAdmin { user.SuperAdmin = req.SuperAdmin } else if !isSuperAdmin && (user.SuperAdmin != req.SuperAdmin) { // If req.SuperAdmin has been set, and the request was not made with the SuperAdmin // context, return error - return fmt.Errorf("user does not have authorization required to set SuperAdmin status. See https://github.com/influxdata/platform/chronograf/issues/2601 for more information") + return fmt.Errorf("user does not have authorization required to set SuperAdmin status. See https://github.com/influxdata/influxdb/chronograf/issues/2601 for more information") } return nil diff --git a/chronograf/server/users_test.go b/chronograf/server/users_test.go index 7ba4dd7f89d..900b53da3cc 100644 --- a/chronograf/server/users_test.go +++ b/chronograf/server/users_test.go @@ -11,9 +11,9 @@ import ( "testing" "github.com/bouk/httprouter" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/mocks" - "github.com/influxdata/platform/chronograf/roles" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/mocks" + "github.com/influxdata/influxdb/chronograf/roles" ) func TestService_UserID(t *testing.T) { @@ -353,7 +353,7 @@ func TestService_NewUser(t *testing.T) { }, wantStatus: http.StatusUnauthorized, wantContentType: "application/json", - wantBody: `{"code":401,"message":"user does not have authorization required to set SuperAdmin status. See https://github.com/influxdata/platform/chronograf/issues/2601 for more information"}`, + wantBody: `{"code":401,"message":"user does not have authorization required to set SuperAdmin status. See https://github.com/influxdata/influxdb/chronograf/issues/2601 for more information"}`, }, { name: "Create a new SuperAdmin User - as superadmin", @@ -1263,7 +1263,7 @@ func TestService_UpdateUser(t *testing.T) { id: "1336", wantStatus: http.StatusUnauthorized, wantContentType: "application/json", - wantBody: `{"code":401,"message":"user does not have authorization required to set SuperAdmin status. See https://github.com/influxdata/platform/chronograf/issues/2601 for more information"}`, + wantBody: `{"code":401,"message":"user does not have authorization required to set SuperAdmin status. See https://github.com/influxdata/influxdb/chronograf/issues/2601 for more information"}`, }, { name: "Update a Chronograf user to super admin - with super admin context", diff --git a/cmd/influx/authorization.go b/cmd/influx/authorization.go index a55693c8b30..66261d621dd 100644 --- a/cmd/influx/authorization.go +++ b/cmd/influx/authorization.go @@ -4,11 +4,11 @@ import ( "context" "os" - "github.com/influxdata/platform" - "github.com/influxdata/platform/bolt" - "github.com/influxdata/platform/cmd/influx/internal" - "github.com/influxdata/platform/http" - "github.com/influxdata/platform/internal/fs" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/bolt" + "github.com/influxdata/influxdb/cmd/influx/internal" + "github.com/influxdata/influxdb/http" + "github.com/influxdata/influxdb/internal/fs" "github.com/spf13/cobra" ) diff --git a/cmd/influx/bucket.go b/cmd/influx/bucket.go index c86425b8a71..d2215691591 100644 --- a/cmd/influx/bucket.go +++ b/cmd/influx/bucket.go @@ -6,11 +6,11 @@ import ( "os" "time" - "github.com/influxdata/platform" - "github.com/influxdata/platform/bolt" - "github.com/influxdata/platform/cmd/influx/internal" - "github.com/influxdata/platform/http" - "github.com/influxdata/platform/internal/fs" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/bolt" + "github.com/influxdata/influxdb/cmd/influx/internal" + "github.com/influxdata/influxdb/http" + "github.com/influxdata/influxdb/internal/fs" "github.com/spf13/cobra" ) diff --git a/cmd/influx/internal/tabwriter.go b/cmd/influx/internal/tabwriter.go index f463f88822b..b8545267109 100644 --- a/cmd/influx/internal/tabwriter.go +++ b/cmd/influx/internal/tabwriter.go @@ -6,7 +6,7 @@ import ( "strings" "text/tabwriter" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) type tabWriter struct { diff --git a/cmd/influx/main.go b/cmd/influx/main.go index a2522450b2a..ccf89fe87c7 100644 --- a/cmd/influx/main.go +++ b/cmd/influx/main.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "github.com/influxdata/platform/internal/fs" + "github.com/influxdata/influxdb/internal/fs" "github.com/spf13/cobra" "github.com/spf13/viper" ) diff --git a/cmd/influx/organization.go b/cmd/influx/organization.go index 49bbae7c96c..1a7b337924c 100644 --- a/cmd/influx/organization.go +++ b/cmd/influx/organization.go @@ -5,11 +5,11 @@ import ( "fmt" "os" - "github.com/influxdata/platform" - "github.com/influxdata/platform/bolt" - "github.com/influxdata/platform/cmd/influx/internal" - "github.com/influxdata/platform/http" - "github.com/influxdata/platform/internal/fs" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/bolt" + "github.com/influxdata/influxdb/cmd/influx/internal" + "github.com/influxdata/influxdb/http" + "github.com/influxdata/influxdb/internal/fs" "github.com/spf13/cobra" ) diff --git a/cmd/influx/query.go b/cmd/influx/query.go index e68482602cb..1806e0efc88 100644 --- a/cmd/influx/query.go +++ b/cmd/influx/query.go @@ -5,8 +5,8 @@ import ( "os" "github.com/influxdata/flux/repl" - "github.com/influxdata/platform" - _ "github.com/influxdata/platform/query/builtin" + platform "github.com/influxdata/influxdb" + _ "github.com/influxdata/influxdb/query/builtin" "github.com/spf13/cobra" "github.com/spf13/viper" ) diff --git a/cmd/influx/repl.go b/cmd/influx/repl.go index b718722d26e..9ab13c2b975 100644 --- a/cmd/influx/repl.go +++ b/cmd/influx/repl.go @@ -6,10 +6,10 @@ import ( "os" "github.com/influxdata/flux/repl" - "github.com/influxdata/platform" - "github.com/influxdata/platform/http" - "github.com/influxdata/platform/query" - _ "github.com/influxdata/platform/query/builtin" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/http" + "github.com/influxdata/influxdb/query" + _ "github.com/influxdata/influxdb/query/builtin" "github.com/spf13/cobra" "github.com/spf13/viper" ) diff --git a/cmd/influx/setup.go b/cmd/influx/setup.go index b7437d8a30f..7da166ade5d 100644 --- a/cmd/influx/setup.go +++ b/cmd/influx/setup.go @@ -7,9 +7,9 @@ import ( "strconv" "strings" - "github.com/influxdata/platform" - "github.com/influxdata/platform/cmd/influx/internal" - "github.com/influxdata/platform/http" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/cmd/influx/internal" + "github.com/influxdata/influxdb/http" "github.com/spf13/cobra" input "github.com/tcnksm/go-input" ) diff --git a/cmd/influx/task.go b/cmd/influx/task.go index 6481530dd65..723d7e6126a 100644 --- a/cmd/influx/task.go +++ b/cmd/influx/task.go @@ -6,9 +6,9 @@ import ( "os" "github.com/influxdata/flux/repl" - "github.com/influxdata/platform" - "github.com/influxdata/platform/cmd/influx/internal" - "github.com/influxdata/platform/http" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/cmd/influx/internal" + "github.com/influxdata/influxdb/http" "github.com/spf13/cobra" ) diff --git a/cmd/influx/user.go b/cmd/influx/user.go index d31ab16ee52..d0c6f3f7213 100644 --- a/cmd/influx/user.go +++ b/cmd/influx/user.go @@ -5,11 +5,11 @@ import ( "fmt" "os" - "github.com/influxdata/platform" - "github.com/influxdata/platform/bolt" - "github.com/influxdata/platform/cmd/influx/internal" - "github.com/influxdata/platform/http" - "github.com/influxdata/platform/internal/fs" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/bolt" + "github.com/influxdata/influxdb/cmd/influx/internal" + "github.com/influxdata/influxdb/http" + "github.com/influxdata/influxdb/internal/fs" "github.com/spf13/cobra" ) diff --git a/cmd/influx/write.go b/cmd/influx/write.go index da0d8318fab..845c8d93c14 100644 --- a/cmd/influx/write.go +++ b/cmd/influx/write.go @@ -7,11 +7,11 @@ import ( "os" "strings" - "github.com/influxdata/platform" - "github.com/influxdata/platform/http" - "github.com/influxdata/platform/kit/signals" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/write" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/http" + "github.com/influxdata/influxdb/kit/signals" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/write" "github.com/spf13/cobra" "github.com/spf13/viper" ) diff --git a/cmd/influx_inspect/buildtsi/buildtsi.go b/cmd/influx_inspect/buildtsi/buildtsi.go index f3c54c9b45f..db67fbe4072 100644 --- a/cmd/influx_inspect/buildtsi/buildtsi.go +++ b/cmd/influx_inspect/buildtsi/buildtsi.go @@ -14,13 +14,13 @@ import ( "strings" "sync/atomic" - "github.com/influxdata/platform/logger" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/storage" - "github.com/influxdata/platform/toml" - "github.com/influxdata/platform/tsdb" - "github.com/influxdata/platform/tsdb/tsi1" - "github.com/influxdata/platform/tsdb/tsm1" + "github.com/influxdata/influxdb/logger" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/storage" + "github.com/influxdata/influxdb/toml" + "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/tsdb/tsi1" + "github.com/influxdata/influxdb/tsdb/tsm1" "go.uber.org/zap" ) diff --git a/cmd/influxd/launcher/launcher.go b/cmd/influxd/launcher/launcher.go index 2c38423a5af..727dcd6a0c2 100644 --- a/cmd/influxd/launcher/launcher.go +++ b/cmd/influxd/launcher/launcher.go @@ -14,32 +14,32 @@ import ( "github.com/influxdata/flux/control" "github.com/influxdata/flux/execute" - "github.com/influxdata/platform" - "github.com/influxdata/platform/bolt" - "github.com/influxdata/platform/chronograf/server" - protofs "github.com/influxdata/platform/fs" - "github.com/influxdata/platform/gather" - "github.com/influxdata/platform/http" - "github.com/influxdata/platform/internal/fs" - "github.com/influxdata/platform/kit/cli" - "github.com/influxdata/platform/kit/prom" - influxlogger "github.com/influxdata/platform/logger" - "github.com/influxdata/platform/nats" - "github.com/influxdata/platform/query" - pcontrol "github.com/influxdata/platform/query/control" - "github.com/influxdata/platform/snowflake" - "github.com/influxdata/platform/source" - "github.com/influxdata/platform/storage" - "github.com/influxdata/platform/storage/readservice" - "github.com/influxdata/platform/task" - taskbackend "github.com/influxdata/platform/task/backend" - taskbolt "github.com/influxdata/platform/task/backend/bolt" - "github.com/influxdata/platform/task/backend/coordinator" - taskexecutor "github.com/influxdata/platform/task/backend/executor" - _ "github.com/influxdata/platform/tsdb/tsi1" - _ "github.com/influxdata/platform/tsdb/tsm1" - "github.com/influxdata/platform/vault" - pzap "github.com/influxdata/platform/zap" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/bolt" + "github.com/influxdata/influxdb/chronograf/server" + protofs "github.com/influxdata/influxdb/fs" + "github.com/influxdata/influxdb/gather" + "github.com/influxdata/influxdb/http" + "github.com/influxdata/influxdb/internal/fs" + "github.com/influxdata/influxdb/kit/cli" + "github.com/influxdata/influxdb/kit/prom" + influxlogger "github.com/influxdata/influxdb/logger" + "github.com/influxdata/influxdb/nats" + "github.com/influxdata/influxdb/query" + pcontrol "github.com/influxdata/influxdb/query/control" + "github.com/influxdata/influxdb/snowflake" + "github.com/influxdata/influxdb/source" + "github.com/influxdata/influxdb/storage" + "github.com/influxdata/influxdb/storage/readservice" + "github.com/influxdata/influxdb/task" + taskbackend "github.com/influxdata/influxdb/task/backend" + taskbolt "github.com/influxdata/influxdb/task/backend/bolt" + "github.com/influxdata/influxdb/task/backend/coordinator" + taskexecutor "github.com/influxdata/influxdb/task/backend/executor" + _ "github.com/influxdata/influxdb/tsdb/tsi1" + _ "github.com/influxdata/influxdb/tsdb/tsm1" + "github.com/influxdata/influxdb/vault" + pzap "github.com/influxdata/influxdb/zap" opentracing "github.com/opentracing/opentracing-go" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" diff --git a/cmd/influxd/launcher/launcher_test.go b/cmd/influxd/launcher/launcher_test.go index 49f74ff36fb..fe5171e041e 100644 --- a/cmd/influxd/launcher/launcher_test.go +++ b/cmd/influxd/launcher/launcher_test.go @@ -12,11 +12,10 @@ import ( "strings" "testing" - "github.com/influxdata/platform/cmd/influxd/launcher" - "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform" - "github.com/influxdata/platform/http" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/cmd/influxd/launcher" + "github.com/influxdata/influxdb/http" ) // Default context. diff --git a/cmd/influxd/main.go b/cmd/influxd/main.go index 2aabb5caca8..6f2be5a3542 100644 --- a/cmd/influxd/main.go +++ b/cmd/influxd/main.go @@ -7,11 +7,11 @@ import ( "os" "time" - "github.com/influxdata/platform/cmd/influxd/launcher" - "github.com/influxdata/platform/kit/signals" - _ "github.com/influxdata/platform/query/builtin" - _ "github.com/influxdata/platform/tsdb/tsi1" - _ "github.com/influxdata/platform/tsdb/tsm1" + "github.com/influxdata/influxdb/cmd/influxd/launcher" + "github.com/influxdata/influxdb/kit/signals" + _ "github.com/influxdata/influxdb/query/builtin" + _ "github.com/influxdata/influxdb/tsdb/tsi1" + _ "github.com/influxdata/influxdb/tsdb/tsm1" ) func main() { diff --git a/context/token.go b/context/token.go index 305ce2229b3..a7ba7aa576b 100644 --- a/context/token.go +++ b/context/token.go @@ -3,7 +3,7 @@ package context import ( "context" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) type contextKey string diff --git a/dashboard.go b/dashboard.go index 4c655e40aa6..ccd1b95f7de 100644 --- a/dashboard.go +++ b/dashboard.go @@ -1,4 +1,4 @@ -package platform +package influxdb import ( "context" diff --git a/dbrp_mapping.go b/dbrp_mapping.go index 7742ec8f8f3..23c5406e9ce 100644 --- a/dbrp_mapping.go +++ b/dbrp_mapping.go @@ -1,4 +1,4 @@ -package platform +package influxdb import ( "context" diff --git a/dbrp_mapping_internal_test.go b/dbrp_mapping_internal_test.go index 1f75afabfd1..2fd0a3606eb 100644 --- a/dbrp_mapping_internal_test.go +++ b/dbrp_mapping_internal_test.go @@ -1,4 +1,4 @@ -package platform +package influxdb import ( "testing" diff --git a/dbrp_mapping_test.go b/dbrp_mapping_test.go index 7d9dbaa2783..811b37ec073 100644 --- a/dbrp_mapping_test.go +++ b/dbrp_mapping_test.go @@ -1,10 +1,10 @@ -package platform_test +package influxdb_test import ( "testing" - "github.com/influxdata/platform" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + platformtesting "github.com/influxdata/influxdb/testing" ) func TestDBRPMapping_Validate(t *testing.T) { diff --git a/error.go b/error.go index 17c4920775f..42c34a1d14a 100644 --- a/error.go +++ b/error.go @@ -1,4 +1,4 @@ -package platform +package influxdb // ChronografError is a domain error encountered while processing chronograf requests. type ChronografError string diff --git a/errors.go b/errors.go index 440586288b4..86167c4ca11 100644 --- a/errors.go +++ b/errors.go @@ -1,4 +1,4 @@ -package platform +package influxdb import ( "encoding/json" diff --git a/errors_test.go b/errors_test.go index 86235c12a74..577d9ef617f 100644 --- a/errors_test.go +++ b/errors_test.go @@ -1,4 +1,4 @@ -package platform_test +package influxdb_test import ( "encoding/json" @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) const EFailedToGetStorageHost = "failed to get the storage host" diff --git a/example_test.go b/example_test.go index 7422a6bcba5..a1563911827 100644 --- a/example_test.go +++ b/example_test.go @@ -1,12 +1,12 @@ -package platform_test +package influxdb_test import ( "context" "fmt" "time" - "github.com/influxdata/platform" - "github.com/influxdata/platform/bolt" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/bolt" ) func ExampleKeyValueLog() { diff --git a/flux/client.go b/flux/client.go index 4f6a1ae75e4..07ad9a463b1 100644 --- a/flux/client.go +++ b/flux/client.go @@ -9,7 +9,7 @@ import ( "net/url" "time" - "github.com/influxdata/platform/chronograf" + "github.com/influxdata/influxdb/chronograf" ) // Shared transports for all clients to prevent leaking connections. diff --git a/fs/proto.go b/fs/proto.go index a73b8e49bf8..2b37cd33789 100644 --- a/fs/proto.go +++ b/fs/proto.go @@ -9,7 +9,7 @@ import ( "path" "path/filepath" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" "go.uber.org/zap" ) diff --git a/fs/proto_test.go b/fs/proto_test.go index 08bda72adb1..e277019e3c3 100644 --- a/fs/proto_test.go +++ b/fs/proto_test.go @@ -7,9 +7,9 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/influxdata/platform" - "github.com/influxdata/platform/fs" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/fs" + platformtesting "github.com/influxdata/influxdb/testing" "go.uber.org/zap" ) diff --git a/gather/handler.go b/gather/handler.go index 15999a60d42..63bad920610 100644 --- a/gather/handler.go +++ b/gather/handler.go @@ -5,8 +5,8 @@ import ( "context" "encoding/json" - "github.com/influxdata/platform" - "github.com/influxdata/platform/nats" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/nats" "go.uber.org/zap" ) diff --git a/gather/prometheus.go b/gather/prometheus.go index 604a2cace20..5a51d543107 100644 --- a/gather/prometheus.go +++ b/gather/prometheus.go @@ -9,7 +9,7 @@ import ( "net/http" "time" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" "github.com/matttproud/golang_protobuf_extensions/pbutil" dto "github.com/prometheus/client_model/go" "github.com/prometheus/common/expfmt" diff --git a/gather/scheduler.go b/gather/scheduler.go index 5a6aa9c9d37..629ae76a2db 100644 --- a/gather/scheduler.go +++ b/gather/scheduler.go @@ -7,8 +7,8 @@ import ( "fmt" "time" - "github.com/influxdata/platform" - "github.com/influxdata/platform/nats" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/nats" "go.uber.org/zap" ) diff --git a/gather/scheduler_test.go b/gather/scheduler_test.go index 98d059f4178..cee5eb29147 100644 --- a/gather/scheduler_test.go +++ b/gather/scheduler_test.go @@ -8,10 +8,10 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform" - influxlogger "github.com/influxdata/platform/logger" - "github.com/influxdata/platform/mock" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + influxlogger "github.com/influxdata/influxdb/logger" + "github.com/influxdata/influxdb/mock" + platformtesting "github.com/influxdata/influxdb/testing" ) func TestScheduler(t *testing.T) { diff --git a/gather/scraper.go b/gather/scraper.go index 2ffa693da7a..c0dc06386de 100644 --- a/gather/scraper.go +++ b/gather/scraper.go @@ -3,7 +3,7 @@ package gather import ( "context" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) // Scraper gathers metrics from a scraper target. diff --git a/gather/scraper_test.go b/gather/scraper_test.go index 94659dd3af9..9cd5b8418ed 100644 --- a/gather/scraper_test.go +++ b/gather/scraper_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) func TestPrometheusScraper(t *testing.T) { diff --git a/gather/storage.go b/gather/storage.go index 8750b461095..4a80d13bc35 100644 --- a/gather/storage.go +++ b/gather/storage.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "github.com/influxdata/platform/nats" + "github.com/influxdata/influxdb/nats" "go.uber.org/zap" ) diff --git a/go.mod b/go.mod index d41c0b20ba2..5fd77915be1 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,8 @@ -module github.com/influxdata/platform +module github.com/influxdata/influxdb require ( github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect github.com/BurntSushi/toml v0.3.1 - github.com/DataDog/datadog-go v0.0.0-20180822151419-281ae9f2d895 // indirect github.com/Jeffail/gabs v1.1.1 // indirect github.com/Microsoft/go-winio v0.4.11 // indirect github.com/NYTimes/gziphandler v1.0.1 @@ -17,7 +16,7 @@ require ( github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da // indirect github.com/armon/go-radix v1.0.0 // indirect github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf // indirect - github.com/aws/aws-sdk-go v1.15.59 // indirect + github.com/aws/aws-sdk-go v1.16.15 // indirect github.com/benbjohnson/tmpl v1.0.0 github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932 // indirect github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect @@ -25,31 +24,29 @@ require ( github.com/bouk/httprouter v0.0.0-20160817010721-ee8b3818a7f5 github.com/caarlos0/ctrlc v1.0.0 // indirect github.com/campoy/unique v0.0.0-20180121183637-88950e537e7e // indirect - github.com/cenkalti/backoff v2.0.0+incompatible // indirect + github.com/cenkalti/backoff v2.1.1+incompatible // indirect github.com/cespare/xxhash v1.1.0 - github.com/circonus-labs/circonus-gometrics v2.2.5+incompatible // indirect - github.com/circonus-labs/circonusllhist v0.1.3 // indirect - github.com/containerd/continuity v0.0.0-20181027224239-bea7585dbfac // indirect + github.com/containerd/continuity v0.0.0-20181203112020-004b46473808 // indirect github.com/coreos/bbolt v1.3.1-coreos.6 github.com/davecgh/go-spew v1.1.1 github.com/denisenkom/go-mssqldb v0.0.0-20181014144952-4e0d7dc8888f // indirect github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/dgryski/go-bitstream v0.0.0-20180413035011-3522498ce2c8 - github.com/docker/distribution v2.6.2+incompatible // indirect - github.com/docker/docker v0.0.0-20180422163414-57142e89befe // indirect + github.com/docker/distribution v2.7.0+incompatible // indirect + github.com/docker/docker v1.13.1 // indirect github.com/docker/go-connections v0.4.0 // indirect github.com/docker/go-units v0.3.3 // indirect - github.com/duosecurity/duo_api_golang v0.0.0-20181024123116-92fea9203dbc // indirect + github.com/duosecurity/duo_api_golang v0.0.0-20190107154727-539434bf0d45 // indirect github.com/elazarl/go-bindata-assetfs v1.0.0 github.com/fatih/color v1.7.0 // indirect github.com/fatih/structs v1.1.0 // indirect github.com/getkin/kin-openapi v0.1.0 github.com/ghodss/yaml v1.0.0 - github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd // indirect + github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2 // indirect github.com/glycerine/goconvey v0.0.0-20180728074245-46e3a41ad493 // indirect github.com/go-ldap/ldap v2.5.1+incompatible // indirect github.com/go-test/deep v1.0.1 // indirect - github.com/gocql/gocql v0.0.0-20181117210152-33c0e89ca93a // indirect + github.com/gocql/gocql v0.0.0-20181124151448-70385f88b28b // indirect github.com/gogo/protobuf v1.1.1 github.com/golang/gddo v0.0.0-20181116215533-9bd4a3295021 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db @@ -57,55 +54,48 @@ require ( github.com/google/go-cmp v0.2.0 github.com/google/go-github v17.0.0+incompatible github.com/google/go-querystring v1.0.0 // indirect - github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 // indirect + github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e // indirect github.com/goreleaser/goreleaser v0.94.0 github.com/goreleaser/nfpm v0.9.7 // indirect github.com/gotestyourself/gotestyourself v2.2.0+incompatible // indirect - github.com/hashicorp/consul v1.4.0 // indirect github.com/hashicorp/go-hclog v0.0.0-20181001195459-61d530d6c27f // indirect github.com/hashicorp/go-immutable-radix v1.0.0 // indirect github.com/hashicorp/go-memdb v0.0.0-20181108192425-032f93b25bec // indirect github.com/hashicorp/go-msgpack v0.0.0-20150518234257-fa3f63826f7c // indirect github.com/hashicorp/go-multierror v1.0.0 // indirect - github.com/hashicorp/go-plugin v0.0.0-20181030172320-54b6ff97d818 // indirect + github.com/hashicorp/go-plugin v0.0.0-20181212150838-f444068e8f5a // indirect github.com/hashicorp/go-retryablehttp v0.5.0 // indirect github.com/hashicorp/go-rootcerts v0.0.0-20160503143440-6bb64b370b90 // indirect - github.com/hashicorp/go-sockaddr v0.0.0-20180320115054-6d291a969b86 // indirect - github.com/hashicorp/go-version v1.0.0 // indirect - github.com/hashicorp/memberlist v0.1.0 // indirect + github.com/hashicorp/go-sockaddr v0.0.0-20190103214136-e92cdb5343bb // indirect + github.com/hashicorp/go-version v1.1.0 // indirect github.com/hashicorp/raft v1.0.0 // indirect - github.com/hashicorp/serf v0.8.1 // indirect github.com/hashicorp/vault v0.11.5 - github.com/hashicorp/vault-plugin-secrets-kv v0.0.0-20181106190520-2236f141171e // indirect - github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect - github.com/imdario/mergo v0.3.6 // indirect + github.com/hashicorp/vault-plugin-secrets-kv v0.0.0-20181219175933-9dbe04db0e34 // indirect github.com/influxdata/flux v0.13.0 github.com/influxdata/influxql v0.0.0-20180925231337-1cbfca8e56b6 github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368 github.com/jefferai/jsonx v0.0.0-20160721235117-9cc31c3135ee // indirect github.com/jessevdk/go-flags v1.4.0 - github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af // indirect github.com/jsternberg/zap-logfmt v1.2.0 github.com/jtolds/gls v4.2.1+incompatible // indirect github.com/julienschmidt/httprouter v1.2.0 github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 // indirect github.com/kevinburke/go-bindata v3.11.0+incompatible - github.com/keybase/go-crypto v0.0.0-20181031135447-f919bfda4fc1 // indirect + github.com/keybase/go-crypto v0.0.0-20181127160227-255a5089e85a // indirect github.com/mattn/go-colorable v0.0.9 // indirect github.com/mattn/go-isatty v0.0.4 - github.com/mattn/go-zglob v0.0.0-20180803001819-2ea3427bfa53 // indirect + github.com/mattn/go-zglob v0.0.1 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.1 - github.com/miekg/dns v1.1.1 // indirect github.com/mitchellh/copystructure v1.0.0 // indirect github.com/mitchellh/go-testing-interface v1.0.0 // indirect - github.com/mitchellh/mapstructure v1.1.2 // indirect github.com/mna/pigeon v1.0.1-0.20180808201053-bb0192cfc2ae github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae // indirect github.com/nats-io/gnatsd v1.3.0 // indirect - github.com/nats-io/go-nats v1.6.0 // indirect + github.com/nats-io/go-nats v1.7.0 // indirect github.com/nats-io/go-nats-streaming v0.4.0 github.com/nats-io/nats-streaming-server v0.11.2 + github.com/nats-io/nkeys v0.0.2 // indirect github.com/nats-io/nuid v1.0.0 // indirect github.com/onsi/ginkgo v1.7.0 // indirect github.com/onsi/gomega v1.4.3 // indirect @@ -123,17 +113,14 @@ require ( github.com/prometheus/common v0.0.0-20181020173914-7e9e6cabbd39 github.com/ryanuber/go-glob v0.0.0-20170128012129-256dc444b735 // indirect github.com/satori/go.uuid v1.2.0 - github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect - github.com/sirupsen/logrus v1.2.0 // indirect + github.com/sirupsen/logrus v1.3.0 // indirect github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d // indirect - github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a // indirect + github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c // indirect github.com/spf13/cobra v0.0.3 github.com/spf13/viper v1.2.1 - github.com/stevvooe/resumable v0.0.0-20180830230917-22b14a53ba50 // indirect github.com/tcnksm/go-input v0.0.0-20180404061846-548a7d7a8ee8 github.com/testcontainers/testcontainer-go v0.0.0-20181115231424-8e868ca12c0f - github.com/tinylib/msgp v1.0.2 // indirect - github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926 // indirect + github.com/tinylib/msgp v1.1.0 // indirect github.com/tylerb/graceful v1.2.15 github.com/willf/bitset v1.1.9 // indirect github.com/yudai/gojsondiff v1.0.0 @@ -148,10 +135,8 @@ require ( golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2 golang.org/x/tools v0.0.0-20181221154417-3ad2d988d5e2 google.golang.org/api v0.0.0-20181021000519-a2651947f503 - google.golang.org/appengine v1.2.0 // indirect - google.golang.org/genproto v0.0.0-20181016170114-94acd270e44e // indirect google.golang.org/grpc v1.15.0 - gopkg.in/asn1-ber.v1 v1.0.0-20170511165959-379148ca0225 // indirect + gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect gopkg.in/ldap.v2 v2.5.1 // indirect gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce // indirect gopkg.in/robfig/cron.v2 v2.0.0-20150107220207-be2e0b0deed5 @@ -168,3 +153,5 @@ replace ( ) replace github.com/getkin/kin-openapi v0.1.0 => github.com/influxdata/kin-openapi v0.1.1-0.20181212221347-ca3615a71f83 + +replace github.com/influxdata/platform => /dev/null diff --git a/go.sum b/go.sum index 84442a37c2e..16ec0f647af 100644 --- a/go.sum +++ b/go.sum @@ -4,8 +4,6 @@ github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7O github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/datadog-go v0.0.0-20180822151419-281ae9f2d895 h1:dmc/C8bpE5VkQn65PNbbyACDC8xw8Hpp/NEurdPmQDQ= -github.com/DataDog/datadog-go v0.0.0-20180822151419-281ae9f2d895/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/Jeffail/gabs v1.1.1 h1:V0uzR08Hj22EX8+8QMhyI9sX2hwRu+/RJhJUmnwda/E= github.com/Jeffail/gabs v1.1.1/go.mod h1:6xMvQMK4k33lb7GUUpaAPh6nKMmemQeg5d4gn7/bOXc= github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc= @@ -50,8 +48,8 @@ github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf h1:eg0MeVzsP1G42dRafH3vf+al2vQIJU0YHX+1Tw87oco= github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= -github.com/aws/aws-sdk-go v1.15.59 h1:K/Jy1OfHttpKHHQEy1V0713bb6XMRiA1HO1aAi/sMNg= -github.com/aws/aws-sdk-go v1.15.59/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM= +github.com/aws/aws-sdk-go v1.16.15 h1:kQyxfRyjAwIYjf0225sn/pn+WAlncKyI8dmT3+ItMFE= +github.com/aws/aws-sdk-go v1.16.15/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/benbjohnson/tmpl v1.0.0 h1:T5QPGJD0W6JJxyEEAlVnX3co/IkUrfHen1/42nlgAHo= github.com/benbjohnson/tmpl v1.0.0/go.mod h1:igT620JFIi44B6awvU9IsDhR77IXWtFigTLil/RPdps= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0= @@ -72,17 +70,13 @@ github.com/caarlos0/ctrlc v1.0.0 h1:2DtF8GSIcajgffDFJzyG15vO+1PuBWOMUdFut7NnXhw= github.com/caarlos0/ctrlc v1.0.0/go.mod h1:CdXpj4rmq0q/1Eb44M9zi2nKB0QraNKuRGYGrrHhcQw= github.com/campoy/unique v0.0.0-20180121183637-88950e537e7e h1:V9a67dfYqPLAvzk5hMQOXYJlZ4SLIXgyKIE+ZiHzgGQ= github.com/campoy/unique v0.0.0-20180121183637-88950e537e7e/go.mod h1:9IOqJGCPMSc6E5ydlp5NIonxObaeu/Iub/X03EKPVYo= -github.com/cenkalti/backoff v2.0.0+incompatible h1:5IIPUHhlnUZbcHQsQou5k1Tn58nJkeJL9U+ig5CHJbY= -github.com/cenkalti/backoff v2.0.0+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= +github.com/cenkalti/backoff v2.1.1+incompatible h1:tKJnvO2kl0zmb/jA5UKAt4VoEVw1qxKWjE/Bpp46npY= +github.com/cenkalti/backoff v2.1.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/circonus-labs/circonus-gometrics v2.2.5+incompatible h1:KsuY3ogbxgVv3FNhbLUoT+SE9znoWEUIuChSIT4HukI= -github.com/circonus-labs/circonus-gometrics v2.2.5+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= -github.com/circonus-labs/circonusllhist v0.1.3 h1:TJH+oke8D16535+jHExHj4nQvzlZrj7ug5D7I/orNUA= -github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/containerd/continuity v0.0.0-20181027224239-bea7585dbfac h1:PThQaO4yCvJzJBUW1XoFQxLotWRhvX2fgljJX8yrhFI= -github.com/containerd/continuity v0.0.0-20181027224239-bea7585dbfac/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= +github.com/containerd/continuity v0.0.0-20181203112020-004b46473808 h1:4BX8f882bXEDKfWIf0wa8HRvpnBoPszJJXL+TVbBw4M= +github.com/containerd/continuity v0.0.0-20181203112020-004b46473808/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= github.com/coreos/bbolt v1.3.1-coreos.6 h1:uTXKg9gY70s9jMAKdfljFQcuh4e/BXOM+V+d00KFj3A= github.com/coreos/bbolt v1.3.1-coreos.6/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -94,21 +88,16 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumC github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-bitstream v0.0.0-20180413035011-3522498ce2c8 h1:akOQj8IVgoeFfBTzGOEQakCYshWD6RNo1M5pivFXt70= github.com/dgryski/go-bitstream v0.0.0-20180413035011-3522498ce2c8/go.mod h1:VMaSuZ+SZcx/wljOQKvp5srsbCiKDEb6K2wC4+PiBmQ= -github.com/docker/distribution v2.6.2+incompatible h1:4FI6af79dfCS/CYb+RRtkSHw3q1L/bnDjG1PcPZtQhM= -github.com/docker/distribution v2.6.2+incompatible h1:4FI6af79dfCS/CYb+RRtkSHw3q1L/bnDjG1PcPZtQhM= -github.com/docker/distribution v2.6.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/distribution v2.6.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/distribution v2.6.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v0.0.0-20180422163414-57142e89befe h1:VW8TnWi0CZgg7oCv0wH6evNwkzcJg/emnw4HrVIWws4= -github.com/docker/docker v0.0.0-20180422163414-57142e89befe/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/distribution v2.7.0+incompatible h1:neUDAlf3wX6Ml4HdqTrbcOHXtfRN0TFIwt6YFL7N9RU= +github.com/docker/distribution v2.7.0+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/docker v1.13.1 h1:IkZjBSIc8hBjLpqeAbeE5mca5mNgeatLHBy3GO78BWo= +github.com/docker/docker v1.13.1/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.3.3 h1:Xk8S3Xj5sLGlG5g67hJmYMmUgXv5N4PhkjJHHqrwnTk= github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/duosecurity/duo_api_golang v0.0.0-20181024123116-92fea9203dbc h1:WBHvoAWoLWz5Zsg9ubIG+Y71gDvoVK5Wd/ON1EXA1Zc= -github.com/duosecurity/duo_api_golang v0.0.0-20181024123116-92fea9203dbc h1:WBHvoAWoLWz5Zsg9ubIG+Y71gDvoVK5Wd/ON1EXA1Zc= -github.com/duosecurity/duo_api_golang v0.0.0-20181024123116-92fea9203dbc/go.mod h1:UqXY1lYT/ERa4OEAywUqdok1T4RCRdArkhic1Opuavo= -github.com/duosecurity/duo_api_golang v0.0.0-20181024123116-92fea9203dbc/go.mod h1:UqXY1lYT/ERa4OEAywUqdok1T4RCRdArkhic1Opuavo= +github.com/duosecurity/duo_api_golang v0.0.0-20190107154727-539434bf0d45 h1:AbIfPlD4fPKJcHghuy+vzOOxY47FNEp4P7SzS1dyP2k= +github.com/duosecurity/duo_api_golang v0.0.0-20190107154727-539434bf0d45/go.mod h1:UqXY1lYT/ERa4OEAywUqdok1T4RCRdArkhic1Opuavo= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/elazarl/go-bindata-assetfs v1.0.0 h1:G/bYguwHIzWq9ZoyUQqrjTmJbbYn3j3CKKpKinvZLFk= @@ -126,8 +115,8 @@ github.com/getkin/kin-openapi v0.1.0/go.mod h1:+0ZtELZf+SlWH8ZdA/IeFb3L/PKOKJx8e github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= -github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd h1:r04MMPyLHj/QwZuMJ5+7tJcBr1AQjpiAK/rZWRrQT7o= -github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= +github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2 h1:Ujru1hufTHVb++eG6OuNDKMxZnGIvF6o/u8q/8h2+I4= +github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= github.com/glycerine/goconvey v0.0.0-20180728074245-46e3a41ad493 h1:OTanQnFt0bi5iLFSdbEVA/idR6Q2WhCm+deb7ir2CcM= github.com/glycerine/goconvey v0.0.0-20180728074245-46e3a41ad493/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24= github.com/go-ldap/ldap v2.5.1+incompatible h1:Opaoft5zMW8IU/VRULB0eGMBQ9P5buRvCW6sFTRmMn8= @@ -136,8 +125,8 @@ github.com/go-sql-driver/mysql v1.4.0 h1:7LxgVwFb2hIQtMm87NdgAVfXjnt4OePseqT1tKx github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-test/deep v1.0.1 h1:UQhStjbkDClarlmv0am7OXXO4/GaPdCGiUiMTvi28sg= github.com/go-test/deep v1.0.1/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= -github.com/gocql/gocql v0.0.0-20181117210152-33c0e89ca93a h1:B5gyGsJJmFKS7examblxFXz3ltm0mN3u0l1JgbMuy5E= -github.com/gocql/gocql v0.0.0-20181117210152-33c0e89ca93a/go.mod h1:4Fw1eo5iaEhDUs8XyuhSVCVy52Jq3L+/3GJgYkwc+/0= +github.com/gocql/gocql v0.0.0-20181124151448-70385f88b28b h1:dnUw9Ih14dCKzbtZxm+pwQRYIb+9ypiwtZgsCQN4zmg= +github.com/gocql/gocql v0.0.0-20181124151448-70385f88b28b/go.mod h1:4Fw1eo5iaEhDUs8XyuhSVCVy52Jq3L+/3GJgYkwc+/0= github.com/gogo/protobuf v1.1.1 h1:72R+M5VuhED/KujmZVcIquuo8mBgX4oVda//DQb3PXo= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/golang/gddo v0.0.0-20181116215533-9bd4a3295021 h1:HYV500jCgk+IC68L5sWrLFIWMpaUFfXXpJSAb7XOoBk= @@ -161,16 +150,14 @@ github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASu github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/uuid v1.0.0 h1:b4Gk+7WdP/d3HZH8EJsZpvV7EtDOgaZLtnaNGIu1adA= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1ks85zJ1lfDGgIiMDuIptTOhJq+zKyg= +github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/goreleaser/nfpm v0.9.7 h1:h8RQMDztu6cW7b0/s4PGbdeMYykAbJG0UMXaWG5uBMI= github.com/goreleaser/nfpm v0.9.7/go.mod h1:F2yzin6cBAL9gb+mSiReuXdsfTrOQwDMsuSpULof+y4= github.com/gotestyourself/gotestyourself v2.2.0+incompatible h1:AQwinXlbQR2HvPjQZOmDhRqsv5mZf+Jb1RnSLxcqZcI= github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod h1:zZKM6oeNM8k+FRljX1mnzVYeS8wiGgQyvST1/GafPbY= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed h1:5upAirOpQc1Q53c0bnx2ufif5kANL7bfZWcc6VJWJd8= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4= -github.com/hashicorp/consul v1.4.0 h1:PQTW4xCuAExEiSbhrsFsikzbW5gVBoi74BjUvYFyKHw= -github.com/hashicorp/consul v1.4.0/go.mod h1:mFrjN1mfidgJfYP1xrJCF+AfRhr6Eaqhb2+sfyn/OOI= github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-cleanhttp v0.5.0 h1:wvCrVc9TjDls6+YGAF2hAifE1E5U1+b4tH6KdvN3Gig= @@ -186,39 +173,29 @@ github.com/hashicorp/go-msgpack v0.0.0-20150518234257-fa3f63826f7c h1:BTAbnbegUI github.com/hashicorp/go-msgpack v0.0.0-20150518234257-fa3f63826f7c/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v1.0.0 h1:iVjPR7a6H0tWELX5NxNe7bYopibicUzc7uPribsnS6o= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-plugin v0.0.0-20181030172320-54b6ff97d818 h1:wA1XRGBHMdpio0gcKUtnmkwSIlCAG1qzpsr+iPyi3Y8= -github.com/hashicorp/go-plugin v0.0.0-20181030172320-54b6ff97d818/go.mod h1:Ft7ju2vWzhO0ETMKUVo12XmXmII6eSUS4rsPTkY/siA= +github.com/hashicorp/go-plugin v0.0.0-20181212150838-f444068e8f5a h1:z9eTtDWoxYrJvtAD+xAepmTEfEmYgouWUytJ84UWAr8= +github.com/hashicorp/go-plugin v0.0.0-20181212150838-f444068e8f5a/go.mod h1:Ft7ju2vWzhO0ETMKUVo12XmXmII6eSUS4rsPTkY/siA= github.com/hashicorp/go-retryablehttp v0.5.0 h1:aVN0FYnPwAgZI/hVzqwfMiM86ttcHTlQKbBVeVmXPIs= github.com/hashicorp/go-retryablehttp v0.5.0/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-rootcerts v0.0.0-20160503143440-6bb64b370b90 h1:VBj0QYQ0u2MCJzBfeYXGexnAl17GsH1yidnoxCqqD9E= github.com/hashicorp/go-rootcerts v0.0.0-20160503143440-6bb64b370b90/go.mod h1:o4zcYY1e0GEZI6eSEr+43QDYmuGglw1qSO6qdHUHCgg= -github.com/hashicorp/go-sockaddr v0.0.0-20180320115054-6d291a969b86 h1:7YOlAIO2YWnJZkQp7B5eFykaIY7C9JndqAFQyVV5BhM= -github.com/hashicorp/go-sockaddr v0.0.0-20180320115054-6d291a969b86/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= +github.com/hashicorp/go-sockaddr v0.0.0-20190103214136-e92cdb5343bb h1:YrwA8w5SBkUIH5BzN2pMYhno+txUCOD5+PVXwLS6ddI= +github.com/hashicorp/go-sockaddr v0.0.0-20190103214136-e92cdb5343bb/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= github.com/hashicorp/go-uuid v1.0.0 h1:RS8zrF7PhGwyNPOtxSClXXj9HA8feRnJzgnI1RJCSnM= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-version v1.0.0 h1:21MVWPKDphxa7ineQQTrCU5brh7OuVVAzGOCnnCPtE8= -github.com/hashicorp/go-version v1.0.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go-version v1.1.0 h1:bPIoEKD27tNdebFGGxxYwcL4nepeY4j1QP23PFRGzg0= +github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hashicorp/memberlist v0.1.0 h1:qSsCiC0WYD39lbSitKNt40e30uorm2Ss/d4JGU1hzH8= -github.com/hashicorp/memberlist v0.1.0/go.mod h1:ncdBp14cuox2iFOq3kDiquKU6fqsTBc3W6JvZwjxxsE= github.com/hashicorp/raft v1.0.0 h1:htBVktAOtGs4Le5Z7K8SF5H2+oWsQFYVmOgH5loro7Y= github.com/hashicorp/raft v1.0.0/go.mod h1:DVSAWItjLjTOkVbSpWQ0j0kUADIvDaCtBxIcbNAQLkI= -github.com/hashicorp/serf v0.8.1 h1:mYs6SMzu72+90OcPa5wr3nfznA4Dw9UyR791ZFNOIf4= -github.com/hashicorp/serf v0.8.1/go.mod h1:h/Ru6tmZazX7WO/GDmwdpS975F019L4t5ng5IgwbNrE= github.com/hashicorp/vault v0.11.5 h1:6G3922BuHAxy3icIgSTJiv6GQCqFgdmXBvn3L9bNrZA= github.com/hashicorp/vault v0.11.5/go.mod h1:KfSyffbKxoVyspOdlaGVjIuwLobi07qD1bAbosPMpP0= github.com/hashicorp/vault v0.11.5/go.mod h1:KfSyffbKxoVyspOdlaGVjIuwLobi07qD1bAbosPMpP0= -github.com/hashicorp/vault-plugin-secrets-kv v0.0.0-20181106190520-2236f141171e h1:2Hwd2Yi0/qjAC6ujOu6WBVXAak9Snuw0LTYdZkqIdKM= -github.com/hashicorp/vault-plugin-secrets-kv v0.0.0-20181106190520-2236f141171e h1:2Hwd2Yi0/qjAC6ujOu6WBVXAak9Snuw0LTYdZkqIdKM= -github.com/hashicorp/vault-plugin-secrets-kv v0.0.0-20181106190520-2236f141171e h1:2Hwd2Yi0/qjAC6ujOu6WBVXAak9Snuw0LTYdZkqIdKM= -github.com/hashicorp/vault-plugin-secrets-kv v0.0.0-20181106190520-2236f141171e h1:2Hwd2Yi0/qjAC6ujOu6WBVXAak9Snuw0LTYdZkqIdKM= -github.com/hashicorp/vault-plugin-secrets-kv v0.0.0-20181106190520-2236f141171e/go.mod h1:VJHHT2SC1tAPrfENQeBhLlb5FbZoKZM+oC/ROmEftz0= -github.com/hashicorp/vault-plugin-secrets-kv v0.0.0-20181106190520-2236f141171e/go.mod h1:VJHHT2SC1tAPrfENQeBhLlb5FbZoKZM+oC/ROmEftz0= -github.com/hashicorp/vault-plugin-secrets-kv v0.0.0-20181106190520-2236f141171e/go.mod h1:VJHHT2SC1tAPrfENQeBhLlb5FbZoKZM+oC/ROmEftz0= -github.com/hashicorp/vault-plugin-secrets-kv v0.0.0-20181106190520-2236f141171e/go.mod h1:VJHHT2SC1tAPrfENQeBhLlb5FbZoKZM+oC/ROmEftz0= +github.com/hashicorp/vault-plugin-secrets-kv v0.0.0-20181219175933-9dbe04db0e34 h1:ErMAmfTAS2ZTJ14uKNMu/SjymcjT1mz6dji1b9s1Ftw= +github.com/hashicorp/vault-plugin-secrets-kv v0.0.0-20181219175933-9dbe04db0e34/go.mod h1:VJHHT2SC1tAPrfENQeBhLlb5FbZoKZM+oC/ROmEftz0= github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb h1:b5rjCoWHc7eqmAS4/qyk21ZsHyb6Mxv/jykxvNTkU4M= github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb h1:b5rjCoWHc7eqmAS4/qyk21ZsHyb6Mxv/jykxvNTkU4M= github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb h1:b5rjCoWHc7eqmAS4/qyk21ZsHyb6Mxv/jykxvNTkU4M= @@ -227,17 +204,12 @@ github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKe github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= -github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d h1:kJCB4vdITiW1eC1vq2e6IsrXKrZit1bv/TDYFGMp4BQ= -github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d h1:kJCB4vdITiW1eC1vq2e6IsrXKrZit1bv/TDYFGMp4BQ= -github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= -github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huandu/xstrings v1.0.0 h1:pO2K/gKgKaat5LdpAhxhluX2GPQMaI3W5FUz/I/UnWk= github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo= +github.com/imdario/mergo v0.3.4 h1:mKkfHkZWD8dC7WxKx3N9WCF0Y+dLau45704YQmY6H94= github.com/imdario/mergo v0.3.4/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28= -github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/influxdata/flux v0.13.0 h1:iWNTxfR8m8LFYNAjSXAYMdxMKHqsBxd3xHlZ7rpl1KA= @@ -257,8 +229,6 @@ github.com/jefferai/jsonx v0.0.0-20160721235117-9cc31c3135ee h1:AQ/QmCk6x8ECPpf2 github.com/jefferai/jsonx v0.0.0-20160721235117-9cc31c3135ee/go.mod h1:N0t2vlmpe8nyZB5ouIbJQPDSR+mH6oe7xHB9VZHSUzM= github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= -github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8 h1:12VvqtR6Aowv3l/EQUlocDHW2Cp4G9WJVH7uyH8QFJE= -github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jsternberg/zap-logfmt v1.2.0 h1:1v+PK4/B48cy8cfQbxL4FmmNZrjnIMr2BsnyEmXqv2o= @@ -274,8 +244,8 @@ github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q github.com/kevinburke/go-bindata v3.11.0+incompatible h1:RcC+GJNmrBHbGaOpQ9MBD8z22rdzlIm0esDRDkyxd4s= github.com/kevinburke/go-bindata v3.11.0+incompatible/go.mod h1:/pEEZ72flUW2p0yi30bslSp9YqD9pysLxunQDdb2CPM= github.com/kevinburke/ssh_config v0.0.0-20180830205328-81db2a75821e/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= -github.com/keybase/go-crypto v0.0.0-20181031135447-f919bfda4fc1 h1:60mtH2Zn7ZFaAd2bO636Q8xPMhSm3b9E49mNmGM+iJY= -github.com/keybase/go-crypto v0.0.0-20181031135447-f919bfda4fc1/go.mod h1:ghbZscTyKdM07+Fw3KSi0hcJm+AlEUWj8QLlPtijN/M= +github.com/keybase/go-crypto v0.0.0-20181127160227-255a5089e85a h1:X/UFlwD2/UV0RCy+8ITi4DmxJwk83YUH7bXwkJIHHMo= +github.com/keybase/go-crypto v0.0.0-20181127160227-255a5089e85a/go.mod h1:ghbZscTyKdM07+Fw3KSi0hcJm+AlEUWj8QLlPtijN/M= github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= @@ -298,12 +268,10 @@ github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzp github.com/mattn/go-tty v0.0.0-20180907095812-13ff1204f104 h1:d8RFOZ2IiFtFWBcKEHAFYJcPTf0wY5q0exFNJZVWa1U= github.com/mattn/go-tty v0.0.0-20180907095812-13ff1204f104/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE= github.com/mattn/go-zglob v0.0.0-20171230104132-4959821b4817/go.mod h1:9fxibJccNxU2cnpIKLRRFA7zX7qhkJIQWBb449FYHOo= -github.com/mattn/go-zglob v0.0.0-20180803001819-2ea3427bfa53 h1:tGfIHhDghvEnneeRhODvGYOt305TPwingKt6p90F4MU= -github.com/mattn/go-zglob v0.0.0-20180803001819-2ea3427bfa53/go.mod h1:9fxibJccNxU2cnpIKLRRFA7zX7qhkJIQWBb449FYHOo= +github.com/mattn/go-zglob v0.0.1 h1:xsEx/XUoVlI6yXjqBK062zYhRTZltCNmYPx6v+8DNaY= +github.com/mattn/go-zglob v0.0.1/go.mod h1:9fxibJccNxU2cnpIKLRRFA7zX7qhkJIQWBb449FYHOo= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/miekg/dns v1.1.1 h1:DVkblRdiScEnEr0LR9nTnEQqHYycjkXW9bOjd+2EL2o= -github.com/miekg/dns v1.1.1/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ= github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/go-homedir v1.0.0 h1:vKb8ShqSby24Yrqr/yDYkuFz8d0WUjys40rvnGC8aR0= @@ -313,8 +281,6 @@ github.com/mitchellh/go-testing-interface v1.0.0 h1:fzU/JVNcaqHQEcVFAKeR41fkiLdI github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/mapstructure v1.0.0 h1:vVpGvMXJPqSDh2VYHF7gsfQj8Ncx+Xw5Y1KHeTRY+7I= github.com/mitchellh/mapstructure v1.0.0/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= -github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY= github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mna/pigeon v1.0.1-0.20180808201053-bb0192cfc2ae h1:mQO+oxi0kpii/TX+ltfTCFuYkOjEn53JhaOObiMuvnk= @@ -323,12 +289,14 @@ github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae h1:VeRdUYdCw49yizlSbM github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg= github.com/nats-io/gnatsd v1.3.0 h1:+5d80klu3QaJgNbdavVBjWJP7cHd11U2CLnRTFM9ICI= github.com/nats-io/gnatsd v1.3.0/go.mod h1:nqco77VO78hLCJpIcVfygDP2rPGfsEHkGTUk94uh5DQ= -github.com/nats-io/go-nats v1.6.0 h1:FznPwMfrVwGnSCh7JTXyJDRW0TIkD4Tr+M1LPJt9T70= -github.com/nats-io/go-nats v1.6.0/go.mod h1:+t7RHT5ApZebkrQdnn6AhQJmhJJiKAvJUio1PiiCtj0= +github.com/nats-io/go-nats v1.7.0 h1:oQOfHcLr8hb43QG8yeVyY2jtarIaTjOv41CGdF3tTvQ= +github.com/nats-io/go-nats v1.7.0/go.mod h1:+t7RHT5ApZebkrQdnn6AhQJmhJJiKAvJUio1PiiCtj0= github.com/nats-io/go-nats-streaming v0.4.0 h1:00wOBnTKzZGvQOFRSxj18kUm4X2TvXzv8LS0skZegPc= github.com/nats-io/go-nats-streaming v0.4.0/go.mod h1:gfq4R3c9sKAINOpelo0gn/b9QDMBZnmrttcsNF+lqyo= github.com/nats-io/nats-streaming-server v0.11.2 h1:UCqZbfXUKs9Ejw7KiNaFZEbbiVbK7uA8jbK2TsdGbqg= github.com/nats-io/nats-streaming-server v0.11.2/go.mod h1:RyqtDJZvMZO66YmyjIYdIvS69zu/wDAkyNWa8PIUa5c= +github.com/nats-io/nkeys v0.0.2 h1:+qM7QpgXnvDDixitZtQUBDY9w/s9mu1ghS+JIbsrx6M= +github.com/nats-io/nkeys v0.0.2/go.mod h1:dab7URMsZm6Z/jp9Z5UGa87Uutgc2mVpXLC4B7TDb/4= github.com/nats-io/nuid v1.0.0 h1:44QGdhbiANq8ZCbUkdn6W5bqtg+mHuDE4wOUuxxndFs= github.com/nats-io/nuid v1.0.0/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw= @@ -381,20 +349,16 @@ github.com/ryanuber/go-glob v0.0.0-20170128012129-256dc444b735 h1:7YvPJVmEeFHR1T github.com/ryanuber/go-glob v0.0.0-20170128012129-256dc444b735/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= -github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= -github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/segmentio/kafka-go v0.1.0 h1:IXCHG+sXPNiIR5pC/vTEItZduPKu4cnpr85YgxpxlW0= github.com/segmentio/kafka-go v0.1.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= -github.com/sirupsen/logrus v1.2.0 h1:juTguoYk5qI21pwyTXY3B3Y5cOTH3ZUyZCg1v/mihuo= -github.com/sirupsen/logrus v1.2.0 h1:juTguoYk5qI21pwyTXY3B3Y5cOTH3ZUyZCg1v/mihuo= -github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME= +github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a h1:JSvGDIbmil4Ui/dDdFBExb7/cmkNjyX5F97oglmvCDo= -github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s= +github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c h1:Ho+uVpkel/udgjbwB5Lktg9BtvJSh2DT0Hi6LPSyI2w= +github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI= @@ -412,8 +376,6 @@ github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn github.com/spf13/viper v1.2.1 h1:bIcUwXqLseLF3BDAZduuNfekWG87ibtFxi59Bq+oI9M= github.com/spf13/viper v1.2.1/go.mod h1:P4AexN0a+C9tGAnUFNwDMYYZv3pjFuvmeiMyKRaNVlI= github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI= -github.com/stevvooe/resumable v0.0.0-20180830230917-22b14a53ba50 h1:4bT0pPowCpQImewr+BjzfUKcuFW+KVyB8d1OF3b6oTI= -github.com/stevvooe/resumable v0.0.0-20180830230917-22b14a53ba50/go.mod h1:1pdIZTAHUz+HDKDVZ++5xg/duPlhKAIzw9qy42CWYp4= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.0/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= @@ -423,10 +385,8 @@ github.com/tcnksm/go-input v0.0.0-20180404061846-548a7d7a8ee8 h1:RB0v+/pc8oMzPsN github.com/tcnksm/go-input v0.0.0-20180404061846-548a7d7a8ee8/go.mod h1:IlWNj9v/13q7xFbaK4mbyzMNwrZLaWSHx/aibKIZuIg= github.com/testcontainers/testcontainer-go v0.0.0-20181115231424-8e868ca12c0f h1:O50XufNIw4FIpSi+/IOGyXTjlVyOgQkaq1MgbgXUtFE= github.com/testcontainers/testcontainer-go v0.0.0-20181115231424-8e868ca12c0f/go.mod h1:SrG3IY071gtmZJjGbKO+POJ57a/MMESerYNWt6ZRtKs= -github.com/tinylib/msgp v1.0.2 h1:DfdQrzQa7Yh2es9SuLkixqxuXS2SxsdYn0KbdrOGWD8= -github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= -github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926 h1:G3dpKMzFDjgEh2q1Z7zUUtKa8ViPtH+ocF0bE0g00O8= -github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= +github.com/tinylib/msgp v1.1.0 h1:9fQd+ICuRIu/ue4vxJZu6/LzxN0HwMds2nq/0cFvxHU= +github.com/tinylib/msgp v1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= github.com/tylerb/graceful v1.2.15 h1:B0x01Y8fsJpogzZTkDg6BDi6eMf03s01lEKGdrv83oA= github.com/tylerb/graceful v1.2.15/go.mod h1:LPYTbOYmUTdabwRt0TGhLllQ0MUNbs0Y5q1WXJOI9II= github.com/willf/bitset v1.1.9 h1:GBtFynGY9ZWZmEC9sWuu41/7VBXPFCOAbCbqTflOg9c= @@ -452,7 +412,6 @@ golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL golang.org/x/exp v0.0.0-20181112044915-a3060d491354 h1:6UAgZ8309zQ9+1iWkHzfszFguqzOdHGyGkd1HmhJ+UE= golang.org/x/exp v0.0.0-20181112044915-a3060d491354/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519 h1:x6rhz8Y9CjbgQkccRGmELH6K+LJj7tOoh3XWeC1yaQM= @@ -483,18 +442,15 @@ gonum.org/v1/netlib v0.0.0-20181029234149-ec6d1f5cefe6 h1:4WsZyVtkthqrHTbDCJfiTs gonum.org/v1/netlib v0.0.0-20181029234149-ec6d1f5cefe6/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= google.golang.org/api v0.0.0-20181021000519-a2651947f503 h1:UK7/bFlIoP9xre0fwSiXFaZZSpzmaen5MKp1sppNJ9U= google.golang.org/api v0.0.0-20181021000519-a2651947f503/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= +google.golang.org/appengine v1.1.0 h1:igQkv0AAhEIvTEpD5LIpAfav2eeVO9HBTjvKHVJPRSs= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.2.0 h1:S0iUepdCWODXRvtE+gcRDd15L+k+k1AiHlMiMjefH24= -google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20181016170114-94acd270e44e h1:I5s8aUkxqPjgAssfOv+dVr+4/7BC40WV6JhcVoORltI= -google.golang.org/genproto v0.0.0-20181016170114-94acd270e44e/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.15.0 h1:Az/KuahOM4NAidTEuJCv/RonAA7rYsTPkqXVjr+8OOw= google.golang.org/grpc v1.15.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio= -gopkg.in/asn1-ber.v1 v1.0.0-20170511165959-379148ca0225 h1:JBwmEvLfCqgPcIq8MjVMQxsF3LVL4XG/HH0qiG0+IFY= -gopkg.in/asn1-ber.v1 v1.0.0-20170511165959-379148ca0225/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw= +gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d h1:TxyelI5cVkbREznMhfzycHdkp5cLA7DpE+GKjSslYhM= +gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/http/api_handler.go b/http/api_handler.go index 2637b9fc6a6..7a6f9933cfb 100644 --- a/http/api_handler.go +++ b/http/api_handler.go @@ -4,10 +4,10 @@ import ( http "net/http" "strings" - "github.com/influxdata/platform" - "github.com/influxdata/platform/chronograf/server" - "github.com/influxdata/platform/query" - "github.com/influxdata/platform/storage" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/chronograf/server" + "github.com/influxdata/influxdb/query" + "github.com/influxdata/influxdb/storage" "go.uber.org/zap" ) diff --git a/http/assets.go b/http/assets.go index 597a6f880cc..de033887067 100644 --- a/http/assets.go +++ b/http/assets.go @@ -4,8 +4,8 @@ import ( "net/http" // TODO: use platform version of the code - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/dist" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/dist" ) const ( diff --git a/http/auth_service.go b/http/auth_service.go index a3353c72c14..e19107d9980 100644 --- a/http/auth_service.go +++ b/http/auth_service.go @@ -11,8 +11,8 @@ import ( "go.uber.org/zap" - "github.com/influxdata/platform" - platcontext "github.com/influxdata/platform/context" + platform "github.com/influxdata/influxdb" + platcontext "github.com/influxdata/influxdb/context" "github.com/julienschmidt/httprouter" ) diff --git a/http/auth_test.go b/http/auth_test.go index 3450b6da2ad..da9aeb554d4 100644 --- a/http/auth_test.go +++ b/http/auth_test.go @@ -10,12 +10,11 @@ import ( "net/http/httptest" "testing" - pcontext "github.com/influxdata/platform/context" - "github.com/influxdata/platform/inmem" - platformtesting "github.com/influxdata/platform/testing" - - "github.com/influxdata/platform" - "github.com/influxdata/platform/mock" + platform "github.com/influxdata/influxdb" + pcontext "github.com/influxdata/influxdb/context" + "github.com/influxdata/influxdb/inmem" + "github.com/influxdata/influxdb/mock" + platformtesting "github.com/influxdata/influxdb/testing" "github.com/julienschmidt/httprouter" ) diff --git a/http/authentication_middleware.go b/http/authentication_middleware.go index a3d5ddec38c..2f54dd2982b 100644 --- a/http/authentication_middleware.go +++ b/http/authentication_middleware.go @@ -5,8 +5,8 @@ import ( "fmt" "net/http" - "github.com/influxdata/platform" - platcontext "github.com/influxdata/platform/context" + platform "github.com/influxdata/influxdb" + platcontext "github.com/influxdata/influxdb/context" "github.com/julienschmidt/httprouter" "go.uber.org/zap" ) diff --git a/http/authentication_test.go b/http/authentication_test.go index 1e46c7e7d95..2d6499f595e 100644 --- a/http/authentication_test.go +++ b/http/authentication_test.go @@ -7,9 +7,9 @@ import ( "net/http/httptest" "testing" - "github.com/influxdata/platform" - platformhttp "github.com/influxdata/platform/http" - "github.com/influxdata/platform/mock" + platform "github.com/influxdata/influxdb" + platformhttp "github.com/influxdata/influxdb/http" + "github.com/influxdata/influxdb/mock" ) func TestAuthenticationHandler(t *testing.T) { diff --git a/http/bucket_service.go b/http/bucket_service.go index 1ebe05b8c34..77924ed20a8 100644 --- a/http/bucket_service.go +++ b/http/bucket_service.go @@ -10,8 +10,8 @@ import ( "strconv" "time" - "github.com/influxdata/platform" - "github.com/influxdata/platform/kit/errors" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/kit/errors" "github.com/julienschmidt/httprouter" "go.uber.org/zap" ) @@ -44,8 +44,9 @@ const ( // NewBucketHandler returns a new instance of BucketHandler. func NewBucketHandler(mappingService platform.UserResourceMappingService, labelService platform.LabelService, userService platform.UserService) *BucketHandler { h := &BucketHandler{ - Router: NewRouter(), - Logger: zap.NewNop(), + Router: NewRouter(), + Logger: zap.NewNop(), + UserResourceMappingService: mappingService, LabelService: labelService, UserService: userService, diff --git a/http/bucket_test.go b/http/bucket_test.go index eac5985f451..cd763f1230e 100644 --- a/http/bucket_test.go +++ b/http/bucket_test.go @@ -11,10 +11,10 @@ import ( "testing" "time" - "github.com/influxdata/platform" - "github.com/influxdata/platform/inmem" - "github.com/influxdata/platform/mock" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/inmem" + "github.com/influxdata/influxdb/mock" + platformtesting "github.com/influxdata/influxdb/testing" "github.com/julienschmidt/httprouter" ) diff --git a/http/chronograf_handler.go b/http/chronograf_handler.go index 077492722aa..4ebd651d99a 100644 --- a/http/chronograf_handler.go +++ b/http/chronograf_handler.go @@ -4,7 +4,7 @@ import ( "net/http" "github.com/NYTimes/gziphandler" - "github.com/influxdata/platform/chronograf/server" + "github.com/influxdata/influxdb/chronograf/server" "github.com/julienschmidt/httprouter" ) diff --git a/http/dashboard_service.go b/http/dashboard_service.go index 8b76fe6f86e..241e4481a6e 100644 --- a/http/dashboard_service.go +++ b/http/dashboard_service.go @@ -10,8 +10,8 @@ import ( "path" "strconv" - "github.com/influxdata/platform" - "github.com/influxdata/platform/kit/errors" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/kit/errors" "github.com/julienschmidt/httprouter" "go.uber.org/zap" ) @@ -47,8 +47,9 @@ const ( // NewDashboardHandler returns a new instance of DashboardHandler. func NewDashboardHandler(mappingService platform.UserResourceMappingService, labelService platform.LabelService, userService platform.UserService) *DashboardHandler { h := &DashboardHandler{ - Router: NewRouter(), - Logger: zap.NewNop(), + Router: NewRouter(), + Logger: zap.NewNop(), + UserResourceMappingService: mappingService, LabelService: labelService, UserService: userService, diff --git a/http/dashboard_test.go b/http/dashboard_test.go index 8dd67acfe5d..4119f728041 100644 --- a/http/dashboard_test.go +++ b/http/dashboard_test.go @@ -11,10 +11,10 @@ import ( "testing" "time" - "github.com/influxdata/platform" - "github.com/influxdata/platform/inmem" - "github.com/influxdata/platform/mock" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/inmem" + "github.com/influxdata/influxdb/mock" + platformtesting "github.com/influxdata/influxdb/testing" "github.com/julienschmidt/httprouter" ) diff --git a/http/duration.go b/http/duration.go index 007f2765f61..bdd515cfb45 100644 --- a/http/duration.go +++ b/http/duration.go @@ -5,7 +5,7 @@ import ( "strconv" "time" - "github.com/influxdata/platform/kit/errors" + "github.com/influxdata/influxdb/kit/errors" ) // ErrInvalidDuration is returned when parsing a malformatted duration. diff --git a/http/errors.go b/http/errors.go index c6e4481e27e..6aec6307339 100644 --- a/http/errors.go +++ b/http/errors.go @@ -7,8 +7,8 @@ import ( "net/http" "strconv" - "github.com/influxdata/platform" - kerrors "github.com/influxdata/platform/kit/errors" + platform "github.com/influxdata/influxdb" + kerrors "github.com/influxdata/influxdb/kit/errors" "github.com/pkg/errors" ) diff --git a/http/errors_test.go b/http/errors_test.go index 28f10bed0aa..0c74370929b 100644 --- a/http/errors_test.go +++ b/http/errors_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/influxdata/platform/http" + "github.com/influxdata/influxdb/http" ) func TestEncodeError(t *testing.T) { diff --git a/http/handler.go b/http/handler.go index be69d1073a9..87d4b415b2e 100644 --- a/http/handler.go +++ b/http/handler.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/influxdata/platform/kit/prom" + "github.com/influxdata/influxdb/kit/prom" opentracing "github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go/ext" "github.com/opentracing/opentracing-go/log" diff --git a/http/influxdb/bucket.go b/http/influxdb/bucket.go index d6f2e1e98b2..3ff813dd31f 100644 --- a/http/influxdb/bucket.go +++ b/http/influxdb/bucket.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) // BucketService connects to Influx via HTTP using tokens to manage buckets diff --git a/http/influxdb/client.go b/http/influxdb/client.go index 65e42aae55a..f79e228d158 100644 --- a/http/influxdb/client.go +++ b/http/influxdb/client.go @@ -5,10 +5,10 @@ import ( "net/http" "net/url" - "github.com/influxdata/platform" - "github.com/influxdata/platform/chronograf" - "github.com/influxdata/platform/chronograf/influx" - platformhttp "github.com/influxdata/platform/http" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/chronograf/influx" + platformhttp "github.com/influxdata/influxdb/http" ) // Shared transports for all clients to prevent leaking connections diff --git a/http/influxdb/source_proxy_query_service.go b/http/influxdb/source_proxy_query_service.go index 6269d6ad627..4bb7109c0ac 100644 --- a/http/influxdb/source_proxy_query_service.go +++ b/http/influxdb/source_proxy_query_service.go @@ -11,10 +11,10 @@ import ( "github.com/influxdata/flux" "github.com/influxdata/flux/csv" "github.com/influxdata/flux/lang" - "github.com/influxdata/platform" - platformhttp "github.com/influxdata/platform/http" - "github.com/influxdata/platform/query" - "github.com/influxdata/platform/query/influxql" + platform "github.com/influxdata/influxdb" + platformhttp "github.com/influxdata/influxdb/http" + "github.com/influxdata/influxdb/query" + "github.com/influxdata/influxdb/query/influxql" ) type SourceProxyQueryService struct { diff --git a/http/label_service.go b/http/label_service.go index 76e336968e3..6b966adec0c 100644 --- a/http/label_service.go +++ b/http/label_service.go @@ -8,8 +8,8 @@ import ( "net/http" "path" - plat "github.com/influxdata/platform" - kerrors "github.com/influxdata/platform/kit/errors" + plat "github.com/influxdata/influxdb" + kerrors "github.com/influxdata/influxdb/kit/errors" "github.com/julienschmidt/httprouter" ) diff --git a/http/macro_service.go b/http/macro_service.go index 5be44ce944a..7bb931cb054 100644 --- a/http/macro_service.go +++ b/http/macro_service.go @@ -8,8 +8,8 @@ import ( "net/http" "path" - "github.com/influxdata/platform" - kerrors "github.com/influxdata/platform/kit/errors" + platform "github.com/influxdata/influxdb" + kerrors "github.com/influxdata/influxdb/kit/errors" "github.com/julienschmidt/httprouter" "go.uber.org/zap" ) diff --git a/http/macro_test.go b/http/macro_test.go index ca0c9f5d59e..49555c60815 100644 --- a/http/macro_test.go +++ b/http/macro_test.go @@ -7,11 +7,11 @@ import ( "net/http/httptest" "testing" - "github.com/influxdata/platform" - "github.com/influxdata/platform/inmem" - kerrors "github.com/influxdata/platform/kit/errors" - "github.com/influxdata/platform/mock" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/inmem" + kerrors "github.com/influxdata/influxdb/kit/errors" + "github.com/influxdata/influxdb/mock" + platformtesting "github.com/influxdata/influxdb/testing" "github.com/julienschmidt/httprouter" ) diff --git a/http/onboarding.go b/http/onboarding.go index 98d437f3be5..5e9283e7bdd 100644 --- a/http/onboarding.go +++ b/http/onboarding.go @@ -6,7 +6,7 @@ import ( "encoding/json" "net/http" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" "github.com/julienschmidt/httprouter" "go.uber.org/zap" ) diff --git a/http/onboarding_test.go b/http/onboarding_test.go index 8013c6484a0..6bf1dbafe5f 100644 --- a/http/onboarding_test.go +++ b/http/onboarding_test.go @@ -5,9 +5,9 @@ import ( "net/http/httptest" "testing" - "github.com/influxdata/platform" - "github.com/influxdata/platform/inmem" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/inmem" + platformtesting "github.com/influxdata/influxdb/testing" ) func initOnboardingService(f platformtesting.OnboardingFields, t *testing.T) (platform.OnboardingService, func()) { diff --git a/http/org_service.go b/http/org_service.go index 4973c0e1641..38dcc028ff0 100644 --- a/http/org_service.go +++ b/http/org_service.go @@ -9,8 +9,8 @@ import ( "path" "strconv" - "github.com/influxdata/platform" - kerrors "github.com/influxdata/platform/kit/errors" + platform "github.com/influxdata/influxdb" + kerrors "github.com/influxdata/influxdb/kit/errors" "github.com/julienschmidt/httprouter" "go.uber.org/zap" ) @@ -49,8 +49,9 @@ const ( func NewOrgHandler(mappingService platform.UserResourceMappingService, labelService platform.LabelService, userService platform.UserService) *OrgHandler { h := &OrgHandler{ - Router: NewRouter(), - Logger: zap.NewNop(), + Router: NewRouter(), + Logger: zap.NewNop(), + UserResourceMappingService: mappingService, LabelService: labelService, UserService: userService, diff --git a/http/org_test.go b/http/org_test.go index 92eb0a9d038..19036cfd8b3 100644 --- a/http/org_test.go +++ b/http/org_test.go @@ -10,10 +10,10 @@ import ( "net/http/httptest" "testing" - "github.com/influxdata/platform" - "github.com/influxdata/platform/inmem" - "github.com/influxdata/platform/mock" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/inmem" + "github.com/influxdata/influxdb/mock" + platformtesting "github.com/influxdata/influxdb/testing" ) func initOrganizationService(f platformtesting.OrganizationFields, t *testing.T) (platform.OrganizationService, string, func()) { diff --git a/http/paging.go b/http/paging.go index 3be84de37d2..56686272251 100644 --- a/http/paging.go +++ b/http/paging.go @@ -6,9 +6,8 @@ import ( "net/url" "strconv" - "github.com/influxdata/platform/kit/errors" - - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/kit/errors" ) // decodeFindOptions returns a FindOptions decoded from http request. diff --git a/http/paging_test.go b/http/paging_test.go index 3c9d4d64ae4..fda0060c9c8 100644 --- a/http/paging_test.go +++ b/http/paging_test.go @@ -2,10 +2,11 @@ package http import ( "context" - "github.com/influxdata/platform" - "github.com/influxdata/platform/mock" "net/http/httptest" "testing" + + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/mock" ) func TestPaging_decodeFindOptions(t *testing.T) { diff --git a/http/proto.go b/http/proto.go index 742fedd426b..059096134ce 100644 --- a/http/proto.go +++ b/http/proto.go @@ -6,7 +6,7 @@ import ( "fmt" "net/http" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" "github.com/julienschmidt/httprouter" "go.uber.org/zap" ) diff --git a/http/proto_test.go b/http/proto_test.go index 93796a3efdd..0de228c4559 100644 --- a/http/proto_test.go +++ b/http/proto_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - "github.com/influxdata/platform" - "github.com/influxdata/platform/mock" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/mock" + platformtesting "github.com/influxdata/influxdb/testing" "go.uber.org/zap" ) diff --git a/http/proxy_query_service.go b/http/proxy_query_service.go index 47c0ddd49c8..939045d7478 100644 --- a/http/proxy_query_service.go +++ b/http/proxy_query_service.go @@ -9,7 +9,7 @@ import ( "net/http" "github.com/influxdata/flux" - "github.com/influxdata/platform/query" + "github.com/influxdata/influxdb/query" "github.com/julienschmidt/httprouter" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" diff --git a/http/query.go b/http/query.go index 746ee2b9cab..9122e1f365b 100644 --- a/http/query.go +++ b/http/query.go @@ -17,10 +17,10 @@ import ( "github.com/influxdata/flux/parser" "github.com/influxdata/flux/semantic" "github.com/influxdata/flux/values" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/kit/errors" + "github.com/influxdata/influxdb/query" "github.com/influxdata/influxql" - "github.com/influxdata/platform" - "github.com/influxdata/platform/kit/errors" - "github.com/influxdata/platform/query" ) // QueryRequest is a flux query request. diff --git a/http/query_handler.go b/http/query_handler.go index 8680b438e84..060adcfc81b 100644 --- a/http/query_handler.go +++ b/http/query_handler.go @@ -15,10 +15,10 @@ import ( "github.com/influxdata/flux/complete" "github.com/influxdata/flux/csv" "github.com/influxdata/flux/parser" - "github.com/influxdata/platform" - pcontext "github.com/influxdata/platform/context" - "github.com/influxdata/platform/kit/errors" - "github.com/influxdata/platform/query" + platform "github.com/influxdata/influxdb" + pcontext "github.com/influxdata/influxdb/context" + "github.com/influxdata/influxdb/kit/errors" + "github.com/influxdata/influxdb/query" "github.com/julienschmidt/httprouter" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" diff --git a/http/query_handler_test.go b/http/query_handler_test.go index b99b144a376..05b09c735a5 100644 --- a/http/query_handler_test.go +++ b/http/query_handler_test.go @@ -13,8 +13,8 @@ import ( "github.com/influxdata/flux/csv" "github.com/influxdata/flux/lang" - "github.com/influxdata/platform" - "github.com/influxdata/platform/query" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/query" ) func TestFluxService_Query(t *testing.T) { diff --git a/http/query_service.go b/http/query_service.go index c7a47573320..11536eaa8eb 100644 --- a/http/query_service.go +++ b/http/query_service.go @@ -8,7 +8,7 @@ import ( "github.com/influxdata/flux" "github.com/influxdata/flux/csv" - "github.com/influxdata/platform/query" + "github.com/influxdata/influxdb/query" "github.com/julienschmidt/httprouter" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" diff --git a/http/query_test.go b/http/query_test.go index 55a07a9b780..7ea44f78f6c 100644 --- a/http/query_test.go +++ b/http/query_test.go @@ -15,10 +15,10 @@ import ( "github.com/influxdata/flux/ast" "github.com/influxdata/flux/csv" "github.com/influxdata/flux/lang" - "github.com/influxdata/platform" - "github.com/influxdata/platform/mock" - "github.com/influxdata/platform/query" - _ "github.com/influxdata/platform/query/builtin" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/mock" + "github.com/influxdata/influxdb/query" + _ "github.com/influxdata/influxdb/query/builtin" ) func TestQueryRequest_WithDefaults(t *testing.T) { diff --git a/http/ready.go b/http/ready.go index 5406896d031..d212eb1f30d 100644 --- a/http/ready.go +++ b/http/ready.go @@ -6,7 +6,7 @@ import ( "net/http" "time" - "github.com/influxdata/platform/toml" + "github.com/influxdata/influxdb/toml" ) var up = time.Now() diff --git a/http/requests.go b/http/requests.go index a0172f92a43..165e826388c 100644 --- a/http/requests.go +++ b/http/requests.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) const ( diff --git a/http/requests_test.go b/http/requests_test.go index 7a0bed04203..b08e0e66bb7 100644 --- a/http/requests_test.go +++ b/http/requests_test.go @@ -7,8 +7,8 @@ import ( "reflect" "testing" - "github.com/influxdata/platform" - "github.com/influxdata/platform/mock" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/mock" ) func Test_queryOrganization(t *testing.T) { diff --git a/http/router.go b/http/router.go index a7c2488be61..bda10b19298 100644 --- a/http/router.go +++ b/http/router.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" "github.com/julienschmidt/httprouter" ) diff --git a/http/scraper_service.go b/http/scraper_service.go index 0a4008969a3..40a9698ca22 100644 --- a/http/scraper_service.go +++ b/http/scraper_service.go @@ -7,8 +7,8 @@ import ( "net/http" "path" - "github.com/influxdata/platform" - kerrors "github.com/influxdata/platform/kit/errors" + platform "github.com/influxdata/influxdb" + kerrors "github.com/influxdata/influxdb/kit/errors" "github.com/julienschmidt/httprouter" "go.uber.org/zap" ) diff --git a/http/scraper_service_test.go b/http/scraper_service_test.go index e4f0cad31ef..6463bfc889b 100644 --- a/http/scraper_service_test.go +++ b/http/scraper_service_test.go @@ -10,10 +10,10 @@ import ( "net/http/httptest" "testing" - "github.com/influxdata/platform" - "github.com/influxdata/platform/inmem" - "github.com/influxdata/platform/mock" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/inmem" + "github.com/influxdata/influxdb/mock" + platformtesting "github.com/influxdata/influxdb/testing" "github.com/julienschmidt/httprouter" ) diff --git a/http/server.go b/http/server.go index 915c43e24c1..c888f209bce 100644 --- a/http/server.go +++ b/http/server.go @@ -10,7 +10,7 @@ import ( "syscall" "time" - "github.com/influxdata/platform/logger" + "github.com/influxdata/influxdb/logger" "go.uber.org/zap" ) diff --git a/http/session_handler.go b/http/session_handler.go index 1368a6276b5..32a981c72b5 100644 --- a/http/session_handler.go +++ b/http/session_handler.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" "github.com/julienschmidt/httprouter" "go.uber.org/zap" ) diff --git a/http/session_test.go b/http/session_test.go index fc9a3d37938..f3924f8957b 100644 --- a/http/session_test.go +++ b/http/session_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/influxdata/platform" - platformhttp "github.com/influxdata/platform/http" - "github.com/influxdata/platform/mock" + platform "github.com/influxdata/influxdb" + platformhttp "github.com/influxdata/influxdb/http" + "github.com/influxdata/influxdb/mock" ) // NewMockSessionBackend returns a SessionBackend with mock services. diff --git a/http/source_proxy_service.go b/http/source_proxy_service.go index 1ca61c221a7..5b227661cd8 100644 --- a/http/source_proxy_service.go +++ b/http/source_proxy_service.go @@ -11,9 +11,9 @@ import ( "strings" "github.com/influxdata/flux/lang" - "github.com/influxdata/platform" - "github.com/influxdata/platform/query" - "github.com/influxdata/platform/query/influxql" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/query" + "github.com/influxdata/influxdb/query/influxql" ) type SourceProxyQueryService struct { diff --git a/http/source_service.go b/http/source_service.go index bf6e6f3af4a..a4d00bbc524 100644 --- a/http/source_service.go +++ b/http/source_service.go @@ -8,15 +8,14 @@ import ( "net/http" "path" - "go.uber.org/zap" - "github.com/influxdata/flux" "github.com/influxdata/flux/csv" "github.com/influxdata/flux/lang" - "github.com/influxdata/platform" - "github.com/influxdata/platform/query" - "github.com/influxdata/platform/query/influxql" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/query" + "github.com/influxdata/influxdb/query/influxql" "github.com/julienschmidt/httprouter" + "go.uber.org/zap" ) const ( diff --git a/http/source_service_test.go b/http/source_service_test.go index aa0bf58cc36..b24ca6d62be 100644 --- a/http/source_service_test.go +++ b/http/source_service_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) func Test_newSourceResponse(t *testing.T) { diff --git a/http/task_service.go b/http/task_service.go index 96083b4c65c..7dc6584de6a 100644 --- a/http/task_service.go +++ b/http/task_service.go @@ -13,10 +13,10 @@ import ( "strings" "time" - "github.com/influxdata/platform" - pcontext "github.com/influxdata/platform/context" - kerrors "github.com/influxdata/platform/kit/errors" - "github.com/influxdata/platform/task/backend" + platform "github.com/influxdata/influxdb" + pcontext "github.com/influxdata/influxdb/context" + kerrors "github.com/influxdata/influxdb/kit/errors" + "github.com/influxdata/influxdb/task/backend" "github.com/julienschmidt/httprouter" "go.uber.org/zap" ) diff --git a/http/task_service_test.go b/http/task_service_test.go index 12cb993e5e2..af2f3505280 100644 --- a/http/task_service_test.go +++ b/http/task_service_test.go @@ -10,11 +10,11 @@ import ( "os" "testing" - "github.com/influxdata/platform" - pcontext "github.com/influxdata/platform/context" - "github.com/influxdata/platform/logger" - "github.com/influxdata/platform/mock" - _ "github.com/influxdata/platform/query/builtin" + platform "github.com/influxdata/influxdb" + pcontext "github.com/influxdata/influxdb/context" + "github.com/influxdata/influxdb/logger" + "github.com/influxdata/influxdb/mock" + _ "github.com/influxdata/influxdb/query/builtin" "github.com/julienschmidt/httprouter" ) diff --git a/http/task_test.go b/http/task_test.go index 93a9b33cd57..642d0ff54b8 100644 --- a/http/task_test.go +++ b/http/task_test.go @@ -5,15 +5,15 @@ import ( "net/http/httptest" "testing" - "github.com/influxdata/platform" - "github.com/influxdata/platform/http" - "github.com/influxdata/platform/inmem" - "github.com/influxdata/platform/mock" - _ "github.com/influxdata/platform/query/builtin" - "github.com/influxdata/platform/task" - "github.com/influxdata/platform/task/backend" - tmock "github.com/influxdata/platform/task/mock" - "github.com/influxdata/platform/task/servicetest" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/http" + "github.com/influxdata/influxdb/inmem" + "github.com/influxdata/influxdb/mock" + _ "github.com/influxdata/influxdb/query/builtin" + "github.com/influxdata/influxdb/task" + "github.com/influxdata/influxdb/task/backend" + tmock "github.com/influxdata/influxdb/task/mock" + "github.com/influxdata/influxdb/task/servicetest" "go.uber.org/zap/zaptest" ) diff --git a/http/telegraf.go b/http/telegraf.go index 14803951038..44020bdb0e7 100644 --- a/http/telegraf.go +++ b/http/telegraf.go @@ -8,9 +8,9 @@ import ( "strings" "github.com/golang/gddo/httputil" - "github.com/influxdata/platform" - pctx "github.com/influxdata/platform/context" - "github.com/influxdata/platform/kit/errors" + platform "github.com/influxdata/influxdb" + pctx "github.com/influxdata/influxdb/context" + "github.com/influxdata/influxdb/kit/errors" "github.com/julienschmidt/httprouter" "go.uber.org/zap" ) diff --git a/http/telegraf_test.go b/http/telegraf_test.go index 511216fecae..999e90a9fb0 100644 --- a/http/telegraf_test.go +++ b/http/telegraf_test.go @@ -10,10 +10,10 @@ import ( "strings" "testing" - "github.com/influxdata/platform" - "github.com/influxdata/platform/mock" - "github.com/influxdata/platform/telegraf/plugins/inputs" - "github.com/influxdata/platform/telegraf/plugins/outputs" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/mock" + "github.com/influxdata/influxdb/telegraf/plugins/inputs" + "github.com/influxdata/influxdb/telegraf/plugins/outputs" "go.uber.org/zap/zaptest" ) diff --git a/http/usage_service.go b/http/usage_service.go index 865380c8264..ec03ec7a5e0 100644 --- a/http/usage_service.go +++ b/http/usage_service.go @@ -6,7 +6,7 @@ import ( "net/http" "time" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" "github.com/julienschmidt/httprouter" "go.uber.org/zap" ) diff --git a/http/user_resource_mapping_service.go b/http/user_resource_mapping_service.go index 812cb4b82d2..565098447ff 100644 --- a/http/user_resource_mapping_service.go +++ b/http/user_resource_mapping_service.go @@ -8,8 +8,8 @@ import ( "net/http" "path" - "github.com/influxdata/platform" - kerrors "github.com/influxdata/platform/kit/errors" + platform "github.com/influxdata/influxdb" + kerrors "github.com/influxdata/influxdb/kit/errors" "github.com/julienschmidt/httprouter" ) diff --git a/http/user_resource_mapping_test.go b/http/user_resource_mapping_test.go index 0df279f6c58..57b6a51debf 100644 --- a/http/user_resource_mapping_test.go +++ b/http/user_resource_mapping_test.go @@ -10,8 +10,8 @@ import ( "net/http/httptest" "testing" - "github.com/influxdata/platform" - "github.com/influxdata/platform/mock" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/mock" "github.com/julienschmidt/httprouter" ) diff --git a/http/user_service.go b/http/user_service.go index 3deea96a03f..e73ee7ba6b9 100644 --- a/http/user_service.go +++ b/http/user_service.go @@ -9,9 +9,9 @@ import ( "path" "strconv" - "github.com/influxdata/platform" - platcontext "github.com/influxdata/platform/context" - kerrors "github.com/influxdata/platform/kit/errors" + platform "github.com/influxdata/influxdb" + platcontext "github.com/influxdata/influxdb/context" + kerrors "github.com/influxdata/influxdb/kit/errors" "github.com/julienschmidt/httprouter" ) diff --git a/http/user_test.go b/http/user_test.go index 7ff20b09f41..5dc078f980a 100644 --- a/http/user_test.go +++ b/http/user_test.go @@ -5,9 +5,9 @@ import ( "net/http/httptest" "testing" - "github.com/influxdata/platform" - "github.com/influxdata/platform/inmem" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/inmem" + platformtesting "github.com/influxdata/influxdb/testing" ) func initUserService(f platformtesting.UserFields, t *testing.T) (platform.UserService, string, func()) { diff --git a/http/view_service.go b/http/view_service.go index 8272ffc0d33..9685d3395f7 100644 --- a/http/view_service.go +++ b/http/view_service.go @@ -9,7 +9,7 @@ import ( "fmt" "net/http" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" "github.com/julienschmidt/httprouter" "go.uber.org/zap" ) @@ -40,8 +40,9 @@ const ( // NewViewHandler returns a new instance of ViewHandler. func NewViewHandler(mappingService platform.UserResourceMappingService, labelService platform.LabelService, userService platform.UserService) *ViewHandler { h := &ViewHandler{ - Router: NewRouter(), - Logger: zap.NewNop(), + Router: NewRouter(), + Logger: zap.NewNop(), + UserResourceMappingService: mappingService, LabelService: labelService, UserService: userService, diff --git a/http/view_test.go b/http/view_test.go index 058bf2c13fc..078dd649160 100644 --- a/http/view_test.go +++ b/http/view_test.go @@ -11,9 +11,9 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform" - "github.com/influxdata/platform/mock" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/mock" + platformtesting "github.com/influxdata/influxdb/testing" "github.com/julienschmidt/httprouter" "github.com/yudai/gojsondiff" "github.com/yudai/gojsondiff/formatter" diff --git a/http/write_handler.go b/http/write_handler.go index ba46ea1c31e..5fae6548d79 100644 --- a/http/write_handler.go +++ b/http/write_handler.go @@ -9,12 +9,12 @@ import ( "net/http" "time" - "github.com/influxdata/platform" - pcontext "github.com/influxdata/platform/context" - "github.com/influxdata/platform/kit/errors" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/storage" - "github.com/influxdata/platform/tsdb" + platform "github.com/influxdata/influxdb" + pcontext "github.com/influxdata/influxdb/context" + "github.com/influxdata/influxdb/kit/errors" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/storage" + "github.com/influxdata/influxdb/tsdb" "github.com/julienschmidt/httprouter" "go.uber.org/zap" ) diff --git a/http/write_handler_test.go b/http/write_handler_test.go index c0afccc7057..503cb44b4e3 100644 --- a/http/write_handler_test.go +++ b/http/write_handler_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) func TestWriteService_Write(t *testing.T) { diff --git a/id.go b/id.go index 4c83dfd1ce5..5bf262ab9da 100644 --- a/id.go +++ b/id.go @@ -1,4 +1,4 @@ -package platform +package influxdb import ( "encoding/binary" diff --git a/id_test.go b/id_test.go index 7c28f1c0bc9..13bf7ce173d 100644 --- a/id_test.go +++ b/id_test.go @@ -1,4 +1,4 @@ -package platform_test +package influxdb_test import ( "bytes" @@ -7,8 +7,8 @@ import ( "reflect" "testing" - "github.com/influxdata/platform" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + platformtesting "github.com/influxdata/influxdb/testing" ) func TestIDFromString(t *testing.T) { @@ -206,7 +206,7 @@ func TestID_GoString(t *testing.T) { } sharpV := fmt.Sprintf("%#v", x) - want := `platform_test.idGoStringTester{ID:"` + idString + `"}` + want := `influxdb_test.idGoStringTester{ID:"` + idString + `"}` if sharpV != want { t.Fatalf("bad GoString: got %q, want %q", sharpV, want) } diff --git a/inmem/auth_service.go b/inmem/auth_service.go index 7b83b61ff4e..6076879dd42 100644 --- a/inmem/auth_service.go +++ b/inmem/auth_service.go @@ -3,7 +3,7 @@ package inmem import ( "context" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) func (s *Service) loadAuthorization(ctx context.Context, id platform.ID) (*platform.Authorization, *platform.Error) { diff --git a/inmem/auth_test.go b/inmem/auth_test.go index f76b6db3418..bd28e580619 100644 --- a/inmem/auth_test.go +++ b/inmem/auth_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/influxdata/platform" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + platformtesting "github.com/influxdata/influxdb/testing" ) func initAuthorizationService(f platformtesting.AuthorizationFields, t *testing.T) (platform.AuthorizationService, string, func()) { diff --git a/inmem/basic_auth.go b/inmem/basic_auth.go index 1ccff30f2d8..f14013152ed 100644 --- a/inmem/basic_auth.go +++ b/inmem/basic_auth.go @@ -3,7 +3,7 @@ package inmem import ( "context" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" "golang.org/x/crypto/bcrypt" ) diff --git a/inmem/basic_auth_test.go b/inmem/basic_auth_test.go index aef2ed96f86..1e800f3ea60 100644 --- a/inmem/basic_auth_test.go +++ b/inmem/basic_auth_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/influxdata/platform" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + platformtesting "github.com/influxdata/influxdb/testing" ) func initBasicAuthService(f platformtesting.UserFields, t *testing.T) (platform.BasicAuthService, func()) { diff --git a/inmem/bucket_service.go b/inmem/bucket_service.go index 079137c503c..986cbae502f 100644 --- a/inmem/bucket_service.go +++ b/inmem/bucket_service.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) var ( diff --git a/inmem/bucket_test.go b/inmem/bucket_test.go index 53d7a27c659..ccb9de6366f 100644 --- a/inmem/bucket_test.go +++ b/inmem/bucket_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/influxdata/platform" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + platformtesting "github.com/influxdata/influxdb/testing" ) func initBucketService(f platformtesting.BucketFields, t *testing.T) (platform.BucketService, string, func()) { diff --git a/inmem/dashboard.go b/inmem/dashboard.go index 7929ccfbe4f..302f73185e9 100644 --- a/inmem/dashboard.go +++ b/inmem/dashboard.go @@ -5,7 +5,7 @@ import ( "fmt" "sync" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) func (s *Service) loadDashboard(ctx context.Context, id platform.ID) (*platform.Dashboard, *platform.Error) { diff --git a/inmem/dashboard_test.go b/inmem/dashboard_test.go index ee275918a6e..ffb3d99915c 100644 --- a/inmem/dashboard_test.go +++ b/inmem/dashboard_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/influxdata/platform" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + platformtesting "github.com/influxdata/influxdb/testing" ) func initDashboardService(f platformtesting.DashboardFields, t *testing.T) (platform.DashboardService, string, func()) { diff --git a/inmem/dbrp_mapping_service.go b/inmem/dbrp_mapping_service.go index 3817240e7b0..1ee47789279 100644 --- a/inmem/dbrp_mapping_service.go +++ b/inmem/dbrp_mapping_service.go @@ -6,7 +6,7 @@ import ( "fmt" "path" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) var ( diff --git a/inmem/dbrp_mapping_test.go b/inmem/dbrp_mapping_test.go index 2c959604a75..cfa5d27d0a1 100644 --- a/inmem/dbrp_mapping_test.go +++ b/inmem/dbrp_mapping_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/influxdata/platform" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + platformtesting "github.com/influxdata/influxdb/testing" ) func initDBRPMappingService(f platformtesting.DBRPMappingFields, t *testing.T) (platform.DBRPMappingService, func()) { diff --git a/inmem/kv.go b/inmem/kv.go index 0a20b5af91a..a4a40b7fd58 100644 --- a/inmem/kv.go +++ b/inmem/kv.go @@ -7,7 +7,7 @@ import ( "sync" "github.com/google/btree" - "github.com/influxdata/platform/kv" + "github.com/influxdata/influxdb/kv" ) // KVStore is an in memory btree backed kv.Store. diff --git a/inmem/kv_test.go b/inmem/kv_test.go index 5c5e5a1d4c9..c1548318177 100644 --- a/inmem/kv_test.go +++ b/inmem/kv_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - "github.com/influxdata/platform" - "github.com/influxdata/platform/inmem" - "github.com/influxdata/platform/kv" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/inmem" + "github.com/influxdata/influxdb/kv" + platformtesting "github.com/influxdata/influxdb/testing" ) func initExampleService(f platformtesting.UserFields, t *testing.T) (platform.UserService, string, func()) { diff --git a/inmem/label_service.go b/inmem/label_service.go index 2bbbaa5f6d0..9111c615359 100644 --- a/inmem/label_service.go +++ b/inmem/label_service.go @@ -5,7 +5,7 @@ import ( "fmt" "path" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) func encodeLabelKey(resourceID platform.ID, name string) string { diff --git a/inmem/label_test.go b/inmem/label_test.go index 61f2f3db37f..e3d91d8dccb 100644 --- a/inmem/label_test.go +++ b/inmem/label_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/influxdata/platform" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + platformtesting "github.com/influxdata/influxdb/testing" ) func initLabelService(f platformtesting.LabelFields, t *testing.T) (platform.LabelService, string, func()) { diff --git a/inmem/lookup_service.go b/inmem/lookup_service.go index 9a87ab49ab1..eae82da1144 100644 --- a/inmem/lookup_service.go +++ b/inmem/lookup_service.go @@ -3,7 +3,7 @@ package inmem import ( "context" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) var _ platform.LookupService = (*Service)(nil) diff --git a/inmem/lookup_service_test.go b/inmem/lookup_service_test.go index 1c6ef718429..2641ef235a3 100644 --- a/inmem/lookup_service_test.go +++ b/inmem/lookup_service_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/influxdata/platform" - "github.com/influxdata/platform/mock" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/mock" + platformtesting "github.com/influxdata/influxdb/testing" ) var ( diff --git a/inmem/macro.go b/inmem/macro.go index 3b13577bf7e..50bbd98d59c 100644 --- a/inmem/macro.go +++ b/inmem/macro.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) // FindMacroByID implements the platform.MacroService interface diff --git a/inmem/macro_test.go b/inmem/macro_test.go index c586cec54cc..32d4e6dda81 100644 --- a/inmem/macro_test.go +++ b/inmem/macro_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/influxdata/platform" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + platformtesting "github.com/influxdata/influxdb/testing" ) func initMacroService(f platformtesting.MacroFields, t *testing.T) (platform.MacroService, string, func()) { diff --git a/inmem/onboarding.go b/inmem/onboarding.go index c174f57e36a..5129af1bb63 100644 --- a/inmem/onboarding.go +++ b/inmem/onboarding.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) const onboardingKey = "onboarding_key" diff --git a/inmem/onboarding_test.go b/inmem/onboarding_test.go index 668dde5c527..47e987daa4a 100644 --- a/inmem/onboarding_test.go +++ b/inmem/onboarding_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/influxdata/platform" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + platformtesting "github.com/influxdata/influxdb/testing" ) func initOnboardingService(f platformtesting.OnboardingFields, t *testing.T) (platform.OnboardingService, func()) { diff --git a/inmem/organization_service.go b/inmem/organization_service.go index 687f8a0df3f..70096b00bf0 100644 --- a/inmem/organization_service.go +++ b/inmem/organization_service.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) const ( diff --git a/inmem/organization_test.go b/inmem/organization_test.go index f927fb497bd..d94c29dd286 100644 --- a/inmem/organization_test.go +++ b/inmem/organization_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/influxdata/platform" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + platformtesting "github.com/influxdata/influxdb/testing" ) func initOrganizationService(f platformtesting.OrganizationFields, t *testing.T) (platform.OrganizationService, string, func()) { diff --git a/inmem/scraper.go b/inmem/scraper.go index 50b264df301..6bd565efc3a 100644 --- a/inmem/scraper.go +++ b/inmem/scraper.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) const ( diff --git a/inmem/scraper_test.go b/inmem/scraper_test.go index 98f748284c9..de7d58fe8d9 100644 --- a/inmem/scraper_test.go +++ b/inmem/scraper_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/influxdata/platform" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + platformtesting "github.com/influxdata/influxdb/testing" ) func initScraperTargetStoreService(f platformtesting.TargetFields, t *testing.T) (platform.ScraperTargetStoreService, string, func()) { diff --git a/inmem/service.go b/inmem/service.go index 942b2aed28a..ba9218d52e3 100644 --- a/inmem/service.go +++ b/inmem/service.go @@ -4,9 +4,9 @@ import ( "sync" "time" - "github.com/influxdata/platform" - "github.com/influxdata/platform/rand" - "github.com/influxdata/platform/snowflake" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/rand" + "github.com/influxdata/influxdb/snowflake" ) // OpPrefix is the op prefix. diff --git a/inmem/telegraf.go b/inmem/telegraf.go index e9ee4c1471c..f08cd886b1d 100644 --- a/inmem/telegraf.go +++ b/inmem/telegraf.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) var _ platform.TelegrafConfigStore = new(Service) diff --git a/inmem/telegraf_test.go b/inmem/telegraf_test.go index 67de9df3aa7..94cd8563952 100644 --- a/inmem/telegraf_test.go +++ b/inmem/telegraf_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/influxdata/platform" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + platformtesting "github.com/influxdata/influxdb/testing" ) func initTelegrafStore(f platformtesting.TelegrafConfigFields, t *testing.T) (platform.TelegrafConfigStore, func()) { diff --git a/inmem/user_resource_mapping_service.go b/inmem/user_resource_mapping_service.go index 2db9515f36e..31f694bb86e 100644 --- a/inmem/user_resource_mapping_service.go +++ b/inmem/user_resource_mapping_service.go @@ -5,7 +5,7 @@ import ( "fmt" "path" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) func encodeUserResourceMappingKey(resourceID, userID platform.ID) string { diff --git a/inmem/user_resource_mapping_test.go b/inmem/user_resource_mapping_test.go index 1a602a50c04..3b98e2994e6 100644 --- a/inmem/user_resource_mapping_test.go +++ b/inmem/user_resource_mapping_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/influxdata/platform" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + platformtesting "github.com/influxdata/influxdb/testing" ) func initUserResourceMappingService(f platformtesting.UserResourceFields, t *testing.T) (platform.UserResourceMappingService, func()) { diff --git a/inmem/user_service.go b/inmem/user_service.go index 4a5b3cd1088..66f11726c21 100644 --- a/inmem/user_service.go +++ b/inmem/user_service.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) var _ platform.UserService = (*Service)(nil) diff --git a/inmem/user_test.go b/inmem/user_test.go index a50bf0017e5..f86839c1c3b 100644 --- a/inmem/user_test.go +++ b/inmem/user_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/influxdata/platform" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + platformtesting "github.com/influxdata/influxdb/testing" ) func initUserService(f platformtesting.UserFields, t *testing.T) (platform.UserService, string, func()) { diff --git a/inmem/view.go b/inmem/view.go index 970279e8013..cb15c72ff58 100644 --- a/inmem/view.go +++ b/inmem/view.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) func (s *Service) loadView(ctx context.Context, id platform.ID) (*platform.View, *platform.Error) { diff --git a/inmem/view_test.go b/inmem/view_test.go index 0421b2db066..bffa030c30b 100644 --- a/inmem/view_test.go +++ b/inmem/view_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/influxdata/platform" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + platformtesting "github.com/influxdata/influxdb/testing" ) func initViewService(f platformtesting.ViewFields, t *testing.T) (platform.ViewService, string, func()) { diff --git a/keyvalue_log.go b/keyvalue_log.go index da1e2c50ea8..6f5d6352550 100644 --- a/keyvalue_log.go +++ b/keyvalue_log.go @@ -1,4 +1,4 @@ -package platform +package influxdb import ( "context" diff --git a/kit/grpc/errors.go b/kit/grpc/errors.go index 901dd34cd35..b3b167800c2 100644 --- a/kit/grpc/errors.go +++ b/kit/grpc/errors.go @@ -4,7 +4,7 @@ import ( "encoding/json" "errors" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/kit/grpc/errors_test.go b/kit/grpc/errors_test.go index 3c81806d1b5..a9f1b2c996f 100644 --- a/kit/grpc/errors_test.go +++ b/kit/grpc/errors_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/kit/prom/example_test.go b/kit/prom/example_test.go index b60aef96998..f955d00197b 100644 --- a/kit/prom/example_test.go +++ b/kit/prom/example_test.go @@ -7,7 +7,7 @@ import ( "net/http" "time" - "github.com/influxdata/platform/kit/prom" + "github.com/influxdata/influxdb/kit/prom" "github.com/prometheus/client_golang/prometheus" ) diff --git a/kit/prom/promtest/promtest_test.go b/kit/prom/promtest/promtest_test.go index 95f44e1e8f4..70e29de4e9d 100644 --- a/kit/prom/promtest/promtest_test.go +++ b/kit/prom/promtest/promtest_test.go @@ -9,8 +9,8 @@ import ( "strings" "testing" - "github.com/influxdata/platform/kit/prom" - "github.com/influxdata/platform/kit/prom/promtest" + "github.com/influxdata/influxdb/kit/prom" + "github.com/influxdata/influxdb/kit/prom/promtest" "github.com/prometheus/client_golang/prometheus" dto "github.com/prometheus/client_model/go" ) diff --git a/kit/prom/registry_test.go b/kit/prom/registry_test.go index b69536563e9..9629f957970 100644 --- a/kit/prom/registry_test.go +++ b/kit/prom/registry_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/influxdata/platform/kit/prom" + "github.com/influxdata/influxdb/kit/prom" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" diff --git a/kv/cursor_test.go b/kv/cursor_test.go index 358cd0e5b24..c3af535a844 100644 --- a/kv/cursor_test.go +++ b/kv/cursor_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/influxdata/platform/kv" + "github.com/influxdata/influxdb/kv" ) func TestStaticCursor_First(t *testing.T) { diff --git a/kv/example.go b/kv/example.go index 0768f6e1c4a..56508be9c0a 100644 --- a/kv/example.go +++ b/kv/example.go @@ -7,7 +7,7 @@ import ( "encoding/json" "fmt" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) var ( diff --git a/label.go b/label.go index aca6ca3d3a3..0676c79b53d 100644 --- a/label.go +++ b/label.go @@ -1,4 +1,4 @@ -package platform +package influxdb import ( "context" diff --git a/label_test.go b/label_test.go index 0d93514446d..c6d2d924ed5 100644 --- a/label_test.go +++ b/label_test.go @@ -1,10 +1,10 @@ -package platform_test +package influxdb_test import ( "testing" - "github.com/influxdata/platform" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + platformtesting "github.com/influxdata/influxdb/testing" ) func TestLabelValidate(t *testing.T) { diff --git a/logger/fields.go b/logger/fields.go index ddc49571e09..3bbb312d621 100644 --- a/logger/fields.go +++ b/logger/fields.go @@ -3,7 +3,7 @@ package logger import ( "time" - "github.com/influxdata/platform/pkg/snowflake" + "github.com/influxdata/influxdb/pkg/snowflake" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) diff --git a/lookup.go b/lookup.go index ee065f32d8f..1ff470347a2 100644 --- a/lookup.go +++ b/lookup.go @@ -1,4 +1,4 @@ -package platform +package influxdb import ( "context" diff --git a/macro.go b/macro.go index 535bfb87898..db2a2a9e5db 100644 --- a/macro.go +++ b/macro.go @@ -1,4 +1,4 @@ -package platform +package influxdb import ( "context" diff --git a/macro_test.go b/macro_test.go index 2a6f87660a6..16c29b48cba 100644 --- a/macro_test.go +++ b/macro_test.go @@ -1,12 +1,12 @@ -package platform_test +package influxdb_test import ( "encoding/json" "reflect" "testing" - "github.com/influxdata/platform" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + platformtesting "github.com/influxdata/influxdb/testing" ) var macroTestID = "debac1e0deadbeef" diff --git a/measurement.go b/measurement.go index 865662ec0b2..fa29c5b4ea5 100644 --- a/measurement.go +++ b/measurement.go @@ -1,4 +1,4 @@ -package platform +package influxdb import "fmt" diff --git a/mock/auth_service.go b/mock/auth_service.go index 8f17a010db5..53da865e5dc 100644 --- a/mock/auth_service.go +++ b/mock/auth_service.go @@ -3,7 +3,7 @@ package mock import ( "context" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" "go.uber.org/zap" ) diff --git a/mock/bucket_service.go b/mock/bucket_service.go index 737431a0734..7fbc50f6bb6 100644 --- a/mock/bucket_service.go +++ b/mock/bucket_service.go @@ -3,7 +3,7 @@ package mock import ( "context" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" "go.uber.org/zap" ) diff --git a/mock/dashboard_service.go b/mock/dashboard_service.go index 73830aa59af..34c806c9b62 100644 --- a/mock/dashboard_service.go +++ b/mock/dashboard_service.go @@ -3,7 +3,7 @@ package mock import ( "context" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) var _ platform.DashboardService = &DashboardService{} diff --git a/mock/dbrp_mapping.go b/mock/dbrp_mapping.go index a576f1105f7..69d169b8075 100644 --- a/mock/dbrp_mapping.go +++ b/mock/dbrp_mapping.go @@ -3,7 +3,7 @@ package mock import ( "context" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) type DBRPMappingService struct { diff --git a/mock/generators.go b/mock/generators.go index f95d71aff2d..782ad19dab9 100644 --- a/mock/generators.go +++ b/mock/generators.go @@ -3,7 +3,7 @@ package mock import ( "testing" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) // IDGenerator is mock implementation of platform.IDGenerator. diff --git a/mock/label_service.go b/mock/label_service.go index f8243c052bc..9bdf46cf64b 100644 --- a/mock/label_service.go +++ b/mock/label_service.go @@ -3,7 +3,7 @@ package mock import ( "context" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) var _ platform.LabelService = &LabelService{} diff --git a/mock/lookup_service.go b/mock/lookup_service.go index 682b4d14d76..a2d472ae654 100644 --- a/mock/lookup_service.go +++ b/mock/lookup_service.go @@ -3,7 +3,7 @@ package mock import ( "context" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) // LookupService provides field lookup for the resource and ID. diff --git a/mock/macro_service.go b/mock/macro_service.go index 5d995631463..b8f7f4de27d 100644 --- a/mock/macro_service.go +++ b/mock/macro_service.go @@ -3,7 +3,7 @@ package mock import ( "context" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) var _ platform.MacroService = &MacroService{} diff --git a/mock/nats.go b/mock/nats.go index ec611db24b5..af0bf346dfa 100644 --- a/mock/nats.go +++ b/mock/nats.go @@ -5,7 +5,7 @@ import ( "io" "sync" - "github.com/influxdata/platform/nats" + "github.com/influxdata/influxdb/nats" ) // NatsServer is the mocked nats server based buffered channel. diff --git a/mock/nats_test.go b/mock/nats_test.go index 156e0ec6226..4772c8718e0 100644 --- a/mock/nats_test.go +++ b/mock/nats_test.go @@ -6,7 +6,7 @@ import ( "sync" "testing" - "github.com/influxdata/platform/nats" + "github.com/influxdata/influxdb/nats" ) // TestNats use the mocked nats publisher and subscriber diff --git a/mock/onboarding_service.go b/mock/onboarding_service.go index 4d8c7972865..da6afe9ec7b 100644 --- a/mock/onboarding_service.go +++ b/mock/onboarding_service.go @@ -3,7 +3,7 @@ package mock import ( "context" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) var _ platform.OnboardingService = (*OnboardingService)(nil) diff --git a/mock/operation_log_service.go b/mock/operation_log_service.go index a5b9893bf67..46cb8b8669f 100644 --- a/mock/operation_log_service.go +++ b/mock/operation_log_service.go @@ -3,7 +3,7 @@ package mock import ( "context" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) var _ platform.BucketOperationLogService = (*BucketOperationLogService)(nil) diff --git a/mock/org_service.go b/mock/org_service.go index edc0ece46a3..48213da49bb 100644 --- a/mock/org_service.go +++ b/mock/org_service.go @@ -3,7 +3,7 @@ package mock import ( "context" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) var _ platform.OrganizationService = &OrganizationService{} diff --git a/mock/points_writer.go b/mock/points_writer.go index 10c82111bec..215c29266e0 100644 --- a/mock/points_writer.go +++ b/mock/points_writer.go @@ -3,7 +3,7 @@ package mock import ( "sync" - "github.com/influxdata/platform/models" + "github.com/influxdata/influxdb/models" ) // PointsWriter is a mock structure for writing points. diff --git a/mock/proto.go b/mock/proto.go index 9a24074683f..e012a1f6fc2 100644 --- a/mock/proto.go +++ b/mock/proto.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) // ProtoService is a mock implementation of a retention.ProtoService, which diff --git a/mock/proxy_query_service.go b/mock/proxy_query_service.go index cf93e1991cf..e6e7ab54120 100644 --- a/mock/proxy_query_service.go +++ b/mock/proxy_query_service.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/influxdata/platform/query" + "github.com/influxdata/influxdb/query" ) var _ query.ProxyQueryService = (*ProxyQueryService)(nil) diff --git a/mock/scraper_service.go b/mock/scraper_service.go index bf0dbdb715f..a770b286898 100644 --- a/mock/scraper_service.go +++ b/mock/scraper_service.go @@ -3,7 +3,7 @@ package mock import ( "context" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) var _ platform.ScraperTargetStoreService = &ScraperTargetStoreService{} diff --git a/mock/secret_service.go b/mock/secret_service.go index a10f562959b..ca018ae9222 100644 --- a/mock/secret_service.go +++ b/mock/secret_service.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) // SecretService is a mock implementation of a retention.SecretService, which diff --git a/mock/session_service.go b/mock/session_service.go index fe111c34455..34634006939 100644 --- a/mock/session_service.go +++ b/mock/session_service.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) // SessionService is a mock implementation of a retention.SessionService, which diff --git a/mock/source_service.go b/mock/source_service.go index 9cc379ef49c..2db5ddd8a13 100644 --- a/mock/source_service.go +++ b/mock/source_service.go @@ -3,7 +3,7 @@ package mock import ( "context" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) var _ platform.SourceService = (*SourceService)(nil) diff --git a/mock/storage_reads.go b/mock/storage_reads.go index acfef80ef1b..acb8176c9c7 100644 --- a/mock/storage_reads.go +++ b/mock/storage_reads.go @@ -1,10 +1,10 @@ package mock import ( - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/storage/reads" - "github.com/influxdata/platform/storage/reads/datatypes" - "github.com/influxdata/platform/tsdb/cursors" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/storage/reads" + "github.com/influxdata/influxdb/storage/reads/datatypes" + "github.com/influxdata/influxdb/tsdb/cursors" "google.golang.org/grpc/metadata" ) diff --git a/mock/task_service.go b/mock/task_service.go index 111b4d481ad..f9b1618a6f3 100644 --- a/mock/task_service.go +++ b/mock/task_service.go @@ -3,7 +3,7 @@ package mock import ( "context" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) var _ platform.TaskService = &TaskService{} diff --git a/mock/telegraf_service.go b/mock/telegraf_service.go index e1e994d1923..122534908b2 100644 --- a/mock/telegraf_service.go +++ b/mock/telegraf_service.go @@ -3,7 +3,7 @@ package mock import ( "context" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) var _ platform.TelegrafConfigStore = &TelegrafConfigStore{} diff --git a/mock/user_resource_mapping_service.go b/mock/user_resource_mapping_service.go index 323b0d926b3..d4696f5fb1f 100644 --- a/mock/user_resource_mapping_service.go +++ b/mock/user_resource_mapping_service.go @@ -3,7 +3,7 @@ package mock import ( "context" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) var _ platform.UserResourceMappingService = &UserResourceMappingService{} diff --git a/mock/user_service.go b/mock/user_service.go index 16e1830a4ba..99838cd7dd9 100644 --- a/mock/user_service.go +++ b/mock/user_service.go @@ -3,7 +3,7 @@ package mock import ( "context" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) var _ platform.UserService = (*UserService)(nil) diff --git a/mock/view_service.go b/mock/view_service.go index d373fa65cd6..37b5989104f 100644 --- a/mock/view_service.go +++ b/mock/view_service.go @@ -3,7 +3,7 @@ package mock import ( "context" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) var _ platform.ViewService = &ViewService{} diff --git a/mock/write_service.go b/mock/write_service.go index fffd2b5e413..2e62f4d3a2d 100644 --- a/mock/write_service.go +++ b/mock/write_service.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) // WriteService writes data read from the reader. diff --git a/models/inline_fnv.go b/models/inline_fnv.go index 47dcac10bfe..eec1ae8b013 100644 --- a/models/inline_fnv.go +++ b/models/inline_fnv.go @@ -1,4 +1,4 @@ -package models // import "github.com/influxdata/platform/models" +package models // import "github.com/influxdata/influxdb/models" // from stdlib hash/fnv/fnv.go const ( diff --git a/models/inline_fnv_test.go b/models/inline_fnv_test.go index 2dab254f9a1..62bc53ec0dc 100644 --- a/models/inline_fnv_test.go +++ b/models/inline_fnv_test.go @@ -5,7 +5,7 @@ import ( "testing" "testing/quick" - "github.com/influxdata/platform/models" + "github.com/influxdata/influxdb/models" ) func TestInlineFNV64aEquivalenceFuzz(t *testing.T) { diff --git a/models/inline_strconv_parse.go b/models/inline_strconv_parse.go index 241dc591839..8db4837384a 100644 --- a/models/inline_strconv_parse.go +++ b/models/inline_strconv_parse.go @@ -1,4 +1,4 @@ -package models // import "github.com/influxdata/platform/models" +package models // import "github.com/influxdata/influxdb/models" import ( "reflect" diff --git a/models/points.go b/models/points.go index 5486b23db99..a11b2df18e8 100644 --- a/models/points.go +++ b/models/points.go @@ -1,5 +1,5 @@ // Package models implements basic objects used throughout the TICK stack. -package models // import "github.com/influxdata/platform/models" +package models // import "github.com/influxdata/influxdb/models" import ( "bytes" @@ -15,7 +15,7 @@ import ( "unicode" "unicode/utf8" - "github.com/influxdata/platform/pkg/escape" + "github.com/influxdata/influxdb/pkg/escape" ) type escapeSet struct { diff --git a/models/points_test.go b/models/points_test.go index 2f5ce167ca9..d0f3ccf9eb9 100644 --- a/models/points_test.go +++ b/models/points_test.go @@ -12,7 +12,7 @@ import ( "testing" "time" - "github.com/influxdata/platform/models" + "github.com/influxdata/influxdb/models" ) func init() { diff --git a/models/statistic_test.go b/models/statistic_test.go index 990cef05477..918c991342f 100644 --- a/models/statistic_test.go +++ b/models/statistic_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/influxdata/platform/models" + "github.com/influxdata/influxdb/models" ) func TestTags_Merge(t *testing.T) { diff --git a/onboarding.go b/onboarding.go index b2440c10b4c..c2f2ea1ce63 100644 --- a/onboarding.go +++ b/onboarding.go @@ -1,4 +1,4 @@ -package platform +package influxdb import "context" diff --git a/operation_log.go b/operation_log.go index 5439a94fa95..ab7b01139de 100644 --- a/operation_log.go +++ b/operation_log.go @@ -1,4 +1,4 @@ -package platform +package influxdb import ( "context" diff --git a/organization.go b/organization.go index 6e69b0eacc2..19d7386037d 100644 --- a/organization.go +++ b/organization.go @@ -1,4 +1,4 @@ -package platform +package influxdb import "context" diff --git a/paging.go b/paging.go index 172e1745e7e..e3635cb23dc 100644 --- a/paging.go +++ b/paging.go @@ -1,4 +1,4 @@ -package platform +package influxdb import ( "strconv" diff --git a/pkg/bloom/bloom_test.go b/pkg/bloom/bloom_test.go index f6dff1a485f..49ee997cde1 100644 --- a/pkg/bloom/bloom_test.go +++ b/pkg/bloom/bloom_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/influxdata/platform/pkg/bloom" + "github.com/influxdata/influxdb/pkg/bloom" ) // Ensure filter can insert values and verify they exist. diff --git a/pkg/bytesutil/bytesutil_test.go b/pkg/bytesutil/bytesutil_test.go index 1a255297b6e..9d7adc69f53 100644 --- a/pkg/bytesutil/bytesutil_test.go +++ b/pkg/bytesutil/bytesutil_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform/pkg/bytesutil" + "github.com/influxdata/influxdb/pkg/bytesutil" ) func TestSearchBytesFixed(t *testing.T) { diff --git a/pkg/data/gen/arrays.gen.go b/pkg/data/gen/arrays.gen.go index 302911d6b17..5f402dedfdd 100644 --- a/pkg/data/gen/arrays.gen.go +++ b/pkg/data/gen/arrays.gen.go @@ -7,8 +7,8 @@ package gen import ( - "github.com/influxdata/platform/tsdb/cursors" - "github.com/influxdata/platform/tsdb/tsm1" + "github.com/influxdata/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/tsdb/tsm1" ) type FloatArray struct { diff --git a/pkg/data/gen/arrays.gen.go.tmpl b/pkg/data/gen/arrays.gen.go.tmpl index c7d99df68a2..5013ab66ee4 100644 --- a/pkg/data/gen/arrays.gen.go.tmpl +++ b/pkg/data/gen/arrays.gen.go.tmpl @@ -1,8 +1,8 @@ package gen import ( - "github.com/influxdata/platform/tsdb/tsm1" - "github.com/influxdata/platform/tsdb/cursors" + "github.com/influxdata/influxdb/tsdb/tsm1" + "github.com/influxdata/influxdb/tsdb/cursors" ) {{range .}} @@ -23,4 +23,4 @@ func New{{$typename}}Len(sz int) *{{$typename}} { func (a *{{$typename}}) Encode(b []byte) ([]byte, error) { return tsm1.Encode{{$typename}}Block(&a.{{$typename}}, b) } -{{end}} \ No newline at end of file +{{end}} diff --git a/pkg/data/gen/series_generator.go b/pkg/data/gen/series_generator.go index 2d46f6cb815..5694507e5f6 100644 --- a/pkg/data/gen/series_generator.go +++ b/pkg/data/gen/series_generator.go @@ -1,7 +1,7 @@ package gen import ( - "github.com/influxdata/platform/models" + "github.com/influxdata/influxdb/models" ) type SeriesGenerator interface { diff --git a/pkg/data/gen/tags_sequence.go b/pkg/data/gen/tags_sequence.go index d121d54a69a..b08f223f508 100644 --- a/pkg/data/gen/tags_sequence.go +++ b/pkg/data/gen/tags_sequence.go @@ -5,7 +5,7 @@ import ( "math" "sort" - "github.com/influxdata/platform/models" + "github.com/influxdata/influxdb/models" ) type TagsSequence interface { diff --git a/pkg/data/gen/values_constant.gen.go b/pkg/data/gen/values_constant.gen.go index 888f48379ea..423c528d099 100644 --- a/pkg/data/gen/values_constant.gen.go +++ b/pkg/data/gen/values_constant.gen.go @@ -9,7 +9,7 @@ package gen import ( "time" - "github.com/influxdata/platform/tsdb/cursors" + "github.com/influxdata/influxdb/tsdb/cursors" ) type FloatConstantValuesSequence struct { diff --git a/pkg/data/gen/values_constant.gen.go.tmpl b/pkg/data/gen/values_constant.gen.go.tmpl index d86bcfb836b..fd5a7e21a2b 100644 --- a/pkg/data/gen/values_constant.gen.go.tmpl +++ b/pkg/data/gen/values_constant.gen.go.tmpl @@ -3,7 +3,7 @@ package gen import ( "time" - "github.com/influxdata/platform/tsdb/cursors" + "github.com/influxdata/influxdb/tsdb/cursors" ) {{range .}} @@ -65,4 +65,4 @@ func (g *{{.Name}}ConstantValuesSequence) Next() bool { func (g *{{.Name}}ConstantValuesSequence) Values() Values { return &g.vals } -{{end}} \ No newline at end of file +{{end}} diff --git a/pkg/data/gen/values_sequence.go b/pkg/data/gen/values_sequence.go index 8f45a1b989c..43a23872e3f 100644 --- a/pkg/data/gen/values_sequence.go +++ b/pkg/data/gen/values_sequence.go @@ -4,7 +4,7 @@ import ( "math/rand" "time" - "github.com/influxdata/platform/tsdb/cursors" + "github.com/influxdata/influxdb/tsdb/cursors" ) type FloatRandomValuesSequence struct { diff --git a/pkg/deep/equal.go b/pkg/deep/equal.go index 5b2df98eebc..327db9aa7a8 100644 --- a/pkg/deep/equal.go +++ b/pkg/deep/equal.go @@ -29,7 +29,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // Package deep provides a deep equality check for use in tests. -package deep // import "github.com/influxdata/platform/pkg/deep" +package deep // import "github.com/influxdata/influxdb/pkg/deep" import ( "fmt" diff --git a/pkg/encoding/simple8b/encoding_test.go b/pkg/encoding/simple8b/encoding_test.go index 3c6adf8a922..a43dfa5e075 100644 --- a/pkg/encoding/simple8b/encoding_test.go +++ b/pkg/encoding/simple8b/encoding_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform/pkg/encoding/simple8b" + "github.com/influxdata/influxdb/pkg/encoding/simple8b" ) func Test_Encode_NoValues(t *testing.T) { diff --git a/pkg/escape/bytes.go b/pkg/escape/bytes.go index 9416a00a477..f3b31f42d36 100644 --- a/pkg/escape/bytes.go +++ b/pkg/escape/bytes.go @@ -1,6 +1,6 @@ // Package escape contains utilities for escaping parts of InfluxQL // and InfluxDB line protocol. -package escape // import "github.com/influxdata/platform/pkg/escape" +package escape // import "github.com/influxdata/influxdb/pkg/escape" import ( "bytes" diff --git a/pkg/estimator/hll/hll.go b/pkg/estimator/hll/hll.go index b14dc289738..babbe74340f 100644 --- a/pkg/estimator/hll/hll.go +++ b/pkg/estimator/hll/hll.go @@ -23,7 +23,7 @@ import ( "unsafe" "github.com/cespare/xxhash" - "github.com/influxdata/platform/pkg/estimator" + "github.com/influxdata/influxdb/pkg/estimator" ) // Current version of HLL implementation. diff --git a/pkg/limiter/fixed_test.go b/pkg/limiter/fixed_test.go index 2b5378ffdeb..b45a7274c2f 100644 --- a/pkg/limiter/fixed_test.go +++ b/pkg/limiter/fixed_test.go @@ -3,7 +3,7 @@ package limiter_test import ( "testing" - "github.com/influxdata/platform/pkg/limiter" + "github.com/influxdata/influxdb/pkg/limiter" ) func TestFixed_Available(t *testing.T) { diff --git a/pkg/limiter/write_test.go b/pkg/limiter/write_test.go index eb08eeddfaa..094e15d067e 100644 --- a/pkg/limiter/write_test.go +++ b/pkg/limiter/write_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/influxdata/platform/pkg/limiter" + "github.com/influxdata/influxdb/pkg/limiter" ) func TestWriter_Limited(t *testing.T) { diff --git a/pkg/metrics/descriptors_test.go b/pkg/metrics/descriptors_test.go index 0e1ff551400..77bc2c994d5 100644 --- a/pkg/metrics/descriptors_test.go +++ b/pkg/metrics/descriptors_test.go @@ -3,7 +3,7 @@ package metrics import ( "testing" - "github.com/influxdata/platform/pkg/testing/assert" + "github.com/influxdata/influxdb/pkg/testing/assert" ) func TestID_newID(t *testing.T) { diff --git a/pkg/metrics/registry_test.go b/pkg/metrics/registry_test.go index 857e731c3fd..78496f37f15 100644 --- a/pkg/metrics/registry_test.go +++ b/pkg/metrics/registry_test.go @@ -3,7 +3,7 @@ package metrics import ( "testing" - "github.com/influxdata/platform/pkg/testing/assert" + "github.com/influxdata/influxdb/pkg/testing/assert" ) func TestRegistry_MustRegisterCounter(t *testing.T) { diff --git a/pkg/metrics/timer_test.go b/pkg/metrics/timer_test.go index ce983e0e5fe..aca439b1044 100644 --- a/pkg/metrics/timer_test.go +++ b/pkg/metrics/timer_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/influxdata/platform/pkg/testing/assert" + "github.com/influxdata/influxdb/pkg/testing/assert" ) func TestTimer_Update(t *testing.T) { diff --git a/pkg/mmap/mmap_test.go b/pkg/mmap/mmap_test.go index a9924262a81..a182219a7cc 100644 --- a/pkg/mmap/mmap_test.go +++ b/pkg/mmap/mmap_test.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "testing" - "github.com/influxdata/platform/pkg/mmap" + "github.com/influxdata/influxdb/pkg/mmap" ) func TestMap(t *testing.T) { diff --git a/pkg/pool/bytes_test.go b/pkg/pool/bytes_test.go index cb73e2bcbc4..28ca98d5195 100644 --- a/pkg/pool/bytes_test.go +++ b/pkg/pool/bytes_test.go @@ -3,7 +3,7 @@ package pool_test import ( "testing" - "github.com/influxdata/platform/pkg/pool" + "github.com/influxdata/influxdb/pkg/pool" ) func TestLimitedBytePool_Put_MaxSize(t *testing.T) { diff --git a/pkg/rhh/metrics_test.go b/pkg/rhh/metrics_test.go index 263534d50bc..568aa9b51a7 100644 --- a/pkg/rhh/metrics_test.go +++ b/pkg/rhh/metrics_test.go @@ -3,7 +3,7 @@ package rhh import ( "testing" - "github.com/influxdata/platform/kit/prom/promtest" + "github.com/influxdata/influxdb/kit/prom/promtest" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/rhh/rhh_test.go b/pkg/rhh/rhh_test.go index 1ea41a9c493..0a2b4a8ebdb 100644 --- a/pkg/rhh/rhh_test.go +++ b/pkg/rhh/rhh_test.go @@ -7,7 +7,7 @@ import ( "testing" "testing/quick" - "github.com/influxdata/platform/pkg/rhh" + "github.com/influxdata/influxdb/pkg/rhh" ) // Ensure hash map can perform basic get/put operations. diff --git a/pkg/slices/bytes_test.go b/pkg/slices/bytes_test.go index c84e5436a97..f48de050483 100644 --- a/pkg/slices/bytes_test.go +++ b/pkg/slices/bytes_test.go @@ -9,7 +9,7 @@ import ( "unsafe" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform/pkg/bytesutil" + "github.com/influxdata/influxdb/pkg/bytesutil" ) func TestCopyChunkedByteSlices_oneChunk(t *testing.T) { diff --git a/pkg/slices/merge_test.go b/pkg/slices/merge_test.go index 6f61b8c65d9..55f97deff6b 100644 --- a/pkg/slices/merge_test.go +++ b/pkg/slices/merge_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/influxdata/platform/pkg/slices" + "github.com/influxdata/influxdb/pkg/slices" ) func TestMergeSortedBytes(t *testing.T) { diff --git a/pkg/slices/strings.go b/pkg/slices/strings.go index ef678e2af13..7539c847128 100644 --- a/pkg/slices/strings.go +++ b/pkg/slices/strings.go @@ -1,5 +1,5 @@ // Package slices contains functions to operate on slices treated as sets. -package slices // import "github.com/influxdata/platform/pkg/slices" +package slices // import "github.com/influxdata/influxdb/pkg/slices" import "strings" diff --git a/prometheus/auth_service.go b/prometheus/auth_service.go index dfaa56864c6..2050797025e 100644 --- a/prometheus/auth_service.go +++ b/prometheus/auth_service.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" "github.com/prometheus/client_golang/prometheus" ) diff --git a/prometheus/auth_service_test.go b/prometheus/auth_service_test.go index 31d1cffc494..93a6b618af6 100644 --- a/prometheus/auth_service_test.go +++ b/prometheus/auth_service_test.go @@ -5,10 +5,10 @@ import ( "errors" "testing" - "github.com/influxdata/platform" - "github.com/influxdata/platform/kit/prom" - "github.com/influxdata/platform/kit/prom/promtest" - "github.com/influxdata/platform/prometheus" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/kit/prom" + "github.com/influxdata/influxdb/kit/prom/promtest" + "github.com/influxdata/influxdb/prometheus" ) // authzSvc is a test helper that returns its Err from every method on the AuthorizationService interface. diff --git a/proto.go b/proto.go index b8b1f8b9fef..be273832eaf 100644 --- a/proto.go +++ b/proto.go @@ -1,4 +1,4 @@ -package platform +package influxdb import ( "context" diff --git a/query.go b/query.go index 6e0ec72161b..476b54364b1 100644 --- a/query.go +++ b/query.go @@ -1,4 +1,4 @@ -package platform +package influxdb // TODO(desa): These files are possibly a temporary. This is needed // as a part of the source work that is being done. diff --git a/query/bridges.go b/query/bridges.go index 3ef6bac3ea4..c043fb7f07f 100644 --- a/query/bridges.go +++ b/query/bridges.go @@ -7,7 +7,7 @@ import ( "net/http" "github.com/influxdata/flux" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) // QueryServiceBridge implements the QueryService interface while consuming the AsyncQueryService interface. diff --git a/query/builtin/builtin.go b/query/builtin/builtin.go index 8a672d4f07d..561492ede70 100644 --- a/query/builtin/builtin.go +++ b/query/builtin/builtin.go @@ -12,10 +12,10 @@ import ( _ "github.com/influxdata/flux/functions/tests" _ "github.com/influxdata/flux/functions/transformations" _ "github.com/influxdata/flux/options" // Import the built-in options - _ "github.com/influxdata/platform/query/functions" // Import the built-in functions - _ "github.com/influxdata/platform/query/functions/inputs" - _ "github.com/influxdata/platform/query/functions/outputs" - _ "github.com/influxdata/platform/query/options" // Import the built-in options + _ "github.com/influxdata/influxdb/query/functions" // Import the built-in functions + _ "github.com/influxdata/influxdb/query/functions/inputs" + _ "github.com/influxdata/influxdb/query/functions/outputs" + _ "github.com/influxdata/influxdb/query/options" // Import the built-in options ) func init() { diff --git a/query/control/controller.go b/query/control/controller.go index 34f39590240..04ac28a1a0f 100644 --- a/query/control/controller.go +++ b/query/control/controller.go @@ -6,8 +6,8 @@ import ( "github.com/influxdata/flux" "github.com/influxdata/flux/control" - "github.com/influxdata/platform" - "github.com/influxdata/platform/query" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/query" "github.com/prometheus/client_golang/prometheus" ) diff --git a/query/dependency.go b/query/dependency.go index 29e01e89539..40d36c653e5 100644 --- a/query/dependency.go +++ b/query/dependency.go @@ -3,7 +3,7 @@ package query import ( "context" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) // FromBucketService wraps an platform.BucketService in the BucketLookup interface. diff --git a/query/functions/inputs/buckets.go b/query/functions/inputs/buckets.go index 71478c73a85..489cd2af730 100644 --- a/query/functions/inputs/buckets.go +++ b/query/functions/inputs/buckets.go @@ -2,6 +2,7 @@ package inputs import ( "fmt" + "github.com/influxdata/flux/memory" "github.com/influxdata/flux/values" @@ -9,8 +10,8 @@ import ( "github.com/influxdata/flux/execute" "github.com/influxdata/flux/functions/inputs" "github.com/influxdata/flux/plan" - "github.com/influxdata/platform" - "github.com/influxdata/platform/query" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/query" "github.com/pkg/errors" ) diff --git a/query/functions/inputs/databases.go b/query/functions/inputs/databases.go index c9d8fabf6ee..29b535f0c5d 100644 --- a/query/functions/inputs/databases.go +++ b/query/functions/inputs/databases.go @@ -3,6 +3,7 @@ package inputs import ( "context" "fmt" + "github.com/influxdata/flux/memory" "github.com/influxdata/flux/semantic" "github.com/influxdata/flux/values" @@ -11,8 +12,8 @@ import ( "github.com/influxdata/flux/execute" "github.com/influxdata/flux/functions/inputs" "github.com/influxdata/flux/plan" - "github.com/influxdata/platform" - "github.com/influxdata/platform/query" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/query" "github.com/pkg/errors" ) diff --git a/query/functions/inputs/from.go b/query/functions/inputs/from.go index 29ef27ece21..3ccf0689cc4 100644 --- a/query/functions/inputs/from.go +++ b/query/functions/inputs/from.go @@ -6,9 +6,9 @@ import ( "github.com/influxdata/flux/execute" "github.com/influxdata/flux/functions/inputs" "github.com/influxdata/flux/plan" - "github.com/influxdata/platform" - "github.com/influxdata/platform/query" - "github.com/influxdata/platform/query/functions/inputs/storage" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/query" + "github.com/influxdata/influxdb/query/functions/inputs/storage" "github.com/pkg/errors" ) diff --git a/query/functions/inputs/from_test.go b/query/functions/inputs/from_test.go index 21f17032a43..f14bfcf9b4d 100644 --- a/query/functions/inputs/from_test.go +++ b/query/functions/inputs/from_test.go @@ -10,8 +10,8 @@ import ( "github.com/influxdata/flux" "github.com/influxdata/flux/execute" "github.com/influxdata/flux/querytest" - "github.com/influxdata/platform" - pquerytest "github.com/influxdata/platform/query/querytest" + platform "github.com/influxdata/influxdb" + pquerytest "github.com/influxdata/influxdb/query/querytest" ) func TestFrom_NewQuery(t *testing.T) { diff --git a/query/functions/inputs/storage/storage.go b/query/functions/inputs/storage/storage.go index 8725809a086..76883a83940 100644 --- a/query/functions/inputs/storage/storage.go +++ b/query/functions/inputs/storage/storage.go @@ -11,7 +11,7 @@ import ( "github.com/influxdata/flux/execute" "github.com/influxdata/flux/functions" "github.com/influxdata/flux/semantic" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" "github.com/pkg/errors" ) diff --git a/query/functions/outputs/to.go b/query/functions/outputs/to.go index e0ad4580903..e933f99f91b 100644 --- a/query/functions/outputs/to.go +++ b/query/functions/outputs/to.go @@ -4,10 +4,8 @@ import ( "context" "errors" "fmt" - "github.com/influxdata/platform/tsdb" - "time" - "sort" + "time" "github.com/influxdata/flux" "github.com/influxdata/flux/execute" @@ -16,10 +14,11 @@ import ( "github.com/influxdata/flux/plan" "github.com/influxdata/flux/semantic" "github.com/influxdata/flux/values" - "github.com/influxdata/platform" - "github.com/influxdata/platform/models" - istorage "github.com/influxdata/platform/query/functions/inputs/storage" - "github.com/influxdata/platform/storage" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/models" + istorage "github.com/influxdata/influxdb/query/functions/inputs/storage" + "github.com/influxdata/influxdb/storage" + "github.com/influxdata/influxdb/tsdb" ) // ToKind is the kind for the `to` flux function diff --git a/query/functions/outputs/to_test.go b/query/functions/outputs/to_test.go index 031550a27a4..da33a76b55b 100644 --- a/query/functions/outputs/to_test.go +++ b/query/functions/outputs/to_test.go @@ -2,6 +2,8 @@ package outputs_test import ( "context" + "testing" + "github.com/google/go-cmp/cmp" "github.com/influxdata/flux" "github.com/influxdata/flux/ast" @@ -9,14 +11,13 @@ import ( "github.com/influxdata/flux/execute/executetest" "github.com/influxdata/flux/functions/inputs" "github.com/influxdata/flux/semantic" - "github.com/influxdata/platform" - "github.com/influxdata/platform/mock" - "github.com/influxdata/platform/models" - _ "github.com/influxdata/platform/query/builtin" - "github.com/influxdata/platform/query/functions/outputs" - "github.com/influxdata/platform/query/querytest" - "github.com/influxdata/platform/tsdb" - "testing" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/mock" + "github.com/influxdata/influxdb/models" + _ "github.com/influxdata/influxdb/query/builtin" + "github.com/influxdata/influxdb/query/functions/outputs" + "github.com/influxdata/influxdb/query/querytest" + "github.com/influxdata/influxdb/tsdb" ) func TestTo_Query(t *testing.T) { diff --git a/query/functions/tests/end_to_end_test.go b/query/functions/tests/end_to_end_test.go index 1478435a43d..cdf3da7574f 100644 --- a/query/functions/tests/end_to_end_test.go +++ b/query/functions/tests/end_to_end_test.go @@ -4,13 +4,6 @@ import ( "bytes" "context" "fmt" - "github.com/influxdata/flux" - "github.com/influxdata/flux/lang" - "github.com/influxdata/platform" - "github.com/influxdata/platform/bolt" - "github.com/influxdata/platform/cmd/influxd/launcher" - "github.com/influxdata/platform/http" - "github.com/influxdata/platform/query" "io" "io/ioutil" nethttp "net/http" @@ -19,16 +12,24 @@ import ( "strings" "testing" + "github.com/influxdata/flux" + "github.com/influxdata/flux/lang" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/bolt" + "github.com/influxdata/influxdb/cmd/influxd/launcher" + "github.com/influxdata/influxdb/http" + "github.com/influxdata/influxdb/query" + _ "github.com/influxdata/flux/functions" // Import the built-in functions _ "github.com/influxdata/flux/functions/inputs" _ "github.com/influxdata/flux/functions/outputs" _ "github.com/influxdata/flux/functions/tests" _ "github.com/influxdata/flux/functions/transformations" _ "github.com/influxdata/flux/options" // Import the built-in options - _ "github.com/influxdata/platform/query/functions" // Import the built-in functions - _ "github.com/influxdata/platform/query/functions/inputs" - _ "github.com/influxdata/platform/query/functions/outputs" - _ "github.com/influxdata/platform/query/options" // Import the built-in options + _ "github.com/influxdata/influxdb/query/functions" // Import the built-in functions + _ "github.com/influxdata/influxdb/query/functions/inputs" + _ "github.com/influxdata/influxdb/query/functions/outputs" + _ "github.com/influxdata/influxdb/query/options" // Import the built-in options ) // Default context. @@ -77,24 +78,24 @@ var skipTests = map[string]string{ "meta_query_fields": "Reason TBD", "meta_query_keys": "Reason TBD", "meta_query_measurements": "Reason TBD", - "min": "Reason TBD", - "multiple_range": "Reason TBD", - "sample": "Reason TBD", - "selector_preserve_time": "Reason TBD", - "shift": "Reason TBD", - "shift_negative_duration": "Reason TBD", - "show_all_tag_keys": "Reason TBD", - "sort": "Reason TBD", - "task_per_line": "Reason TBD", - "top": "Reason TBD", - "union": "Reason TBD", - "union_heterogeneous": "Reason TBD", - "unique": "Reason TBD", - - "string_max": "error: invalid use of function: *functions.MaxSelector has no implementation for type string (https://github.com/influxdata/platform/issues/224)", - "null_as_value": "null not supported as value in influxql (https://github.com/influxdata/platform/issues/353)", - "string_interp": "string interpolation not working as expected in flux (https://github.com/influxdata/platform/issues/404)", - "to": "to functions are not supported in the testing framework (https://github.com/influxdata/flux/issues/77)", + "min": "Reason TBD", + "multiple_range": "Reason TBD", + "sample": "Reason TBD", + "selector_preserve_time": "Reason TBD", + "shift": "Reason TBD", + "shift_negative_duration": "Reason TBD", + "show_all_tag_keys": "Reason TBD", + "sort": "Reason TBD", + "task_per_line": "Reason TBD", + "top": "Reason TBD", + "union": "Reason TBD", + "union_heterogeneous": "Reason TBD", + "unique": "Reason TBD", + + "string_max": "error: invalid use of function: *functions.MaxSelector has no implementation for type string (https://github.com/influxdata/platform/issues/224)", + "null_as_value": "null not supported as value in influxql (https://github.com/influxdata/platform/issues/353)", + "string_interp": "string interpolation not working as expected in flux (https://github.com/influxdata/platform/issues/404)", + "to": "to functions are not supported in the testing framework (https://github.com/influxdata/flux/issues/77)", "covariance_missing_column_1": "need to support known errors in new test framework (https://github.com/influxdata/flux/issues/536)", "covariance_missing_column_2": "need to support known errors in new test framework (https://github.com/influxdata/flux/issues/536)", "drop_before_rename": "need to support known errors in new test framework (https://github.com/influxdata/flux/issues/536)", diff --git a/query/influxql/compiler.go b/query/influxql/compiler.go index d6140d750af..344583215a6 100644 --- a/query/influxql/compiler.go +++ b/query/influxql/compiler.go @@ -4,7 +4,7 @@ import ( "context" "github.com/influxdata/flux" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) const CompilerType = "influxql" diff --git a/query/influxql/compiler_test.go b/query/influxql/compiler_test.go index 70a5526b316..df733e8b85c 100644 --- a/query/influxql/compiler_test.go +++ b/query/influxql/compiler_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/influxdata/flux" - "github.com/influxdata/platform/query/influxql" + "github.com/influxdata/influxdb/query/influxql" ) func TestCompiler(t *testing.T) { diff --git a/query/influxql/dialect_test.go b/query/influxql/dialect_test.go index 86f410fc763..d746cbb9498 100644 --- a/query/influxql/dialect_test.go +++ b/query/influxql/dialect_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/influxdata/flux" - "github.com/influxdata/platform/query/influxql" + "github.com/influxdata/influxdb/query/influxql" ) func TestDialect(t *testing.T) { diff --git a/query/influxql/end_to_end_test.go b/query/influxql/end_to_end_test.go index 6b7ebbdb23b..e0c260c8685 100644 --- a/query/influxql/end_to_end_test.go +++ b/query/influxql/end_to_end_test.go @@ -16,12 +16,12 @@ import ( ifql "github.com/influxdata/flux/influxql" "github.com/influxdata/flux/memory" "github.com/influxdata/flux/querytest" - "github.com/influxdata/platform" - "github.com/influxdata/platform/mock" - "github.com/influxdata/platform/query" - _ "github.com/influxdata/platform/query/builtin" - "github.com/influxdata/platform/query/influxql" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/mock" + "github.com/influxdata/influxdb/query" + _ "github.com/influxdata/influxdb/query/builtin" + "github.com/influxdata/influxdb/query/influxql" + platformtesting "github.com/influxdata/influxdb/testing" ) const generatedInfluxQLDataDir = "testdata" diff --git a/query/influxql/response_test.go b/query/influxql/response_test.go index 562799fdfa8..ecd7a317a0b 100644 --- a/query/influxql/response_test.go +++ b/query/influxql/response_test.go @@ -8,7 +8,7 @@ import ( "github.com/andreyvit/diff" "github.com/google/go-cmp/cmp" "github.com/influxdata/flux/csv" - "github.com/influxdata/platform/query/influxql" + "github.com/influxdata/influxdb/query/influxql" ) var crlfPattern = regexp.MustCompile(`\r?\n`) diff --git a/query/influxql/result_test.go b/query/influxql/result_test.go index 6e84dcfcb20..0da1f5efae2 100644 --- a/query/influxql/result_test.go +++ b/query/influxql/result_test.go @@ -10,7 +10,7 @@ import ( "github.com/influxdata/flux" "github.com/influxdata/flux/execute" "github.com/influxdata/flux/execute/executetest" - "github.com/influxdata/platform/query/influxql" + "github.com/influxdata/influxdb/query/influxql" ) func TestMultiResultEncoder_Encode(t *testing.T) { diff --git a/query/influxql/service.go b/query/influxql/service.go index 778d833e2bb..9f8a5c65c5d 100644 --- a/query/influxql/service.go +++ b/query/influxql/service.go @@ -9,7 +9,7 @@ import ( "net/url" "github.com/influxdata/flux" - "github.com/influxdata/platform/query" + "github.com/influxdata/influxdb/query" ) // Endpoint contains the necessary information to connect to a specific cluster. diff --git a/query/influxql/service_test.go b/query/influxql/service_test.go index bc6c3e47674..ff27d4f404f 100644 --- a/query/influxql/service_test.go +++ b/query/influxql/service_test.go @@ -7,8 +7,8 @@ import ( "net/http/httptest" "testing" - "github.com/influxdata/platform/query" - "github.com/influxdata/platform/query/influxql" + "github.com/influxdata/influxdb/query" + "github.com/influxdata/influxdb/query/influxql" ) func TestService(t *testing.T) { diff --git a/query/influxql/spectests/math.go b/query/influxql/spectests/math.go index 2db61d749ef..64839a3b443 100644 --- a/query/influxql/spectests/math.go +++ b/query/influxql/spectests/math.go @@ -8,9 +8,10 @@ import ( "github.com/influxdata/flux" "github.com/influxdata/flux/ast" "github.com/influxdata/flux/execute" - + "github.com/influxdata/flux/functions/inputs" + "github.com/influxdata/flux/functions/transformations" "github.com/influxdata/flux/semantic" - "github.com/influxdata/platform/query/influxql" + "github.com/influxdata/influxdb/query/influxql" ) func init() { diff --git a/query/influxql/spectests/show_databases.go b/query/influxql/spectests/show_databases.go index 9310e8debdd..ceb48457ac4 100644 --- a/query/influxql/spectests/show_databases.go +++ b/query/influxql/spectests/show_databases.go @@ -3,7 +3,7 @@ package spectests import ( "github.com/influxdata/flux" "github.com/influxdata/flux/functions/transformations" - "github.com/influxdata/platform/query/functions/inputs" + "github.com/influxdata/influxdb/query/functions/inputs" ) func init() { diff --git a/query/influxql/spectests/show_retention_policies.go b/query/influxql/spectests/show_retention_policies.go index 5d9932a2148..96e1f543403 100644 --- a/query/influxql/spectests/show_retention_policies.go +++ b/query/influxql/spectests/show_retention_policies.go @@ -5,7 +5,7 @@ import ( "github.com/influxdata/flux/ast" "github.com/influxdata/flux/functions/transformations" "github.com/influxdata/flux/semantic" - "github.com/influxdata/platform/query/functions/inputs" + "github.com/influxdata/influxdb/query/functions/inputs" ) func init() { diff --git a/query/influxql/spectests/testing.go b/query/influxql/spectests/testing.go index 76bbcc6478a..6d8f002b96f 100644 --- a/query/influxql/spectests/testing.go +++ b/query/influxql/spectests/testing.go @@ -11,10 +11,10 @@ import ( "github.com/google/go-cmp/cmp" "github.com/influxdata/flux" - "github.com/influxdata/platform" - "github.com/influxdata/platform/mock" - "github.com/influxdata/platform/query/influxql" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/mock" + "github.com/influxdata/influxdb/query/influxql" + platformtesting "github.com/influxdata/influxdb/testing" ) var dbrpMappingSvc = mock.NewDBRPMappingService() diff --git a/query/influxql/testdata/compspecs/compspecs.go b/query/influxql/testdata/compspecs/compspecs.go index 20efec35d98..355f54ace21 100644 --- a/query/influxql/testdata/compspecs/compspecs.go +++ b/query/influxql/testdata/compspecs/compspecs.go @@ -12,10 +12,10 @@ import ( "github.com/google/go-cmp/cmp/cmpopts" "github.com/influxdata/flux" "github.com/influxdata/flux/semantic/semantictest" - "github.com/influxdata/platform" - "github.com/influxdata/platform/mock" - "github.com/influxdata/platform/query/influxql" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/mock" + "github.com/influxdata/influxdb/query/influxql" + platformtesting "github.com/influxdata/influxdb/testing" ) func printUsage() { diff --git a/query/influxql/transpiler.go b/query/influxql/transpiler.go index ada0f8b4fd9..c0826784686 100644 --- a/query/influxql/transpiler.go +++ b/query/influxql/transpiler.go @@ -14,9 +14,9 @@ import ( "github.com/influxdata/flux/functions/inputs" "github.com/influxdata/flux/functions/transformations" "github.com/influxdata/flux/semantic" + platform "github.com/influxdata/influxdb" + pinputs "github.com/influxdata/influxdb/query/functions/inputs" "github.com/influxdata/influxql" - "github.com/influxdata/platform" - pinputs "github.com/influxdata/platform/query/functions/inputs" ) // Transpiler converts InfluxQL queries into a query spec. diff --git a/query/influxql/transpiler_test.go b/query/influxql/transpiler_test.go index ac5231f214f..9d2596b3c2d 100644 --- a/query/influxql/transpiler_test.go +++ b/query/influxql/transpiler_test.go @@ -5,11 +5,11 @@ import ( "strings" "testing" - "github.com/influxdata/platform" - "github.com/influxdata/platform/mock" - "github.com/influxdata/platform/query/influxql" - "github.com/influxdata/platform/query/influxql/spectests" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/mock" + "github.com/influxdata/influxdb/query/influxql" + "github.com/influxdata/influxdb/query/influxql/spectests" + platformtesting "github.com/influxdata/influxdb/testing" "github.com/pkg/errors" ) diff --git a/query/logger.go b/query/logger.go index 0821082cc27..9fa0001dcd0 100644 --- a/query/logger.go +++ b/query/logger.go @@ -4,7 +4,7 @@ import ( "time" "github.com/influxdata/flux" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) // Logger persists metadata about executed queries. diff --git a/query/mock/service.go b/query/mock/service.go index 8f5b11b2999..3f20db73a8f 100644 --- a/query/mock/service.go +++ b/query/mock/service.go @@ -5,7 +5,7 @@ import ( "io" "github.com/influxdata/flux" - "github.com/influxdata/platform/query" + "github.com/influxdata/influxdb/query" ) // ProxyQueryService mocks the idep QueryService for testing. diff --git a/query/preauthorizer.go b/query/preauthorizer.go index bce39c97280..33cfdf7fca2 100644 --- a/query/preauthorizer.go +++ b/query/preauthorizer.go @@ -4,7 +4,7 @@ import ( "context" "github.com/influxdata/flux" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" "github.com/pkg/errors" ) diff --git a/query/preauthorizer_test.go b/query/preauthorizer_test.go index c30993fa44f..d809f5c7e7b 100644 --- a/query/preauthorizer_test.go +++ b/query/preauthorizer_test.go @@ -7,11 +7,11 @@ import ( "github.com/google/go-cmp/cmp" "github.com/influxdata/flux" - "github.com/influxdata/platform" - "github.com/influxdata/platform/kit/errors" - "github.com/influxdata/platform/mock" - "github.com/influxdata/platform/query" - _ "github.com/influxdata/platform/query/builtin" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/kit/errors" + "github.com/influxdata/influxdb/mock" + "github.com/influxdata/influxdb/query" + _ "github.com/influxdata/influxdb/query/builtin" ) func newBucketServiceWithOneBucket(bucket platform.Bucket) platform.BucketService { diff --git a/query/query.go b/query/query.go index dc40d360153..7f8cb442b42 100644 --- a/query/query.go +++ b/query/query.go @@ -5,8 +5,8 @@ import ( "math" "time" + "github.com/influxdata/influxdb/models" "github.com/influxdata/influxql" - "github.com/influxdata/platform/models" ) var ( diff --git a/query/querytest/compile.go b/query/querytest/compile.go index e5199860c1b..4fd3f236777 100644 --- a/query/querytest/compile.go +++ b/query/querytest/compile.go @@ -12,8 +12,8 @@ import ( "github.com/influxdata/flux" "github.com/influxdata/flux/functions/transformations" "github.com/influxdata/flux/semantic/semantictest" - "github.com/influxdata/platform" - "github.com/influxdata/platform/query" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/query" ) type BucketAwareQueryTestCase struct { diff --git a/query/request.go b/query/request.go index 0e7341c2647..cf6a48084fe 100644 --- a/query/request.go +++ b/query/request.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/influxdata/flux" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) // Request respresents the query to run. diff --git a/query/service_test.go b/query/service_test.go index 4b601f919a7..e542f290fa1 100644 --- a/query/service_test.go +++ b/query/service_test.go @@ -8,8 +8,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/influxdata/flux" - "github.com/influxdata/platform/query" - platformtesting "github.com/influxdata/platform/testing" + "github.com/influxdata/influxdb/query" + platformtesting "github.com/influxdata/influxdb/testing" ) var CmpOpts = []cmp.Option{ diff --git a/query/spec.go b/query/spec.go index c2e34d8ead7..722ec7630f9 100644 --- a/query/spec.go +++ b/query/spec.go @@ -2,7 +2,7 @@ package query import ( "github.com/influxdata/flux" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) // BucketAwareOperationSpec specifies an operation that reads or writes buckets diff --git a/rand/token.go b/rand/token.go index 5a6557f9a89..db00662591b 100644 --- a/rand/token.go +++ b/rand/token.go @@ -4,7 +4,7 @@ import ( "crypto/rand" "encoding/base64" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) // TODO: rename to token.go diff --git a/scraper.go b/scraper.go index a7e1cd3c650..12e5cfd80e7 100644 --- a/scraper.go +++ b/scraper.go @@ -1,4 +1,4 @@ -package platform +package influxdb import ( "context" diff --git a/secret.go b/secret.go index c01156fcb66..41180696076 100644 --- a/secret.go +++ b/secret.go @@ -1,4 +1,4 @@ -package platform +package influxdb import "context" diff --git a/session.go b/session.go index f7bc123571a..470d08841a5 100644 --- a/session.go +++ b/session.go @@ -1,4 +1,4 @@ -package platform +package influxdb import ( "context" diff --git a/snowflake/id.go b/snowflake/id.go index bf1672ffed3..4101dd2bcee 100644 --- a/snowflake/id.go +++ b/snowflake/id.go @@ -6,8 +6,8 @@ import ( "sync" "time" - "github.com/influxdata/platform" - "github.com/influxdata/platform/pkg/snowflake" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/pkg/snowflake" ) func init() { diff --git a/snowflake/id_test.go b/snowflake/id_test.go index 9c111c0c4d8..0a39ae438a2 100644 --- a/snowflake/id_test.go +++ b/snowflake/id_test.go @@ -3,7 +3,7 @@ package snowflake import ( "testing" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) func TestIDLength(t *testing.T) { diff --git a/source.go b/source.go index f1ce13dc95a..d4a22715574 100644 --- a/source.go +++ b/source.go @@ -1,4 +1,4 @@ -package platform +package influxdb import "context" diff --git a/source/bucket.go b/source/bucket.go index c88c83bf9a9..bdbddeec597 100644 --- a/source/bucket.go +++ b/source/bucket.go @@ -3,9 +3,9 @@ package source import ( "fmt" - "github.com/influxdata/platform" - "github.com/influxdata/platform/http" - "github.com/influxdata/platform/http/influxdb" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/http" + "github.com/influxdata/influxdb/http/influxdb" ) // NewBucketService creates a bucket service from a source. diff --git a/source/query.go b/source/query.go index 7f8dbf323ca..70781a68aca 100644 --- a/source/query.go +++ b/source/query.go @@ -3,10 +3,10 @@ package source import ( "fmt" - "github.com/influxdata/platform" - "github.com/influxdata/platform/http" - "github.com/influxdata/platform/http/influxdb" - "github.com/influxdata/platform/query" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/http" + "github.com/influxdata/influxdb/http/influxdb" + "github.com/influxdata/influxdb/query" ) // NewQueryService creates a bucket service from a source. diff --git a/status.go b/status.go index 783ae467d71..e6be4d3d734 100644 --- a/status.go +++ b/status.go @@ -1,4 +1,4 @@ -package platform +package influxdb import "fmt" diff --git a/storage/bucket_service.go b/storage/bucket_service.go index 69c20badf4d..8788769b410 100644 --- a/storage/bucket_service.go +++ b/storage/bucket_service.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) // BucketDeleter defines the behaviour of deleting a bucket. diff --git a/storage/bucket_service_test.go b/storage/bucket_service_test.go index 82f6f61798d..f197cddf97c 100644 --- a/storage/bucket_service_test.go +++ b/storage/bucket_service_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/influxdata/platform" - "github.com/influxdata/platform/inmem" - "github.com/influxdata/platform/storage" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/inmem" + "github.com/influxdata/influxdb/storage" ) func TestBucketService(t *testing.T) { diff --git a/storage/compat/compat.go b/storage/compat/compat.go index 4e6b3a355ec..6c7d029f060 100644 --- a/storage/compat/compat.go +++ b/storage/compat/compat.go @@ -8,9 +8,9 @@ package compat import ( - "github.com/influxdata/platform/storage" - "github.com/influxdata/platform/toml" - "github.com/influxdata/platform/tsdb/tsm1" + "github.com/influxdata/influxdb/storage" + "github.com/influxdata/influxdb/toml" + "github.com/influxdata/influxdb/tsdb/tsm1" ) // Config matches the old toml layout from the influxdb repo, so that we can read diff --git a/storage/config.go b/storage/config.go index a88522218c8..ce7b5815280 100644 --- a/storage/config.go +++ b/storage/config.go @@ -4,9 +4,9 @@ import ( "path/filepath" "time" - "github.com/influxdata/platform/toml" - "github.com/influxdata/platform/tsdb/tsi1" - "github.com/influxdata/platform/tsdb/tsm1" + "github.com/influxdata/influxdb/toml" + "github.com/influxdata/influxdb/tsdb/tsi1" + "github.com/influxdata/influxdb/tsdb/tsm1" ) const ( diff --git a/storage/engine.go b/storage/engine.go index 70252010a10..c1ed60ccd4e 100644 --- a/storage/engine.go +++ b/storage/engine.go @@ -9,13 +9,13 @@ import ( "sync" "time" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/logger" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/tsdb/tsi1" + "github.com/influxdata/influxdb/tsdb/tsm1" "github.com/influxdata/influxql" - "github.com/influxdata/platform" - "github.com/influxdata/platform/logger" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/tsdb" - "github.com/influxdata/platform/tsdb/tsi1" - "github.com/influxdata/platform/tsdb/tsm1" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" ) diff --git a/storage/engine_test.go b/storage/engine_test.go index 5099d37c7cf..d058ac25a3b 100644 --- a/storage/engine_test.go +++ b/storage/engine_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" - "github.com/influxdata/platform" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/storage" - "github.com/influxdata/platform/tsdb" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/storage" + "github.com/influxdata/influxdb/tsdb" ) func TestEngine_WriteAndIndex(t *testing.T) { diff --git a/storage/points_writer.go b/storage/points_writer.go index c13aa48fbd1..3d1d6c4a6d2 100644 --- a/storage/points_writer.go +++ b/storage/points_writer.go @@ -1,7 +1,7 @@ package storage import ( - "github.com/influxdata/platform/models" + "github.com/influxdata/influxdb/models" ) // PointsWriter describes the ability to write points into a storage engine. diff --git a/storage/reads/array_cursor.gen.go b/storage/reads/array_cursor.gen.go index d587d911d87..d798db93dd5 100644 --- a/storage/reads/array_cursor.gen.go +++ b/storage/reads/array_cursor.gen.go @@ -9,7 +9,7 @@ package reads import ( "errors" - "github.com/influxdata/platform/tsdb/cursors" + "github.com/influxdata/influxdb/tsdb/cursors" ) const ( diff --git a/storage/reads/array_cursor.gen.go.tmpl b/storage/reads/array_cursor.gen.go.tmpl index d209fd35dd6..e56c4e0ad70 100644 --- a/storage/reads/array_cursor.gen.go.tmpl +++ b/storage/reads/array_cursor.gen.go.tmpl @@ -3,7 +3,7 @@ package reads import ( "errors" - "github.com/influxdata/platform/tsdb/cursors" + "github.com/influxdata/influxdb/tsdb/cursors" ) const ( diff --git a/storage/reads/array_cursor.go b/storage/reads/array_cursor.go index 2c4faace9da..959f1963217 100644 --- a/storage/reads/array_cursor.go +++ b/storage/reads/array_cursor.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/influxdata/platform/storage/reads/datatypes" - "github.com/influxdata/platform/tsdb/cursors" + "github.com/influxdata/influxdb/storage/reads/datatypes" + "github.com/influxdata/influxdb/tsdb/cursors" ) type singleValue struct { diff --git a/storage/reads/group_resultset.go b/storage/reads/group_resultset.go index 3cbef359437..0fd25598956 100644 --- a/storage/reads/group_resultset.go +++ b/storage/reads/group_resultset.go @@ -6,10 +6,10 @@ import ( "fmt" "sort" - "github.com/influxdata/platform/logger" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/storage/reads/datatypes" - "github.com/influxdata/platform/tsdb/cursors" + "github.com/influxdata/influxdb/logger" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/storage/reads/datatypes" + "github.com/influxdata/influxdb/tsdb/cursors" "github.com/opentracing/opentracing-go" "go.uber.org/zap" ) diff --git a/storage/reads/group_resultset_test.go b/storage/reads/group_resultset_test.go index 0a6b5d30dac..b23939e851a 100644 --- a/storage/reads/group_resultset_test.go +++ b/storage/reads/group_resultset_test.go @@ -6,10 +6,10 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/pkg/data/gen" - "github.com/influxdata/platform/storage/reads" - "github.com/influxdata/platform/storage/reads/datatypes" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/pkg/data/gen" + "github.com/influxdata/influxdb/storage/reads" + "github.com/influxdata/influxdb/storage/reads/datatypes" ) func TestGroupGroupResultSetSorting(t *testing.T) { diff --git a/storage/reads/keymerger.go b/storage/reads/keymerger.go index 96c22921834..5b82b8672dc 100644 --- a/storage/reads/keymerger.go +++ b/storage/reads/keymerger.go @@ -4,7 +4,7 @@ import ( "bytes" "strings" - "github.com/influxdata/platform/models" + "github.com/influxdata/influxdb/models" ) // tagsKeyMerger is responsible for determining a merged set of tag keys diff --git a/storage/reads/keymerger_test.go b/storage/reads/keymerger_test.go index 6757a259bdc..8f230acb761 100644 --- a/storage/reads/keymerger_test.go +++ b/storage/reads/keymerger_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform/models" + "github.com/influxdata/influxdb/models" ) func TestKeyMerger_MergeTagKeys(t *testing.T) { diff --git a/storage/reads/merge.go b/storage/reads/merge.go index 3a3f6b870f9..19e71787967 100644 --- a/storage/reads/merge.go +++ b/storage/reads/merge.go @@ -3,8 +3,8 @@ package reads import ( "container/heap" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/tsdb/cursors" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/tsdb/cursors" ) type mergedResultSet struct { diff --git a/storage/reads/merge_test.go b/storage/reads/merge_test.go index cb1157aee77..135e8969fa5 100644 --- a/storage/reads/merge_test.go +++ b/storage/reads/merge_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform/storage/reads" - "github.com/influxdata/platform/storage/reads/datatypes" + "github.com/influxdata/influxdb/storage/reads" + "github.com/influxdata/influxdb/storage/reads/datatypes" ) func newStreamSeries(v ...string) *sliceStreamReader { diff --git a/storage/reads/mergegroupresultset.go b/storage/reads/mergegroupresultset.go index 61da76cc2e1..41447666963 100644 --- a/storage/reads/mergegroupresultset.go +++ b/storage/reads/mergegroupresultset.go @@ -4,7 +4,7 @@ import ( "bytes" "sort" - "github.com/influxdata/platform/pkg/slices" + "github.com/influxdata/influxdb/pkg/slices" ) // groupNoneMergedGroupResultSet produces a single GroupCursor, merging all diff --git a/storage/reads/mergegroupresultset_test.go b/storage/reads/mergegroupresultset_test.go index dee30396a10..c679a5e0d41 100644 --- a/storage/reads/mergegroupresultset_test.go +++ b/storage/reads/mergegroupresultset_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform/storage/reads" - "github.com/influxdata/platform/storage/reads/datatypes" + "github.com/influxdata/influxdb/storage/reads" + "github.com/influxdata/influxdb/storage/reads/datatypes" ) func newGroupNoneStreamSeries(tagKeys string, v ...string) *sliceStreamReader { diff --git a/storage/reads/predicate.go b/storage/reads/predicate.go index b6217014443..91d10c64d7e 100644 --- a/storage/reads/predicate.go +++ b/storage/reads/predicate.go @@ -8,9 +8,9 @@ import ( "github.com/influxdata/flux/ast" "github.com/influxdata/flux/semantic" + "github.com/influxdata/influxdb/storage/reads/datatypes" + "github.com/influxdata/influxdb/tsdb" "github.com/influxdata/influxql" - "github.com/influxdata/platform/storage/reads/datatypes" - "github.com/influxdata/platform/tsdb" "github.com/pkg/errors" ) diff --git a/storage/reads/predicate_test.go b/storage/reads/predicate_test.go index f4f5834efd3..dcdeeaa9152 100644 --- a/storage/reads/predicate_test.go +++ b/storage/reads/predicate_test.go @@ -3,8 +3,8 @@ package reads_test import ( "testing" - "github.com/influxdata/platform/storage/reads" - "github.com/influxdata/platform/storage/reads/datatypes" + "github.com/influxdata/influxdb/storage/reads" + "github.com/influxdata/influxdb/storage/reads/datatypes" ) func TestPredicateToExprString(t *testing.T) { diff --git a/storage/reads/reader.go b/storage/reads/reader.go index bbfe7538941..f1eaeb1267a 100644 --- a/storage/reads/reader.go +++ b/storage/reads/reader.go @@ -10,10 +10,10 @@ import ( "github.com/influxdata/flux" "github.com/influxdata/flux/execute" "github.com/influxdata/flux/values" - "github.com/influxdata/platform/models" - fstorage "github.com/influxdata/platform/query/functions/inputs/storage" - "github.com/influxdata/platform/storage/reads/datatypes" - "github.com/influxdata/platform/tsdb/cursors" + "github.com/influxdata/influxdb/models" + fstorage "github.com/influxdata/influxdb/query/functions/inputs/storage" + "github.com/influxdata/influxdb/storage/reads/datatypes" + "github.com/influxdata/influxdb/tsdb/cursors" ) type storageTable interface { diff --git a/storage/reads/response_writer.gen.go b/storage/reads/response_writer.gen.go index 94fc445b2e5..cc27118f774 100644 --- a/storage/reads/response_writer.gen.go +++ b/storage/reads/response_writer.gen.go @@ -7,8 +7,8 @@ package reads import ( - "github.com/influxdata/platform/storage/reads/datatypes" - "github.com/influxdata/platform/tsdb/cursors" + "github.com/influxdata/influxdb/storage/reads/datatypes" + "github.com/influxdata/influxdb/tsdb/cursors" ) func (w *ResponseWriter) getFloatPointsFrame() *datatypes.ReadResponse_Frame_FloatPoints { diff --git a/storage/reads/response_writer.gen.go.tmpl b/storage/reads/response_writer.gen.go.tmpl index aaa22137513..7dd0de4d3bd 100644 --- a/storage/reads/response_writer.gen.go.tmpl +++ b/storage/reads/response_writer.gen.go.tmpl @@ -1,8 +1,8 @@ package reads import ( - "github.com/influxdata/platform/storage/reads/datatypes" - "github.com/influxdata/platform/tsdb/cursors" + "github.com/influxdata/influxdb/storage/reads/datatypes" + "github.com/influxdata/influxdb/tsdb/cursors" ) diff --git a/storage/reads/response_writer.go b/storage/reads/response_writer.go index 061163f0d4d..c583fb6d82c 100644 --- a/storage/reads/response_writer.go +++ b/storage/reads/response_writer.go @@ -2,11 +2,12 @@ package reads import ( "fmt" + "google.golang.org/grpc/metadata" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/storage/reads/datatypes" - "github.com/influxdata/platform/tsdb/cursors" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/storage/reads/datatypes" + "github.com/influxdata/influxdb/tsdb/cursors" ) type ResponseStream interface { diff --git a/storage/reads/response_writer_test.go b/storage/reads/response_writer_test.go index 3b287c5b776..0abaf75443c 100644 --- a/storage/reads/response_writer_test.go +++ b/storage/reads/response_writer_test.go @@ -2,12 +2,13 @@ package reads_test import ( "fmt" - "github.com/influxdata/platform/mock" - "github.com/influxdata/platform/storage/reads" - "github.com/influxdata/platform/tsdb/cursors" - "google.golang.org/grpc/metadata" "reflect" "testing" + + "github.com/influxdata/influxdb/mock" + "github.com/influxdata/influxdb/storage/reads" + "github.com/influxdata/influxdb/tsdb/cursors" + "google.golang.org/grpc/metadata" ) func TestResponseWriter_WriteResultSet_Stats(t *testing.T) { diff --git a/storage/reads/resultset.go b/storage/reads/resultset.go index 83e3850c23e..a85478c0fe3 100644 --- a/storage/reads/resultset.go +++ b/storage/reads/resultset.go @@ -3,9 +3,9 @@ package reads import ( "context" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/storage/reads/datatypes" - "github.com/influxdata/platform/tsdb/cursors" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/storage/reads/datatypes" + "github.com/influxdata/influxdb/tsdb/cursors" ) type multiShardCursors interface { diff --git a/storage/reads/series_cursor.go b/storage/reads/series_cursor.go index 2e9cd7f7074..a6c4f182da3 100644 --- a/storage/reads/series_cursor.go +++ b/storage/reads/series_cursor.go @@ -3,9 +3,9 @@ package reads import ( "context" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/tsdb/cursors" "github.com/influxdata/influxql" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/tsdb/cursors" ) type SeriesCursor interface { diff --git a/storage/reads/store.go b/storage/reads/store.go index d8dd47b3807..e7310d7115f 100644 --- a/storage/reads/store.go +++ b/storage/reads/store.go @@ -4,10 +4,10 @@ import ( "context" "github.com/gogo/protobuf/proto" - "github.com/influxdata/platform/models" - fstorage "github.com/influxdata/platform/query/functions/inputs/storage" - "github.com/influxdata/platform/storage/reads/datatypes" - "github.com/influxdata/platform/tsdb/cursors" + "github.com/influxdata/influxdb/models" + fstorage "github.com/influxdata/influxdb/query/functions/inputs/storage" + "github.com/influxdata/influxdb/storage/reads/datatypes" + "github.com/influxdata/influxdb/tsdb/cursors" ) type ResultSet interface { diff --git a/storage/reads/store_test.go b/storage/reads/store_test.go index c5161b8013a..62fa108fa3c 100644 --- a/storage/reads/store_test.go +++ b/storage/reads/store_test.go @@ -6,9 +6,9 @@ import ( "io" "strings" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/storage/reads" - "github.com/influxdata/platform/tsdb/cursors" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/storage/reads" + "github.com/influxdata/influxdb/tsdb/cursors" ) func CursorToString(wr io.Writer, cur cursors.Cursor, opts ...optionFn) { diff --git a/storage/reads/stream_reader.gen.go b/storage/reads/stream_reader.gen.go index 370caade54b..2b0393e973f 100644 --- a/storage/reads/stream_reader.gen.go +++ b/storage/reads/stream_reader.gen.go @@ -9,8 +9,8 @@ package reads import ( "fmt" - "github.com/influxdata/platform/storage/reads/datatypes" - "github.com/influxdata/platform/tsdb/cursors" + "github.com/influxdata/influxdb/storage/reads/datatypes" + "github.com/influxdata/influxdb/tsdb/cursors" ) type floatCursorStreamReader struct { diff --git a/storage/reads/stream_reader.gen.go.tmpl b/storage/reads/stream_reader.gen.go.tmpl index 7da4e2d800f..bd9e37a724b 100644 --- a/storage/reads/stream_reader.gen.go.tmpl +++ b/storage/reads/stream_reader.gen.go.tmpl @@ -3,8 +3,8 @@ package reads import ( "fmt" - "github.com/influxdata/platform/storage/reads/datatypes" - "github.com/influxdata/platform/tsdb/cursors" + "github.com/influxdata/influxdb/storage/reads/datatypes" + "github.com/influxdata/influxdb/tsdb/cursors" ) diff --git a/storage/reads/stream_reader.go b/storage/reads/stream_reader.go index 5f5a5f6e496..9e8c6562f09 100644 --- a/storage/reads/stream_reader.go +++ b/storage/reads/stream_reader.go @@ -5,9 +5,9 @@ import ( "fmt" "io" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/storage/reads/datatypes" - "github.com/influxdata/platform/tsdb/cursors" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/storage/reads/datatypes" + "github.com/influxdata/influxdb/tsdb/cursors" ) var ( diff --git a/storage/reads/stream_reader_gen_test.go b/storage/reads/stream_reader_gen_test.go index 28ba12d03ff..085a90f36ec 100644 --- a/storage/reads/stream_reader_gen_test.go +++ b/storage/reads/stream_reader_gen_test.go @@ -9,7 +9,7 @@ package reads_test import ( "sort" - "github.com/influxdata/platform/storage/reads/datatypes" + "github.com/influxdata/influxdb/storage/reads/datatypes" ) type FloatPoints datatypes.ReadResponse_FloatPointsFrame diff --git a/storage/reads/stream_reader_gen_test.go.tmpl b/storage/reads/stream_reader_gen_test.go.tmpl index 6819d43e315..017f935b690 100644 --- a/storage/reads/stream_reader_gen_test.go.tmpl +++ b/storage/reads/stream_reader_gen_test.go.tmpl @@ -3,7 +3,7 @@ package reads_test import ( "sort" - "github.com/influxdata/platform/storage/reads/datatypes" + "github.com/influxdata/influxdb/storage/reads/datatypes" ) {{range .}} @@ -37,4 +37,4 @@ func {{.name}}F(points {{$type}}) datatypes.ReadResponse_Frame { }, } } -{{end}} \ No newline at end of file +{{end}} diff --git a/storage/reads/stream_reader_test.go b/storage/reads/stream_reader_test.go index 4d852a1efec..c1766851aee 100644 --- a/storage/reads/stream_reader_test.go +++ b/storage/reads/stream_reader_test.go @@ -8,9 +8,9 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/storage/reads" - "github.com/influxdata/platform/storage/reads/datatypes" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/storage/reads" + "github.com/influxdata/influxdb/storage/reads/datatypes" ) func errCmp(x, y error) bool { diff --git a/storage/reads/table.gen.go b/storage/reads/table.gen.go index 4befc2bfcd3..e9b3ef404b8 100644 --- a/storage/reads/table.gen.go +++ b/storage/reads/table.gen.go @@ -7,14 +7,15 @@ package reads import ( + "sync" + "github.com/influxdata/flux/arrow" "github.com/influxdata/flux/memory" - "sync" "github.com/influxdata/flux" "github.com/influxdata/flux/execute" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/tsdb/cursors" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/tsdb/cursors" "github.com/pkg/errors" ) diff --git a/storage/reads/table.gen.go.tmpl b/storage/reads/table.gen.go.tmpl index f8bc5835e26..c1d01f15edd 100644 --- a/storage/reads/table.gen.go.tmpl +++ b/storage/reads/table.gen.go.tmpl @@ -7,8 +7,8 @@ import ( "github.com/influxdata/flux" "github.com/influxdata/flux/execute" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/tsdb/cursors" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/tsdb/cursors" "github.com/pkg/errors" ) {{range .}} diff --git a/storage/reads/table.go b/storage/reads/table.go index cb10bff87a5..0182cb6bb03 100644 --- a/storage/reads/table.go +++ b/storage/reads/table.go @@ -11,8 +11,8 @@ import ( "github.com/influxdata/flux/arrow" "github.com/influxdata/flux/execute" "github.com/influxdata/flux/memory" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/tsdb/cursors" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/tsdb/cursors" ) type table struct { diff --git a/storage/reads/tagsbuffer.go b/storage/reads/tagsbuffer.go index d819a08cde1..b58966ff533 100644 --- a/storage/reads/tagsbuffer.go +++ b/storage/reads/tagsbuffer.go @@ -1,7 +1,7 @@ package reads import ( - "github.com/influxdata/platform/models" + "github.com/influxdata/influxdb/models" ) type tagsBuffer struct { diff --git a/storage/readservice/common.go b/storage/readservice/common.go index b2785e6d119..8e70552b7e0 100644 --- a/storage/readservice/common.go +++ b/storage/readservice/common.go @@ -1,6 +1,6 @@ package readservice -import "github.com/influxdata/platform/models" +import "github.com/influxdata/influxdb/models" const ( fieldKey = "_field" diff --git a/storage/readservice/cursor.go b/storage/readservice/cursor.go index 5c92e281770..03900f51f55 100644 --- a/storage/readservice/cursor.go +++ b/storage/readservice/cursor.go @@ -3,14 +3,14 @@ package readservice import ( "context" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/query" + "github.com/influxdata/influxdb/storage" + "github.com/influxdata/influxdb/storage/reads" + "github.com/influxdata/influxdb/storage/reads/datatypes" + "github.com/influxdata/influxdb/tsdb" "github.com/influxdata/influxql" - "github.com/influxdata/platform" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/query" - "github.com/influxdata/platform/storage" - "github.com/influxdata/platform/storage/reads" - "github.com/influxdata/platform/storage/reads/datatypes" - "github.com/influxdata/platform/tsdb" opentracing "github.com/opentracing/opentracing-go" ) diff --git a/storage/readservice/service.go b/storage/readservice/service.go index a2f3ed7f3ce..1a9645f5c94 100644 --- a/storage/readservice/service.go +++ b/storage/readservice/service.go @@ -2,14 +2,14 @@ package readservice import ( "github.com/influxdata/flux/control" - "github.com/influxdata/platform" - "github.com/influxdata/platform/query" - pcontrol "github.com/influxdata/platform/query/control" - "github.com/influxdata/platform/query/functions/inputs" - fstorage "github.com/influxdata/platform/query/functions/inputs/storage" - "github.com/influxdata/platform/query/functions/outputs" - "github.com/influxdata/platform/storage" - "github.com/influxdata/platform/storage/reads" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/query" + pcontrol "github.com/influxdata/influxdb/query/control" + "github.com/influxdata/influxdb/query/functions/inputs" + fstorage "github.com/influxdata/influxdb/query/functions/inputs/storage" + "github.com/influxdata/influxdb/query/functions/outputs" + "github.com/influxdata/influxdb/storage" + "github.com/influxdata/influxdb/storage/reads" ) // NewProxyQueryService returns a proxy query service based on the given queryController diff --git a/storage/readservice/store.go b/storage/readservice/store.go index 82b8bc418f7..13ef554ce86 100644 --- a/storage/readservice/store.go +++ b/storage/readservice/store.go @@ -7,11 +7,11 @@ import ( "github.com/gogo/protobuf/proto" "github.com/gogo/protobuf/types" - "github.com/influxdata/platform/models" - fstorage "github.com/influxdata/platform/query/functions/inputs/storage" - "github.com/influxdata/platform/storage" - "github.com/influxdata/platform/storage/reads" - "github.com/influxdata/platform/storage/reads/datatypes" + "github.com/influxdata/influxdb/models" + fstorage "github.com/influxdata/influxdb/query/functions/inputs/storage" + "github.com/influxdata/influxdb/storage" + "github.com/influxdata/influxdb/storage/reads" + "github.com/influxdata/influxdb/storage/reads/datatypes" ) type store struct { diff --git a/storage/retention.go b/storage/retention.go index c217aaf07a9..ed3a08282a1 100644 --- a/storage/retention.go +++ b/storage/retention.go @@ -8,11 +8,11 @@ import ( "sync/atomic" "time" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/logger" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/tsdb" "github.com/influxdata/influxql" - "github.com/influxdata/platform" - "github.com/influxdata/platform/logger" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/tsdb" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" ) diff --git a/storage/retention_test.go b/storage/retention_test.go index 7b4f89916c1..c4d2a8e9b2e 100644 --- a/storage/retention_test.go +++ b/storage/retention_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/tsdb" "github.com/influxdata/influxql" - "github.com/influxdata/platform" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/tsdb" ) func TestService_expireData(t *testing.T) { diff --git a/storage/series_cursor.go b/storage/series_cursor.go index 31b250f4de8..09b17e27d76 100644 --- a/storage/series_cursor.go +++ b/storage/series_cursor.go @@ -5,10 +5,10 @@ import ( "sort" "sync" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/tsdb/tsi1" "github.com/influxdata/influxql" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/tsdb" - "github.com/influxdata/platform/tsdb/tsi1" ) type SeriesCursor interface { diff --git a/task.go b/task.go index a5b032efcd5..8fda713b5a8 100644 --- a/task.go +++ b/task.go @@ -1,4 +1,4 @@ -package platform +package influxdb import ( "context" diff --git a/task/backend/bolt/bolt.go b/task/backend/bolt/bolt.go index f97e3b42b15..7f8fd42c7c3 100644 --- a/task/backend/bolt/bolt.go +++ b/task/backend/bolt/bolt.go @@ -22,10 +22,10 @@ import ( "fmt" bolt "github.com/coreos/bbolt" - "github.com/influxdata/platform" - "github.com/influxdata/platform/snowflake" - "github.com/influxdata/platform/task/backend" - "github.com/influxdata/platform/task/options" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/snowflake" + "github.com/influxdata/influxdb/task/backend" + "github.com/influxdata/influxdb/task/options" ) // ErrDBReadOnly is an error for when the database is set to read only. diff --git a/task/backend/bolt/bolt_test.go b/task/backend/bolt/bolt_test.go index 01bf2139970..c86f26d93e4 100644 --- a/task/backend/bolt/bolt_test.go +++ b/task/backend/bolt/bolt_test.go @@ -6,11 +6,11 @@ import ( "testing" bolt "github.com/coreos/bbolt" - _ "github.com/influxdata/platform/query/builtin" - "github.com/influxdata/platform/task/backend" - boltstore "github.com/influxdata/platform/task/backend/bolt" - "github.com/influxdata/platform/task/backend/storetest" - "github.com/influxdata/platform/task/options" + _ "github.com/influxdata/influxdb/query/builtin" + "github.com/influxdata/influxdb/task/backend" + boltstore "github.com/influxdata/influxdb/task/backend/bolt" + "github.com/influxdata/influxdb/task/backend/storetest" + "github.com/influxdata/influxdb/task/options" ) func init() { diff --git a/task/backend/coordinator/coordinator.go b/task/backend/coordinator/coordinator.go index 626114cced8..9a14a389aa5 100644 --- a/task/backend/coordinator/coordinator.go +++ b/task/backend/coordinator/coordinator.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/influxdata/platform" - "github.com/influxdata/platform/task/backend" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/task/backend" "go.uber.org/zap" ) diff --git a/task/backend/coordinator/coordinator_test.go b/task/backend/coordinator/coordinator_test.go index b213f35e50c..7a55de87236 100644 --- a/task/backend/coordinator/coordinator_test.go +++ b/task/backend/coordinator/coordinator_test.go @@ -6,12 +6,12 @@ import ( "testing" "time" - "github.com/influxdata/platform" - _ "github.com/influxdata/platform/query/builtin" - "github.com/influxdata/platform/task/backend" - "github.com/influxdata/platform/task/backend/coordinator" - "github.com/influxdata/platform/task/mock" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + _ "github.com/influxdata/influxdb/query/builtin" + "github.com/influxdata/influxdb/task/backend" + "github.com/influxdata/influxdb/task/backend/coordinator" + "github.com/influxdata/influxdb/task/mock" + platformtesting "github.com/influxdata/influxdb/testing" "go.uber.org/zap/zaptest" ) diff --git a/task/backend/error_test.go b/task/backend/error_test.go index efbc49686b5..71024f7e151 100644 --- a/task/backend/error_test.go +++ b/task/backend/error_test.go @@ -3,7 +3,7 @@ package backend_test import ( "testing" - "github.com/influxdata/platform/task/backend" + "github.com/influxdata/influxdb/task/backend" ) func TestParseRequestStillQueuedError(t *testing.T) { diff --git a/task/backend/executor/executor.go b/task/backend/executor/executor.go index 3cd5d9fdced..d70a40c05fc 100644 --- a/task/backend/executor/executor.go +++ b/task/backend/executor/executor.go @@ -9,9 +9,9 @@ import ( "github.com/influxdata/flux" "github.com/influxdata/flux/lang" - "github.com/influxdata/platform/logger" - "github.com/influxdata/platform/query" - "github.com/influxdata/platform/task/backend" + "github.com/influxdata/influxdb/logger" + "github.com/influxdata/influxdb/query" + "github.com/influxdata/influxdb/task/backend" "go.uber.org/zap" ) diff --git a/task/backend/executor/executor_test.go b/task/backend/executor/executor_test.go index fa1e4d94f70..7b21fdec803 100644 --- a/task/backend/executor/executor_test.go +++ b/task/backend/executor/executor_test.go @@ -15,12 +15,12 @@ import ( "github.com/influxdata/flux/lang" "github.com/influxdata/flux/memory" "github.com/influxdata/flux/values" - "github.com/influxdata/platform" - "github.com/influxdata/platform/query" - _ "github.com/influxdata/platform/query/builtin" - "github.com/influxdata/platform/task/backend" - "github.com/influxdata/platform/task/backend/executor" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/query" + _ "github.com/influxdata/influxdb/query/builtin" + "github.com/influxdata/influxdb/task/backend" + "github.com/influxdata/influxdb/task/backend/executor" + platformtesting "github.com/influxdata/influxdb/testing" "go.uber.org/zap" ) diff --git a/task/backend/inmem_logreaderwriter.go b/task/backend/inmem_logreaderwriter.go index 8eea6ca6e80..f9120a49575 100644 --- a/task/backend/inmem_logreaderwriter.go +++ b/task/backend/inmem_logreaderwriter.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) type runReaderWriter struct { diff --git a/task/backend/inmem_store.go b/task/backend/inmem_store.go index e2968f46152..81168a27afd 100644 --- a/task/backend/inmem_store.go +++ b/task/backend/inmem_store.go @@ -6,9 +6,9 @@ import ( "fmt" "sync" - "github.com/influxdata/platform" - "github.com/influxdata/platform/snowflake" - "github.com/influxdata/platform/task/options" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/snowflake" + "github.com/influxdata/influxdb/task/options" ) var _ Store = (*inmem)(nil) diff --git a/task/backend/inmem_store_test.go b/task/backend/inmem_store_test.go index 4e42a4c7dac..5c39f06f31d 100644 --- a/task/backend/inmem_store_test.go +++ b/task/backend/inmem_store_test.go @@ -3,9 +3,9 @@ package backend_test import ( "testing" - "github.com/influxdata/platform/task/backend" - "github.com/influxdata/platform/task/backend/storetest" - "github.com/influxdata/platform/task/options" + "github.com/influxdata/influxdb/task/backend" + "github.com/influxdata/influxdb/task/backend/storetest" + "github.com/influxdata/influxdb/task/options" ) func init() { diff --git a/task/backend/logreaderwriter_test.go b/task/backend/logreaderwriter_test.go index fb170a67266..ca593b3f767 100644 --- a/task/backend/logreaderwriter_test.go +++ b/task/backend/logreaderwriter_test.go @@ -8,13 +8,13 @@ import ( "github.com/influxdata/flux/control" "github.com/influxdata/flux/execute" - "github.com/influxdata/platform/inmem" - "github.com/influxdata/platform/query" - pcontrol "github.com/influxdata/platform/query/control" - "github.com/influxdata/platform/storage" - "github.com/influxdata/platform/storage/readservice" - "github.com/influxdata/platform/task/backend" - "github.com/influxdata/platform/task/backend/storetest" + "github.com/influxdata/influxdb/inmem" + "github.com/influxdata/influxdb/query" + pcontrol "github.com/influxdata/influxdb/query/control" + "github.com/influxdata/influxdb/storage" + "github.com/influxdata/influxdb/storage/readservice" + "github.com/influxdata/influxdb/task/backend" + "github.com/influxdata/influxdb/task/backend/storetest" "go.uber.org/zap" "go.uber.org/zap/zaptest" ) diff --git a/task/backend/meta.go b/task/backend/meta.go index 192da469e36..a297fe22185 100644 --- a/task/backend/meta.go +++ b/task/backend/meta.go @@ -5,8 +5,8 @@ import ( "math" "time" - "github.com/influxdata/platform" - "github.com/influxdata/platform/task/options" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/task/options" cron "gopkg.in/robfig/cron.v2" ) diff --git a/task/backend/meta_test.go b/task/backend/meta_test.go index ebb914316da..8bcd43cd64a 100644 --- a/task/backend/meta_test.go +++ b/task/backend/meta_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "github.com/influxdata/platform" - "github.com/influxdata/platform/snowflake" - "github.com/influxdata/platform/task/backend" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/snowflake" + "github.com/influxdata/influxdb/task/backend" ) var idGen = snowflake.NewIDGenerator() diff --git a/task/backend/point_logwriter.go b/task/backend/point_logwriter.go index bb0645b9873..03498f9dcf7 100644 --- a/task/backend/point_logwriter.go +++ b/task/backend/point_logwriter.go @@ -4,9 +4,9 @@ import ( "context" "time" - "github.com/influxdata/platform" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/tsdb" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/tsdb" ) const ( diff --git a/task/backend/query_logreader.go b/task/backend/query_logreader.go index 6283e990a04..0fcc6ae83a0 100644 --- a/task/backend/query_logreader.go +++ b/task/backend/query_logreader.go @@ -11,9 +11,9 @@ import ( "github.com/influxdata/flux" "github.com/influxdata/flux/lang" "github.com/influxdata/flux/semantic" - "github.com/influxdata/platform" - pctx "github.com/influxdata/platform/context" - "github.com/influxdata/platform/query" + platform "github.com/influxdata/influxdb" + pctx "github.com/influxdata/influxdb/context" + "github.com/influxdata/influxdb/query" ) type QueryLogReader struct { diff --git a/task/backend/scheduler.go b/task/backend/scheduler.go index 202884841a3..dfb3deb4f7e 100644 --- a/task/backend/scheduler.go +++ b/task/backend/scheduler.go @@ -9,7 +9,7 @@ import ( "sync/atomic" "time" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" "github.com/opentracing/opentracing-go" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" diff --git a/task/backend/scheduler_test.go b/task/backend/scheduler_test.go index 666c93dcf4b..8d488193fe5 100644 --- a/task/backend/scheduler_test.go +++ b/task/backend/scheduler_test.go @@ -8,12 +8,12 @@ import ( "testing" "time" - "github.com/influxdata/platform" - "github.com/influxdata/platform/kit/prom" - "github.com/influxdata/platform/kit/prom/promtest" - _ "github.com/influxdata/platform/query/builtin" - "github.com/influxdata/platform/task/backend" - "github.com/influxdata/platform/task/mock" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/kit/prom" + "github.com/influxdata/influxdb/kit/prom/promtest" + _ "github.com/influxdata/influxdb/query/builtin" + "github.com/influxdata/influxdb/task/backend" + "github.com/influxdata/influxdb/task/mock" "go.uber.org/zap/zaptest" ) diff --git a/task/backend/store.go b/task/backend/store.go index 51b7f3bf378..3f185083eb0 100644 --- a/task/backend/store.go +++ b/task/backend/store.go @@ -11,8 +11,8 @@ import ( "strings" "time" - "github.com/influxdata/platform" - "github.com/influxdata/platform/task/options" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/task/options" ) var ( diff --git a/task/backend/storetest/logstoretest.go b/task/backend/storetest/logstoretest.go index 5f3d671771f..628e92666a1 100644 --- a/task/backend/storetest/logstoretest.go +++ b/task/backend/storetest/logstoretest.go @@ -8,10 +8,10 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform" - pcontext "github.com/influxdata/platform/context" - "github.com/influxdata/platform/task/backend" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + pcontext "github.com/influxdata/influxdb/context" + "github.com/influxdata/influxdb/task/backend" + platformtesting "github.com/influxdata/influxdb/testing" ) type CreateRunStoreFunc func(*testing.T) (backend.LogWriter, backend.LogReader) diff --git a/task/backend/storetest/storetest.go b/task/backend/storetest/storetest.go index 6e5154b5237..5f65e9644b6 100644 --- a/task/backend/storetest/storetest.go +++ b/task/backend/storetest/storetest.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/influxdata/platform" - "github.com/influxdata/platform/snowflake" - "github.com/influxdata/platform/task/backend" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/snowflake" + "github.com/influxdata/influxdb/task/backend" ) var idGen = snowflake.NewIDGenerator() diff --git a/task/mock/scheduler.go b/task/mock/scheduler.go index 6df57e5d259..e39c530c1ba 100644 --- a/task/mock/scheduler.go +++ b/task/mock/scheduler.go @@ -9,9 +9,9 @@ import ( "sync" "time" - "github.com/influxdata/platform" - "github.com/influxdata/platform/task/backend" - scheduler "github.com/influxdata/platform/task/backend" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/task/backend" + scheduler "github.com/influxdata/influxdb/task/backend" "go.uber.org/zap" ) diff --git a/task/options/options_test.go b/task/options/options_test.go index 46ee86a53dc..a27ed48f0f7 100644 --- a/task/options/options_test.go +++ b/task/options/options_test.go @@ -7,8 +7,8 @@ import ( "time" "github.com/google/go-cmp/cmp" - _ "github.com/influxdata/platform/query/builtin" - "github.com/influxdata/platform/task/options" + _ "github.com/influxdata/influxdb/query/builtin" + "github.com/influxdata/influxdb/task/options" ) func scriptGenerator(opt options.Options, body string) string { diff --git a/task/platform_adapter.go b/task/platform_adapter.go index 7967cc5a678..01ddfa679dd 100644 --- a/task/platform_adapter.go +++ b/task/platform_adapter.go @@ -5,9 +5,9 @@ import ( "errors" "time" - "github.com/influxdata/platform" - "github.com/influxdata/platform/task/backend" - "github.com/influxdata/platform/task/options" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/task/backend" + "github.com/influxdata/influxdb/task/options" ) type RunController interface { @@ -75,7 +75,7 @@ func (p pAdapter) CreateTask(ctx context.Context, t *platform.Task) error { return err } - // TODO(mr): decide whether we allow user to configure scheduleAfter. https://github.com/influxdata/platform/issues/595 + // TODO(mr): decide whether we allow user to configure scheduleAfter. https://github.com/influxdata/influxdb/issues/595 scheduleAfter := time.Now().Unix() if t.Status == "" { diff --git a/task/service_test.go b/task/service_test.go index d42b99be49c..ff08d064b87 100644 --- a/task/service_test.go +++ b/task/service_test.go @@ -7,10 +7,10 @@ import ( "testing" bolt "github.com/coreos/bbolt" - _ "github.com/influxdata/platform/query/builtin" - "github.com/influxdata/platform/task/backend" - boltstore "github.com/influxdata/platform/task/backend/bolt" - "github.com/influxdata/platform/task/servicetest" + _ "github.com/influxdata/influxdb/query/builtin" + "github.com/influxdata/influxdb/task/backend" + boltstore "github.com/influxdata/influxdb/task/backend/bolt" + "github.com/influxdata/influxdb/task/servicetest" ) func inMemFactory(t *testing.T) (*servicetest.System, context.CancelFunc) { diff --git a/task/servicetest/servicetest.go b/task/servicetest/servicetest.go index b22303573e2..8c02ed54517 100644 --- a/task/servicetest/servicetest.go +++ b/task/servicetest/servicetest.go @@ -15,11 +15,11 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform" - "github.com/influxdata/platform/snowflake" - "github.com/influxdata/platform/task" - "github.com/influxdata/platform/task/backend" - "github.com/influxdata/platform/task/options" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/snowflake" + "github.com/influxdata/influxdb/task" + "github.com/influxdata/influxdb/task/backend" + "github.com/influxdata/influxdb/task/options" ) func init() { diff --git a/task/validator.go b/task/validator.go index 9b9560ee969..4078e06f8cb 100644 --- a/task/validator.go +++ b/task/validator.go @@ -7,9 +7,9 @@ import ( "time" "github.com/influxdata/flux" - "github.com/influxdata/platform" - platcontext "github.com/influxdata/platform/context" - "github.com/influxdata/platform/query" + platform "github.com/influxdata/influxdb" + platcontext "github.com/influxdata/influxdb/context" + "github.com/influxdata/influxdb/query" ) type authError struct { diff --git a/telegraf.go b/telegraf.go index c4cb7a21632..fdcdffacab4 100644 --- a/telegraf.go +++ b/telegraf.go @@ -1,4 +1,4 @@ -package platform +package influxdb import ( "context" @@ -7,9 +7,9 @@ import ( "fmt" "time" - "github.com/influxdata/platform/telegraf/plugins" - "github.com/influxdata/platform/telegraf/plugins/inputs" - "github.com/influxdata/platform/telegraf/plugins/outputs" + "github.com/influxdata/influxdb/telegraf/plugins" + "github.com/influxdata/influxdb/telegraf/plugins/inputs" + "github.com/influxdata/influxdb/telegraf/plugins/outputs" ) // ErrTelegrafConfigInvalidOrganizationID is the error message for a missing or invalid organization ID. diff --git a/telegraf/plugins/inputs/base.go b/telegraf/plugins/inputs/base.go index 1afbc7fc600..56cd919b071 100644 --- a/telegraf/plugins/inputs/base.go +++ b/telegraf/plugins/inputs/base.go @@ -1,6 +1,6 @@ package inputs -import "github.com/influxdata/platform/telegraf/plugins" +import "github.com/influxdata/influxdb/telegraf/plugins" type baseInput int diff --git a/telegraf/plugins/inputs/inputs_test.go b/telegraf/plugins/inputs/inputs_test.go index 29ca9d6beaa..41b5168636c 100644 --- a/telegraf/plugins/inputs/inputs_test.go +++ b/telegraf/plugins/inputs/inputs_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/influxdata/platform/telegraf/plugins" + "github.com/influxdata/influxdb/telegraf/plugins" ) // local plugin diff --git a/telegraf/plugins/outputs/base.go b/telegraf/plugins/outputs/base.go index c9b103fe983..7bc8b9a8d28 100644 --- a/telegraf/plugins/outputs/base.go +++ b/telegraf/plugins/outputs/base.go @@ -1,6 +1,6 @@ package outputs -import "github.com/influxdata/platform/telegraf/plugins" +import "github.com/influxdata/influxdb/telegraf/plugins" type baseOutput int diff --git a/telegraf/plugins/outputs/outputs_test.go b/telegraf/plugins/outputs/outputs_test.go index 17afa28b1fb..3da3774b9eb 100644 --- a/telegraf/plugins/outputs/outputs_test.go +++ b/telegraf/plugins/outputs/outputs_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/influxdata/platform/telegraf/plugins" + "github.com/influxdata/influxdb/telegraf/plugins" ) // local plugin diff --git a/telegraf_test.go b/telegraf_test.go index c305c5eb884..940ccb1e261 100644 --- a/telegraf_test.go +++ b/telegraf_test.go @@ -1,4 +1,4 @@ -package platform +package influxdb import ( "encoding/json" @@ -8,13 +8,11 @@ import ( "testing" "github.com/BurntSushi/toml" - - "github.com/influxdata/platform/telegraf/plugins" - "github.com/influxdata/platform/telegraf/plugins/outputs" - "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/influxdata/platform/telegraf/plugins/inputs" + "github.com/influxdata/influxdb/telegraf/plugins" + "github.com/influxdata/influxdb/telegraf/plugins/inputs" + "github.com/influxdata/influxdb/telegraf/plugins/outputs" ) var telegrafCmpOptions = cmp.Options{ diff --git a/testing/auth.go b/testing/auth.go index 461a977c0c3..c2ffb68807a 100644 --- a/testing/auth.go +++ b/testing/auth.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform" - "github.com/influxdata/platform/mock" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/mock" ) const ( diff --git a/testing/basic_auth.go b/testing/basic_auth.go index af0f0f75e6b..45460d6bb9a 100644 --- a/testing/basic_auth.go +++ b/testing/basic_auth.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) // BasicAuth test all the services for basic auth diff --git a/testing/bucket_service.go b/testing/bucket_service.go index 2172ebe2830..e93f2e2b57b 100644 --- a/testing/bucket_service.go +++ b/testing/bucket_service.go @@ -9,8 +9,8 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform" - "github.com/influxdata/platform/mock" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/mock" ) const ( diff --git a/testing/cells.go b/testing/cells.go index dff4f953d13..0fb0e924022 100644 --- a/testing/cells.go +++ b/testing/cells.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform" - "github.com/influxdata/platform/mock" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/mock" ) const ( diff --git a/testing/dashboards.go b/testing/dashboards.go index d349df50802..4747177962f 100644 --- a/testing/dashboards.go +++ b/testing/dashboards.go @@ -8,8 +8,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/influxdata/platform" - "github.com/influxdata/platform/mock" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/mock" ) const ( diff --git a/testing/dbrp_mapping.go b/testing/dbrp_mapping.go index 325dae581ce..a2aa0616e05 100644 --- a/testing/dbrp_mapping.go +++ b/testing/dbrp_mapping.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" "github.com/pkg/errors" ) diff --git a/testing/keyvalue_log.go b/testing/keyvalue_log.go index 5fd0a3d50d6..6cfb9fdc71f 100644 --- a/testing/keyvalue_log.go +++ b/testing/keyvalue_log.go @@ -7,7 +7,7 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) var keyValueLogCmpOptions = cmp.Options{ diff --git a/testing/kv.go b/testing/kv.go index 0024d4173c3..750bb69947c 100644 --- a/testing/kv.go +++ b/testing/kv.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/influxdata/platform/kv" + "github.com/influxdata/influxdb/kv" ) // KVStoreFields are background data that has to be set before diff --git a/testing/label_service.go b/testing/label_service.go index a54b436bf58..017414eb112 100644 --- a/testing/label_service.go +++ b/testing/label_service.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) var labelCmpOptions = cmp.Options{ diff --git a/testing/macro.go b/testing/macro.go index 9f97643e78e..51cc886bed9 100644 --- a/testing/macro.go +++ b/testing/macro.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform" - "github.com/influxdata/platform/mock" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/mock" ) const ( diff --git a/testing/onboarding.go b/testing/onboarding.go index a9f0cc802fb..0fc61db67e2 100644 --- a/testing/onboarding.go +++ b/testing/onboarding.go @@ -6,8 +6,8 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform" - "github.com/influxdata/platform/mock" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/mock" ) // OnboardingFields will include the IDGenerator, TokenGenerator diff --git a/testing/organization_service.go b/testing/organization_service.go index 2e2dcccaf4e..c132210fdea 100644 --- a/testing/organization_service.go +++ b/testing/organization_service.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform" - "github.com/influxdata/platform/mock" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/mock" ) const ( diff --git a/testing/scraper_target.go b/testing/scraper_target.go index bf03ec7db3b..b9d0799b4c7 100644 --- a/testing/scraper_target.go +++ b/testing/scraper_target.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform" - "github.com/influxdata/platform/mock" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/mock" ) const ( diff --git a/testing/secret.go b/testing/secret.go index f05e6d5f6b9..ca455f0ba9c 100644 --- a/testing/secret.go +++ b/testing/secret.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) var secretCmpOptions = cmp.Options{ diff --git a/testing/session.go b/testing/session.go index 37619b1d84a..eb7fc9c698f 100644 --- a/testing/session.go +++ b/testing/session.go @@ -9,8 +9,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/influxdata/platform" - "github.com/influxdata/platform/mock" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/mock" ) const ( diff --git a/testing/source.go b/testing/source.go index 08cb653318a..a09b4ec2d9b 100644 --- a/testing/source.go +++ b/testing/source.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform" - "github.com/influxdata/platform/mock" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/mock" ) const ( diff --git a/testing/telegraf.go b/testing/telegraf.go index 2a2d680114f..8c9dddd5ada 100644 --- a/testing/telegraf.go +++ b/testing/telegraf.go @@ -9,10 +9,10 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/influxdata/platform" - "github.com/influxdata/platform/mock" - "github.com/influxdata/platform/telegraf/plugins/inputs" - "github.com/influxdata/platform/telegraf/plugins/outputs" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/mock" + "github.com/influxdata/influxdb/telegraf/plugins/inputs" + "github.com/influxdata/influxdb/telegraf/plugins/outputs" ) // TelegrafConfigFields includes prepopulated data for mapping tests. diff --git a/testing/user_resource_mapping_service.go b/testing/user_resource_mapping_service.go index 91a75dac8a6..5b85a6062ca 100644 --- a/testing/user_resource_mapping_service.go +++ b/testing/user_resource_mapping_service.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) var mappingCmpOptions = cmp.Options{ diff --git a/testing/user_service.go b/testing/user_service.go index edfc7b39282..fa86fc551fc 100644 --- a/testing/user_service.go +++ b/testing/user_service.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform" - "github.com/influxdata/platform/mock" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/mock" ) const ( diff --git a/testing/util.go b/testing/util.go index 1f5a1517425..ff4eaa799b7 100644 --- a/testing/util.go +++ b/testing/util.go @@ -3,7 +3,7 @@ package testing import ( "testing" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) // TODO(goller): remove opPrefix argument diff --git a/token.go b/token.go index 841d9aa25ad..be9bbf30ea4 100644 --- a/token.go +++ b/token.go @@ -1,4 +1,4 @@ -package platform +package influxdb // TokenGenerator represents a generator for API tokens. type TokenGenerator interface { diff --git a/toml/toml_test.go b/toml/toml_test.go index 89fe771981d..08c963b84e7 100644 --- a/toml/toml_test.go +++ b/toml/toml_test.go @@ -10,7 +10,7 @@ import ( "time" "github.com/google/go-cmp/cmp" - itoml "github.com/influxdata/platform/toml" + itoml "github.com/influxdata/influxdb/toml" ) func TestSize_UnmarshalText(t *testing.T) { diff --git a/tools.go b/tools.go index a03357ec912..95dac038e52 100644 --- a/tools.go +++ b/tools.go @@ -1,6 +1,6 @@ //+build tools -package platform +package influxdb import ( _ "github.com/benbjohnson/tmpl" diff --git a/tsdb/config.go b/tsdb/config.go index 4368e2d9acf..53958be1343 100644 --- a/tsdb/config.go +++ b/tsdb/config.go @@ -1,7 +1,7 @@ package tsdb import ( - "github.com/influxdata/platform/query" + "github.com/influxdata/influxdb/query" ) // EOF represents a "not found" key returned by a Cursor. diff --git a/tsdb/cursor.go b/tsdb/cursor.go index a95c371972c..849835d446e 100644 --- a/tsdb/cursor.go +++ b/tsdb/cursor.go @@ -1,6 +1,6 @@ package tsdb -import "github.com/influxdata/platform/tsdb/cursors" +import "github.com/influxdata/influxdb/tsdb/cursors" // These aliases exist to maintain api compatability when they were moved // into their own package to avoid having a heavy dependency in order to diff --git a/tsdb/cursors/arrayvalues_test.go b/tsdb/cursors/arrayvalues_test.go index ab5e53b7e08..8e0a90e70d9 100644 --- a/tsdb/cursors/arrayvalues_test.go +++ b/tsdb/cursors/arrayvalues_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform/tsdb/cursors" + "github.com/influxdata/influxdb/tsdb/cursors" ) func makeBooleanArray(v ...interface{}) *cursors.BooleanArray { diff --git a/tsdb/cursors/cursor.go b/tsdb/cursors/cursor.go index 3b53a539f4a..70cdc4c4925 100644 --- a/tsdb/cursors/cursor.go +++ b/tsdb/cursors/cursor.go @@ -3,7 +3,7 @@ package cursors import ( "context" - "github.com/influxdata/platform/models" + "github.com/influxdata/influxdb/models" ) const DefaultMaxPointsPerBlock = 1000 diff --git a/tsdb/explode.go b/tsdb/explode.go index 09f35128c46..54089ad46c4 100644 --- a/tsdb/explode.go +++ b/tsdb/explode.go @@ -3,8 +3,8 @@ package tsdb import ( "encoding/binary" - "github.com/influxdata/platform" - "github.com/influxdata/platform/models" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/models" ) // Values used to store the field key and measurement name as tags. diff --git a/tsdb/explode_test.go b/tsdb/explode_test.go index 96e4e8567df..2b9c2e9de8d 100644 --- a/tsdb/explode_test.go +++ b/tsdb/explode_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/tsdb" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/tsdb" ) func TestNames(t *testing.T) { diff --git a/tsdb/index.go b/tsdb/index.go index 1542a5ac0de..d621150c51d 100644 --- a/tsdb/index.go +++ b/tsdb/index.go @@ -5,9 +5,9 @@ import ( "fmt" "sync" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/query" "github.com/influxdata/influxql" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/query" ) // SeriesElem represents a generic series element. diff --git a/tsdb/index_test.go b/tsdb/index_test.go index 7b8414f2f3e..ba2f2f18c41 100644 --- a/tsdb/index_test.go +++ b/tsdb/index_test.go @@ -10,12 +10,12 @@ import ( "sync" "testing" + "github.com/influxdata/influxdb/logger" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/query" + "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/tsdb/tsi1" "github.com/influxdata/influxql" - "github.com/influxdata/platform/logger" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/query" - "github.com/influxdata/platform/tsdb" - "github.com/influxdata/platform/tsdb/tsi1" ) func toSeriesIDs(ids []uint64) []tsdb.SeriesID { diff --git a/tsdb/meta.go b/tsdb/meta.go index 2ed3e7940a6..dae5f4022c2 100644 --- a/tsdb/meta.go +++ b/tsdb/meta.go @@ -5,7 +5,7 @@ package tsdb import ( "sort" - "github.com/influxdata/platform/models" + "github.com/influxdata/influxdb/models" ) // MarshalTags converts a tag set to bytes for use as a lookup key. diff --git a/tsdb/meta_test.go b/tsdb/meta_test.go index 31d70a55add..4a513510def 100644 --- a/tsdb/meta_test.go +++ b/tsdb/meta_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/tsdb" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/tsdb" ) // Ensure tags can be marshaled into a byte slice. diff --git a/tsdb/metrics.go b/tsdb/metrics.go index 47429ab94b6..190e9b65be9 100644 --- a/tsdb/metrics.go +++ b/tsdb/metrics.go @@ -4,8 +4,7 @@ import ( "sort" "sync" - "github.com/influxdata/platform/pkg/rhh" - + "github.com/influxdata/influxdb/pkg/rhh" "github.com/prometheus/client_golang/prometheus" ) diff --git a/tsdb/metrics_test.go b/tsdb/metrics_test.go index 8f840994664..8c88223490c 100644 --- a/tsdb/metrics_test.go +++ b/tsdb/metrics_test.go @@ -3,7 +3,7 @@ package tsdb import ( "testing" - "github.com/influxdata/platform/kit/prom/promtest" + "github.com/influxdata/influxdb/kit/prom/promtest" "github.com/prometheus/client_golang/prometheus" dto "github.com/prometheus/client_model/go" ) diff --git a/tsdb/series_collection.go b/tsdb/series_collection.go index fb597cac32a..cfb697c9c08 100644 --- a/tsdb/series_collection.go +++ b/tsdb/series_collection.go @@ -5,8 +5,8 @@ import ( "sync/atomic" "unsafe" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/pkg/bytesutil" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/pkg/bytesutil" ) // SeriesCollection is a struct of arrays representation of a collection of series that allows diff --git a/tsdb/series_collection_test.go b/tsdb/series_collection_test.go index 0cbd2ca42cb..79c566f6ba3 100644 --- a/tsdb/series_collection_test.go +++ b/tsdb/series_collection_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/influxdata/platform/models" + "github.com/influxdata/influxdb/models" ) func TestSeriesCollection(t *testing.T) { diff --git a/tsdb/series_file.go b/tsdb/series_file.go index 1af091f2774..daf3fd9bbb2 100644 --- a/tsdb/series_file.go +++ b/tsdb/series_file.go @@ -10,12 +10,11 @@ import ( "sort" "sync" - "github.com/influxdata/platform/logger" - "github.com/influxdata/platform/pkg/rhh" - "github.com/cespare/xxhash" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/pkg/binaryutil" + "github.com/influxdata/influxdb/logger" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/pkg/binaryutil" + "github.com/influxdata/influxdb/pkg/rhh" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" "golang.org/x/sync/errgroup" diff --git a/tsdb/series_file_test.go b/tsdb/series_file_test.go index 14fa6620d44..41ea98e0f22 100644 --- a/tsdb/series_file_test.go +++ b/tsdb/series_file_test.go @@ -7,9 +7,9 @@ import ( "os" "testing" - "github.com/influxdata/platform/logger" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/tsdb" + "github.com/influxdata/influxdb/logger" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/tsdb" ) func TestParseSeriesKeyInto(t *testing.T) { diff --git a/tsdb/series_id.go b/tsdb/series_id.go index eab229f7c40..70b13332132 100644 --- a/tsdb/series_id.go +++ b/tsdb/series_id.go @@ -3,7 +3,7 @@ package tsdb import ( "unsafe" - "github.com/influxdata/platform/models" + "github.com/influxdata/influxdb/models" ) const ( diff --git a/tsdb/series_id_test.go b/tsdb/series_id_test.go index 50f47c159cf..873558f21f4 100644 --- a/tsdb/series_id_test.go +++ b/tsdb/series_id_test.go @@ -4,7 +4,7 @@ import ( "math/rand" "testing" - "github.com/influxdata/platform/models" + "github.com/influxdata/influxdb/models" ) func TestSeriesID(t *testing.T) { diff --git a/tsdb/series_index.go b/tsdb/series_index.go index 5298da973b6..d95c89e2b53 100644 --- a/tsdb/series_index.go +++ b/tsdb/series_index.go @@ -7,9 +7,9 @@ import ( "io" "os" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/pkg/mmap" - "github.com/influxdata/platform/pkg/rhh" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/pkg/mmap" + "github.com/influxdata/influxdb/pkg/rhh" "github.com/prometheus/client_golang/prometheus" ) diff --git a/tsdb/series_index_test.go b/tsdb/series_index_test.go index 274f2973074..0f0dab3e943 100644 --- a/tsdb/series_index_test.go +++ b/tsdb/series_index_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/tsdb" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/tsdb" ) func toTypedSeriesID(id uint64) tsdb.SeriesIDTyped { diff --git a/tsdb/series_partition.go b/tsdb/series_partition.go index 44032e69a0e..bb6cd22b082 100644 --- a/tsdb/series_partition.go +++ b/tsdb/series_partition.go @@ -10,9 +10,9 @@ import ( "sync" "time" - "github.com/influxdata/platform/logger" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/pkg/rhh" + "github.com/influxdata/influxdb/logger" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/pkg/rhh" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" ) diff --git a/tsdb/series_segment.go b/tsdb/series_segment.go index 6b19467794f..43247b9b6a1 100644 --- a/tsdb/series_segment.go +++ b/tsdb/series_segment.go @@ -11,7 +11,7 @@ import ( "regexp" "strconv" - "github.com/influxdata/platform/pkg/mmap" + "github.com/influxdata/influxdb/pkg/mmap" ) const ( diff --git a/tsdb/series_segment_test.go b/tsdb/series_segment_test.go index 47539e0bcfe..729cd946c21 100644 --- a/tsdb/series_segment_test.go +++ b/tsdb/series_segment_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform/tsdb" + "github.com/influxdata/influxdb/tsdb" ) func MustTempDir() (string, func()) { diff --git a/tsdb/tsi1/cache.go b/tsdb/tsi1/cache.go index 7c198525ce1..7fcb4ea2de7 100644 --- a/tsdb/tsi1/cache.go +++ b/tsdb/tsi1/cache.go @@ -4,7 +4,7 @@ import ( "container/list" "sync" - "github.com/influxdata/platform/tsdb" + "github.com/influxdata/influxdb/tsdb" "github.com/prometheus/client_golang/prometheus" ) diff --git a/tsdb/tsi1/cache_test.go b/tsdb/tsi1/cache_test.go index c4a7ecefe27..e910c7a2498 100644 --- a/tsdb/tsi1/cache_test.go +++ b/tsdb/tsi1/cache_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/influxdata/platform/tsdb" + "github.com/influxdata/influxdb/tsdb" ) func newSeriesIDSet(ids ...int) *tsdb.SeriesIDSet { diff --git a/tsdb/tsi1/config.go b/tsdb/tsi1/config.go index 9c2e642afe0..07cac181f1a 100644 --- a/tsdb/tsi1/config.go +++ b/tsdb/tsi1/config.go @@ -1,6 +1,6 @@ package tsi1 -import "github.com/influxdata/platform/toml" +import "github.com/influxdata/influxdb/toml" // DefaultMaxIndexLogFileSize is the default threshold, in bytes, when an index // write-ahead log file will compact into an index file. diff --git a/tsdb/tsi1/file_set.go b/tsdb/tsi1/file_set.go index e54ce32d359..1a20f9cb58d 100644 --- a/tsdb/tsi1/file_set.go +++ b/tsdb/tsi1/file_set.go @@ -7,8 +7,8 @@ import ( "sync" "unsafe" + "github.com/influxdata/influxdb/tsdb" "github.com/influxdata/influxql" - "github.com/influxdata/platform/tsdb" ) // FileSet represents a collection of files. diff --git a/tsdb/tsi1/file_set_test.go b/tsdb/tsi1/file_set_test.go index b16f89b50f6..48984ab8b47 100644 --- a/tsdb/tsi1/file_set_test.go +++ b/tsdb/tsi1/file_set_test.go @@ -6,9 +6,9 @@ import ( "sort" "testing" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/tsdb" - "github.com/influxdata/platform/tsdb/tsi1" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/tsdb/tsi1" ) // Ensure fileset can return an iterator over all series in the index. diff --git a/tsdb/tsi1/index.go b/tsdb/tsi1/index.go index a2f45c7633c..8208f0aec72 100644 --- a/tsdb/tsi1/index.go +++ b/tsdb/tsi1/index.go @@ -16,11 +16,11 @@ import ( "unsafe" "github.com/cespare/xxhash" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/pkg/slices" + "github.com/influxdata/influxdb/query" + "github.com/influxdata/influxdb/tsdb" "github.com/influxdata/influxql" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/pkg/slices" - "github.com/influxdata/platform/query" - "github.com/influxdata/platform/tsdb" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" ) diff --git a/tsdb/tsi1/index_file.go b/tsdb/tsi1/index_file.go index 77f889606bf..51be0a0c43c 100644 --- a/tsdb/tsi1/index_file.go +++ b/tsdb/tsi1/index_file.go @@ -9,9 +9,9 @@ import ( "sync" "unsafe" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/pkg/mmap" - "github.com/influxdata/platform/tsdb" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/pkg/mmap" + "github.com/influxdata/influxdb/tsdb" ) // IndexFileVersion is the current TSI1 index file version. diff --git a/tsdb/tsi1/index_file_test.go b/tsdb/tsi1/index_file_test.go index dc9875c63ae..4307a0fa5dd 100644 --- a/tsdb/tsi1/index_file_test.go +++ b/tsdb/tsi1/index_file_test.go @@ -4,9 +4,9 @@ import ( "bytes" "testing" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/tsdb" - "github.com/influxdata/platform/tsdb/tsi1" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/tsdb/tsi1" ) // Ensure a simple index file can be built and opened. diff --git a/tsdb/tsi1/index_files.go b/tsdb/tsi1/index_files.go index dfb443b4c2c..9f38bab831f 100644 --- a/tsdb/tsi1/index_files.go +++ b/tsdb/tsi1/index_files.go @@ -7,8 +7,8 @@ import ( "sort" "time" - "github.com/influxdata/platform/pkg/bytesutil" - "github.com/influxdata/platform/tsdb" + "github.com/influxdata/influxdb/pkg/bytesutil" + "github.com/influxdata/influxdb/tsdb" ) // IndexFiles represents a layered set of index files. diff --git a/tsdb/tsi1/index_files_test.go b/tsdb/tsi1/index_files_test.go index 5c916eabed9..a75e60cd8d2 100644 --- a/tsdb/tsi1/index_files_test.go +++ b/tsdb/tsi1/index_files_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/tsdb/tsi1" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/tsdb/tsi1" ) // Ensure multiple index files can be compacted together. diff --git a/tsdb/tsi1/index_test.go b/tsdb/tsi1/index_test.go index 5e8edec666e..adea529c854 100644 --- a/tsdb/tsi1/index_test.go +++ b/tsdb/tsi1/index_test.go @@ -10,9 +10,9 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/tsdb" - "github.com/influxdata/platform/tsdb/tsi1" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/tsdb/tsi1" ) // Bloom filter settings used in tests. diff --git a/tsdb/tsi1/legacy_test.go b/tsdb/tsi1/legacy_test.go index a00570f3de0..f83d25cc44c 100644 --- a/tsdb/tsi1/legacy_test.go +++ b/tsdb/tsi1/legacy_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/influxdata/platform/tsdb" + "github.com/influxdata/influxdb/tsdb" ) func TestLegacyOpen(t *testing.T) { diff --git a/tsdb/tsi1/log_file.go b/tsdb/tsi1/log_file.go index eafcd1056c1..db81b771cb5 100644 --- a/tsdb/tsi1/log_file.go +++ b/tsdb/tsi1/log_file.go @@ -14,10 +14,10 @@ import ( "time" "unsafe" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/pkg/bloom" - "github.com/influxdata/platform/pkg/mmap" - "github.com/influxdata/platform/tsdb" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/pkg/bloom" + "github.com/influxdata/influxdb/pkg/mmap" + "github.com/influxdata/influxdb/tsdb" ) // Log errors. diff --git a/tsdb/tsi1/log_file_test.go b/tsdb/tsi1/log_file_test.go index 17210b2d2b8..9d6e2423c2c 100644 --- a/tsdb/tsi1/log_file_test.go +++ b/tsdb/tsi1/log_file_test.go @@ -13,12 +13,11 @@ import ( "testing" "time" - "github.com/influxdata/platform/pkg/slices" - - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/pkg/bloom" - "github.com/influxdata/platform/tsdb" - "github.com/influxdata/platform/tsdb/tsi1" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/pkg/bloom" + "github.com/influxdata/influxdb/pkg/slices" + "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/tsdb/tsi1" ) // Ensure log file can append series. diff --git a/tsdb/tsi1/measurement_block.go b/tsdb/tsi1/measurement_block.go index 2ddb612b099..959c0a9d681 100644 --- a/tsdb/tsi1/measurement_block.go +++ b/tsdb/tsi1/measurement_block.go @@ -8,8 +8,8 @@ import ( "sort" "unsafe" - "github.com/influxdata/platform/pkg/rhh" - "github.com/influxdata/platform/tsdb" + "github.com/influxdata/influxdb/pkg/rhh" + "github.com/influxdata/influxdb/tsdb" ) // MeasurementBlockVersion is the version of the measurement block. diff --git a/tsdb/tsi1/measurement_block_test.go b/tsdb/tsi1/measurement_block_test.go index 7afbf59d3b1..25a754f1129 100644 --- a/tsdb/tsi1/measurement_block_test.go +++ b/tsdb/tsi1/measurement_block_test.go @@ -7,8 +7,8 @@ import ( "reflect" "testing" - "github.com/influxdata/platform/tsdb" - "github.com/influxdata/platform/tsdb/tsi1" + "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/tsdb/tsi1" ) func TestReadMeasurementBlockTrailer(t *testing.T) { diff --git a/tsdb/tsi1/metrics_test.go b/tsdb/tsi1/metrics_test.go index 2f054a74fdc..7f343d66153 100644 --- a/tsdb/tsi1/metrics_test.go +++ b/tsdb/tsi1/metrics_test.go @@ -3,7 +3,7 @@ package tsi1 import ( "testing" - "github.com/influxdata/platform/kit/prom/promtest" + "github.com/influxdata/influxdb/kit/prom/promtest" "github.com/prometheus/client_golang/prometheus" dto "github.com/prometheus/client_model/go" ) diff --git a/tsdb/tsi1/partition.go b/tsdb/tsi1/partition.go index 6a611f2d626..83d6c051cf4 100644 --- a/tsdb/tsi1/partition.go +++ b/tsdb/tsi1/partition.go @@ -15,10 +15,10 @@ import ( "time" "unsafe" + "github.com/influxdata/influxdb/logger" + "github.com/influxdata/influxdb/pkg/bytesutil" + "github.com/influxdata/influxdb/tsdb" "github.com/influxdata/influxql" - "github.com/influxdata/platform/logger" - "github.com/influxdata/platform/pkg/bytesutil" - "github.com/influxdata/platform/tsdb" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" ) diff --git a/tsdb/tsi1/partition_test.go b/tsdb/tsi1/partition_test.go index 2fc7fa93fdc..87c3941dfd5 100644 --- a/tsdb/tsi1/partition_test.go +++ b/tsdb/tsi1/partition_test.go @@ -7,8 +7,8 @@ import ( "path/filepath" "testing" - "github.com/influxdata/platform/tsdb" - "github.com/influxdata/platform/tsdb/tsi1" + "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/tsdb/tsi1" ) func TestPartition_Open(t *testing.T) { diff --git a/tsdb/tsi1/stats.go b/tsdb/tsi1/stats.go index 4ff1fb06ae5..0e97bcdad49 100644 --- a/tsdb/tsi1/stats.go +++ b/tsdb/tsi1/stats.go @@ -8,7 +8,7 @@ import ( "io" "sort" - "github.com/influxdata/platform/pkg/binaryutil" + "github.com/influxdata/influxdb/pkg/binaryutil" ) const ( diff --git a/tsdb/tsi1/stats_test.go b/tsdb/tsi1/stats_test.go index 6f1fbb2b819..d2c4dff2125 100644 --- a/tsdb/tsi1/stats_test.go +++ b/tsdb/tsi1/stats_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform/tsdb/tsi1" + "github.com/influxdata/influxdb/tsdb/tsi1" ) func TestMeasurementCardinalityStats_WriteTo(t *testing.T) { diff --git a/tsdb/tsi1/tag_block.go b/tsdb/tsi1/tag_block.go index 6223e457cfc..825ebb6ad98 100644 --- a/tsdb/tsi1/tag_block.go +++ b/tsdb/tsi1/tag_block.go @@ -7,8 +7,8 @@ import ( "fmt" "io" - "github.com/influxdata/platform/pkg/rhh" - "github.com/influxdata/platform/tsdb" + "github.com/influxdata/influxdb/pkg/rhh" + "github.com/influxdata/influxdb/tsdb" ) // TagBlockVersion is the version of the tag block. diff --git a/tsdb/tsi1/tag_block_test.go b/tsdb/tsi1/tag_block_test.go index aed13f9cc74..16f3b222f85 100644 --- a/tsdb/tsi1/tag_block_test.go +++ b/tsdb/tsi1/tag_block_test.go @@ -6,8 +6,8 @@ import ( "reflect" "testing" - "github.com/influxdata/platform/tsdb" - "github.com/influxdata/platform/tsdb/tsi1" + "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/tsdb/tsi1" ) func newSeriesIDSet(ids ...int) *tsdb.SeriesIDSet { diff --git a/tsdb/tsi1/tsi1.go b/tsdb/tsi1/tsi1.go index 17f671eaef5..678c9ed058e 100644 --- a/tsdb/tsi1/tsi1.go +++ b/tsdb/tsi1/tsi1.go @@ -6,7 +6,7 @@ import ( "fmt" "io" - "github.com/influxdata/platform/tsdb" + "github.com/influxdata/influxdb/tsdb" ) // LoadFactor is the fill percent for RHH indexes. diff --git a/tsdb/tsi1/tsi1_test.go b/tsdb/tsi1/tsi1_test.go index 5cd09d5a463..dd3056631df 100644 --- a/tsdb/tsi1/tsi1_test.go +++ b/tsdb/tsi1/tsi1_test.go @@ -8,9 +8,9 @@ import ( "reflect" "testing" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/tsdb" - "github.com/influxdata/platform/tsdb/tsi1" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/tsdb/tsi1" ) // Ensure iterator can operate over an in-memory list of elements. diff --git a/tsdb/tsm1/array_cursor.gen.go b/tsdb/tsm1/array_cursor.gen.go index 78eb70d48f3..a18b1837840 100644 --- a/tsdb/tsm1/array_cursor.gen.go +++ b/tsdb/tsm1/array_cursor.gen.go @@ -9,8 +9,8 @@ package tsm1 import ( "sort" - "github.com/influxdata/platform/tsdb" - "github.com/influxdata/platform/tsdb/cursors" + "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/tsdb/cursors" ) // Array Cursors diff --git a/tsdb/tsm1/array_cursor.gen.go.tmpl b/tsdb/tsm1/array_cursor.gen.go.tmpl index ecf97151ef1..3ec768e28ae 100644 --- a/tsdb/tsm1/array_cursor.gen.go.tmpl +++ b/tsdb/tsm1/array_cursor.gen.go.tmpl @@ -3,8 +3,8 @@ package tsm1 import ( "sort" - "github.com/influxdata/platform/tsdb" - "github.com/influxdata/platform/tsdb/cursors" + "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/tsdb/cursors" ) // Array Cursors diff --git a/tsdb/tsm1/array_cursor_iterator.gen.go b/tsdb/tsm1/array_cursor_iterator.gen.go index 67050f77d53..e462e8dc563 100644 --- a/tsdb/tsm1/array_cursor_iterator.gen.go +++ b/tsdb/tsm1/array_cursor_iterator.gen.go @@ -9,9 +9,9 @@ package tsm1 import ( "context" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/query" - "github.com/influxdata/platform/tsdb" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/query" + "github.com/influxdata/influxdb/tsdb" ) // buildFloatArrayCursor creates an array cursor for a float field. diff --git a/tsdb/tsm1/array_cursor_iterator.gen.go.tmpl b/tsdb/tsm1/array_cursor_iterator.gen.go.tmpl index 2d0b5848b78..48f1b1400c1 100644 --- a/tsdb/tsm1/array_cursor_iterator.gen.go.tmpl +++ b/tsdb/tsm1/array_cursor_iterator.gen.go.tmpl @@ -3,9 +3,9 @@ package tsm1 import ( "context" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/query" - "github.com/influxdata/platform/tsdb" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/query" + "github.com/influxdata/influxdb/tsdb" ) {{range .}} diff --git a/tsdb/tsm1/array_cursor_iterator.go b/tsdb/tsm1/array_cursor_iterator.go index bc58a84d1e7..f5bd79364c7 100644 --- a/tsdb/tsm1/array_cursor_iterator.go +++ b/tsdb/tsm1/array_cursor_iterator.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/pkg/metrics" - "github.com/influxdata/platform/query" - "github.com/influxdata/platform/tsdb" - "github.com/influxdata/platform/tsdb/cursors" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/pkg/metrics" + "github.com/influxdata/influxdb/query" + "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/tsdb/cursors" ) type arrayCursorIterator struct { diff --git a/tsdb/tsm1/array_encoding.go b/tsdb/tsm1/array_encoding.go index b34a76fbbb5..864581efad8 100644 --- a/tsdb/tsm1/array_encoding.go +++ b/tsdb/tsm1/array_encoding.go @@ -3,7 +3,7 @@ package tsm1 import ( "fmt" - "github.com/influxdata/platform/tsdb" + "github.com/influxdata/influxdb/tsdb" ) // DecodeBooleanArrayBlock decodes the boolean block from the byte slice diff --git a/tsdb/tsm1/array_encoding_test.go b/tsdb/tsm1/array_encoding_test.go index fe0fe141c55..8d9ed8a386f 100644 --- a/tsdb/tsm1/array_encoding_test.go +++ b/tsdb/tsm1/array_encoding_test.go @@ -7,8 +7,8 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform/tsdb" - "github.com/influxdata/platform/tsdb/tsm1" + "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/tsdb/tsm1" ) func TestDecodeFloatArrayBlock(t *testing.T) { diff --git a/tsdb/tsm1/batch_boolean_test.go b/tsdb/tsm1/batch_boolean_test.go index 6673610f785..4033322627e 100644 --- a/tsdb/tsm1/batch_boolean_test.go +++ b/tsdb/tsm1/batch_boolean_test.go @@ -9,7 +9,7 @@ import ( "testing/quick" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform/tsdb/tsm1" + "github.com/influxdata/influxdb/tsdb/tsm1" ) func TestBooleanArrayEncodeAll_NoValues(t *testing.T) { diff --git a/tsdb/tsm1/batch_float_test.go b/tsdb/tsm1/batch_float_test.go index ffd177823f6..d3a9ab7aaec 100644 --- a/tsdb/tsm1/batch_float_test.go +++ b/tsdb/tsm1/batch_float_test.go @@ -10,7 +10,7 @@ import ( "testing/quick" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform/tsdb/tsm1" + "github.com/influxdata/influxdb/tsdb/tsm1" ) var fullBlockFloat64Ones []float64 diff --git a/tsdb/tsm1/batch_integer.go b/tsdb/tsm1/batch_integer.go index 30af1df841f..fc26ffb7e8f 100644 --- a/tsdb/tsm1/batch_integer.go +++ b/tsdb/tsm1/batch_integer.go @@ -5,7 +5,7 @@ import ( "fmt" "unsafe" - "github.com/influxdata/platform/pkg/encoding/simple8b" + "github.com/influxdata/influxdb/pkg/encoding/simple8b" ) // IntegerArrayEncodeAll encodes src into b, returning b and any error encountered. diff --git a/tsdb/tsm1/batch_string_test.go b/tsdb/tsm1/batch_string_test.go index a9794742163..1760034cfdc 100644 --- a/tsdb/tsm1/batch_string_test.go +++ b/tsdb/tsm1/batch_string_test.go @@ -9,8 +9,8 @@ import ( "testing/quick" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform/internal/testutil" - "github.com/influxdata/platform/uuid" + "github.com/influxdata/influxdb/internal/testutil" + "github.com/influxdata/influxdb/uuid" ) func TestStringArrayEncodeAll_NoValues(t *testing.T) { diff --git a/tsdb/tsm1/batch_timestamp.go b/tsdb/tsm1/batch_timestamp.go index faf7aad3f86..5dbc5c3b659 100644 --- a/tsdb/tsm1/batch_timestamp.go +++ b/tsdb/tsm1/batch_timestamp.go @@ -6,7 +6,7 @@ import ( "math" "unsafe" - "github.com/influxdata/platform/pkg/encoding/simple8b" + "github.com/influxdata/influxdb/pkg/encoding/simple8b" ) // TimeArrayEncodeAll encodes src into b, returning b and any error encountered. diff --git a/tsdb/tsm1/bit_reader_test.go b/tsdb/tsm1/bit_reader_test.go index f5d3150f1e9..897a9f18299 100644 --- a/tsdb/tsm1/bit_reader_test.go +++ b/tsdb/tsm1/bit_reader_test.go @@ -10,7 +10,7 @@ import ( "testing/quick" bitstream "github.com/dgryski/go-bitstream" - "github.com/influxdata/platform/tsdb/tsm1" + "github.com/influxdata/influxdb/tsdb/tsm1" ) func TestBitStreamEOF(t *testing.T) { diff --git a/tsdb/tsm1/bool_test.go b/tsdb/tsm1/bool_test.go index e09fe8e9e2c..f646f8179dd 100644 --- a/tsdb/tsm1/bool_test.go +++ b/tsdb/tsm1/bool_test.go @@ -6,7 +6,7 @@ import ( "testing" "testing/quick" - "github.com/influxdata/platform/tsdb/tsm1" + "github.com/influxdata/influxdb/tsdb/tsm1" ) func Test_BooleanEncoder_NoValues(t *testing.T) { diff --git a/tsdb/tsm1/cache.go b/tsdb/tsm1/cache.go index 1302b5b3a51..25f973d00bc 100644 --- a/tsdb/tsm1/cache.go +++ b/tsdb/tsm1/cache.go @@ -8,9 +8,9 @@ import ( "sync/atomic" "time" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/tsdb" "github.com/influxdata/influxql" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/tsdb" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" ) diff --git a/tsdb/tsm1/cache_race_test.go b/tsdb/tsm1/cache_race_test.go index b7a9741b373..9f7f0a2c2f9 100644 --- a/tsdb/tsm1/cache_race_test.go +++ b/tsdb/tsm1/cache_race_test.go @@ -6,7 +6,7 @@ import ( "sync" "testing" - "github.com/influxdata/platform/tsdb/tsm1" + "github.com/influxdata/influxdb/tsdb/tsm1" ) func TestCacheCheckConcurrentReadsAreSafe(t *testing.T) { diff --git a/tsdb/tsm1/compact.gen.go b/tsdb/tsm1/compact.gen.go index fe416a7a91c..6861d854129 100644 --- a/tsdb/tsm1/compact.gen.go +++ b/tsdb/tsm1/compact.gen.go @@ -9,7 +9,7 @@ package tsm1 import ( "sort" - "github.com/influxdata/platform/tsdb" + "github.com/influxdata/influxdb/tsdb" ) // merge combines the next set of blocks into merged blocks. diff --git a/tsdb/tsm1/compact.gen.go.tmpl b/tsdb/tsm1/compact.gen.go.tmpl index 292c8525b75..96c81dcd2f5 100644 --- a/tsdb/tsm1/compact.gen.go.tmpl +++ b/tsdb/tsm1/compact.gen.go.tmpl @@ -3,7 +3,7 @@ package tsm1 import ( "sort" - "github.com/influxdata/platform/tsdb" + "github.com/influxdata/influxdb/tsdb" ) {{range .}} diff --git a/tsdb/tsm1/compact.go b/tsdb/tsm1/compact.go index d66f3bb320c..aea49fccb3b 100644 --- a/tsdb/tsm1/compact.go +++ b/tsdb/tsm1/compact.go @@ -25,8 +25,8 @@ import ( "sync/atomic" "time" - "github.com/influxdata/platform/pkg/limiter" - "github.com/influxdata/platform/tsdb" + "github.com/influxdata/influxdb/pkg/limiter" + "github.com/influxdata/influxdb/tsdb" ) const maxTSMFileSize = uint32(2048 * 1024 * 1024) // 2GB diff --git a/tsdb/tsm1/compact_test.go b/tsdb/tsm1/compact_test.go index 03a0df9cfb2..33a6ab0dce1 100644 --- a/tsdb/tsm1/compact_test.go +++ b/tsdb/tsm1/compact_test.go @@ -11,8 +11,8 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform/tsdb/cursors" - "github.com/influxdata/platform/tsdb/tsm1" + "github.com/influxdata/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/tsdb/tsm1" ) // Tests compacting a Cache snapshot into a single TSM file diff --git a/tsdb/tsm1/config.go b/tsdb/tsm1/config.go index 524c34d0835..d3e367af61e 100644 --- a/tsdb/tsm1/config.go +++ b/tsdb/tsm1/config.go @@ -4,7 +4,7 @@ import ( "runtime" "time" - "github.com/influxdata/platform/toml" + "github.com/influxdata/influxdb/toml" ) var DefaultMaxConcurrentOpens = runtime.GOMAXPROCS(0) diff --git a/tsdb/tsm1/encoding.gen.go b/tsdb/tsm1/encoding.gen.go index 0a1117b619e..274e35b3c8c 100644 --- a/tsdb/tsm1/encoding.gen.go +++ b/tsdb/tsm1/encoding.gen.go @@ -9,7 +9,7 @@ package tsm1 import ( "sort" - "github.com/influxdata/platform/tsdb" + "github.com/influxdata/influxdb/tsdb" ) // Values represents a slice of values. diff --git a/tsdb/tsm1/encoding.gen.go.tmpl b/tsdb/tsm1/encoding.gen.go.tmpl index 688916216f2..4f1114459cc 100644 --- a/tsdb/tsm1/encoding.gen.go.tmpl +++ b/tsdb/tsm1/encoding.gen.go.tmpl @@ -3,7 +3,7 @@ package tsm1 import ( "sort" - "github.com/influxdata/platform/tsdb" + "github.com/influxdata/influxdb/tsdb" ) {{range .}} diff --git a/tsdb/tsm1/encoding.go b/tsdb/tsm1/encoding.go index 473f5b02a26..2f5e48d493a 100644 --- a/tsdb/tsm1/encoding.go +++ b/tsdb/tsm1/encoding.go @@ -6,9 +6,9 @@ import ( "runtime" "time" + "github.com/influxdata/influxdb/pkg/pool" + "github.com/influxdata/influxdb/tsdb" "github.com/influxdata/influxql" - "github.com/influxdata/platform/pkg/pool" - "github.com/influxdata/platform/tsdb" ) const ( diff --git a/tsdb/tsm1/encoding_test.go b/tsdb/tsm1/encoding_test.go index 5ea849cd564..4167d8f1709 100644 --- a/tsdb/tsm1/encoding_test.go +++ b/tsdb/tsm1/encoding_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/influxdata/platform/tsdb/tsm1" + "github.com/influxdata/influxdb/tsdb/tsm1" ) func TestEncoding_FloatBlock(t *testing.T) { diff --git a/tsdb/tsm1/engine.go b/tsdb/tsm1/engine.go index 075878323f3..71b68edea1f 100644 --- a/tsdb/tsm1/engine.go +++ b/tsdb/tsm1/engine.go @@ -1,5 +1,5 @@ // Package tsm1 provides a TSDB in the Time Structured Merge tree format. -package tsm1 // import "github.com/influxdata/platform/tsdb/tsm1" +package tsm1 // import "github.com/influxdata/influxdb/tsdb/tsm1" import ( "bytes" @@ -18,21 +18,21 @@ import ( "sync/atomic" "time" + "github.com/influxdata/influxdb/logger" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/pkg/bytesutil" + "github.com/influxdata/influxdb/pkg/limiter" + "github.com/influxdata/influxdb/pkg/metrics" + "github.com/influxdata/influxdb/query" + "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/tsdb/tsi1" "github.com/influxdata/influxql" - "github.com/influxdata/platform/logger" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/pkg/bytesutil" - "github.com/influxdata/platform/pkg/limiter" - "github.com/influxdata/platform/pkg/metrics" - "github.com/influxdata/platform/query" - "github.com/influxdata/platform/tsdb" - "github.com/influxdata/platform/tsdb/tsi1" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" ) -//go:generate env GO111MODULE=on go run github.com/influxdata/platform/tools/tmpl -i -data=file_store.gen.go.tmpldata file_store.gen.go.tmpl=file_store.gen.go -//go:generate env GO111MODULE=on go run github.com/influxdata/platform/tools/tmpl -i -d isArray=y -data=file_store.gen.go.tmpldata file_store.gen.go.tmpl=file_store_array.gen.go +//go:generate env GO111MODULE=on go run github.com/influxdata/influxdb/tools/tmpl -i -data=file_store.gen.go.tmpldata file_store.gen.go.tmpl=file_store.gen.go +//go:generate env GO111MODULE=on go run github.com/influxdata/influxdb/tools/tmpl -i -d isArray=y -data=file_store.gen.go.tmpldata file_store.gen.go.tmpl=file_store_array.gen.go //go:generate env GO111MODULE=on go run github.com/benbjohnson/tmpl -data=@encoding.gen.go.tmpldata encoding.gen.go.tmpl //go:generate env GO111MODULE=on go run github.com/benbjohnson/tmpl -data=@compact.gen.go.tmpldata compact.gen.go.tmpl //go:generate env GO111MODULE=on go run github.com/benbjohnson/tmpl -data=@reader.gen.go.tmpldata reader.gen.go.tmpl diff --git a/tsdb/tsm1/engine_cursor.go b/tsdb/tsm1/engine_cursor.go index 33af0b3d13a..85cb3f50a2d 100644 --- a/tsdb/tsm1/engine_cursor.go +++ b/tsdb/tsm1/engine_cursor.go @@ -3,7 +3,7 @@ package tsm1 import ( "context" - "github.com/influxdata/platform/tsdb" + "github.com/influxdata/influxdb/tsdb" ) func (e *Engine) CreateCursorIterator(ctx context.Context) (tsdb.CursorIterator, error) { diff --git a/tsdb/tsm1/engine_delete_prefix.go b/tsdb/tsm1/engine_delete_prefix.go index 341722e09fe..9de91831b81 100644 --- a/tsdb/tsm1/engine_delete_prefix.go +++ b/tsdb/tsm1/engine_delete_prefix.go @@ -5,9 +5,9 @@ import ( "math" "sync" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/pkg/bytesutil" "github.com/influxdata/influxql" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/pkg/bytesutil" ) func (e *Engine) DeletePrefix(prefix []byte, min, max int64) error { diff --git a/tsdb/tsm1/engine_delete_prefix_test.go b/tsdb/tsm1/engine_delete_prefix_test.go index 4b95b886a6d..c0fa52df798 100644 --- a/tsdb/tsm1/engine_delete_prefix_test.go +++ b/tsdb/tsm1/engine_delete_prefix_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/influxdata/platform/models" + "github.com/influxdata/influxdb/models" ) func TestEngine_DeletePrefix(t *testing.T) { diff --git a/tsdb/tsm1/engine_test.go b/tsdb/tsm1/engine_test.go index 0a4fa42acbb..5b6e4c01494 100644 --- a/tsdb/tsm1/engine_test.go +++ b/tsdb/tsm1/engine_test.go @@ -13,12 +13,12 @@ import ( "testing" "time" + "github.com/influxdata/influxdb/logger" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/tsdb/tsi1" + "github.com/influxdata/influxdb/tsdb/tsm1" "github.com/influxdata/influxql" - "github.com/influxdata/platform/logger" - "github.com/influxdata/platform/models" - "github.com/influxdata/platform/tsdb" - "github.com/influxdata/platform/tsdb/tsi1" - "github.com/influxdata/platform/tsdb/tsm1" ) // Test that series id set gets updated and returned appropriately. diff --git a/tsdb/tsm1/file_store.gen.go.tmpl b/tsdb/tsm1/file_store.gen.go.tmpl index 93a11987253..5cae1fe45bc 100644 --- a/tsdb/tsm1/file_store.gen.go.tmpl +++ b/tsdb/tsm1/file_store.gen.go.tmpl @@ -1,7 +1,7 @@ package tsm1 import ( - "github.com/influxdata/platform/tsdb" + "github.com/influxdata/influxdb/tsdb" ) {{$isArray := .D.isArray}} {{$isNotArray := not $isArray}} diff --git a/tsdb/tsm1/file_store.go b/tsdb/tsm1/file_store.go index 18eb0808d48..d8dccf0efc6 100644 --- a/tsdb/tsm1/file_store.go +++ b/tsdb/tsm1/file_store.go @@ -17,11 +17,11 @@ import ( "sync/atomic" "time" - "github.com/influxdata/platform/pkg/file" - "github.com/influxdata/platform/pkg/limiter" - "github.com/influxdata/platform/pkg/metrics" - "github.com/influxdata/platform/query" - "github.com/influxdata/platform/tsdb" + "github.com/influxdata/influxdb/pkg/file" + "github.com/influxdata/influxdb/pkg/limiter" + "github.com/influxdata/influxdb/pkg/metrics" + "github.com/influxdata/influxdb/query" + "github.com/influxdata/influxdb/tsdb" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" ) diff --git a/tsdb/tsm1/file_store_array.gen.go b/tsdb/tsm1/file_store_array.gen.go index a7bd82e6a29..4e016c3e820 100644 --- a/tsdb/tsm1/file_store_array.gen.go +++ b/tsdb/tsm1/file_store_array.gen.go @@ -3,7 +3,7 @@ package tsm1 import ( - "github.com/influxdata/platform/tsdb" + "github.com/influxdata/influxdb/tsdb" ) // ReadFloatArrayBlock reads the next block as a set of float values. diff --git a/tsdb/tsm1/file_store_array_test.go b/tsdb/tsm1/file_store_array_test.go index 1e66aaf977f..a486bab83b1 100644 --- a/tsdb/tsm1/file_store_array_test.go +++ b/tsdb/tsm1/file_store_array_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform/tsdb" - "github.com/influxdata/platform/tsdb/tsm1" + "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/tsdb/tsm1" ) func TestFileStore_Array(t *testing.T) { diff --git a/tsdb/tsm1/file_store_test.go b/tsdb/tsm1/file_store_test.go index a17ef51cf51..371007f78f7 100644 --- a/tsdb/tsm1/file_store_test.go +++ b/tsdb/tsm1/file_store_test.go @@ -12,8 +12,8 @@ import ( "testing" "time" - "github.com/influxdata/platform/logger" - "github.com/influxdata/platform/tsdb/tsm1" + "github.com/influxdata/influxdb/logger" + "github.com/influxdata/influxdb/tsdb/tsm1" ) func TestFileStore_Read(t *testing.T) { diff --git a/tsdb/tsm1/float_test.go b/tsdb/tsm1/float_test.go index 9780859cc94..ed8b2ab583f 100644 --- a/tsdb/tsm1/float_test.go +++ b/tsdb/tsm1/float_test.go @@ -8,7 +8,7 @@ import ( "testing/quick" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform/tsdb/tsm1" + "github.com/influxdata/influxdb/tsdb/tsm1" ) func TestFloatEncoder_Simple(t *testing.T) { diff --git a/tsdb/tsm1/metrics_test.go b/tsdb/tsm1/metrics_test.go index 8aafb1aa7ae..4b8dfb2a646 100644 --- a/tsdb/tsm1/metrics_test.go +++ b/tsdb/tsm1/metrics_test.go @@ -3,7 +3,7 @@ package tsm1 import ( "testing" - "github.com/influxdata/platform/kit/prom/promtest" + "github.com/influxdata/influxdb/kit/prom/promtest" "github.com/prometheus/client_golang/prometheus" ) diff --git a/tsdb/tsm1/reader.gen.go b/tsdb/tsm1/reader.gen.go index 5badaf1539b..ac218465b6b 100644 --- a/tsdb/tsm1/reader.gen.go +++ b/tsdb/tsm1/reader.gen.go @@ -7,7 +7,7 @@ package tsm1 import ( - "github.com/influxdata/platform/tsdb" + "github.com/influxdata/influxdb/tsdb" ) // ReadFloatBlockAt returns the float values corresponding to the given index entry. diff --git a/tsdb/tsm1/reader.gen.go.tmpl b/tsdb/tsm1/reader.gen.go.tmpl index 86ac9046d36..e4789f0996b 100644 --- a/tsdb/tsm1/reader.gen.go.tmpl +++ b/tsdb/tsm1/reader.gen.go.tmpl @@ -1,7 +1,7 @@ package tsm1 import ( - "github.com/influxdata/platform/tsdb" + "github.com/influxdata/influxdb/tsdb" ) {{range .}} @@ -74,4 +74,4 @@ func (m *mmapAccessor) read{{.Name}}ArrayBlock(entry *IndexEntry, values *tsdb.{ return err } -{{end}} \ No newline at end of file +{{end}} diff --git a/tsdb/tsm1/reader_mmap.go b/tsdb/tsm1/reader_mmap.go index 5765ebe99f5..4c913e7d77d 100644 --- a/tsdb/tsm1/reader_mmap.go +++ b/tsdb/tsm1/reader_mmap.go @@ -7,7 +7,7 @@ import ( "sync" "sync/atomic" - "github.com/influxdata/platform/pkg/file" + "github.com/influxdata/influxdb/pkg/file" "go.uber.org/zap" ) diff --git a/tsdb/tsm1/ring.go b/tsdb/tsm1/ring.go index 56f60e22de1..a80763a377b 100644 --- a/tsdb/tsm1/ring.go +++ b/tsdb/tsm1/ring.go @@ -6,7 +6,7 @@ import ( "sync/atomic" "github.com/cespare/xxhash" - "github.com/influxdata/platform/pkg/bytesutil" + "github.com/influxdata/influxdb/pkg/bytesutil" ) // partitions is the number of partitions we used in the ring's continuum. It diff --git a/tsdb/tsm1/stats.go b/tsdb/tsm1/stats.go index 61646702867..be86ee93353 100644 --- a/tsdb/tsm1/stats.go +++ b/tsdb/tsm1/stats.go @@ -9,7 +9,7 @@ import ( "sort" "strings" - "github.com/influxdata/platform/pkg/binaryutil" + "github.com/influxdata/influxdb/pkg/binaryutil" ) const ( diff --git a/tsdb/tsm1/stats_test.go b/tsdb/tsm1/stats_test.go index 2f6458e71f6..b2e15c45858 100644 --- a/tsdb/tsm1/stats_test.go +++ b/tsdb/tsm1/stats_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform/tsdb/tsm1" + "github.com/influxdata/influxdb/tsdb/tsm1" ) func TestMeasurementStats_WriteTo(t *testing.T) { diff --git a/tsdb/tsm1/string_test.go b/tsdb/tsm1/string_test.go index 9e154e9f7c0..41035a4ac27 100644 --- a/tsdb/tsm1/string_test.go +++ b/tsdb/tsm1/string_test.go @@ -8,7 +8,7 @@ import ( "testing/quick" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform/internal/testutil" + "github.com/influxdata/influxdb/internal/testutil" ) func Test_StringEncoder_NoValues(t *testing.T) { diff --git a/tsdb/tsm1/tombstone.go b/tsdb/tsm1/tombstone.go index f57f06f42ec..49842fb3862 100644 --- a/tsdb/tsm1/tombstone.go +++ b/tsdb/tsm1/tombstone.go @@ -56,7 +56,7 @@ import ( "strings" "sync" - "github.com/influxdata/platform/pkg/file" + "github.com/influxdata/influxdb/pkg/file" ) const ( diff --git a/tsdb/tsm1/tombstone_test.go b/tsdb/tsm1/tombstone_test.go index e6bf045d6ec..5335550f411 100644 --- a/tsdb/tsm1/tombstone_test.go +++ b/tsdb/tsm1/tombstone_test.go @@ -12,7 +12,7 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform/tsdb/tsm1" + "github.com/influxdata/influxdb/tsdb/tsm1" ) func TestTombstoner_Add(t *testing.T) { diff --git a/tsdb/tsm1/wal.go b/tsdb/tsm1/wal.go index 04be15c2fbd..2200a2bacd6 100644 --- a/tsdb/tsm1/wal.go +++ b/tsdb/tsm1/wal.go @@ -18,8 +18,8 @@ import ( "time" "github.com/golang/snappy" - "github.com/influxdata/platform/pkg/limiter" - "github.com/influxdata/platform/pkg/pool" + "github.com/influxdata/influxdb/pkg/limiter" + "github.com/influxdata/influxdb/pkg/pool" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" ) diff --git a/tsdb/tsm1/wal_test.go b/tsdb/tsm1/wal_test.go index 0d957f02214..de78110fd7e 100644 --- a/tsdb/tsm1/wal_test.go +++ b/tsdb/tsm1/wal_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/golang/snappy" - "github.com/influxdata/platform/pkg/slices" - "github.com/influxdata/platform/tsdb/tsm1" + "github.com/influxdata/influxdb/pkg/slices" + "github.com/influxdata/influxdb/tsdb/tsm1" ) func TestWALWriter_WriteMulti_Single(t *testing.T) { diff --git a/tsdb/tsm1/writer.go b/tsdb/tsm1/writer.go index 96a5a58978c..d69a25344d5 100644 --- a/tsdb/tsm1/writer.go +++ b/tsdb/tsm1/writer.go @@ -74,7 +74,7 @@ import ( "strings" "time" - "github.com/influxdata/platform/models" + "github.com/influxdata/influxdb/models" ) const ( diff --git a/tsdb/tsm1/writer_test.go b/tsdb/tsm1/writer_test.go index b7bf78dc0d8..672bf44a4b6 100644 --- a/tsdb/tsm1/writer_test.go +++ b/tsdb/tsm1/writer_test.go @@ -10,7 +10,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform/tsdb/tsm1" + "github.com/influxdata/influxdb/tsdb/tsm1" ) func TestTSMWriter_Write_Empty(t *testing.T) { diff --git a/ui/src/me/components/Support.tsx b/ui/src/me/components/Support.tsx index 55b53cb4847..1f3428cebb1 100644 --- a/ui/src/me/components/Support.tsx +++ b/ui/src/me/components/Support.tsx @@ -5,11 +5,11 @@ const supportLinks = [ {link: 'https://docs.influxdata.com/', title: '📜 Docs'}, {link: 'https://community.influxdata.com', title: '💭 Community Forum'}, { - link: 'https://github.com/influxdata/platform/issues/new', + link: 'https://github.com/influxdata/influxdb/issues/new', title: '✨ Feature Requests', }, { - link: 'https://github.com/influxdata/platform/issues/new', + link: 'https://github.com/influxdata/influxdb/issues/new', title: '🐛 Report a bug', }, ] diff --git a/ui/src/shared/decorators/errors.tsx b/ui/src/shared/decorators/errors.tsx index 59a392995ac..30c4f34296b 100644 --- a/ui/src/shared/decorators/errors.tsx +++ b/ui/src/shared/decorators/errors.tsx @@ -10,7 +10,7 @@ class DefaultError extends Component { return (

A Chronograf error has occurred. Please report the issue  - + here . diff --git a/ui/src/types/flux.ts b/ui/src/types/flux.ts index bab37e1d0b1..90f96e37cb5 100644 --- a/ui/src/types/flux.ts +++ b/ui/src/types/flux.ts @@ -151,7 +151,7 @@ export interface Links { } // FluxTable is the result of a request to Flux -// https://github.com/influxdata/platform/blob/master/query/docs/SPEC.md#response-format +// https://github.com/influxdata/influxdb/blob/master/query/docs/SPEC.md#response-format export interface FluxTable { id: string name: string diff --git a/ui/src/types/v2/links.ts b/ui/src/types/v2/links.ts index f3dea716006..2d3759f201d 100644 --- a/ui/src/types/v2/links.ts +++ b/ui/src/types/v2/links.ts @@ -1,6 +1,6 @@ // Links is the response from the /api/v2 endpoint. It contains // links to all other endpoints. -// see https://github.com/influxdata/platform/blob/db5b20f4eabcc7d2233e54415cbd48945b0b4d0c/http/api_handler.go#L125 +// see https://github.com/influxdata/influxdb/blob/db5b20f4eabcc7d2233e54415cbd48945b0b4d0c/http/api_handler.go#L125 export interface Links { authorizations: string buckets: string diff --git a/usage.go b/usage.go index 542463790c8..2db187e00a9 100644 --- a/usage.go +++ b/usage.go @@ -1,4 +1,4 @@ -package platform +package influxdb import ( "context" diff --git a/user.go b/user.go index 9a55f4d433c..8baa5ee71f3 100644 --- a/user.go +++ b/user.go @@ -1,4 +1,4 @@ -package platform +package influxdb import ( "context" diff --git a/user_resource_mapping.go b/user_resource_mapping.go index 42d4679b3b9..191be4bbd5a 100644 --- a/user_resource_mapping.go +++ b/user_resource_mapping.go @@ -1,4 +1,4 @@ -package platform +package influxdb import ( "context" diff --git a/user_resource_mapping_test.go b/user_resource_mapping_test.go index 658b729c944..ccf88f8c0c3 100644 --- a/user_resource_mapping_test.go +++ b/user_resource_mapping_test.go @@ -1,10 +1,10 @@ -package platform_test +package influxdb_test import ( "testing" - "github.com/influxdata/platform" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + platformtesting "github.com/influxdata/influxdb/testing" ) func TestOwnerMappingValidate(t *testing.T) { diff --git a/uuid/uuid.go b/uuid/uuid.go index a29c0274e65..2967ee384f7 100644 --- a/uuid/uuid.go +++ b/uuid/uuid.go @@ -32,7 +32,7 @@ // http://tools.ietf.org/html/rfc4122 // Package uuid provides functions to create time-based UUIDs. -package uuid // import "github.com/influxdata/platform/uuid" +package uuid // import "github.com/influxdata/influxdb/uuid" import ( "crypto/rand" diff --git a/vault/secret.go b/vault/secret.go index 0e1c9d22290..8b715cf7840 100644 --- a/vault/secret.go +++ b/vault/secret.go @@ -7,7 +7,7 @@ import ( "strconv" "github.com/hashicorp/vault/api" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) var _ platform.SecretService = (*SecretService)(nil) diff --git a/vault/secret_test.go b/vault/secret_test.go index 11996b30c13..62dc4202d4b 100644 --- a/vault/secret_test.go +++ b/vault/secret_test.go @@ -7,9 +7,9 @@ import ( "fmt" "testing" - "github.com/influxdata/platform" - platformtesting "github.com/influxdata/platform/testing" - "github.com/influxdata/platform/vault" + platform "github.com/influxdata/influxdb" + platformtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/vault" testcontainer "github.com/testcontainers/testcontainer-go" ) diff --git a/view.go b/view.go index 1642d7294c5..3736e1943b0 100644 --- a/view.go +++ b/view.go @@ -1,4 +1,4 @@ -package platform +package influxdb import ( "context" @@ -206,7 +206,8 @@ func MarshalViewPropertiesJSON(v ViewProperties) ([]byte, error) { Shape string `json:"shape"` SingleStatViewProperties }{ - Shape: "chronograf-v2", + Shape: "chronograf-v2", + SingleStatViewProperties: vis, } case TableViewProperties: @@ -214,7 +215,8 @@ func MarshalViewPropertiesJSON(v ViewProperties) ([]byte, error) { Shape string `json:"shape"` TableViewProperties }{ - Shape: "chronograf-v2", + Shape: "chronograf-v2", + TableViewProperties: vis, } case GaugeViewProperties: @@ -222,7 +224,8 @@ func MarshalViewPropertiesJSON(v ViewProperties) ([]byte, error) { Shape string `json:"shape"` GaugeViewProperties }{ - Shape: "chronograf-v2", + Shape: "chronograf-v2", + GaugeViewProperties: vis, } case XYViewProperties: @@ -230,7 +233,8 @@ func MarshalViewPropertiesJSON(v ViewProperties) ([]byte, error) { Shape string `json:"shape"` XYViewProperties }{ - Shape: "chronograf-v2", + Shape: "chronograf-v2", + XYViewProperties: vis, } case LinePlusSingleStatProperties: @@ -238,7 +242,8 @@ func MarshalViewPropertiesJSON(v ViewProperties) ([]byte, error) { Shape string `json:"shape"` LinePlusSingleStatProperties }{ - Shape: "chronograf-v2", + Shape: "chronograf-v2", + LinePlusSingleStatProperties: vis, } case MarkdownViewProperties: @@ -246,7 +251,8 @@ func MarshalViewPropertiesJSON(v ViewProperties) ([]byte, error) { Shape string `json:"shape"` MarkdownViewProperties }{ - Shape: "chronograf-v2", + Shape: "chronograf-v2", + MarkdownViewProperties: vis, } case LogViewProperties: diff --git a/view_test.go b/view_test.go index 5c2060056d8..c96c0ec04d6 100644 --- a/view_test.go +++ b/view_test.go @@ -1,12 +1,12 @@ -package platform_test +package influxdb_test import ( "encoding/json" "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform" - platformtesting "github.com/influxdata/platform/testing" + platform "github.com/influxdata/influxdb" + platformtesting "github.com/influxdata/influxdb/testing" ) func TestView_MarshalJSON(t *testing.T) { diff --git a/write.go b/write.go index 8782f5964ff..fbb83171bad 100644 --- a/write.go +++ b/write.go @@ -1,4 +1,4 @@ -package platform +package influxdb import ( "context" diff --git a/write/batcher.go b/write/batcher.go index 0aef2c1b3bd..e494742f36e 100644 --- a/write/batcher.go +++ b/write/batcher.go @@ -8,7 +8,7 @@ import ( "io" "time" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" ) const ( diff --git a/write/batcher_test.go b/write/batcher_test.go index 1a1f78e3777..51a2a59d0b3 100644 --- a/write/batcher_test.go +++ b/write/batcher_test.go @@ -11,8 +11,8 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/influxdata/platform" - "github.com/influxdata/platform/mock" + platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/mock" ) func TestScanLines(t *testing.T) { diff --git a/zap/auth_service.go b/zap/auth_service.go index fa2cdcd82b0..a4307c59f5e 100644 --- a/zap/auth_service.go +++ b/zap/auth_service.go @@ -3,9 +3,8 @@ package zap import ( "context" + platform "github.com/influxdata/influxdb" "go.uber.org/zap" - - "github.com/influxdata/platform" ) var _ platform.AuthorizationService = (*AuthorizationService)(nil) diff --git a/zap/proxy_query_service.go b/zap/proxy_query_service.go index 34580029e3a..805fa4693d4 100644 --- a/zap/proxy_query_service.go +++ b/zap/proxy_query_service.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/influxdata/platform/query" + "github.com/influxdata/influxdb/query" "go.uber.org/zap" ) diff --git a/zap/tracer.go b/zap/tracer.go index bac009e66c5..368d90a11fa 100644 --- a/zap/tracer.go +++ b/zap/tracer.go @@ -8,7 +8,7 @@ import ( "net/http" "time" - "github.com/influxdata/platform" + platform "github.com/influxdata/influxdb" opentracing "github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go/log" "go.uber.org/zap"