From 89eaad35875d4771dbf199113792ead6844bf183 Mon Sep 17 00:00:00 2001 From: Sam Arnold Date: Mon, 5 Apr 2021 13:52:35 -0400 Subject: [PATCH] chore: fix up import ordering with gci --- authorizer/authorize_find.go | 6 ++---- authorizer/check.go | 6 ++---- authorizer/task.go | 6 ++---- authorizer/task_test.go | 4 ++-- checks/service.go | 6 ++---- checks/service_external_test.go | 8 +++----- checks/service_test.go | 3 +-- cmd/influx/task.go | 6 ++---- cmd/influx/task_test.go | 6 ++---- cmd/influxd/launcher/launcher.go | 14 ++++++++------ cmd/influxd/launcher/launcher_helpers.go | 3 +-- cmd/influxd/launcher/pkger_test.go | 6 ++---- dbrp/error.go | 3 +-- http/api_handler.go | 3 +-- http/check_service.go | 3 +-- http/check_test.go | 8 +++----- http/notification_rule.go | 8 +++----- http/notification_rule_test.go | 6 ++---- http/task_service.go | 8 +++----- http/task_service_test.go | 8 +++----- internal/resource/resolve.go | 6 ++---- kv/migration/all/0003_task_owners.go | 6 ++---- kv/task.go | 6 ++---- kv/task_private_test.go | 6 ++---- kv/task_test.go | 4 ++-- mock/task_service.go | 4 +--- notification/rule/service/service.go | 6 ++---- notification/rule/service/service_external_test.go | 8 +++----- notification/rule/service/service_test.go | 6 ++---- pkger/clone_resource.go | 6 ++---- pkger/parser_test.go | 6 ++---- pkger/service.go | 8 +++----- pkger/service_models.go | 6 ++---- pkger/service_test.go | 6 ++---- task/backend/analytical_storage.go | 8 +++----- task/backend/analytical_storage_test.go | 6 +++--- task/backend/coordinator.go | 4 +--- task/backend/coordinator/coordinator.go | 4 +--- task/backend/coordinator/coordinator_test.go | 6 ++---- task/backend/coordinator/support_test.go | 4 +--- task/backend/coordinator_test.go | 6 ++---- task/backend/executor/executor.go | 6 ++---- task/backend/executor/executor_metrics.go | 4 +--- task/backend/executor/executor_test.go | 6 ++---- task/backend/executor/limits.go | 3 +-- task/backend/executor/limits_test.go | 3 +-- task/backend/middleware/check_middleware.go | 6 ++---- task/backend/middleware/check_middleware_test.go | 4 ++-- task/backend/middleware/middleware.go | 3 +-- task/backend/middleware/middleware_test.go | 4 ++-- task/backend/middleware/notification_middleware.go | 6 ++---- .../middleware/notification_middleware_test.go | 4 ++-- task/backend/run_recorder.go | 4 +--- task/backend/schedulable_task_service.go | 4 +--- task/backend/schedulable_task_service_test.go | 4 +--- task/backend/task.go | 3 +-- task/mock/executor.go | 4 +--- task/mock/task_control_service.go | 4 +--- task/servicetest/servicetest.go | 6 ++---- task/taskmodel/task_test.go | 2 +- 60 files changed, 115 insertions(+), 208 deletions(-) diff --git a/authorizer/authorize_find.go b/authorizer/authorize_find.go index 21eb700d99b..b4aa6152595 100644 --- a/authorizer/authorize_find.go +++ b/authorizer/authorize_find.go @@ -3,11 +3,9 @@ package authorizer import ( "context" - "github.com/influxdata/influxdb/v2/task/taskmodel" - - "github.com/influxdata/influxdb/v2/kit/platform/errors" - "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/platform/errors" + "github.com/influxdata/influxdb/v2/task/taskmodel" ) // AuthorizeFindDBRPs takes the given items and returns only the ones that the user is authorized to access. diff --git a/authorizer/check.go b/authorizer/check.go index e0e95099ac4..0f0744e3948 100644 --- a/authorizer/check.go +++ b/authorizer/check.go @@ -3,11 +3,9 @@ package authorizer import ( "context" - "github.com/influxdata/influxdb/v2/task/taskmodel" - - "github.com/influxdata/influxdb/v2/kit/platform" - "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/platform" + "github.com/influxdata/influxdb/v2/task/taskmodel" ) var _ influxdb.CheckService = (*CheckService)(nil) diff --git a/authorizer/task.go b/authorizer/task.go index 8aa9064732f..9538c4a0c1e 100644 --- a/authorizer/task.go +++ b/authorizer/task.go @@ -4,13 +4,11 @@ import ( "context" "fmt" - "github.com/influxdata/influxdb/v2/task/taskmodel" - + "github.com/influxdata/influxdb/v2" "github.com/influxdata/influxdb/v2/kit/platform" "github.com/influxdata/influxdb/v2/kit/platform/errors" - - "github.com/influxdata/influxdb/v2" "github.com/influxdata/influxdb/v2/kit/tracing" + "github.com/influxdata/influxdb/v2/task/taskmodel" "go.uber.org/zap" ) diff --git a/authorizer/task_test.go b/authorizer/task_test.go index 049426c0f4f..2b504bc5210 100644 --- a/authorizer/task_test.go +++ b/authorizer/task_test.go @@ -2,8 +2,6 @@ package authorizer_test import ( "context" - "github.com/influxdata/influxdb/v2/kit/platform" - "github.com/influxdata/influxdb/v2/task/taskmodel" "testing" "time" @@ -14,9 +12,11 @@ import ( _ "github.com/influxdata/influxdb/v2/fluxinit/static" "github.com/influxdata/influxdb/v2/http" "github.com/influxdata/influxdb/v2/inmem" + "github.com/influxdata/influxdb/v2/kit/platform" "github.com/influxdata/influxdb/v2/kv" "github.com/influxdata/influxdb/v2/kv/migration/all" "github.com/influxdata/influxdb/v2/mock" + "github.com/influxdata/influxdb/v2/task/taskmodel" "github.com/influxdata/influxdb/v2/tenant" "github.com/pkg/errors" "go.uber.org/zap/zaptest" diff --git a/checks/service.go b/checks/service.go index b02bfd4ef7a..72b0bbdd1f9 100644 --- a/checks/service.go +++ b/checks/service.go @@ -4,17 +4,15 @@ import ( "context" "fmt" - "github.com/influxdata/influxdb/v2/task/taskmodel" - + "github.com/influxdata/influxdb/v2" "github.com/influxdata/influxdb/v2/kit/platform" "github.com/influxdata/influxdb/v2/kit/platform/errors" - - "github.com/influxdata/influxdb/v2" "github.com/influxdata/influxdb/v2/kit/tracing" "github.com/influxdata/influxdb/v2/kv" "github.com/influxdata/influxdb/v2/notification/check" "github.com/influxdata/influxdb/v2/query/fluxlang" "github.com/influxdata/influxdb/v2/snowflake" + "github.com/influxdata/influxdb/v2/task/taskmodel" "go.uber.org/zap" ) diff --git a/checks/service_external_test.go b/checks/service_external_test.go index ef149e86032..0e9857e2a72 100644 --- a/checks/service_external_test.go +++ b/checks/service_external_test.go @@ -8,18 +8,16 @@ import ( "testing" "time" - "github.com/influxdata/influxdb/v2/task/taskmodel" - - "github.com/influxdata/influxdb/v2/kit/platform" - "github.com/influxdata/influxdb/v2/kit/platform/errors" - "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/influxdata/flux/ast" "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/platform" + "github.com/influxdata/influxdb/v2/kit/platform/errors" "github.com/influxdata/influxdb/v2/mock" "github.com/influxdata/influxdb/v2/notification" "github.com/influxdata/influxdb/v2/notification/check" + "github.com/influxdata/influxdb/v2/task/taskmodel" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/checks/service_test.go b/checks/service_test.go index 6a9076926e6..ffff6327e76 100644 --- a/checks/service_test.go +++ b/checks/service_test.go @@ -4,8 +4,6 @@ import ( "context" "testing" - "github.com/influxdata/influxdb/v2/task/taskmodel" - "github.com/influxdata/influxdb/v2" _ "github.com/influxdata/influxdb/v2/fluxinit/static" "github.com/influxdata/influxdb/v2/inmem" @@ -13,6 +11,7 @@ import ( "github.com/influxdata/influxdb/v2/kv/migration/all" "github.com/influxdata/influxdb/v2/mock" "github.com/influxdata/influxdb/v2/query/fluxlang" + "github.com/influxdata/influxdb/v2/task/taskmodel" "github.com/influxdata/influxdb/v2/tenant" "go.uber.org/zap/zaptest" ) diff --git a/cmd/influx/task.go b/cmd/influx/task.go index 022706886d9..7a2de1f613e 100644 --- a/cmd/influx/task.go +++ b/cmd/influx/task.go @@ -5,12 +5,10 @@ import ( "fmt" "time" - "github.com/influxdata/influxdb/v2/task/taskmodel" - - "github.com/influxdata/influxdb/v2/kit/platform" - "github.com/influxdata/influxdb/v2" "github.com/influxdata/influxdb/v2/http" + "github.com/influxdata/influxdb/v2/kit/platform" + "github.com/influxdata/influxdb/v2/task/taskmodel" "github.com/influxdata/influxdb/v2/tenant" "github.com/spf13/cobra" ) diff --git a/cmd/influx/task_test.go b/cmd/influx/task_test.go index 6e2ac56a38b..eadeec0d772 100644 --- a/cmd/influx/task_test.go +++ b/cmd/influx/task_test.go @@ -7,13 +7,11 @@ import ( "io/ioutil" "testing" - "github.com/influxdata/influxdb/v2/task/taskmodel" - - "github.com/influxdata/influxdb/v2/kit/platform" - "github.com/google/go-cmp/cmp" "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/platform" "github.com/influxdata/influxdb/v2/mock" + "github.com/influxdata/influxdb/v2/task/taskmodel" "github.com/spf13/cobra" "github.com/stretchr/testify/require" ) diff --git a/cmd/influxd/launcher/launcher.go b/cmd/influxd/launcher/launcher.go index 3bcb8a5a1b4..14f77657e70 100644 --- a/cmd/influxd/launcher/launcher.go +++ b/cmd/influxd/launcher/launcher.go @@ -14,10 +14,6 @@ import ( "sync" "time" - "github.com/influxdata/influxdb/v2/task/taskmodel" - - platform2 "github.com/influxdata/influxdb/v2/kit/platform" - "github.com/influxdata/flux" "github.com/influxdata/flux/dependencies/testing" platform "github.com/influxdata/influxdb/v2" @@ -38,6 +34,7 @@ import ( "github.com/influxdata/influxdb/v2/kit/feature" overrideflagger "github.com/influxdata/influxdb/v2/kit/feature/override" "github.com/influxdata/influxdb/v2/kit/metric" + platform2 "github.com/influxdata/influxdb/v2/kit/platform" "github.com/influxdata/influxdb/v2/kit/prom" "github.com/influxdata/influxdb/v2/kit/tracing" kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" @@ -66,11 +63,16 @@ import ( "github.com/influxdata/influxdb/v2/task/backend/executor" "github.com/influxdata/influxdb/v2/task/backend/middleware" "github.com/influxdata/influxdb/v2/task/backend/scheduler" + "github.com/influxdata/influxdb/v2/task/taskmodel" telegrafservice "github.com/influxdata/influxdb/v2/telegraf/service" "github.com/influxdata/influxdb/v2/telemetry" "github.com/influxdata/influxdb/v2/tenant" - _ "github.com/influxdata/influxdb/v2/tsdb/engine/tsm1" // needed for tsm1 - _ "github.com/influxdata/influxdb/v2/tsdb/index/tsi1" // needed for tsi1 + + // needed for tsm1 + _ "github.com/influxdata/influxdb/v2/tsdb/engine/tsm1" + + // needed for tsi1 + _ "github.com/influxdata/influxdb/v2/tsdb/index/tsi1" authv1 "github.com/influxdata/influxdb/v2/v1/authorization" iqlcoordinator "github.com/influxdata/influxdb/v2/v1/coordinator" "github.com/influxdata/influxdb/v2/v1/services/meta" diff --git a/cmd/influxd/launcher/launcher_helpers.go b/cmd/influxd/launcher/launcher_helpers.go index 50b5a3f695b..8cfd50bd767 100644 --- a/cmd/influxd/launcher/launcher_helpers.go +++ b/cmd/influxd/launcher/launcher_helpers.go @@ -13,8 +13,6 @@ import ( "strings" "testing" - "github.com/influxdata/influxdb/v2/task/taskmodel" - "github.com/influxdata/flux" "github.com/influxdata/flux/lang" "github.com/influxdata/influxdb/v2" @@ -30,6 +28,7 @@ import ( "github.com/influxdata/influxdb/v2/pkger" "github.com/influxdata/influxdb/v2/query" "github.com/influxdata/influxdb/v2/restore" + "github.com/influxdata/influxdb/v2/task/taskmodel" "github.com/influxdata/influxdb/v2/tenant" dto "github.com/prometheus/client_model/go" "github.com/prometheus/common/expfmt" diff --git a/cmd/influxd/launcher/pkger_test.go b/cmd/influxd/launcher/pkger_test.go index 3806db52031..47bec607296 100644 --- a/cmd/influxd/launcher/pkger_test.go +++ b/cmd/influxd/launcher/pkger_test.go @@ -12,18 +12,16 @@ import ( "testing" "time" - "github.com/influxdata/influxdb/v2/task/taskmodel" - + "github.com/influxdata/influxdb/v2" "github.com/influxdata/influxdb/v2/kit/platform" errors2 "github.com/influxdata/influxdb/v2/kit/platform/errors" - - "github.com/influxdata/influxdb/v2" "github.com/influxdata/influxdb/v2/mock" "github.com/influxdata/influxdb/v2/notification" "github.com/influxdata/influxdb/v2/notification/check" "github.com/influxdata/influxdb/v2/notification/endpoint" "github.com/influxdata/influxdb/v2/notification/rule" "github.com/influxdata/influxdb/v2/pkger" + "github.com/influxdata/influxdb/v2/task/taskmodel" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/zap" diff --git a/dbrp/error.go b/dbrp/error.go index 654ec8a7ea8..de42c84c523 100644 --- a/dbrp/error.go +++ b/dbrp/error.go @@ -3,9 +3,8 @@ package dbrp import ( "fmt" - "github.com/influxdata/influxdb/v2/task/taskmodel" - "github.com/influxdata/influxdb/v2/kit/platform/errors" + "github.com/influxdata/influxdb/v2/task/taskmodel" ) var ( diff --git a/http/api_handler.go b/http/api_handler.go index 9f66beb0383..a0b6ea7e9ad 100644 --- a/http/api_handler.go +++ b/http/api_handler.go @@ -4,8 +4,6 @@ import ( "context" "net/http" - "github.com/influxdata/influxdb/v2/task/taskmodel" - "github.com/go-chi/chi" "github.com/influxdata/httprouter" "github.com/influxdata/influxdb/v2" @@ -22,6 +20,7 @@ import ( "github.com/influxdata/influxdb/v2/query" "github.com/influxdata/influxdb/v2/query/fluxlang" "github.com/influxdata/influxdb/v2/storage" + "github.com/influxdata/influxdb/v2/task/taskmodel" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" ) diff --git a/http/check_service.go b/http/check_service.go index a45280df70e..0ce17d27312 100644 --- a/http/check_service.go +++ b/http/check_service.go @@ -9,8 +9,6 @@ import ( "path" "time" - "github.com/influxdata/influxdb/v2/task/taskmodel" - "github.com/influxdata/httprouter" "github.com/influxdata/influxdb/v2" pctx "github.com/influxdata/influxdb/v2/context" @@ -20,6 +18,7 @@ import ( "github.com/influxdata/influxdb/v2/notification/check" "github.com/influxdata/influxdb/v2/pkg/httpc" "github.com/influxdata/influxdb/v2/query/fluxlang" + "github.com/influxdata/influxdb/v2/task/taskmodel" "go.uber.org/zap" ) diff --git a/http/check_test.go b/http/check_test.go index 988927cc5e1..c35dd3d7e3a 100644 --- a/http/check_test.go +++ b/http/check_test.go @@ -11,21 +11,19 @@ import ( "path" "testing" - "github.com/influxdata/influxdb/v2/task/taskmodel" - - "github.com/influxdata/influxdb/v2/kit/platform" - "github.com/influxdata/influxdb/v2/kit/platform/errors" - "github.com/influxdata/flux/parser" "github.com/influxdata/httprouter" "github.com/influxdata/influxdb/v2" pcontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/kit/platform" + "github.com/influxdata/influxdb/v2/kit/platform/errors" kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" "github.com/influxdata/influxdb/v2/mock" "github.com/influxdata/influxdb/v2/notification" "github.com/influxdata/influxdb/v2/notification/check" "github.com/influxdata/influxdb/v2/pkg/testttp" "github.com/influxdata/influxdb/v2/query/fluxlang" + "github.com/influxdata/influxdb/v2/task/taskmodel" influxTesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/http/notification_rule.go b/http/notification_rule.go index 28c43a9b12d..65231af79bf 100644 --- a/http/notification_rule.go +++ b/http/notification_rule.go @@ -9,16 +9,14 @@ import ( "path" "time" - "github.com/influxdata/influxdb/v2/task/taskmodel" - - "github.com/influxdata/influxdb/v2/kit/platform" - "github.com/influxdata/influxdb/v2/kit/platform/errors" - "github.com/influxdata/httprouter" "github.com/influxdata/influxdb/v2" pctx "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/kit/platform" + "github.com/influxdata/influxdb/v2/kit/platform/errors" "github.com/influxdata/influxdb/v2/notification/rule" "github.com/influxdata/influxdb/v2/pkg/httpc" + "github.com/influxdata/influxdb/v2/task/taskmodel" "go.uber.org/zap" ) diff --git a/http/notification_rule_test.go b/http/notification_rule_test.go index d8b90c3d4e0..1066cc01475 100644 --- a/http/notification_rule_test.go +++ b/http/notification_rule_test.go @@ -5,14 +5,12 @@ import ( "encoding/json" "testing" - "github.com/influxdata/influxdb/v2/task/taskmodel" - - "github.com/influxdata/influxdb/v2/kit/platform" - "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/platform" "github.com/influxdata/influxdb/v2/mock" "github.com/influxdata/influxdb/v2/notification" "github.com/influxdata/influxdb/v2/notification/rule" + "github.com/influxdata/influxdb/v2/task/taskmodel" influxTesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/http/task_service.go b/http/task_service.go index 6b3d385fb37..702841e26ea 100644 --- a/http/task_service.go +++ b/http/task_service.go @@ -11,18 +11,16 @@ import ( "strconv" "time" - "github.com/influxdata/influxdb/v2/task/taskmodel" - - "github.com/influxdata/influxdb/v2/kit/platform" - errors2 "github.com/influxdata/influxdb/v2/kit/platform/errors" - "github.com/influxdata/httprouter" "github.com/influxdata/influxdb/v2" pcontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/kit/platform" + errors2 "github.com/influxdata/influxdb/v2/kit/platform/errors" "github.com/influxdata/influxdb/v2/kit/tracing" "github.com/influxdata/influxdb/v2/kv" "github.com/influxdata/influxdb/v2/pkg/httpc" "github.com/influxdata/influxdb/v2/task/options" + "github.com/influxdata/influxdb/v2/task/taskmodel" "go.uber.org/zap" ) diff --git a/http/task_service_test.go b/http/task_service_test.go index d7b968e38ca..435d25ccf5f 100644 --- a/http/task_service_test.go +++ b/http/task_service_test.go @@ -13,19 +13,17 @@ import ( "testing" "time" - "github.com/influxdata/influxdb/v2/task/taskmodel" - - "github.com/influxdata/influxdb/v2/kit/platform" - errors2 "github.com/influxdata/influxdb/v2/kit/platform/errors" - "github.com/influxdata/httprouter" "github.com/influxdata/influxdb/v2" "github.com/influxdata/influxdb/v2/authorization" pcontext "github.com/influxdata/influxdb/v2/context" _ "github.com/influxdata/influxdb/v2/fluxinit/static" + "github.com/influxdata/influxdb/v2/kit/platform" + errors2 "github.com/influxdata/influxdb/v2/kit/platform/errors" kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" "github.com/influxdata/influxdb/v2/label" "github.com/influxdata/influxdb/v2/mock" + "github.com/influxdata/influxdb/v2/task/taskmodel" "github.com/influxdata/influxdb/v2/tenant" influxdbtesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap" diff --git a/internal/resource/resolve.go b/internal/resource/resolve.go index 673c93fd7c9..6331c87b066 100644 --- a/internal/resource/resolve.go +++ b/internal/resource/resolve.go @@ -4,12 +4,10 @@ import ( "context" "fmt" - "github.com/influxdata/influxdb/v2/task/taskmodel" - + "github.com/influxdata/influxdb/v2" "github.com/influxdata/influxdb/v2/kit/platform" "github.com/influxdata/influxdb/v2/kit/platform/errors" - - "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/task/taskmodel" ) // Resolver is a type which combines multiple resource services diff --git a/kv/migration/all/0003_task_owners.go b/kv/migration/all/0003_task_owners.go index debcb052cb4..aa3d98a5ac7 100644 --- a/kv/migration/all/0003_task_owners.go +++ b/kv/migration/all/0003_task_owners.go @@ -5,13 +5,11 @@ import ( "encoding/json" "time" - "github.com/influxdata/influxdb/v2/task/taskmodel" - + "github.com/influxdata/influxdb/v2" "github.com/influxdata/influxdb/v2/kit/platform" "github.com/influxdata/influxdb/v2/kit/platform/errors" - - "github.com/influxdata/influxdb/v2" "github.com/influxdata/influxdb/v2/kv" + "github.com/influxdata/influxdb/v2/task/taskmodel" ) var taskBucket = []byte("tasksv1") diff --git a/kv/task.go b/kv/task.go index 909c60361a9..5fd3aafb709 100644 --- a/kv/task.go +++ b/kv/task.go @@ -8,14 +8,12 @@ import ( "strings" "time" - "github.com/influxdata/influxdb/v2/task/taskmodel" - - "github.com/influxdata/influxdb/v2/kit/platform" - "github.com/influxdata/influxdb/v2" icontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/kit/platform" "github.com/influxdata/influxdb/v2/resource" "github.com/influxdata/influxdb/v2/task/options" + "github.com/influxdata/influxdb/v2/task/taskmodel" ) // Task Storage Schema diff --git a/kv/task_private_test.go b/kv/task_private_test.go index 94ef61e103f..df3080543e2 100644 --- a/kv/task_private_test.go +++ b/kv/task_private_test.go @@ -3,12 +3,10 @@ package kv import ( "testing" - "github.com/influxdata/influxdb/v2/task/taskmodel" - - "github.com/influxdata/influxdb/v2/kit/platform" - "github.com/google/go-cmp/cmp" "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/platform" + "github.com/influxdata/influxdb/v2/task/taskmodel" ) func Test_newTaskMatchFN(t *testing.T) { diff --git a/kv/task_test.go b/kv/task_test.go index cb489a92970..f050fe433ce 100644 --- a/kv/task_test.go +++ b/kv/task_test.go @@ -4,8 +4,6 @@ import ( "bytes" "context" "encoding/json" - "github.com/influxdata/influxdb/v2/kit/platform" - "github.com/influxdata/influxdb/v2/task/taskmodel" "testing" "time" @@ -15,10 +13,12 @@ import ( "github.com/influxdata/influxdb/v2/authorization" icontext "github.com/influxdata/influxdb/v2/context" _ "github.com/influxdata/influxdb/v2/fluxinit/static" + "github.com/influxdata/influxdb/v2/kit/platform" "github.com/influxdata/influxdb/v2/kv" "github.com/influxdata/influxdb/v2/query/fluxlang" "github.com/influxdata/influxdb/v2/task/options" "github.com/influxdata/influxdb/v2/task/servicetest" + "github.com/influxdata/influxdb/v2/task/taskmodel" "github.com/influxdata/influxdb/v2/tenant" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/mock/task_service.go b/mock/task_service.go index 3874de78df1..0dec5a27d16 100644 --- a/mock/task_service.go +++ b/mock/task_service.go @@ -4,11 +4,9 @@ import ( "context" "time" - "github.com/influxdata/influxdb/v2/task/taskmodel" - "github.com/influxdata/influxdb/v2/kit/platform" - "github.com/influxdata/influxdb/v2/task/backend" + "github.com/influxdata/influxdb/v2/task/taskmodel" ) var _ taskmodel.TaskService = (*TaskService)(nil) diff --git a/notification/rule/service/service.go b/notification/rule/service/service.go index 13df13b1ce5..46e8d1e98b5 100644 --- a/notification/rule/service/service.go +++ b/notification/rule/service/service.go @@ -5,16 +5,14 @@ import ( "encoding/json" "fmt" - "github.com/influxdata/influxdb/v2/task/taskmodel" - + "github.com/influxdata/influxdb/v2" "github.com/influxdata/influxdb/v2/kit/platform" "github.com/influxdata/influxdb/v2/kit/platform/errors" - - "github.com/influxdata/influxdb/v2" "github.com/influxdata/influxdb/v2/kv" "github.com/influxdata/influxdb/v2/notification/rule" "github.com/influxdata/influxdb/v2/pkg/pointer" "github.com/influxdata/influxdb/v2/snowflake" + "github.com/influxdata/influxdb/v2/task/taskmodel" "go.uber.org/zap" ) diff --git a/notification/rule/service/service_external_test.go b/notification/rule/service/service_external_test.go index 077c0d80dfa..7ca93e67215 100644 --- a/notification/rule/service/service_external_test.go +++ b/notification/rule/service/service_external_test.go @@ -8,20 +8,18 @@ import ( "testing" "time" - "github.com/influxdata/influxdb/v2/task/taskmodel" - - "github.com/influxdata/influxdb/v2/kit/platform" - "github.com/influxdata/influxdb/v2/kit/platform/errors" - "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/influxdata/flux/ast" influxdb "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/platform" + "github.com/influxdata/influxdb/v2/kit/platform/errors" "github.com/influxdata/influxdb/v2/mock" "github.com/influxdata/influxdb/v2/notification" "github.com/influxdata/influxdb/v2/notification/endpoint" "github.com/influxdata/influxdb/v2/notification/rule" "github.com/influxdata/influxdb/v2/pkg/pointer" + "github.com/influxdata/influxdb/v2/task/taskmodel" ) const ( diff --git a/notification/rule/service/service_test.go b/notification/rule/service/service_test.go index f5488e01040..5326b20160c 100644 --- a/notification/rule/service/service_test.go +++ b/notification/rule/service/service_test.go @@ -7,20 +7,18 @@ import ( "os" "testing" - "github.com/influxdata/influxdb/v2/task/taskmodel" - - "github.com/influxdata/influxdb/v2/kit/platform" - influxdb "github.com/influxdata/influxdb/v2" "github.com/influxdata/influxdb/v2/bolt" _ "github.com/influxdata/influxdb/v2/fluxinit/static" "github.com/influxdata/influxdb/v2/inmem" + "github.com/influxdata/influxdb/v2/kit/platform" "github.com/influxdata/influxdb/v2/kv" "github.com/influxdata/influxdb/v2/kv/migration/all" "github.com/influxdata/influxdb/v2/mock" endpointservice "github.com/influxdata/influxdb/v2/notification/endpoint/service" "github.com/influxdata/influxdb/v2/query/fluxlang" "github.com/influxdata/influxdb/v2/secret" + "github.com/influxdata/influxdb/v2/task/taskmodel" "github.com/influxdata/influxdb/v2/tenant" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" diff --git a/pkger/clone_resource.go b/pkger/clone_resource.go index d984adb25d0..308b86a4c69 100644 --- a/pkger/clone_resource.go +++ b/pkger/clone_resource.go @@ -8,18 +8,16 @@ import ( "sort" "strings" - "github.com/influxdata/influxdb/v2/task/taskmodel" - - "github.com/influxdata/influxdb/v2/kit/platform" - "github.com/influxdata/influxdb/v2" ierrors "github.com/influxdata/influxdb/v2/kit/errors" + "github.com/influxdata/influxdb/v2/kit/platform" "github.com/influxdata/influxdb/v2/notification" icheck "github.com/influxdata/influxdb/v2/notification/check" "github.com/influxdata/influxdb/v2/notification/endpoint" "github.com/influxdata/influxdb/v2/notification/rule" "github.com/influxdata/influxdb/v2/pkger/internal/wordplay" "github.com/influxdata/influxdb/v2/snowflake" + "github.com/influxdata/influxdb/v2/task/taskmodel" ) var idGenerator = snowflake.NewDefaultIDGenerator() diff --git a/pkger/parser_test.go b/pkger/parser_test.go index 0b41d2648b5..4fafee2b57e 100644 --- a/pkger/parser_test.go +++ b/pkger/parser_test.go @@ -13,14 +13,12 @@ import ( "testing" "time" - "github.com/influxdata/influxdb/v2/task/taskmodel" - - errors2 "github.com/influxdata/influxdb/v2/kit/platform/errors" - "github.com/influxdata/influxdb/v2" + errors2 "github.com/influxdata/influxdb/v2/kit/platform/errors" "github.com/influxdata/influxdb/v2/notification" icheck "github.com/influxdata/influxdb/v2/notification/check" "github.com/influxdata/influxdb/v2/notification/endpoint" + "github.com/influxdata/influxdb/v2/task/taskmodel" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkger/service.go b/pkger/service.go index 35a823b785c..1781fc22c29 100644 --- a/pkger/service.go +++ b/pkger/service.go @@ -12,19 +12,17 @@ import ( "sync" "time" - "github.com/influxdata/influxdb/v2/task/taskmodel" - - "github.com/influxdata/influxdb/v2/kit/platform" - errors2 "github.com/influxdata/influxdb/v2/kit/platform/errors" - "github.com/go-stack/stack" "github.com/influxdata/influxdb/v2" ierrors "github.com/influxdata/influxdb/v2/kit/errors" + "github.com/influxdata/influxdb/v2/kit/platform" + errors2 "github.com/influxdata/influxdb/v2/kit/platform/errors" icheck "github.com/influxdata/influxdb/v2/notification/check" "github.com/influxdata/influxdb/v2/notification/rule" "github.com/influxdata/influxdb/v2/pkger/internal/wordplay" "github.com/influxdata/influxdb/v2/snowflake" "github.com/influxdata/influxdb/v2/task/options" + "github.com/influxdata/influxdb/v2/task/taskmodel" "go.uber.org/zap" ) diff --git a/pkger/service_models.go b/pkger/service_models.go index 23acc445425..de134679abc 100644 --- a/pkger/service_models.go +++ b/pkger/service_models.go @@ -4,12 +4,10 @@ import ( "reflect" "sort" - "github.com/influxdata/influxdb/v2/task/taskmodel" - - "github.com/influxdata/influxdb/v2/kit/platform" - "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/platform" "github.com/influxdata/influxdb/v2/notification/rule" + "github.com/influxdata/influxdb/v2/task/taskmodel" ) type stateCoordinator struct { diff --git a/pkger/service_test.go b/pkger/service_test.go index 070d2a55eef..138ce6cda0c 100644 --- a/pkger/service_test.go +++ b/pkger/service_test.go @@ -13,17 +13,15 @@ import ( "testing" "time" - "github.com/influxdata/influxdb/v2/task/taskmodel" - + "github.com/influxdata/influxdb/v2" "github.com/influxdata/influxdb/v2/kit/platform" errors2 "github.com/influxdata/influxdb/v2/kit/platform/errors" - - "github.com/influxdata/influxdb/v2" "github.com/influxdata/influxdb/v2/mock" "github.com/influxdata/influxdb/v2/notification" icheck "github.com/influxdata/influxdb/v2/notification/check" "github.com/influxdata/influxdb/v2/notification/endpoint" "github.com/influxdata/influxdb/v2/notification/rule" + "github.com/influxdata/influxdb/v2/task/taskmodel" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" diff --git a/task/backend/analytical_storage.go b/task/backend/analytical_storage.go index b588ac8b699..92f230248a3 100644 --- a/task/backend/analytical_storage.go +++ b/task/backend/analytical_storage.go @@ -7,17 +7,15 @@ import ( "fmt" "time" - "github.com/influxdata/influxdb/v2/task/taskmodel" - - "github.com/influxdata/influxdb/v2/kit/platform" - errors2 "github.com/influxdata/influxdb/v2/kit/platform/errors" - "github.com/influxdata/flux" "github.com/influxdata/flux/lang" "github.com/influxdata/influxdb/v2" "github.com/influxdata/influxdb/v2/kit/errors" + "github.com/influxdata/influxdb/v2/kit/platform" + errors2 "github.com/influxdata/influxdb/v2/kit/platform/errors" "github.com/influxdata/influxdb/v2/query" "github.com/influxdata/influxdb/v2/storage" + "github.com/influxdata/influxdb/v2/task/taskmodel" "go.uber.org/zap" ) diff --git a/task/backend/analytical_storage_test.go b/task/backend/analytical_storage_test.go index d11d953db74..efa20672999 100644 --- a/task/backend/analytical_storage_test.go +++ b/task/backend/analytical_storage_test.go @@ -2,14 +2,11 @@ package backend_test import ( "context" - "github.com/influxdata/influxdb/v2/task/taskmodel" "io/ioutil" "os" "testing" "time" - "github.com/influxdata/influxdb/v2/kit/platform" - "github.com/golang/mock/gomock" "github.com/influxdata/flux" "github.com/influxdata/influxdb/v2" @@ -17,6 +14,8 @@ import ( icontext "github.com/influxdata/influxdb/v2/context" _ "github.com/influxdata/influxdb/v2/fluxinit/static" "github.com/influxdata/influxdb/v2/inmem" + "github.com/influxdata/influxdb/v2/kit/platform" + "github.com/influxdata/influxdb/v2/kit/platform" "github.com/influxdata/influxdb/v2/kv" "github.com/influxdata/influxdb/v2/kv/migration/all" "github.com/influxdata/influxdb/v2/mock" @@ -28,6 +27,7 @@ import ( storageflux "github.com/influxdata/influxdb/v2/storage/flux" "github.com/influxdata/influxdb/v2/task/backend" "github.com/influxdata/influxdb/v2/task/servicetest" + "github.com/influxdata/influxdb/v2/task/taskmodel" "github.com/influxdata/influxdb/v2/tenant" "github.com/influxdata/influxdb/v2/v1/services/meta" storage2 "github.com/influxdata/influxdb/v2/v1/services/storage" diff --git a/task/backend/coordinator.go b/task/backend/coordinator.go index 88baac7161a..7989206612b 100644 --- a/task/backend/coordinator.go +++ b/task/backend/coordinator.go @@ -4,10 +4,8 @@ import ( "context" "time" - "github.com/influxdata/influxdb/v2/task/taskmodel" - "github.com/influxdata/influxdb/v2/kit/platform" - + "github.com/influxdata/influxdb/v2/task/taskmodel" "go.uber.org/zap" ) diff --git a/task/backend/coordinator/coordinator.go b/task/backend/coordinator/coordinator.go index 8ca3041baac..61c7fd1fa15 100644 --- a/task/backend/coordinator/coordinator.go +++ b/task/backend/coordinator/coordinator.go @@ -5,13 +5,11 @@ import ( "errors" "time" - "github.com/influxdata/influxdb/v2/task/taskmodel" - "github.com/influxdata/influxdb/v2/kit/platform" - "github.com/influxdata/influxdb/v2/task/backend/executor" "github.com/influxdata/influxdb/v2/task/backend/middleware" "github.com/influxdata/influxdb/v2/task/backend/scheduler" + "github.com/influxdata/influxdb/v2/task/taskmodel" "go.uber.org/zap" ) diff --git a/task/backend/coordinator/coordinator_test.go b/task/backend/coordinator/coordinator_test.go index e5284799681..b3d9095a9c4 100644 --- a/task/backend/coordinator/coordinator_test.go +++ b/task/backend/coordinator/coordinator_test.go @@ -6,13 +6,11 @@ import ( "testing" "time" - "github.com/influxdata/influxdb/v2/task/taskmodel" - - "github.com/influxdata/influxdb/v2/kit/platform" - "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" + "github.com/influxdata/influxdb/v2/kit/platform" "github.com/influxdata/influxdb/v2/task/backend/scheduler" + "github.com/influxdata/influxdb/v2/task/taskmodel" "go.uber.org/zap/zaptest" ) diff --git a/task/backend/coordinator/support_test.go b/task/backend/coordinator/support_test.go index 956aa2ddebd..4a05832e06d 100644 --- a/task/backend/coordinator/support_test.go +++ b/task/backend/coordinator/support_test.go @@ -3,12 +3,10 @@ package coordinator import ( "context" - "github.com/influxdata/influxdb/v2/task/taskmodel" - "github.com/influxdata/influxdb/v2/kit/platform" - "github.com/influxdata/influxdb/v2/task/backend/executor" "github.com/influxdata/influxdb/v2/task/backend/scheduler" + "github.com/influxdata/influxdb/v2/task/taskmodel" ) var _ Executor = (*executorE)(nil) diff --git a/task/backend/coordinator_test.go b/task/backend/coordinator_test.go index a2d0a546813..be3e60901a3 100644 --- a/task/backend/coordinator_test.go +++ b/task/backend/coordinator_test.go @@ -5,11 +5,9 @@ import ( "testing" "time" - "github.com/influxdata/influxdb/v2/task/taskmodel" - - "github.com/influxdata/influxdb/v2/kit/platform" - "github.com/google/go-cmp/cmp" + "github.com/influxdata/influxdb/v2/kit/platform" + "github.com/influxdata/influxdb/v2/task/taskmodel" "go.uber.org/zap/zaptest" ) diff --git a/task/backend/executor/executor.go b/task/backend/executor/executor.go index 8110861266a..263e4566f8b 100644 --- a/task/backend/executor/executor.go +++ b/task/backend/executor/executor.go @@ -7,10 +7,6 @@ import ( "sync" "time" - "github.com/influxdata/influxdb/v2/task/taskmodel" - - "github.com/influxdata/influxdb/v2/kit/platform" - "github.com/influxdata/flux" "github.com/influxdata/flux/ast" "github.com/influxdata/flux/lang" @@ -18,10 +14,12 @@ import ( "github.com/influxdata/influxdb/v2" icontext "github.com/influxdata/influxdb/v2/context" "github.com/influxdata/influxdb/v2/kit/feature" + "github.com/influxdata/influxdb/v2/kit/platform" "github.com/influxdata/influxdb/v2/kit/tracing" "github.com/influxdata/influxdb/v2/query" "github.com/influxdata/influxdb/v2/task/backend" "github.com/influxdata/influxdb/v2/task/backend/scheduler" + "github.com/influxdata/influxdb/v2/task/taskmodel" "go.uber.org/zap" ) diff --git a/task/backend/executor/executor_metrics.go b/task/backend/executor/executor_metrics.go index ea34d9b5a17..2de1a5914df 100644 --- a/task/backend/executor/executor_metrics.go +++ b/task/backend/executor/executor_metrics.go @@ -3,11 +3,9 @@ package executor import ( "time" - "github.com/influxdata/influxdb/v2/task/taskmodel" - "github.com/influxdata/influxdb/v2/kit/platform" "github.com/influxdata/influxdb/v2/kit/platform/errors" - + "github.com/influxdata/influxdb/v2/task/taskmodel" "github.com/prometheus/client_golang/prometheus" ) diff --git a/task/backend/executor/executor_test.go b/task/backend/executor/executor_test.go index d9e4afdd67e..2c62e1f19c7 100644 --- a/task/backend/executor/executor_test.go +++ b/task/backend/executor/executor_test.go @@ -10,16 +10,13 @@ import ( "testing" "time" - "github.com/influxdata/influxdb/v2/task/taskmodel" - - "github.com/influxdata/influxdb/v2/kit/platform" - "github.com/golang/mock/gomock" "github.com/influxdata/flux" "github.com/influxdata/influxdb/v2" "github.com/influxdata/influxdb/v2/authorization" icontext "github.com/influxdata/influxdb/v2/context" "github.com/influxdata/influxdb/v2/inmem" + "github.com/influxdata/influxdb/v2/kit/platform" "github.com/influxdata/influxdb/v2/kit/prom" "github.com/influxdata/influxdb/v2/kit/prom/promtest" tracetest "github.com/influxdata/influxdb/v2/kit/tracing/testing" @@ -30,6 +27,7 @@ import ( "github.com/influxdata/influxdb/v2/task/backend" "github.com/influxdata/influxdb/v2/task/backend/executor/mock" "github.com/influxdata/influxdb/v2/task/backend/scheduler" + "github.com/influxdata/influxdb/v2/task/taskmodel" "github.com/influxdata/influxdb/v2/tenant" "github.com/opentracing/opentracing-go" "github.com/stretchr/testify/assert" diff --git a/task/backend/executor/limits.go b/task/backend/executor/limits.go index b321abd3439..121a0aa033b 100644 --- a/task/backend/executor/limits.go +++ b/task/backend/executor/limits.go @@ -4,10 +4,9 @@ import ( "context" "sort" - "github.com/influxdata/influxdb/v2/task/taskmodel" - "github.com/influxdata/influxdb/v2/query/fluxlang" "github.com/influxdata/influxdb/v2/task/options" + "github.com/influxdata/influxdb/v2/task/taskmodel" ) // ConcurrencyLimit creates a concurrency limit func that uses the executor to determine diff --git a/task/backend/executor/limits_test.go b/task/backend/executor/limits_test.go index edad8ba31ad..e8f512a37c6 100644 --- a/task/backend/executor/limits_test.go +++ b/task/backend/executor/limits_test.go @@ -5,9 +5,8 @@ import ( "testing" "time" - "github.com/influxdata/influxdb/v2/task/taskmodel" - "github.com/influxdata/influxdb/v2/query/fluxlang" + "github.com/influxdata/influxdb/v2/task/taskmodel" ) var ( diff --git a/task/backend/middleware/check_middleware.go b/task/backend/middleware/check_middleware.go index 9c489101536..ec37e6b7ee0 100644 --- a/task/backend/middleware/check_middleware.go +++ b/task/backend/middleware/check_middleware.go @@ -5,11 +5,9 @@ import ( "fmt" "time" - "github.com/influxdata/influxdb/v2/task/taskmodel" - - "github.com/influxdata/influxdb/v2/kit/platform" - "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/platform" + "github.com/influxdata/influxdb/v2/task/taskmodel" ) // CoordinatingCheckService acts as a CheckService decorator that handles coordinating the api request diff --git a/task/backend/middleware/check_middleware_test.go b/task/backend/middleware/check_middleware_test.go index 445d4646f47..d9ae9e67fc5 100644 --- a/task/backend/middleware/check_middleware_test.go +++ b/task/backend/middleware/check_middleware_test.go @@ -3,16 +3,16 @@ package middleware_test import ( "context" "fmt" - "github.com/influxdata/influxdb/v2/kit/platform" - "github.com/influxdata/influxdb/v2/task/taskmodel" "testing" "time" "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/platform" "github.com/influxdata/influxdb/v2/mock" "github.com/influxdata/influxdb/v2/notification/check" "github.com/influxdata/influxdb/v2/notification/rule" "github.com/influxdata/influxdb/v2/task/backend/middleware" + "github.com/influxdata/influxdb/v2/task/taskmodel" ) type pipingCoordinator struct { diff --git a/task/backend/middleware/middleware.go b/task/backend/middleware/middleware.go index fb312132c9d..a422ac245e1 100644 --- a/task/backend/middleware/middleware.go +++ b/task/backend/middleware/middleware.go @@ -5,9 +5,8 @@ import ( "fmt" "time" - "github.com/influxdata/influxdb/v2/task/taskmodel" - "github.com/influxdata/influxdb/v2/kit/platform" + "github.com/influxdata/influxdb/v2/task/taskmodel" ) // Coordinator is a type which is used to react to diff --git a/task/backend/middleware/middleware_test.go b/task/backend/middleware/middleware_test.go index 2d0ced6d8db..bb4993b8212 100644 --- a/task/backend/middleware/middleware_test.go +++ b/task/backend/middleware/middleware_test.go @@ -3,13 +3,12 @@ package middleware_test import ( "context" "errors" - "github.com/influxdata/influxdb/v2/kit/platform" - "github.com/influxdata/influxdb/v2/task/taskmodel" "sync" "testing" "time" _ "github.com/influxdata/influxdb/v2/fluxinit/static" + "github.com/influxdata/influxdb/v2/kit/platform" pmock "github.com/influxdata/influxdb/v2/mock" "github.com/influxdata/influxdb/v2/snowflake" "github.com/influxdata/influxdb/v2/task/backend" @@ -17,6 +16,7 @@ import ( "github.com/influxdata/influxdb/v2/task/backend/middleware" "github.com/influxdata/influxdb/v2/task/backend/scheduler" "github.com/influxdata/influxdb/v2/task/mock" + "github.com/influxdata/influxdb/v2/task/taskmodel" "go.uber.org/zap/zaptest" ) diff --git a/task/backend/middleware/notification_middleware.go b/task/backend/middleware/notification_middleware.go index a7d398a84d1..e32f6cc8b45 100644 --- a/task/backend/middleware/notification_middleware.go +++ b/task/backend/middleware/notification_middleware.go @@ -5,11 +5,9 @@ import ( "fmt" "time" - "github.com/influxdata/influxdb/v2/task/taskmodel" - - "github.com/influxdata/influxdb/v2/kit/platform" - "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/platform" + "github.com/influxdata/influxdb/v2/task/taskmodel" ) // CoordinatingNotificationRuleStore acts as a NotificationRuleStore decorator that handles coordinating the api request diff --git a/task/backend/middleware/notification_middleware_test.go b/task/backend/middleware/notification_middleware_test.go index 9c87e10fa4d..e687c4b94b6 100644 --- a/task/backend/middleware/notification_middleware_test.go +++ b/task/backend/middleware/notification_middleware_test.go @@ -3,14 +3,14 @@ package middleware_test import ( "context" "fmt" - "github.com/influxdata/influxdb/v2/kit/platform" - "github.com/influxdata/influxdb/v2/task/taskmodel" "testing" "time" "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/platform" "github.com/influxdata/influxdb/v2/notification/rule" "github.com/influxdata/influxdb/v2/task/backend/middleware" + "github.com/influxdata/influxdb/v2/task/taskmodel" ) func newNotificationRuleSvcStack() (mockedSvc, *middleware.CoordinatingNotificationRuleStore) { diff --git a/task/backend/run_recorder.go b/task/backend/run_recorder.go index 5972d7ea7e3..bf54373cb18 100644 --- a/task/backend/run_recorder.go +++ b/task/backend/run_recorder.go @@ -6,12 +6,10 @@ import ( "fmt" "time" - "github.com/influxdata/influxdb/v2/task/taskmodel" - "github.com/influxdata/influxdb/v2/kit/platform" - "github.com/influxdata/influxdb/v2/models" "github.com/influxdata/influxdb/v2/storage" + "github.com/influxdata/influxdb/v2/task/taskmodel" "go.uber.org/zap" ) diff --git a/task/backend/schedulable_task_service.go b/task/backend/schedulable_task_service.go index 021ff43d43d..81d496de302 100644 --- a/task/backend/schedulable_task_service.go +++ b/task/backend/schedulable_task_service.go @@ -5,11 +5,9 @@ import ( "fmt" "time" - "github.com/influxdata/influxdb/v2/task/taskmodel" - "github.com/influxdata/influxdb/v2/kit/platform" - "github.com/influxdata/influxdb/v2/task/backend/scheduler" + "github.com/influxdata/influxdb/v2/task/taskmodel" ) var _ scheduler.SchedulableService = (*SchedulableTaskService)(nil) diff --git a/task/backend/schedulable_task_service_test.go b/task/backend/schedulable_task_service_test.go index 829d5678fd7..3120c08d678 100644 --- a/task/backend/schedulable_task_service_test.go +++ b/task/backend/schedulable_task_service_test.go @@ -5,11 +5,9 @@ import ( "testing" "time" - "github.com/influxdata/influxdb/v2/task/taskmodel" - "github.com/influxdata/influxdb/v2/kit/platform" - "github.com/influxdata/influxdb/v2/task/backend/scheduler" + "github.com/influxdata/influxdb/v2/task/taskmodel" ) var ( diff --git a/task/backend/task.go b/task/backend/task.go index 11b9f21b3f6..67e7fb18ea2 100644 --- a/task/backend/task.go +++ b/task/backend/task.go @@ -4,9 +4,8 @@ import ( "context" "time" - "github.com/influxdata/influxdb/v2/task/taskmodel" - "github.com/influxdata/influxdb/v2/kit/platform" + "github.com/influxdata/influxdb/v2/task/taskmodel" ) // TaskControlService is a low-level controller interface, intended to be passed to diff --git a/task/mock/executor.go b/task/mock/executor.go index edcf5d54e6d..fd02135c434 100644 --- a/task/mock/executor.go +++ b/task/mock/executor.go @@ -7,12 +7,10 @@ import ( "sync" "time" - "github.com/influxdata/influxdb/v2/task/taskmodel" - "github.com/influxdata/influxdb/v2/kit/platform" - "github.com/influxdata/influxdb/v2/task/backend/executor" "github.com/influxdata/influxdb/v2/task/backend/scheduler" + "github.com/influxdata/influxdb/v2/task/taskmodel" ) type promise struct { diff --git a/task/mock/task_control_service.go b/task/mock/task_control_service.go index 764cf5d9cd0..98662ef5dc4 100644 --- a/task/mock/task_control_service.go +++ b/task/mock/task_control_service.go @@ -7,12 +7,10 @@ import ( "sync" "time" - "github.com/influxdata/influxdb/v2/task/taskmodel" - "github.com/influxdata/influxdb/v2/kit/platform" - "github.com/influxdata/influxdb/v2/snowflake" "github.com/influxdata/influxdb/v2/task/backend" + "github.com/influxdata/influxdb/v2/task/taskmodel" ) var idgen = snowflake.NewDefaultIDGenerator() diff --git a/task/servicetest/servicetest.go b/task/servicetest/servicetest.go index 714c9fc90aa..ee068737e44 100644 --- a/task/servicetest/servicetest.go +++ b/task/servicetest/servicetest.go @@ -16,17 +16,15 @@ import ( "testing" "time" - "github.com/influxdata/influxdb/v2/task/taskmodel" - - "github.com/influxdata/influxdb/v2/kit/platform" - "github.com/google/go-cmp/cmp" "github.com/influxdata/influxdb/v2" icontext "github.com/influxdata/influxdb/v2/context" "github.com/influxdata/influxdb/v2/kit/feature" + "github.com/influxdata/influxdb/v2/kit/platform" influxdbmock "github.com/influxdata/influxdb/v2/mock" "github.com/influxdata/influxdb/v2/task/backend" "github.com/influxdata/influxdb/v2/task/options" + "github.com/influxdata/influxdb/v2/task/taskmodel" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/task/taskmodel/task_test.go b/task/taskmodel/task_test.go index df89d49c240..2200bd9be53 100644 --- a/task/taskmodel/task_test.go +++ b/task/taskmodel/task_test.go @@ -2,13 +2,13 @@ package taskmodel_test import ( "encoding/json" - "github.com/influxdata/influxdb/v2/task/taskmodel" "testing" "github.com/google/go-cmp/cmp" _ "github.com/influxdata/influxdb/v2/fluxinit/static" "github.com/influxdata/influxdb/v2/query/fluxlang" "github.com/influxdata/influxdb/v2/task/options" + "github.com/influxdata/influxdb/v2/task/taskmodel" ) func TestUpdateValidate(t *testing.T) {