From af06897014950521f17bc29717d62336a44891e7 Mon Sep 17 00:00:00 2001 From: Gianluca Arbezzano Date: Tue, 31 Mar 2020 14:17:50 +0200 Subject: [PATCH 01/18] chore(tracing): Span with Prometheus Metrics moved to kit/tracing I think it is a nice utility function that I would like to use elsewhere. So I decided to move it out to the tracing package. Signed-off-by: Gianluca Arbezzano --- kit/tracing/tracing.go | 50 +++++++++++++++++++++++++++++++------ query/control/controller.go | 40 +++-------------------------- 2 files changed, 46 insertions(+), 44 deletions(-) diff --git a/kit/tracing/tracing.go b/kit/tracing/tracing.go index 965a6bb6e6..e3ca956370 100644 --- a/kit/tracing/tracing.go +++ b/kit/tracing/tracing.go @@ -6,7 +6,9 @@ import ( "net/http" "runtime" "strings" + "time" + "github.com/prometheus/client_golang/prometheus" "github.com/uber/jaeger-client-go" "github.com/influxdata/httprouter" @@ -75,6 +77,38 @@ func annotateSpan(span opentracing.Span, handlerName string, req *http.Request) span.LogKV("path", req.URL.Path) } +// span is a simple wrapper around opentracing.Span in order to +// get access to the duration of the span for metrics reporting. +type WrappedSpan struct { + s opentracing.Span + start time.Time + Duration time.Duration + hist prometheus.Observer + gauge prometheus.Gauge +} + +func StartSpanFromContextWithPromMetircs(ctx context.Context, operationName string, hist prometheus.Observer, gauge prometheus.Gauge, opts ...opentracing.StartSpanOption) (*WrappedSpan, context.Context) { + start := time.Now() + s, sctx := StartSpanFromContextWithOperationName(ctx, operationName, opentracing.StartTime(start)) + gauge.Inc() + return &WrappedSpan{ + s: s, + start: start, + hist: hist, + gauge: gauge, + }, sctx +} + +func (s *WrappedSpan) Finish() { + finish := time.Now() + s.Duration = finish.Sub(s.start) + s.s.FinishWithOptions(opentracing.FinishOptions{ + FinishTime: finish, + }) + s.hist.Observe(s.Duration.Seconds()) + s.gauge.Dec() +} + // StartSpanFromContext is an improved opentracing.StartSpanFromContext. // Uses the calling function as the operation name, and logs the filename and line number. // @@ -100,7 +134,7 @@ func annotateSpan(span opentracing.Span, handlerName string, req *http.Request) // // // Sugar to create a child span // span, ctx := opentracing.StartSpanFromContext(ctx, "operation name") -func StartSpanFromContext(ctx context.Context) (opentracing.Span, context.Context) { +func StartSpanFromContext(ctx context.Context, opts ...opentracing.StartSpanOption) (opentracing.Span, context.Context) { if ctx == nil { panic("StartSpanFromContext called with nil context") } @@ -109,7 +143,7 @@ func StartSpanFromContext(ctx context.Context) (opentracing.Span, context.Contex var pcs [1]uintptr n := runtime.Callers(2, pcs[:]) if n < 1 { - span, ctx := opentracing.StartSpanFromContext(ctx, "unknown") + span, ctx := opentracing.StartSpanFromContext(ctx, "unknown", opts...) span.LogFields(log.Error(errors.New("runtime.Callers failed"))) return span, ctx } @@ -122,7 +156,8 @@ func StartSpanFromContext(ctx context.Context) (opentracing.Span, context.Contex var span opentracing.Span if parentSpan := opentracing.SpanFromContext(ctx); parentSpan != nil { // Create a child span. - span = opentracing.StartSpan(name, opentracing.ChildOf(parentSpan.Context())) + opts = append(opts, opentracing.ChildOf(parentSpan.Context())) + span = opentracing.StartSpan(name, opts...) } else { // Create a root span. span = opentracing.StartSpan(name) @@ -137,7 +172,7 @@ func StartSpanFromContext(ctx context.Context) (opentracing.Span, context.Contex } // StartSpanFromContextWithOperationName is like StartSpanFromContext, but the caller determines the operation name. -func StartSpanFromContextWithOperationName(ctx context.Context, operationName string) (opentracing.Span, context.Context) { +func StartSpanFromContextWithOperationName(ctx context.Context, operationName string, opts ...opentracing.StartSpanOption) (opentracing.Span, context.Context) { if ctx == nil { panic("StartSpanFromContextWithOperationName called with nil context") } @@ -146,7 +181,7 @@ func StartSpanFromContextWithOperationName(ctx context.Context, operationName st var pcs [1]uintptr n := runtime.Callers(2, pcs[:]) if n < 1 { - span, ctx := opentracing.StartSpanFromContext(ctx, operationName) + span, ctx := opentracing.StartSpanFromContext(ctx, operationName, opts...) span.LogFields(log.Error(errors.New("runtime.Callers failed"))) return span, ctx } @@ -154,11 +189,12 @@ func StartSpanFromContextWithOperationName(ctx context.Context, operationName st var span opentracing.Span if parentSpan := opentracing.SpanFromContext(ctx); parentSpan != nil { + opts = append(opts, opentracing.ChildOf(parentSpan.Context())) // Create a child span. - span = opentracing.StartSpan(operationName, opentracing.ChildOf(parentSpan.Context())) + span = opentracing.StartSpan(operationName, opts...) } else { // Create a root span. - span = opentracing.StartSpan(operationName) + span = opentracing.StartSpan(operationName, opts...) } // New context references this span, not the parent (if there was one). ctx = opentracing.ContextWithSpan(ctx, span) diff --git a/query/control/controller.go b/query/control/controller.go index 3c30848c5f..5be94aae5c 100644 --- a/query/control/controller.go +++ b/query/control/controller.go @@ -23,7 +23,6 @@ import ( "runtime/debug" "sync" "sync/atomic" - "time" "github.com/influxdata/flux" "github.com/influxdata/flux/codes" @@ -35,7 +34,6 @@ import ( "github.com/influxdata/influxdb/kit/tracing" influxlogger "github.com/influxdata/influxdb/logger" "github.com/influxdata/influxdb/query" - "github.com/opentracing/opentracing-go" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" "go.uber.org/zap/zapcore" @@ -263,7 +261,7 @@ func (c *Controller) createQuery(ctx context.Context, ct flux.CompilerType) (*Qu compileLabelValues[len(compileLabelValues)-1] = string(ct) cctx, cancel := context.WithCancel(ctx) - parentSpan, parentCtx := StartSpanFromContext( + parentSpan, parentCtx := tracing.StartSpanFromContextWithPromMetircs( cctx, "all", c.metrics.allDur.WithLabelValues(labelValues...), @@ -525,7 +523,7 @@ type Query struct { cancel func() parentCtx context.Context - parentSpan, currentSpan *span + parentSpan, currentSpan *tracing.WrappedSpan stats flux.Statistics done sync.Once @@ -752,7 +750,7 @@ TRANSITION: return q.parentCtx, true } var currentCtx context.Context - q.currentSpan, currentCtx = StartSpanFromContext( + q.currentSpan, currentCtx = tracing.StartSpanFromContextWithPromMetircs( q.parentCtx, newState.String(), dur.WithLabelValues(labelValues...), @@ -967,38 +965,6 @@ func isFinishedState(state State) bool { } } -// span is a simple wrapper around opentracing.Span in order to -// get access to the duration of the span for metrics reporting. -type span struct { - s opentracing.Span - start time.Time - Duration time.Duration - hist prometheus.Observer - gauge prometheus.Gauge -} - -func StartSpanFromContext(ctx context.Context, operationName string, hist prometheus.Observer, gauge prometheus.Gauge) (*span, context.Context) { - start := time.Now() - s, sctx := opentracing.StartSpanFromContext(ctx, operationName, opentracing.StartTime(start)) - gauge.Inc() - return &span{ - s: s, - start: start, - hist: hist, - gauge: gauge, - }, sctx -} - -func (s *span) Finish() { - finish := time.Now() - s.Duration = finish.Sub(s.start) - s.s.FinishWithOptions(opentracing.FinishOptions{ - FinishTime: finish, - }) - s.hist.Observe(s.Duration.Seconds()) - s.gauge.Dec() -} - // handleFluxError will take a flux.Error and convert it into an influxdb.Error. // It will match certain codes to the equivalent in influxdb. // From 8e5bd1a2ddfda3f49843a19e90a8092f2bb123b9 Mon Sep 17 00:00:00 2001 From: Gianluca Arbezzano Date: Tue, 31 Mar 2020 16:01:31 +0200 Subject: [PATCH 02/18] chore(tracing): embed the opentracing.Span Signed-off-by: Gianluca Arbezzano --- kit/tracing/tracing.go | 17 ++++++----------- query/control/controller.go | 6 +++--- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/kit/tracing/tracing.go b/kit/tracing/tracing.go index e3ca956370..2552a0969f 100644 --- a/kit/tracing/tracing.go +++ b/kit/tracing/tracing.go @@ -79,30 +79,25 @@ func annotateSpan(span opentracing.Span, handlerName string, req *http.Request) // span is a simple wrapper around opentracing.Span in order to // get access to the duration of the span for metrics reporting. -type WrappedSpan struct { - s opentracing.Span +type Span struct { + opentracing.Span start time.Time Duration time.Duration hist prometheus.Observer gauge prometheus.Gauge } -func StartSpanFromContextWithPromMetircs(ctx context.Context, operationName string, hist prometheus.Observer, gauge prometheus.Gauge, opts ...opentracing.StartSpanOption) (*WrappedSpan, context.Context) { +func StartSpanFromContextWithPromMetrics(ctx context.Context, operationName string, hist prometheus.Observer, gauge prometheus.Gauge, opts ...opentracing.StartSpanOption) (*Span, context.Context) { start := time.Now() s, sctx := StartSpanFromContextWithOperationName(ctx, operationName, opentracing.StartTime(start)) gauge.Inc() - return &WrappedSpan{ - s: s, - start: start, - hist: hist, - gauge: gauge, - }, sctx + return &Span{s, start, 0, hist, gauge}, sctx } -func (s *WrappedSpan) Finish() { +func (s *Span) Finish() { finish := time.Now() s.Duration = finish.Sub(s.start) - s.s.FinishWithOptions(opentracing.FinishOptions{ + s.Span.FinishWithOptions(opentracing.FinishOptions{ FinishTime: finish, }) s.hist.Observe(s.Duration.Seconds()) diff --git a/query/control/controller.go b/query/control/controller.go index 5be94aae5c..ef4ea9dc87 100644 --- a/query/control/controller.go +++ b/query/control/controller.go @@ -261,7 +261,7 @@ func (c *Controller) createQuery(ctx context.Context, ct flux.CompilerType) (*Qu compileLabelValues[len(compileLabelValues)-1] = string(ct) cctx, cancel := context.WithCancel(ctx) - parentSpan, parentCtx := tracing.StartSpanFromContextWithPromMetircs( + parentSpan, parentCtx := tracing.StartSpanFromContextWithPromMetrics( cctx, "all", c.metrics.allDur.WithLabelValues(labelValues...), @@ -523,7 +523,7 @@ type Query struct { cancel func() parentCtx context.Context - parentSpan, currentSpan *tracing.WrappedSpan + parentSpan, currentSpan *tracing.Span stats flux.Statistics done sync.Once @@ -750,7 +750,7 @@ TRANSITION: return q.parentCtx, true } var currentCtx context.Context - q.currentSpan, currentCtx = tracing.StartSpanFromContextWithPromMetircs( + q.currentSpan, currentCtx = tracing.StartSpanFromContextWithPromMetrics( q.parentCtx, newState.String(), dur.WithLabelValues(labelValues...), From 2840e6f26e5675a7f8bab17ad7f231f7d703e2b5 Mon Sep 17 00:00:00 2001 From: George Date: Fri, 3 Apr 2020 17:02:51 +0100 Subject: [PATCH 03/18] feat(kv): add ability to configure a max permissions using auth filter function (#17598) --- kv/service.go | 12 ++++++++++++ kv/session.go | 20 +++++++++++--------- kv/task.go | 2 ++ task/servicetest/servicetest.go | 7 ++++++- 4 files changed, 31 insertions(+), 10 deletions(-) diff --git a/kv/service.go b/kv/service.go index 150170396c..03b831a671 100644 --- a/kv/service.go +++ b/kv/service.go @@ -48,6 +48,8 @@ type Service struct { Migrator *Migrator urmByUserIndex *Index + + disableAuthorizationsForMaxPermissions func(context.Context) bool } // NewService returns an instance of a Service. @@ -79,6 +81,9 @@ func NewService(log *zap.Logger, kv Store, configs ...ServiceConfig) *Service { return id, nil }, )), + disableAuthorizationsForMaxPermissions: func(context.Context) bool { + return false + }, } // kv service migrations @@ -268,3 +273,10 @@ func (s *Service) WithStore(store Store) { func (s *Service) WithSpecialOrgBucketIDs(gen influxdb.IDGenerator) { s.OrgBucketIDs = gen } + +// WithMaxPermissionFunc sets the useAuthorizationsForMaxPermissions function +// which can trigger whether or not max permissions uses the users authorizations +// to derive maximum permissions. +func (s *Service) WithMaxPermissionFunc(fn func(context.Context) bool) { + s.disableAuthorizationsForMaxPermissions = fn +} diff --git a/kv/session.go b/kv/session.go index 128cddf3e5..f6e7663400 100644 --- a/kv/session.go +++ b/kv/session.go @@ -124,15 +124,17 @@ func (s *Service) maxPermissions(ctx context.Context, tx Tx, userID influxdb.ID) } ps = append(ps, influxdb.MePermissions(userID)...) - // TODO(desa): this is super expensive, we should keep a list of a users maximal privileges somewhere - // we did this so that the oper token would be used in a users permissions. - af := influxdb.AuthorizationFilter{UserID: &userID} - as, err := s.findAuthorizations(ctx, tx, af) - if err != nil { - return nil, err - } - for _, a := range as { - ps = append(ps, a.Permissions...) + if !s.disableAuthorizationsForMaxPermissions(ctx) { + // TODO(desa): this is super expensive, we should keep a list of a users maximal privileges somewhere + // we did this so that the oper token would be used in a users permissions. + af := influxdb.AuthorizationFilter{UserID: &userID} + as, err := s.findAuthorizations(ctx, tx, af) + if err != nil { + return nil, err + } + for _, a := range as { + ps = append(ps, a.Permissions...) + } } return ps, nil diff --git a/kv/task.go b/kv/task.go index b08b5d8d35..85fe7a7bd3 100644 --- a/kv/task.go +++ b/kv/task.go @@ -131,9 +131,11 @@ func (s *Service) findTaskByIDWithAuth(ctx context.Context, tx Tx, id influxdb.I Status: influxdb.Active, ID: influxdb.ID(1), OrgID: t.OrganizationID, + UserID: t.OwnerID, } if t.OwnerID.Valid() { + ctx = icontext.SetAuthorizer(ctx, t.Authorization) // populate task Auth ps, err := s.maxPermissions(ctx, tx, t.OwnerID) if err != nil { diff --git a/task/servicetest/servicetest.go b/task/servicetest/servicetest.go index a0f2f01cba..e381b02bac 100644 --- a/task/servicetest/servicetest.go +++ b/task/servicetest/servicetest.go @@ -280,10 +280,15 @@ func testTaskCRUD(t *testing.T, sys *System) { Flux: fmt.Sprintf(scriptFmt, 0), Type: influxdb.TaskSystemType, } + + // tasks sets user id on authorization to that + // of the tasks owner + want.Authorization.UserID = tsk.OwnerID + for fn, f := range found { if diff := cmp.Diff(f, want); diff != "" { t.Logf("got: %+#v", f) - t.Fatalf("expected %s task to be consistant: -got/+want: %s", fn, diff) + t.Errorf("expected %s task to be consistant: -got/+want: %s", fn, diff) } } From 9895657dc077bd6527ce6de28adf0648455e5f3d Mon Sep 17 00:00:00 2001 From: "Jonathan A. Sternberg" Date: Fri, 3 Apr 2020 11:05:49 -0500 Subject: [PATCH 04/18] ci: run go mod tidy for the promqltests (#17580) --- query/promql/internal/promqltests/go.sum | 3 +++ 1 file changed, 3 insertions(+) diff --git a/query/promql/internal/promqltests/go.sum b/query/promql/internal/promqltests/go.sum index 82f2d0d671..734e8c7a9b 100644 --- a/query/promql/internal/promqltests/go.sum +++ b/query/promql/internal/promqltests/go.sum @@ -364,6 +364,8 @@ github.com/mattn/go-runewidth v0.0.3 h1:a+kO+98RDGEfo6asOGMmpodZq4FNtnGP54yps8Bz github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+twI54= +github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-sqlite3 v1.11.0 h1:LDdKkqtYlom37fkvqs8rMPFKAMe8+SgjbwZ6ex1/A/Q= github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-tty v0.0.0-20180907095812-13ff1204f104 h1:d8RFOZ2IiFtFWBcKEHAFYJcPTf0wY5q0exFNJZVWa1U= @@ -420,6 +422,7 @@ github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQ github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= +github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= From 39978aa50029f9475028743606f672e63970b339 Mon Sep 17 00:00:00 2001 From: Vlasta Hajek Date: Fri, 3 Apr 2020 18:22:24 +0200 Subject: [PATCH 05/18] docs(clientLibs): update-go-client (#17572) --- .../components/ClientGoOverlay.tsx | 39 +++++++-- ui/src/clientLibraries/constants/index.ts | 83 +++++++++++++------ 2 files changed, 91 insertions(+), 31 deletions(-) diff --git a/ui/src/clientLibraries/components/ClientGoOverlay.tsx b/ui/src/clientLibraries/components/ClientGoOverlay.tsx index 147e5e6f5b..04b04bac1d 100644 --- a/ui/src/clientLibraries/components/ClientGoOverlay.tsx +++ b/ui/src/clientLibraries/components/ClientGoOverlay.tsx @@ -26,7 +26,9 @@ const ClientGoOverlay: FunctionComponent = props => { name, url, initializeClientCodeSnippet, - writeDataCodeSnippet, + writingDataLineProtocolCodeSnippet, + writingDataPointCodeSnippet, + executeQueryCodeSnippet, } = clientGoLibrary const {org} = props const server = window.location.origin @@ -44,20 +46,45 @@ const ClientGoOverlay: FunctionComponent = props => { template={initializeClientCodeSnippet} label="Go Code" defaults={{ - token: 'myToken', - server: 'myHTTPInfluxAddress', + token: 'token', + server: 'serverUrl', }} values={{ server, }} />
Write Data
+

Option 1: Use InfluxDB Line Protocol to write data

+

Option 2: Use a Data Point to write data

+ +
Execute a Flux query
+ , <%= token %>, influxdb.WithHTTPClient(myHTTPClient)) -if err != nil { - panic(err) // error handling here; normally we wouldn't use fmt but it works for the example -} -// Add your app code here -influx.Close() // closes the client. After this the client is useless.`, - writeDataCodeSnippet: `// we use client.NewRowMetric for the example because it's easy, but if you need extra performance -// it is fine to manually build the []client.Metric{}. -myMetrics := []influxdb.Metric{ - influxdb.NewRowMetric( - map[string]interface{}{"memory": 1000, "cpu": 0.93}, - "system-metrics", - map[string]string{"hostname": "hal9000"}, - time.Date(2018, 3, 4, 5, 6, 7, 8, time.UTC)), - influxdb.NewRowMetric( - map[string]interface{}{"memory": 1000, "cpu": 0.93}, - "system-metrics", - map[string]string{"hostname": "hal9000"}, - time.Date(2018, 3, 4, 5, 6, 7, 9, time.UTC)), -} + initializeClientCodeSnippet: `package main -// The actual write..., this method can be called concurrently. -if _, err := influx.Write(context.Background(), "<%= bucket %>", "<%= org %>", myMetrics...) -if err != nil { - log.Fatal(err) // as above use your own error handling here. +import ( + "github.com/influxdata/influxdb-client-go" +) + +func main() { + // You can generate a Token from the "Tokens Tab" in the UI + client := influxdb2.NewClient("<%= server %>", "<%= token %>") + // always close client at the end + defer client.Close() + }`, + writingDataPointCodeSnippet: `// get non-blocking write client +writeApi := client.WriteApi("<%= org %>", "<%= bucket %>") +// create point using full params constructor +p := influxdb2.NewPoint("stat", + map[string]string{"unit": "temperature"}, + map[string]interface{}{"avg": 24.5, "max": 45}, + time.Now()) +// write point asynchronously +writeApi.WritePoint(p) +// create point using fluent style +p = influxdb2.NewPointWithMeasurement("stat"). + AddTag("unit", "temperature"). + AddField("avg", 23.2). + AddField("max", 45). + SetTime(time.Now()) +// write point asynchronously +writeApi.WritePoint(p) +// Flush writes +write.Flush()`, + writingDataLineProtocolCodeSnippet: `// get non-blocking write client +writeApi := client.WriteApi("<%= org %>", "<%= bucket %>") +// write line protocol +writeApi.WriteRecord(fmt.Sprintf("stat,unit=temperature avg=%f,max=%f", 23.5, 45.0)) +writeApi.WriteRecord(fmt.Sprintf("stat,unit=temperature avg=%f,max=%f", 22.5, 45.0)) +// Flush writes +write.Flush()`, + executeQueryCodeSnippet: `query := \`from(bucket:"<%= bucket %>")|> range(start: -1h) |> filter(fn: (r) => r._measurement == "stat")\` +// Get query client +queryApi := client.QueryApi("<%= org %>") +// get QueryTableResult +result, err := queryApi.Query(context.Background(), query) +if err == nil { + // Iterate over query response + for result.Next() { + // Notice when group key has changed + if result.TableChanged() { + fmt.Printf("table: %s\\n", result.TableMetadata().String()) + } + // Access data + fmt.Printf("value: %v\\n", result.Record().Value()) + } + // check for an error + if result.Err() != nil { + fmt.Printf("query parsing error: %\\n", result.Err().Error()) + } +} else { + panic(err) }`, } From 96321ff8bd9a8c63ad7efb4278bbc442e654bb33 Mon Sep 17 00:00:00 2001 From: Alex Boatwright Date: Fri, 3 Apr 2020 10:06:00 -0700 Subject: [PATCH 06/18] fix: validate existence of limit api response objects (#17605) --- ui/src/cloud/reducers/limits.ts | 78 ++++++++++++++++++++++----------- 1 file changed, 53 insertions(+), 25 deletions(-) diff --git a/ui/src/cloud/reducers/limits.ts b/ui/src/cloud/reducers/limits.ts index b862c8e2da..49715e4eda 100644 --- a/ui/src/cloud/reducers/limits.ts +++ b/ui/src/cloud/reducers/limits.ts @@ -66,68 +66,96 @@ export const limitsReducer = ( case ActionTypes.SetLimits: { const {limits} = action.payload - const {maxBuckets, maxRetentionDuration} = limits.bucket - const {maxDashboards} = limits.dashboard - const {maxTasks} = limits.task - const {maxChecks} = limits.check - const { - maxNotifications, - blockedNotificationRules, - } = limits.notificationRule - const {blockedNotificationEndpoints} = limits.notificationEndpoint + if (limits.bucket) { + const {maxBuckets, maxRetentionDuration} = limits.bucket + draftState.buckets.maxAllowed = maxBuckets + draftState.buckets.maxRetentionSeconds = maxRetentionDuration / 1e9 + } - const {readKBs, writeKBs, cardinality} = limits.rate + if (limits.dashboard) { + const {maxDashboards} = limits.dashboard + draftState.dashboards.maxAllowed = maxDashboards + } - draftState.buckets.maxAllowed = maxBuckets - draftState.buckets.maxRetentionSeconds = maxRetentionDuration / 1e9 - draftState.dashboards.maxAllowed = maxDashboards - draftState.tasks.maxAllowed = maxTasks - draftState.checks.maxAllowed = maxChecks - draftState.rules.maxAllowed = maxNotifications - draftState.rules.blocked = blockedNotificationRules - .split(',') - .map(r => r.trim()) - draftState.endpoints.blocked = blockedNotificationEndpoints - .split(',') - .map(r => r.trim()) - draftState.rate.readKBs.maxAllowed = readKBs - draftState.rate.writeKBs.maxAllowed = writeKBs - draftState.rate.cardinality.maxAllowed = cardinality + if (limits.task) { + const {maxTasks} = limits.task + draftState.tasks.maxAllowed = maxTasks + } + + if (limits.check) { + const {maxChecks} = limits.check + draftState.checks.maxAllowed = maxChecks + } + + if (limits.notificationRule) { + const { + maxNotifications, + blockedNotificationRules, + } = limits.notificationRule + draftState.rules.maxAllowed = maxNotifications + draftState.rules.blocked = blockedNotificationRules + .split(',') + .map(r => r.trim()) + } + + if (limits.notificationEndpoint) { + const {blockedNotificationEndpoints} = limits.notificationEndpoint + draftState.endpoints.blocked = blockedNotificationEndpoints + .split(',') + .map(r => r.trim()) + } + + if (limits.rate) { + const {readKBs, writeKBs, cardinality} = limits.rate + + draftState.rate.readKBs.maxAllowed = readKBs + draftState.rate.writeKBs.maxAllowed = writeKBs + draftState.rate.cardinality.maxAllowed = cardinality + } return } + case ActionTypes.SetDashboardLimitStatus: { draftState.dashboards.limitStatus = action.payload.limitStatus return } + case ActionTypes.SetBucketLimitStatus: { draftState.buckets.limitStatus = action.payload.limitStatus return } + case ActionTypes.SetTaskLimitStatus: { draftState.tasks.limitStatus = action.payload.limitStatus return } + case ActionTypes.SetChecksLimitStatus: { draftState.checks.limitStatus = action.payload.limitStatus return } + case ActionTypes.SetRulesLimitStatus: { draftState.rules.limitStatus = action.payload.limitStatus return } + case ActionTypes.SetEndpointsLimitStatus: { draftState.endpoints.limitStatus = action.payload.limitStatus return } + case ActionTypes.SetReadRateLimitStatus: { draftState.rate.readKBs.limitStatus = action.payload.limitStatus return } + case ActionTypes.SetWriteRateLimitStatus: { draftState.rate.writeKBs.limitStatus = action.payload.limitStatus return } + case ActionTypes.SetCardinalityLimitStatus: { draftState.rate.cardinality.limitStatus = action.payload.limitStatus return From 207f174d7556293aba4c163cedcef07c01c0b6cf Mon Sep 17 00:00:00 2001 From: Ariel Salem Date: Fri, 3 Apr 2020 10:24:31 -0700 Subject: [PATCH 07/18] fix(ui): fixed single column links bug (#17601) --- CHANGELOG.md | 1 + ui/src/shared/components/tables/TableCell.tsx | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9bc473286..0097a1ee9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,7 @@ 1. [17404](https://github.com/influxdata/influxdb/pull/17404): Updated duplicate check error message to be more explicit and actionable 1. [17515](https://github.com/influxdata/influxdb/pull/17515): Editing a table cell shows the proper values and respects changes 1. [17521](https://github.com/influxdata/influxdb/pull/17521): Table view scrolling should be slightly smoother +1. [17601](https://github.com/influxdata/influxdb/pull/17601): URL table values on single columns are being correctly parsed ### UI Improvements diff --git a/ui/src/shared/components/tables/TableCell.tsx b/ui/src/shared/components/tables/TableCell.tsx index 4ed1e2dc1f..545f609dbe 100644 --- a/ui/src/shared/components/tables/TableCell.tsx +++ b/ui/src/shared/components/tables/TableCell.tsx @@ -31,12 +31,13 @@ interface Props extends CellRendererProps { timeFormatter: (time: string) => string } -const URL_REGEXP = /(https?:\/\/[^\s]+)/g +const URL_REGEXP = /((http|https)?:\/\/[^\s]+)/g // NOTE: rip this out if you spend time any here as per: // https://stackoverflow.com/questions/1500260/detect-urls-in-text-with-javascript/1500501#1500501 function asLink(str) { - if (!URL_REGEXP.test('' + str)) { + const isURL = `${str}`.includes('http://') || `${str}`.includes('https://') + if (isURL === false) { return str } From 0ae8bebd755cf4aa579b9c38e6ea4792dfdbe53a Mon Sep 17 00:00:00 2001 From: "Jonathan A. Sternberg" Date: Fri, 3 Apr 2020 12:39:20 -0500 Subject: [PATCH 08/18] refactor: rewrite imports to include the /v2 suffix for version 2 --- authorizer/agent.go | 2 +- authorizer/agent_test.go | 8 +- authorizer/auth.go | 2 +- authorizer/auth_test.go | 10 +-- authorizer/authorize.go | 4 +- authorizer/authorize_find.go | 2 +- authorizer/backup.go | 4 +- authorizer/bucket.go | 4 +- authorizer/bucket_test.go | 10 +-- authorizer/check.go | 2 +- authorizer/check_test.go | 13 ++-- authorizer/dashboard.go | 2 +- authorizer/dashboard_test.go | 10 +-- authorizer/document.go | 2 +- authorizer/label.go | 2 +- authorizer/label_test.go | 10 +-- authorizer/notification_endpoint.go | 2 +- authorizer/notification_endpoint_test.go | 12 +-- authorizer/notification_rule.go | 2 +- authorizer/notification_rule_test.go | 13 ++-- authorizer/org.go | 2 +- authorizer/org_test.go | 10 +-- authorizer/password.go | 2 +- authorizer/password_test.go | 8 +- authorizer/scraper.go | 2 +- authorizer/scraper_test.go | 10 +-- authorizer/secret.go | 2 +- authorizer/secret_test.go | 10 +-- authorizer/source.go | 2 +- authorizer/source_test.go | 10 +-- authorizer/task.go | 4 +- authorizer/task_test.go | 16 ++-- authorizer/telegraf.go | 2 +- authorizer/telegraf_test.go | 10 +-- authorizer/urm.go | 2 +- authorizer/urm_test.go | 10 +-- authorizer/user.go | 2 +- authorizer/user_test.go | 10 +-- authorizer/util_test.go | 2 +- authorizer/variable.go | 2 +- authorizer/variable_test.go | 10 +-- authz_test.go | 4 +- bolt/bbolt.go | 6 +- bolt/bbolt_test.go | 2 +- bolt/id.go | 2 +- bolt/id_test.go | 4 +- bolt/kv.go | 4 +- bolt/kv_test.go | 4 +- bolt/metrics_test.go | 4 +- chronograf/.kapacitor/alerts.go | 2 +- chronograf/.kapacitor/alerts_test.go | 2 +- chronograf/.kapacitor/ast.go | 2 +- chronograf/.kapacitor/ast_test.go | 2 +- chronograf/.kapacitor/client.go | 4 +- chronograf/.kapacitor/client_test.go | 2 +- chronograf/.kapacitor/data.go | 2 +- chronograf/.kapacitor/data_test.go | 2 +- chronograf/.kapacitor/http_out.go | 2 +- chronograf/.kapacitor/influxout.go | 2 +- chronograf/.kapacitor/influxout_test.go | 2 +- .../.kapacitor/kapa_client_benchmark_test.go | 4 +- chronograf/.kapacitor/kapa_client_test.go | 4 +- chronograf/.kapacitor/pipeline.go | 2 +- chronograf/.kapacitor/tickscripts.go | 2 +- chronograf/.kapacitor/tickscripts_test.go | 2 +- chronograf/.kapacitor/triggers.go | 2 +- chronograf/.kapacitor/triggers_test.go | 2 +- chronograf/.kapacitor/validate.go | 2 +- chronograf/.kapacitor/validate_test.go | 2 +- chronograf/.kapacitor/vars.go | 2 +- chronograf/.kapacitor/vars_test.go | 2 +- chronograf/bolt/bolt_test.go | 6 +- chronograf/bolt/build.go | 4 +- chronograf/bolt/client.go | 4 +- chronograf/bolt/config.go | 4 +- chronograf/bolt/config_test.go | 2 +- chronograf/bolt/dashboards.go | 4 +- chronograf/bolt/internal/internal.go | 2 +- chronograf/bolt/internal/internal_test.go | 4 +- chronograf/bolt/layouts.go | 4 +- chronograf/bolt/mapping.go | 4 +- chronograf/bolt/mapping_test.go | 2 +- chronograf/bolt/org_config.go | 4 +- chronograf/bolt/org_config_test.go | 2 +- chronograf/bolt/organizations.go | 6 +- chronograf/bolt/organizations_test.go | 6 +- chronograf/bolt/servers.go | 4 +- chronograf/bolt/servers_test.go | 2 +- chronograf/bolt/sources.go | 6 +- chronograf/bolt/sources_test.go | 4 +- chronograf/bolt/users.go | 4 +- chronograf/bolt/users_test.go | 2 +- chronograf/canned/bin.go | 2 +- chronograf/cmd/chronoctl/add.go | 2 +- chronograf/cmd/chronoctl/util.go | 6 +- chronograf/cmd/chronograf/main.go | 4 +- chronograf/enterprise/enterprise.go | 4 +- chronograf/enterprise/enterprise_test.go | 6 +- chronograf/enterprise/meta.go | 4 +- chronograf/enterprise/meta_test.go | 2 +- chronograf/enterprise/mocks_test.go | 4 +- chronograf/enterprise/roles.go | 2 +- chronograf/enterprise/roles_test.go | 2 +- chronograf/enterprise/users.go | 2 +- chronograf/enterprise/users_test.go | 4 +- chronograf/filestore/apps.go | 4 +- chronograf/filestore/apps_test.go | 4 +- chronograf/filestore/dashboards.go | 4 +- chronograf/filestore/kapacitors.go | 2 +- chronograf/filestore/organizations.go | 2 +- chronograf/filestore/sources.go | 2 +- chronograf/id/time.go | 2 +- chronograf/id/uuid.go | 2 +- chronograf/influx/annotations.go | 4 +- chronograf/influx/annotations_test.go | 4 +- chronograf/influx/authorization.go | 2 +- chronograf/influx/databases.go | 4 +- chronograf/influx/influx.go | 4 +- chronograf/influx/influx_test.go | 6 +- chronograf/influx/lineprotocol.go | 2 +- chronograf/influx/lineprotocol_test.go | 2 +- chronograf/influx/permissions.go | 2 +- chronograf/influx/permissions_test.go | 2 +- chronograf/influx/query.go | 2 +- chronograf/influx/query_test.go | 2 +- chronograf/influx/users.go | 2 +- chronograf/influx/users_test.go | 2 +- chronograf/integrations/server_test.go | 8 +- chronograf/memdb/kapacitors.go | 2 +- chronograf/memdb/kapacitors_test.go | 2 +- chronograf/memdb/sources.go | 2 +- chronograf/memdb/sources_test.go | 2 +- chronograf/mocks/auth.go | 2 +- chronograf/mocks/config.go | 2 +- chronograf/mocks/dashboards.go | 2 +- chronograf/mocks/databases.go | 2 +- chronograf/mocks/layouts.go | 2 +- chronograf/mocks/logger.go | 2 +- chronograf/mocks/mapping.go | 2 +- chronograf/mocks/org_config.go | 2 +- chronograf/mocks/organizations.go | 2 +- chronograf/mocks/roles.go | 2 +- chronograf/mocks/servers.go | 2 +- chronograf/mocks/sources.go | 2 +- chronograf/mocks/store.go | 2 +- chronograf/mocks/timeseries.go | 2 +- chronograf/mocks/users.go | 2 +- chronograf/multistore/dashboards.go | 2 +- chronograf/multistore/kapacitors.go | 2 +- chronograf/multistore/kapacitors_test.go | 2 +- chronograf/multistore/layouts.go | 2 +- chronograf/multistore/organizations.go | 2 +- chronograf/multistore/sources.go | 2 +- chronograf/noop/config.go | 2 +- chronograf/noop/dashboards.go | 2 +- chronograf/noop/layouts.go | 2 +- chronograf/noop/mappings.go | 2 +- chronograf/noop/org_config.go | 2 +- chronograf/noop/organizations.go | 2 +- chronograf/noop/servers.go | 2 +- chronograf/noop/sources.go | 2 +- chronograf/noop/users.go | 2 +- chronograf/oauth2/auth0.go | 2 +- chronograf/oauth2/auth0_test.go | 4 +- chronograf/oauth2/generic.go | 2 +- chronograf/oauth2/generic_test.go | 4 +- chronograf/oauth2/github.go | 2 +- chronograf/oauth2/github_test.go | 4 +- chronograf/oauth2/google.go | 2 +- chronograf/oauth2/google_test.go | 4 +- chronograf/oauth2/heroku.go | 2 +- chronograf/oauth2/heroku_test.go | 4 +- chronograf/oauth2/jwt_test.go | 2 +- chronograf/oauth2/mux.go | 2 +- chronograf/oauth2/mux_test.go | 2 +- chronograf/oauth2/oauth2_test.go | 2 +- chronograf/organizations/dashboards.go | 2 +- chronograf/organizations/dashboards_test.go | 6 +- chronograf/organizations/org_config.go | 2 +- chronograf/organizations/organizations.go | 2 +- .../organizations/organizations_test.go | 6 +- chronograf/organizations/servers.go | 2 +- chronograf/organizations/servers_test.go | 6 +- chronograf/organizations/sources.go | 2 +- chronograf/organizations/sources_test.go | 6 +- chronograf/organizations/users.go | 2 +- chronograf/organizations/users_test.go | 6 +- chronograf/roles/roles.go | 2 +- chronograf/roles/sources.go | 2 +- chronograf/roles/sources_test.go | 4 +- chronograf/server/annotations.go | 4 +- chronograf/server/annotations_test.go | 4 +- chronograf/server/assets.go | 4 +- chronograf/server/auth.go | 8 +- chronograf/server/auth_test.go | 8 +- chronograf/server/builders.go | 10 +-- chronograf/server/builders_test.go | 2 +- chronograf/server/cells.go | 4 +- chronograf/server/cells_test.go | 4 +- chronograf/server/config.go | 2 +- chronograf/server/config_test.go | 4 +- chronograf/server/dashboards.go | 2 +- chronograf/server/dashboards_test.go | 2 +- chronograf/server/databases.go | 2 +- chronograf/server/databases_test.go | 4 +- chronograf/server/env.go | 2 +- chronograf/server/env_test.go | 2 +- chronograf/server/influx.go | 4 +- chronograf/server/influx_test.go | 4 +- chronograf/server/layout.go | 2 +- chronograf/server/layout_test.go | 6 +- chronograf/server/logger.go | 2 +- chronograf/server/mapping.go | 4 +- chronograf/server/mapping_test.go | 6 +- chronograf/server/me.go | 6 +- chronograf/server/me_test.go | 8 +- chronograf/server/middle.go | 2 +- chronograf/server/middle_test.go | 6 +- chronograf/server/mountable_router.go | 2 +- chronograf/server/mountable_router_test.go | 2 +- chronograf/server/mux.go | 6 +- chronograf/server/org_config.go | 2 +- chronograf/server/org_config_test.go | 6 +- chronograf/server/organizations.go | 6 +- chronograf/server/organizations_test.go | 6 +- chronograf/server/permissions.go | 2 +- chronograf/server/permissions_test.go | 4 +- chronograf/server/queries.go | 6 +- chronograf/server/queries_test.go | 4 +- chronograf/server/queryconfig.go | 4 +- chronograf/server/queryconfig_test.go | 2 +- chronograf/server/routes.go | 4 +- chronograf/server/routes_test.go | 2 +- chronograf/server/server.go | 10 +-- chronograf/server/service.go | 6 +- chronograf/server/services.go | 4 +- chronograf/server/stores.go | 8 +- chronograf/server/stores_test.go | 6 +- chronograf/server/templates.go | 4 +- chronograf/server/templates_test.go | 2 +- chronograf/server/url_prefixer.go | 2 +- chronograf/server/url_prefixer_test.go | 4 +- chronograf/server/users.go | 4 +- chronograf/server/users_test.go | 6 +- cmd/chronograf-migrator/dashboard.go | 6 +- cmd/chronograf-migrator/main.go | 6 +- cmd/influx/authorization.go | 6 +- cmd/influx/backup.go | 6 +- cmd/influx/bucket.go | 4 +- cmd/influx/bucket_test.go | 4 +- cmd/influx/config.go | 2 +- cmd/influx/config/config.go | 2 +- cmd/influx/config/config_test.go | 4 +- cmd/influx/config_test.go | 4 +- cmd/influx/debug.go | 6 +- cmd/influx/delete.go | 4 +- cmd/influx/internal/errorfmt_test.go | 2 +- cmd/influx/internal/tabwriter.go | 2 +- cmd/influx/main.go | 18 ++--- cmd/influx/main_test.go | 2 +- cmd/influx/organization.go | 5 +- cmd/influx/organization_test.go | 4 +- cmd/influx/ping.go | 2 +- cmd/influx/pkg.go | 8 +- cmd/influx/pkg_test.go | 7 +- cmd/influx/query.go | 2 +- cmd/influx/repl.go | 8 +- cmd/influx/secret.go | 4 +- cmd/influx/secret_test.go | 4 +- cmd/influx/setup.go | 8 +- cmd/influx/task.go | 6 +- cmd/influx/transpile.go | 6 +- cmd/influx/user.go | 4 +- cmd/influx/user_test.go | 6 +- cmd/influx/write.go | 10 +-- cmd/influx_inspect/buildtsi/buildtsi.go | 16 ++-- cmd/influxd/generate/command.go | 10 +-- cmd/influxd/generate/command_simple.go | 2 +- cmd/influxd/generate/generator.go | 20 ++--- cmd/influxd/generate/internal/shard/writer.go | 4 +- cmd/influxd/inspect/build_tsi.go | 12 +-- cmd/influxd/inspect/compact_series_file.go | 6 +- cmd/influxd/inspect/dump_tsi1.go | 4 +- cmd/influxd/inspect/dump_wal.go | 4 +- cmd/influxd/inspect/export_blocks.go | 2 +- cmd/influxd/inspect/export_index.go | 6 +- cmd/influxd/inspect/report_tsi1.go | 4 +- cmd/influxd/inspect/report_tsm.go | 8 +- cmd/influxd/inspect/verify_series.go | 4 +- cmd/influxd/inspect/verify_tsm.go | 4 +- cmd/influxd/inspect/verify_wal.go | 4 +- cmd/influxd/internal/profile/profile.go | 2 +- cmd/influxd/launcher/engine.go | 14 ++-- cmd/influxd/launcher/flusher.go | 2 +- cmd/influxd/launcher/launcher.go | 78 +++++++++---------- cmd/influxd/launcher/launcher_helpers.go | 16 ++-- cmd/influxd/launcher/launcher_test.go | 8 +- cmd/influxd/launcher/pkger_test.go | 10 +-- cmd/influxd/launcher/query_test.go | 10 +-- cmd/influxd/launcher/storage_test.go | 10 +-- cmd/influxd/launcher/tasks_test.go | 6 +- cmd/influxd/launcher/tenant_test.go | 6 +- cmd/influxd/main.go | 18 ++--- cmd/influxd/migrate/command.go | 10 +-- cmd/influxd/restore/command.go | 12 +-- cmd/telemetryd/main.go | 8 +- context/token.go | 2 +- context/token_test.go | 4 +- dashboard_test.go | 4 +- dbrp_mapping_test.go | 4 +- endpoints/service.go | 2 +- errors_test.go | 2 +- flux/client.go | 2 +- gather/handler.go | 4 +- gather/metrics.go | 4 +- gather/prometheus.go | 2 +- gather/recorder.go | 6 +- gather/scheduler.go | 6 +- gather/scheduler_test.go | 8 +- gather/scraper.go | 2 +- gather/scraper_test.go | 2 +- go.mod | 2 +- http/api_handler.go | 16 ++-- http/api_handler_test.go | 2 +- http/assets.go | 4 +- http/auth_service.go | 6 +- http/auth_test.go | 14 ++-- http/authentication_middleware.go | 6 +- http/authentication_test.go | 12 +-- http/backup_service.go | 8 +- http/bucket_service.go | 8 +- http/bucket_service_test.go | 16 ++-- http/check_service.go | 11 ++- http/check_test.go | 16 ++-- http/chronograf_handler.go | 4 +- http/client.go | 4 +- http/dashboard_service.go | 4 +- http/dashboard_test.go | 12 +-- http/delete_handler.go | 8 +- http/delete_test.go | 10 +-- http/document_service.go | 6 +- http/document_service_test.go | 18 ++--- http/document_test.go | 10 +-- http/duration.go | 2 +- http/errors.go | 2 +- http/errors_test.go | 6 +- http/handler.go | 4 +- http/handler_test.go | 4 +- http/helpers.go | 2 +- http/influxdb/bucket.go | 4 +- http/influxdb/client.go | 8 +- http/influxdb/source_proxy_query_service.go | 12 +-- http/label_service.go | 4 +- http/label_test.go | 12 +-- http/metric/recorder.go | 2 +- http/middleware.go | 2 +- http/middleware_test.go | 2 +- http/mock/middleware.go | 4 +- http/notification_endpoint.go | 8 +- http/notification_endpoint_test.go | 20 ++--- http/notification_rule.go | 8 +- http/notification_rule_test.go | 10 +-- http/onboarding.go | 2 +- http/onboarding_test.go | 12 +-- http/org_service.go | 8 +- http/org_service_test.go | 12 +-- http/paging.go | 2 +- http/paging_test.go | 4 +- http/platform_handler.go | 2 +- http/query.go | 8 +- http/query_handler.go | 18 ++--- http/query_handler_test.go | 20 ++--- http/query_test.go | 8 +- http/ready.go | 2 +- http/requests.go | 2 +- http/requests_test.go | 4 +- http/router.go | 6 +- http/router_test.go | 2 +- http/scraper_service.go | 4 +- http/scraper_service_test.go | 12 +-- http/server.go | 2 +- http/session_handler.go | 2 +- http/session_test.go | 4 +- http/source_proxy_service.go | 10 +-- http/source_service.go | 8 +- http/source_service_test.go | 2 +- http/swagger.go | 2 +- http/task_service.go | 10 +-- http/task_service_test.go | 13 ++-- http/telegraf.go | 10 +-- http/telegraf_test.go | 4 +- http/usage_service.go | 2 +- http/user_resource_mapping_service.go | 4 +- http/user_resource_mapping_test.go | 4 +- http/user_service.go | 6 +- http/user_test.go | 10 +-- http/variable_service.go | 4 +- http/variable_test.go | 8 +- http/write_handler.go | 16 ++-- http/write_handler_test.go | 12 +-- id_test.go | 4 +- inmem/dbrp_mapping_service.go | 2 +- inmem/dbrp_mapping_test.go | 4 +- inmem/kv.go | 2 +- inmem/kv_test.go | 6 +- inmem/service.go | 6 +- inmem/source.go | 2 +- jsonweb/token.go | 2 +- jsonweb/token_test.go | 2 +- kit/cli/idflag.go | 4 +- kit/grpc/errors.go | 2 +- kit/grpc/errors_test.go | 2 +- kit/metric/client.go | 4 +- kit/prom/example_test.go | 2 +- kit/prom/promtest/promtest_test.go | 4 +- kit/prom/registry_test.go | 2 +- kit/transport/http/api.go | 2 +- kit/transport/http/api_test.go | 6 +- kit/transport/http/error_handler.go | 2 +- kit/transport/http/error_handler_test.go | 6 +- kit/transport/http/middleware.go | 4 +- kit/transport/http/middleware_test.go | 4 +- kv/auth.go | 4 +- kv/auth_private_test.go | 2 +- kv/auth_test.go | 6 +- kv/bucket.go | 8 +- kv/bucket_test.go | 6 +- kv/check.go | 6 +- kv/check_test.go | 6 +- kv/cursor_test.go | 2 +- kv/dashboard.go | 4 +- kv/dashboard_test.go | 6 +- kv/document.go | 2 +- kv/document_options.go | 2 +- kv/document_test.go | 2 +- kv/duplicate_read_test.go | 6 +- kv/encode.go | 2 +- kv/index_test.go | 6 +- kv/kv_test.go | 6 +- kv/kvlog.go | 2 +- kv/kvlog_test.go | 6 +- kv/label.go | 4 +- kv/label_test.go | 6 +- kv/lookup_service.go | 2 +- kv/lookup_service_test.go | 10 +-- kv/migration.go | 2 +- kv/migration_test.go | 6 +- kv/notification_endpoint.go | 6 +- kv/notification_endpoint_test.go | 8 +- kv/notification_rule.go | 4 +- kv/notification_rule_test.go | 6 +- kv/onboarding.go | 2 +- kv/onboarding_test.go | 6 +- kv/org.go | 9 +-- kv/org_test.go | 6 +- kv/passwords.go | 2 +- kv/passwords_test.go | 8 +- kv/scrapers.go | 2 +- kv/scrapers_test.go | 6 +- kv/secret.go | 2 +- kv/secret_test.go | 6 +- kv/service.go | 11 ++- kv/service_test.go | 4 +- kv/session.go | 2 +- kv/session_test.go | 6 +- kv/source.go | 2 +- kv/source_test.go | 6 +- kv/store_base.go | 4 +- kv/store_base_test.go | 4 +- kv/store_index.go | 4 +- kv/store_index_test.go | 5 +- kv/task.go | 8 +- kv/task_private_test.go | 2 +- kv/task_test.go | 10 +-- kv/telegraf.go | 2 +- kv/telegraf_test.go | 6 +- kv/tenant_test.go | 8 +- kv/unique.go | 4 +- kv/urm.go | 6 +- kv/urm_private_test.go | 2 +- kv/urm_test.go | 10 +-- kv/user.go | 4 +- kv/user_test.go | 6 +- kv/variable.go | 2 +- kv/variable_test.go | 6 +- label_test.go | 4 +- logger/fields.go | 4 +- mock/auth_service.go | 2 +- mock/authorization.go | 2 +- mock/bucket_service.go | 2 +- mock/check_service.go | 2 +- mock/dashboard_service.go | 2 +- mock/dbrp_mapping.go | 2 +- mock/delete.go | 2 +- mock/dependencies.go | 2 +- mock/document_service.go | 2 +- mock/generators.go | 2 +- mock/kv.go | 2 +- mock/label_service.go | 2 +- mock/lookup_service.go | 2 +- mock/nats.go | 2 +- mock/nats_test.go | 2 +- mock/notification_endpoint_service.go | 2 +- mock/notification_rule_store.go | 2 +- mock/onboarding_service.go | 2 +- mock/operation_log_service.go | 2 +- mock/org_service.go | 2 +- mock/passwords.go | 2 +- mock/points_writer.go | 2 +- mock/reads_resultset.go | 8 +- mock/reads_resultset_test.go | 8 +- mock/scraper_service.go | 2 +- mock/secret_service.go | 2 +- mock/session_service.go | 2 +- mock/source_service.go | 2 +- mock/task_service.go | 4 +- mock/telegraf_service.go | 2 +- mock/user_resource_mapping_service.go | 2 +- mock/user_service.go | 2 +- mock/variable_service.go | 2 +- mock/write_service.go | 2 +- models/inline_fnv_test.go | 2 +- models/points.go | 2 +- models/points_test.go | 6 +- models/statistic_test.go | 2 +- models/tagkeysset_test.go | 2 +- notification/check/check.go | 6 +- notification/check/check_test.go | 12 ++- notification/check/custom.go | 4 +- notification/check/custom_test.go | 4 +- notification/check/deadman.go | 6 +- notification/check/deadman_test.go | 6 +- notification/check/threshold.go | 6 +- notification/check/threshold_test.go | 6 +- notification/endpoint/endpoint.go | 2 +- notification/endpoint/endpoint_test.go | 8 +- notification/endpoint/http.go | 2 +- notification/endpoint/pagerduty.go | 2 +- notification/endpoint/slack.go | 2 +- notification/rule/http.go | 6 +- notification/rule/http_test.go | 8 +- notification/rule/pagerduty.go | 6 +- notification/rule/pagerduty_test.go | 8 +- notification/rule/rule.go | 6 +- notification/rule/rule_test.go | 14 ++-- notification/rule/slack.go | 6 +- notification/rule/slack_test.go | 8 +- notification/tag.go | 4 +- pkg/bloom/bloom_test.go | 2 +- pkg/bytesutil/bytesutil_test.go | 2 +- pkg/data/gen/arrays.gen.go | 4 +- pkg/data/gen/merged_series_generator.go | 2 +- pkg/data/gen/merged_series_generator_test.go | 6 +- pkg/data/gen/series_generator.go | 2 +- pkg/data/gen/specs.go | 6 +- pkg/data/gen/specs_test.go | 2 +- pkg/data/gen/tags_sequence.go | 2 +- pkg/data/gen/values_sequence.gen.go | 4 +- pkg/encoding/simple8b/encoding_test.go | 2 +- pkg/fs/fs_test.go | 2 +- pkg/httpc/client.go | 2 +- pkg/httpc/req.go | 2 +- pkg/jsonnet/decode_test.go | 2 +- pkg/jsonparser/jsonparser.go | 2 +- pkg/jsonparser/jsonparser_test.go | 4 +- pkg/limiter/fixed_test.go | 2 +- pkg/limiter/write_test.go | 2 +- pkg/metrics/descriptors_test.go | 2 +- pkg/metrics/registry_test.go | 2 +- pkg/metrics/timer_test.go | 2 +- pkg/mmap/mmap_test.go | 2 +- pkg/pool/bytes_test.go | 2 +- pkg/rhh/metrics_test.go | 2 +- pkg/rhh/rhh_test.go | 2 +- pkg/slices/bytes_test.go | 2 +- pkg/slices/merge_test.go | 2 +- pkg/testttp/http_test.go | 2 +- pkger/clone_resource.go | 16 ++-- pkger/http_remote_service.go | 4 +- pkger/http_server.go | 8 +- pkger/http_server_test.go | 12 +-- pkger/models.go | 10 +-- pkger/models_test.go | 2 +- pkger/parser.go | 4 +- pkger/parser_test.go | 8 +- pkger/service.go | 6 +- pkger/service_auth.go | 2 +- pkger/service_logging.go | 2 +- pkger/service_metrics.go | 6 +- pkger/service_test.go | 12 +-- pkger/service_tracing.go | 4 +- pkger/store.go | 4 +- pkger/store_test.go | 6 +- predicate/logical.go | 4 +- predicate/parser.go | 2 +- predicate/parser_test.go | 4 +- predicate/predicate.go | 6 +- predicate/predicate_test.go | 8 +- predicate/tag_rule.go | 6 +- prometheus/auth_service.go | 2 +- prometheus/auth_service_test.go | 8 +- prometheus/codec.go | 2 +- prometheus/codec_test.go | 2 +- prometheus/example_test.go | 2 +- prometheus/filter_test.go | 2 +- prometheus/influx.go | 2 +- prometheus/metric_recorder.go | 2 +- prometheus/transformer_test.go | 2 +- query/bridges.go | 6 +- query/bridges_test.go | 4 +- query/builtin/builtin.go | 4 +- query/control/controller.go | 12 +-- query/control/controller_test.go | 8 +- query/dependency.go | 2 +- query/dependency_test.go | 6 +- query/encode_test.go | 4 +- query/influxql/compiler.go | 2 +- query/influxql/compiler_test.go | 2 +- query/influxql/dialect_test.go | 2 +- query/influxql/end_to_end_test.go | 14 ++-- query/influxql/response_test.go | 2 +- query/influxql/result_test.go | 2 +- query/influxql/service.go | 4 +- query/influxql/service_test.go | 4 +- query/influxql/spectests/testing.go | 8 +- .../influxql/testdata/compspecs/compspecs.go | 8 +- query/influxql/transpiler.go | 2 +- query/influxql/transpiler_test.go | 10 +-- query/logger.go | 2 +- query/logging.go | 4 +- query/logging_test.go | 6 +- query/mock/logger.go | 2 +- query/mock/service.go | 4 +- .../internal/promqltests/end_to_end_test.go | 2 +- query/promql/internal/promqltests/engine.go | 8 +- query/promql/query_test.go | 2 +- query/promql/types.go | 2 +- query/query.go | 2 +- query/querytest/compile.go | 4 +- query/querytest/compiler.go | 4 +- query/request.go | 2 +- query/service.go | 2 +- query/service_test.go | 4 +- query/spec.go | 2 +- query/stdlib/experimental/to.go | 12 +-- query/stdlib/experimental/to_test.go | 16 ++-- query/stdlib/influxdata/influxdb/buckets.go | 4 +- .../influxdata/influxdb/dependencies.go | 8 +- query/stdlib/influxdata/influxdb/from.go | 2 +- query/stdlib/influxdata/influxdb/from_test.go | 6 +- query/stdlib/influxdata/influxdb/metrics.go | 2 +- query/stdlib/influxdata/influxdb/operators.go | 2 +- .../stdlib/influxdata/influxdb/rules_test.go | 2 +- query/stdlib/influxdata/influxdb/source.go | 8 +- .../stdlib/influxdata/influxdb/source_test.go | 12 +-- query/stdlib/influxdata/influxdb/storage.go | 6 +- query/stdlib/influxdata/influxdb/to.go | 12 +-- query/stdlib/influxdata/influxdb/to_test.go | 14 ++-- .../influxdata/influxdb/v1/databases.go | 4 +- query/stdlib/packages.go | 8 +- query/stdlib/testing/end_to_end_test.go | 15 ++-- rand/id.go | 2 +- rand/id_test.go | 2 +- rand/token.go | 2 +- resource/noop/resource_logger.go | 2 +- resource/resource.go | 2 +- snowflake/id.go | 4 +- snowflake/id_test.go | 2 +- source/bucket.go | 6 +- source/query.go | 8 +- storage/bucket_service.go | 4 +- storage/bucket_service_test.go | 8 +- storage/compat/compat.go | 6 +- storage/config.go | 8 +- storage/engine.go | 24 +++--- storage/engine_measurement_schema.go | 4 +- storage/engine_schema.go | 4 +- storage/engine_test.go | 14 ++-- storage/flux/predicate.go | 4 +- storage/flux/reader.go | 10 +-- storage/flux/table.gen.go | 6 +- storage/flux/table.go | 2 +- storage/flux/table_test.go | 16 ++-- storage/points_writer.go | 2 +- storage/points_writer_test.go | 11 ++- storage/reads/array_cursor.gen.go | 2 +- storage/reads/array_cursor.go | 4 +- storage/reads/group_resultset.go | 8 +- storage/reads/group_resultset_test.go | 8 +- storage/reads/influxql_predicate.go | 2 +- storage/reads/influxql_predicate_test.go | 4 +- storage/reads/keymerger.go | 2 +- storage/reads/keymerger_test.go | 2 +- storage/reads/predicate.go | 2 +- storage/reads/predicate_test.go | 4 +- storage/reads/resultset.go | 6 +- storage/reads/resultset_lineprotocol.go | 4 +- storage/reads/series_cursor.go | 14 ++-- storage/reads/series_cursor_test.go | 6 +- storage/reads/store.go | 6 +- storage/reads/store_test.go | 6 +- storage/reads/tagsbuffer.go | 2 +- storage/reads/viewer.go | 6 +- storage/readservice/service.go | 4 +- storage/readservice/source.go | 2 +- storage/readservice/store.go | 10 +-- storage/retention.go | 8 +- storage/retention_test.go | 12 +-- storage/series_cursor.go | 12 +-- storage/series_cursor_test.go | 6 +- storage/wal/dump.go | 6 +- storage/wal/dump_test.go | 7 +- storage/wal/metrics_test.go | 2 +- storage/wal/verifier_test.go | 4 +- storage/wal/wal.go | 10 +-- storage/wal/wal_test.go | 4 +- tag_test.go | 4 +- task.go | 2 +- task/backend/analytical_storage.go | 6 +- task/backend/analytical_storage_test.go | 28 +++---- task/backend/coordinator.go | 2 +- task/backend/coordinator/coordinator.go | 8 +- task/backend/coordinator/coordinator_test.go | 4 +- task/backend/coordinator/support_test.go | 6 +- task/backend/coordinator_test.go | 2 +- task/backend/executor/executor.go | 12 +-- task/backend/executor/executor_metrics.go | 2 +- task/backend/executor/executor_test.go | 20 ++--- task/backend/executor/limits.go | 4 +- task/backend/executor/limits_test.go | 2 +- task/backend/executor/support_test.go | 8 +- task/backend/middleware/check_middleware.go | 2 +- .../middleware/check_middleware_test.go | 10 +-- task/backend/middleware/middleware.go | 2 +- task/backend/middleware/middleware_test.go | 18 ++--- .../middleware/notification_middleware.go | 2 +- .../notification_middleware_test.go | 6 +- task/backend/run_recorder.go | 8 +- task/backend/schedulable_task_service.go | 4 +- task/backend/schedulable_task_service_test.go | 4 +- task/backend/scheduler/scheduler.go | 2 +- task/backend/task.go | 2 +- task/mock/executor.go | 6 +- task/mock/task_control_service.go | 6 +- task/options/options.go | 2 +- task/options/options_test.go | 6 +- task/servicetest/servicetest.go | 8 +- task_test.go | 6 +- telegraf.go | 6 +- telegraf/plugins/inputs/base.go | 2 +- telegraf/plugins/inputs/inputs_test.go | 2 +- telegraf/plugins/outputs/base.go | 2 +- telegraf/plugins/outputs/outputs_test.go | 2 +- telegraf_test.go | 6 +- telemetry/handler.go | 2 +- telemetry/handler_test.go | 2 +- telemetry/metrics.go | 2 +- telemetry/push.go | 2 +- telemetry/reporter.go | 2 +- telemetry/reporter_test.go | 2 +- telemetry/timestamps.go | 2 +- telemetry/timestamps_test.go | 2 +- tenant/duplicate_reads.go | 4 +- tenant/error.go | 2 +- tenant/error_bucket.go | 2 +- tenant/error_org.go | 2 +- tenant/error_urm.go | 2 +- tenant/error_user.go | 2 +- tenant/http_client_bucket.go | 6 +- tenant/http_client_org.go | 6 +- tenant/http_client_user.go | 6 +- tenant/http_handler_urm.go | 4 +- tenant/http_handler_urm_test.go | 6 +- tenant/http_server.go | 2 +- tenant/http_server_bucket.go | 4 +- tenant/http_server_bucket_test.go | 8 +- tenant/http_server_org.go | 4 +- tenant/http_server_org_test.go | 8 +- tenant/http_server_user.go | 6 +- tenant/http_server_user_test.go | 8 +- tenant/middleware_bucket_logging.go | 2 +- tenant/middleware_bucket_metrics.go | 6 +- tenant/middleware_org_auth.go | 4 +- tenant/middleware_org_logging.go | 2 +- tenant/middleware_org_metrics.go | 6 +- tenant/middleware_urm_logging.go | 2 +- tenant/middleware_urm_metrics.go | 6 +- tenant/middleware_user_auth.go | 4 +- tenant/middleware_user_logging.go | 2 +- tenant/middleware_user_metrics.go | 6 +- tenant/service.go | 2 +- tenant/service_bucket.go | 4 +- tenant/service_bucket_test.go | 8 +- tenant/service_org.go | 6 +- tenant/service_org_test.go | 8 +- tenant/service_test.go | 6 +- tenant/service_urm.go | 4 +- tenant/service_urm_test.go | 8 +- tenant/service_user.go | 4 +- tenant/service_user_test.go | 8 +- tenant/storage.go | 8 +- tenant/storage_bucket.go | 4 +- tenant/storage_bucket_test.go | 8 +- tenant/storage_org.go | 4 +- tenant/storage_org_test.go | 8 +- tenant/storage_urm.go | 4 +- tenant/storage_urm_test.go | 8 +- tenant/storage_user.go | 4 +- tenant/storage_user_test.go | 8 +- testing/auth.go | 4 +- testing/bucket_service.go | 4 +- testing/checks.go | 8 +- testing/dashboards.go | 4 +- testing/dbrp_mapping.go | 2 +- testing/document.go | 10 +-- testing/id.go | 2 +- testing/index.go | 2 +- testing/keyvalue_log.go | 2 +- testing/kv.go | 2 +- testing/label_service.go | 4 +- testing/migration.go | 4 +- testing/notification_endpoint.go | 6 +- testing/notification_rule.go | 10 +-- testing/onboarding.go | 4 +- testing/organization_service.go | 6 +- testing/passwords.go | 2 +- testing/scraper_target.go | 4 +- testing/secret.go | 2 +- testing/session.go | 4 +- testing/source.go | 4 +- testing/telegraf.go | 8 +- testing/tenant.go | 2 +- testing/user_resource_mapping_service.go | 2 +- testing/user_service.go | 6 +- testing/util.go | 4 +- testing/variable.go | 6 +- toml/toml_test.go | 2 +- tsdb/cursors/arrayvalues_test.go | 2 +- tsdb/cursors/cursor.go | 2 +- tsdb/explode.go | 4 +- tsdb/explode_test.go | 4 +- tsdb/meta.go | 2 +- tsdb/meta_test.go | 4 +- tsdb/migrate/migrate.go | 26 +++---- tsdb/migrate/migrate_test.go | 2 +- tsdb/series_collection.go | 4 +- tsdb/series_collection_test.go | 2 +- tsdb/series_id.go | 2 +- tsdb/series_id_test.go | 2 +- tsdb/series_iterators_test.go | 12 +-- tsdb/seriesfile/metrics.go | 2 +- tsdb/seriesfile/metrics_test.go | 6 +- tsdb/seriesfile/series_file.go | 14 ++-- tsdb/seriesfile/series_file_test.go | 8 +- tsdb/seriesfile/series_index.go | 8 +- tsdb/seriesfile/series_index_test.go | 6 +- tsdb/seriesfile/series_partition.go | 12 +-- tsdb/seriesfile/series_partition_test.go | 8 +- tsdb/seriesfile/series_segment.go | 6 +- tsdb/seriesfile/series_segment_test.go | 4 +- tsdb/seriesfile/series_verify.go | 2 +- tsdb/seriesfile/series_verify_test.go | 6 +- tsdb/tsi1/cache.go | 2 +- tsdb/tsi1/cache_test.go | 2 +- tsdb/tsi1/config.go | 2 +- tsdb/tsi1/dump_tsi1.go | 4 +- tsdb/tsi1/file_set.go | 6 +- tsdb/tsi1/file_set_test.go | 8 +- tsdb/tsi1/index.go | 14 ++-- tsdb/tsi1/index_file.go | 10 +-- tsdb/tsi1/index_file_test.go | 8 +- tsdb/tsi1/index_files.go | 8 +- tsdb/tsi1/index_files_test.go | 4 +- tsdb/tsi1/index_test.go | 10 +-- tsdb/tsi1/legacy_test.go | 2 +- tsdb/tsi1/log_file.go | 12 +-- tsdb/tsi1/log_file_test.go | 14 ++-- tsdb/tsi1/measurement_block.go | 4 +- tsdb/tsi1/measurement_block_test.go | 4 +- tsdb/tsi1/metrics_test.go | 2 +- tsdb/tsi1/partition.go | 14 ++-- tsdb/tsi1/partition_test.go | 4 +- tsdb/tsi1/report.go | 8 +- tsdb/tsi1/sql_index_exporter_test.go | 8 +- tsdb/tsi1/stats.go | 2 +- tsdb/tsi1/stats_test.go | 2 +- tsdb/tsi1/tag_block.go | 4 +- tsdb/tsi1/tag_block_test.go | 4 +- tsdb/tsi1/tsi1.go | 2 +- tsdb/tsi1/tsi1_test.go | 8 +- tsdb/tsm1/array_cursor.gen.go | 2 +- tsdb/tsm1/array_cursor_iterator.gen.go | 6 +- tsdb/tsm1/array_cursor_iterator.go | 10 +-- tsdb/tsm1/array_cursor_test.go | 4 +- tsdb/tsm1/array_encoding.go | 2 +- tsdb/tsm1/array_encoding_test.go | 4 +- tsdb/tsm1/batch_boolean_test.go | 2 +- tsdb/tsm1/batch_float_test.go | 2 +- tsdb/tsm1/batch_integer.go | 2 +- tsdb/tsm1/batch_string_test.go | 4 +- tsdb/tsm1/batch_timestamp.go | 2 +- tsdb/tsm1/bit_reader_test.go | 2 +- tsdb/tsm1/block_exporter.go | 4 +- tsdb/tsm1/bool_test.go | 2 +- tsdb/tsm1/cache.go | 8 +- tsdb/tsm1/cache_race_test.go | 2 +- tsdb/tsm1/cache_test.go | 5 +- tsdb/tsm1/compact.gen.go | 2 +- tsdb/tsm1/compact.go | 6 +- tsdb/tsm1/compact_test.go | 6 +- tsdb/tsm1/config.go | 2 +- tsdb/tsm1/encoding.gen.go | 2 +- tsdb/tsm1/encoding.go | 2 +- tsdb/tsm1/encoding_test.go | 2 +- tsdb/tsm1/engine.go | 30 +++---- tsdb/tsm1/engine_cursor.go | 2 +- tsdb/tsm1/engine_cursor_test.go | 6 +- tsdb/tsm1/engine_delete_prefix.go | 8 +- tsdb/tsm1/engine_delete_prefix_test.go | 4 +- tsdb/tsm1/engine_measurement_schema.go | 8 +- tsdb/tsm1/engine_measurement_schema_test.go | 8 +- tsdb/tsm1/engine_schema.go | 10 +-- tsdb/tsm1/engine_schema_test.go | 8 +- tsdb/tsm1/engine_test.go | 16 ++-- tsdb/tsm1/file_store.go | 12 +-- tsdb/tsm1/file_store_array.gen.go | 2 +- tsdb/tsm1/file_store_array_test.go | 4 +- tsdb/tsm1/file_store_test.go | 6 +- tsdb/tsm1/float_test.go | 2 +- tsdb/tsm1/metrics_test.go | 2 +- tsdb/tsm1/predicate.go | 4 +- tsdb/tsm1/predicate_test.go | 2 +- tsdb/tsm1/reader.gen.go | 2 +- tsdb/tsm1/reader_mmap.go | 2 +- tsdb/tsm1/reader_range_iterator.go | 2 +- tsdb/tsm1/reader_range_iterator_test.go | 8 +- tsdb/tsm1/report.go | 8 +- tsdb/tsm1/ring.go | 2 +- tsdb/tsm1/stats.go | 2 +- tsdb/tsm1/stats_test.go | 2 +- tsdb/tsm1/string_test.go | 2 +- tsdb/tsm1/tombstone.go | 2 +- tsdb/tsm1/tombstone_test.go | 4 +- tsdb/tsm1/value.go | 6 +- tsdb/tsm1/verify_tsm.go | 6 +- tsdb/tsm1/writer.go | 4 +- tsdb/tsm1/writer_test.go | 2 +- tsdb/value/value.go | 6 +- user_resource_mapping_test.go | 6 +- variable_test.go | 4 +- vault/secret.go | 2 +- vault/secret_test.go | 6 +- write/batcher.go | 2 +- write/batcher_test.go | 4 +- zap/auth_service.go | 2 +- zap/proxy_query_service.go | 2 +- zap/tracer.go | 2 +- 957 files changed, 2352 insertions(+), 2363 deletions(-) diff --git a/authorizer/agent.go b/authorizer/agent.go index 0f85265c64..8c40eda8bb 100644 --- a/authorizer/agent.go +++ b/authorizer/agent.go @@ -3,7 +3,7 @@ package authorizer import ( "context" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) // AuthAgent provides a means to authenticate users with resource and their associate actions. It diff --git a/authorizer/agent_test.go b/authorizer/agent_test.go index fa1f1b89d8..0a2349ea76 100644 --- a/authorizer/agent_test.go +++ b/authorizer/agent_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/authorizer" - icontext "github.com/influxdata/influxdb/context" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/authorizer" + icontext "github.com/influxdata/influxdb/v2/context" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" "github.com/stretchr/testify/require" ) diff --git a/authorizer/auth.go b/authorizer/auth.go index b098b3ac2f..8a23517432 100644 --- a/authorizer/auth.go +++ b/authorizer/auth.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) var _ influxdb.AuthorizationService = (*AuthorizationService)(nil) diff --git a/authorizer/auth_test.go b/authorizer/auth_test.go index 1b7a3f26f1..4825c53ddd 100644 --- a/authorizer/auth_test.go +++ b/authorizer/auth_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/authorizer" - influxdbcontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/mock" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/authorizer" + influxdbcontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/mock" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" ) var authorizationCmpOptions = cmp.Options{ diff --git a/authorizer/authorize.go b/authorizer/authorize.go index 094828f726..9fdb6325ba 100644 --- a/authorizer/authorize.go +++ b/authorizer/authorize.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/influxdata/influxdb" - icontext "github.com/influxdata/influxdb/context" + "github.com/influxdata/influxdb/v2" + icontext "github.com/influxdata/influxdb/v2/context" ) func isAllowedAll(a influxdb.Authorizer, permissions []influxdb.Permission) error { diff --git a/authorizer/authorize_find.go b/authorizer/authorize_find.go index 9e4ee561f8..791bfb8313 100644 --- a/authorizer/authorize_find.go +++ b/authorizer/authorize_find.go @@ -3,7 +3,7 @@ package authorizer import ( "context" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) // AuthorizeFindAuthorizations takes the given items and returns only the ones that the user is authorized to read. diff --git a/authorizer/backup.go b/authorizer/backup.go index 4dc502e102..76c398fdc9 100644 --- a/authorizer/backup.go +++ b/authorizer/backup.go @@ -4,8 +4,8 @@ import ( "context" "io" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/tracing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/tracing" ) var _ influxdb.BackupService = (*BackupService)(nil) diff --git a/authorizer/bucket.go b/authorizer/bucket.go index 234a472717..ee8853630d 100644 --- a/authorizer/bucket.go +++ b/authorizer/bucket.go @@ -2,8 +2,8 @@ package authorizer import ( "context" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/tracing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/tracing" ) var _ influxdb.BucketService = (*BucketService)(nil) diff --git a/authorizer/bucket_test.go b/authorizer/bucket_test.go index 0a91157d34..d8cd3eb1ef 100644 --- a/authorizer/bucket_test.go +++ b/authorizer/bucket_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/authorizer" - influxdbcontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/mock" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/authorizer" + influxdbcontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/mock" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" ) var bucketCmpOptions = cmp.Options{ diff --git a/authorizer/check.go b/authorizer/check.go index 3e28c6289a..677234ab28 100644 --- a/authorizer/check.go +++ b/authorizer/check.go @@ -3,7 +3,7 @@ package authorizer import ( "context" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) var _ influxdb.CheckService = (*CheckService)(nil) diff --git a/authorizer/check_test.go b/authorizer/check_test.go index dc70271e04..f75644d22a 100644 --- a/authorizer/check_test.go +++ b/authorizer/check_test.go @@ -6,14 +6,13 @@ import ( "sort" "testing" - "github.com/influxdata/influxdb/notification/check" - "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/authorizer" - influxdbcontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/mock" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/authorizer" + influxdbcontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/mock" + "github.com/influxdata/influxdb/v2/notification/check" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" ) var checkCmpOptions = cmp.Options{ diff --git a/authorizer/dashboard.go b/authorizer/dashboard.go index 22a1565850..c4fd9f62d9 100644 --- a/authorizer/dashboard.go +++ b/authorizer/dashboard.go @@ -3,7 +3,7 @@ package authorizer import ( "context" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) var _ influxdb.DashboardService = (*DashboardService)(nil) diff --git a/authorizer/dashboard_test.go b/authorizer/dashboard_test.go index e7362c3e9f..101a55ab0d 100644 --- a/authorizer/dashboard_test.go +++ b/authorizer/dashboard_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/authorizer" - influxdbcontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/mock" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/authorizer" + influxdbcontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/mock" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" ) var dashboardCmpOptions = cmp.Options{ diff --git a/authorizer/document.go b/authorizer/document.go index a83eaeacd2..528d8281b1 100644 --- a/authorizer/document.go +++ b/authorizer/document.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) var _ influxdb.DocumentService = (*DocumentService)(nil) diff --git a/authorizer/label.go b/authorizer/label.go index 519377d401..d3b50590ef 100644 --- a/authorizer/label.go +++ b/authorizer/label.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) var _ influxdb.LabelService = (*LabelService)(nil) diff --git a/authorizer/label_test.go b/authorizer/label_test.go index af5f66c090..a835e07cc1 100644 --- a/authorizer/label_test.go +++ b/authorizer/label_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/authorizer" - influxdbcontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/mock" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/authorizer" + influxdbcontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/mock" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" ) const ( diff --git a/authorizer/notification_endpoint.go b/authorizer/notification_endpoint.go index 61eab42063..527ea21fde 100644 --- a/authorizer/notification_endpoint.go +++ b/authorizer/notification_endpoint.go @@ -3,7 +3,7 @@ package authorizer import ( "context" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) var _ influxdb.NotificationEndpointService = (*NotificationEndpointService)(nil) diff --git a/authorizer/notification_endpoint_test.go b/authorizer/notification_endpoint_test.go index 01df4e9ec4..dbe64ab4cb 100644 --- a/authorizer/notification_endpoint_test.go +++ b/authorizer/notification_endpoint_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/authorizer" - influxdbcontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/mock" - "github.com/influxdata/influxdb/notification/endpoint" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/authorizer" + influxdbcontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/mock" + "github.com/influxdata/influxdb/v2/notification/endpoint" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" ) var notificationEndpointCmpOptions = cmp.Options{ diff --git a/authorizer/notification_rule.go b/authorizer/notification_rule.go index 75e68ab0b4..5fe34e3280 100644 --- a/authorizer/notification_rule.go +++ b/authorizer/notification_rule.go @@ -3,7 +3,7 @@ package authorizer import ( "context" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) var _ influxdb.NotificationRuleStore = (*NotificationRuleStore)(nil) diff --git a/authorizer/notification_rule_test.go b/authorizer/notification_rule_test.go index eead7d5036..e6380e91c3 100644 --- a/authorizer/notification_rule_test.go +++ b/authorizer/notification_rule_test.go @@ -6,14 +6,13 @@ import ( "sort" "testing" - "github.com/influxdata/influxdb/notification/rule" - "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/authorizer" - influxdbcontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/mock" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/authorizer" + influxdbcontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/mock" + "github.com/influxdata/influxdb/v2/notification/rule" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" ) var notificationRuleCmpOptions = cmp.Options{ diff --git a/authorizer/org.go b/authorizer/org.go index 41c56ce94e..d266cf9a69 100644 --- a/authorizer/org.go +++ b/authorizer/org.go @@ -3,7 +3,7 @@ package authorizer import ( "context" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) var _ influxdb.OrganizationService = (*OrgService)(nil) diff --git a/authorizer/org_test.go b/authorizer/org_test.go index ee72c54ee8..4e37a81c79 100644 --- a/authorizer/org_test.go +++ b/authorizer/org_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/authorizer" - influxdbcontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/mock" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/authorizer" + influxdbcontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/mock" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" ) var orgCmpOptions = cmp.Options{ diff --git a/authorizer/password.go b/authorizer/password.go index d99e415fd4..3e8c66e011 100644 --- a/authorizer/password.go +++ b/authorizer/password.go @@ -3,7 +3,7 @@ package authorizer import ( "context" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) // PasswordService is a new authorization middleware for a password service. diff --git a/authorizer/password_test.go b/authorizer/password_test.go index 731509a289..ceb94b2196 100644 --- a/authorizer/password_test.go +++ b/authorizer/password_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/authorizer" - icontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/mock" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/authorizer" + icontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/mock" "github.com/stretchr/testify/require" ) diff --git a/authorizer/scraper.go b/authorizer/scraper.go index dc77761411..a78b0c5e9e 100644 --- a/authorizer/scraper.go +++ b/authorizer/scraper.go @@ -3,7 +3,7 @@ package authorizer import ( "context" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) var _ influxdb.ScraperTargetStoreService = (*ScraperTargetStoreService)(nil) diff --git a/authorizer/scraper_test.go b/authorizer/scraper_test.go index 2118addca2..66bf90031e 100644 --- a/authorizer/scraper_test.go +++ b/authorizer/scraper_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/authorizer" - influxdbcontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/mock" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/authorizer" + influxdbcontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/mock" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" ) var scraperCmpOptions = cmp.Options{ diff --git a/authorizer/secret.go b/authorizer/secret.go index b5448f1f64..f8ec258061 100644 --- a/authorizer/secret.go +++ b/authorizer/secret.go @@ -3,7 +3,7 @@ package authorizer import ( "context" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) var _ influxdb.SecretService = (*SecretService)(nil) diff --git a/authorizer/secret_test.go b/authorizer/secret_test.go index a90b02df97..da076048f5 100644 --- a/authorizer/secret_test.go +++ b/authorizer/secret_test.go @@ -6,11 +6,11 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/authorizer" - influxdbcontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/mock" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/authorizer" + influxdbcontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/mock" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" ) var secretCmpOptions = cmp.Options{ diff --git a/authorizer/source.go b/authorizer/source.go index 6481c74f87..ff5fa1ab24 100644 --- a/authorizer/source.go +++ b/authorizer/source.go @@ -3,7 +3,7 @@ package authorizer import ( "context" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) var _ influxdb.SourceService = (*SourceService)(nil) diff --git a/authorizer/source_test.go b/authorizer/source_test.go index d6ecbeaa09..ee1b9db8bb 100644 --- a/authorizer/source_test.go +++ b/authorizer/source_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/authorizer" - influxdbcontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/mock" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/authorizer" + influxdbcontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/mock" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" ) var sourceCmpOptions = cmp.Options{ diff --git a/authorizer/task.go b/authorizer/task.go index 3c4fadcab1..9303d1b8cf 100644 --- a/authorizer/task.go +++ b/authorizer/task.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/tracing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/tracing" "go.uber.org/zap" ) diff --git a/authorizer/task_test.go b/authorizer/task_test.go index 39f1058642..2313de7abf 100644 --- a/authorizer/task_test.go +++ b/authorizer/task_test.go @@ -5,14 +5,14 @@ import ( "testing" "time" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/authorizer" - pctx "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/http" - "github.com/influxdata/influxdb/inmem" - "github.com/influxdata/influxdb/kv" - "github.com/influxdata/influxdb/mock" - _ "github.com/influxdata/influxdb/query/builtin" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/authorizer" + pctx "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/http" + "github.com/influxdata/influxdb/v2/inmem" + "github.com/influxdata/influxdb/v2/kv" + "github.com/influxdata/influxdb/v2/mock" + _ "github.com/influxdata/influxdb/v2/query/builtin" "github.com/pkg/errors" "go.uber.org/zap/zaptest" ) diff --git a/authorizer/telegraf.go b/authorizer/telegraf.go index cad60a8f0b..dd9aa7abd0 100644 --- a/authorizer/telegraf.go +++ b/authorizer/telegraf.go @@ -3,7 +3,7 @@ package authorizer import ( "context" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) var _ influxdb.TelegrafConfigStore = (*TelegrafConfigService)(nil) diff --git a/authorizer/telegraf_test.go b/authorizer/telegraf_test.go index cb5f1eba45..02c3556a70 100644 --- a/authorizer/telegraf_test.go +++ b/authorizer/telegraf_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/authorizer" - influxdbcontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/mock" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/authorizer" + influxdbcontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/mock" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" ) var telegrafCmpOptions = cmp.Options{ diff --git a/authorizer/urm.go b/authorizer/urm.go index 2063de23ae..02566aa6e1 100644 --- a/authorizer/urm.go +++ b/authorizer/urm.go @@ -3,7 +3,7 @@ package authorizer import ( "context" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) type OrganizationService interface { diff --git a/authorizer/urm_test.go b/authorizer/urm_test.go index 604ed53d81..ee659e10cd 100644 --- a/authorizer/urm_test.go +++ b/authorizer/urm_test.go @@ -5,11 +5,11 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/authorizer" - influxdbcontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/mock" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/authorizer" + influxdbcontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/mock" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" ) type OrgService struct { diff --git a/authorizer/user.go b/authorizer/user.go index c0c773cab3..29c1b86d3f 100644 --- a/authorizer/user.go +++ b/authorizer/user.go @@ -3,7 +3,7 @@ package authorizer import ( "context" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) var _ influxdb.UserService = (*UserService)(nil) diff --git a/authorizer/user_test.go b/authorizer/user_test.go index 6b9b555252..7bfabae249 100644 --- a/authorizer/user_test.go +++ b/authorizer/user_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/authorizer" - influxdbcontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/mock" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/authorizer" + influxdbcontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/mock" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" ) var userCmpOptions = cmp.Options{ diff --git a/authorizer/util_test.go b/authorizer/util_test.go index 0147d60a59..a8a3f69960 100644 --- a/authorizer/util_test.go +++ b/authorizer/util_test.go @@ -1,6 +1,6 @@ package authorizer_test -import "github.com/influxdata/influxdb" +import "github.com/influxdata/influxdb/v2" // Authorizer is mock authorizer that can be used in testing. type Authorizer struct { diff --git a/authorizer/variable.go b/authorizer/variable.go index 7efbabcf97..15b5cf3787 100644 --- a/authorizer/variable.go +++ b/authorizer/variable.go @@ -3,7 +3,7 @@ package authorizer import ( "context" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) var _ influxdb.VariableService = (*VariableService)(nil) diff --git a/authorizer/variable_test.go b/authorizer/variable_test.go index 9d58808a62..d87b239f98 100644 --- a/authorizer/variable_test.go +++ b/authorizer/variable_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/authorizer" - influxdbcontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/mock" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/authorizer" + influxdbcontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/mock" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" ) var variableCmpOptions = cmp.Options{ diff --git a/authz_test.go b/authz_test.go index e2ca0bd131..93c1327c3b 100644 --- a/authz_test.go +++ b/authz_test.go @@ -3,8 +3,8 @@ package influxdb_test import ( "testing" - platform "github.com/influxdata/influxdb" - influxdbtesting "github.com/influxdata/influxdb/testing" + platform "github.com/influxdata/influxdb/v2" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" ) func TestAuthorizer_PermissionAllowed(t *testing.T) { diff --git a/bolt/bbolt.go b/bolt/bbolt.go index 9088d5f54d..1c4709be5c 100644 --- a/bolt/bbolt.go +++ b/bolt/bbolt.go @@ -8,9 +8,9 @@ import ( "time" bolt "github.com/coreos/bbolt" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/rand" - "github.com/influxdata/influxdb/snowflake" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/rand" + "github.com/influxdata/influxdb/v2/snowflake" "go.uber.org/zap" ) diff --git a/bolt/bbolt_test.go b/bolt/bbolt_test.go index 2dcb456584..5cd3e5d44d 100644 --- a/bolt/bbolt_test.go +++ b/bolt/bbolt_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "testing" - "github.com/influxdata/influxdb/bolt" + "github.com/influxdata/influxdb/v2/bolt" "go.uber.org/zap/zaptest" ) diff --git a/bolt/id.go b/bolt/id.go index 00b4964ea3..f1eee76d05 100644 --- a/bolt/id.go +++ b/bolt/id.go @@ -6,7 +6,7 @@ import ( "math/rand" bolt "github.com/coreos/bbolt" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" "go.uber.org/zap" ) diff --git a/bolt/id_test.go b/bolt/id_test.go index 5946c94245..daf9899322 100644 --- a/bolt/id_test.go +++ b/bolt/id_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/mock" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" ) func TestID(t *testing.T) { diff --git a/bolt/kv.go b/bolt/kv.go index aba50278ad..b9c5ac923a 100644 --- a/bolt/kv.go +++ b/bolt/kv.go @@ -10,8 +10,8 @@ import ( "time" bolt "github.com/coreos/bbolt" - "github.com/influxdata/influxdb/kit/tracing" - "github.com/influxdata/influxdb/kv" + "github.com/influxdata/influxdb/v2/kit/tracing" + "github.com/influxdata/influxdb/v2/kv" "go.uber.org/zap" ) diff --git a/bolt/kv_test.go b/bolt/kv_test.go index 3ab42c5167..03e5e96d55 100644 --- a/bolt/kv_test.go +++ b/bolt/kv_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/influxdata/influxdb/kv" - platformtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2/kv" + platformtesting "github.com/influxdata/influxdb/v2/testing" ) func initKVStore(f platformtesting.KVStoreFields, t *testing.T) (kv.Store, func()) { diff --git a/bolt/metrics_test.go b/bolt/metrics_test.go index e0fe6fe2be..d72bdbd82f 100644 --- a/bolt/metrics_test.go +++ b/bolt/metrics_test.go @@ -3,8 +3,8 @@ package bolt_test import ( "testing" - "github.com/influxdata/influxdb/kit/prom" - "github.com/influxdata/influxdb/kit/prom/promtest" + "github.com/influxdata/influxdb/v2/kit/prom" + "github.com/influxdata/influxdb/v2/kit/prom/promtest" "go.uber.org/zap/zaptest" ) diff --git a/chronograf/.kapacitor/alerts.go b/chronograf/.kapacitor/alerts.go index 7ade0babac..b4f8e47000 100644 --- a/chronograf/.kapacitor/alerts.go +++ b/chronograf/.kapacitor/alerts.go @@ -6,7 +6,7 @@ import ( "regexp" "strings" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" "github.com/influxdata/kapacitor/pipeline" "github.com/influxdata/kapacitor/pipeline/tick" ) diff --git a/chronograf/.kapacitor/alerts_test.go b/chronograf/.kapacitor/alerts_test.go index b9972f5cba..ff703d3641 100644 --- a/chronograf/.kapacitor/alerts_test.go +++ b/chronograf/.kapacitor/alerts_test.go @@ -3,7 +3,7 @@ package kapacitor import ( "testing" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) func TestAlertServices(t *testing.T) { diff --git a/chronograf/.kapacitor/ast.go b/chronograf/.kapacitor/ast.go index 778299c1fe..ecac0931bc 100644 --- a/chronograf/.kapacitor/ast.go +++ b/chronograf/.kapacitor/ast.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" "github.com/influxdata/kapacitor/pipeline" "github.com/influxdata/kapacitor/tick" "github.com/influxdata/kapacitor/tick/ast" diff --git a/chronograf/.kapacitor/ast_test.go b/chronograf/.kapacitor/ast_test.go index 77b5f39512..3938ebcd18 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/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) func TestReverse(t *testing.T) { diff --git a/chronograf/.kapacitor/client.go b/chronograf/.kapacitor/client.go index 75fa51a754..19ea2aeee1 100644 --- a/chronograf/.kapacitor/client.go +++ b/chronograf/.kapacitor/client.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/id" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/id" client "github.com/influxdata/kapacitor/client/v1" ) diff --git a/chronograf/.kapacitor/client_test.go b/chronograf/.kapacitor/client_test.go index f847ad886d..4f273c886f 100644 --- a/chronograf/.kapacitor/client_test.go +++ b/chronograf/.kapacitor/client_test.go @@ -8,7 +8,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" client "github.com/influxdata/kapacitor/client/v1" ) diff --git a/chronograf/.kapacitor/data.go b/chronograf/.kapacitor/data.go index d0f3e48cbe..a8dc218ca2 100644 --- a/chronograf/.kapacitor/data.go +++ b/chronograf/.kapacitor/data.go @@ -3,7 +3,7 @@ package kapacitor import ( "fmt" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) // Data returns the tickscript data section for querying diff --git a/chronograf/.kapacitor/data_test.go b/chronograf/.kapacitor/data_test.go index 3f7f495fdc..b150c0e756 100644 --- a/chronograf/.kapacitor/data_test.go +++ b/chronograf/.kapacitor/data_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) var config = `{ diff --git a/chronograf/.kapacitor/http_out.go b/chronograf/.kapacitor/http_out.go index 88e6ef6bc6..ec569144d6 100644 --- a/chronograf/.kapacitor/http_out.go +++ b/chronograf/.kapacitor/http_out.go @@ -3,7 +3,7 @@ package kapacitor import ( "fmt" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) // HTTPEndpoint is the default location of the tickscript output diff --git a/chronograf/.kapacitor/influxout.go b/chronograf/.kapacitor/influxout.go index 67baf2568f..8cf507a447 100644 --- a/chronograf/.kapacitor/influxout.go +++ b/chronograf/.kapacitor/influxout.go @@ -3,7 +3,7 @@ package kapacitor import ( "fmt" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/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 5dd41f7219..faeef74392 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/influxdb/chronograf" +import "github.com/influxdata/influxdb/v2/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 902bc65638..0d2dc08d96 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/influxdb/chronograf/kapacitor" - "github.com/influxdata/influxdb/chronograf/mocks" + "github.com/influxdata/influxdb/v2/chronograf/kapacitor" + "github.com/influxdata/influxdb/v2/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 e46d0c7279..c9e5ce5220 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/influxdb/chronograf/kapacitor" - "github.com/influxdata/influxdb/chronograf/mocks" + "github.com/influxdata/influxdb/v2/chronograf/kapacitor" + "github.com/influxdata/influxdb/v2/chronograf/mocks" client "github.com/influxdata/kapacitor/client/v1" ) diff --git a/chronograf/.kapacitor/pipeline.go b/chronograf/.kapacitor/pipeline.go index d4453cebb1..a17db1f5c9 100644 --- a/chronograf/.kapacitor/pipeline.go +++ b/chronograf/.kapacitor/pipeline.go @@ -4,7 +4,7 @@ import ( "bytes" "encoding/json" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" "github.com/influxdata/kapacitor/pipeline" totick "github.com/influxdata/kapacitor/pipeline/tick" ) diff --git a/chronograf/.kapacitor/tickscripts.go b/chronograf/.kapacitor/tickscripts.go index 3b92ca946a..d2c21d2c43 100644 --- a/chronograf/.kapacitor/tickscripts.go +++ b/chronograf/.kapacitor/tickscripts.go @@ -3,7 +3,7 @@ package kapacitor import ( "fmt" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) var _ chronograf.Ticker = &Alert{} diff --git a/chronograf/.kapacitor/tickscripts_test.go b/chronograf/.kapacitor/tickscripts_test.go index 54abbef612..402c3d6fa4 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/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" "github.com/sergi/go-diff/diffmatchpatch" ) diff --git a/chronograf/.kapacitor/triggers.go b/chronograf/.kapacitor/triggers.go index a3552d4a7e..83c92429a5 100644 --- a/chronograf/.kapacitor/triggers.go +++ b/chronograf/.kapacitor/triggers.go @@ -3,7 +3,7 @@ package kapacitor import ( "fmt" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) const ( diff --git a/chronograf/.kapacitor/triggers_test.go b/chronograf/.kapacitor/triggers_test.go index 69fa6c0443..1e09bc563a 100644 --- a/chronograf/.kapacitor/triggers_test.go +++ b/chronograf/.kapacitor/triggers_test.go @@ -3,7 +3,7 @@ package kapacitor import ( "testing" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) func TestTrigger(t *testing.T) { diff --git a/chronograf/.kapacitor/validate.go b/chronograf/.kapacitor/validate.go index 9ea93a8d06..3a1d12cec2 100644 --- a/chronograf/.kapacitor/validate.go +++ b/chronograf/.kapacitor/validate.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" "github.com/influxdata/kapacitor/pipeline" "github.com/influxdata/kapacitor/tick" "github.com/influxdata/kapacitor/tick/ast" diff --git a/chronograf/.kapacitor/validate_test.go b/chronograf/.kapacitor/validate_test.go index f17268ee02..41f997d120 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/influxdb/chronograf" +import "github.com/influxdata/influxdb/v2/chronograf" func TestValidateAlert(t *testing.T) { tests := []struct { diff --git a/chronograf/.kapacitor/vars.go b/chronograf/.kapacitor/vars.go index f31ad0c7e0..b0e2eeb830 100644 --- a/chronograf/.kapacitor/vars.go +++ b/chronograf/.kapacitor/vars.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) var ( diff --git a/chronograf/.kapacitor/vars_test.go b/chronograf/.kapacitor/vars_test.go index 06aaa4160e..871063e1ea 100644 --- a/chronograf/.kapacitor/vars_test.go +++ b/chronograf/.kapacitor/vars_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) func TestVarsCritStringEqual(t *testing.T) { diff --git a/chronograf/bolt/bolt_test.go b/chronograf/bolt/bolt_test.go index 5e6dd98fce..7f452e5933 100644 --- a/chronograf/bolt/bolt_test.go +++ b/chronograf/bolt/bolt_test.go @@ -7,9 +7,9 @@ import ( "os" "time" - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/bolt" - "github.com/influxdata/influxdb/chronograf/mocks" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/bolt" + "github.com/influxdata/influxdb/v2/chronograf/mocks" ) // TestNow is a set time for testing. diff --git a/chronograf/bolt/build.go b/chronograf/bolt/build.go index 33baa800e5..4b760a0666 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/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/bolt/internal" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/bolt/internal" ) // Ensure BuildStore struct implements chronograf.BuildStore interface diff --git a/chronograf/bolt/client.go b/chronograf/bolt/client.go index c02b1dfbc2..3374d62d96 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/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/id" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/id" ) // Client is a client for the boltDB data store. diff --git a/chronograf/bolt/config.go b/chronograf/bolt/config.go index 00a2859f05..e70f0ebd94 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/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/bolt/internal" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/bolt/internal" ) // Ensure ConfigStore implements chronograf.ConfigStore. diff --git a/chronograf/bolt/config_test.go b/chronograf/bolt/config_test.go index 1cb9a381dc..3982bfe0bf 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/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) func TestConfig_Get(t *testing.T) { diff --git a/chronograf/bolt/dashboards.go b/chronograf/bolt/dashboards.go index 9d55fabd76..7fa81f3e17 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/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/bolt/internal" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/bolt/internal" ) // Ensure DashboardsStore implements chronograf.DashboardsStore. diff --git a/chronograf/bolt/internal/internal.go b/chronograf/bolt/internal/internal.go index b941652abc..dafc95bd67 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/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/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 4c64c71829..bf51b6fd10 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/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/bolt/internal" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/bolt/internal" ) func TestMarshalSource(t *testing.T) { diff --git a/chronograf/bolt/layouts.go b/chronograf/bolt/layouts.go index e6ade5f0db..dae609ffda 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/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/bolt/internal" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/bolt/internal" ) // Ensure LayoutsStore implements chronograf.LayoutsStore. diff --git a/chronograf/bolt/mapping.go b/chronograf/bolt/mapping.go index 20b394844b..dda943c887 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/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/bolt/internal" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/bolt/internal" ) // Ensure MappingsStore implements chronograf.MappingsStore. diff --git a/chronograf/bolt/mapping_test.go b/chronograf/bolt/mapping_test.go index 2fea0b52e8..27e695990f 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/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) var mappingCmpOptions = cmp.Options{ diff --git a/chronograf/bolt/org_config.go b/chronograf/bolt/org_config.go index bb6044d300..f2511653bf 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/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/bolt/internal" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/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 e3857f083f..3c4522b16d 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/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) func TestOrganizationConfig_FindOrCreate(t *testing.T) { diff --git a/chronograf/bolt/organizations.go b/chronograf/bolt/organizations.go index 31b66d74ed..8b3aa0332a 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/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/bolt/internal" - "github.com/influxdata/influxdb/chronograf/organizations" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/bolt/internal" + "github.com/influxdata/influxdb/v2/chronograf/organizations" ) // Ensure OrganizationsStore implements chronograf.OrganizationsStore. diff --git a/chronograf/bolt/organizations_test.go b/chronograf/bolt/organizations_test.go index 996768bb5a..827fe21305 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/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/bolt" - "github.com/influxdata/influxdb/chronograf/roles" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/bolt" + "github.com/influxdata/influxdb/v2/chronograf/roles" ) var orgCmpOptions = cmp.Options{ diff --git a/chronograf/bolt/servers.go b/chronograf/bolt/servers.go index 4d3724f614..24cc1bcaba 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/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/bolt/internal" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/bolt/internal" ) // Ensure ServersStore implements chronograf.ServersStore. diff --git a/chronograf/bolt/servers_test.go b/chronograf/bolt/servers_test.go index cc3f2144f1..dbf6f72cb1 100644 --- a/chronograf/bolt/servers_test.go +++ b/chronograf/bolt/servers_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) // Ensure an ServerStore can store, retrieve, update, and delete servers. diff --git a/chronograf/bolt/sources.go b/chronograf/bolt/sources.go index 87ea581278..bfc0a474f6 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/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/bolt/internal" - "github.com/influxdata/influxdb/chronograf/roles" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/bolt/internal" + "github.com/influxdata/influxdb/v2/chronograf/roles" ) // Ensure SourcesStore implements chronograf.SourcesStore. diff --git a/chronograf/bolt/sources_test.go b/chronograf/bolt/sources_test.go index 5ea929e684..9d8b0a652b 100644 --- a/chronograf/bolt/sources_test.go +++ b/chronograf/bolt/sources_test.go @@ -5,8 +5,8 @@ import ( "reflect" "testing" - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/bolt" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/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 a195d2f248..ad25ca5037 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/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/bolt/internal" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/bolt/internal" ) // Ensure UsersStore implements chronograf.UsersStore. diff --git a/chronograf/bolt/users_test.go b/chronograf/bolt/users_test.go index 4000b6582a..e2b38b47d7 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/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/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 05bcbfd668..8ba3db45f4 100644 --- a/chronograf/canned/bin.go +++ b/chronograf/canned/bin.go @@ -5,7 +5,7 @@ import ( "encoding/json" "fmt" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/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 9c4d94498c..ccb5add711 100644 --- a/chronograf/cmd/chronoctl/add.go +++ b/chronograf/cmd/chronoctl/add.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) type AddCommand struct { diff --git a/chronograf/cmd/chronoctl/util.go b/chronograf/cmd/chronoctl/util.go index f0c52c4078..fdf691681c 100644 --- a/chronograf/cmd/chronoctl/util.go +++ b/chronograf/cmd/chronoctl/util.go @@ -8,9 +8,9 @@ import ( "strings" "text/tabwriter" - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/bolt" - "github.com/influxdata/influxdb/chronograf/mocks" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/bolt" + "github.com/influxdata/influxdb/v2/chronograf/mocks" ) func NewBoltClient(path string) (*bolt.Client, error) { diff --git a/chronograf/cmd/chronograf/main.go b/chronograf/cmd/chronograf/main.go index 174a74e2e1..516dc2f492 100644 --- a/chronograf/cmd/chronograf/main.go +++ b/chronograf/cmd/chronograf/main.go @@ -5,8 +5,8 @@ import ( "log" "os" - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/server" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/server" flags "github.com/jessevdk/go-flags" ) diff --git a/chronograf/enterprise/enterprise.go b/chronograf/enterprise/enterprise.go index 9a4e98f093..fd287bc603 100644 --- a/chronograf/enterprise/enterprise.go +++ b/chronograf/enterprise/enterprise.go @@ -7,8 +7,8 @@ import ( "context" - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/influx" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/influx" ) var _ chronograf.TimeSeries = &Client{} diff --git a/chronograf/enterprise/enterprise_test.go b/chronograf/enterprise/enterprise_test.go index 746e167cfa..0470e50aa5 100644 --- a/chronograf/enterprise/enterprise_test.go +++ b/chronograf/enterprise/enterprise_test.go @@ -7,9 +7,9 @@ import ( "reflect" "testing" - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/enterprise" - "github.com/influxdata/influxdb/chronograf/influx" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/enterprise" + "github.com/influxdata/influxdb/v2/chronograf/influx" ) func Test_Enterprise_FetchesDataNodes(t *testing.T) { diff --git a/chronograf/enterprise/meta.go b/chronograf/enterprise/meta.go index beb4b6d938..7b1bcd11f3 100644 --- a/chronograf/enterprise/meta.go +++ b/chronograf/enterprise/meta.go @@ -13,8 +13,8 @@ import ( "net/url" "time" - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/influx" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/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 23a5e9f23d..c82107e856 100644 --- a/chronograf/enterprise/meta_test.go +++ b/chronograf/enterprise/meta_test.go @@ -13,7 +13,7 @@ import ( "testing" "time" - "github.com/influxdata/influxdb/chronograf/influx" + "github.com/influxdata/influxdb/v2/chronograf/influx" ) func TestMetaClient_ShowCluster(t *testing.T) { diff --git a/chronograf/enterprise/mocks_test.go b/chronograf/enterprise/mocks_test.go index 9e98741af8..628044ccf0 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/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/enterprise" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/enterprise" ) type ControlClient struct { diff --git a/chronograf/enterprise/roles.go b/chronograf/enterprise/roles.go index 3ff9ec8cc0..628a091cce 100644 --- a/chronograf/enterprise/roles.go +++ b/chronograf/enterprise/roles.go @@ -3,7 +3,7 @@ package enterprise import ( "context" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/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 daeb0ce6f9..d82fef0a7f 100644 --- a/chronograf/enterprise/roles_test.go +++ b/chronograf/enterprise/roles_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) func TestRoles_ToChronograf(t *testing.T) { diff --git a/chronograf/enterprise/users.go b/chronograf/enterprise/users.go index b854f71035..4651b8cef6 100644 --- a/chronograf/enterprise/users.go +++ b/chronograf/enterprise/users.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/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 a8b7ccb0be..0b1d0975d2 100644 --- a/chronograf/enterprise/users_test.go +++ b/chronograf/enterprise/users_test.go @@ -6,8 +6,8 @@ import ( "reflect" "testing" - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/enterprise" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/enterprise" ) func TestClient_Add(t *testing.T) { diff --git a/chronograf/filestore/apps.go b/chronograf/filestore/apps.go index b489fa2552..902808f661 100644 --- a/chronograf/filestore/apps.go +++ b/chronograf/filestore/apps.go @@ -8,8 +8,8 @@ import ( "os" "path" - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/pkg/fs" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/pkg/fs" ) // 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 82995b3693..f304c75f58 100644 --- a/chronograf/filestore/apps_test.go +++ b/chronograf/filestore/apps_test.go @@ -12,8 +12,8 @@ import ( "testing" "time" - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/filestore" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/filestore" ) func TestAll(t *testing.T) { diff --git a/chronograf/filestore/dashboards.go b/chronograf/filestore/dashboards.go index d99fb5f120..e537cdaca3 100644 --- a/chronograf/filestore/dashboards.go +++ b/chronograf/filestore/dashboards.go @@ -9,8 +9,8 @@ import ( "path" "strconv" - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/pkg/fs" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/pkg/fs" ) // 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 e5dca293fb..ec596bbe1d 100644 --- a/chronograf/filestore/kapacitors.go +++ b/chronograf/filestore/kapacitors.go @@ -8,7 +8,7 @@ import ( "path" "strconv" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/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 3f844b4eb3..41aaadd1b9 100644 --- a/chronograf/filestore/organizations.go +++ b/chronograf/filestore/organizations.go @@ -7,7 +7,7 @@ import ( "os" "path" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/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 a9821d4217..dbde8cd37c 100644 --- a/chronograf/filestore/sources.go +++ b/chronograf/filestore/sources.go @@ -8,7 +8,7 @@ import ( "path" "strconv" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/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 14966d8e86..6e50e69f8b 100644 --- a/chronograf/id/time.go +++ b/chronograf/id/time.go @@ -4,7 +4,7 @@ import ( "strconv" "time" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) // tm generates an id based on current time diff --git a/chronograf/id/uuid.go b/chronograf/id/uuid.go index ce66e8e0dc..7ff81074d6 100644 --- a/chronograf/id/uuid.go +++ b/chronograf/id/uuid.go @@ -1,7 +1,7 @@ package id import ( - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" uuid "github.com/satori/go.uuid" ) diff --git a/chronograf/influx/annotations.go b/chronograf/influx/annotations.go index 22ed5b3047..5222332103 100644 --- a/chronograf/influx/annotations.go +++ b/chronograf/influx/annotations.go @@ -8,8 +8,8 @@ import ( "sort" "time" - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/id" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/id" ) const ( diff --git a/chronograf/influx/annotations_test.go b/chronograf/influx/annotations_test.go index 29b8d03d5b..db356c0b04 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/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/mocks" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/mocks" ) func Test_toPoint(t *testing.T) { diff --git a/chronograf/influx/authorization.go b/chronograf/influx/authorization.go index 50061d0734..7c0d2f6c19 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/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) // Authorizer adds optional authorization header to request diff --git a/chronograf/influx/databases.go b/chronograf/influx/databases.go index 0630096f1a..042cdd2f66 100644 --- a/chronograf/influx/databases.go +++ b/chronograf/influx/databases.go @@ -6,8 +6,8 @@ import ( "encoding/json" "fmt" - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/kit/tracing" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/kit/tracing" ) // AllDB returns all databases from within Influx diff --git a/chronograf/influx/influx.go b/chronograf/influx/influx.go index 88cbba9cef..f6de6d5eac 100644 --- a/chronograf/influx/influx.go +++ b/chronograf/influx/influx.go @@ -11,8 +11,8 @@ import ( "net/url" "strings" - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/kit/tracing" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/kit/tracing" ) var _ chronograf.TimeSeries = &Client{} diff --git a/chronograf/influx/influx_test.go b/chronograf/influx/influx_test.go index cc1bba0636..3f9ec3ea7c 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/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/influx" - "github.com/influxdata/influxdb/chronograf/mocks" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/influx" + "github.com/influxdata/influxdb/v2/chronograf/mocks" ) // NewClient initializes an HTTP Client for InfluxDB. diff --git a/chronograf/influx/lineprotocol.go b/chronograf/influx/lineprotocol.go index cadae2f1d2..082e647459 100644 --- a/chronograf/influx/lineprotocol.go +++ b/chronograf/influx/lineprotocol.go @@ -5,7 +5,7 @@ import ( "sort" "strings" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) var ( diff --git a/chronograf/influx/lineprotocol_test.go b/chronograf/influx/lineprotocol_test.go index 5abc33ef9e..a3466be959 100644 --- a/chronograf/influx/lineprotocol_test.go +++ b/chronograf/influx/lineprotocol_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) func Test_toLineProtocol(t *testing.T) { diff --git a/chronograf/influx/permissions.go b/chronograf/influx/permissions.go index 5e2f25040c..b10da2ced5 100644 --- a/chronograf/influx/permissions.go +++ b/chronograf/influx/permissions.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) var ( diff --git a/chronograf/influx/permissions_test.go b/chronograf/influx/permissions_test.go index 6c52d7cba5..0050cf0252 100644 --- a/chronograf/influx/permissions_test.go +++ b/chronograf/influx/permissions_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) func TestDifference(t *testing.T) { diff --git a/chronograf/influx/query.go b/chronograf/influx/query.go index 1a144bd05d..a47d69cd2c 100644 --- a/chronograf/influx/query.go +++ b/chronograf/influx/query.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" "github.com/influxdata/influxql" ) diff --git a/chronograf/influx/query_test.go b/chronograf/influx/query_test.go index f4415f11dd..0927343814 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/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) func TestConvert(t *testing.T) { diff --git a/chronograf/influx/users.go b/chronograf/influx/users.go index 5c26e88672..a41a35e78b 100644 --- a/chronograf/influx/users.go +++ b/chronograf/influx/users.go @@ -5,7 +5,7 @@ import ( "encoding/json" "fmt" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) // Add a new User in InfluxDB diff --git a/chronograf/influx/users_test.go b/chronograf/influx/users_test.go index b4ddcc9a85..1936e9992f 100644 --- a/chronograf/influx/users_test.go +++ b/chronograf/influx/users_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) func TestClient_userPermissions(t *testing.T) { diff --git a/chronograf/integrations/server_test.go b/chronograf/integrations/server_test.go index 140e2da6d3..0f6462cb74 100644 --- a/chronograf/integrations/server_test.go +++ b/chronograf/integrations/server_test.go @@ -15,10 +15,10 @@ import ( "testing" "time" - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/bolt" - "github.com/influxdata/influxdb/chronograf/oauth2" - "github.com/influxdata/influxdb/chronograf/server" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/bolt" + "github.com/influxdata/influxdb/v2/chronograf/oauth2" + "github.com/influxdata/influxdb/v2/chronograf/server" ) func TestServer(t *testing.T) { diff --git a/chronograf/memdb/kapacitors.go b/chronograf/memdb/kapacitors.go index 21a394933f..1635942d5d 100644 --- a/chronograf/memdb/kapacitors.go +++ b/chronograf/memdb/kapacitors.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) // Ensure KapacitorStore implements chronograf.ServersStore. diff --git a/chronograf/memdb/kapacitors_test.go b/chronograf/memdb/kapacitors_test.go index a254e14c31..74a4cbbae3 100644 --- a/chronograf/memdb/kapacitors_test.go +++ b/chronograf/memdb/kapacitors_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) func TestInterfaceImplementation(t *testing.T) { diff --git a/chronograf/memdb/sources.go b/chronograf/memdb/sources.go index 6576c0ae68..f1d73c62af 100644 --- a/chronograf/memdb/sources.go +++ b/chronograf/memdb/sources.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) // Ensure SourcesStore implements chronograf.SourcesStore. diff --git a/chronograf/memdb/sources_test.go b/chronograf/memdb/sources_test.go index 3cbcd85f80..f5b7a8bf90 100644 --- a/chronograf/memdb/sources_test.go +++ b/chronograf/memdb/sources_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) func TestSourcesStore(t *testing.T) { diff --git a/chronograf/mocks/auth.go b/chronograf/mocks/auth.go index 2fa980fe2d..f4302453b1 100644 --- a/chronograf/mocks/auth.go +++ b/chronograf/mocks/auth.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/influxdata/influxdb/chronograf/oauth2" + "github.com/influxdata/influxdb/v2/chronograf/oauth2" ) // Authenticator implements a OAuth2 authenticator diff --git a/chronograf/mocks/config.go b/chronograf/mocks/config.go index e78a2d0183..5dd605d947 100644 --- a/chronograf/mocks/config.go +++ b/chronograf/mocks/config.go @@ -3,7 +3,7 @@ package mocks import ( "context" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) // ConfigStore stores global application configuration diff --git a/chronograf/mocks/dashboards.go b/chronograf/mocks/dashboards.go index 460d0946db..f50c2f2f5a 100644 --- a/chronograf/mocks/dashboards.go +++ b/chronograf/mocks/dashboards.go @@ -3,7 +3,7 @@ package mocks import ( "context" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) var _ chronograf.DashboardsStore = &DashboardsStore{} diff --git a/chronograf/mocks/databases.go b/chronograf/mocks/databases.go index 6af071502e..a5117ed96e 100644 --- a/chronograf/mocks/databases.go +++ b/chronograf/mocks/databases.go @@ -3,7 +3,7 @@ package mocks import ( "context" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) var _ chronograf.Databases = &Databases{} diff --git a/chronograf/mocks/layouts.go b/chronograf/mocks/layouts.go index a9b81686d1..0f321d27e7 100644 --- a/chronograf/mocks/layouts.go +++ b/chronograf/mocks/layouts.go @@ -3,7 +3,7 @@ package mocks import ( "context" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) var _ chronograf.LayoutsStore = &LayoutsStore{} diff --git a/chronograf/mocks/logger.go b/chronograf/mocks/logger.go index 302cc00653..9f9d2e03be 100644 --- a/chronograf/mocks/logger.go +++ b/chronograf/mocks/logger.go @@ -5,7 +5,7 @@ import ( "io" "testing" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) // NewLogger returns a mock logger that implements chronograf.Logger diff --git a/chronograf/mocks/mapping.go b/chronograf/mocks/mapping.go index 298f94c28d..ec09bdb4df 100644 --- a/chronograf/mocks/mapping.go +++ b/chronograf/mocks/mapping.go @@ -3,7 +3,7 @@ package mocks import ( "context" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) type MappingsStore struct { diff --git a/chronograf/mocks/org_config.go b/chronograf/mocks/org_config.go index ad8372dee7..6f0715f2ad 100644 --- a/chronograf/mocks/org_config.go +++ b/chronograf/mocks/org_config.go @@ -3,7 +3,7 @@ package mocks import ( "context" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) var _ chronograf.OrganizationConfigStore = &OrganizationConfigStore{} diff --git a/chronograf/mocks/organizations.go b/chronograf/mocks/organizations.go index 11bb72a1cb..ddb734a628 100644 --- a/chronograf/mocks/organizations.go +++ b/chronograf/mocks/organizations.go @@ -3,7 +3,7 @@ package mocks import ( "context" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) var _ chronograf.OrganizationsStore = &OrganizationsStore{} diff --git a/chronograf/mocks/roles.go b/chronograf/mocks/roles.go index 8bf0832e65..235ae61df1 100644 --- a/chronograf/mocks/roles.go +++ b/chronograf/mocks/roles.go @@ -3,7 +3,7 @@ package mocks import ( "context" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) var _ chronograf.RolesStore = &RolesStore{} diff --git a/chronograf/mocks/servers.go b/chronograf/mocks/servers.go index b4e0891023..9eea65044f 100644 --- a/chronograf/mocks/servers.go +++ b/chronograf/mocks/servers.go @@ -3,7 +3,7 @@ package mocks import ( "context" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) var _ chronograf.ServersStore = &ServersStore{} diff --git a/chronograf/mocks/sources.go b/chronograf/mocks/sources.go index 117d9df82f..5a77b2cb41 100644 --- a/chronograf/mocks/sources.go +++ b/chronograf/mocks/sources.go @@ -3,7 +3,7 @@ package mocks import ( "context" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) var _ chronograf.SourcesStore = &SourcesStore{} diff --git a/chronograf/mocks/store.go b/chronograf/mocks/store.go index 914ba99b70..f22df100cd 100644 --- a/chronograf/mocks/store.go +++ b/chronograf/mocks/store.go @@ -3,7 +3,7 @@ package mocks import ( "context" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) // Store is a server.DataStore diff --git a/chronograf/mocks/timeseries.go b/chronograf/mocks/timeseries.go index e29df23c10..3d1a1b8a96 100644 --- a/chronograf/mocks/timeseries.go +++ b/chronograf/mocks/timeseries.go @@ -3,7 +3,7 @@ package mocks import ( "context" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) var _ chronograf.TimeSeries = &TimeSeries{} diff --git a/chronograf/mocks/users.go b/chronograf/mocks/users.go index df853b2485..9e3646e113 100644 --- a/chronograf/mocks/users.go +++ b/chronograf/mocks/users.go @@ -3,7 +3,7 @@ package mocks import ( "context" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) var _ chronograf.UsersStore = &UsersStore{} diff --git a/chronograf/multistore/dashboards.go b/chronograf/multistore/dashboards.go index 07b2d0ffbb..d5d275ea2b 100644 --- a/chronograf/multistore/dashboards.go +++ b/chronograf/multistore/dashboards.go @@ -3,7 +3,7 @@ package multistore import ( "context" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) // Ensure DashboardsStore implements chronograf.DashboardsStore. diff --git a/chronograf/multistore/kapacitors.go b/chronograf/multistore/kapacitors.go index 8fb0681f0d..cd2f96bcb7 100644 --- a/chronograf/multistore/kapacitors.go +++ b/chronograf/multistore/kapacitors.go @@ -3,7 +3,7 @@ package multistore import ( "context" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) // Ensure KapacitorStore implements chronograf.ServersStore. diff --git a/chronograf/multistore/kapacitors_test.go b/chronograf/multistore/kapacitors_test.go index 969681656f..1bc073a66c 100644 --- a/chronograf/multistore/kapacitors_test.go +++ b/chronograf/multistore/kapacitors_test.go @@ -3,7 +3,7 @@ package multistore import ( "testing" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) func TestInterfaceImplementation(t *testing.T) { diff --git a/chronograf/multistore/layouts.go b/chronograf/multistore/layouts.go index 9f4dbe54a5..900128b2ed 100644 --- a/chronograf/multistore/layouts.go +++ b/chronograf/multistore/layouts.go @@ -3,7 +3,7 @@ package multistore import ( "context" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) // Layouts is a LayoutsStore that contains multiple LayoutsStores diff --git a/chronograf/multistore/organizations.go b/chronograf/multistore/organizations.go index 6fe6f5a00c..8bb9289e49 100644 --- a/chronograf/multistore/organizations.go +++ b/chronograf/multistore/organizations.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) // Ensure OrganizationsStore implements chronograf.OrganizationsStore. diff --git a/chronograf/multistore/sources.go b/chronograf/multistore/sources.go index b8f90ee428..74fd4b99b2 100644 --- a/chronograf/multistore/sources.go +++ b/chronograf/multistore/sources.go @@ -3,7 +3,7 @@ package multistore import ( "context" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) // Ensure SourcesStore implements chronograf.SourcesStore. diff --git a/chronograf/noop/config.go b/chronograf/noop/config.go index 30915fcdf0..2098736f14 100644 --- a/chronograf/noop/config.go +++ b/chronograf/noop/config.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) // ensure ConfigStore implements chronograf.ConfigStore diff --git a/chronograf/noop/dashboards.go b/chronograf/noop/dashboards.go index cf37d6bbc3..cbc06d332a 100644 --- a/chronograf/noop/dashboards.go +++ b/chronograf/noop/dashboards.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) // ensure DashboardsStore implements chronograf.DashboardsStore diff --git a/chronograf/noop/layouts.go b/chronograf/noop/layouts.go index a4c3662c5d..9ff2ad4ccf 100644 --- a/chronograf/noop/layouts.go +++ b/chronograf/noop/layouts.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) // ensure LayoutsStore implements chronograf.LayoutsStore diff --git a/chronograf/noop/mappings.go b/chronograf/noop/mappings.go index 04a2e148a4..8769683924 100644 --- a/chronograf/noop/mappings.go +++ b/chronograf/noop/mappings.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) // ensure MappingsStore implements chronograf.MappingsStore diff --git a/chronograf/noop/org_config.go b/chronograf/noop/org_config.go index 5fdda415e0..53da5ac6a6 100644 --- a/chronograf/noop/org_config.go +++ b/chronograf/noop/org_config.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) // ensure OrganizationConfigStore implements chronograf.OrganizationConfigStore diff --git a/chronograf/noop/organizations.go b/chronograf/noop/organizations.go index b1ed622c29..0528bbb6d3 100644 --- a/chronograf/noop/organizations.go +++ b/chronograf/noop/organizations.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) // ensure OrganizationsStore implements chronograf.OrganizationsStore diff --git a/chronograf/noop/servers.go b/chronograf/noop/servers.go index 41078181d3..d6702f5177 100644 --- a/chronograf/noop/servers.go +++ b/chronograf/noop/servers.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) // ensure ServersStore implements chronograf.ServersStore diff --git a/chronograf/noop/sources.go b/chronograf/noop/sources.go index 08f70001fe..254d9062f4 100644 --- a/chronograf/noop/sources.go +++ b/chronograf/noop/sources.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) // ensure SourcesStore implements chronograf.SourcesStore diff --git a/chronograf/noop/users.go b/chronograf/noop/users.go index ee732e9930..c65881e7c4 100644 --- a/chronograf/noop/users.go +++ b/chronograf/noop/users.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) // ensure UsersStore implements chronograf.UsersStore diff --git a/chronograf/oauth2/auth0.go b/chronograf/oauth2/auth0.go index 87cddccd4e..927cc6d09a 100644 --- a/chronograf/oauth2/auth0.go +++ b/chronograf/oauth2/auth0.go @@ -5,7 +5,7 @@ import ( "net/http" "net/url" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) var _ Provider = &Auth0{} diff --git a/chronograf/oauth2/auth0_test.go b/chronograf/oauth2/auth0_test.go index 84db491756..d0ef55bf8a 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/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/oauth2" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/oauth2" ) var auth0Tests = []struct { diff --git a/chronograf/oauth2/generic.go b/chronograf/oauth2/generic.go index b245a53a7a..8483c7f4fa 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/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" "golang.org/x/oauth2" ) diff --git a/chronograf/oauth2/generic_test.go b/chronograf/oauth2/generic_test.go index 5600ea352b..2bc8533fa4 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/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/oauth2" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/oauth2" ) func TestGenericGroup_withNotEmail(t *testing.T) { diff --git a/chronograf/oauth2/github.go b/chronograf/oauth2/github.go index a6fe4fdaf8..c06d554aa2 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/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/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 413d87efb7..9cf03022d9 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/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/oauth2" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/oauth2" ) func TestGithubPrincipalID(t *testing.T) { diff --git a/chronograf/oauth2/google.go b/chronograf/oauth2/google.go index 3362d6dd23..d8e984e086 100644 --- a/chronograf/oauth2/google.go +++ b/chronograf/oauth2/google.go @@ -5,7 +5,7 @@ import ( "fmt" "net/http" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" "golang.org/x/oauth2" goauth2 "google.golang.org/api/oauth2/v2" "google.golang.org/api/option" diff --git a/chronograf/oauth2/google_test.go b/chronograf/oauth2/google_test.go index daac49c972..633a15aef9 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/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/oauth2" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/oauth2" ) func TestGooglePrincipalID(t *testing.T) { diff --git a/chronograf/oauth2/heroku.go b/chronograf/oauth2/heroku.go index f6255d0d91..2cf036db1d 100644 --- a/chronograf/oauth2/heroku.go +++ b/chronograf/oauth2/heroku.go @@ -5,7 +5,7 @@ import ( "fmt" "net/http" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/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 430f374370..c26ee2967b 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/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/oauth2" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/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 07050c5007..904429135c 100644 --- a/chronograf/oauth2/jwt_test.go +++ b/chronograf/oauth2/jwt_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/influxdata/influxdb/chronograf/oauth2" + "github.com/influxdata/influxdb/v2/chronograf/oauth2" ) func TestAuthenticate(t *testing.T) { diff --git a/chronograf/oauth2/mux.go b/chronograf/oauth2/mux.go index d13aa50af1..bc0c4132f4 100644 --- a/chronograf/oauth2/mux.go +++ b/chronograf/oauth2/mux.go @@ -5,7 +5,7 @@ import ( "path" "time" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" "golang.org/x/oauth2" ) diff --git a/chronograf/oauth2/mux_test.go b/chronograf/oauth2/mux_test.go index fac12a2669..964cb08afd 100644 --- a/chronograf/oauth2/mux_test.go +++ b/chronograf/oauth2/mux_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/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 5bae905051..1303489298 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/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) var _ Provider = &MockProvider{} diff --git a/chronograf/organizations/dashboards.go b/chronograf/organizations/dashboards.go index 9a87466e18..1b79b30a11 100644 --- a/chronograf/organizations/dashboards.go +++ b/chronograf/organizations/dashboards.go @@ -3,7 +3,7 @@ package organizations import ( "context" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) // ensure that DashboardsStore implements chronograf.DashboardStore diff --git a/chronograf/organizations/dashboards_test.go b/chronograf/organizations/dashboards_test.go index 63848723ed..827de6948b 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/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/mocks" - "github.com/influxdata/influxdb/chronograf/organizations" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/mocks" + "github.com/influxdata/influxdb/v2/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 56b0c10e86..1378a1e6eb 100644 --- a/chronograf/organizations/org_config.go +++ b/chronograf/organizations/org_config.go @@ -3,7 +3,7 @@ package organizations import ( "context" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) // ensure that OrganizationConfig implements chronograf.OrganizationConfigStore diff --git a/chronograf/organizations/organizations.go b/chronograf/organizations/organizations.go index 42a56ee7bf..57a7ee1b7f 100644 --- a/chronograf/organizations/organizations.go +++ b/chronograf/organizations/organizations.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) type contextKey string diff --git a/chronograf/organizations/organizations_test.go b/chronograf/organizations/organizations_test.go index c00155c272..f57068cb70 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/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/mocks" - "github.com/influxdata/influxdb/chronograf/organizations" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/mocks" + "github.com/influxdata/influxdb/v2/chronograf/organizations" ) // IgnoreFields is used because ID cannot be predicted reliably diff --git a/chronograf/organizations/servers.go b/chronograf/organizations/servers.go index 7b09ac79dc..89bf1a8ed3 100644 --- a/chronograf/organizations/servers.go +++ b/chronograf/organizations/servers.go @@ -3,7 +3,7 @@ package organizations import ( "context" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) // ensure that ServersStore implements chronograf.ServerStore diff --git a/chronograf/organizations/servers_test.go b/chronograf/organizations/servers_test.go index ac612fa25b..256be8f3f1 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/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/mocks" - "github.com/influxdata/influxdb/chronograf/organizations" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/mocks" + "github.com/influxdata/influxdb/v2/chronograf/organizations" ) // IgnoreFields is used because ID cannot be predicted reliably diff --git a/chronograf/organizations/sources.go b/chronograf/organizations/sources.go index 32b6dfa2c5..eadc761146 100644 --- a/chronograf/organizations/sources.go +++ b/chronograf/organizations/sources.go @@ -3,7 +3,7 @@ package organizations import ( "context" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) // ensure that SourcesStore implements chronograf.SourceStore diff --git a/chronograf/organizations/sources_test.go b/chronograf/organizations/sources_test.go index ab366ed3a8..4dc4edb951 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/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/mocks" - "github.com/influxdata/influxdb/chronograf/organizations" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/mocks" + "github.com/influxdata/influxdb/v2/chronograf/organizations" ) // IgnoreFields is used because ID cannot be predicted reliably diff --git a/chronograf/organizations/users.go b/chronograf/organizations/users.go index ac0bfd577a..bb2a849e88 100644 --- a/chronograf/organizations/users.go +++ b/chronograf/organizations/users.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) // Ensure UsersStore implements chronograf.UsersStore. diff --git a/chronograf/organizations/users_test.go b/chronograf/organizations/users_test.go index a1f2c5bf47..c8494c6b55 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/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/mocks" - "github.com/influxdata/influxdb/chronograf/organizations" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/mocks" + "github.com/influxdata/influxdb/v2/chronograf/organizations" ) // IgnoreFields is used because ID cannot be predicted reliably diff --git a/chronograf/roles/roles.go b/chronograf/roles/roles.go index ec3b93f66a..a5e63ad04c 100644 --- a/chronograf/roles/roles.go +++ b/chronograf/roles/roles.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) type contextKey string diff --git a/chronograf/roles/sources.go b/chronograf/roles/sources.go index b4e84fcf6a..9872601be9 100644 --- a/chronograf/roles/sources.go +++ b/chronograf/roles/sources.go @@ -3,7 +3,7 @@ package roles import ( "context" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) // NOTE: diff --git a/chronograf/roles/sources_test.go b/chronograf/roles/sources_test.go index 4b7192dc27..9a69718b3f 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/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/mocks" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/mocks" ) func TestSources_Get(t *testing.T) { diff --git a/chronograf/server/annotations.go b/chronograf/server/annotations.go index 650f4db5b8..262ff80fd1 100644 --- a/chronograf/server/annotations.go +++ b/chronograf/server/annotations.go @@ -7,8 +7,8 @@ import ( "net/url" "time" - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/influx" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/influx" ) const ( diff --git a/chronograf/server/annotations_test.go b/chronograf/server/annotations_test.go index 862faf07d6..23984b4139 100644 --- a/chronograf/server/annotations_test.go +++ b/chronograf/server/annotations_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/influxdata/httprouter" - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/mocks" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/mocks" ) func TestService_Annotations(t *testing.T) { diff --git a/chronograf/server/assets.go b/chronograf/server/assets.go index 35fa861c0f..16f0ded8bd 100644 --- a/chronograf/server/assets.go +++ b/chronograf/server/assets.go @@ -3,8 +3,8 @@ package server import ( "net/http" - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/dist" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/dist" ) const ( diff --git a/chronograf/server/auth.go b/chronograf/server/auth.go index be3b3606bc..fa38e74622 100644 --- a/chronograf/server/auth.go +++ b/chronograf/server/auth.go @@ -5,10 +5,10 @@ import ( "fmt" "net/http" - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/oauth2" - "github.com/influxdata/influxdb/chronograf/organizations" - "github.com/influxdata/influxdb/chronograf/roles" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/oauth2" + "github.com/influxdata/influxdb/v2/chronograf/organizations" + "github.com/influxdata/influxdb/v2/chronograf/roles" ) // HasAuthorizedToken extracts the token from a request and validates it using the authenticator. diff --git a/chronograf/server/auth_test.go b/chronograf/server/auth_test.go index 0fb1abb60f..307517d932 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/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/mocks" - "github.com/influxdata/influxdb/chronograf/oauth2" - "github.com/influxdata/influxdb/chronograf/roles" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/mocks" + "github.com/influxdata/influxdb/v2/chronograf/oauth2" + "github.com/influxdata/influxdb/v2/chronograf/roles" ) func TestAuthorizedToken(t *testing.T) { diff --git a/chronograf/server/builders.go b/chronograf/server/builders.go index f10eb3f63a..c3d9519cef 100644 --- a/chronograf/server/builders.go +++ b/chronograf/server/builders.go @@ -1,11 +1,11 @@ package server import ( - "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" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/canned" + "github.com/influxdata/influxdb/v2/chronograf/filestore" + "github.com/influxdata/influxdb/v2/chronograf/memdb" + "github.com/influxdata/influxdb/v2/chronograf/multistore" ) // LayoutBuilder is responsible for building Layouts diff --git a/chronograf/server/builders_test.go b/chronograf/server/builders_test.go index 72bbfc4f78..ccd0b05577 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/influxdb/chronograf/server" + "github.com/influxdata/influxdb/v2/chronograf/server" ) func TestLayoutBuilder(t *testing.T) { diff --git a/chronograf/server/cells.go b/chronograf/server/cells.go index 28dd94e1f9..1c1155afd1 100644 --- a/chronograf/server/cells.go +++ b/chronograf/server/cells.go @@ -6,8 +6,8 @@ import ( "net/http" "github.com/influxdata/httprouter" - "github.com/influxdata/influxdb/chronograf" - idgen "github.com/influxdata/influxdb/chronograf/id" + "github.com/influxdata/influxdb/v2/chronograf" + idgen "github.com/influxdata/influxdb/v2/chronograf/id" ) const ( diff --git a/chronograf/server/cells_test.go b/chronograf/server/cells_test.go index 259174a52e..562b8befbf 100644 --- a/chronograf/server/cells_test.go +++ b/chronograf/server/cells_test.go @@ -14,8 +14,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/influxdata/httprouter" - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/mocks" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/mocks" ) func Test_Cells_CorrectAxis(t *testing.T) { diff --git a/chronograf/server/config.go b/chronograf/server/config.go index c33fd2d52f..cb5d07802c 100644 --- a/chronograf/server/config.go +++ b/chronograf/server/config.go @@ -4,7 +4,7 @@ import ( "encoding/json" "net/http" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) type configLinks struct { diff --git a/chronograf/server/config_test.go b/chronograf/server/config_test.go index 224dd514b4..d9633ebcae 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/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/mocks" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/mocks" ) func TestConfig(t *testing.T) { diff --git a/chronograf/server/dashboards.go b/chronograf/server/dashboards.go index 2ae0618f6c..0e74c5b533 100644 --- a/chronograf/server/dashboards.go +++ b/chronograf/server/dashboards.go @@ -5,7 +5,7 @@ import ( "fmt" "net/http" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) type dashboardLinks struct { diff --git a/chronograf/server/dashboards_test.go b/chronograf/server/dashboards_test.go index c74110a475..a5ef0b7d9a 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/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) func TestCorrectWidthHeight(t *testing.T) { diff --git a/chronograf/server/databases.go b/chronograf/server/databases.go index d34a307676..d79ea29d1f 100644 --- a/chronograf/server/databases.go +++ b/chronograf/server/databases.go @@ -9,7 +9,7 @@ import ( "strconv" "github.com/influxdata/httprouter" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) const ( diff --git a/chronograf/server/databases_test.go b/chronograf/server/databases_test.go index eb39e27391..5372da0806 100644 --- a/chronograf/server/databases_test.go +++ b/chronograf/server/databases_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/influxdata/httprouter" - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/mocks" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/mocks" ) func TestService_GetDatabases(t *testing.T) { diff --git a/chronograf/server/env.go b/chronograf/server/env.go index b195694749..8573e77e0c 100644 --- a/chronograf/server/env.go +++ b/chronograf/server/env.go @@ -3,7 +3,7 @@ package server import ( "net/http" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) type envResponse struct { diff --git a/chronograf/server/env_test.go b/chronograf/server/env_test.go index 3e39c7c6be..07a8ee88f7 100644 --- a/chronograf/server/env_test.go +++ b/chronograf/server/env_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) func TestEnvironment(t *testing.T) { diff --git a/chronograf/server/influx.go b/chronograf/server/influx.go index 212cad2b6a..a878687970 100644 --- a/chronograf/server/influx.go +++ b/chronograf/server/influx.go @@ -10,8 +10,8 @@ import ( "net/url" "time" - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/influx" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/influx" ) // ValidInfluxRequest checks if queries specify a command. diff --git a/chronograf/server/influx_test.go b/chronograf/server/influx_test.go index 00ca6b16fe..715fb6681e 100644 --- a/chronograf/server/influx_test.go +++ b/chronograf/server/influx_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/influxdata/httprouter" - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/mocks" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/mocks" ) func TestService_Influx(t *testing.T) { diff --git a/chronograf/server/layout.go b/chronograf/server/layout.go index 6869951ba5..9c3ad03277 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/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) type link struct { diff --git a/chronograf/server/layout_test.go b/chronograf/server/layout_test.go index 056f050fd3..47a6f0618e 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/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/mocks" - "github.com/influxdata/influxdb/chronograf/server" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/mocks" + "github.com/influxdata/influxdb/v2/chronograf/server" ) func Test_Layouts(t *testing.T) { diff --git a/chronograf/server/logger.go b/chronograf/server/logger.go index a7b74ec631..cb88bf0606 100644 --- a/chronograf/server/logger.go +++ b/chronograf/server/logger.go @@ -4,7 +4,7 @@ import ( "net/http" "time" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) // statusWriterFlusher captures the status header of an http.ResponseWriter diff --git a/chronograf/server/mapping.go b/chronograf/server/mapping.go index ed9765f813..d865fa4803 100644 --- a/chronograf/server/mapping.go +++ b/chronograf/server/mapping.go @@ -9,8 +9,8 @@ import ( "strings" "github.com/bouk/httprouter" - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/oauth2" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/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 3cba9b88bf..c2f026e193 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/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/mocks" - "github.com/influxdata/influxdb/chronograf/roles" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/mocks" + "github.com/influxdata/influxdb/v2/chronograf/roles" ) func TestMappings_All(t *testing.T) { diff --git a/chronograf/server/me.go b/chronograf/server/me.go index 9ee532cd01..6a1f6d6601 100644 --- a/chronograf/server/me.go +++ b/chronograf/server/me.go @@ -6,9 +6,9 @@ import ( "net/http" "sort" - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/oauth2" - "github.com/influxdata/influxdb/chronograf/organizations" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/oauth2" + "github.com/influxdata/influxdb/v2/chronograf/organizations" "golang.org/x/net/context" ) diff --git a/chronograf/server/me_test.go b/chronograf/server/me_test.go index 881471de71..8848b477ed 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/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/mocks" - "github.com/influxdata/influxdb/chronograf/oauth2" - "github.com/influxdata/influxdb/chronograf/roles" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/mocks" + "github.com/influxdata/influxdb/v2/chronograf/oauth2" + "github.com/influxdata/influxdb/v2/chronograf/roles" ) func TestService_Me(t *testing.T) { diff --git a/chronograf/server/middle.go b/chronograf/server/middle.go index d148878f87..b6ba8afc2e 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/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/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 376337378c..12dbb00712 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/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/mocks" - "github.com/influxdata/influxdb/chronograf/oauth2" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/mocks" + "github.com/influxdata/influxdb/v2/chronograf/oauth2" ) func TestRouteMatchesPrincipal(t *testing.T) { diff --git a/chronograf/server/mountable_router.go b/chronograf/server/mountable_router.go index d985c5097e..1ae275cfdf 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/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) var _ chronograf.Router = &MountableRouter{} diff --git a/chronograf/server/mountable_router_test.go b/chronograf/server/mountable_router_test.go index 98c0dbce3a..2eec8a0593 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/influxdb/chronograf/server" + "github.com/influxdata/influxdb/v2/chronograf/server" ) func Test_MountableRouter_MountsRoutesUnderPrefix(t *testing.T) { diff --git a/chronograf/server/mux.go b/chronograf/server/mux.go index 606f8d0f83..9200c6bbd3 100644 --- a/chronograf/server/mux.go +++ b/chronograf/server/mux.go @@ -13,9 +13,9 @@ import ( "github.com/NYTimes/gziphandler" "github.com/bouk/httprouter" jhttprouter "github.com/influxdata/httprouter" - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/oauth2" - "github.com/influxdata/influxdb/chronograf/roles" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/oauth2" + "github.com/influxdata/influxdb/v2/chronograf/roles" ) const ( diff --git a/chronograf/server/org_config.go b/chronograf/server/org_config.go index fc354698cd..8311863f40 100644 --- a/chronograf/server/org_config.go +++ b/chronograf/server/org_config.go @@ -5,7 +5,7 @@ import ( "fmt" "net/http" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) type organizationConfigLinks struct { diff --git a/chronograf/server/org_config_test.go b/chronograf/server/org_config_test.go index 613de26033..3ec842fefd 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/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/mocks" - "github.com/influxdata/influxdb/chronograf/organizations" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/mocks" + "github.com/influxdata/influxdb/v2/chronograf/organizations" ) func TestOrganizationConfig(t *testing.T) { diff --git a/chronograf/server/organizations.go b/chronograf/server/organizations.go index f3d543873d..01f2cb8ce9 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/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/organizations" - "github.com/influxdata/influxdb/chronograf/roles" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/organizations" + "github.com/influxdata/influxdb/v2/chronograf/roles" ) type organizationRequest struct { diff --git a/chronograf/server/organizations_test.go b/chronograf/server/organizations_test.go index 227668c800..7392bab6d6 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/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/mocks" - "github.com/influxdata/influxdb/chronograf/roles" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/mocks" + "github.com/influxdata/influxdb/v2/chronograf/roles" ) func TestService_OrganizationID(t *testing.T) { diff --git a/chronograf/server/permissions.go b/chronograf/server/permissions.go index 145d4bcecc..ae7123e567 100644 --- a/chronograf/server/permissions.go +++ b/chronograf/server/permissions.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) // Permissions returns all possible permissions for this source. diff --git a/chronograf/server/permissions_test.go b/chronograf/server/permissions_test.go index 35f9169c8a..1d0db37fa4 100644 --- a/chronograf/server/permissions_test.go +++ b/chronograf/server/permissions_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/influxdata/httprouter" - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/mocks" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/mocks" ) func TestService_Permissions(t *testing.T) { diff --git a/chronograf/server/queries.go b/chronograf/server/queries.go index ec9444f559..38ab656a33 100644 --- a/chronograf/server/queries.go +++ b/chronograf/server/queries.go @@ -8,9 +8,9 @@ import ( "golang.org/x/net/context" - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/influx" - "github.com/influxdata/influxdb/chronograf/influx/queries" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/influx" + "github.com/influxdata/influxdb/v2/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 3df8f35f3b..c8008861e4 100644 --- a/chronograf/server/queries_test.go +++ b/chronograf/server/queries_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/influxdata/httprouter" - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/mocks" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/mocks" ) func TestService_Queries(t *testing.T) { diff --git a/chronograf/server/queryconfig.go b/chronograf/server/queryconfig.go index 0795f85494..6f575a688f 100644 --- a/chronograf/server/queryconfig.go +++ b/chronograf/server/queryconfig.go @@ -3,8 +3,8 @@ package server import ( "fmt" - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/influx" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/influx" ) // ToQueryConfig converts InfluxQL into queryconfigs diff --git a/chronograf/server/queryconfig_test.go b/chronograf/server/queryconfig_test.go index b486f6545e..c6ea49f837 100644 --- a/chronograf/server/queryconfig_test.go +++ b/chronograf/server/queryconfig_test.go @@ -3,7 +3,7 @@ package server import ( "testing" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) func TestValidateQueryConfig(t *testing.T) { diff --git a/chronograf/server/routes.go b/chronograf/server/routes.go index 2ac3ce94b3..d417e44e7a 100644 --- a/chronograf/server/routes.go +++ b/chronograf/server/routes.go @@ -4,8 +4,8 @@ import ( "fmt" "net/http" - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/oauth2" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/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 076ff5e366..5333c2dc11 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/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) func TestAllRoutes(t *testing.T) { diff --git a/chronograf/server/server.go b/chronograf/server/server.go index d40c8de0d9..2e4d9be0af 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/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" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/bolt" + idgen "github.com/influxdata/influxdb/v2/chronograf/id" + "github.com/influxdata/influxdb/v2/chronograf/influx" + "github.com/influxdata/influxdb/v2/chronograf/oauth2" client "github.com/influxdata/usage-client/v1" flags "github.com/jessevdk/go-flags" "github.com/tylerb/graceful" diff --git a/chronograf/server/service.go b/chronograf/server/service.go index fd5a3a0728..c98750657c 100644 --- a/chronograf/server/service.go +++ b/chronograf/server/service.go @@ -4,9 +4,9 @@ import ( "context" "strings" - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/enterprise" - "github.com/influxdata/influxdb/chronograf/influx" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/enterprise" + "github.com/influxdata/influxdb/v2/chronograf/influx" ) // Service handles REST calls to the persistence diff --git a/chronograf/server/services.go b/chronograf/server/services.go index c12ed5650a..2457895fda 100644 --- a/chronograf/server/services.go +++ b/chronograf/server/services.go @@ -7,8 +7,8 @@ import ( "net/http" "net/url" - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/flux" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/flux" ) type postServiceRequest struct { diff --git a/chronograf/server/stores.go b/chronograf/server/stores.go index 90ebe307b2..2a457a81de 100644 --- a/chronograf/server/stores.go +++ b/chronograf/server/stores.go @@ -3,10 +3,10 @@ package server import ( "context" - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/noop" - "github.com/influxdata/influxdb/chronograf/organizations" - "github.com/influxdata/influxdb/chronograf/roles" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/noop" + "github.com/influxdata/influxdb/v2/chronograf/organizations" + "github.com/influxdata/influxdb/v2/chronograf/roles" ) // hasOrganizationContext retrieves organization specified on context diff --git a/chronograf/server/stores_test.go b/chronograf/server/stores_test.go index fe6d471f0f..5882c786d6 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/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/mocks" - "github.com/influxdata/influxdb/chronograf/organizations" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/mocks" + "github.com/influxdata/influxdb/v2/chronograf/organizations" ) func TestStore_SourcesGet(t *testing.T) { diff --git a/chronograf/server/templates.go b/chronograf/server/templates.go index b5dd151a48..8646c5d89a 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/influxdb/chronograf" - idgen "github.com/influxdata/influxdb/chronograf/id" + "github.com/influxdata/influxdb/v2/chronograf" + idgen "github.com/influxdata/influxdb/v2/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 30ff6d5a0a..8b0c871117 100644 --- a/chronograf/server/templates_test.go +++ b/chronograf/server/templates_test.go @@ -3,7 +3,7 @@ package server import ( "testing" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) func TestValidTemplateRequest(t *testing.T) { diff --git a/chronograf/server/url_prefixer.go b/chronograf/server/url_prefixer.go index 0baae6c9f0..1fd298c469 100644 --- a/chronograf/server/url_prefixer.go +++ b/chronograf/server/url_prefixer.go @@ -7,7 +7,7 @@ import ( "net/http" "regexp" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) const ( diff --git a/chronograf/server/url_prefixer_test.go b/chronograf/server/url_prefixer_test.go index 824989f6fa..48fb68b92e 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/influxdb/chronograf/mocks" - "github.com/influxdata/influxdb/chronograf/server" + "github.com/influxdata/influxdb/v2/chronograf/mocks" + "github.com/influxdata/influxdb/v2/chronograf/server" ) var prefixerTests = []struct { diff --git a/chronograf/server/users.go b/chronograf/server/users.go index a674bed7d3..e9cb286604 100644 --- a/chronograf/server/users.go +++ b/chronograf/server/users.go @@ -9,8 +9,8 @@ import ( "strconv" "github.com/bouk/httprouter" - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/roles" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/roles" ) type userRequest struct { diff --git a/chronograf/server/users_test.go b/chronograf/server/users_test.go index 900b53da3c..9bd745a1cd 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/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/mocks" - "github.com/influxdata/influxdb/chronograf/roles" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/mocks" + "github.com/influxdata/influxdb/v2/chronograf/roles" ) func TestService_UserID(t *testing.T) { diff --git a/cmd/chronograf-migrator/dashboard.go b/cmd/chronograf-migrator/dashboard.go index 22cb42ec04..c4993e50f5 100644 --- a/cmd/chronograf-migrator/dashboard.go +++ b/cmd/chronograf-migrator/dashboard.go @@ -9,9 +9,9 @@ import ( "time" "github.com/influxdata/flux/ast" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/query/influxql" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/query/influxql" ) func convert1To2Cell(cell chronograf.DashboardCell) *influxdb.Cell { diff --git a/cmd/chronograf-migrator/main.go b/cmd/chronograf-migrator/main.go index 316458645a..4971b57ebf 100644 --- a/cmd/chronograf-migrator/main.go +++ b/cmd/chronograf-migrator/main.go @@ -10,9 +10,9 @@ import ( "os" "strings" - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/bolt" - "github.com/influxdata/influxdb/pkger" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/bolt" + "github.com/influxdata/influxdb/v2/pkger" ) var chronografDBPath string diff --git a/cmd/influx/authorization.go b/cmd/influx/authorization.go index 47cef98808..1707f7bba8 100644 --- a/cmd/influx/authorization.go +++ b/cmd/influx/authorization.go @@ -4,9 +4,9 @@ import ( "context" "io" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/cmd/influx/internal" - "github.com/influxdata/influxdb/http" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/cmd/influx/internal" + "github.com/influxdata/influxdb/v2/http" "github.com/spf13/cobra" ) diff --git a/cmd/influx/backup.go b/cmd/influx/backup.go index 74e7aac38d..b0c1e3bdd5 100644 --- a/cmd/influx/backup.go +++ b/cmd/influx/backup.go @@ -6,9 +6,9 @@ import ( "os" "path/filepath" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/bolt" - "github.com/influxdata/influxdb/http" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/bolt" + "github.com/influxdata/influxdb/v2/http" "github.com/spf13/cobra" "go.uber.org/multierr" ) diff --git a/cmd/influx/bucket.go b/cmd/influx/bucket.go index 3c1a926cab..10a6f37e88 100644 --- a/cmd/influx/bucket.go +++ b/cmd/influx/bucket.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/http" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/http" "github.com/spf13/cobra" ) diff --git a/cmd/influx/bucket_test.go b/cmd/influx/bucket_test.go index 68647a56e1..cc83998662 100644 --- a/cmd/influx/bucket_test.go +++ b/cmd/influx/bucket_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/mock" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" "github.com/spf13/cobra" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cmd/influx/config.go b/cmd/influx/config.go index 5aab5f30ae..4b6f281d05 100644 --- a/cmd/influx/config.go +++ b/cmd/influx/config.go @@ -1,7 +1,7 @@ package main import ( - "github.com/influxdata/influxdb/cmd/influx/config" + "github.com/influxdata/influxdb/v2/cmd/influx/config" "github.com/spf13/cobra" ) diff --git a/cmd/influx/config/config.go b/cmd/influx/config/config.go index 0c91052318..b5fba2b20c 100644 --- a/cmd/influx/config/config.go +++ b/cmd/influx/config/config.go @@ -9,7 +9,7 @@ import ( "os" "github.com/BurntSushi/toml" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) // Config store the crendentials of influxdb host and token. diff --git a/cmd/influx/config/config_test.go b/cmd/influx/config/config_test.go index 4271fdc84e..d72618b949 100644 --- a/cmd/influx/config/config_test.go +++ b/cmd/influx/config/config_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - influxtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + influxtesting "github.com/influxdata/influxdb/v2/testing" ) func TestWriteConfigs(t *testing.T) { diff --git a/cmd/influx/config_test.go b/cmd/influx/config_test.go index 99b4357672..b7bb398c5c 100644 --- a/cmd/influx/config_test.go +++ b/cmd/influx/config_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/cmd/influx/config" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/cmd/influx/config" "github.com/spf13/cobra" "github.com/stretchr/testify/require" ) diff --git a/cmd/influx/debug.go b/cmd/influx/debug.go index 0d566aa9f1..164dc037d6 100644 --- a/cmd/influx/debug.go +++ b/cmd/influx/debug.go @@ -6,9 +6,9 @@ import ( "os" "path/filepath" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/internal/fs" - "github.com/influxdata/influxdb/tsdb/tsm1" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/internal/fs" + "github.com/influxdata/influxdb/v2/tsdb/tsm1" "github.com/spf13/cobra" ) diff --git a/cmd/influx/delete.go b/cmd/influx/delete.go index 8a9ea2c9e5..2f3329d59f 100644 --- a/cmd/influx/delete.go +++ b/cmd/influx/delete.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/influxdata/influxdb/http" - "github.com/influxdata/influxdb/kit/signals" + "github.com/influxdata/influxdb/v2/http" + "github.com/influxdata/influxdb/v2/kit/signals" "github.com/spf13/cobra" ) diff --git a/cmd/influx/internal/errorfmt_test.go b/cmd/influx/internal/errorfmt_test.go index 8b3f71f8f8..d943ae695b 100644 --- a/cmd/influx/internal/errorfmt_test.go +++ b/cmd/influx/internal/errorfmt_test.go @@ -4,7 +4,7 @@ import ( "errors" "testing" - "github.com/influxdata/influxdb/cmd/influx/internal" + "github.com/influxdata/influxdb/v2/cmd/influx/internal" ) func TestErrorFmt(t *testing.T) { diff --git a/cmd/influx/internal/tabwriter.go b/cmd/influx/internal/tabwriter.go index 85272b9048..aeee4226ce 100644 --- a/cmd/influx/internal/tabwriter.go +++ b/cmd/influx/internal/tabwriter.go @@ -6,7 +6,7 @@ import ( "strings" "text/tabwriter" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) // TabWriter wraps tab writer headers logic. diff --git a/cmd/influx/main.go b/cmd/influx/main.go index bc237b0631..1015befa44 100644 --- a/cmd/influx/main.go +++ b/cmd/influx/main.go @@ -11,15 +11,15 @@ import ( "strings" "sync" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/bolt" - "github.com/influxdata/influxdb/cmd/influx/config" - "github.com/influxdata/influxdb/cmd/influx/internal" - "github.com/influxdata/influxdb/http" - "github.com/influxdata/influxdb/internal/fs" - "github.com/influxdata/influxdb/kit/cli" - "github.com/influxdata/influxdb/kv" - "github.com/influxdata/influxdb/pkg/httpc" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/bolt" + "github.com/influxdata/influxdb/v2/cmd/influx/config" + "github.com/influxdata/influxdb/v2/cmd/influx/internal" + "github.com/influxdata/influxdb/v2/http" + "github.com/influxdata/influxdb/v2/internal/fs" + "github.com/influxdata/influxdb/v2/kit/cli" + "github.com/influxdata/influxdb/v2/kv" + "github.com/influxdata/influxdb/v2/pkg/httpc" "github.com/spf13/cobra" "github.com/spf13/viper" "go.uber.org/zap" diff --git a/cmd/influx/main_test.go b/cmd/influx/main_test.go index 8972145c47..981ccd9d94 100644 --- a/cmd/influx/main_test.go +++ b/cmd/influx/main_test.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "testing" - "github.com/influxdata/influxdb/cmd/influx/config" + "github.com/influxdata/influxdb/v2/cmd/influx/config" "github.com/spf13/cobra" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cmd/influx/organization.go b/cmd/influx/organization.go index 41355632b6..f42388b369 100644 --- a/cmd/influx/organization.go +++ b/cmd/influx/organization.go @@ -5,9 +5,8 @@ import ( "fmt" "io" - "github.com/influxdata/influxdb/http" - - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/http" "github.com/spf13/cobra" ) diff --git a/cmd/influx/organization_test.go b/cmd/influx/organization_test.go index 1f225e0f73..60df35ec6a 100644 --- a/cmd/influx/organization_test.go +++ b/cmd/influx/organization_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/mock" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" "github.com/spf13/cobra" "github.com/stretchr/testify/require" ) diff --git a/cmd/influx/ping.go b/cmd/influx/ping.go index 24857e1e09..53fb5ed893 100644 --- a/cmd/influx/ping.go +++ b/cmd/influx/ping.go @@ -6,7 +6,7 @@ import ( "net/http" "time" - "github.com/influxdata/influxdb/kit/check" + "github.com/influxdata/influxdb/v2/kit/check" "github.com/spf13/cobra" ) diff --git a/cmd/influx/pkg.go b/cmd/influx/pkg.go index 094bc86708..b7fe2d0682 100644 --- a/cmd/influx/pkg.go +++ b/cmd/influx/pkg.go @@ -17,10 +17,10 @@ import ( "time" "github.com/fatih/color" - "github.com/influxdata/influxdb" - ihttp "github.com/influxdata/influxdb/http" - ierror "github.com/influxdata/influxdb/kit/errors" - "github.com/influxdata/influxdb/pkger" + "github.com/influxdata/influxdb/v2" + ihttp "github.com/influxdata/influxdb/v2/http" + ierror "github.com/influxdata/influxdb/v2/kit/errors" + "github.com/influxdata/influxdb/v2/pkger" "github.com/olekukonko/tablewriter" "github.com/spf13/cobra" input "github.com/tcnksm/go-input" diff --git a/cmd/influx/pkg_test.go b/cmd/influx/pkg_test.go index 4daa0aad6e..cd281f12b2 100644 --- a/cmd/influx/pkg_test.go +++ b/cmd/influx/pkg_test.go @@ -15,10 +15,9 @@ import ( "strings" "testing" - "github.com/influxdata/influxdb/mock" - - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/pkger" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" + "github.com/influxdata/influxdb/v2/pkger" "github.com/spf13/cobra" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cmd/influx/query.go b/cmd/influx/query.go index 4c045565ac..ad94177940 100644 --- a/cmd/influx/query.go +++ b/cmd/influx/query.go @@ -6,7 +6,7 @@ import ( "github.com/influxdata/flux" "github.com/influxdata/flux/repl" _ "github.com/influxdata/flux/stdlib" - _ "github.com/influxdata/influxdb/query/stdlib" + _ "github.com/influxdata/influxdb/v2/query/stdlib" "github.com/spf13/cobra" ) diff --git a/cmd/influx/repl.go b/cmd/influx/repl.go index 2f77fce7a6..2fec32a4b4 100644 --- a/cmd/influx/repl.go +++ b/cmd/influx/repl.go @@ -7,10 +7,10 @@ import ( "github.com/influxdata/flux" "github.com/influxdata/flux/repl" _ "github.com/influxdata/flux/stdlib" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/http" - "github.com/influxdata/influxdb/query" - _ "github.com/influxdata/influxdb/query/stdlib" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/http" + "github.com/influxdata/influxdb/v2/query" + _ "github.com/influxdata/influxdb/v2/query/stdlib" "github.com/spf13/cobra" ) diff --git a/cmd/influx/secret.go b/cmd/influx/secret.go index ad34335024..4749fcf249 100644 --- a/cmd/influx/secret.go +++ b/cmd/influx/secret.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/http" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/http" "github.com/spf13/cobra" input "github.com/tcnksm/go-input" ) diff --git a/cmd/influx/secret_test.go b/cmd/influx/secret_test.go index 5164868508..480e9bad14 100644 --- a/cmd/influx/secret_test.go +++ b/cmd/influx/secret_test.go @@ -7,8 +7,8 @@ import ( "io/ioutil" "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/mock" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" "github.com/spf13/cobra" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cmd/influx/setup.go b/cmd/influx/setup.go index 4da0075139..04e83ad2a7 100644 --- a/cmd/influx/setup.go +++ b/cmd/influx/setup.go @@ -9,10 +9,10 @@ import ( "strings" "time" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/cmd/influx/config" - "github.com/influxdata/influxdb/cmd/influx/internal" - "github.com/influxdata/influxdb/http" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/cmd/influx/config" + "github.com/influxdata/influxdb/v2/cmd/influx/internal" + "github.com/influxdata/influxdb/v2/http" "github.com/spf13/cobra" input "github.com/tcnksm/go-input" ) diff --git a/cmd/influx/task.go b/cmd/influx/task.go index be4eeb0c6a..a024aa2bfc 100644 --- a/cmd/influx/task.go +++ b/cmd/influx/task.go @@ -8,9 +8,9 @@ import ( "time" "github.com/influxdata/flux/repl" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/cmd/influx/internal" - "github.com/influxdata/influxdb/http" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/cmd/influx/internal" + "github.com/influxdata/influxdb/v2/http" "github.com/spf13/cobra" ) diff --git a/cmd/influx/transpile.go b/cmd/influx/transpile.go index e3bb581004..f3df859f73 100644 --- a/cmd/influx/transpile.go +++ b/cmd/influx/transpile.go @@ -6,9 +6,9 @@ import ( "time" "github.com/influxdata/flux/ast" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/errors" - "github.com/influxdata/influxdb/query/influxql" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/errors" + "github.com/influxdata/influxdb/v2/query/influxql" "github.com/spf13/cobra" ) diff --git a/cmd/influx/user.go b/cmd/influx/user.go index 376ca21078..eb59c12587 100644 --- a/cmd/influx/user.go +++ b/cmd/influx/user.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/http" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/http" "github.com/spf13/cobra" input "github.com/tcnksm/go-input" ) diff --git a/cmd/influx/user_test.go b/cmd/influx/user_test.go index 26ad926ece..87513c8eaf 100644 --- a/cmd/influx/user_test.go +++ b/cmd/influx/user_test.go @@ -8,9 +8,9 @@ import ( "reflect" "testing" - "github.com/influxdata/influxdb" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/mock" + "github.com/influxdata/influxdb/v2" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" "github.com/spf13/cobra" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cmd/influx/write.go b/cmd/influx/write.go index f487af4054..3db56b7a8a 100644 --- a/cmd/influx/write.go +++ b/cmd/influx/write.go @@ -7,11 +7,11 @@ import ( "os" "strings" - 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" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/http" + "github.com/influxdata/influxdb/v2/kit/signals" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/write" "github.com/spf13/cobra" ) diff --git a/cmd/influx_inspect/buildtsi/buildtsi.go b/cmd/influx_inspect/buildtsi/buildtsi.go index b3f90c653e..c14166b0c5 100644 --- a/cmd/influx_inspect/buildtsi/buildtsi.go +++ b/cmd/influx_inspect/buildtsi/buildtsi.go @@ -8,14 +8,14 @@ import ( "os" "path/filepath" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/pkg/fs" - "github.com/influxdata/influxdb/storage/wal" - "github.com/influxdata/influxdb/toml" - "github.com/influxdata/influxdb/tsdb" - "github.com/influxdata/influxdb/tsdb/seriesfile" - "github.com/influxdata/influxdb/tsdb/tsi1" - "github.com/influxdata/influxdb/tsdb/tsm1" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/pkg/fs" + "github.com/influxdata/influxdb/v2/storage/wal" + "github.com/influxdata/influxdb/v2/toml" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/seriesfile" + "github.com/influxdata/influxdb/v2/tsdb/tsi1" + "github.com/influxdata/influxdb/v2/tsdb/tsm1" "go.uber.org/zap" ) diff --git a/cmd/influxd/generate/command.go b/cmd/influxd/generate/command.go index 4bb639e7f6..267c72d833 100644 --- a/cmd/influxd/generate/command.go +++ b/cmd/influxd/generate/command.go @@ -6,11 +6,11 @@ import ( "os" "time" - "github.com/influxdata/influxdb/bolt" - "github.com/influxdata/influxdb/cmd/influxd/internal/profile" - "github.com/influxdata/influxdb/internal/fs" - "github.com/influxdata/influxdb/kv" - "github.com/influxdata/influxdb/pkg/data/gen" + "github.com/influxdata/influxdb/v2/bolt" + "github.com/influxdata/influxdb/v2/cmd/influxd/internal/profile" + "github.com/influxdata/influxdb/v2/internal/fs" + "github.com/influxdata/influxdb/v2/kv" + "github.com/influxdata/influxdb/v2/pkg/data/gen" "github.com/spf13/cobra" "go.uber.org/zap" ) diff --git a/cmd/influxd/generate/command_simple.go b/cmd/influxd/generate/command_simple.go index b6dbd41708..25f4b36130 100644 --- a/cmd/influxd/generate/command_simple.go +++ b/cmd/influxd/generate/command_simple.go @@ -5,7 +5,7 @@ import ( "strings" "text/template" - "github.com/influxdata/influxdb/pkg/data/gen" + "github.com/influxdata/influxdb/v2/pkg/data/gen" "github.com/spf13/cobra" ) diff --git a/cmd/influxd/generate/generator.go b/cmd/influxd/generate/generator.go index 213d84e8e0..60901eddf9 100644 --- a/cmd/influxd/generate/generator.go +++ b/cmd/influxd/generate/generator.go @@ -8,16 +8,16 @@ import ( "runtime" "sync" - "github.com/influxdata/influxdb/cmd/influxd/generate/internal/shard" - "github.com/influxdata/influxdb/kit/errors" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/pkg/data/gen" - "github.com/influxdata/influxdb/pkg/limiter" - "github.com/influxdata/influxdb/storage" - "github.com/influxdata/influxdb/tsdb" - "github.com/influxdata/influxdb/tsdb/seriesfile" - "github.com/influxdata/influxdb/tsdb/tsi1" - "github.com/influxdata/influxdb/tsdb/tsm1" + "github.com/influxdata/influxdb/v2/cmd/influxd/generate/internal/shard" + "github.com/influxdata/influxdb/v2/kit/errors" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/pkg/data/gen" + "github.com/influxdata/influxdb/v2/pkg/limiter" + "github.com/influxdata/influxdb/v2/storage" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/seriesfile" + "github.com/influxdata/influxdb/v2/tsdb/tsi1" + "github.com/influxdata/influxdb/v2/tsdb/tsm1" ) type Generator struct { diff --git a/cmd/influxd/generate/internal/shard/writer.go b/cmd/influxd/generate/internal/shard/writer.go index 8a579137fa..5cbced2db6 100644 --- a/cmd/influxd/generate/internal/shard/writer.go +++ b/cmd/influxd/generate/internal/shard/writer.go @@ -5,8 +5,8 @@ import ( "os" "path/filepath" - "github.com/influxdata/influxdb/pkg/data/gen" - "github.com/influxdata/influxdb/tsdb/tsm1" + "github.com/influxdata/influxdb/v2/pkg/data/gen" + "github.com/influxdata/influxdb/v2/tsdb/tsm1" ) const ( diff --git a/cmd/influxd/inspect/build_tsi.go b/cmd/influxd/inspect/build_tsi.go index 37066b2b6f..a230647ec6 100644 --- a/cmd/influxd/inspect/build_tsi.go +++ b/cmd/influxd/inspect/build_tsi.go @@ -10,12 +10,12 @@ import ( "runtime" "strings" - "github.com/influxdata/influxdb/cmd/influx_inspect/buildtsi" - "github.com/influxdata/influxdb/logger" - "github.com/influxdata/influxdb/storage" - "github.com/influxdata/influxdb/tsdb/seriesfile" - "github.com/influxdata/influxdb/tsdb/tsi1" - "github.com/influxdata/influxdb/tsdb/tsm1" + "github.com/influxdata/influxdb/v2/cmd/influx_inspect/buildtsi" + "github.com/influxdata/influxdb/v2/logger" + "github.com/influxdata/influxdb/v2/storage" + "github.com/influxdata/influxdb/v2/tsdb/seriesfile" + "github.com/influxdata/influxdb/v2/tsdb/tsi1" + "github.com/influxdata/influxdb/v2/tsdb/tsm1" "github.com/spf13/cobra" ) diff --git a/cmd/influxd/inspect/compact_series_file.go b/cmd/influxd/inspect/compact_series_file.go index 546ef4b5de..c5250f2e0e 100644 --- a/cmd/influxd/inspect/compact_series_file.go +++ b/cmd/influxd/inspect/compact_series_file.go @@ -10,9 +10,9 @@ import ( "strconv" "strings" - "github.com/influxdata/influxdb/internal/fs" - "github.com/influxdata/influxdb/storage" - "github.com/influxdata/influxdb/tsdb/seriesfile" + "github.com/influxdata/influxdb/v2/internal/fs" + "github.com/influxdata/influxdb/v2/storage" + "github.com/influxdata/influxdb/v2/tsdb/seriesfile" "github.com/spf13/cobra" "golang.org/x/sync/errgroup" ) diff --git a/cmd/influxd/inspect/dump_tsi1.go b/cmd/influxd/inspect/dump_tsi1.go index dea12421b4..ae5e266b83 100644 --- a/cmd/influxd/inspect/dump_tsi1.go +++ b/cmd/influxd/inspect/dump_tsi1.go @@ -7,8 +7,8 @@ import ( "path/filepath" "regexp" - "github.com/influxdata/influxdb/internal/fs" - "github.com/influxdata/influxdb/tsdb/tsi1" + "github.com/influxdata/influxdb/v2/internal/fs" + "github.com/influxdata/influxdb/v2/tsdb/tsi1" "github.com/spf13/cobra" "go.uber.org/zap" ) diff --git a/cmd/influxd/inspect/dump_wal.go b/cmd/influxd/inspect/dump_wal.go index b996fd6318..35fe9bf7cc 100644 --- a/cmd/influxd/inspect/dump_wal.go +++ b/cmd/influxd/inspect/dump_wal.go @@ -3,8 +3,8 @@ package inspect import ( "os" - "github.com/influxdata/influxdb/kit/errors" - "github.com/influxdata/influxdb/storage/wal" + "github.com/influxdata/influxdb/v2/kit/errors" + "github.com/influxdata/influxdb/v2/storage/wal" "github.com/spf13/cobra" ) diff --git a/cmd/influxd/inspect/export_blocks.go b/cmd/influxd/inspect/export_blocks.go index 0716417e5e..13963893ca 100644 --- a/cmd/influxd/inspect/export_blocks.go +++ b/cmd/influxd/inspect/export_blocks.go @@ -3,7 +3,7 @@ package inspect import ( "os" - "github.com/influxdata/influxdb/tsdb/tsm1" + "github.com/influxdata/influxdb/v2/tsdb/tsm1" "github.com/spf13/cobra" ) diff --git a/cmd/influxd/inspect/export_index.go b/cmd/influxd/inspect/export_index.go index c284670ac8..814d2c6c05 100644 --- a/cmd/influxd/inspect/export_index.go +++ b/cmd/influxd/inspect/export_index.go @@ -6,9 +6,9 @@ import ( "os" "path/filepath" - "github.com/influxdata/influxdb/internal/fs" - "github.com/influxdata/influxdb/tsdb/seriesfile" - "github.com/influxdata/influxdb/tsdb/tsi1" + "github.com/influxdata/influxdb/v2/internal/fs" + "github.com/influxdata/influxdb/v2/tsdb/seriesfile" + "github.com/influxdata/influxdb/v2/tsdb/tsi1" "github.com/spf13/cobra" ) diff --git a/cmd/influxd/inspect/report_tsi1.go b/cmd/influxd/inspect/report_tsi1.go index b2c98b978e..352bd2210e 100644 --- a/cmd/influxd/inspect/report_tsi1.go +++ b/cmd/influxd/inspect/report_tsi1.go @@ -5,8 +5,8 @@ import ( "io" "os" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/tsdb/tsi1" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/tsdb/tsi1" "github.com/spf13/cobra" ) diff --git a/cmd/influxd/inspect/report_tsm.go b/cmd/influxd/inspect/report_tsm.go index 21029a283e..9a6b24089e 100644 --- a/cmd/influxd/inspect/report_tsm.go +++ b/cmd/influxd/inspect/report_tsm.go @@ -2,10 +2,10 @@ package inspect import ( "fmt" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/internal/fs" - "github.com/influxdata/influxdb/kit/errors" - "github.com/influxdata/influxdb/tsdb/tsm1" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/internal/fs" + "github.com/influxdata/influxdb/v2/kit/errors" + "github.com/influxdata/influxdb/v2/tsdb/tsm1" "github.com/spf13/cobra" "os" "path/filepath" diff --git a/cmd/influxd/inspect/verify_series.go b/cmd/influxd/inspect/verify_series.go index 7cc582add8..d36353fc91 100644 --- a/cmd/influxd/inspect/verify_series.go +++ b/cmd/influxd/inspect/verify_series.go @@ -4,8 +4,8 @@ import ( "os" "runtime" - "github.com/influxdata/influxdb/logger" - "github.com/influxdata/influxdb/tsdb/seriesfile" + "github.com/influxdata/influxdb/v2/logger" + "github.com/influxdata/influxdb/v2/tsdb/seriesfile" "github.com/spf13/cobra" "go.uber.org/zap/zapcore" ) diff --git a/cmd/influxd/inspect/verify_tsm.go b/cmd/influxd/inspect/verify_tsm.go index 49fe287390..6791ed1de5 100644 --- a/cmd/influxd/inspect/verify_tsm.go +++ b/cmd/influxd/inspect/verify_tsm.go @@ -5,8 +5,8 @@ import ( "os" "path/filepath" - "github.com/influxdata/influxdb/kit/cli" - "github.com/influxdata/influxdb/tsdb/tsm1" + "github.com/influxdata/influxdb/v2/kit/cli" + "github.com/influxdata/influxdb/v2/tsdb/tsm1" "github.com/spf13/cobra" ) diff --git a/cmd/influxd/inspect/verify_wal.go b/cmd/influxd/inspect/verify_wal.go index be20328731..8dffe43a80 100644 --- a/cmd/influxd/inspect/verify_wal.go +++ b/cmd/influxd/inspect/verify_wal.go @@ -2,8 +2,8 @@ package inspect import ( "fmt" - "github.com/influxdata/influxdb/internal/fs" - "github.com/influxdata/influxdb/storage/wal" + "github.com/influxdata/influxdb/v2/internal/fs" + "github.com/influxdata/influxdb/v2/storage/wal" "github.com/spf13/cobra" "os" "path/filepath" diff --git a/cmd/influxd/internal/profile/profile.go b/cmd/influxd/internal/profile/profile.go index 8259485165..cfbd36a2e8 100644 --- a/cmd/influxd/internal/profile/profile.go +++ b/cmd/influxd/internal/profile/profile.go @@ -6,7 +6,7 @@ import ( "runtime" "runtime/pprof" - "github.com/influxdata/influxdb/pkg/fs" + "github.com/influxdata/influxdb/v2/pkg/fs" ) type Config struct { diff --git a/cmd/influxd/launcher/engine.go b/cmd/influxd/launcher/engine.go index 957c313165..d73fe3545a 100644 --- a/cmd/influxd/launcher/engine.go +++ b/cmd/influxd/launcher/engine.go @@ -7,13 +7,13 @@ import ( "os" "sync" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/http" - "github.com/influxdata/influxdb/kit/prom" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/storage" - "github.com/influxdata/influxdb/storage/reads" - "github.com/influxdata/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/http" + "github.com/influxdata/influxdb/v2/kit/prom" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/storage" + "github.com/influxdata/influxdb/v2/storage/reads" + "github.com/influxdata/influxdb/v2/tsdb/cursors" "github.com/influxdata/influxql" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" diff --git a/cmd/influxd/launcher/flusher.go b/cmd/influxd/launcher/flusher.go index e2ffbb94e9..890582626a 100644 --- a/cmd/influxd/launcher/flusher.go +++ b/cmd/influxd/launcher/flusher.go @@ -3,7 +3,7 @@ package launcher import ( "context" - "github.com/influxdata/influxdb/http" + "github.com/influxdata/influxdb/v2/http" ) type flushers []http.Flusher diff --git a/cmd/influxd/launcher/launcher.go b/cmd/influxd/launcher/launcher.go index b56edd1d57..7f6b05d413 100644 --- a/cmd/influxd/launcher/launcher.go +++ b/cmd/influxd/launcher/launcher.go @@ -15,45 +15,45 @@ import ( "time" "github.com/influxdata/flux" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/authorizer" - "github.com/influxdata/influxdb/bolt" - "github.com/influxdata/influxdb/chronograf/server" - "github.com/influxdata/influxdb/cmd/influxd/inspect" - "github.com/influxdata/influxdb/endpoints" - "github.com/influxdata/influxdb/gather" - "github.com/influxdata/influxdb/http" - "github.com/influxdata/influxdb/inmem" - "github.com/influxdata/influxdb/internal/fs" - "github.com/influxdata/influxdb/kit/cli" - "github.com/influxdata/influxdb/kit/prom" - "github.com/influxdata/influxdb/kit/signals" - "github.com/influxdata/influxdb/kit/tracing" - kithttp "github.com/influxdata/influxdb/kit/transport/http" - "github.com/influxdata/influxdb/kv" - influxlogger "github.com/influxdata/influxdb/logger" - "github.com/influxdata/influxdb/nats" - "github.com/influxdata/influxdb/pkger" - infprom "github.com/influxdata/influxdb/prometheus" - "github.com/influxdata/influxdb/query" - "github.com/influxdata/influxdb/query/control" - "github.com/influxdata/influxdb/query/stdlib/influxdata/influxdb" - "github.com/influxdata/influxdb/snowflake" - "github.com/influxdata/influxdb/source" - "github.com/influxdata/influxdb/storage" - storageflux "github.com/influxdata/influxdb/storage/flux" - "github.com/influxdata/influxdb/storage/readservice" - taskbackend "github.com/influxdata/influxdb/task/backend" - "github.com/influxdata/influxdb/task/backend/coordinator" - "github.com/influxdata/influxdb/task/backend/executor" - "github.com/influxdata/influxdb/task/backend/middleware" - "github.com/influxdata/influxdb/task/backend/scheduler" - "github.com/influxdata/influxdb/telemetry" - "github.com/influxdata/influxdb/tenant" - _ "github.com/influxdata/influxdb/tsdb/tsi1" // needed for tsi1 - _ "github.com/influxdata/influxdb/tsdb/tsm1" // needed for tsm1 - "github.com/influxdata/influxdb/vault" - pzap "github.com/influxdata/influxdb/zap" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/authorizer" + "github.com/influxdata/influxdb/v2/bolt" + "github.com/influxdata/influxdb/v2/chronograf/server" + "github.com/influxdata/influxdb/v2/cmd/influxd/inspect" + "github.com/influxdata/influxdb/v2/endpoints" + "github.com/influxdata/influxdb/v2/gather" + "github.com/influxdata/influxdb/v2/http" + "github.com/influxdata/influxdb/v2/inmem" + "github.com/influxdata/influxdb/v2/internal/fs" + "github.com/influxdata/influxdb/v2/kit/cli" + "github.com/influxdata/influxdb/v2/kit/prom" + "github.com/influxdata/influxdb/v2/kit/signals" + "github.com/influxdata/influxdb/v2/kit/tracing" + kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" + "github.com/influxdata/influxdb/v2/kv" + influxlogger "github.com/influxdata/influxdb/v2/logger" + "github.com/influxdata/influxdb/v2/nats" + "github.com/influxdata/influxdb/v2/pkger" + infprom "github.com/influxdata/influxdb/v2/prometheus" + "github.com/influxdata/influxdb/v2/query" + "github.com/influxdata/influxdb/v2/query/control" + "github.com/influxdata/influxdb/v2/query/stdlib/influxdata/influxdb" + "github.com/influxdata/influxdb/v2/snowflake" + "github.com/influxdata/influxdb/v2/source" + "github.com/influxdata/influxdb/v2/storage" + storageflux "github.com/influxdata/influxdb/v2/storage/flux" + "github.com/influxdata/influxdb/v2/storage/readservice" + taskbackend "github.com/influxdata/influxdb/v2/task/backend" + "github.com/influxdata/influxdb/v2/task/backend/coordinator" + "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/telemetry" + "github.com/influxdata/influxdb/v2/tenant" + _ "github.com/influxdata/influxdb/v2/tsdb/tsi1" // needed for tsi1 + _ "github.com/influxdata/influxdb/v2/tsdb/tsm1" // needed for tsm1 + "github.com/influxdata/influxdb/v2/vault" + pzap "github.com/influxdata/influxdb/v2/zap" "github.com/opentracing/opentracing-go" "github.com/prometheus/client_golang/prometheus" "github.com/spf13/cobra" diff --git a/cmd/influxd/launcher/launcher_helpers.go b/cmd/influxd/launcher/launcher_helpers.go index 153cca789b..e4c28acd84 100644 --- a/cmd/influxd/launcher/launcher_helpers.go +++ b/cmd/influxd/launcher/launcher_helpers.go @@ -16,14 +16,14 @@ import ( "github.com/influxdata/flux" "github.com/influxdata/flux/lang" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/bolt" - influxdbcontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/http" - "github.com/influxdata/influxdb/mock" - "github.com/influxdata/influxdb/pkg/httpc" - "github.com/influxdata/influxdb/pkger" - "github.com/influxdata/influxdb/query" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/bolt" + influxdbcontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/http" + "github.com/influxdata/influxdb/v2/mock" + "github.com/influxdata/influxdb/v2/pkg/httpc" + "github.com/influxdata/influxdb/v2/pkger" + "github.com/influxdata/influxdb/v2/query" ) // TestLauncher is a test wrapper for launcher.Launcher. diff --git a/cmd/influxd/launcher/launcher_test.go b/cmd/influxd/launcher/launcher_test.go index 618663eb4a..600d8ce7b9 100644 --- a/cmd/influxd/launcher/launcher_test.go +++ b/cmd/influxd/launcher/launcher_test.go @@ -7,10 +7,10 @@ import ( nethttp "net/http" "testing" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/cmd/influxd/launcher" - "github.com/influxdata/influxdb/http" - _ "github.com/influxdata/influxdb/query/builtin" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/cmd/influxd/launcher" + "github.com/influxdata/influxdb/v2/http" + _ "github.com/influxdata/influxdb/v2/query/builtin" ) // Default context. diff --git a/cmd/influxd/launcher/pkger_test.go b/cmd/influxd/launcher/pkger_test.go index 76f1a2e456..81e124fe8a 100644 --- a/cmd/influxd/launcher/pkger_test.go +++ b/cmd/influxd/launcher/pkger_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/mock" - "github.com/influxdata/influxdb/notification" - "github.com/influxdata/influxdb/notification/check" - "github.com/influxdata/influxdb/pkger" + "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/pkger" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/zap" diff --git a/cmd/influxd/launcher/query_test.go b/cmd/influxd/launcher/query_test.go index 03d6ce0f1f..02844176af 100644 --- a/cmd/influxd/launcher/query_test.go +++ b/cmd/influxd/launcher/query_test.go @@ -19,11 +19,11 @@ import ( "github.com/influxdata/flux/execute/executetest" "github.com/influxdata/flux/lang" "github.com/influxdata/flux/values" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/cmd/influxd/launcher" - phttp "github.com/influxdata/influxdb/http" - "github.com/influxdata/influxdb/kit/prom" - "github.com/influxdata/influxdb/query" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/cmd/influxd/launcher" + phttp "github.com/influxdata/influxdb/v2/http" + "github.com/influxdata/influxdb/v2/kit/prom" + "github.com/influxdata/influxdb/v2/query" ) func TestLauncher_Write_Query_FieldKey(t *testing.T) { diff --git a/cmd/influxd/launcher/storage_test.go b/cmd/influxd/launcher/storage_test.go index 99f741a18a..1cc48b8319 100644 --- a/cmd/influxd/launcher/storage_test.go +++ b/cmd/influxd/launcher/storage_test.go @@ -9,11 +9,11 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/cmd/influxd/launcher" - "github.com/influxdata/influxdb/http" - "github.com/influxdata/influxdb/toml" - "github.com/influxdata/influxdb/tsdb/tsm1" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/cmd/influxd/launcher" + "github.com/influxdata/influxdb/v2/http" + "github.com/influxdata/influxdb/v2/toml" + "github.com/influxdata/influxdb/v2/tsdb/tsm1" ) func TestStorage_WriteAndQuery(t *testing.T) { diff --git a/cmd/influxd/launcher/tasks_test.go b/cmd/influxd/launcher/tasks_test.go index 1da50702b8..1a80fe7d34 100644 --- a/cmd/influxd/launcher/tasks_test.go +++ b/cmd/influxd/launcher/tasks_test.go @@ -12,9 +12,9 @@ import ( "github.com/google/go-cmp/cmp" "github.com/influxdata/flux" "github.com/influxdata/flux/execute/executetest" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/cmd/influxd/launcher" - pctx "github.com/influxdata/influxdb/context" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/cmd/influxd/launcher" + pctx "github.com/influxdata/influxdb/v2/context" ) func TestLauncher_Task(t *testing.T) { diff --git a/cmd/influxd/launcher/tenant_test.go b/cmd/influxd/launcher/tenant_test.go index 64bbca8461..b92724318c 100644 --- a/cmd/influxd/launcher/tenant_test.go +++ b/cmd/influxd/launcher/tenant_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/cmd/influxd/launcher" - icontext "github.com/influxdata/influxdb/context" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/cmd/influxd/launcher" + icontext "github.com/influxdata/influxdb/v2/context" ) func testTenant(t *testing.T, args ...string) { diff --git a/cmd/influxd/main.go b/cmd/influxd/main.go index d53af80158..baebdcb2a3 100644 --- a/cmd/influxd/main.go +++ b/cmd/influxd/main.go @@ -8,15 +8,15 @@ import ( "time" "github.com/influxdata/flux" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/cmd/influxd/generate" - "github.com/influxdata/influxdb/cmd/influxd/inspect" - "github.com/influxdata/influxdb/cmd/influxd/launcher" - "github.com/influxdata/influxdb/cmd/influxd/migrate" - "github.com/influxdata/influxdb/cmd/influxd/restore" - _ "github.com/influxdata/influxdb/query/builtin" - _ "github.com/influxdata/influxdb/tsdb/tsi1" - _ "github.com/influxdata/influxdb/tsdb/tsm1" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/cmd/influxd/generate" + "github.com/influxdata/influxdb/v2/cmd/influxd/inspect" + "github.com/influxdata/influxdb/v2/cmd/influxd/launcher" + "github.com/influxdata/influxdb/v2/cmd/influxd/migrate" + "github.com/influxdata/influxdb/v2/cmd/influxd/restore" + _ "github.com/influxdata/influxdb/v2/query/builtin" + _ "github.com/influxdata/influxdb/v2/tsdb/tsi1" + _ "github.com/influxdata/influxdb/v2/tsdb/tsm1" "github.com/spf13/cobra" "github.com/spf13/viper" ) diff --git a/cmd/influxd/migrate/command.go b/cmd/influxd/migrate/command.go index 47a762125a..a52a884208 100644 --- a/cmd/influxd/migrate/command.go +++ b/cmd/influxd/migrate/command.go @@ -9,11 +9,11 @@ import ( "path/filepath" "time" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/internal/fs" - "github.com/influxdata/influxdb/kit/cli" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/tsdb/migrate" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/internal/fs" + "github.com/influxdata/influxdb/v2/kit/cli" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/tsdb/migrate" "github.com/spf13/cobra" ) diff --git a/cmd/influxd/restore/command.go b/cmd/influxd/restore/command.go index fb9385e020..1a87e8de9a 100644 --- a/cmd/influxd/restore/command.go +++ b/cmd/influxd/restore/command.go @@ -7,12 +7,12 @@ import ( "path/filepath" "strings" - "github.com/influxdata/influxdb/bolt" - "github.com/influxdata/influxdb/cmd/influxd/inspect" - "github.com/influxdata/influxdb/http" - "github.com/influxdata/influxdb/internal/fs" - "github.com/influxdata/influxdb/kit/cli" - "github.com/influxdata/influxdb/storage" + "github.com/influxdata/influxdb/v2/bolt" + "github.com/influxdata/influxdb/v2/cmd/influxd/inspect" + "github.com/influxdata/influxdb/v2/http" + "github.com/influxdata/influxdb/v2/internal/fs" + "github.com/influxdata/influxdb/v2/kit/cli" + "github.com/influxdata/influxdb/v2/storage" "github.com/spf13/cobra" ) diff --git a/cmd/telemetryd/main.go b/cmd/telemetryd/main.go index f4df5a4dd3..219653a573 100644 --- a/cmd/telemetryd/main.go +++ b/cmd/telemetryd/main.go @@ -6,10 +6,10 @@ import ( "os" "time" - "github.com/influxdata/influxdb/kit/cli" - influxlogger "github.com/influxdata/influxdb/logger" - "github.com/influxdata/influxdb/prometheus" - "github.com/influxdata/influxdb/telemetry" + "github.com/influxdata/influxdb/v2/kit/cli" + influxlogger "github.com/influxdata/influxdb/v2/logger" + "github.com/influxdata/influxdb/v2/prometheus" + "github.com/influxdata/influxdb/v2/telemetry" "go.uber.org/zap" ) diff --git a/context/token.go b/context/token.go index 07cbbd8dfc..00f265712c 100644 --- a/context/token.go +++ b/context/token.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) type contextKey string diff --git a/context/token_test.go b/context/token_test.go index 20d35c653e..f61b5621e2 100644 --- a/context/token_test.go +++ b/context/token_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/influxdata/influxdb" - icontext "github.com/influxdata/influxdb/context" + "github.com/influxdata/influxdb/v2" + icontext "github.com/influxdata/influxdb/v2/context" ) func TestGetAuthorizer(t *testing.T) { diff --git a/dashboard_test.go b/dashboard_test.go index 7744ad4bac..60496b703a 100644 --- a/dashboard_test.go +++ b/dashboard_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - platform "github.com/influxdata/influxdb" - platformtesting "github.com/influxdata/influxdb/testing" + platform "github.com/influxdata/influxdb/v2" + platformtesting "github.com/influxdata/influxdb/v2/testing" ) func TestView_MarshalJSON(t *testing.T) { diff --git a/dbrp_mapping_test.go b/dbrp_mapping_test.go index 811b37ec07..ccf19db3ed 100644 --- a/dbrp_mapping_test.go +++ b/dbrp_mapping_test.go @@ -3,8 +3,8 @@ package influxdb_test import ( "testing" - platform "github.com/influxdata/influxdb" - platformtesting "github.com/influxdata/influxdb/testing" + platform "github.com/influxdata/influxdb/v2" + platformtesting "github.com/influxdata/influxdb/v2/testing" ) func TestDBRPMapping_Validate(t *testing.T) { diff --git a/endpoints/service.go b/endpoints/service.go index 327e66ee1a..e22d49df07 100644 --- a/endpoints/service.go +++ b/endpoints/service.go @@ -3,7 +3,7 @@ package endpoints import ( "context" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) // Service provides all the notification endpoint service behavior. diff --git a/errors_test.go b/errors_test.go index 0e336496a9..d30e3015e2 100644 --- a/errors_test.go +++ b/errors_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) const EFailedToGetStorageHost = "failed to get the storage host" diff --git a/flux/client.go b/flux/client.go index 07ad9a463b..d374ec484c 100644 --- a/flux/client.go +++ b/flux/client.go @@ -9,7 +9,7 @@ import ( "net/url" "time" - "github.com/influxdata/influxdb/chronograf" + "github.com/influxdata/influxdb/v2/chronograf" ) // Shared transports for all clients to prevent leaking connections. diff --git a/gather/handler.go b/gather/handler.go index 5bac7d460c..3bc5765860 100644 --- a/gather/handler.go +++ b/gather/handler.go @@ -5,8 +5,8 @@ import ( "context" "encoding/json" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/nats" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/nats" "go.uber.org/zap" ) diff --git a/gather/metrics.go b/gather/metrics.go index 8e9744958b..6ce4007290 100644 --- a/gather/metrics.go +++ b/gather/metrics.go @@ -6,8 +6,8 @@ import ( "time" "github.com/gogo/protobuf/proto" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/models" ) // MetricsCollection is the struct including metrics and other requirements. diff --git a/gather/prometheus.go b/gather/prometheus.go index a68f2c733b..d33f267704 100644 --- a/gather/prometheus.go +++ b/gather/prometheus.go @@ -9,7 +9,7 @@ import ( "net/http" "time" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" "github.com/matttproud/golang_protobuf_extensions/pbutil" dto "github.com/prometheus/client_model/go" "github.com/prometheus/common/expfmt" diff --git a/gather/recorder.go b/gather/recorder.go index f54c6b15b5..d4211806cc 100644 --- a/gather/recorder.go +++ b/gather/recorder.go @@ -4,9 +4,9 @@ import ( "context" "encoding/json" - "github.com/influxdata/influxdb/nats" - "github.com/influxdata/influxdb/storage" - "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/v2/nats" + "github.com/influxdata/influxdb/v2/storage" + "github.com/influxdata/influxdb/v2/tsdb" "go.uber.org/zap" ) diff --git a/gather/scheduler.go b/gather/scheduler.go index 4ce47df53c..6685bbe0f8 100644 --- a/gather/scheduler.go +++ b/gather/scheduler.go @@ -7,9 +7,9 @@ import ( "fmt" "time" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/tracing" - "github.com/influxdata/influxdb/nats" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/tracing" + "github.com/influxdata/influxdb/v2/nats" "go.uber.org/zap" ) diff --git a/gather/scheduler_test.go b/gather/scheduler_test.go index 1ec209d1c4..339495554b 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/influxdb" - influxlogger "github.com/influxdata/influxdb/logger" - "github.com/influxdata/influxdb/mock" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + influxlogger "github.com/influxdata/influxdb/v2/logger" + "github.com/influxdata/influxdb/v2/mock" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" ) func TestScheduler(t *testing.T) { diff --git a/gather/scraper.go b/gather/scraper.go index f1bfc23d1c..1d90008e9c 100644 --- a/gather/scraper.go +++ b/gather/scraper.go @@ -3,7 +3,7 @@ package gather import ( "context" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) // Scraper gathers metrics from a scraper target. diff --git a/gather/scraper_test.go b/gather/scraper_test.go index f6da7542cc..10c21633d4 100644 --- a/gather/scraper_test.go +++ b/gather/scraper_test.go @@ -10,7 +10,7 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) var ( diff --git a/go.mod b/go.mod index 9d02275bf3..6c39b71f55 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/influxdata/influxdb +module github.com/influxdata/influxdb/v2 go 1.13 diff --git a/http/api_handler.go b/http/api_handler.go index cf9123ad31..e955af1aab 100644 --- a/http/api_handler.go +++ b/http/api_handler.go @@ -4,14 +4,14 @@ import ( "net/http" "github.com/go-chi/chi" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/authorizer" - "github.com/influxdata/influxdb/chronograf/server" - "github.com/influxdata/influxdb/http/metric" - "github.com/influxdata/influxdb/kit/prom" - kithttp "github.com/influxdata/influxdb/kit/transport/http" - "github.com/influxdata/influxdb/query" - "github.com/influxdata/influxdb/storage" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/authorizer" + "github.com/influxdata/influxdb/v2/chronograf/server" + "github.com/influxdata/influxdb/v2/http/metric" + "github.com/influxdata/influxdb/v2/kit/prom" + kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" + "github.com/influxdata/influxdb/v2/query" + "github.com/influxdata/influxdb/v2/storage" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" ) diff --git a/http/api_handler_test.go b/http/api_handler_test.go index d227b09426..40157d37c7 100644 --- a/http/api_handler_test.go +++ b/http/api_handler_test.go @@ -6,7 +6,7 @@ import ( "net/http/httptest" "testing" - kithttp "github.com/influxdata/influxdb/kit/transport/http" + kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" "go.uber.org/zap/zaptest" ) diff --git a/http/assets.go b/http/assets.go index d475be837b..60a20c9a68 100644 --- a/http/assets.go +++ b/http/assets.go @@ -5,8 +5,8 @@ import ( "path/filepath" // TODO: use platform version of the code - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/dist" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/dist" ) const ( diff --git a/http/auth_service.go b/http/auth_service.go index 7d5756e65f..432f19fe53 100644 --- a/http/auth_service.go +++ b/http/auth_service.go @@ -9,9 +9,9 @@ import ( "time" "github.com/influxdata/httprouter" - platform "github.com/influxdata/influxdb" - platcontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/pkg/httpc" + platform "github.com/influxdata/influxdb/v2" + platcontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/pkg/httpc" "go.uber.org/zap" ) diff --git a/http/auth_test.go b/http/auth_test.go index f0a8a522ee..5ec531ffff 100644 --- a/http/auth_test.go +++ b/http/auth_test.go @@ -11,13 +11,13 @@ import ( "testing" "github.com/influxdata/httprouter" - platform "github.com/influxdata/influxdb" - pcontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/inmem" - kithttp "github.com/influxdata/influxdb/kit/transport/http" - "github.com/influxdata/influxdb/kv" - "github.com/influxdata/influxdb/mock" - platformtesting "github.com/influxdata/influxdb/testing" + platform "github.com/influxdata/influxdb/v2" + pcontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/inmem" + kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" + "github.com/influxdata/influxdb/v2/kv" + "github.com/influxdata/influxdb/v2/mock" + platformtesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/http/authentication_middleware.go b/http/authentication_middleware.go index 1088bd7a74..0571f18713 100644 --- a/http/authentication_middleware.go +++ b/http/authentication_middleware.go @@ -8,9 +8,9 @@ import ( "time" "github.com/influxdata/httprouter" - platform "github.com/influxdata/influxdb" - platcontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/jsonweb" + platform "github.com/influxdata/influxdb/v2" + platcontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/jsonweb" "go.uber.org/zap" ) diff --git a/http/authentication_test.go b/http/authentication_test.go index c71183d1e4..8381798e1f 100644 --- a/http/authentication_test.go +++ b/http/authentication_test.go @@ -9,12 +9,12 @@ import ( "testing" "time" - influxdb "github.com/influxdata/influxdb" - platform "github.com/influxdata/influxdb" - platformhttp "github.com/influxdata/influxdb/http" - "github.com/influxdata/influxdb/jsonweb" - kithttp "github.com/influxdata/influxdb/kit/transport/http" - "github.com/influxdata/influxdb/mock" + influxdb "github.com/influxdata/influxdb/v2" + platform "github.com/influxdata/influxdb/v2" + platformhttp "github.com/influxdata/influxdb/v2/http" + "github.com/influxdata/influxdb/v2/jsonweb" + kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" + "github.com/influxdata/influxdb/v2/mock" "go.uber.org/zap/zaptest" ) diff --git a/http/backup_service.go b/http/backup_service.go index 349027aaad..4cfca49b1d 100644 --- a/http/backup_service.go +++ b/http/backup_service.go @@ -14,10 +14,10 @@ import ( "time" "github.com/influxdata/httprouter" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/bolt" - "github.com/influxdata/influxdb/internal/fs" - "github.com/influxdata/influxdb/kit/tracing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/bolt" + "github.com/influxdata/influxdb/v2/internal/fs" + "github.com/influxdata/influxdb/v2/kit/tracing" "go.uber.org/multierr" "go.uber.org/zap" ) diff --git a/http/bucket_service.go b/http/bucket_service.go index 9f45449816..d48db3dd2f 100644 --- a/http/bucket_service.go +++ b/http/bucket_service.go @@ -9,10 +9,10 @@ import ( "time" "github.com/influxdata/httprouter" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/tracing" - kithttp "github.com/influxdata/influxdb/kit/transport/http" - "github.com/influxdata/influxdb/pkg/httpc" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/tracing" + kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" + "github.com/influxdata/influxdb/v2/pkg/httpc" "go.uber.org/zap" ) diff --git a/http/bucket_service_test.go b/http/bucket_service_test.go index 931ef149f2..e12842ae30 100644 --- a/http/bucket_service_test.go +++ b/http/bucket_service_test.go @@ -12,14 +12,14 @@ import ( "time" "github.com/influxdata/httprouter" - "github.com/influxdata/influxdb" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/inmem" - kithttp "github.com/influxdata/influxdb/kit/transport/http" - "github.com/influxdata/influxdb/kv" - "github.com/influxdata/influxdb/mock" - "github.com/influxdata/influxdb/pkg/httpc" - platformtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/inmem" + kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" + "github.com/influxdata/influxdb/v2/kv" + "github.com/influxdata/influxdb/v2/mock" + "github.com/influxdata/influxdb/v2/pkg/httpc" + platformtesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap" "go.uber.org/zap/zaptest" ) diff --git a/http/check_service.go b/http/check_service.go index ce86bab390..2f439f0341 100644 --- a/http/check_service.go +++ b/http/check_service.go @@ -9,13 +9,12 @@ import ( "path" "time" - "github.com/influxdata/influxdb/kit/tracing" - "github.com/influxdata/httprouter" - "github.com/influxdata/influxdb" - pctx "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/notification/check" - "github.com/influxdata/influxdb/pkg/httpc" + "github.com/influxdata/influxdb/v2" + pctx "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/kit/tracing" + "github.com/influxdata/influxdb/v2/notification/check" + "github.com/influxdata/influxdb/v2/pkg/httpc" "go.uber.org/zap" ) diff --git a/http/check_test.go b/http/check_test.go index bc20951906..95f283344c 100644 --- a/http/check_test.go +++ b/http/check_test.go @@ -13,14 +13,14 @@ import ( "github.com/influxdata/flux/parser" "github.com/influxdata/httprouter" - "github.com/influxdata/influxdb" - pcontext "github.com/influxdata/influxdb/context" - kithttp "github.com/influxdata/influxdb/kit/transport/http" - "github.com/influxdata/influxdb/mock" - "github.com/influxdata/influxdb/notification" - "github.com/influxdata/influxdb/notification/check" - "github.com/influxdata/influxdb/pkg/testttp" - influxTesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + pcontext "github.com/influxdata/influxdb/v2/context" + 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" + influxTesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/http/chronograf_handler.go b/http/chronograf_handler.go index 39a9ab9ef8..e66a676d8d 100644 --- a/http/chronograf_handler.go +++ b/http/chronograf_handler.go @@ -2,8 +2,8 @@ package http import ( "github.com/influxdata/httprouter" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/chronograf/server" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/chronograf/server" ) const prefixChronograf = "/chronograf" diff --git a/http/client.go b/http/client.go index 7df39d4a68..dd8355b7b3 100644 --- a/http/client.go +++ b/http/client.go @@ -7,8 +7,8 @@ import ( "net/url" "time" - "github.com/influxdata/influxdb/kit/tracing" - "github.com/influxdata/influxdb/pkg/httpc" + "github.com/influxdata/influxdb/v2/kit/tracing" + "github.com/influxdata/influxdb/v2/pkg/httpc" ) // NewHTTPClient creates a new httpc.Client type. This call sets all diff --git a/http/dashboard_service.go b/http/dashboard_service.go index b4906e8b69..cd44dd5d21 100644 --- a/http/dashboard_service.go +++ b/http/dashboard_service.go @@ -8,8 +8,8 @@ import ( "path" "github.com/influxdata/httprouter" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/pkg/httpc" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/pkg/httpc" "go.uber.org/zap" ) diff --git a/http/dashboard_test.go b/http/dashboard_test.go index e86aade084..54a94aa974 100644 --- a/http/dashboard_test.go +++ b/http/dashboard_test.go @@ -13,12 +13,12 @@ import ( "github.com/google/go-cmp/cmp" "github.com/influxdata/httprouter" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/inmem" - kithttp "github.com/influxdata/influxdb/kit/transport/http" - "github.com/influxdata/influxdb/kv" - "github.com/influxdata/influxdb/mock" - platformtesting "github.com/influxdata/influxdb/testing" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/inmem" + kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" + "github.com/influxdata/influxdb/v2/kv" + "github.com/influxdata/influxdb/v2/mock" + platformtesting "github.com/influxdata/influxdb/v2/testing" "github.com/yudai/gojsondiff" "github.com/yudai/gojsondiff/formatter" "go.uber.org/zap/zaptest" diff --git a/http/delete_handler.go b/http/delete_handler.go index 1b3d85519f..e3778e001f 100644 --- a/http/delete_handler.go +++ b/http/delete_handler.go @@ -9,10 +9,10 @@ import ( "time" "github.com/influxdata/httprouter" - "github.com/influxdata/influxdb" - pcontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/kit/tracing" - "github.com/influxdata/influxdb/predicate" + "github.com/influxdata/influxdb/v2" + pcontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/kit/tracing" + "github.com/influxdata/influxdb/v2/predicate" "go.uber.org/zap" ) diff --git a/http/delete_test.go b/http/delete_test.go index b958ca7685..ef070f3fe9 100644 --- a/http/delete_test.go +++ b/http/delete_test.go @@ -8,11 +8,11 @@ import ( "net/http/httptest" "testing" - "github.com/influxdata/influxdb" - pcontext "github.com/influxdata/influxdb/context" - kithttp "github.com/influxdata/influxdb/kit/transport/http" - "github.com/influxdata/influxdb/mock" - influxtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + pcontext "github.com/influxdata/influxdb/v2/context" + kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" + "github.com/influxdata/influxdb/v2/mock" + influxtesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/http/document_service.go b/http/document_service.go index 2365da4f16..6384ce7102 100644 --- a/http/document_service.go +++ b/http/document_service.go @@ -8,9 +8,9 @@ import ( "path" "github.com/influxdata/httprouter" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/tracing" - "github.com/influxdata/influxdb/pkg/httpc" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/tracing" + "github.com/influxdata/influxdb/v2/pkg/httpc" "go.uber.org/zap" ) diff --git a/http/document_service_test.go b/http/document_service_test.go index a7a77d3f1b..6193c0e185 100644 --- a/http/document_service_test.go +++ b/http/document_service_test.go @@ -7,15 +7,15 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/authorizer" - icontext "github.com/influxdata/influxdb/context" - httpmock "github.com/influxdata/influxdb/http/mock" - "github.com/influxdata/influxdb/inmem" - "github.com/influxdata/influxdb/kit/transport/http" - "github.com/influxdata/influxdb/kv" - "github.com/influxdata/influxdb/mock" - itesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/authorizer" + icontext "github.com/influxdata/influxdb/v2/context" + httpmock "github.com/influxdata/influxdb/v2/http/mock" + "github.com/influxdata/influxdb/v2/inmem" + "github.com/influxdata/influxdb/v2/kit/transport/http" + "github.com/influxdata/influxdb/v2/kv" + "github.com/influxdata/influxdb/v2/mock" + itesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/http/document_test.go b/http/document_test.go index 51ce150419..c0f9cef3c9 100644 --- a/http/document_test.go +++ b/http/document_test.go @@ -11,11 +11,11 @@ import ( "time" "github.com/influxdata/httprouter" - "github.com/influxdata/influxdb" - pcontext "github.com/influxdata/influxdb/context" - kithttp "github.com/influxdata/influxdb/kit/transport/http" - "github.com/influxdata/influxdb/mock" - influxtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + pcontext "github.com/influxdata/influxdb/v2/context" + kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" + "github.com/influxdata/influxdb/v2/mock" + influxtesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/http/duration.go b/http/duration.go index 5b2189a5e0..d04171e419 100644 --- a/http/duration.go +++ b/http/duration.go @@ -5,7 +5,7 @@ import ( "strconv" "time" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) // ErrInvalidDuration is returned when parsing a malformatted duration. diff --git a/http/errors.go b/http/errors.go index e6a399614e..77261cb624 100644 --- a/http/errors.go +++ b/http/errors.go @@ -11,7 +11,7 @@ import ( "net/http" "strings" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" "github.com/pkg/errors" ) diff --git a/http/errors_test.go b/http/errors_test.go index 0351d01add..8f41d0001e 100644 --- a/http/errors_test.go +++ b/http/errors_test.go @@ -9,9 +9,9 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/http" - kithttp "github.com/influxdata/influxdb/kit/transport/http" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/http" + kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" "github.com/pkg/errors" ) diff --git a/http/handler.go b/http/handler.go index e58b55a1d7..bec0ba70a1 100644 --- a/http/handler.go +++ b/http/handler.go @@ -7,8 +7,8 @@ import ( _ "net/http/pprof" // used for debug pprof at the default path. "github.com/go-chi/chi" - "github.com/influxdata/influxdb/kit/prom" - kithttp "github.com/influxdata/influxdb/kit/transport/http" + "github.com/influxdata/influxdb/v2/kit/prom" + kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" ) diff --git a/http/handler_test.go b/http/handler_test.go index 76f0a448c9..6df8f7bc91 100644 --- a/http/handler_test.go +++ b/http/handler_test.go @@ -6,8 +6,8 @@ import ( _ "net/http/pprof" "testing" - "github.com/influxdata/influxdb/kit/prom" - "github.com/influxdata/influxdb/kit/prom/promtest" + "github.com/influxdata/influxdb/v2/kit/prom" + "github.com/influxdata/influxdb/v2/kit/prom/promtest" "go.uber.org/zap" "go.uber.org/zap/zaptest" ) diff --git a/http/helpers.go b/http/helpers.go index c991769bb4..324f1380b5 100644 --- a/http/helpers.go +++ b/http/helpers.go @@ -5,7 +5,7 @@ import ( "net/url" "github.com/influxdata/httprouter" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) // TODO remove this file once bucket and org service are moved to the tenant service diff --git a/http/influxdb/bucket.go b/http/influxdb/bucket.go index f295363183..5e63c59cdf 100644 --- a/http/influxdb/bucket.go +++ b/http/influxdb/bucket.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/tracing" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/tracing" ) // BucketService connects to Influx via HTTP using tokens to manage buckets diff --git a/http/influxdb/client.go b/http/influxdb/client.go index 260026845d..ff31b299ec 100644 --- a/http/influxdb/client.go +++ b/http/influxdb/client.go @@ -5,10 +5,10 @@ import ( "net/http" "net/url" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/chronograf" - "github.com/influxdata/influxdb/chronograf/influx" - "github.com/influxdata/influxdb/kit/tracing" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/chronograf" + "github.com/influxdata/influxdb/v2/chronograf/influx" + "github.com/influxdata/influxdb/v2/kit/tracing" ) // 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 dbc61fa4ef..7290a784ee 100644 --- a/http/influxdb/source_proxy_query_service.go +++ b/http/influxdb/source_proxy_query_service.go @@ -12,12 +12,12 @@ import ( "github.com/influxdata/flux/csv" "github.com/influxdata/flux/lang" "github.com/influxdata/flux/repl" - platform "github.com/influxdata/influxdb" - platformhttp "github.com/influxdata/influxdb/http" - "github.com/influxdata/influxdb/kit/check" - "github.com/influxdata/influxdb/kit/tracing" - "github.com/influxdata/influxdb/query" - "github.com/influxdata/influxdb/query/influxql" + platform "github.com/influxdata/influxdb/v2" + platformhttp "github.com/influxdata/influxdb/v2/http" + "github.com/influxdata/influxdb/v2/kit/check" + "github.com/influxdata/influxdb/v2/kit/tracing" + "github.com/influxdata/influxdb/v2/query" + "github.com/influxdata/influxdb/v2/query/influxql" ) type SourceProxyQueryService struct { diff --git a/http/label_service.go b/http/label_service.go index 2d3fb381a7..1f35f712aa 100644 --- a/http/label_service.go +++ b/http/label_service.go @@ -9,8 +9,8 @@ import ( "path" "github.com/influxdata/httprouter" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/pkg/httpc" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/pkg/httpc" "go.uber.org/zap" ) diff --git a/http/label_test.go b/http/label_test.go index b9964231d6..0f6e2e6579 100644 --- a/http/label_test.go +++ b/http/label_test.go @@ -11,12 +11,12 @@ import ( "testing" "github.com/influxdata/httprouter" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/inmem" - kithttp "github.com/influxdata/influxdb/kit/transport/http" - "github.com/influxdata/influxdb/kv" - "github.com/influxdata/influxdb/mock" - platformtesting "github.com/influxdata/influxdb/testing" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/inmem" + kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" + "github.com/influxdata/influxdb/v2/kv" + "github.com/influxdata/influxdb/v2/mock" + platformtesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/http/metric/recorder.go b/http/metric/recorder.go index 4e35191ad5..39f4fedf0e 100644 --- a/http/metric/recorder.go +++ b/http/metric/recorder.go @@ -3,7 +3,7 @@ package metric import ( "context" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) // EventRecorder records meta-data associated with http requests. diff --git a/http/middleware.go b/http/middleware.go index 2a093bc29c..dc57eaae79 100644 --- a/http/middleware.go +++ b/http/middleware.go @@ -9,7 +9,7 @@ import ( "strings" "time" - kithttp "github.com/influxdata/influxdb/kit/transport/http" + kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" "go.uber.org/zap" ) diff --git a/http/middleware_test.go b/http/middleware_test.go index 7701d7a9b0..2d1bf5d773 100644 --- a/http/middleware_test.go +++ b/http/middleware_test.go @@ -12,7 +12,7 @@ import ( "strings" "testing" - "github.com/influxdata/influxdb/logger" + "github.com/influxdata/influxdb/v2/logger" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) diff --git a/http/mock/middleware.go b/http/mock/middleware.go index 71d59b5256..769f95c2cc 100644 --- a/http/mock/middleware.go +++ b/http/mock/middleware.go @@ -3,8 +3,8 @@ package mock import ( "net/http" - "github.com/influxdata/influxdb" - platcontext "github.com/influxdata/influxdb/context" + "github.com/influxdata/influxdb/v2" + platcontext "github.com/influxdata/influxdb/v2/context" ) // NewAuthMiddlewareHandler create a mocked middleware handler. diff --git a/http/notification_endpoint.go b/http/notification_endpoint.go index 0ab8a4e865..7435f7d4c3 100644 --- a/http/notification_endpoint.go +++ b/http/notification_endpoint.go @@ -9,10 +9,10 @@ import ( "net/http" "github.com/influxdata/httprouter" - "github.com/influxdata/influxdb" - pctx "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/notification/endpoint" - "github.com/influxdata/influxdb/pkg/httpc" + "github.com/influxdata/influxdb/v2" + pctx "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/notification/endpoint" + "github.com/influxdata/influxdb/v2/pkg/httpc" "go.uber.org/zap" ) diff --git a/http/notification_endpoint_test.go b/http/notification_endpoint_test.go index ea802b70ad..4f13b10db9 100644 --- a/http/notification_endpoint_test.go +++ b/http/notification_endpoint_test.go @@ -12,16 +12,16 @@ import ( "testing" "github.com/influxdata/httprouter" - "github.com/influxdata/influxdb" - pcontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/inmem" - kithttp "github.com/influxdata/influxdb/kit/transport/http" - "github.com/influxdata/influxdb/kv" - "github.com/influxdata/influxdb/mock" - "github.com/influxdata/influxdb/notification/endpoint" - "github.com/influxdata/influxdb/pkg/testttp" - influxTesting "github.com/influxdata/influxdb/testing" - platformtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + pcontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/inmem" + kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" + "github.com/influxdata/influxdb/v2/kv" + "github.com/influxdata/influxdb/v2/mock" + "github.com/influxdata/influxdb/v2/notification/endpoint" + "github.com/influxdata/influxdb/v2/pkg/testttp" + influxTesting "github.com/influxdata/influxdb/v2/testing" + platformtesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/http/notification_rule.go b/http/notification_rule.go index 85f69071ec..02f135e9ad 100644 --- a/http/notification_rule.go +++ b/http/notification_rule.go @@ -10,10 +10,10 @@ import ( "time" "github.com/influxdata/httprouter" - "github.com/influxdata/influxdb" - pctx "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/notification/rule" - "github.com/influxdata/influxdb/pkg/httpc" + "github.com/influxdata/influxdb/v2" + pctx "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/notification/rule" + "github.com/influxdata/influxdb/v2/pkg/httpc" "go.uber.org/zap" ) diff --git a/http/notification_rule_test.go b/http/notification_rule_test.go index 305ef207ce..6a28950394 100644 --- a/http/notification_rule_test.go +++ b/http/notification_rule_test.go @@ -5,11 +5,11 @@ import ( "encoding/json" "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/mock" - "github.com/influxdata/influxdb/notification" - "github.com/influxdata/influxdb/notification/rule" - influxTesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" + "github.com/influxdata/influxdb/v2/notification" + "github.com/influxdata/influxdb/v2/notification/rule" + influxTesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/http/onboarding.go b/http/onboarding.go index c9ed4315e3..ce39be6d81 100644 --- a/http/onboarding.go +++ b/http/onboarding.go @@ -8,7 +8,7 @@ import ( "net/http" "github.com/influxdata/httprouter" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" "go.uber.org/zap" ) diff --git a/http/onboarding_test.go b/http/onboarding_test.go index c3cf708dc2..a889e54eaf 100644 --- a/http/onboarding_test.go +++ b/http/onboarding_test.go @@ -5,12 +5,12 @@ import ( "net/http/httptest" "testing" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/inmem" - kithttp "github.com/influxdata/influxdb/kit/transport/http" - "github.com/influxdata/influxdb/kv" - "github.com/influxdata/influxdb/mock" - platformtesting "github.com/influxdata/influxdb/testing" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/inmem" + kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" + "github.com/influxdata/influxdb/v2/kv" + "github.com/influxdata/influxdb/v2/mock" + platformtesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/http/org_service.go b/http/org_service.go index e8fefdcde9..ef32f00e50 100644 --- a/http/org_service.go +++ b/http/org_service.go @@ -8,10 +8,10 @@ import ( "strings" "github.com/influxdata/httprouter" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/tracing" - kithttp "github.com/influxdata/influxdb/kit/transport/http" - "github.com/influxdata/influxdb/pkg/httpc" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/tracing" + kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" + "github.com/influxdata/influxdb/v2/pkg/httpc" "go.uber.org/zap" ) diff --git a/http/org_service_test.go b/http/org_service_test.go index de9ec9cb9a..4f74c5bfd6 100644 --- a/http/org_service_test.go +++ b/http/org_service_test.go @@ -10,12 +10,12 @@ import ( "net/http/httptest" "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/inmem" - kithttp "github.com/influxdata/influxdb/kit/transport/http" - "github.com/influxdata/influxdb/kv" - "github.com/influxdata/influxdb/mock" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/inmem" + kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" + "github.com/influxdata/influxdb/v2/kv" + "github.com/influxdata/influxdb/v2/mock" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/http/paging.go b/http/paging.go index 4edf58252d..d0e0072ba2 100644 --- a/http/paging.go +++ b/http/paging.go @@ -6,7 +6,7 @@ import ( "net/url" "strconv" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) // decodeFindOptions returns a FindOptions decoded from http request. diff --git a/http/paging_test.go b/http/paging_test.go index 361b35c9b2..f27d373369 100644 --- a/http/paging_test.go +++ b/http/paging_test.go @@ -4,8 +4,8 @@ import ( "net/http/httptest" "testing" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/mock" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" ) func TestPaging_decodeFindOptions(t *testing.T) { diff --git a/http/platform_handler.go b/http/platform_handler.go index 9c4ee1968a..77773104bd 100644 --- a/http/platform_handler.go +++ b/http/platform_handler.go @@ -4,7 +4,7 @@ import ( "net/http" "strings" - kithttp "github.com/influxdata/influxdb/kit/transport/http" + kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" ) // PlatformHandler is a collection of all the service handlers. diff --git a/http/query.go b/http/query.go index d4ab3e4505..bfce7742d1 100644 --- a/http/query.go +++ b/http/query.go @@ -20,10 +20,10 @@ import ( "github.com/influxdata/flux/lang" "github.com/influxdata/flux/parser" "github.com/influxdata/flux/repl" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/jsonweb" - "github.com/influxdata/influxdb/query" - transpiler "github.com/influxdata/influxdb/query/influxql" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/jsonweb" + "github.com/influxdata/influxdb/v2/query" + transpiler "github.com/influxdata/influxdb/v2/query/influxql" "github.com/influxdata/influxql" ) diff --git a/http/query_handler.go b/http/query_handler.go index 9ed6471aa1..0d1fd5a0b5 100644 --- a/http/query_handler.go +++ b/http/query_handler.go @@ -20,15 +20,15 @@ import ( "github.com/influxdata/flux/iocounter" "github.com/influxdata/flux/parser" "github.com/influxdata/httprouter" - "github.com/influxdata/influxdb" - pcontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/http/metric" - "github.com/influxdata/influxdb/kit/check" - "github.com/influxdata/influxdb/kit/tracing" - kithttp "github.com/influxdata/influxdb/kit/transport/http" - "github.com/influxdata/influxdb/logger" - "github.com/influxdata/influxdb/query" - "github.com/influxdata/influxdb/query/influxql" + "github.com/influxdata/influxdb/v2" + pcontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/http/metric" + "github.com/influxdata/influxdb/v2/kit/check" + "github.com/influxdata/influxdb/v2/kit/tracing" + kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" + "github.com/influxdata/influxdb/v2/logger" + "github.com/influxdata/influxdb/v2/query" + "github.com/influxdata/influxdb/v2/query/influxql" "github.com/pkg/errors" prom "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 f838f3e326..5d9c15b5c9 100644 --- a/http/query_handler_test.go +++ b/http/query_handler_test.go @@ -19,16 +19,16 @@ import ( "github.com/influxdata/flux" "github.com/influxdata/flux/csv" "github.com/influxdata/flux/lang" - "github.com/influxdata/influxdb" - platform "github.com/influxdata/influxdb" - icontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/http/metric" - "github.com/influxdata/influxdb/kit/check" - tracetesting "github.com/influxdata/influxdb/kit/tracing/testing" - kithttp "github.com/influxdata/influxdb/kit/transport/http" - influxmock "github.com/influxdata/influxdb/mock" - "github.com/influxdata/influxdb/query" - "github.com/influxdata/influxdb/query/mock" + "github.com/influxdata/influxdb/v2" + platform "github.com/influxdata/influxdb/v2" + icontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/http/metric" + "github.com/influxdata/influxdb/v2/kit/check" + tracetesting "github.com/influxdata/influxdb/v2/kit/tracing/testing" + kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" + influxmock "github.com/influxdata/influxdb/v2/mock" + "github.com/influxdata/influxdb/v2/query" + "github.com/influxdata/influxdb/v2/query/mock" "go.uber.org/zap/zaptest" ) diff --git a/http/query_test.go b/http/query_test.go index 714e4ae842..ecbb5cd62f 100644 --- a/http/query_test.go +++ b/http/query_test.go @@ -17,10 +17,10 @@ import ( "github.com/influxdata/flux/csv" "github.com/influxdata/flux/lang" "github.com/influxdata/flux/repl" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/mock" - "github.com/influxdata/influxdb/query" - _ "github.com/influxdata/influxdb/query/builtin" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" + "github.com/influxdata/influxdb/v2/query" + _ "github.com/influxdata/influxdb/v2/query/builtin" ) var cmpOptions = cmp.Options{ diff --git a/http/ready.go b/http/ready.go index 12bf03c7f5..c0f98ced57 100644 --- a/http/ready.go +++ b/http/ready.go @@ -6,7 +6,7 @@ import ( "net/http" "time" - "github.com/influxdata/influxdb/toml" + "github.com/influxdata/influxdb/v2/toml" ) // ReadyHandler is a default readiness handler. The default behaviour is always ready. diff --git a/http/requests.go b/http/requests.go index b70bef77d5..3e9804bf33 100644 --- a/http/requests.go +++ b/http/requests.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) const ( diff --git a/http/requests_test.go b/http/requests_test.go index 2856c3798e..89223d46ee 100644 --- a/http/requests_test.go +++ b/http/requests_test.go @@ -7,8 +7,8 @@ import ( "reflect" "testing" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/mock" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" ) func Test_queryOrganization(t *testing.T) { diff --git a/http/router.go b/http/router.go index eae1aef9d9..4898ce1ff5 100644 --- a/http/router.go +++ b/http/router.go @@ -10,9 +10,9 @@ import ( "github.com/go-chi/chi" "github.com/go-chi/chi/middleware" "github.com/influxdata/httprouter" - platform "github.com/influxdata/influxdb" - kithttp "github.com/influxdata/influxdb/kit/transport/http" - influxlogger "github.com/influxdata/influxdb/logger" + platform "github.com/influxdata/influxdb/v2" + kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" + influxlogger "github.com/influxdata/influxdb/v2/logger" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) diff --git a/http/router_test.go b/http/router_test.go index b73777c967..ed559fbf5d 100644 --- a/http/router_test.go +++ b/http/router_test.go @@ -7,7 +7,7 @@ import ( "net/http/httptest" "testing" - kithttp "github.com/influxdata/influxdb/kit/transport/http" + kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" "go.uber.org/zap/zaptest" ) diff --git a/http/scraper_service.go b/http/scraper_service.go index cbfbda364c..403a31f192 100644 --- a/http/scraper_service.go +++ b/http/scraper_service.go @@ -9,8 +9,8 @@ import ( "path" "github.com/influxdata/httprouter" - "github.com/influxdata/influxdb" - pctx "github.com/influxdata/influxdb/context" + "github.com/influxdata/influxdb/v2" + pctx "github.com/influxdata/influxdb/v2/context" "go.uber.org/zap" ) diff --git a/http/scraper_service_test.go b/http/scraper_service_test.go index 2b28da95e6..8a8edc6ce6 100644 --- a/http/scraper_service_test.go +++ b/http/scraper_service_test.go @@ -11,12 +11,12 @@ import ( "testing" "github.com/influxdata/httprouter" - "github.com/influxdata/influxdb" - platcontext "github.com/influxdata/influxdb/context" - httpMock "github.com/influxdata/influxdb/http/mock" - kithttp "github.com/influxdata/influxdb/kit/transport/http" - "github.com/influxdata/influxdb/mock" - platformtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + platcontext "github.com/influxdata/influxdb/v2/context" + httpMock "github.com/influxdata/influxdb/v2/http/mock" + kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" + "github.com/influxdata/influxdb/v2/mock" + platformtesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/http/server.go b/http/server.go index 6614c44e07..82c6aa11bf 100644 --- a/http/server.go +++ b/http/server.go @@ -10,7 +10,7 @@ import ( "syscall" "time" - "github.com/influxdata/influxdb/logger" + "github.com/influxdata/influxdb/v2/logger" "go.uber.org/zap" ) diff --git a/http/session_handler.go b/http/session_handler.go index c969d564e7..db78512275 100644 --- a/http/session_handler.go +++ b/http/session_handler.go @@ -5,7 +5,7 @@ import ( "net/http" "github.com/influxdata/httprouter" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" "go.uber.org/zap" ) diff --git a/http/session_test.go b/http/session_test.go index 13c4de95fe..33ba6d4b1a 100644 --- a/http/session_test.go +++ b/http/session_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/mock" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" "go.uber.org/zap/zaptest" ) diff --git a/http/source_proxy_service.go b/http/source_proxy_service.go index f0a6e14788..5d65d4392b 100644 --- a/http/source_proxy_service.go +++ b/http/source_proxy_service.go @@ -12,11 +12,11 @@ import ( "github.com/influxdata/flux" "github.com/influxdata/flux/lang" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/check" - "github.com/influxdata/influxdb/kit/tracing" - "github.com/influxdata/influxdb/query" - "github.com/influxdata/influxdb/query/influxql" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/check" + "github.com/influxdata/influxdb/v2/kit/tracing" + "github.com/influxdata/influxdb/v2/query" + "github.com/influxdata/influxdb/v2/query/influxql" ) type SourceProxyQueryService struct { diff --git a/http/source_service.go b/http/source_service.go index dd0ef331d8..268edb7d52 100644 --- a/http/source_service.go +++ b/http/source_service.go @@ -11,10 +11,10 @@ import ( "github.com/influxdata/flux/lang" "github.com/influxdata/flux/repl" "github.com/influxdata/httprouter" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/pkg/httpc" - "github.com/influxdata/influxdb/query" - "github.com/influxdata/influxdb/query/influxql" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/pkg/httpc" + "github.com/influxdata/influxdb/v2/query" + "github.com/influxdata/influxdb/v2/query/influxql" "go.uber.org/zap" ) diff --git a/http/source_service_test.go b/http/source_service_test.go index 4a2bb2bcb3..906db83c77 100644 --- a/http/source_service_test.go +++ b/http/source_service_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) func Test_newSourceResponse(t *testing.T) { diff --git a/http/swagger.go b/http/swagger.go index e2185e6a1f..e45126081a 100644 --- a/http/swagger.go +++ b/http/swagger.go @@ -8,7 +8,7 @@ import ( "sync" "github.com/ghodss/yaml" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" "go.uber.org/zap" ) diff --git a/http/task_service.go b/http/task_service.go index 16b8420ca9..35f81f8d53 100644 --- a/http/task_service.go +++ b/http/task_service.go @@ -12,11 +12,11 @@ import ( "time" "github.com/influxdata/httprouter" - "github.com/influxdata/influxdb" - pcontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/kit/tracing" - "github.com/influxdata/influxdb/kv" - "github.com/influxdata/influxdb/pkg/httpc" + "github.com/influxdata/influxdb/v2" + pcontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/kit/tracing" + "github.com/influxdata/influxdb/v2/kv" + "github.com/influxdata/influxdb/v2/pkg/httpc" "go.uber.org/zap" ) diff --git a/http/task_service_test.go b/http/task_service_test.go index 5a19fbc2fd..3583e113a2 100644 --- a/http/task_service_test.go +++ b/http/task_service_test.go @@ -14,13 +14,12 @@ import ( "time" "github.com/influxdata/httprouter" - "github.com/influxdata/influxdb" - pcontext "github.com/influxdata/influxdb/context" - - kithttp "github.com/influxdata/influxdb/kit/transport/http" - "github.com/influxdata/influxdb/mock" - _ "github.com/influxdata/influxdb/query/builtin" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + pcontext "github.com/influxdata/influxdb/v2/context" + kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" + "github.com/influxdata/influxdb/v2/mock" + _ "github.com/influxdata/influxdb/v2/query/builtin" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap" "go.uber.org/zap/zaptest" ) diff --git a/http/telegraf.go b/http/telegraf.go index fe92bd0862..f1b42d2215 100644 --- a/http/telegraf.go +++ b/http/telegraf.go @@ -9,11 +9,11 @@ import ( "github.com/golang/gddo/httputil" "github.com/influxdata/httprouter" - "github.com/influxdata/influxdb" - platform "github.com/influxdata/influxdb" - pctx "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/pkg/httpc" - "github.com/influxdata/influxdb/telegraf/plugins" + "github.com/influxdata/influxdb/v2" + platform "github.com/influxdata/influxdb/v2" + pctx "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/pkg/httpc" + "github.com/influxdata/influxdb/v2/telegraf/plugins" "go.uber.org/zap" ) diff --git a/http/telegraf_test.go b/http/telegraf_test.go index cff0ab0608..8358d4ea47 100644 --- a/http/telegraf_test.go +++ b/http/telegraf_test.go @@ -10,8 +10,8 @@ import ( "strings" "testing" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/mock" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" "go.uber.org/zap/zaptest" ) diff --git a/http/usage_service.go b/http/usage_service.go index b9334bc2bf..c8fec2f789 100644 --- a/http/usage_service.go +++ b/http/usage_service.go @@ -7,7 +7,7 @@ import ( "time" "github.com/influxdata/httprouter" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" "go.uber.org/zap" ) diff --git a/http/user_resource_mapping_service.go b/http/user_resource_mapping_service.go index b0914f50f1..03d92bff6c 100644 --- a/http/user_resource_mapping_service.go +++ b/http/user_resource_mapping_service.go @@ -8,8 +8,8 @@ import ( "path" "github.com/influxdata/httprouter" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/pkg/httpc" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/pkg/httpc" "go.uber.org/zap" ) diff --git a/http/user_resource_mapping_test.go b/http/user_resource_mapping_test.go index cda2016532..f45bfabb9c 100644 --- a/http/user_resource_mapping_test.go +++ b/http/user_resource_mapping_test.go @@ -11,8 +11,8 @@ import ( "testing" "github.com/influxdata/httprouter" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/mock" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" "go.uber.org/zap/zaptest" ) diff --git a/http/user_service.go b/http/user_service.go index c56c364d83..e20aea55b0 100644 --- a/http/user_service.go +++ b/http/user_service.go @@ -7,9 +7,9 @@ import ( "net/http" "github.com/influxdata/httprouter" - "github.com/influxdata/influxdb" - icontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/pkg/httpc" + "github.com/influxdata/influxdb/v2" + icontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/pkg/httpc" "go.uber.org/zap" ) diff --git a/http/user_test.go b/http/user_test.go index 6939746059..4149e2f05d 100644 --- a/http/user_test.go +++ b/http/user_test.go @@ -8,11 +8,11 @@ import ( "path" "testing" - platform "github.com/influxdata/influxdb" - kithttp "github.com/influxdata/influxdb/kit/transport/http" - "github.com/influxdata/influxdb/mock" - "github.com/influxdata/influxdb/pkg/testttp" - platformtesting "github.com/influxdata/influxdb/testing" + platform "github.com/influxdata/influxdb/v2" + kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" + "github.com/influxdata/influxdb/v2/mock" + "github.com/influxdata/influxdb/v2/pkg/testttp" + platformtesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/http/variable_service.go b/http/variable_service.go index 93c1cf6b64..2187e1e9ae 100644 --- a/http/variable_service.go +++ b/http/variable_service.go @@ -7,8 +7,8 @@ import ( "net/http" "github.com/influxdata/httprouter" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/pkg/httpc" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/pkg/httpc" "go.uber.org/zap" ) diff --git a/http/variable_test.go b/http/variable_test.go index 4321e66de1..cfe258ebaa 100644 --- a/http/variable_test.go +++ b/http/variable_test.go @@ -12,10 +12,10 @@ import ( "time" "github.com/influxdata/httprouter" - platform "github.com/influxdata/influxdb" - kithttp "github.com/influxdata/influxdb/kit/transport/http" - "github.com/influxdata/influxdb/mock" - platformtesting "github.com/influxdata/influxdb/testing" + platform "github.com/influxdata/influxdb/v2" + kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" + "github.com/influxdata/influxdb/v2/mock" + platformtesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/http/write_handler.go b/http/write_handler.go index c725ecd5f2..be86b14e47 100644 --- a/http/write_handler.go +++ b/http/write_handler.go @@ -10,14 +10,14 @@ import ( "net/http" "github.com/influxdata/httprouter" - "github.com/influxdata/influxdb" - pcontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/http/metric" - "github.com/influxdata/influxdb/kit/tracing" - kithttp "github.com/influxdata/influxdb/kit/transport/http" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/storage" - "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/v2" + pcontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/http/metric" + "github.com/influxdata/influxdb/v2/kit/tracing" + kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/storage" + "github.com/influxdata/influxdb/v2/tsdb" "go.uber.org/zap" ) diff --git a/http/write_handler_test.go b/http/write_handler_test.go index 52849c0e96..f9bf6517a3 100644 --- a/http/write_handler_test.go +++ b/http/write_handler_test.go @@ -11,12 +11,12 @@ import ( "strings" "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/http/metric" - httpmock "github.com/influxdata/influxdb/http/mock" - kithttp "github.com/influxdata/influxdb/kit/transport/http" - "github.com/influxdata/influxdb/mock" - influxtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/http/metric" + httpmock "github.com/influxdata/influxdb/v2/http/mock" + kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" + "github.com/influxdata/influxdb/v2/mock" + influxtesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/id_test.go b/id_test.go index 30743e9aae..5c7746857e 100644 --- a/id_test.go +++ b/id_test.go @@ -7,8 +7,8 @@ import ( "reflect" "testing" - "github.com/influxdata/influxdb" - platformtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + platformtesting "github.com/influxdata/influxdb/v2/testing" ) func TestIDFromString(t *testing.T) { diff --git a/inmem/dbrp_mapping_service.go b/inmem/dbrp_mapping_service.go index 48097ff407..f21a1c2143 100644 --- a/inmem/dbrp_mapping_service.go +++ b/inmem/dbrp_mapping_service.go @@ -5,7 +5,7 @@ import ( "fmt" "path" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) var ( diff --git a/inmem/dbrp_mapping_test.go b/inmem/dbrp_mapping_test.go index cfa5d27d0a..e9449661a7 100644 --- a/inmem/dbrp_mapping_test.go +++ b/inmem/dbrp_mapping_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - platform "github.com/influxdata/influxdb" - platformtesting "github.com/influxdata/influxdb/testing" + platform "github.com/influxdata/influxdb/v2" + platformtesting "github.com/influxdata/influxdb/v2/testing" ) func initDBRPMappingService(f platformtesting.DBRPMappingFields, t *testing.T) (platform.DBRPMappingService, func()) { diff --git a/inmem/kv.go b/inmem/kv.go index f400b439e2..6d6d09ee2c 100644 --- a/inmem/kv.go +++ b/inmem/kv.go @@ -8,7 +8,7 @@ import ( "sync" "github.com/google/btree" - "github.com/influxdata/influxdb/kv" + "github.com/influxdata/influxdb/v2/kv" ) // ensure *KVStore implement kv.Store interface diff --git a/inmem/kv_test.go b/inmem/kv_test.go index 8aaa35bf9e..b86ea64079 100644 --- a/inmem/kv_test.go +++ b/inmem/kv_test.go @@ -10,9 +10,9 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb/inmem" - "github.com/influxdata/influxdb/kv" - platformtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2/inmem" + "github.com/influxdata/influxdb/v2/kv" + platformtesting "github.com/influxdata/influxdb/v2/testing" ) func initKVStore(f platformtesting.KVStoreFields, t *testing.T) (kv.Store, func()) { diff --git a/inmem/service.go b/inmem/service.go index 5b2b6e8860..c025c4b105 100644 --- a/inmem/service.go +++ b/inmem/service.go @@ -4,9 +4,9 @@ import ( "context" "sync" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/rand" - "github.com/influxdata/influxdb/snowflake" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/rand" + "github.com/influxdata/influxdb/v2/snowflake" ) // OpPrefix is the op prefix. diff --git a/inmem/source.go b/inmem/source.go index ac41d2cd72..aa65da9bf0 100644 --- a/inmem/source.go +++ b/inmem/source.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) // DefaultSource is the default source. diff --git a/jsonweb/token.go b/jsonweb/token.go index 69307f657a..8b676d9404 100644 --- a/jsonweb/token.go +++ b/jsonweb/token.go @@ -4,7 +4,7 @@ import ( "errors" "github.com/dgrijalva/jwt-go" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) const kind = "jwt" diff --git a/jsonweb/token_test.go b/jsonweb/token_test.go index ae0d1f7784..cda65f8c62 100644 --- a/jsonweb/token_test.go +++ b/jsonweb/token_test.go @@ -6,7 +6,7 @@ import ( "github.com/dgrijalva/jwt-go" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) var ( diff --git a/kit/cli/idflag.go b/kit/cli/idflag.go index ab7b851f77..ae99ca55ad 100644 --- a/kit/cli/idflag.go +++ b/kit/cli/idflag.go @@ -1,8 +1,8 @@ package cli import ( - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/tsdb" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/kit/grpc/errors.go b/kit/grpc/errors.go index b3b167800c..a783097152 100644 --- a/kit/grpc/errors.go +++ b/kit/grpc/errors.go @@ -4,7 +4,7 @@ import ( "encoding/json" "errors" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" "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 a9f1b2c996..9d8e67516c 100644 --- a/kit/grpc/errors_test.go +++ b/kit/grpc/errors_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/kit/metric/client.go b/kit/metric/client.go index 42c472c077..dd49de7a29 100644 --- a/kit/metric/client.go +++ b/kit/metric/client.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/prom" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/prom" "github.com/prometheus/client_golang/prometheus" ) diff --git a/kit/prom/example_test.go b/kit/prom/example_test.go index 51a6d77a13..44657a4ef4 100644 --- a/kit/prom/example_test.go +++ b/kit/prom/example_test.go @@ -7,7 +7,7 @@ import ( "net/http" "time" - "github.com/influxdata/influxdb/kit/prom" + "github.com/influxdata/influxdb/v2/kit/prom" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" ) diff --git a/kit/prom/promtest/promtest_test.go b/kit/prom/promtest/promtest_test.go index 7954fa410a..760471758f 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/influxdb/kit/prom" - "github.com/influxdata/influxdb/kit/prom/promtest" + "github.com/influxdata/influxdb/v2/kit/prom" + "github.com/influxdata/influxdb/v2/kit/prom/promtest" "github.com/prometheus/client_golang/prometheus" dto "github.com/prometheus/client_model/go" "go.uber.org/zap/zaptest" diff --git a/kit/prom/registry_test.go b/kit/prom/registry_test.go index b53d810f96..a2ee75de91 100644 --- a/kit/prom/registry_test.go +++ b/kit/prom/registry_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/influxdata/influxdb/kit/prom" + "github.com/influxdata/influxdb/v2/kit/prom" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" diff --git a/kit/transport/http/api.go b/kit/transport/http/api.go index 66db5da01f..0ff2dbdacd 100644 --- a/kit/transport/http/api.go +++ b/kit/transport/http/api.go @@ -8,7 +8,7 @@ import ( "io" "net/http" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" "go.uber.org/zap" ) diff --git a/kit/transport/http/api_test.go b/kit/transport/http/api_test.go index 3d5cad8a4c..9e6fd7aca2 100644 --- a/kit/transport/http/api_test.go +++ b/kit/transport/http/api_test.go @@ -10,9 +10,9 @@ import ( "strings" "testing" - "github.com/influxdata/influxdb" - kithttp "github.com/influxdata/influxdb/kit/transport/http" - "github.com/influxdata/influxdb/pkg/testttp" + "github.com/influxdata/influxdb/v2" + kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" + "github.com/influxdata/influxdb/v2/pkg/testttp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/kit/transport/http/error_handler.go b/kit/transport/http/error_handler.go index 6e6d7d24bf..52767835c0 100644 --- a/kit/transport/http/error_handler.go +++ b/kit/transport/http/error_handler.go @@ -5,7 +5,7 @@ import ( "encoding/json" "net/http" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) // ErrorHandler is the error handler in http package. diff --git a/kit/transport/http/error_handler_test.go b/kit/transport/http/error_handler_test.go index 57a4ec6af3..2c152620ce 100644 --- a/kit/transport/http/error_handler_test.go +++ b/kit/transport/http/error_handler_test.go @@ -6,9 +6,9 @@ import ( "net/http/httptest" "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/http" - kithttp "github.com/influxdata/influxdb/kit/transport/http" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/http" + kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" ) func TestEncodeError(t *testing.T) { diff --git a/kit/transport/http/middleware.go b/kit/transport/http/middleware.go index f7580930e0..3ba0fbfc68 100644 --- a/kit/transport/http/middleware.go +++ b/kit/transport/http/middleware.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/tracing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/tracing" ua "github.com/mileusna/useragent" "github.com/prometheus/client_golang/prometheus" ) diff --git a/kit/transport/http/middleware_test.go b/kit/transport/http/middleware_test.go index 808d6effff..e5a0c3f7e6 100644 --- a/kit/transport/http/middleware_test.go +++ b/kit/transport/http/middleware_test.go @@ -5,8 +5,8 @@ import ( "path" "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/pkg/testttp" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/pkg/testttp" "github.com/stretchr/testify/assert" ) diff --git a/kv/auth.go b/kv/auth.go index 8f22ecc1c2..2f948316ae 100644 --- a/kv/auth.go +++ b/kv/auth.go @@ -6,8 +6,8 @@ import ( "fmt" "github.com/buger/jsonparser" - influxdb "github.com/influxdata/influxdb" - jsonp "github.com/influxdata/influxdb/pkg/jsonparser" + influxdb "github.com/influxdata/influxdb/v2" + jsonp "github.com/influxdata/influxdb/v2/pkg/jsonparser" ) var ( diff --git a/kv/auth_private_test.go b/kv/auth_private_test.go index da8e1e4515..856b8e9b4a 100644 --- a/kv/auth_private_test.go +++ b/kv/auth_private_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) func mustMarshal(t testing.TB, v interface{}) []byte { diff --git a/kv/auth_test.go b/kv/auth_test.go index 4087a07d24..3a401b63cb 100644 --- a/kv/auth_test.go +++ b/kv/auth_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kv" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kv" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/kv/bucket.go b/kv/bucket.go index 4617b13875..b7ea5b7316 100644 --- a/kv/bucket.go +++ b/kv/bucket.go @@ -6,10 +6,10 @@ import ( "fmt" "time" - "github.com/influxdata/influxdb" - icontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/kit/tracing" - "github.com/influxdata/influxdb/resource" + "github.com/influxdata/influxdb/v2" + icontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/kit/tracing" + "github.com/influxdata/influxdb/v2/resource" ) var ( diff --git a/kv/bucket_test.go b/kv/bucket_test.go index af5e34175b..2e002cd6f8 100644 --- a/kv/bucket_test.go +++ b/kv/bucket_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kv" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kv" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/kv/check.go b/kv/check.go index 3a7ecddbd4..e10b33a0c5 100644 --- a/kv/check.go +++ b/kv/check.go @@ -3,9 +3,9 @@ package kv import ( "context" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/tracing" - "github.com/influxdata/influxdb/notification/check" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/tracing" + "github.com/influxdata/influxdb/v2/notification/check" ) var _ influxdb.CheckService = (*Service)(nil) diff --git a/kv/check_test.go b/kv/check_test.go index d547f4f5e3..96d17a128d 100644 --- a/kv/check_test.go +++ b/kv/check_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kv" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kv" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/kv/cursor_test.go b/kv/cursor_test.go index c3af535a84..ec18503d35 100644 --- a/kv/cursor_test.go +++ b/kv/cursor_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/influxdata/influxdb/kv" + "github.com/influxdata/influxdb/v2/kv" ) func TestStaticCursor_First(t *testing.T) { diff --git a/kv/dashboard.go b/kv/dashboard.go index 956591f220..b7a8b7c11e 100644 --- a/kv/dashboard.go +++ b/kv/dashboard.go @@ -8,8 +8,8 @@ import ( "go.uber.org/zap" - influxdb "github.com/influxdata/influxdb" - icontext "github.com/influxdata/influxdb/context" + influxdb "github.com/influxdata/influxdb/v2" + icontext "github.com/influxdata/influxdb/v2/context" ) var ( diff --git a/kv/dashboard_test.go b/kv/dashboard_test.go index 16b28c73c5..d41849d6da 100644 --- a/kv/dashboard_test.go +++ b/kv/dashboard_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kv" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kv" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/kv/document.go b/kv/document.go index d154979722..86be719959 100644 --- a/kv/document.go +++ b/kv/document.go @@ -5,7 +5,7 @@ import ( "encoding/json" "path" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) const ( diff --git a/kv/document_options.go b/kv/document_options.go index 17a68eb74e..cadf369ef5 100644 --- a/kv/document_options.go +++ b/kv/document_options.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) // DocumentIndex implements influxdb.DocumentIndex. It is used to access labels/owners of documents. diff --git a/kv/document_test.go b/kv/document_test.go index 543af77520..162d484509 100644 --- a/kv/document_test.go +++ b/kv/document_test.go @@ -3,7 +3,7 @@ package kv_test import ( "testing" - influxdbtesting "github.com/influxdata/influxdb/testing" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" ) func TestBoltDocumentStore(t *testing.T) { diff --git a/kv/duplicate_read_test.go b/kv/duplicate_read_test.go index 9f9072a56f..3e449d52b8 100644 --- a/kv/duplicate_read_test.go +++ b/kv/duplicate_read_test.go @@ -3,9 +3,9 @@ package kv_test import ( "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/tenant" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/tenant" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/kv/encode.go b/kv/encode.go index 5a11a2b709..62c5071e2b 100644 --- a/kv/encode.go +++ b/kv/encode.go @@ -4,7 +4,7 @@ import ( "errors" "strings" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) // EncodeFn returns an encoding when called. Closures are your friend here. diff --git a/kv/index_test.go b/kv/index_test.go index 920570a14b..c7fed33a04 100644 --- a/kv/index_test.go +++ b/kv/index_test.go @@ -7,9 +7,9 @@ import ( "os" "testing" - "github.com/influxdata/influxdb/bolt" - "github.com/influxdata/influxdb/inmem" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2/bolt" + "github.com/influxdata/influxdb/v2/inmem" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/kv/kv_test.go b/kv/kv_test.go index 47a50cd6a1..3da1f2dc80 100644 --- a/kv/kv_test.go +++ b/kv/kv_test.go @@ -7,9 +7,9 @@ import ( "os" "testing" - "github.com/influxdata/influxdb/bolt" - "github.com/influxdata/influxdb/inmem" - "github.com/influxdata/influxdb/kv" + "github.com/influxdata/influxdb/v2/bolt" + "github.com/influxdata/influxdb/v2/inmem" + "github.com/influxdata/influxdb/v2/kv" "go.uber.org/zap/zaptest" ) diff --git a/kv/kvlog.go b/kv/kvlog.go index f3b9c23a7d..ee56232f1c 100644 --- a/kv/kvlog.go +++ b/kv/kvlog.go @@ -9,7 +9,7 @@ import ( "fmt" "time" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) var ( diff --git a/kv/kvlog_test.go b/kv/kvlog_test.go index a2b14b066a..12d1f12ffd 100644 --- a/kv/kvlog_test.go +++ b/kv/kvlog_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kv" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kv" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/kv/label.go b/kv/label.go index d24dca391b..d061c22506 100644 --- a/kv/label.go +++ b/kv/label.go @@ -6,8 +6,8 @@ import ( "fmt" "strings" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/tracing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/tracing" ) var ( diff --git a/kv/label_test.go b/kv/label_test.go index 50c755b68b..2b5de1e249 100644 --- a/kv/label_test.go +++ b/kv/label_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kv" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kv" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/kv/lookup_service.go b/kv/lookup_service.go index 29a1a9a880..47f271d8d7 100644 --- a/kv/lookup_service.go +++ b/kv/lookup_service.go @@ -3,7 +3,7 @@ package kv import ( "context" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) var _ influxdb.LookupService = (*Service)(nil) diff --git a/kv/lookup_service_test.go b/kv/lookup_service_test.go index f6ad4f3d77..8a1360608f 100644 --- a/kv/lookup_service_test.go +++ b/kv/lookup_service_test.go @@ -4,11 +4,11 @@ import ( "context" "testing" - "github.com/influxdata/influxdb" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kv" - "github.com/influxdata/influxdb/mock" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kv" + "github.com/influxdata/influxdb/v2/mock" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/kv/migration.go b/kv/migration.go index 03242dc9ce..897aa3e250 100644 --- a/kv/migration.go +++ b/kv/migration.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - influxdb "github.com/influxdata/influxdb" + influxdb "github.com/influxdata/influxdb/v2" "go.uber.org/zap" ) diff --git a/kv/migration_test.go b/kv/migration_test.go index 57475e569f..1aba70781b 100644 --- a/kv/migration_test.go +++ b/kv/migration_test.go @@ -3,9 +3,9 @@ package kv_test import ( "testing" - "github.com/influxdata/influxdb/inmem" - "github.com/influxdata/influxdb/kv" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2/inmem" + "github.com/influxdata/influxdb/v2/kv" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap" ) diff --git a/kv/notification_endpoint.go b/kv/notification_endpoint.go index 60b0804950..fbdfe4ab7a 100644 --- a/kv/notification_endpoint.go +++ b/kv/notification_endpoint.go @@ -3,9 +3,9 @@ package kv import ( "context" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/tracing" - "github.com/influxdata/influxdb/notification/endpoint" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/tracing" + "github.com/influxdata/influxdb/v2/notification/endpoint" ) var ( diff --git a/kv/notification_endpoint_test.go b/kv/notification_endpoint_test.go index d7bf5d8d91..68cbe25867 100644 --- a/kv/notification_endpoint_test.go +++ b/kv/notification_endpoint_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/endpoints" - "github.com/influxdata/influxdb/kv" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/endpoints" + "github.com/influxdata/influxdb/v2/kv" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/kv/notification_rule.go b/kv/notification_rule.go index 5894b6fdc2..03cd37aceb 100644 --- a/kv/notification_rule.go +++ b/kv/notification_rule.go @@ -5,10 +5,10 @@ import ( "encoding/json" "fmt" - "github.com/influxdata/influxdb/notification/rule" + "github.com/influxdata/influxdb/v2/notification/rule" "go.uber.org/zap" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) var ( diff --git a/kv/notification_rule_test.go b/kv/notification_rule_test.go index 667e83cc87..1f4795244a 100644 --- a/kv/notification_rule_test.go +++ b/kv/notification_rule_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kv" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kv" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/kv/onboarding.go b/kv/onboarding.go index 2aa256f03b..0ef15bbde5 100644 --- a/kv/onboarding.go +++ b/kv/onboarding.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) var ( diff --git a/kv/onboarding_test.go b/kv/onboarding_test.go index 62e3b95135..37bb053343 100644 --- a/kv/onboarding_test.go +++ b/kv/onboarding_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - influxdb "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kv" - influxdbtesting "github.com/influxdata/influxdb/testing" + influxdb "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kv" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/kv/org.go b/kv/org.go index 4ec84c6403..923499501d 100644 --- a/kv/org.go +++ b/kv/org.go @@ -7,13 +7,12 @@ import ( "strings" "time" - "github.com/influxdata/influxdb/resource" - + "github.com/influxdata/influxdb/v2/resource" "go.uber.org/zap" - "github.com/influxdata/influxdb" - icontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/kit/tracing" + "github.com/influxdata/influxdb/v2" + icontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/kit/tracing" ) const ( diff --git a/kv/org_test.go b/kv/org_test.go index 1e76ff950a..94f69b67d5 100644 --- a/kv/org_test.go +++ b/kv/org_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kv" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kv" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/kv/passwords.go b/kv/passwords.go index 252408b5d8..89728d60ad 100644 --- a/kv/passwords.go +++ b/kv/passwords.go @@ -6,7 +6,7 @@ import ( "golang.org/x/crypto/bcrypt" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) // MinPasswordLength is the shortest password we allow into the system. diff --git a/kv/passwords_test.go b/kv/passwords_test.go index 88dd726340..a7dbb85d97 100644 --- a/kv/passwords_test.go +++ b/kv/passwords_test.go @@ -6,10 +6,10 @@ import ( "fmt" "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kv" - "github.com/influxdata/influxdb/mock" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kv" + "github.com/influxdata/influxdb/v2/mock" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/kv/scrapers.go b/kv/scrapers.go index 13f2b5b2e8..ee876692d9 100644 --- a/kv/scrapers.go +++ b/kv/scrapers.go @@ -5,7 +5,7 @@ import ( "encoding/json" "fmt" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) var ( diff --git a/kv/scrapers_test.go b/kv/scrapers_test.go index b52d8b8e9a..a1d1ccf00b 100644 --- a/kv/scrapers_test.go +++ b/kv/scrapers_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kv" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kv" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/kv/secret.go b/kv/secret.go index cdb68301bc..e37cc42754 100644 --- a/kv/secret.go +++ b/kv/secret.go @@ -5,7 +5,7 @@ import ( "encoding/base64" "errors" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) var ( diff --git a/kv/secret_test.go b/kv/secret_test.go index 1b8355a5ee..563fd42877 100644 --- a/kv/secret_test.go +++ b/kv/secret_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kv" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kv" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/kv/service.go b/kv/service.go index 03b831a671..dbc8c179b4 100644 --- a/kv/service.go +++ b/kv/service.go @@ -5,13 +5,12 @@ import ( "encoding/json" "time" - "github.com/influxdata/influxdb/resource/noop" - "github.com/benbjohnson/clock" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/rand" - "github.com/influxdata/influxdb/resource" - "github.com/influxdata/influxdb/snowflake" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/rand" + "github.com/influxdata/influxdb/v2/resource" + "github.com/influxdata/influxdb/v2/resource/noop" + "github.com/influxdata/influxdb/v2/snowflake" "go.uber.org/zap" ) diff --git a/kv/service_test.go b/kv/service_test.go index 0ecccb1e28..a31718e196 100644 --- a/kv/service_test.go +++ b/kv/service_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kv" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kv" "go.uber.org/zap/zaptest" ) diff --git a/kv/session.go b/kv/session.go index f6e7663400..8bfe9624c6 100644 --- a/kv/session.go +++ b/kv/session.go @@ -5,7 +5,7 @@ import ( "encoding/json" "time" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) var ( diff --git a/kv/session_test.go b/kv/session_test.go index 09397d3a13..ca72e05a4d 100644 --- a/kv/session_test.go +++ b/kv/session_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kv" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kv" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/kv/source.go b/kv/source.go index 03486b732d..7a92801bee 100644 --- a/kv/source.go +++ b/kv/source.go @@ -5,7 +5,7 @@ import ( "encoding/json" "fmt" - influxdb "github.com/influxdata/influxdb" + influxdb "github.com/influxdata/influxdb/v2" ) var ( diff --git a/kv/source_test.go b/kv/source_test.go index 389653c823..47e7756618 100644 --- a/kv/source_test.go +++ b/kv/source_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kv" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kv" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/kv/store_base.go b/kv/store_base.go index 41aef1b67b..77bb6a4539 100644 --- a/kv/store_base.go +++ b/kv/store_base.go @@ -6,8 +6,8 @@ import ( "errors" "fmt" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/tracing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/tracing" ) type Entity struct { diff --git a/kv/store_base_test.go b/kv/store_base_test.go index 94c3cb3c96..f4699a54f3 100644 --- a/kv/store_base_test.go +++ b/kv/store_base_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kv" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kv" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/kv/store_index.go b/kv/store_index.go index 113228b12b..f6dd13897d 100644 --- a/kv/store_index.go +++ b/kv/store_index.go @@ -6,8 +6,8 @@ import ( "errors" "fmt" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/tracing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/tracing" ) // IndexStore provides a entity store that uses an index lookup. diff --git a/kv/store_index_test.go b/kv/store_index_test.go index 563270c98a..5f7cc02b71 100644 --- a/kv/store_index_test.go +++ b/kv/store_index_test.go @@ -4,9 +4,8 @@ import ( "context" "testing" - "github.com/influxdata/influxdb" - - "github.com/influxdata/influxdb/kv" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kv" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/kv/task.go b/kv/task.go index 85fe7a7bd3..78e37f24cc 100644 --- a/kv/task.go +++ b/kv/task.go @@ -6,10 +6,10 @@ import ( "strings" "time" - "github.com/influxdata/influxdb" - icontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/resource" - "github.com/influxdata/influxdb/task/options" + "github.com/influxdata/influxdb/v2" + icontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/resource" + "github.com/influxdata/influxdb/v2/task/options" "go.uber.org/zap" ) diff --git a/kv/task_private_test.go b/kv/task_private_test.go index 6e87e49130..731a0430ed 100644 --- a/kv/task_private_test.go +++ b/kv/task_private_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) func Test_newTaskMatchFN(t *testing.T) { diff --git a/kv/task_test.go b/kv/task_test.go index 0239561fb3..8264470829 100644 --- a/kv/task_test.go +++ b/kv/task_test.go @@ -9,11 +9,11 @@ import ( "github.com/benbjohnson/clock" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - icontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/kv" - _ "github.com/influxdata/influxdb/query/builtin" - "github.com/influxdata/influxdb/task/servicetest" + "github.com/influxdata/influxdb/v2" + icontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/kv" + _ "github.com/influxdata/influxdb/v2/query/builtin" + "github.com/influxdata/influxdb/v2/task/servicetest" "go.uber.org/zap/zaptest" ) diff --git a/kv/telegraf.go b/kv/telegraf.go index 19ee91d1eb..ffd3803f45 100644 --- a/kv/telegraf.go +++ b/kv/telegraf.go @@ -5,7 +5,7 @@ import ( "encoding/json" "fmt" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) var ( diff --git a/kv/telegraf_test.go b/kv/telegraf_test.go index 7456e725a4..8b82b6a622 100644 --- a/kv/telegraf_test.go +++ b/kv/telegraf_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kv" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kv" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/kv/tenant_test.go b/kv/tenant_test.go index 8a42898d46..783b4dc924 100644 --- a/kv/tenant_test.go +++ b/kv/tenant_test.go @@ -5,10 +5,10 @@ import ( "fmt" "testing" - "github.com/influxdata/influxdb" - icontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/kv" - itesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + icontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/kv" + itesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/kv/unique.go b/kv/unique.go index 0ed2ecfc58..8196a226b5 100644 --- a/kv/unique.go +++ b/kv/unique.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - influxdb "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/tracing" + influxdb "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/tracing" ) // UnexpectedIndexError is used when the error comes from an internal system. diff --git a/kv/urm.go b/kv/urm.go index 247dd3e480..e8002ed0c1 100644 --- a/kv/urm.go +++ b/kv/urm.go @@ -5,9 +5,9 @@ import ( "encoding/json" "fmt" - "github.com/influxdata/influxdb" - icontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/kit/tracing" + "github.com/influxdata/influxdb/v2" + icontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/kit/tracing" "go.uber.org/zap" ) diff --git a/kv/urm_private_test.go b/kv/urm_private_test.go index 27e4b1f4e1..06d377ad67 100644 --- a/kv/urm_private_test.go +++ b/kv/urm_private_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) func Test_userResourceMappingPredicate(t *testing.T) { diff --git a/kv/urm_test.go b/kv/urm_test.go index 0657c18681..3a41fcc9d0 100644 --- a/kv/urm_test.go +++ b/kv/urm_test.go @@ -4,11 +4,11 @@ import ( "context" "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/inmem" - "github.com/influxdata/influxdb/kv" - "github.com/influxdata/influxdb/snowflake" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/inmem" + "github.com/influxdata/influxdb/v2/kv" + "github.com/influxdata/influxdb/v2/snowflake" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/kv/user.go b/kv/user.go index d889a8d22c..705a4ec5e0 100644 --- a/kv/user.go +++ b/kv/user.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - "github.com/influxdata/influxdb" - icontext "github.com/influxdata/influxdb/context" + "github.com/influxdata/influxdb/v2" + icontext "github.com/influxdata/influxdb/v2/context" ) var ( diff --git a/kv/user_test.go b/kv/user_test.go index 8832cc0eb3..c8948249d8 100644 --- a/kv/user_test.go +++ b/kv/user_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kv" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kv" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/kv/variable.go b/kv/variable.go index 048f235423..1bab41424e 100644 --- a/kv/variable.go +++ b/kv/variable.go @@ -5,7 +5,7 @@ import ( "encoding/json" "strings" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) // TODO: eradicate this with migration strategy diff --git a/kv/variable_test.go b/kv/variable_test.go index f448c89b61..af5a8f5eb7 100644 --- a/kv/variable_test.go +++ b/kv/variable_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kv" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kv" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/label_test.go b/label_test.go index 01fec6f83e..9a38b5b684 100644 --- a/label_test.go +++ b/label_test.go @@ -3,8 +3,8 @@ package influxdb_test import ( "testing" - "github.com/influxdata/influxdb" - influxtest "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + influxtest "github.com/influxdata/influxdb/v2/testing" ) const ( diff --git a/logger/fields.go b/logger/fields.go index 6dea992619..959b5c424a 100644 --- a/logger/fields.go +++ b/logger/fields.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/influxdata/influxdb/kit/tracing" - "github.com/influxdata/influxdb/pkg/snowflake" + "github.com/influxdata/influxdb/v2/kit/tracing" + "github.com/influxdata/influxdb/v2/pkg/snowflake" "github.com/opentracing/opentracing-go" "github.com/uber/jaeger-client-go" "go.uber.org/zap" diff --git a/mock/auth_service.go b/mock/auth_service.go index f677460976..25eeb1afb5 100644 --- a/mock/auth_service.go +++ b/mock/auth_service.go @@ -3,7 +3,7 @@ package mock import ( "context" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) // AuthorizationService is a mock implementation of a retention.AuthorizationService, which diff --git a/mock/authorization.go b/mock/authorization.go index 66a0ea152d..9e9bed0eb6 100644 --- a/mock/authorization.go +++ b/mock/authorization.go @@ -1,7 +1,7 @@ package mock import ( - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) // Authorization is an Authorizer that always allows everything diff --git a/mock/bucket_service.go b/mock/bucket_service.go index 7d9dcd24e4..3de766e70d 100644 --- a/mock/bucket_service.go +++ b/mock/bucket_service.go @@ -4,7 +4,7 @@ import ( "context" "time" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) // BucketService is a mock implementation of a retention.BucketService, which diff --git a/mock/check_service.go b/mock/check_service.go index ddf5f86629..6d33d3bb18 100644 --- a/mock/check_service.go +++ b/mock/check_service.go @@ -3,7 +3,7 @@ package mock import ( "context" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) // CheckService is a mock implementation of a retention.CheckService, which diff --git a/mock/dashboard_service.go b/mock/dashboard_service.go index 7c4755e714..6f124b2afb 100644 --- a/mock/dashboard_service.go +++ b/mock/dashboard_service.go @@ -3,7 +3,7 @@ package mock import ( "context" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) var _ platform.DashboardService = &DashboardService{} diff --git a/mock/dbrp_mapping.go b/mock/dbrp_mapping.go index 69d169b807..e6fe9b4076 100644 --- a/mock/dbrp_mapping.go +++ b/mock/dbrp_mapping.go @@ -3,7 +3,7 @@ package mock import ( "context" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) type DBRPMappingService struct { diff --git a/mock/delete.go b/mock/delete.go index 105d5a3a12..7c925f3f18 100644 --- a/mock/delete.go +++ b/mock/delete.go @@ -3,7 +3,7 @@ package mock import ( "context" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) var _ influxdb.DeleteService = &DeleteService{} diff --git a/mock/dependencies.go b/mock/dependencies.go index 0b10560d05..91339c2eb9 100644 --- a/mock/dependencies.go +++ b/mock/dependencies.go @@ -3,7 +3,7 @@ package mock import ( "context" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) // BucketLookup implements the BucketLookup interface needed by flux "from" and "to". diff --git a/mock/document_service.go b/mock/document_service.go index 3b963c428e..488b659243 100644 --- a/mock/document_service.go +++ b/mock/document_service.go @@ -3,7 +3,7 @@ package mock import ( "context" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) var _ influxdb.DocumentStore = &DocumentStore{} diff --git a/mock/generators.go b/mock/generators.go index 37a5bb9bdf..b935ca1a6d 100644 --- a/mock/generators.go +++ b/mock/generators.go @@ -4,7 +4,7 @@ import ( "testing" "time" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) // IDGenerator is mock implementation of platform.IDGenerator. diff --git a/mock/kv.go b/mock/kv.go index b2dc8fc403..2798a70afc 100644 --- a/mock/kv.go +++ b/mock/kv.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/influxdata/influxdb/kv" + "github.com/influxdata/influxdb/v2/kv" ) var _ (kv.Store) = (*Store)(nil) diff --git a/mock/label_service.go b/mock/label_service.go index 62b0038664..8aa717620a 100644 --- a/mock/label_service.go +++ b/mock/label_service.go @@ -3,7 +3,7 @@ package mock import ( "context" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) var _ platform.LabelService = &LabelService{} diff --git a/mock/lookup_service.go b/mock/lookup_service.go index d0e1724285..f68d0264c0 100644 --- a/mock/lookup_service.go +++ b/mock/lookup_service.go @@ -3,7 +3,7 @@ package mock import ( "context" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) // LookupService provides field lookup for the resource and ID. diff --git a/mock/nats.go b/mock/nats.go index af0bf346df..c481ebccb7 100644 --- a/mock/nats.go +++ b/mock/nats.go @@ -5,7 +5,7 @@ import ( "io" "sync" - "github.com/influxdata/influxdb/nats" + "github.com/influxdata/influxdb/v2/nats" ) // NatsServer is the mocked nats server based buffered channel. diff --git a/mock/nats_test.go b/mock/nats_test.go index 4772c8718e..b07920d258 100644 --- a/mock/nats_test.go +++ b/mock/nats_test.go @@ -6,7 +6,7 @@ import ( "sync" "testing" - "github.com/influxdata/influxdb/nats" + "github.com/influxdata/influxdb/v2/nats" ) // TestNats use the mocked nats publisher and subscriber diff --git a/mock/notification_endpoint_service.go b/mock/notification_endpoint_service.go index 4a16d49f9e..32fe2ec91d 100644 --- a/mock/notification_endpoint_service.go +++ b/mock/notification_endpoint_service.go @@ -3,7 +3,7 @@ package mock import ( "context" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) var _ influxdb.NotificationEndpointService = &NotificationEndpointService{} diff --git a/mock/notification_rule_store.go b/mock/notification_rule_store.go index 94c3df52f6..7f12e8b449 100644 --- a/mock/notification_rule_store.go +++ b/mock/notification_rule_store.go @@ -3,7 +3,7 @@ package mock import ( "context" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) var _ influxdb.NotificationRuleStore = &NotificationRuleStore{} diff --git a/mock/onboarding_service.go b/mock/onboarding_service.go index 29728ee329..ed73dd505e 100644 --- a/mock/onboarding_service.go +++ b/mock/onboarding_service.go @@ -3,7 +3,7 @@ package mock import ( "context" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) var _ platform.OnboardingService = (*OnboardingService)(nil) diff --git a/mock/operation_log_service.go b/mock/operation_log_service.go index 46cb8b8669..3a698afcba 100644 --- a/mock/operation_log_service.go +++ b/mock/operation_log_service.go @@ -3,7 +3,7 @@ package mock import ( "context" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) var _ platform.BucketOperationLogService = (*BucketOperationLogService)(nil) diff --git a/mock/org_service.go b/mock/org_service.go index cc92f6151e..e878881d67 100644 --- a/mock/org_service.go +++ b/mock/org_service.go @@ -3,7 +3,7 @@ package mock import ( "context" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) var _ platform.OrganizationService = &OrganizationService{} diff --git a/mock/passwords.go b/mock/passwords.go index 927f4f468c..ffd866af7b 100644 --- a/mock/passwords.go +++ b/mock/passwords.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) // PasswordsService is a mock implementation of a retention.PasswordsService, which diff --git a/mock/points_writer.go b/mock/points_writer.go index f0f7ce202a..c500248fbf 100644 --- a/mock/points_writer.go +++ b/mock/points_writer.go @@ -4,7 +4,7 @@ import ( "context" "sync" - "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/v2/models" ) // PointsWriter is a mock structure for writing points. diff --git a/mock/reads_resultset.go b/mock/reads_resultset.go index 3f7b3162a5..4803b8c897 100644 --- a/mock/reads_resultset.go +++ b/mock/reads_resultset.go @@ -1,10 +1,10 @@ package mock import ( - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/pkg/data/gen" - "github.com/influxdata/influxdb/storage/reads" - "github.com/influxdata/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/pkg/data/gen" + "github.com/influxdata/influxdb/v2/storage/reads" + "github.com/influxdata/influxdb/v2/tsdb/cursors" ) type GeneratorResultSet struct { diff --git a/mock/reads_resultset_test.go b/mock/reads_resultset_test.go index abbe1a1209..cb0cc03ec3 100644 --- a/mock/reads_resultset_test.go +++ b/mock/reads_resultset_test.go @@ -6,10 +6,10 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb/mock" - "github.com/influxdata/influxdb/pkg/data/gen" - "github.com/influxdata/influxdb/storage/reads" - "github.com/influxdata/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2/mock" + "github.com/influxdata/influxdb/v2/pkg/data/gen" + "github.com/influxdata/influxdb/v2/storage/reads" + "github.com/influxdata/influxdb/v2/tsdb/cursors" ) func mustNewSpecFromToml(tb testing.TB, toml string) *gen.Spec { diff --git a/mock/scraper_service.go b/mock/scraper_service.go index 8e45576bc8..54acb55379 100644 --- a/mock/scraper_service.go +++ b/mock/scraper_service.go @@ -3,7 +3,7 @@ package mock import ( "context" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) var _ platform.ScraperTargetStoreService = &ScraperTargetStoreService{} diff --git a/mock/secret_service.go b/mock/secret_service.go index ca018ae922..d57b0bd92b 100644 --- a/mock/secret_service.go +++ b/mock/secret_service.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) // SecretService is a mock implementation of a retention.SecretService, which diff --git a/mock/session_service.go b/mock/session_service.go index d1ae3440a2..867662375e 100644 --- a/mock/session_service.go +++ b/mock/session_service.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) // SessionService is a mock implementation of a retention.SessionService, which diff --git a/mock/source_service.go b/mock/source_service.go index 2db5ddd8a1..80d6a7b015 100644 --- a/mock/source_service.go +++ b/mock/source_service.go @@ -3,7 +3,7 @@ package mock import ( "context" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) var _ platform.SourceService = (*SourceService)(nil) diff --git a/mock/task_service.go b/mock/task_service.go index 4b44d91936..9ebc34b9db 100644 --- a/mock/task_service.go +++ b/mock/task_service.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/task/backend" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/task/backend" ) var _ influxdb.TaskService = (*TaskService)(nil) diff --git a/mock/telegraf_service.go b/mock/telegraf_service.go index 14eb0d7438..a2b59d2614 100644 --- a/mock/telegraf_service.go +++ b/mock/telegraf_service.go @@ -3,7 +3,7 @@ package mock import ( "context" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) var _ platform.TelegrafConfigStore = (*TelegrafConfigStore)(nil) diff --git a/mock/user_resource_mapping_service.go b/mock/user_resource_mapping_service.go index d4696f5fb1..53c092e14d 100644 --- a/mock/user_resource_mapping_service.go +++ b/mock/user_resource_mapping_service.go @@ -3,7 +3,7 @@ package mock import ( "context" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) var _ platform.UserResourceMappingService = &UserResourceMappingService{} diff --git a/mock/user_service.go b/mock/user_service.go index 5203554ed0..879fc8bbf0 100644 --- a/mock/user_service.go +++ b/mock/user_service.go @@ -3,7 +3,7 @@ package mock import ( "context" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) var _ platform.UserService = (*UserService)(nil) diff --git a/mock/variable_service.go b/mock/variable_service.go index d0d9c2d9b6..341acb0376 100644 --- a/mock/variable_service.go +++ b/mock/variable_service.go @@ -3,7 +3,7 @@ package mock import ( "context" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) var _ platform.VariableService = &VariableService{} diff --git a/mock/write_service.go b/mock/write_service.go index 2e62f4d3a2..093d6a12cf 100644 --- a/mock/write_service.go +++ b/mock/write_service.go @@ -4,7 +4,7 @@ import ( "context" "io" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) // WriteService writes data read from the reader. diff --git a/models/inline_fnv_test.go b/models/inline_fnv_test.go index 62bc53ec0d..cef6b6566c 100644 --- a/models/inline_fnv_test.go +++ b/models/inline_fnv_test.go @@ -5,7 +5,7 @@ import ( "testing" "testing/quick" - "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/v2/models" ) func TestInlineFNV64aEquivalenceFuzz(t *testing.T) { diff --git a/models/points.go b/models/points.go index eda9bee016..b12a226329 100644 --- a/models/points.go +++ b/models/points.go @@ -15,7 +15,7 @@ import ( "unicode" "unicode/utf8" - "github.com/influxdata/influxdb/pkg/escape" + "github.com/influxdata/influxdb/v2/pkg/escape" ) const ( diff --git a/models/points_test.go b/models/points_test.go index 039133c84f..f8e253abfb 100644 --- a/models/points_test.go +++ b/models/points_test.go @@ -17,9 +17,9 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/tsdb" "github.com/stretchr/testify/assert" ) diff --git a/models/statistic_test.go b/models/statistic_test.go index 918c991342..966c49c35a 100644 --- a/models/statistic_test.go +++ b/models/statistic_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/v2/models" ) func TestTags_Merge(t *testing.T) { diff --git a/models/tagkeysset_test.go b/models/tagkeysset_test.go index a1d915fba5..113d925e29 100644 --- a/models/tagkeysset_test.go +++ b/models/tagkeysset_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/v2/models" ) func TestTagKeysSet_UnionKeys(t *testing.T) { diff --git a/notification/check/check.go b/notification/check/check.go index 27c50e03d5..e797284f61 100644 --- a/notification/check/check.go +++ b/notification/check/check.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/influxdata/flux/ast" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/notification" - "github.com/influxdata/influxdb/notification/flux" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/notification" + "github.com/influxdata/influxdb/v2/notification/flux" ) // Base will embed inside a check. diff --git a/notification/check/check_test.go b/notification/check/check_test.go index b20236913c..247e24b796 100644 --- a/notification/check/check_test.go +++ b/notification/check/check_test.go @@ -8,13 +8,11 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/influxdata/flux/parser" - "github.com/influxdata/influxdb/notification" - - "github.com/influxdata/influxdb/mock" - - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/notification/check" - influxTesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" + "github.com/influxdata/influxdb/v2/notification" + "github.com/influxdata/influxdb/v2/notification/check" + influxTesting "github.com/influxdata/influxdb/v2/testing" ) const ( diff --git a/notification/check/custom.go b/notification/check/custom.go index d731979ad6..214a575157 100644 --- a/notification/check/custom.go +++ b/notification/check/custom.go @@ -6,8 +6,8 @@ import ( "github.com/influxdata/flux/ast" "github.com/influxdata/flux/parser" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/notification/flux" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/notification/flux" ) var _ influxdb.Check = &Custom{} diff --git a/notification/check/custom_test.go b/notification/check/custom_test.go index d4926e455a..df32e2a1d8 100644 --- a/notification/check/custom_test.go +++ b/notification/check/custom_test.go @@ -8,8 +8,8 @@ import ( "github.com/andreyvit/diff" "github.com/influxdata/flux/ast" "github.com/influxdata/flux/parser" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/notification/check" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/notification/check" ) func TestCheck_Valid(t *testing.T) { diff --git a/notification/check/deadman.go b/notification/check/deadman.go index 94088b876e..9777ab8894 100644 --- a/notification/check/deadman.go +++ b/notification/check/deadman.go @@ -7,9 +7,9 @@ import ( "github.com/influxdata/flux/ast" "github.com/influxdata/flux/parser" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/notification" - "github.com/influxdata/influxdb/notification/flux" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/notification" + "github.com/influxdata/influxdb/v2/notification/flux" ) var _ influxdb.Check = (*Deadman)(nil) diff --git a/notification/check/deadman_test.go b/notification/check/deadman_test.go index 9a99c10696..ab9fdf0090 100644 --- a/notification/check/deadman_test.go +++ b/notification/check/deadman_test.go @@ -3,9 +3,9 @@ package check_test import ( "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/notification" - "github.com/influxdata/influxdb/notification/check" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/notification" + "github.com/influxdata/influxdb/v2/notification/check" ) func TestDeadman_GenerateFlux(t *testing.T) { diff --git a/notification/check/threshold.go b/notification/check/threshold.go index c770787de2..b669d146e7 100644 --- a/notification/check/threshold.go +++ b/notification/check/threshold.go @@ -7,9 +7,9 @@ import ( "github.com/influxdata/flux/ast" "github.com/influxdata/flux/parser" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/notification" - "github.com/influxdata/influxdb/notification/flux" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/notification" + "github.com/influxdata/influxdb/v2/notification/flux" ) var _ influxdb.Check = (*Threshold)(nil) diff --git a/notification/check/threshold_test.go b/notification/check/threshold_test.go index 2be45bf6f1..31e9753f59 100644 --- a/notification/check/threshold_test.go +++ b/notification/check/threshold_test.go @@ -4,9 +4,9 @@ import ( "testing" "github.com/influxdata/flux/ast" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/notification" - "github.com/influxdata/influxdb/notification/check" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/notification" + "github.com/influxdata/influxdb/v2/notification/check" "github.com/stretchr/testify/assert" ) diff --git a/notification/endpoint/endpoint.go b/notification/endpoint/endpoint.go index 0d55749559..975bc5e40b 100644 --- a/notification/endpoint/endpoint.go +++ b/notification/endpoint/endpoint.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) // types of endpoints. diff --git a/notification/endpoint/endpoint_test.go b/notification/endpoint/endpoint_test.go index fd7e6b4950..a6c23410e7 100644 --- a/notification/endpoint/endpoint_test.go +++ b/notification/endpoint/endpoint_test.go @@ -7,10 +7,10 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/mock" - "github.com/influxdata/influxdb/notification/endpoint" - influxTesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" + "github.com/influxdata/influxdb/v2/notification/endpoint" + influxTesting "github.com/influxdata/influxdb/v2/testing" ) const ( diff --git a/notification/endpoint/http.go b/notification/endpoint/http.go index bc07315bb1..4a3fd81c4b 100644 --- a/notification/endpoint/http.go +++ b/notification/endpoint/http.go @@ -7,7 +7,7 @@ import ( "net/http" "net/url" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) var _ influxdb.NotificationEndpoint = &HTTP{} diff --git a/notification/endpoint/pagerduty.go b/notification/endpoint/pagerduty.go index 4233c372ee..57cc7b4fca 100644 --- a/notification/endpoint/pagerduty.go +++ b/notification/endpoint/pagerduty.go @@ -3,7 +3,7 @@ package endpoint import ( "encoding/json" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) var _ influxdb.NotificationEndpoint = &PagerDuty{} diff --git a/notification/endpoint/slack.go b/notification/endpoint/slack.go index f18faf1268..c900acdcf1 100644 --- a/notification/endpoint/slack.go +++ b/notification/endpoint/slack.go @@ -5,7 +5,7 @@ import ( "fmt" "net/url" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) var _ influxdb.NotificationEndpoint = &Slack{} diff --git a/notification/rule/http.go b/notification/rule/http.go index c83b581ffb..8f43401da2 100644 --- a/notification/rule/http.go +++ b/notification/rule/http.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/influxdata/flux/ast" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/notification/endpoint" - "github.com/influxdata/influxdb/notification/flux" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/notification/endpoint" + "github.com/influxdata/influxdb/v2/notification/flux" ) // HTTP is the notification rule config of http. diff --git a/notification/rule/http_test.go b/notification/rule/http_test.go index 727a022179..f6a85a196b 100644 --- a/notification/rule/http_test.go +++ b/notification/rule/http_test.go @@ -3,10 +3,10 @@ package rule_test import ( "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/notification" - "github.com/influxdata/influxdb/notification/endpoint" - "github.com/influxdata/influxdb/notification/rule" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/notification" + "github.com/influxdata/influxdb/v2/notification/endpoint" + "github.com/influxdata/influxdb/v2/notification/rule" ) func TestHTTP_GenerateFlux(t *testing.T) { diff --git a/notification/rule/pagerduty.go b/notification/rule/pagerduty.go index 019372273d..e787bb5a04 100644 --- a/notification/rule/pagerduty.go +++ b/notification/rule/pagerduty.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/influxdata/flux/ast" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/notification/endpoint" - "github.com/influxdata/influxdb/notification/flux" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/notification/endpoint" + "github.com/influxdata/influxdb/v2/notification/flux" ) // PagerDuty is the rule config of pagerduty notification. diff --git a/notification/rule/pagerduty_test.go b/notification/rule/pagerduty_test.go index e369ea27b8..1515f7dae4 100644 --- a/notification/rule/pagerduty_test.go +++ b/notification/rule/pagerduty_test.go @@ -4,10 +4,10 @@ import ( "testing" "github.com/andreyvit/diff" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/notification" - "github.com/influxdata/influxdb/notification/endpoint" - "github.com/influxdata/influxdb/notification/rule" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/notification" + "github.com/influxdata/influxdb/v2/notification/endpoint" + "github.com/influxdata/influxdb/v2/notification/rule" ) func TestPagerDuty_GenerateFlux(t *testing.T) { diff --git a/notification/rule/rule.go b/notification/rule/rule.go index aa43878d35..a9dc9249fb 100644 --- a/notification/rule/rule.go +++ b/notification/rule/rule.go @@ -7,9 +7,9 @@ import ( "time" "github.com/influxdata/flux/ast" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/notification" - "github.com/influxdata/influxdb/notification/flux" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/notification" + "github.com/influxdata/influxdb/v2/notification/flux" ) var typeToRule = map[string](func() influxdb.NotificationRule){ diff --git a/notification/rule/rule_test.go b/notification/rule/rule_test.go index 479a9d1257..cbe3f2401d 100644 --- a/notification/rule/rule_test.go +++ b/notification/rule/rule_test.go @@ -5,15 +5,13 @@ import ( "testing" "time" - "github.com/influxdata/influxdb/mock" - "github.com/influxdata/influxdb/pkg/testing/assert" - "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb/notification" - - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/notification/rule" - influxTesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" + "github.com/influxdata/influxdb/v2/notification" + "github.com/influxdata/influxdb/v2/notification/rule" + "github.com/influxdata/influxdb/v2/pkg/testing/assert" + influxTesting "github.com/influxdata/influxdb/v2/testing" ) func lvlPtr(l notification.CheckLevel) *notification.CheckLevel { diff --git a/notification/rule/slack.go b/notification/rule/slack.go index 400a38f63f..518b2c74e8 100644 --- a/notification/rule/slack.go +++ b/notification/rule/slack.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/influxdata/flux/ast" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/notification/endpoint" - "github.com/influxdata/influxdb/notification/flux" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/notification/endpoint" + "github.com/influxdata/influxdb/v2/notification/flux" ) // Slack is the notification rule config of slack. diff --git a/notification/rule/slack_test.go b/notification/rule/slack_test.go index ff3496fd89..6cb8c7a8d1 100644 --- a/notification/rule/slack_test.go +++ b/notification/rule/slack_test.go @@ -4,10 +4,10 @@ import ( "testing" "github.com/influxdata/flux/parser" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/notification" - "github.com/influxdata/influxdb/notification/endpoint" - "github.com/influxdata/influxdb/notification/rule" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/notification" + "github.com/influxdata/influxdb/v2/notification/endpoint" + "github.com/influxdata/influxdb/v2/notification/rule" ) func mustDuration(d string) *notification.Duration { diff --git a/notification/tag.go b/notification/tag.go index b11acaf23b..25ec75695b 100644 --- a/notification/tag.go +++ b/notification/tag.go @@ -2,8 +2,8 @@ package notification import ( "github.com/influxdata/flux/ast" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/notification/flux" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/notification/flux" ) // TagRule is the struct of tag rule. diff --git a/pkg/bloom/bloom_test.go b/pkg/bloom/bloom_test.go index 49ee997cde..595ca6623c 100644 --- a/pkg/bloom/bloom_test.go +++ b/pkg/bloom/bloom_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/influxdata/influxdb/pkg/bloom" + "github.com/influxdata/influxdb/v2/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 9d7adc69f5..dcfe02122a 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/influxdb/pkg/bytesutil" + "github.com/influxdata/influxdb/v2/pkg/bytesutil" ) func TestSearchBytesFixed(t *testing.T) { diff --git a/pkg/data/gen/arrays.gen.go b/pkg/data/gen/arrays.gen.go index b3ed333b9e..4e111f20b4 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/influxdb/tsdb/cursors" - "github.com/influxdata/influxdb/tsdb/tsm1" + "github.com/influxdata/influxdb/v2/tsdb/cursors" + "github.com/influxdata/influxdb/v2/tsdb/tsm1" ) type FloatValues interface { diff --git a/pkg/data/gen/merged_series_generator.go b/pkg/data/gen/merged_series_generator.go index ef8880bf4d..cad08685df 100644 --- a/pkg/data/gen/merged_series_generator.go +++ b/pkg/data/gen/merged_series_generator.go @@ -4,7 +4,7 @@ import ( "container/heap" "math" - "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/v2/models" ) type mergedSeriesGenerator struct { diff --git a/pkg/data/gen/merged_series_generator_test.go b/pkg/data/gen/merged_series_generator_test.go index 14815449e8..84c00e6d09 100644 --- a/pkg/data/gen/merged_series_generator_test.go +++ b/pkg/data/gen/merged_series_generator_test.go @@ -8,9 +8,9 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/tsdb" ) var ( diff --git a/pkg/data/gen/series_generator.go b/pkg/data/gen/series_generator.go index 1bd62bdaaa..0368baec0f 100644 --- a/pkg/data/gen/series_generator.go +++ b/pkg/data/gen/series_generator.go @@ -4,7 +4,7 @@ import ( "math" "time" - "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/v2/models" ) type SeriesGenerator interface { diff --git a/pkg/data/gen/specs.go b/pkg/data/gen/specs.go index 05a02fe2a6..9f995abc76 100644 --- a/pkg/data/gen/specs.go +++ b/pkg/data/gen/specs.go @@ -11,9 +11,9 @@ import ( "unicode/utf8" "github.com/BurntSushi/toml" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/tsdb" "github.com/pkg/errors" ) diff --git a/pkg/data/gen/specs_test.go b/pkg/data/gen/specs_test.go index 46c779c1b0..aef0149053 100644 --- a/pkg/data/gen/specs_test.go +++ b/pkg/data/gen/specs_test.go @@ -6,7 +6,7 @@ import ( "github.com/BurntSushi/toml" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/v2/models" ) func countableSequenceFnCmp(a, b NewCountableSequenceFn) bool { diff --git a/pkg/data/gen/tags_sequence.go b/pkg/data/gen/tags_sequence.go index a0e0cec921..0bc69c2d66 100644 --- a/pkg/data/gen/tags_sequence.go +++ b/pkg/data/gen/tags_sequence.go @@ -6,7 +6,7 @@ import ( "math/rand" "sort" - "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/v2/models" ) type TagsSequence interface { diff --git a/pkg/data/gen/values_sequence.gen.go b/pkg/data/gen/values_sequence.gen.go index a598770129..152da0cabc 100644 --- a/pkg/data/gen/values_sequence.gen.go +++ b/pkg/data/gen/values_sequence.gen.go @@ -7,8 +7,8 @@ package gen import ( - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/tsdb/cursors" ) type FloatValuesSequence interface { diff --git a/pkg/encoding/simple8b/encoding_test.go b/pkg/encoding/simple8b/encoding_test.go index a43dfa5e07..4d1d65a9cd 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/influxdb/pkg/encoding/simple8b" + "github.com/influxdata/influxdb/v2/pkg/encoding/simple8b" ) func Test_Encode_NoValues(t *testing.T) { diff --git a/pkg/fs/fs_test.go b/pkg/fs/fs_test.go index a29fea10d7..ce7331e3be 100644 --- a/pkg/fs/fs_test.go +++ b/pkg/fs/fs_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "testing" - "github.com/influxdata/influxdb/pkg/fs" + "github.com/influxdata/influxdb/v2/pkg/fs" ) func TestRenameFileWithReplacement(t *testing.T) { diff --git a/pkg/httpc/client.go b/pkg/httpc/client.go index c786327946..a28123f73a 100644 --- a/pkg/httpc/client.go +++ b/pkg/httpc/client.go @@ -7,7 +7,7 @@ import ( "net/url" "path" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) type ( diff --git a/pkg/httpc/req.go b/pkg/httpc/req.go index f2f5770574..c09503c42e 100644 --- a/pkg/httpc/req.go +++ b/pkg/httpc/req.go @@ -11,7 +11,7 @@ import ( "net/http" "strings" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) const ( diff --git a/pkg/jsonnet/decode_test.go b/pkg/jsonnet/decode_test.go index 51e604bd67..15d457c809 100644 --- a/pkg/jsonnet/decode_test.go +++ b/pkg/jsonnet/decode_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/influxdata/influxdb/pkg/jsonnet" + "github.com/influxdata/influxdb/v2/pkg/jsonnet" "github.com/stretchr/testify/require" ) diff --git a/pkg/jsonparser/jsonparser.go b/pkg/jsonparser/jsonparser.go index e07a84049c..410419c69b 100644 --- a/pkg/jsonparser/jsonparser.go +++ b/pkg/jsonparser/jsonparser.go @@ -2,7 +2,7 @@ package jsonparser import ( "github.com/buger/jsonparser" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) // GetID returns an influxdb.ID for the specified keys path or an error if diff --git a/pkg/jsonparser/jsonparser_test.go b/pkg/jsonparser/jsonparser_test.go index 52dd82cb7b..cb39d9aac1 100644 --- a/pkg/jsonparser/jsonparser_test.go +++ b/pkg/jsonparser/jsonparser_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/pkg/jsonparser" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/pkg/jsonparser" ) func TestGetID(t *testing.T) { diff --git a/pkg/limiter/fixed_test.go b/pkg/limiter/fixed_test.go index b45a7274c2..a0dec19769 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/influxdb/pkg/limiter" + "github.com/influxdata/influxdb/v2/pkg/limiter" ) func TestFixed_Available(t *testing.T) { diff --git a/pkg/limiter/write_test.go b/pkg/limiter/write_test.go index 768d6e3e0b..21a519fb13 100644 --- a/pkg/limiter/write_test.go +++ b/pkg/limiter/write_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/influxdata/influxdb/pkg/limiter" + "github.com/influxdata/influxdb/v2/pkg/limiter" ) func TestWriter_Limited(t *testing.T) { diff --git a/pkg/metrics/descriptors_test.go b/pkg/metrics/descriptors_test.go index 77bc2c994d..280386c93e 100644 --- a/pkg/metrics/descriptors_test.go +++ b/pkg/metrics/descriptors_test.go @@ -3,7 +3,7 @@ package metrics import ( "testing" - "github.com/influxdata/influxdb/pkg/testing/assert" + "github.com/influxdata/influxdb/v2/pkg/testing/assert" ) func TestID_newID(t *testing.T) { diff --git a/pkg/metrics/registry_test.go b/pkg/metrics/registry_test.go index 78496f37f1..67f148f08c 100644 --- a/pkg/metrics/registry_test.go +++ b/pkg/metrics/registry_test.go @@ -3,7 +3,7 @@ package metrics import ( "testing" - "github.com/influxdata/influxdb/pkg/testing/assert" + "github.com/influxdata/influxdb/v2/pkg/testing/assert" ) func TestRegistry_MustRegisterCounter(t *testing.T) { diff --git a/pkg/metrics/timer_test.go b/pkg/metrics/timer_test.go index aca439b104..a6c6952568 100644 --- a/pkg/metrics/timer_test.go +++ b/pkg/metrics/timer_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/influxdata/influxdb/pkg/testing/assert" + "github.com/influxdata/influxdb/v2/pkg/testing/assert" ) func TestTimer_Update(t *testing.T) { diff --git a/pkg/mmap/mmap_test.go b/pkg/mmap/mmap_test.go index a182219a7c..12d15a3e31 100644 --- a/pkg/mmap/mmap_test.go +++ b/pkg/mmap/mmap_test.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "testing" - "github.com/influxdata/influxdb/pkg/mmap" + "github.com/influxdata/influxdb/v2/pkg/mmap" ) func TestMap(t *testing.T) { diff --git a/pkg/pool/bytes_test.go b/pkg/pool/bytes_test.go index 28ca98d519..0a8b1bfc17 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/influxdb/pkg/pool" + "github.com/influxdata/influxdb/v2/pkg/pool" ) func TestLimitedBytePool_Put_MaxSize(t *testing.T) { diff --git a/pkg/rhh/metrics_test.go b/pkg/rhh/metrics_test.go index 568aa9b51a..b65a14e618 100644 --- a/pkg/rhh/metrics_test.go +++ b/pkg/rhh/metrics_test.go @@ -3,7 +3,7 @@ package rhh import ( "testing" - "github.com/influxdata/influxdb/kit/prom/promtest" + "github.com/influxdata/influxdb/v2/kit/prom/promtest" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/rhh/rhh_test.go b/pkg/rhh/rhh_test.go index 0a2b4a8ebd..0f58d58e8d 100644 --- a/pkg/rhh/rhh_test.go +++ b/pkg/rhh/rhh_test.go @@ -7,7 +7,7 @@ import ( "testing" "testing/quick" - "github.com/influxdata/influxdb/pkg/rhh" + "github.com/influxdata/influxdb/v2/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 f48de05048..866e03c30a 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/influxdb/pkg/bytesutil" + "github.com/influxdata/influxdb/v2/pkg/bytesutil" ) func TestCopyChunkedByteSlices_oneChunk(t *testing.T) { diff --git a/pkg/slices/merge_test.go b/pkg/slices/merge_test.go index 55f97deff6..439c9fbf69 100644 --- a/pkg/slices/merge_test.go +++ b/pkg/slices/merge_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/influxdata/influxdb/pkg/slices" + "github.com/influxdata/influxdb/v2/pkg/slices" ) func TestMergeSortedBytes(t *testing.T) { diff --git a/pkg/testttp/http_test.go b/pkg/testttp/http_test.go index 7eb9e9052d..ebb57d9da8 100644 --- a/pkg/testttp/http_test.go +++ b/pkg/testttp/http_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/influxdata/influxdb/pkg/testttp" + "github.com/influxdata/influxdb/v2/pkg/testttp" ) func TestHTTP(t *testing.T) { diff --git a/pkger/clone_resource.go b/pkger/clone_resource.go index f39a60d135..80dbcfa729 100644 --- a/pkger/clone_resource.go +++ b/pkger/clone_resource.go @@ -8,14 +8,14 @@ import ( "sort" "strings" - "github.com/influxdata/influxdb" - ierrors "github.com/influxdata/influxdb/kit/errors" - "github.com/influxdata/influxdb/notification" - icheck "github.com/influxdata/influxdb/notification/check" - "github.com/influxdata/influxdb/notification/endpoint" - "github.com/influxdata/influxdb/notification/rule" - "github.com/influxdata/influxdb/pkger/internal/wordplay" - "github.com/influxdata/influxdb/snowflake" + "github.com/influxdata/influxdb/v2" + ierrors "github.com/influxdata/influxdb/v2/kit/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/notification/rule" + "github.com/influxdata/influxdb/v2/pkger/internal/wordplay" + "github.com/influxdata/influxdb/v2/snowflake" ) var idGenerator = snowflake.NewDefaultIDGenerator() diff --git a/pkger/http_remote_service.go b/pkger/http_remote_service.go index cc935c9442..b224fa5685 100644 --- a/pkger/http_remote_service.go +++ b/pkger/http_remote_service.go @@ -5,8 +5,8 @@ import ( "fmt" "net/http" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/pkg/httpc" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/pkg/httpc" ) // HTTPRemoteService provides an http client that is fluent in all things pkger. diff --git a/pkger/http_server.go b/pkger/http_server.go index d075e52ac9..beb598f350 100644 --- a/pkger/http_server.go +++ b/pkger/http_server.go @@ -12,10 +12,10 @@ import ( "github.com/go-chi/chi" "github.com/go-chi/chi/middleware" - "github.com/influxdata/influxdb" - pctx "github.com/influxdata/influxdb/context" - kithttp "github.com/influxdata/influxdb/kit/transport/http" - "github.com/influxdata/influxdb/pkg/jsonnet" + "github.com/influxdata/influxdb/v2" + pctx "github.com/influxdata/influxdb/v2/context" + kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" + "github.com/influxdata/influxdb/v2/pkg/jsonnet" "go.uber.org/zap" "gopkg.in/yaml.v3" ) diff --git a/pkger/http_server_test.go b/pkger/http_server_test.go index 54f490f2d5..8426991ead 100644 --- a/pkger/http_server_test.go +++ b/pkger/http_server_test.go @@ -16,12 +16,12 @@ import ( "time" "github.com/go-chi/chi" - "github.com/influxdata/influxdb" - pcontext "github.com/influxdata/influxdb/context" - kithttp "github.com/influxdata/influxdb/kit/transport/http" - "github.com/influxdata/influxdb/mock" - "github.com/influxdata/influxdb/pkg/testttp" - "github.com/influxdata/influxdb/pkger" + "github.com/influxdata/influxdb/v2" + pcontext "github.com/influxdata/influxdb/v2/context" + kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" + "github.com/influxdata/influxdb/v2/mock" + "github.com/influxdata/influxdb/v2/pkg/testttp" + "github.com/influxdata/influxdb/v2/pkger" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/zap" diff --git a/pkger/models.go b/pkger/models.go index 0c435c916d..17539dd5ed 100644 --- a/pkger/models.go +++ b/pkger/models.go @@ -12,11 +12,11 @@ import ( "strings" "time" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/notification" - icheck "github.com/influxdata/influxdb/notification/check" - "github.com/influxdata/influxdb/notification/endpoint" - "github.com/influxdata/influxdb/notification/rule" + "github.com/influxdata/influxdb/v2" + "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" ) // Package kind types. diff --git a/pkger/models_test.go b/pkger/models_test.go index 390e692099..21fb8b012b 100644 --- a/pkger/models_test.go +++ b/pkger/models_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkger/parser.go b/pkger/parser.go index b6dd30cd4c..b1559da22a 100644 --- a/pkger/parser.go +++ b/pkger/parser.go @@ -13,8 +13,8 @@ import ( "strings" "time" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/pkg/jsonnet" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/pkg/jsonnet" "gopkg.in/yaml.v3" ) diff --git a/pkger/parser_test.go b/pkger/parser_test.go index 289c7b12b2..1bce2853c2 100644 --- a/pkger/parser_test.go +++ b/pkger/parser_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/notification" - icheck "github.com/influxdata/influxdb/notification/check" - "github.com/influxdata/influxdb/notification/endpoint" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/notification" + icheck "github.com/influxdata/influxdb/v2/notification/check" + "github.com/influxdata/influxdb/v2/notification/endpoint" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkger/service.go b/pkger/service.go index acb5ad37fc..b3f8597bea 100644 --- a/pkger/service.go +++ b/pkger/service.go @@ -10,9 +10,9 @@ import ( "sync" "time" - "github.com/influxdata/influxdb" - ierrors "github.com/influxdata/influxdb/kit/errors" - "github.com/influxdata/influxdb/snowflake" + "github.com/influxdata/influxdb/v2" + ierrors "github.com/influxdata/influxdb/v2/kit/errors" + "github.com/influxdata/influxdb/v2/snowflake" "go.uber.org/zap" ) diff --git a/pkger/service_auth.go b/pkger/service_auth.go index 08a8e89b99..5e908ac3be 100644 --- a/pkger/service_auth.go +++ b/pkger/service_auth.go @@ -3,7 +3,7 @@ package pkger import ( "context" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) type AuthAgent interface { diff --git a/pkger/service_logging.go b/pkger/service_logging.go index 1efbba37b0..f52a3388e5 100644 --- a/pkger/service_logging.go +++ b/pkger/service_logging.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" "go.uber.org/zap" ) diff --git a/pkger/service_metrics.go b/pkger/service_metrics.go index e05bd3a736..e0e504e774 100644 --- a/pkger/service_metrics.go +++ b/pkger/service_metrics.go @@ -3,9 +3,9 @@ package pkger import ( "context" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/metric" - "github.com/influxdata/influxdb/kit/prom" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/metric" + "github.com/influxdata/influxdb/v2/kit/prom" ) type mwMetrics struct { diff --git a/pkger/service_test.go b/pkger/service_test.go index 51aa594c76..fb266c4e65 100644 --- a/pkger/service_test.go +++ b/pkger/service_test.go @@ -11,12 +11,12 @@ import ( "testing" "time" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/mock" - "github.com/influxdata/influxdb/notification" - icheck "github.com/influxdata/influxdb/notification/check" - "github.com/influxdata/influxdb/notification/endpoint" - "github.com/influxdata/influxdb/notification/rule" + "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/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" diff --git a/pkger/service_tracing.go b/pkger/service_tracing.go index b154a9a87b..220a655fc2 100644 --- a/pkger/service_tracing.go +++ b/pkger/service_tracing.go @@ -3,8 +3,8 @@ package pkger import ( "context" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/tracing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/tracing" ) type traceMW struct { diff --git a/pkger/store.go b/pkger/store.go index e443f6145a..a6ee0704b3 100644 --- a/pkger/store.go +++ b/pkger/store.go @@ -5,8 +5,8 @@ import ( "encoding/json" "time" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kv" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kv" ) type ( diff --git a/pkger/store_test.go b/pkger/store_test.go index ff68986eea..f0ed665fdc 100644 --- a/pkger/store_test.go +++ b/pkger/store_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/inmem" - "github.com/influxdata/influxdb/pkger" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/inmem" + "github.com/influxdata/influxdb/v2/pkger" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/predicate/logical.go b/predicate/logical.go index 37048705f8..894a896779 100644 --- a/predicate/logical.go +++ b/predicate/logical.go @@ -3,8 +3,8 @@ package predicate import ( "fmt" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/storage/reads/datatypes" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/storage/reads/datatypes" ) // LogicalOperator is a string type of logical operator. diff --git a/predicate/parser.go b/predicate/parser.go index f9eb09af8d..de1e1db3b9 100644 --- a/predicate/parser.go +++ b/predicate/parser.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" "github.com/influxdata/influxql" ) diff --git a/predicate/parser_test.go b/predicate/parser_test.go index 92cf29e9d1..5f0d0a69e4 100644 --- a/predicate/parser_test.go +++ b/predicate/parser_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - influxtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + influxtesting "github.com/influxdata/influxdb/v2/testing" "github.com/influxdata/influxql" ) diff --git a/predicate/predicate.go b/predicate/predicate.go index 0a5890aa19..b96f3e1fdb 100644 --- a/predicate/predicate.go +++ b/predicate/predicate.go @@ -1,9 +1,9 @@ package predicate import ( - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/storage/reads/datatypes" - "github.com/influxdata/influxdb/tsdb/tsm1" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/storage/reads/datatypes" + "github.com/influxdata/influxdb/v2/tsdb/tsm1" ) // Node is a predicate node. diff --git a/predicate/predicate_test.go b/predicate/predicate_test.go index 95e3d17c0a..39c2e5ffda 100644 --- a/predicate/predicate_test.go +++ b/predicate/predicate_test.go @@ -4,10 +4,10 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/storage/reads/datatypes" - influxtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/storage/reads/datatypes" + influxtesting "github.com/influxdata/influxdb/v2/testing" ) func TestDataTypeConversion(t *testing.T) { diff --git a/predicate/tag_rule.go b/predicate/tag_rule.go index aec7f2ccce..503e9676aa 100644 --- a/predicate/tag_rule.go +++ b/predicate/tag_rule.go @@ -3,9 +3,9 @@ package predicate import ( "fmt" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/storage/reads/datatypes" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/storage/reads/datatypes" ) // TagRuleNode is a node type of a single tag rule. diff --git a/prometheus/auth_service.go b/prometheus/auth_service.go index 025f3bafd5..1cf15ed910 100644 --- a/prometheus/auth_service.go +++ b/prometheus/auth_service.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" "github.com/prometheus/client_golang/prometheus" ) diff --git a/prometheus/auth_service_test.go b/prometheus/auth_service_test.go index 20eaca1432..9ab568f8ed 100644 --- a/prometheus/auth_service_test.go +++ b/prometheus/auth_service_test.go @@ -5,10 +5,10 @@ import ( "errors" "testing" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/prom" - "github.com/influxdata/influxdb/kit/prom/promtest" - "github.com/influxdata/influxdb/prometheus" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/prom" + "github.com/influxdata/influxdb/v2/kit/prom/promtest" + "github.com/influxdata/influxdb/v2/prometheus" "go.uber.org/zap" ) diff --git a/prometheus/codec.go b/prometheus/codec.go index 512ec14440..215342ff68 100644 --- a/prometheus/codec.go +++ b/prometheus/codec.go @@ -8,7 +8,7 @@ import ( "strconv" "time" - "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/v2/models" dto "github.com/prometheus/client_model/go" "github.com/prometheus/common/expfmt" ) diff --git a/prometheus/codec_test.go b/prometheus/codec_test.go index b548d3b8fe..8fbe13b8d7 100644 --- a/prometheus/codec_test.go +++ b/prometheus/codec_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - pr "github.com/influxdata/influxdb/prometheus" + pr "github.com/influxdata/influxdb/v2/prometheus" dto "github.com/prometheus/client_model/go" "github.com/prometheus/common/expfmt" ) diff --git a/prometheus/example_test.go b/prometheus/example_test.go index 41df67b5a8..205832f76c 100644 --- a/prometheus/example_test.go +++ b/prometheus/example_test.go @@ -4,7 +4,7 @@ import ( "bytes" "fmt" - "github.com/influxdata/influxdb/prometheus" + "github.com/influxdata/influxdb/v2/prometheus" pr "github.com/prometheus/client_golang/prometheus" dto "github.com/prometheus/client_model/go" "github.com/prometheus/common/expfmt" diff --git a/prometheus/filter_test.go b/prometheus/filter_test.go index 361f66f4b9..efbcc27f0a 100644 --- a/prometheus/filter_test.go +++ b/prometheus/filter_test.go @@ -6,7 +6,7 @@ import ( "testing" proto "github.com/golang/protobuf/proto" - pr "github.com/influxdata/influxdb/prometheus" + pr "github.com/influxdata/influxdb/v2/prometheus" "github.com/prometheus/client_golang/prometheus" dto "github.com/prometheus/client_model/go" ) diff --git a/prometheus/influx.go b/prometheus/influx.go index b7857cc086..64fcb185a8 100644 --- a/prometheus/influx.go +++ b/prometheus/influx.go @@ -5,7 +5,7 @@ import ( "strconv" "time" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" "github.com/prometheus/client_golang/prometheus" ) diff --git a/prometheus/metric_recorder.go b/prometheus/metric_recorder.go index 0d06a65dbc..335b5a1da0 100644 --- a/prometheus/metric_recorder.go +++ b/prometheus/metric_recorder.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/influxdata/influxdb/http/metric" + "github.com/influxdata/influxdb/v2/http/metric" "github.com/prometheus/client_golang/prometheus" ) diff --git a/prometheus/transformer_test.go b/prometheus/transformer_test.go index 90b371601c..fc79bebc12 100644 --- a/prometheus/transformer_test.go +++ b/prometheus/transformer_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - pr "github.com/influxdata/influxdb/prometheus" + pr "github.com/influxdata/influxdb/v2/prometheus" dto "github.com/prometheus/client_model/go" ) diff --git a/query/bridges.go b/query/bridges.go index 53328d5a86..9d3c429b75 100644 --- a/query/bridges.go +++ b/query/bridges.go @@ -7,9 +7,9 @@ import ( "github.com/influxdata/flux" "github.com/influxdata/flux/csv" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/check" - "github.com/influxdata/influxdb/kit/tracing" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/check" + "github.com/influxdata/influxdb/v2/kit/tracing" ) // QueryServiceBridge implements the QueryService interface while consuming the AsyncQueryService interface. diff --git a/query/bridges_test.go b/query/bridges_test.go index 9bb1a77d39..3ccd15c70a 100644 --- a/query/bridges_test.go +++ b/query/bridges_test.go @@ -10,8 +10,8 @@ import ( "github.com/influxdata/flux" "github.com/influxdata/flux/csv" "github.com/influxdata/flux/execute/executetest" - "github.com/influxdata/influxdb/query" - "github.com/influxdata/influxdb/query/mock" + "github.com/influxdata/influxdb/v2/query" + "github.com/influxdata/influxdb/v2/query/mock" ) type failWriter struct { diff --git a/query/builtin/builtin.go b/query/builtin/builtin.go index 73a0bae19e..61be85b0bd 100644 --- a/query/builtin/builtin.go +++ b/query/builtin/builtin.go @@ -6,8 +6,8 @@ package builtin import ( "github.com/influxdata/flux" - _ "github.com/influxdata/flux/stdlib" // Import the stdlib - _ "github.com/influxdata/influxdb/query/stdlib" // Import the stdlib + _ "github.com/influxdata/flux/stdlib" // Import the stdlib + _ "github.com/influxdata/influxdb/v2/query/stdlib" // Import the stdlib ) func init() { diff --git a/query/control/controller.go b/query/control/controller.go index ab8496cc61..861d4aaeb8 100644 --- a/query/control/controller.go +++ b/query/control/controller.go @@ -28,12 +28,12 @@ import ( "github.com/influxdata/flux/codes" "github.com/influxdata/flux/lang" "github.com/influxdata/flux/memory" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/errors" - "github.com/influxdata/influxdb/kit/prom" - "github.com/influxdata/influxdb/kit/tracing" - influxlogger "github.com/influxdata/influxdb/logger" - "github.com/influxdata/influxdb/query" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/errors" + "github.com/influxdata/influxdb/v2/kit/prom" + "github.com/influxdata/influxdb/v2/kit/tracing" + influxlogger "github.com/influxdata/influxdb/v2/logger" + "github.com/influxdata/influxdb/v2/query" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" "go.uber.org/zap/zapcore" diff --git a/query/control/controller_test.go b/query/control/controller_test.go index 3a28635084..a9357c0f9d 100644 --- a/query/control/controller_test.go +++ b/query/control/controller_test.go @@ -20,10 +20,10 @@ import ( "github.com/influxdata/flux/plan" "github.com/influxdata/flux/plan/plantest" "github.com/influxdata/flux/stdlib/universe" - "github.com/influxdata/influxdb/query" - _ "github.com/influxdata/influxdb/query/builtin" - "github.com/influxdata/influxdb/query/control" - "github.com/influxdata/influxdb/query/stdlib/influxdata/influxdb" + "github.com/influxdata/influxdb/v2/query" + _ "github.com/influxdata/influxdb/v2/query/builtin" + "github.com/influxdata/influxdb/v2/query/control" + "github.com/influxdata/influxdb/v2/query/stdlib/influxdata/influxdb" "github.com/prometheus/client_golang/prometheus" dto "github.com/prometheus/client_model/go" "go.uber.org/zap/zaptest" diff --git a/query/dependency.go b/query/dependency.go index be08bbec77..42f0514630 100644 --- a/query/dependency.go +++ b/query/dependency.go @@ -5,7 +5,7 @@ import ( "github.com/influxdata/flux" "github.com/influxdata/flux/codes" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) // FromBucketService wraps an platform.BucketService in the BucketLookup interface. diff --git a/query/dependency_test.go b/query/dependency_test.go index 73198900ef..05d454f010 100644 --- a/query/dependency_test.go +++ b/query/dependency_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/mock" - "github.com/influxdata/influxdb/query" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" + "github.com/influxdata/influxdb/v2/query" ) func TestSecretLookup(t *testing.T) { diff --git a/query/encode_test.go b/query/encode_test.go index 74e7019147..7321e13799 100644 --- a/query/encode_test.go +++ b/query/encode_test.go @@ -11,8 +11,8 @@ import ( "github.com/influxdata/flux/csv" "github.com/influxdata/flux/execute" "github.com/influxdata/flux/execute/executetest" - "github.com/influxdata/influxdb/query" - "github.com/influxdata/influxdb/query/mock" + "github.com/influxdata/influxdb/v2/query" + "github.com/influxdata/influxdb/v2/query/mock" ) func TestReturnNoContent(t *testing.T) { diff --git a/query/influxql/compiler.go b/query/influxql/compiler.go index 4eadb5ea74..38a54f1e84 100644 --- a/query/influxql/compiler.go +++ b/query/influxql/compiler.go @@ -7,7 +7,7 @@ import ( "github.com/influxdata/flux" "github.com/influxdata/flux/lang" "github.com/influxdata/flux/plan" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) const CompilerType = "influxql" diff --git a/query/influxql/compiler_test.go b/query/influxql/compiler_test.go index df733e8b85..f71b212183 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/influxdb/query/influxql" + "github.com/influxdata/influxdb/v2/query/influxql" ) func TestCompiler(t *testing.T) { diff --git a/query/influxql/dialect_test.go b/query/influxql/dialect_test.go index d746cbb949..f842c26926 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/influxdb/query/influxql" + "github.com/influxdata/influxdb/v2/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 35b7740169..cb734b220c 100644 --- a/query/influxql/end_to_end_test.go +++ b/query/influxql/end_to_end_test.go @@ -16,13 +16,13 @@ import ( ifql "github.com/influxdata/flux/influxql" "github.com/influxdata/flux/memory" fluxquerytest "github.com/influxdata/flux/querytest" - 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" - "github.com/influxdata/influxdb/query/querytest" - platformtesting "github.com/influxdata/influxdb/testing" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" + "github.com/influxdata/influxdb/v2/query" + _ "github.com/influxdata/influxdb/v2/query/builtin" + "github.com/influxdata/influxdb/v2/query/influxql" + "github.com/influxdata/influxdb/v2/query/querytest" + platformtesting "github.com/influxdata/influxdb/v2/testing" ) const generatedInfluxQLDataDir = "testdata" diff --git a/query/influxql/response_test.go b/query/influxql/response_test.go index ecd7a317a0..68c0293515 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/influxdb/query/influxql" + "github.com/influxdata/influxdb/v2/query/influxql" ) var crlfPattern = regexp.MustCompile(`\r?\n`) diff --git a/query/influxql/result_test.go b/query/influxql/result_test.go index 0da1f5efae..114917d3ac 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/influxdb/query/influxql" + "github.com/influxdata/influxdb/v2/query/influxql" ) func TestMultiResultEncoder_Encode(t *testing.T) { diff --git a/query/influxql/service.go b/query/influxql/service.go index 653a05f943..7ce98f9e0b 100644 --- a/query/influxql/service.go +++ b/query/influxql/service.go @@ -10,8 +10,8 @@ import ( "github.com/influxdata/flux" - "github.com/influxdata/influxdb/kit/tracing" - "github.com/influxdata/influxdb/query" + "github.com/influxdata/influxdb/v2/kit/tracing" + "github.com/influxdata/influxdb/v2/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 ff27d4f404..4784823be7 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/influxdb/query" - "github.com/influxdata/influxdb/query/influxql" + "github.com/influxdata/influxdb/v2/query" + "github.com/influxdata/influxdb/v2/query/influxql" ) func TestService(t *testing.T) { diff --git a/query/influxql/spectests/testing.go b/query/influxql/spectests/testing.go index 30f8005aab..623953b219 100644 --- a/query/influxql/spectests/testing.go +++ b/query/influxql/spectests/testing.go @@ -10,10 +10,10 @@ import ( "github.com/andreyvit/diff" "github.com/influxdata/flux/ast" "github.com/influxdata/flux/parser" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/mock" - "github.com/influxdata/influxdb/query/influxql" - platformtesting "github.com/influxdata/influxdb/testing" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" + "github.com/influxdata/influxdb/v2/query/influxql" + platformtesting "github.com/influxdata/influxdb/v2/testing" ) var dbrpMappingSvc = mock.NewDBRPMappingService() diff --git a/query/influxql/testdata/compspecs/compspecs.go b/query/influxql/testdata/compspecs/compspecs.go index 355f54ace2..18f185dc05 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" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/mock" - "github.com/influxdata/influxdb/query/influxql" - platformtesting "github.com/influxdata/influxdb/testing" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" + "github.com/influxdata/influxdb/v2/query/influxql" + platformtesting "github.com/influxdata/influxdb/v2/testing" ) func printUsage() { diff --git a/query/influxql/transpiler.go b/query/influxql/transpiler.go index 9835e97c7a..b7f73528dd 100644 --- a/query/influxql/transpiler.go +++ b/query/influxql/transpiler.go @@ -9,7 +9,7 @@ import ( "time" "github.com/influxdata/flux/ast" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" "github.com/influxdata/influxql" ) diff --git a/query/influxql/transpiler_test.go b/query/influxql/transpiler_test.go index 62a28a4201..9945338596 100644 --- a/query/influxql/transpiler_test.go +++ b/query/influxql/transpiler_test.go @@ -5,11 +5,11 @@ import ( "strings" "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" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" + "github.com/influxdata/influxdb/v2/query/influxql" + "github.com/influxdata/influxdb/v2/query/influxql/spectests" + platformtesting "github.com/influxdata/influxdb/v2/testing" "github.com/pkg/errors" ) diff --git a/query/logger.go b/query/logger.go index 457b4817c5..dd54c8dfba 100644 --- a/query/logger.go +++ b/query/logger.go @@ -4,7 +4,7 @@ import ( "time" "github.com/influxdata/flux" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) // Logger persists metadata about executed queries. diff --git a/query/logging.go b/query/logging.go index 8ec2941c40..b6ec55f623 100644 --- a/query/logging.go +++ b/query/logging.go @@ -9,8 +9,8 @@ import ( "github.com/influxdata/flux" "github.com/influxdata/flux/iocounter" - "github.com/influxdata/influxdb/kit/check" - "github.com/influxdata/influxdb/kit/tracing" + "github.com/influxdata/influxdb/v2/kit/check" + "github.com/influxdata/influxdb/v2/kit/tracing" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) diff --git a/query/logging_test.go b/query/logging_test.go index adafbb420d..eb2ad9364d 100644 --- a/query/logging_test.go +++ b/query/logging_test.go @@ -10,9 +10,9 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/influxdata/flux" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/query" - "github.com/influxdata/influxdb/query/mock" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/query" + "github.com/influxdata/influxdb/v2/query/mock" "github.com/opentracing/opentracing-go" "github.com/uber/jaeger-client-go" "go.uber.org/zap" diff --git a/query/mock/logger.go b/query/mock/logger.go index 572e2c2e90..e1805ef513 100644 --- a/query/mock/logger.go +++ b/query/mock/logger.go @@ -1,6 +1,6 @@ package mock -import "github.com/influxdata/influxdb/query" +import "github.com/influxdata/influxdb/v2/query" var _ query.Logger = (*QueryLogger)(nil) diff --git a/query/mock/service.go b/query/mock/service.go index 40c5459220..91f852879e 100644 --- a/query/mock/service.go +++ b/query/mock/service.go @@ -6,8 +6,8 @@ import ( "sync" "github.com/influxdata/flux" - "github.com/influxdata/influxdb/kit/check" - "github.com/influxdata/influxdb/query" + "github.com/influxdata/influxdb/v2/kit/check" + "github.com/influxdata/influxdb/v2/query" ) // ProxyQueryService mocks the idpe QueryService for testing. diff --git a/query/promql/internal/promqltests/end_to_end_test.go b/query/promql/internal/promqltests/end_to_end_test.go index ab1961026a..b281b38f90 100644 --- a/query/promql/internal/promqltests/end_to_end_test.go +++ b/query/promql/internal/promqltests/end_to_end_test.go @@ -3,7 +3,7 @@ package promqltests import ( "testing" - _ "github.com/influxdata/influxdb/query/builtin" + _ "github.com/influxdata/influxdb/v2/query/builtin" ) func TestPromQLEndToEnd(t *testing.T) { diff --git a/query/promql/internal/promqltests/engine.go b/query/promql/internal/promqltests/engine.go index 3caff9d054..3262816eef 100644 --- a/query/promql/internal/promqltests/engine.go +++ b/query/promql/internal/promqltests/engine.go @@ -16,10 +16,10 @@ import ( "github.com/influxdata/flux/ast" "github.com/influxdata/flux/lang" fpromql "github.com/influxdata/flux/promql" - "github.com/influxdata/influxdb/cmd/influxd/launcher" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/query" - itsdb "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/v2/cmd/influxd/launcher" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/query" + itsdb "github.com/influxdata/influxdb/v2/tsdb" ipromql "github.com/influxdata/promql/v2" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/pkg/labels" diff --git a/query/promql/query_test.go b/query/promql/query_test.go index 38fb2c8a1a..38f1d7b53f 100644 --- a/query/promql/query_test.go +++ b/query/promql/query_test.go @@ -12,7 +12,7 @@ import ( "github.com/influxdata/flux/semantic" "github.com/influxdata/flux/semantic/semantictest" "github.com/influxdata/flux/stdlib/universe" - "github.com/influxdata/influxdb/query/stdlib/influxdata/influxdb" + "github.com/influxdata/influxdb/v2/query/stdlib/influxdata/influxdb" ) func TestParsePromQL(t *testing.T) { diff --git a/query/promql/types.go b/query/promql/types.go index fc5c71dd46..69ff4dbdba 100644 --- a/query/promql/types.go +++ b/query/promql/types.go @@ -11,7 +11,7 @@ import ( "github.com/influxdata/flux/interpreter" "github.com/influxdata/flux/semantic" "github.com/influxdata/flux/stdlib/universe" - "github.com/influxdata/influxdb/query/stdlib/influxdata/influxdb" + "github.com/influxdata/influxdb/v2/query/stdlib/influxdata/influxdb" ) type ArgKind int diff --git a/query/query.go b/query/query.go index 8780127a74..dbab96aa56 100644 --- a/query/query.go +++ b/query/query.go @@ -5,7 +5,7 @@ import ( "math" "time" - "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/v2/models" "github.com/influxdata/influxql" ) diff --git a/query/querytest/compile.go b/query/querytest/compile.go index ac469a4250..ea0f27cc13 100644 --- a/query/querytest/compile.go +++ b/query/querytest/compile.go @@ -6,8 +6,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/influxdata/flux" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/query" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/query" ) type BucketsAccessedTestCase struct { diff --git a/query/querytest/compiler.go b/query/querytest/compiler.go index 4ac9b4b8b1..6d1de8a71d 100644 --- a/query/querytest/compiler.go +++ b/query/querytest/compiler.go @@ -3,8 +3,8 @@ package querytest import ( "github.com/influxdata/flux/plan" "github.com/influxdata/flux/stdlib/influxdata/influxdb/v1" - "github.com/influxdata/influxdb/query/influxql" - "github.com/influxdata/influxdb/query/stdlib/influxdata/influxdb" + "github.com/influxdata/influxdb/v2/query/influxql" + "github.com/influxdata/influxdb/v2/query/stdlib/influxdata/influxdb" ) // MakeFromInfluxJSONCompiler returns a compiler that replaces all From operations with FromJSON. diff --git a/query/request.go b/query/request.go index 47bd76adf9..6eec3b3bbf 100644 --- a/query/request.go +++ b/query/request.go @@ -7,7 +7,7 @@ import ( "net/http" "github.com/influxdata/flux" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) const ( diff --git a/query/service.go b/query/service.go index 79e41268b9..ffabf40174 100644 --- a/query/service.go +++ b/query/service.go @@ -5,7 +5,7 @@ import ( "io" "github.com/influxdata/flux" - "github.com/influxdata/influxdb/kit/check" + "github.com/influxdata/influxdb/v2/kit/check" ) // QueryService represents a type capable of performing queries. diff --git a/query/service_test.go b/query/service_test.go index e740c2c0ed..860b22d3bb 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/influxdb/query" - platformtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2/query" + platformtesting "github.com/influxdata/influxdb/v2/testing" ) var CmpOpts = []cmp.Option{ diff --git a/query/spec.go b/query/spec.go index 46d05f5583..1261bf79dc 100644 --- a/query/spec.go +++ b/query/spec.go @@ -6,7 +6,7 @@ import ( "github.com/influxdata/flux" "github.com/influxdata/flux/ast" "github.com/influxdata/flux/lang" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) // BucketAwareOperationSpec specifies an operation that reads or writes buckets diff --git a/query/stdlib/experimental/to.go b/query/stdlib/experimental/to.go index 29e859ca65..a44921e365 100644 --- a/query/stdlib/experimental/to.go +++ b/query/stdlib/experimental/to.go @@ -11,12 +11,12 @@ import ( "github.com/influxdata/flux/plan" "github.com/influxdata/flux/semantic" "github.com/influxdata/flux/stdlib/experimental" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/query" - "github.com/influxdata/influxdb/query/stdlib/influxdata/influxdb" - "github.com/influxdata/influxdb/storage" - "github.com/influxdata/influxdb/tsdb" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/query" + "github.com/influxdata/influxdb/v2/query/stdlib/influxdata/influxdb" + "github.com/influxdata/influxdb/v2/storage" + "github.com/influxdata/influxdb/v2/tsdb" ) // ToKind is the kind for the `to` flux function diff --git a/query/stdlib/experimental/to_test.go b/query/stdlib/experimental/to_test.go index 0210841a59..65f562b3f2 100644 --- a/query/stdlib/experimental/to_test.go +++ b/query/stdlib/experimental/to_test.go @@ -13,14 +13,14 @@ import ( "github.com/influxdata/flux/execute/executetest" "github.com/influxdata/flux/querytest" "github.com/influxdata/flux/stdlib/universe" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/mock" - "github.com/influxdata/influxdb/models" - _ "github.com/influxdata/influxdb/query/builtin" - pquerytest "github.com/influxdata/influxdb/query/querytest" - "github.com/influxdata/influxdb/query/stdlib/experimental" - "github.com/influxdata/influxdb/query/stdlib/influxdata/influxdb" - "github.com/influxdata/influxdb/tsdb" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" + "github.com/influxdata/influxdb/v2/models" + _ "github.com/influxdata/influxdb/v2/query/builtin" + pquerytest "github.com/influxdata/influxdb/v2/query/querytest" + "github.com/influxdata/influxdb/v2/query/stdlib/experimental" + "github.com/influxdata/influxdb/v2/query/stdlib/influxdata/influxdb" + "github.com/influxdata/influxdb/v2/tsdb" ) func TestTo_Query(t *testing.T) { diff --git a/query/stdlib/influxdata/influxdb/buckets.go b/query/stdlib/influxdata/influxdb/buckets.go index 4fd36f948d..0a41282908 100644 --- a/query/stdlib/influxdata/influxdb/buckets.go +++ b/query/stdlib/influxdata/influxdb/buckets.go @@ -11,8 +11,8 @@ import ( "github.com/influxdata/flux/plan" "github.com/influxdata/flux/stdlib/influxdata/influxdb" "github.com/influxdata/flux/values" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/query" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/query" ) func init() { diff --git a/query/stdlib/influxdata/influxdb/dependencies.go b/query/stdlib/influxdata/influxdb/dependencies.go index 3303c27589..4a1691bed1 100644 --- a/query/stdlib/influxdata/influxdb/dependencies.go +++ b/query/stdlib/influxdata/influxdb/dependencies.go @@ -4,10 +4,10 @@ import ( "context" "github.com/influxdata/flux" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/prom" - "github.com/influxdata/influxdb/query" - "github.com/influxdata/influxdb/storage" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/prom" + "github.com/influxdata/influxdb/v2/query" + "github.com/influxdata/influxdb/v2/storage" "github.com/prometheus/client_golang/prometheus" ) diff --git a/query/stdlib/influxdata/influxdb/from.go b/query/stdlib/influxdata/influxdb/from.go index cdd6789c19..5c8f5f6079 100644 --- a/query/stdlib/influxdata/influxdb/from.go +++ b/query/stdlib/influxdata/influxdb/from.go @@ -8,7 +8,7 @@ import ( "github.com/influxdata/flux/plan" "github.com/influxdata/flux/semantic" "github.com/influxdata/flux/stdlib/influxdata/influxdb" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) const FromKind = "influxDBFrom" diff --git a/query/stdlib/influxdata/influxdb/from_test.go b/query/stdlib/influxdata/influxdb/from_test.go index dac3b13eee..a77ddd6a88 100644 --- a/query/stdlib/influxdata/influxdb/from_test.go +++ b/query/stdlib/influxdata/influxdb/from_test.go @@ -11,9 +11,9 @@ import ( "github.com/influxdata/flux/plan/plantest" "github.com/influxdata/flux/querytest" "github.com/influxdata/flux/stdlib/universe" - platform "github.com/influxdata/influxdb" - pquerytest "github.com/influxdata/influxdb/query/querytest" - "github.com/influxdata/influxdb/query/stdlib/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" + pquerytest "github.com/influxdata/influxdb/v2/query/querytest" + "github.com/influxdata/influxdb/v2/query/stdlib/influxdata/influxdb" ) func TestFrom_NewQuery(t *testing.T) { diff --git a/query/stdlib/influxdata/influxdb/metrics.go b/query/stdlib/influxdata/influxdb/metrics.go index 82577e3a57..1673fbce32 100644 --- a/query/stdlib/influxdata/influxdb/metrics.go +++ b/query/stdlib/influxdata/influxdb/metrics.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" "github.com/prometheus/client_golang/prometheus" ) diff --git a/query/stdlib/influxdata/influxdb/operators.go b/query/stdlib/influxdata/influxdb/operators.go index 4203b074be..c2395943a5 100644 --- a/query/stdlib/influxdata/influxdb/operators.go +++ b/query/stdlib/influxdata/influxdb/operators.go @@ -9,7 +9,7 @@ import ( "github.com/influxdata/flux/plan" "github.com/influxdata/flux/semantic" "github.com/influxdata/flux/values" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) const ( diff --git a/query/stdlib/influxdata/influxdb/rules_test.go b/query/stdlib/influxdata/influxdb/rules_test.go index b4f7b79efe..903c1bc6b0 100644 --- a/query/stdlib/influxdata/influxdb/rules_test.go +++ b/query/stdlib/influxdata/influxdb/rules_test.go @@ -12,7 +12,7 @@ import ( "github.com/influxdata/flux/plan/plantest" "github.com/influxdata/flux/semantic" "github.com/influxdata/flux/stdlib/universe" - "github.com/influxdata/influxdb/query/stdlib/influxdata/influxdb" + "github.com/influxdata/influxdb/v2/query/stdlib/influxdata/influxdb" ) func fluxTime(t int64) flux.Time { diff --git a/query/stdlib/influxdata/influxdb/source.go b/query/stdlib/influxdata/influxdb/source.go index 0ace5b7dc5..ab1d501f12 100644 --- a/query/stdlib/influxdata/influxdb/source.go +++ b/query/stdlib/influxdata/influxdb/source.go @@ -11,10 +11,10 @@ import ( "github.com/influxdata/flux/memory" "github.com/influxdata/flux/plan" "github.com/influxdata/flux/semantic" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/tracing" - "github.com/influxdata/influxdb/query" - "github.com/influxdata/influxdb/tsdb/cursors" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/tracing" + "github.com/influxdata/influxdb/v2/query" + "github.com/influxdata/influxdb/v2/tsdb/cursors" ) func init() { diff --git a/query/stdlib/influxdata/influxdb/source_test.go b/query/stdlib/influxdata/influxdb/source_test.go index 1cdda0f935..6304f03024 100644 --- a/query/stdlib/influxdata/influxdb/source_test.go +++ b/query/stdlib/influxdata/influxdb/source_test.go @@ -9,12 +9,12 @@ import ( "github.com/influxdata/flux/dependencies/dependenciestest" "github.com/influxdata/flux/execute" "github.com/influxdata/flux/memory" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/prom/promtest" - "github.com/influxdata/influxdb/mock" - "github.com/influxdata/influxdb/query/stdlib/influxdata/influxdb" - "github.com/influxdata/influxdb/tsdb/cursors" - "github.com/influxdata/influxdb/uuid" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/prom/promtest" + "github.com/influxdata/influxdb/v2/mock" + "github.com/influxdata/influxdb/v2/query/stdlib/influxdata/influxdb" + "github.com/influxdata/influxdb/v2/tsdb/cursors" + "github.com/influxdata/influxdb/v2/uuid" "github.com/prometheus/client_golang/prometheus" ) diff --git a/query/stdlib/influxdata/influxdb/storage.go b/query/stdlib/influxdata/influxdb/storage.go index 4f574fb20e..7ca559b42b 100644 --- a/query/stdlib/influxdata/influxdb/storage.go +++ b/query/stdlib/influxdata/influxdb/storage.go @@ -8,9 +8,9 @@ import ( "github.com/influxdata/flux/execute" "github.com/influxdata/flux/memory" "github.com/influxdata/flux/semantic" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/prom" - "github.com/influxdata/influxdb/tsdb/cursors" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/prom" + "github.com/influxdata/influxdb/v2/tsdb/cursors" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" ) diff --git a/query/stdlib/influxdata/influxdb/to.go b/query/stdlib/influxdata/influxdb/to.go index a70161bf32..57c58bd2e1 100644 --- a/query/stdlib/influxdata/influxdb/to.go +++ b/query/stdlib/influxdata/influxdb/to.go @@ -17,12 +17,12 @@ import ( "github.com/influxdata/flux/stdlib/influxdata/influxdb" "github.com/influxdata/flux/stdlib/kafka" "github.com/influxdata/flux/values" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/tracing" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/query" - "github.com/influxdata/influxdb/storage" - "github.com/influxdata/influxdb/tsdb" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/tracing" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/query" + "github.com/influxdata/influxdb/v2/storage" + "github.com/influxdata/influxdb/v2/tsdb" ) // ToKind is the kind for the `to` flux function diff --git a/query/stdlib/influxdata/influxdb/to_test.go b/query/stdlib/influxdata/influxdb/to_test.go index 8afc9128a8..e124a6a3a7 100644 --- a/query/stdlib/influxdata/influxdb/to_test.go +++ b/query/stdlib/influxdata/influxdb/to_test.go @@ -15,13 +15,13 @@ import ( "github.com/influxdata/flux/querytest" "github.com/influxdata/flux/semantic" "github.com/influxdata/flux/values/valuestest" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/mock" - "github.com/influxdata/influxdb/models" - _ "github.com/influxdata/influxdb/query/builtin" - pquerytest "github.com/influxdata/influxdb/query/querytest" - "github.com/influxdata/influxdb/query/stdlib/influxdata/influxdb" - "github.com/influxdata/influxdb/tsdb" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" + "github.com/influxdata/influxdb/v2/models" + _ "github.com/influxdata/influxdb/v2/query/builtin" + pquerytest "github.com/influxdata/influxdb/v2/query/querytest" + "github.com/influxdata/influxdb/v2/query/stdlib/influxdata/influxdb" + "github.com/influxdata/influxdb/v2/tsdb" ) func TestTo_Query(t *testing.T) { diff --git a/query/stdlib/influxdata/influxdb/v1/databases.go b/query/stdlib/influxdata/influxdb/v1/databases.go index 6a6c59a76c..670b283fc2 100644 --- a/query/stdlib/influxdata/influxdb/v1/databases.go +++ b/query/stdlib/influxdata/influxdb/v1/databases.go @@ -11,8 +11,8 @@ import ( "github.com/influxdata/flux/plan" "github.com/influxdata/flux/stdlib/influxdata/influxdb/v1" "github.com/influxdata/flux/values" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/query" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/query" "github.com/pkg/errors" ) diff --git a/query/stdlib/packages.go b/query/stdlib/packages.go index 3e856f4693..9271bdfc65 100644 --- a/query/stdlib/packages.go +++ b/query/stdlib/packages.go @@ -2,8 +2,8 @@ package stdlib // Import all stdlib packages import ( - _ "github.com/influxdata/influxdb/query/stdlib/experimental" - _ "github.com/influxdata/influxdb/query/stdlib/influxdata/influxdb" - _ "github.com/influxdata/influxdb/query/stdlib/influxdata/influxdb/v1" - _ "github.com/influxdata/influxdb/query/stdlib/testing" + _ "github.com/influxdata/influxdb/v2/query/stdlib/experimental" + _ "github.com/influxdata/influxdb/v2/query/stdlib/influxdata/influxdb" + _ "github.com/influxdata/influxdb/v2/query/stdlib/influxdata/influxdb/v1" + _ "github.com/influxdata/influxdb/v2/query/stdlib/testing" ) diff --git a/query/stdlib/testing/end_to_end_test.go b/query/stdlib/testing/end_to_end_test.go index 03168581df..32d6a8eed5 100644 --- a/query/stdlib/testing/end_to_end_test.go +++ b/query/stdlib/testing/end_to_end_test.go @@ -14,14 +14,13 @@ import ( "github.com/influxdata/flux/parser" "github.com/influxdata/flux/stdlib" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/cmd/influxd/launcher" - influxdbcontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/mock" - "github.com/influxdata/influxdb/query" - itesting "github.com/influxdata/influxdb/query/stdlib/testing" - - _ "github.com/influxdata/influxdb/query/stdlib" // Import the stdlib + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/cmd/influxd/launcher" + influxdbcontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/mock" + "github.com/influxdata/influxdb/v2/query" + _ "github.com/influxdata/influxdb/v2/query/stdlib" + itesting "github.com/influxdata/influxdb/v2/query/stdlib/testing" // Import the stdlib ) // Default context. diff --git a/rand/id.go b/rand/id.go index 091e8db106..c8ffb1ee2c 100644 --- a/rand/id.go +++ b/rand/id.go @@ -5,7 +5,7 @@ import ( "math/rand" "sync" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) var _ influxdb.IDGenerator = (*OrgBucketID)(nil) diff --git a/rand/id_test.go b/rand/id_test.go index f04757be52..82c57f46cc 100644 --- a/rand/id_test.go +++ b/rand/id_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) func TestOrgBucketID_ID(t *testing.T) { diff --git a/rand/token.go b/rand/token.go index db00662591..0e84d6cb84 100644 --- a/rand/token.go +++ b/rand/token.go @@ -4,7 +4,7 @@ import ( "crypto/rand" "encoding/base64" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) // TODO: rename to token.go diff --git a/resource/noop/resource_logger.go b/resource/noop/resource_logger.go index ca080fb6f1..1bc0eef091 100644 --- a/resource/noop/resource_logger.go +++ b/resource/noop/resource_logger.go @@ -1,6 +1,6 @@ package noop -import "github.com/influxdata/influxdb/resource" +import "github.com/influxdata/influxdb/v2/resource" type ResourceLogger struct{} diff --git a/resource/resource.go b/resource/resource.go index fef41b21e0..86a55d5d63 100644 --- a/resource/resource.go +++ b/resource/resource.go @@ -7,7 +7,7 @@ package resource import ( "time" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) // Logger records changes to resources. diff --git a/snowflake/id.go b/snowflake/id.go index 4101dd2bce..33d4a297f3 100644 --- a/snowflake/id.go +++ b/snowflake/id.go @@ -6,8 +6,8 @@ import ( "sync" "time" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/pkg/snowflake" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/pkg/snowflake" ) func init() { diff --git a/snowflake/id_test.go b/snowflake/id_test.go index 0a39ae438a..b53f2efd56 100644 --- a/snowflake/id_test.go +++ b/snowflake/id_test.go @@ -3,7 +3,7 @@ package snowflake import ( "testing" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) func TestIDLength(t *testing.T) { diff --git a/source/bucket.go b/source/bucket.go index b4cd524d6a..fa05ae8dfc 100644 --- a/source/bucket.go +++ b/source/bucket.go @@ -3,9 +3,9 @@ package source import ( "fmt" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/http" - "github.com/influxdata/influxdb/http/influxdb" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/http" + "github.com/influxdata/influxdb/v2/http/influxdb" ) // NewBucketService creates a bucket service from a source. diff --git a/source/query.go b/source/query.go index 70781a68ac..37869214b3 100644 --- a/source/query.go +++ b/source/query.go @@ -3,10 +3,10 @@ package source import ( "fmt" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/http" - "github.com/influxdata/influxdb/http/influxdb" - "github.com/influxdata/influxdb/query" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/http" + "github.com/influxdata/influxdb/v2/http/influxdb" + "github.com/influxdata/influxdb/v2/query" ) // NewQueryService creates a bucket service from a source. diff --git a/storage/bucket_service.go b/storage/bucket_service.go index 45b463f599..59f6bb7b6d 100644 --- a/storage/bucket_service.go +++ b/storage/bucket_service.go @@ -4,8 +4,8 @@ import ( "context" "errors" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/tracing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/tracing" ) // BucketDeleter defines the behaviour of deleting a bucket. diff --git a/storage/bucket_service_test.go b/storage/bucket_service_test.go index a116100772..d2072227c1 100644 --- a/storage/bucket_service_test.go +++ b/storage/bucket_service_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/inmem" - "github.com/influxdata/influxdb/kv" - "github.com/influxdata/influxdb/storage" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/inmem" + "github.com/influxdata/influxdb/v2/kv" + "github.com/influxdata/influxdb/v2/storage" "go.uber.org/zap/zaptest" ) diff --git a/storage/compat/compat.go b/storage/compat/compat.go index f31411826f..44ebdb4367 100644 --- a/storage/compat/compat.go +++ b/storage/compat/compat.go @@ -8,9 +8,9 @@ package compat import ( - "github.com/influxdata/influxdb/storage" - "github.com/influxdata/influxdb/toml" - "github.com/influxdata/influxdb/tsdb/tsm1" + "github.com/influxdata/influxdb/v2/storage" + "github.com/influxdata/influxdb/v2/toml" + "github.com/influxdata/influxdb/v2/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 36b61226a8..8d7fd6d2fe 100644 --- a/storage/config.go +++ b/storage/config.go @@ -4,10 +4,10 @@ import ( "path/filepath" "time" - "github.com/influxdata/influxdb/toml" - "github.com/influxdata/influxdb/tsdb/seriesfile" - "github.com/influxdata/influxdb/tsdb/tsi1" - "github.com/influxdata/influxdb/tsdb/tsm1" + "github.com/influxdata/influxdb/v2/toml" + "github.com/influxdata/influxdb/v2/tsdb/seriesfile" + "github.com/influxdata/influxdb/v2/tsdb/tsi1" + "github.com/influxdata/influxdb/v2/tsdb/tsm1" ) // Default configuration values. diff --git a/storage/engine.go b/storage/engine.go index e88ad32e79..01fb8c920b 100644 --- a/storage/engine.go +++ b/storage/engine.go @@ -12,18 +12,18 @@ import ( "sync" "time" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/tracing" - "github.com/influxdata/influxdb/logger" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/pkg/limiter" - "github.com/influxdata/influxdb/storage/wal" - "github.com/influxdata/influxdb/tsdb" - "github.com/influxdata/influxdb/tsdb/cursors" - "github.com/influxdata/influxdb/tsdb/seriesfile" - "github.com/influxdata/influxdb/tsdb/tsi1" - "github.com/influxdata/influxdb/tsdb/tsm1" - "github.com/influxdata/influxdb/tsdb/value" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/tracing" + "github.com/influxdata/influxdb/v2/logger" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/pkg/limiter" + "github.com/influxdata/influxdb/v2/storage/wal" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/cursors" + "github.com/influxdata/influxdb/v2/tsdb/seriesfile" + "github.com/influxdata/influxdb/v2/tsdb/tsi1" + "github.com/influxdata/influxdb/v2/tsdb/tsm1" + "github.com/influxdata/influxdb/v2/tsdb/value" "github.com/influxdata/influxql" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" diff --git a/storage/engine_measurement_schema.go b/storage/engine_measurement_schema.go index 94d0827a7d..bdd8af577f 100644 --- a/storage/engine_measurement_schema.go +++ b/storage/engine_measurement_schema.go @@ -3,8 +3,8 @@ package storage import ( "context" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/tsdb/cursors" "github.com/influxdata/influxql" ) diff --git a/storage/engine_schema.go b/storage/engine_schema.go index f8eb17d25b..7d29eb3a21 100644 --- a/storage/engine_schema.go +++ b/storage/engine_schema.go @@ -3,8 +3,8 @@ package storage import ( "context" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/tsdb/cursors" "github.com/influxdata/influxql" ) diff --git a/storage/engine_test.go b/storage/engine_test.go index f7289b993f..9cfe35bcbe 100644 --- a/storage/engine_test.go +++ b/storage/engine_test.go @@ -10,13 +10,13 @@ import ( "testing" "time" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/prom/promtest" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/storage" - "github.com/influxdata/influxdb/storage/reads/datatypes" - "github.com/influxdata/influxdb/tsdb" - "github.com/influxdata/influxdb/tsdb/tsm1" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/prom/promtest" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/storage" + "github.com/influxdata/influxdb/v2/storage/reads/datatypes" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/tsm1" "github.com/prometheus/client_golang/prometheus" ) diff --git a/storage/flux/predicate.go b/storage/flux/predicate.go index 3cc70ab6f6..f6dd6e3159 100644 --- a/storage/flux/predicate.go +++ b/storage/flux/predicate.go @@ -5,8 +5,8 @@ import ( "github.com/influxdata/flux/ast" "github.com/influxdata/flux/semantic" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/storage/reads/datatypes" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/storage/reads/datatypes" "github.com/pkg/errors" ) diff --git a/storage/flux/reader.go b/storage/flux/reader.go index bf83f547c6..204b073a82 100644 --- a/storage/flux/reader.go +++ b/storage/flux/reader.go @@ -10,11 +10,11 @@ import ( "github.com/influxdata/flux/execute" "github.com/influxdata/flux/memory" "github.com/influxdata/flux/values" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/query/stdlib/influxdata/influxdb" - storage "github.com/influxdata/influxdb/storage/reads" - "github.com/influxdata/influxdb/storage/reads/datatypes" - "github.com/influxdata/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/query/stdlib/influxdata/influxdb" + storage "github.com/influxdata/influxdb/v2/storage/reads" + "github.com/influxdata/influxdb/v2/storage/reads/datatypes" + "github.com/influxdata/influxdb/v2/tsdb/cursors" ) type storageTable interface { diff --git a/storage/flux/table.gen.go b/storage/flux/table.gen.go index 502e06e1e6..6740532b8d 100644 --- a/storage/flux/table.gen.go +++ b/storage/flux/table.gen.go @@ -13,9 +13,9 @@ import ( "github.com/influxdata/flux/arrow" "github.com/influxdata/flux/execute" "github.com/influxdata/flux/memory" - "github.com/influxdata/influxdb/models" - storage "github.com/influxdata/influxdb/storage/reads" - "github.com/influxdata/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2/models" + storage "github.com/influxdata/influxdb/v2/storage/reads" + "github.com/influxdata/influxdb/v2/tsdb/cursors" "github.com/pkg/errors" ) diff --git a/storage/flux/table.go b/storage/flux/table.go index 707b3b945c..67950924e8 100644 --- a/storage/flux/table.go +++ b/storage/flux/table.go @@ -11,7 +11,7 @@ import ( "github.com/influxdata/flux/arrow" "github.com/influxdata/flux/execute" "github.com/influxdata/flux/memory" - "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/v2/models" ) type table struct { diff --git a/storage/flux/table_test.go b/storage/flux/table_test.go index 3cadfb2a42..a0685ea20a 100644 --- a/storage/flux/table_test.go +++ b/storage/flux/table_test.go @@ -14,14 +14,14 @@ import ( "github.com/influxdata/flux/execute" "github.com/influxdata/flux/memory" "github.com/influxdata/flux/values" - "github.com/influxdata/influxdb/cmd/influxd/generate" - "github.com/influxdata/influxdb/mock" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/pkg/data/gen" - "github.com/influxdata/influxdb/query/stdlib/influxdata/influxdb" - "github.com/influxdata/influxdb/storage" - storageflux "github.com/influxdata/influxdb/storage/flux" - "github.com/influxdata/influxdb/storage/readservice" + "github.com/influxdata/influxdb/v2/cmd/influxd/generate" + "github.com/influxdata/influxdb/v2/mock" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/pkg/data/gen" + "github.com/influxdata/influxdb/v2/query/stdlib/influxdata/influxdb" + "github.com/influxdata/influxdb/v2/storage" + storageflux "github.com/influxdata/influxdb/v2/storage/flux" + "github.com/influxdata/influxdb/v2/storage/readservice" "go.uber.org/zap/zaptest" ) diff --git a/storage/points_writer.go b/storage/points_writer.go index 439d8bca6e..0be5cd2c49 100644 --- a/storage/points_writer.go +++ b/storage/points_writer.go @@ -3,7 +3,7 @@ package storage import ( "context" - "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/v2/models" ) // PointsWriter describes the ability to write points into a storage engine. diff --git a/storage/points_writer_test.go b/storage/points_writer_test.go index 5be0b4cb0e..d6a5037e54 100644 --- a/storage/points_writer_test.go +++ b/storage/points_writer_test.go @@ -8,12 +8,11 @@ import ( "errors" "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/storage" - "github.com/influxdata/influxdb/tsdb" - - "github.com/influxdata/influxdb/mock" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/storage" + "github.com/influxdata/influxdb/v2/tsdb" ) func TestBufferedPointsWriter(t *testing.T) { diff --git a/storage/reads/array_cursor.gen.go b/storage/reads/array_cursor.gen.go index 32f652f022..9ef41c3950 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/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2/tsdb/cursors" ) const ( diff --git a/storage/reads/array_cursor.go b/storage/reads/array_cursor.go index 869f33cd65..00b925bc43 100644 --- a/storage/reads/array_cursor.go +++ b/storage/reads/array_cursor.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/influxdata/influxdb/storage/reads/datatypes" - "github.com/influxdata/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2/storage/reads/datatypes" + "github.com/influxdata/influxdb/v2/tsdb/cursors" ) type singleValue struct { diff --git a/storage/reads/group_resultset.go b/storage/reads/group_resultset.go index 06366996f2..069ac4c35b 100644 --- a/storage/reads/group_resultset.go +++ b/storage/reads/group_resultset.go @@ -6,10 +6,10 @@ import ( "fmt" "sort" - "github.com/influxdata/influxdb/kit/tracing" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/storage/reads/datatypes" - "github.com/influxdata/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2/kit/tracing" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/storage/reads/datatypes" + "github.com/influxdata/influxdb/v2/tsdb/cursors" ) type groupResultSet struct { diff --git a/storage/reads/group_resultset_test.go b/storage/reads/group_resultset_test.go index ee13d16167..4187a9c9f7 100644 --- a/storage/reads/group_resultset_test.go +++ b/storage/reads/group_resultset_test.go @@ -7,10 +7,10 @@ import ( "github.com/google/go-cmp/cmp" - "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" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/pkg/data/gen" + "github.com/influxdata/influxdb/v2/storage/reads" + "github.com/influxdata/influxdb/v2/storage/reads/datatypes" ) func TestNewGroupResultSet_Sorting(t *testing.T) { diff --git a/storage/reads/influxql_predicate.go b/storage/reads/influxql_predicate.go index 7aeb8f78a7..f7f4e49bbf 100644 --- a/storage/reads/influxql_predicate.go +++ b/storage/reads/influxql_predicate.go @@ -3,7 +3,7 @@ package reads import ( "regexp" - "github.com/influxdata/influxdb/storage/reads/datatypes" + "github.com/influxdata/influxdb/v2/storage/reads/datatypes" "github.com/influxdata/influxql" "github.com/pkg/errors" ) diff --git a/storage/reads/influxql_predicate_test.go b/storage/reads/influxql_predicate_test.go index d8e0bc13ae..718867e7d6 100644 --- a/storage/reads/influxql_predicate_test.go +++ b/storage/reads/influxql_predicate_test.go @@ -3,8 +3,8 @@ package reads_test import ( "testing" - "github.com/influxdata/influxdb/storage/reads" - "github.com/influxdata/influxdb/storage/reads/datatypes" + "github.com/influxdata/influxdb/v2/storage/reads" + "github.com/influxdata/influxdb/v2/storage/reads/datatypes" ) func TestHasFieldValueKey(t *testing.T) { diff --git a/storage/reads/keymerger.go b/storage/reads/keymerger.go index ed5501d94e..da47ee2c1b 100644 --- a/storage/reads/keymerger.go +++ b/storage/reads/keymerger.go @@ -4,7 +4,7 @@ import ( "bytes" "strings" - "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/v2/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 8814405528..f779bf4b2a 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/influxdb/models" + "github.com/influxdata/influxdb/v2/models" ) func TestKeyMerger_MergeTagKeys(t *testing.T) { diff --git a/storage/reads/predicate.go b/storage/reads/predicate.go index 99249f099b..a94f4777ce 100644 --- a/storage/reads/predicate.go +++ b/storage/reads/predicate.go @@ -4,7 +4,7 @@ import ( "bytes" "strconv" - "github.com/influxdata/influxdb/storage/reads/datatypes" + "github.com/influxdata/influxdb/v2/storage/reads/datatypes" ) // NodeVisitor can be called by Walk to traverse the Node hierarchy. diff --git a/storage/reads/predicate_test.go b/storage/reads/predicate_test.go index dcdeeaa915..1e8643c9f9 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/influxdb/storage/reads" - "github.com/influxdata/influxdb/storage/reads/datatypes" + "github.com/influxdata/influxdb/v2/storage/reads" + "github.com/influxdata/influxdb/v2/storage/reads/datatypes" ) func TestPredicateToExprString(t *testing.T) { diff --git a/storage/reads/resultset.go b/storage/reads/resultset.go index eaaaa61f6b..45dc6a2973 100644 --- a/storage/reads/resultset.go +++ b/storage/reads/resultset.go @@ -3,9 +3,9 @@ package reads import ( "context" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/storage/reads/datatypes" - "github.com/influxdata/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/storage/reads/datatypes" + "github.com/influxdata/influxdb/v2/tsdb/cursors" ) type resultSet struct { diff --git a/storage/reads/resultset_lineprotocol.go b/storage/reads/resultset_lineprotocol.go index f821aa6b88..7bfc938d8f 100644 --- a/storage/reads/resultset_lineprotocol.go +++ b/storage/reads/resultset_lineprotocol.go @@ -5,8 +5,8 @@ import ( "io" "strconv" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/tsdb/cursors" ) // ResultSetToLineProtocol transforms rs to line protocol and writes the diff --git a/storage/reads/series_cursor.go b/storage/reads/series_cursor.go index e9bf3c7e43..ffc7292c1f 100644 --- a/storage/reads/series_cursor.go +++ b/storage/reads/series_cursor.go @@ -4,13 +4,13 @@ import ( "context" "fmt" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/tracing" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/query" - "github.com/influxdata/influxdb/storage" - "github.com/influxdata/influxdb/storage/reads/datatypes" - "github.com/influxdata/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/tracing" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/query" + "github.com/influxdata/influxdb/v2/storage" + "github.com/influxdata/influxdb/v2/storage/reads/datatypes" + "github.com/influxdata/influxdb/v2/tsdb/cursors" "github.com/influxdata/influxql" ) diff --git a/storage/reads/series_cursor_test.go b/storage/reads/series_cursor_test.go index ae78914fe7..ea531baa99 100644 --- a/storage/reads/series_cursor_test.go +++ b/storage/reads/series_cursor_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/storage" - "github.com/influxdata/influxdb/storage/reads/datatypes" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/storage" + "github.com/influxdata/influxdb/v2/storage/reads/datatypes" "github.com/influxdata/influxql" ) diff --git a/storage/reads/store.go b/storage/reads/store.go index 8918794b37..215f5befb9 100644 --- a/storage/reads/store.go +++ b/storage/reads/store.go @@ -4,9 +4,9 @@ import ( "context" "github.com/gogo/protobuf/proto" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/storage/reads/datatypes" - "github.com/influxdata/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/storage/reads/datatypes" + "github.com/influxdata/influxdb/v2/tsdb/cursors" ) type ResultSet interface { diff --git a/storage/reads/store_test.go b/storage/reads/store_test.go index 432e0b34f9..304557a93a 100644 --- a/storage/reads/store_test.go +++ b/storage/reads/store_test.go @@ -6,9 +6,9 @@ import ( "io" "strings" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/storage/reads" - "github.com/influxdata/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/storage/reads" + "github.com/influxdata/influxdb/v2/tsdb/cursors" ) func cursorToString(wr io.Writer, cur cursors.Cursor) { diff --git a/storage/reads/tagsbuffer.go b/storage/reads/tagsbuffer.go index b58966ff53..e0982b0b27 100644 --- a/storage/reads/tagsbuffer.go +++ b/storage/reads/tagsbuffer.go @@ -1,7 +1,7 @@ package reads import ( - "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/v2/models" ) type tagsBuffer struct { diff --git a/storage/reads/viewer.go b/storage/reads/viewer.go index 2002ee07ff..6be7e1fd20 100644 --- a/storage/reads/viewer.go +++ b/storage/reads/viewer.go @@ -3,9 +3,9 @@ package reads import ( "context" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/storage" - "github.com/influxdata/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/storage" + "github.com/influxdata/influxdb/v2/tsdb/cursors" "github.com/influxdata/influxql" ) diff --git a/storage/readservice/service.go b/storage/readservice/service.go index f2db72b9e0..9ac62c13c7 100644 --- a/storage/readservice/service.go +++ b/storage/readservice/service.go @@ -1,8 +1,8 @@ package readservice import ( - "github.com/influxdata/influxdb/query" - "github.com/influxdata/influxdb/query/control" + "github.com/influxdata/influxdb/v2/query" + "github.com/influxdata/influxdb/v2/query/control" ) // NewProxyQueryService returns a proxy query service based on the given queryController diff --git a/storage/readservice/source.go b/storage/readservice/source.go index 68981e77ef..8c9f4b0cb6 100644 --- a/storage/readservice/source.go +++ b/storage/readservice/source.go @@ -2,7 +2,7 @@ package readservice import ( "github.com/gogo/protobuf/types" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) // this is easier than fooling around with .proto files. diff --git a/storage/readservice/store.go b/storage/readservice/store.go index f9bb76fafa..2f2aa7f55b 100644 --- a/storage/readservice/store.go +++ b/storage/readservice/store.go @@ -5,11 +5,11 @@ import ( "errors" "github.com/gogo/protobuf/proto" - "github.com/influxdata/influxdb/kit/tracing" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/storage/reads" - "github.com/influxdata/influxdb/storage/reads/datatypes" - "github.com/influxdata/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2/kit/tracing" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/storage/reads" + "github.com/influxdata/influxdb/v2/storage/reads/datatypes" + "github.com/influxdata/influxdb/v2/tsdb/cursors" "github.com/influxdata/influxql" ) diff --git a/storage/retention.go b/storage/retention.go index 24ef613fd4..d623021f91 100644 --- a/storage/retention.go +++ b/storage/retention.go @@ -6,10 +6,10 @@ import ( "math" "time" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/tracing" - "github.com/influxdata/influxdb/logger" - "github.com/influxdata/influxdb/tsdb/tsm1" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/tracing" + "github.com/influxdata/influxdb/v2/logger" + "github.com/influxdata/influxdb/v2/tsdb/tsm1" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" "go.uber.org/zap/zapcore" diff --git a/storage/retention_test.go b/storage/retention_test.go index fddf4ab6fd..b49e920341 100644 --- a/storage/retention_test.go +++ b/storage/retention_test.go @@ -14,12 +14,12 @@ import ( "testing" "time" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/prom/promtest" - "github.com/influxdata/influxdb/logger" - "github.com/influxdata/influxdb/toml" - "github.com/influxdata/influxdb/tsdb" - "github.com/influxdata/influxdb/tsdb/tsm1" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/prom/promtest" + "github.com/influxdata/influxdb/v2/logger" + "github.com/influxdata/influxdb/v2/toml" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/tsm1" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" ) diff --git a/storage/series_cursor.go b/storage/series_cursor.go index e864a6eef9..7cbf032ace 100644 --- a/storage/series_cursor.go +++ b/storage/series_cursor.go @@ -4,12 +4,12 @@ import ( "bytes" "errors" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/pkg/lifecycle" - "github.com/influxdata/influxdb/tsdb" - "github.com/influxdata/influxdb/tsdb/seriesfile" - "github.com/influxdata/influxdb/tsdb/tsi1" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/pkg/lifecycle" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/seriesfile" + "github.com/influxdata/influxdb/v2/tsdb/tsi1" "github.com/influxdata/influxql" ) diff --git a/storage/series_cursor_test.go b/storage/series_cursor_test.go index 41a76c8e80..e3da14d1bd 100644 --- a/storage/series_cursor_test.go +++ b/storage/series_cursor_test.go @@ -4,9 +4,9 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/tsdb" - "github.com/influxdata/influxdb/tsdb/seriesfile" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/seriesfile" ) func Test_NewSeriesCursor_UnexpectedOrg(t *testing.T) { diff --git a/storage/wal/dump.go b/storage/wal/dump.go index 311c1dce71..b1dd290294 100644 --- a/storage/wal/dump.go +++ b/storage/wal/dump.go @@ -9,9 +9,9 @@ import ( "sort" "text/tabwriter" - "github.com/influxdata/influxdb/storage/reads/datatypes" - "github.com/influxdata/influxdb/tsdb" - "github.com/influxdata/influxdb/tsdb/value" + "github.com/influxdata/influxdb/v2/storage/reads/datatypes" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/value" ) // Command represents the program execution for "influxd inspect dumpmwal diff --git a/storage/wal/dump_test.go b/storage/wal/dump_test.go index e73ddefb21..cdf3dabf2a 100644 --- a/storage/wal/dump_test.go +++ b/storage/wal/dump_test.go @@ -9,12 +9,11 @@ import ( "sort" "testing" - "github.com/influxdata/influxdb/tsdb" - "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/tsdb/value" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/value" ) func TestWalDump_RunWriteEntries(t *testing.T) { diff --git a/storage/wal/metrics_test.go b/storage/wal/metrics_test.go index 12025892f7..cfb7a215d3 100644 --- a/storage/wal/metrics_test.go +++ b/storage/wal/metrics_test.go @@ -3,7 +3,7 @@ package wal import ( "testing" - "github.com/influxdata/influxdb/kit/prom/promtest" + "github.com/influxdata/influxdb/v2/kit/prom/promtest" "github.com/prometheus/client_golang/prometheus" ) diff --git a/storage/wal/verifier_test.go b/storage/wal/verifier_test.go index e7f8f973a0..69e10fcdd7 100644 --- a/storage/wal/verifier_test.go +++ b/storage/wal/verifier_test.go @@ -4,8 +4,8 @@ import ( "context" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/influxdata/influxdb/kit/errors" - "github.com/influxdata/influxdb/tsdb/value" + "github.com/influxdata/influxdb/v2/kit/errors" + "github.com/influxdata/influxdb/v2/tsdb/value" "io/ioutil" "math/rand" "os" diff --git a/storage/wal/wal.go b/storage/wal/wal.go index 1c71f9757a..f6c90cef0a 100644 --- a/storage/wal/wal.go +++ b/storage/wal/wal.go @@ -21,11 +21,11 @@ import ( "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/tracing" - "github.com/influxdata/influxdb/pkg/limiter" - "github.com/influxdata/influxdb/pkg/pool" - "github.com/influxdata/influxdb/tsdb/value" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/tracing" + "github.com/influxdata/influxdb/v2/pkg/limiter" + "github.com/influxdata/influxdb/v2/pkg/pool" + "github.com/influxdata/influxdb/v2/tsdb/value" ) const ( diff --git a/storage/wal/wal_test.go b/storage/wal/wal_test.go index 2ccd2ca044..904a599f38 100644 --- a/storage/wal/wal_test.go +++ b/storage/wal/wal_test.go @@ -11,8 +11,8 @@ import ( "github.com/golang/snappy" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/tsdb/value" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/tsdb/value" ) func TestWALWriter_WriteMulti_Single(t *testing.T) { diff --git a/tag_test.go b/tag_test.go index fc13252a8e..a23917fdd1 100644 --- a/tag_test.go +++ b/tag_test.go @@ -3,8 +3,8 @@ package influxdb_test import ( "testing" - "github.com/influxdata/influxdb" - influxTesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + influxTesting "github.com/influxdata/influxdb/v2/testing" ) func TestTagValid(t *testing.T) { diff --git a/task.go b/task.go index 2aad09b64b..ac817c82b1 100644 --- a/task.go +++ b/task.go @@ -11,7 +11,7 @@ import ( "github.com/influxdata/flux/ast" "github.com/influxdata/flux/ast/edit" "github.com/influxdata/flux/parser" - "github.com/influxdata/influxdb/task/options" + "github.com/influxdata/influxdb/v2/task/options" ) const ( diff --git a/task/backend/analytical_storage.go b/task/backend/analytical_storage.go index 44f1205022..38b00fe1b9 100644 --- a/task/backend/analytical_storage.go +++ b/task/backend/analytical_storage.go @@ -9,9 +9,9 @@ import ( "github.com/influxdata/flux" "github.com/influxdata/flux/lang" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/query" - "github.com/influxdata/influxdb/storage" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/query" + "github.com/influxdata/influxdb/v2/storage" "go.uber.org/zap" ) diff --git a/task/backend/analytical_storage_test.go b/task/backend/analytical_storage_test.go index 1743c92399..16c1327f06 100644 --- a/task/backend/analytical_storage_test.go +++ b/task/backend/analytical_storage_test.go @@ -8,20 +8,20 @@ import ( "time" "github.com/influxdata/flux" - "github.com/influxdata/influxdb" - icontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/inmem" - "github.com/influxdata/influxdb/kv" - "github.com/influxdata/influxdb/mock" - "github.com/influxdata/influxdb/query" - _ "github.com/influxdata/influxdb/query/builtin" - "github.com/influxdata/influxdb/query/control" - stdlib "github.com/influxdata/influxdb/query/stdlib/influxdata/influxdb" - "github.com/influxdata/influxdb/storage" - storageflux "github.com/influxdata/influxdb/storage/flux" - "github.com/influxdata/influxdb/storage/readservice" - "github.com/influxdata/influxdb/task/backend" - "github.com/influxdata/influxdb/task/servicetest" + "github.com/influxdata/influxdb/v2" + icontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/inmem" + "github.com/influxdata/influxdb/v2/kv" + "github.com/influxdata/influxdb/v2/mock" + "github.com/influxdata/influxdb/v2/query" + _ "github.com/influxdata/influxdb/v2/query/builtin" + "github.com/influxdata/influxdb/v2/query/control" + stdlib "github.com/influxdata/influxdb/v2/query/stdlib/influxdata/influxdb" + "github.com/influxdata/influxdb/v2/storage" + storageflux "github.com/influxdata/influxdb/v2/storage/flux" + "github.com/influxdata/influxdb/v2/storage/readservice" + "github.com/influxdata/influxdb/v2/task/backend" + "github.com/influxdata/influxdb/v2/task/servicetest" "go.uber.org/zap" "go.uber.org/zap/zaptest" ) diff --git a/task/backend/coordinator.go b/task/backend/coordinator.go index a4b7707530..231e1861ec 100644 --- a/task/backend/coordinator.go +++ b/task/backend/coordinator.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" "go.uber.org/zap" ) diff --git a/task/backend/coordinator/coordinator.go b/task/backend/coordinator/coordinator.go index c885bfd27b..b76cf3ce88 100644 --- a/task/backend/coordinator/coordinator.go +++ b/task/backend/coordinator/coordinator.go @@ -5,10 +5,10 @@ import ( "errors" "time" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/task/backend/executor" - "github.com/influxdata/influxdb/task/backend/middleware" - "github.com/influxdata/influxdb/task/backend/scheduler" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/task/backend/executor" + "github.com/influxdata/influxdb/v2/task/backend/middleware" + "github.com/influxdata/influxdb/v2/task/backend/scheduler" "go.uber.org/zap" ) diff --git a/task/backend/coordinator/coordinator_test.go b/task/backend/coordinator/coordinator_test.go index b1c7d953a0..40f03a566a 100644 --- a/task/backend/coordinator/coordinator_test.go +++ b/task/backend/coordinator/coordinator_test.go @@ -8,8 +8,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/task/backend/scheduler" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/task/backend/scheduler" "go.uber.org/zap/zaptest" ) diff --git a/task/backend/coordinator/support_test.go b/task/backend/coordinator/support_test.go index 0a69eba568..6bbab72cdb 100644 --- a/task/backend/coordinator/support_test.go +++ b/task/backend/coordinator/support_test.go @@ -3,9 +3,9 @@ package coordinator import ( "context" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/task/backend/executor" - "github.com/influxdata/influxdb/task/backend/scheduler" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/task/backend/executor" + "github.com/influxdata/influxdb/v2/task/backend/scheduler" ) var _ Executor = (*executorE)(nil) diff --git a/task/backend/coordinator_test.go b/task/backend/coordinator_test.go index ebdc4af170..a9a1ee9fee 100644 --- a/task/backend/coordinator_test.go +++ b/task/backend/coordinator_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" "go.uber.org/zap/zaptest" ) diff --git a/task/backend/executor/executor.go b/task/backend/executor/executor.go index 07b90b23c2..12e18df633 100644 --- a/task/backend/executor/executor.go +++ b/task/backend/executor/executor.go @@ -8,12 +8,12 @@ import ( "github.com/influxdata/flux" "github.com/influxdata/flux/lang" - "github.com/influxdata/influxdb" - icontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/kit/tracing" - "github.com/influxdata/influxdb/query" - "github.com/influxdata/influxdb/task/backend" - "github.com/influxdata/influxdb/task/backend/scheduler" + "github.com/influxdata/influxdb/v2" + icontext "github.com/influxdata/influxdb/v2/context" + "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" "go.uber.org/zap" ) diff --git a/task/backend/executor/executor_metrics.go b/task/backend/executor/executor_metrics.go index 46f0096fe6..f12c451de2 100644 --- a/task/backend/executor/executor_metrics.go +++ b/task/backend/executor/executor_metrics.go @@ -3,7 +3,7 @@ package executor import ( "time" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" "github.com/prometheus/client_golang/prometheus" ) diff --git a/task/backend/executor/executor_test.go b/task/backend/executor/executor_test.go index 44213b7a9d..994a76013c 100644 --- a/task/backend/executor/executor_test.go +++ b/task/backend/executor/executor_test.go @@ -11,16 +11,16 @@ import ( "time" "github.com/influxdata/flux" - "github.com/influxdata/influxdb" - icontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/inmem" - "github.com/influxdata/influxdb/kit/prom" - "github.com/influxdata/influxdb/kit/prom/promtest" - tracetest "github.com/influxdata/influxdb/kit/tracing/testing" - "github.com/influxdata/influxdb/kv" - "github.com/influxdata/influxdb/query" - "github.com/influxdata/influxdb/task/backend" - "github.com/influxdata/influxdb/task/backend/scheduler" + "github.com/influxdata/influxdb/v2" + icontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/inmem" + "github.com/influxdata/influxdb/v2/kit/prom" + "github.com/influxdata/influxdb/v2/kit/prom/promtest" + tracetest "github.com/influxdata/influxdb/v2/kit/tracing/testing" + "github.com/influxdata/influxdb/v2/kv" + "github.com/influxdata/influxdb/v2/query" + "github.com/influxdata/influxdb/v2/task/backend" + "github.com/influxdata/influxdb/v2/task/backend/scheduler" "github.com/opentracing/opentracing-go" "github.com/uber/jaeger-client-go" "go.uber.org/zap/zaptest" diff --git a/task/backend/executor/limits.go b/task/backend/executor/limits.go index de20fea561..398c8850a7 100644 --- a/task/backend/executor/limits.go +++ b/task/backend/executor/limits.go @@ -4,8 +4,8 @@ import ( "context" "sort" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/task/options" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/task/options" ) // 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 dd8dd1228f..ded209119b 100644 --- a/task/backend/executor/limits_test.go +++ b/task/backend/executor/limits_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) var ( diff --git a/task/backend/executor/support_test.go b/task/backend/executor/support_test.go index 5513e6bc27..ddc98b16db 100644 --- a/task/backend/executor/support_test.go +++ b/task/backend/executor/support_test.go @@ -13,10 +13,10 @@ import ( "github.com/influxdata/flux/lang" "github.com/influxdata/flux/memory" "github.com/influxdata/flux/values" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kv" - "github.com/influxdata/influxdb/query" - _ "github.com/influxdata/influxdb/query/builtin" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kv" + "github.com/influxdata/influxdb/v2/query" + _ "github.com/influxdata/influxdb/v2/query/builtin" ) type fakeQueryService struct { diff --git a/task/backend/middleware/check_middleware.go b/task/backend/middleware/check_middleware.go index 3c9198bd12..58f9e04b28 100644 --- a/task/backend/middleware/check_middleware.go +++ b/task/backend/middleware/check_middleware.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) // 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 4f22c65bae..d3815cd6e4 100644 --- a/task/backend/middleware/check_middleware_test.go +++ b/task/backend/middleware/check_middleware_test.go @@ -6,11 +6,11 @@ import ( "testing" "time" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/mock" - "github.com/influxdata/influxdb/notification/check" - "github.com/influxdata/influxdb/notification/rule" - "github.com/influxdata/influxdb/task/backend/middleware" + "github.com/influxdata/influxdb/v2" + "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" ) type pipingCoordinator struct { diff --git a/task/backend/middleware/middleware.go b/task/backend/middleware/middleware.go index f5ed67ab9b..cbd88d5898 100644 --- a/task/backend/middleware/middleware.go +++ b/task/backend/middleware/middleware.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) // 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 695a7da50c..a7e7c81545 100644 --- a/task/backend/middleware/middleware_test.go +++ b/task/backend/middleware/middleware_test.go @@ -7,15 +7,15 @@ import ( "testing" "time" - "github.com/influxdata/influxdb" - pmock "github.com/influxdata/influxdb/mock" - _ "github.com/influxdata/influxdb/query/builtin" - "github.com/influxdata/influxdb/snowflake" - "github.com/influxdata/influxdb/task/backend" - "github.com/influxdata/influxdb/task/backend/coordinator" - "github.com/influxdata/influxdb/task/backend/middleware" - "github.com/influxdata/influxdb/task/backend/scheduler" - "github.com/influxdata/influxdb/task/mock" + "github.com/influxdata/influxdb/v2" + pmock "github.com/influxdata/influxdb/v2/mock" + _ "github.com/influxdata/influxdb/v2/query/builtin" + "github.com/influxdata/influxdb/v2/snowflake" + "github.com/influxdata/influxdb/v2/task/backend" + "github.com/influxdata/influxdb/v2/task/backend/coordinator" + "github.com/influxdata/influxdb/v2/task/backend/middleware" + "github.com/influxdata/influxdb/v2/task/backend/scheduler" + "github.com/influxdata/influxdb/v2/task/mock" "go.uber.org/zap/zaptest" ) diff --git a/task/backend/middleware/notification_middleware.go b/task/backend/middleware/notification_middleware.go index 0f16574899..0d9974be1c 100644 --- a/task/backend/middleware/notification_middleware.go +++ b/task/backend/middleware/notification_middleware.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) // 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 aff28630f5..f1f8e78a50 100644 --- a/task/backend/middleware/notification_middleware_test.go +++ b/task/backend/middleware/notification_middleware_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/notification/rule" - "github.com/influxdata/influxdb/task/backend/middleware" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/notification/rule" + "github.com/influxdata/influxdb/v2/task/backend/middleware" ) func newNotificationRuleSvcStack() (mockedSvc, *middleware.CoordinatingNotificationRuleStore) { diff --git a/task/backend/run_recorder.go b/task/backend/run_recorder.go index cb7337937b..36a8818c49 100644 --- a/task/backend/run_recorder.go +++ b/task/backend/run_recorder.go @@ -6,10 +6,10 @@ import ( "fmt" "time" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/storage" - "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/storage" + "github.com/influxdata/influxdb/v2/tsdb" "go.uber.org/zap" ) diff --git a/task/backend/schedulable_task_service.go b/task/backend/schedulable_task_service.go index 4c6f291830..f94c63622c 100644 --- a/task/backend/schedulable_task_service.go +++ b/task/backend/schedulable_task_service.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/task/backend/scheduler" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/task/backend/scheduler" ) var _ scheduler.SchedulableService = (*SchedulableTaskService)(nil) diff --git a/task/backend/schedulable_task_service_test.go b/task/backend/schedulable_task_service_test.go index e4e28ff388..46c7281bac 100644 --- a/task/backend/schedulable_task_service_test.go +++ b/task/backend/schedulable_task_service_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/task/backend/scheduler" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/task/backend/scheduler" ) var ( diff --git a/task/backend/scheduler/scheduler.go b/task/backend/scheduler/scheduler.go index c0e7fb8485..801070472c 100644 --- a/task/backend/scheduler/scheduler.go +++ b/task/backend/scheduler/scheduler.go @@ -6,7 +6,7 @@ import ( "time" "github.com/influxdata/cron" - "github.com/influxdata/influxdb/task/options" + "github.com/influxdata/influxdb/v2/task/options" ) // ID duplicates the influxdb ID so users of the scheduler don't have to diff --git a/task/backend/task.go b/task/backend/task.go index f99c2df686..0b7fc28107 100644 --- a/task/backend/task.go +++ b/task/backend/task.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) // 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 7510278fcc..05b51d8b2b 100644 --- a/task/mock/executor.go +++ b/task/mock/executor.go @@ -7,9 +7,9 @@ import ( "sync" "time" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/task/backend/executor" - "github.com/influxdata/influxdb/task/backend/scheduler" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/task/backend/executor" + "github.com/influxdata/influxdb/v2/task/backend/scheduler" ) type promise struct { diff --git a/task/mock/task_control_service.go b/task/mock/task_control_service.go index 348d93b8bf..eecac8d26d 100644 --- a/task/mock/task_control_service.go +++ b/task/mock/task_control_service.go @@ -7,9 +7,9 @@ import ( "sync" "time" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/snowflake" - "github.com/influxdata/influxdb/task/backend" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/snowflake" + "github.com/influxdata/influxdb/v2/task/backend" ) var idgen = snowflake.NewDefaultIDGenerator() diff --git a/task/options/options.go b/task/options/options.go index 8198fc275a..0c4d792056 100644 --- a/task/options/options.go +++ b/task/options/options.go @@ -13,7 +13,7 @@ import ( "github.com/influxdata/flux/parser" "github.com/influxdata/flux/semantic" "github.com/influxdata/flux/values" - "github.com/influxdata/influxdb/pkg/pointer" + "github.com/influxdata/influxdb/v2/pkg/pointer" ) const maxConcurrency = 100 diff --git a/task/options/options_test.go b/task/options/options_test.go index a791451104..db6acbe973 100644 --- a/task/options/options_test.go +++ b/task/options/options_test.go @@ -8,9 +8,9 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb/pkg/pointer" - _ "github.com/influxdata/influxdb/query/builtin" - "github.com/influxdata/influxdb/task/options" + "github.com/influxdata/influxdb/v2/pkg/pointer" + _ "github.com/influxdata/influxdb/v2/query/builtin" + "github.com/influxdata/influxdb/v2/task/options" ) func scriptGenerator(opt options.Options, body string) string { diff --git a/task/servicetest/servicetest.go b/task/servicetest/servicetest.go index e381b02bac..252870f563 100644 --- a/task/servicetest/servicetest.go +++ b/task/servicetest/servicetest.go @@ -17,10 +17,10 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - icontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/task/backend" - "github.com/influxdata/influxdb/task/options" + "github.com/influxdata/influxdb/v2" + icontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/task/backend" + "github.com/influxdata/influxdb/v2/task/options" ) // BackendComponentFactory is supplied by consumers of the adaptertest package, diff --git a/task_test.go b/task_test.go index a42f773df2..22120c49c0 100644 --- a/task_test.go +++ b/task_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/google/go-cmp/cmp" - platform "github.com/influxdata/influxdb" - _ "github.com/influxdata/influxdb/query/builtin" - "github.com/influxdata/influxdb/task/options" + platform "github.com/influxdata/influxdb/v2" + _ "github.com/influxdata/influxdb/v2/query/builtin" + "github.com/influxdata/influxdb/v2/task/options" ) func TestUpdateValidate(t *testing.T) { diff --git a/telegraf.go b/telegraf.go index 62dafda94b..131a7bac6a 100644 --- a/telegraf.go +++ b/telegraf.go @@ -7,9 +7,9 @@ import ( "regexp" "github.com/BurntSushi/toml" - "github.com/influxdata/influxdb/telegraf/plugins" - "github.com/influxdata/influxdb/telegraf/plugins/inputs" - "github.com/influxdata/influxdb/telegraf/plugins/outputs" + "github.com/influxdata/influxdb/v2/telegraf/plugins" + "github.com/influxdata/influxdb/v2/telegraf/plugins/inputs" + "github.com/influxdata/influxdb/v2/telegraf/plugins/outputs" ) const ( diff --git a/telegraf/plugins/inputs/base.go b/telegraf/plugins/inputs/base.go index 56cd919b07..136adb3ffe 100644 --- a/telegraf/plugins/inputs/base.go +++ b/telegraf/plugins/inputs/base.go @@ -1,6 +1,6 @@ package inputs -import "github.com/influxdata/influxdb/telegraf/plugins" +import "github.com/influxdata/influxdb/v2/telegraf/plugins" type baseInput int diff --git a/telegraf/plugins/inputs/inputs_test.go b/telegraf/plugins/inputs/inputs_test.go index 41b5168636..cf42ed3241 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/influxdb/telegraf/plugins" + "github.com/influxdata/influxdb/v2/telegraf/plugins" ) // local plugin diff --git a/telegraf/plugins/outputs/base.go b/telegraf/plugins/outputs/base.go index 7bc8b9a8d2..0c1e7196ac 100644 --- a/telegraf/plugins/outputs/base.go +++ b/telegraf/plugins/outputs/base.go @@ -1,6 +1,6 @@ package outputs -import "github.com/influxdata/influxdb/telegraf/plugins" +import "github.com/influxdata/influxdb/v2/telegraf/plugins" type baseOutput int diff --git a/telegraf/plugins/outputs/outputs_test.go b/telegraf/plugins/outputs/outputs_test.go index 3da3774b9e..f25dba1caf 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/influxdb/telegraf/plugins" + "github.com/influxdata/influxdb/v2/telegraf/plugins" ) // local plugin diff --git a/telegraf_test.go b/telegraf_test.go index 637db7fb64..a9235c0201 100644 --- a/telegraf_test.go +++ b/telegraf_test.go @@ -8,9 +8,9 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/influxdata/influxdb/telegraf/plugins" - "github.com/influxdata/influxdb/telegraf/plugins/inputs" - "github.com/influxdata/influxdb/telegraf/plugins/outputs" + "github.com/influxdata/influxdb/v2/telegraf/plugins" + "github.com/influxdata/influxdb/v2/telegraf/plugins/inputs" + "github.com/influxdata/influxdb/v2/telegraf/plugins/outputs" "github.com/stretchr/testify/require" ) diff --git a/telemetry/handler.go b/telemetry/handler.go index 22986cc13e..fc72803454 100644 --- a/telemetry/handler.go +++ b/telemetry/handler.go @@ -9,7 +9,7 @@ import ( "go.uber.org/zap" - "github.com/influxdata/influxdb/prometheus" + "github.com/influxdata/influxdb/v2/prometheus" dto "github.com/prometheus/client_model/go" "github.com/prometheus/common/expfmt" ) diff --git a/telemetry/handler_test.go b/telemetry/handler_test.go index 40fa9308a5..24f553ff0d 100644 --- a/telemetry/handler_test.go +++ b/telemetry/handler_test.go @@ -12,7 +12,7 @@ import ( "time" "github.com/gogo/protobuf/proto" - pr "github.com/influxdata/influxdb/prometheus" + pr "github.com/influxdata/influxdb/v2/prometheus" dto "github.com/prometheus/client_model/go" "github.com/prometheus/common/expfmt" "go.uber.org/zap/zaptest" diff --git a/telemetry/metrics.go b/telemetry/metrics.go index 97837a62b1..e6a9c46c89 100644 --- a/telemetry/metrics.go +++ b/telemetry/metrics.go @@ -1,7 +1,7 @@ package telemetry import ( - pr "github.com/influxdata/influxdb/prometheus" + pr "github.com/influxdata/influxdb/v2/prometheus" ) var telemetryMatcher = pr.NewMatcher(). diff --git a/telemetry/push.go b/telemetry/push.go index c2fa4a31f7..1c89dca09f 100644 --- a/telemetry/push.go +++ b/telemetry/push.go @@ -9,7 +9,7 @@ import ( "net/http" "time" - pr "github.com/influxdata/influxdb/prometheus" + pr "github.com/influxdata/influxdb/v2/prometheus" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/expfmt" ) diff --git a/telemetry/reporter.go b/telemetry/reporter.go index ec1ba7accd..5429f9f395 100644 --- a/telemetry/reporter.go +++ b/telemetry/reporter.go @@ -4,7 +4,7 @@ import ( "context" "time" - influxlogger "github.com/influxdata/influxdb/logger" + influxlogger "github.com/influxdata/influxdb/v2/logger" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" ) diff --git a/telemetry/reporter_test.go b/telemetry/reporter_test.go index ead60516e2..ea130569ce 100644 --- a/telemetry/reporter_test.go +++ b/telemetry/reporter_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - pr "github.com/influxdata/influxdb/prometheus" + pr "github.com/influxdata/influxdb/v2/prometheus" "github.com/prometheus/client_golang/prometheus" dto "github.com/prometheus/client_model/go" "go.uber.org/zap/zaptest" diff --git a/telemetry/timestamps.go b/telemetry/timestamps.go index d0944ef379..7a32f0948f 100644 --- a/telemetry/timestamps.go +++ b/telemetry/timestamps.go @@ -3,7 +3,7 @@ package telemetry import ( "time" - "github.com/influxdata/influxdb/prometheus" + "github.com/influxdata/influxdb/v2/prometheus" dto "github.com/prometheus/client_model/go" ) diff --git a/telemetry/timestamps_test.go b/telemetry/timestamps_test.go index 537bcd1e99..c98fc80dde 100644 --- a/telemetry/timestamps_test.go +++ b/telemetry/timestamps_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/gogo/protobuf/proto" - pr "github.com/influxdata/influxdb/prometheus" + pr "github.com/influxdata/influxdb/v2/prometheus" dto "github.com/prometheus/client_model/go" ) diff --git a/tenant/duplicate_reads.go b/tenant/duplicate_reads.go index 6046d17013..65dbf0e656 100644 --- a/tenant/duplicate_reads.go +++ b/tenant/duplicate_reads.go @@ -6,8 +6,8 @@ import ( "sort" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kv" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kv" "go.uber.org/zap" ) diff --git a/tenant/error.go b/tenant/error.go index 0649f42c81..cf54cf8da4 100644 --- a/tenant/error.go +++ b/tenant/error.go @@ -1,7 +1,7 @@ package tenant import ( - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) var ( diff --git a/tenant/error_bucket.go b/tenant/error_bucket.go index 76d7c765e3..7412683b2c 100644 --- a/tenant/error_bucket.go +++ b/tenant/error_bucket.go @@ -3,7 +3,7 @@ package tenant import ( "fmt" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) var ( diff --git a/tenant/error_org.go b/tenant/error_org.go index 3ce0eda60b..2db5874191 100644 --- a/tenant/error_org.go +++ b/tenant/error_org.go @@ -3,7 +3,7 @@ package tenant import ( "fmt" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) var ( diff --git a/tenant/error_urm.go b/tenant/error_urm.go index cd17e03180..ced00eefaa 100644 --- a/tenant/error_urm.go +++ b/tenant/error_urm.go @@ -3,7 +3,7 @@ package tenant import ( "fmt" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) var ( diff --git a/tenant/error_user.go b/tenant/error_user.go index 49b53ebfda..79192f35d1 100644 --- a/tenant/error_user.go +++ b/tenant/error_user.go @@ -3,7 +3,7 @@ package tenant import ( "fmt" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) var ( diff --git a/tenant/http_client_bucket.go b/tenant/http_client_bucket.go index 862b9b2ca7..50a521b444 100644 --- a/tenant/http_client_bucket.go +++ b/tenant/http_client_bucket.go @@ -5,9 +5,9 @@ import ( "fmt" "path" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/tracing" - "github.com/influxdata/influxdb/pkg/httpc" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/tracing" + "github.com/influxdata/influxdb/v2/pkg/httpc" ) // BucketClientService connects to Influx via HTTP using tokens to manage buckets diff --git a/tenant/http_client_org.go b/tenant/http_client_org.go index a3a9e54a2b..545b2b0c70 100644 --- a/tenant/http_client_org.go +++ b/tenant/http_client_org.go @@ -3,9 +3,9 @@ package tenant import ( "context" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/tracing" - "github.com/influxdata/influxdb/pkg/httpc" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/tracing" + "github.com/influxdata/influxdb/v2/pkg/httpc" ) // OrgClientService connects to Influx via HTTP using tokens to manage organizations diff --git a/tenant/http_client_user.go b/tenant/http_client_user.go index 73ce863688..55823a982f 100644 --- a/tenant/http_client_user.go +++ b/tenant/http_client_user.go @@ -4,9 +4,9 @@ import ( "context" "net/http" - "github.com/influxdata/influxdb" - ihttp "github.com/influxdata/influxdb/http" - "github.com/influxdata/influxdb/pkg/httpc" + "github.com/influxdata/influxdb/v2" + ihttp "github.com/influxdata/influxdb/v2/http" + "github.com/influxdata/influxdb/v2/pkg/httpc" ) // UserService connects to Influx via HTTP using tokens to manage users diff --git a/tenant/http_handler_urm.go b/tenant/http_handler_urm.go index 137c594ebd..700fafc3f1 100644 --- a/tenant/http_handler_urm.go +++ b/tenant/http_handler_urm.go @@ -8,8 +8,8 @@ import ( "path" "github.com/go-chi/chi" - "github.com/influxdata/influxdb" - kithttp "github.com/influxdata/influxdb/kit/transport/http" + "github.com/influxdata/influxdb/v2" + kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" "go.uber.org/zap" ) diff --git a/tenant/http_handler_urm_test.go b/tenant/http_handler_urm_test.go index 9395b363c7..ff9f9bde40 100644 --- a/tenant/http_handler_urm_test.go +++ b/tenant/http_handler_urm_test.go @@ -12,9 +12,9 @@ import ( "github.com/go-chi/chi" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/mock" - "github.com/influxdata/influxdb/tenant" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" + "github.com/influxdata/influxdb/v2/tenant" "go.uber.org/zap/zaptest" ) diff --git a/tenant/http_server.go b/tenant/http_server.go index 0c65fc00a5..72ade9324a 100644 --- a/tenant/http_server.go +++ b/tenant/http_server.go @@ -5,7 +5,7 @@ import ( "net/http" "strconv" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) // findOptionsParams converts find options into a paramiterizated key pair diff --git a/tenant/http_server_bucket.go b/tenant/http_server_bucket.go index 1f0686bbb0..c6f49fc83a 100644 --- a/tenant/http_server_bucket.go +++ b/tenant/http_server_bucket.go @@ -9,8 +9,8 @@ import ( "github.com/go-chi/chi" "github.com/go-chi/chi/middleware" - "github.com/influxdata/influxdb" - kithttp "github.com/influxdata/influxdb/kit/transport/http" + "github.com/influxdata/influxdb/v2" + kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" "go.uber.org/zap" ) diff --git a/tenant/http_server_bucket_test.go b/tenant/http_server_bucket_test.go index 4b71bd9662..ec1e4943c6 100644 --- a/tenant/http_server_bucket_test.go +++ b/tenant/http_server_bucket_test.go @@ -6,10 +6,10 @@ import ( "testing" "github.com/go-chi/chi" - "github.com/influxdata/influxdb" - ihttp "github.com/influxdata/influxdb/http" - "github.com/influxdata/influxdb/tenant" - itesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + ihttp "github.com/influxdata/influxdb/v2/http" + "github.com/influxdata/influxdb/v2/tenant" + itesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/tenant/http_server_org.go b/tenant/http_server_org.go index f723c19db0..841c9b343e 100644 --- a/tenant/http_server_org.go +++ b/tenant/http_server_org.go @@ -6,8 +6,8 @@ import ( "github.com/go-chi/chi" "github.com/go-chi/chi/middleware" - "github.com/influxdata/influxdb" - kithttp "github.com/influxdata/influxdb/kit/transport/http" + "github.com/influxdata/influxdb/v2" + kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" "go.uber.org/zap" ) diff --git a/tenant/http_server_org_test.go b/tenant/http_server_org_test.go index ef56dd5618..33219af8fc 100644 --- a/tenant/http_server_org_test.go +++ b/tenant/http_server_org_test.go @@ -6,10 +6,10 @@ import ( "testing" "github.com/go-chi/chi" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/http" - "github.com/influxdata/influxdb/tenant" - itesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/http" + "github.com/influxdata/influxdb/v2/tenant" + itesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/tenant/http_server_user.go b/tenant/http_server_user.go index 0c1486b356..7b209226cd 100644 --- a/tenant/http_server_user.go +++ b/tenant/http_server_user.go @@ -9,9 +9,9 @@ import ( "github.com/go-chi/chi" "github.com/go-chi/chi/middleware" - "github.com/influxdata/influxdb" - icontext "github.com/influxdata/influxdb/context" - kithttp "github.com/influxdata/influxdb/kit/transport/http" + "github.com/influxdata/influxdb/v2" + icontext "github.com/influxdata/influxdb/v2/context" + kithttp "github.com/influxdata/influxdb/v2/kit/transport/http" "go.uber.org/zap" ) diff --git a/tenant/http_server_user_test.go b/tenant/http_server_user_test.go index d455e6aca3..cf69a5b888 100644 --- a/tenant/http_server_user_test.go +++ b/tenant/http_server_user_test.go @@ -6,10 +6,10 @@ import ( "testing" "github.com/go-chi/chi" - platform "github.com/influxdata/influxdb" - ihttp "github.com/influxdata/influxdb/http" - "github.com/influxdata/influxdb/tenant" - platformtesting "github.com/influxdata/influxdb/testing" + platform "github.com/influxdata/influxdb/v2" + ihttp "github.com/influxdata/influxdb/v2/http" + "github.com/influxdata/influxdb/v2/tenant" + platformtesting "github.com/influxdata/influxdb/v2/testing" "go.uber.org/zap/zaptest" ) diff --git a/tenant/middleware_bucket_logging.go b/tenant/middleware_bucket_logging.go index 569e2e4fa7..6bcb601652 100644 --- a/tenant/middleware_bucket_logging.go +++ b/tenant/middleware_bucket_logging.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" "go.uber.org/zap" ) diff --git a/tenant/middleware_bucket_metrics.go b/tenant/middleware_bucket_metrics.go index 1ebcc83cfb..abb431bccb 100644 --- a/tenant/middleware_bucket_metrics.go +++ b/tenant/middleware_bucket_metrics.go @@ -2,9 +2,9 @@ package tenant import ( "context" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/metric" - "github.com/influxdata/influxdb/kit/prom" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/metric" + "github.com/influxdata/influxdb/v2/kit/prom" ) type BucketMetrics struct { diff --git a/tenant/middleware_org_auth.go b/tenant/middleware_org_auth.go index fb1abe0f56..9c3a4a3290 100644 --- a/tenant/middleware_org_auth.go +++ b/tenant/middleware_org_auth.go @@ -3,8 +3,8 @@ package tenant import ( "context" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/authorizer" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/authorizer" ) var _ influxdb.OrganizationService = (*AuthedOrgService)(nil) diff --git a/tenant/middleware_org_logging.go b/tenant/middleware_org_logging.go index dfce9ae1cb..d4efd34a3e 100644 --- a/tenant/middleware_org_logging.go +++ b/tenant/middleware_org_logging.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" "go.uber.org/zap" ) diff --git a/tenant/middleware_org_metrics.go b/tenant/middleware_org_metrics.go index fdae5c13b5..835d3f4dd4 100644 --- a/tenant/middleware_org_metrics.go +++ b/tenant/middleware_org_metrics.go @@ -3,9 +3,9 @@ package tenant import ( "context" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/metric" - "github.com/influxdata/influxdb/kit/prom" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/metric" + "github.com/influxdata/influxdb/v2/kit/prom" ) type OrgMetrics struct { diff --git a/tenant/middleware_urm_logging.go b/tenant/middleware_urm_logging.go index 58ba5cacbb..bac8bc98ac 100644 --- a/tenant/middleware_urm_logging.go +++ b/tenant/middleware_urm_logging.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" "go.uber.org/zap" ) diff --git a/tenant/middleware_urm_metrics.go b/tenant/middleware_urm_metrics.go index 2177488b93..10a5d7a8bd 100644 --- a/tenant/middleware_urm_metrics.go +++ b/tenant/middleware_urm_metrics.go @@ -3,9 +3,9 @@ package tenant import ( "context" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/metric" - "github.com/influxdata/influxdb/kit/prom" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/metric" + "github.com/influxdata/influxdb/v2/kit/prom" ) type UrmMetrics struct { diff --git a/tenant/middleware_user_auth.go b/tenant/middleware_user_auth.go index 80c820eb23..f78040ec08 100644 --- a/tenant/middleware_user_auth.go +++ b/tenant/middleware_user_auth.go @@ -3,8 +3,8 @@ package tenant import ( "context" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/authorizer" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/authorizer" ) var _ influxdb.UserService = (*AuthedUserService)(nil) diff --git a/tenant/middleware_user_logging.go b/tenant/middleware_user_logging.go index b407658645..be47296ff2 100644 --- a/tenant/middleware_user_logging.go +++ b/tenant/middleware_user_logging.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" "go.uber.org/zap" ) diff --git a/tenant/middleware_user_metrics.go b/tenant/middleware_user_metrics.go index 3596b9cef4..eeb5e4e802 100644 --- a/tenant/middleware_user_metrics.go +++ b/tenant/middleware_user_metrics.go @@ -3,9 +3,9 @@ package tenant import ( "context" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/metric" - "github.com/influxdata/influxdb/kit/prom" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/metric" + "github.com/influxdata/influxdb/v2/kit/prom" ) var _ influxdb.UserService = (*UserMetrics)(nil) diff --git a/tenant/service.go b/tenant/service.go index f866877670..89fe0c6b0d 100644 --- a/tenant/service.go +++ b/tenant/service.go @@ -1,6 +1,6 @@ package tenant -import "github.com/influxdata/influxdb" +import "github.com/influxdata/influxdb/v2" type Service struct { store *Store diff --git a/tenant/service_bucket.go b/tenant/service_bucket.go index 7951dc9e77..e6cc2c7f9a 100644 --- a/tenant/service_bucket.go +++ b/tenant/service_bucket.go @@ -4,8 +4,8 @@ import ( "context" "errors" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kv" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kv" ) // FindBucketByID returns a single bucket by ID. diff --git a/tenant/service_bucket_test.go b/tenant/service_bucket_test.go index 7fae52d931..273870b80a 100644 --- a/tenant/service_bucket_test.go +++ b/tenant/service_bucket_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kv" - "github.com/influxdata/influxdb/tenant" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kv" + "github.com/influxdata/influxdb/v2/tenant" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" ) func TestBoltBucketService(t *testing.T) { diff --git a/tenant/service_org.go b/tenant/service_org.go index 95ef51cac2..51cf24eac0 100644 --- a/tenant/service_org.go +++ b/tenant/service_org.go @@ -3,9 +3,9 @@ package tenant import ( "context" - "github.com/influxdata/influxdb" - icontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/kv" + "github.com/influxdata/influxdb/v2" + icontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/kv" ) // Returns a single organization by ID. diff --git a/tenant/service_org_test.go b/tenant/service_org_test.go index a4d1bb7e2f..923e698f07 100644 --- a/tenant/service_org_test.go +++ b/tenant/service_org_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kv" - "github.com/influxdata/influxdb/tenant" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kv" + "github.com/influxdata/influxdb/v2/tenant" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" ) func TestBoltOrganizationService(t *testing.T) { diff --git a/tenant/service_test.go b/tenant/service_test.go index ec06e81765..a712ecf486 100644 --- a/tenant/service_test.go +++ b/tenant/service_test.go @@ -7,9 +7,9 @@ import ( "os" "testing" - "github.com/influxdata/influxdb/bolt" - "github.com/influxdata/influxdb/inmem" - "github.com/influxdata/influxdb/kv" + "github.com/influxdata/influxdb/v2/bolt" + "github.com/influxdata/influxdb/v2/inmem" + "github.com/influxdata/influxdb/v2/kv" "go.uber.org/zap/zaptest" ) diff --git a/tenant/service_urm.go b/tenant/service_urm.go index 972dfe26d6..76587fdda0 100644 --- a/tenant/service_urm.go +++ b/tenant/service_urm.go @@ -3,8 +3,8 @@ package tenant import ( "context" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kv" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kv" ) // FindUserResourceMappings returns a list of UserResourceMappings that match filter and the total count of matching mappings. diff --git a/tenant/service_urm_test.go b/tenant/service_urm_test.go index e9c45b5e93..2361c8029b 100644 --- a/tenant/service_urm_test.go +++ b/tenant/service_urm_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kv" - "github.com/influxdata/influxdb/tenant" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kv" + "github.com/influxdata/influxdb/v2/tenant" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" ) func TestBoltUserResourceMappingService(t *testing.T) { diff --git a/tenant/service_user.go b/tenant/service_user.go index e51edfefea..91ae0551b6 100644 --- a/tenant/service_user.go +++ b/tenant/service_user.go @@ -3,8 +3,8 @@ package tenant import ( "context" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kv" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kv" "golang.org/x/crypto/bcrypt" ) diff --git a/tenant/service_user_test.go b/tenant/service_user_test.go index 8b1f745518..903d31e5e4 100644 --- a/tenant/service_user_test.go +++ b/tenant/service_user_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kv" - "github.com/influxdata/influxdb/tenant" - influxdbtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kv" + "github.com/influxdata/influxdb/v2/tenant" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" ) func TestBoltUserService(t *testing.T) { diff --git a/tenant/storage.go b/tenant/storage.go index e6b274f478..b2a0e19f82 100644 --- a/tenant/storage.go +++ b/tenant/storage.go @@ -4,10 +4,10 @@ import ( "context" "encoding/json" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/tracing" - "github.com/influxdata/influxdb/kv" - "github.com/influxdata/influxdb/snowflake" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/tracing" + "github.com/influxdata/influxdb/v2/kv" + "github.com/influxdata/influxdb/v2/snowflake" ) const MaxIDGenerationN = 100 diff --git a/tenant/storage_bucket.go b/tenant/storage_bucket.go index cab2d5e847..93292bad41 100644 --- a/tenant/storage_bucket.go +++ b/tenant/storage_bucket.go @@ -5,8 +5,8 @@ import ( "encoding/json" "time" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kv" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kv" ) var ( diff --git a/tenant/storage_bucket_test.go b/tenant/storage_bucket_test.go index 3e2621ec9c..9593e33a22 100644 --- a/tenant/storage_bucket_test.go +++ b/tenant/storage_bucket_test.go @@ -8,10 +8,10 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/inmem" - "github.com/influxdata/influxdb/kv" - "github.com/influxdata/influxdb/tenant" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/inmem" + "github.com/influxdata/influxdb/v2/kv" + "github.com/influxdata/influxdb/v2/tenant" ) // type Bucket struct { diff --git a/tenant/storage_org.go b/tenant/storage_org.go index 3856990a71..0dbb821f89 100644 --- a/tenant/storage_org.go +++ b/tenant/storage_org.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kv" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kv" ) var ( diff --git a/tenant/storage_org_test.go b/tenant/storage_org_test.go index 746f422bef..6f53f4b0b9 100644 --- a/tenant/storage_org_test.go +++ b/tenant/storage_org_test.go @@ -6,10 +6,10 @@ import ( "reflect" "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/inmem" - "github.com/influxdata/influxdb/kv" - "github.com/influxdata/influxdb/tenant" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/inmem" + "github.com/influxdata/influxdb/v2/kv" + "github.com/influxdata/influxdb/v2/tenant" ) // type Organization struct { diff --git a/tenant/storage_urm.go b/tenant/storage_urm.go index 6c7e1fc798..4c725b589c 100644 --- a/tenant/storage_urm.go +++ b/tenant/storage_urm.go @@ -4,8 +4,8 @@ import ( "context" "encoding/json" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kv" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kv" ) var ( diff --git a/tenant/storage_urm_test.go b/tenant/storage_urm_test.go index 062077fd6f..622ba6547e 100644 --- a/tenant/storage_urm_test.go +++ b/tenant/storage_urm_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/inmem" - "github.com/influxdata/influxdb/kv" - "github.com/influxdata/influxdb/tenant" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/inmem" + "github.com/influxdata/influxdb/v2/kv" + "github.com/influxdata/influxdb/v2/tenant" ) func TestURM(t *testing.T) { diff --git a/tenant/storage_user.go b/tenant/storage_user.go index 26ae0c2d44..d3f3a430c6 100644 --- a/tenant/storage_user.go +++ b/tenant/storage_user.go @@ -4,8 +4,8 @@ import ( "context" "encoding/json" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kv" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kv" ) var ( diff --git a/tenant/storage_user_test.go b/tenant/storage_user_test.go index 06f9c62dda..5e95616c2a 100644 --- a/tenant/storage_user_test.go +++ b/tenant/storage_user_test.go @@ -6,10 +6,10 @@ import ( "reflect" "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/inmem" - "github.com/influxdata/influxdb/kv" - "github.com/influxdata/influxdb/tenant" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/inmem" + "github.com/influxdata/influxdb/v2/kv" + "github.com/influxdata/influxdb/v2/tenant" ) func TestUser(t *testing.T) { diff --git a/testing/auth.go b/testing/auth.go index df2a10eada..bf49e7a905 100644 --- a/testing/auth.go +++ b/testing/auth.go @@ -8,8 +8,8 @@ import ( "time" "github.com/google/go-cmp/cmp" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/mock" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" ) const ( diff --git a/testing/bucket_service.go b/testing/bucket_service.go index fe49a47c0e..ba3b004276 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/influxdb" - "github.com/influxdata/influxdb/mock" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" ) const ( diff --git a/testing/checks.go b/testing/checks.go index 9062c97258..ab544ed110 100644 --- a/testing/checks.go +++ b/testing/checks.go @@ -11,10 +11,10 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/influxdata/flux/parser" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/mock" - "github.com/influxdata/influxdb/notification" - "github.com/influxdata/influxdb/notification/check" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" + "github.com/influxdata/influxdb/v2/notification" + "github.com/influxdata/influxdb/v2/notification/check" ) func mustDuration(d string) *notification.Duration { diff --git a/testing/dashboards.go b/testing/dashboards.go index 5fe3b4a2db..175be4aa97 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" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/mock" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" ) const ( diff --git a/testing/dbrp_mapping.go b/testing/dbrp_mapping.go index 450d86918a..48a40cb28a 100644 --- a/testing/dbrp_mapping.go +++ b/testing/dbrp_mapping.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" "github.com/pkg/errors" ) diff --git a/testing/document.go b/testing/document.go index 34ff12de1e..f2b75acaed 100644 --- a/testing/document.go +++ b/testing/document.go @@ -8,11 +8,11 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/authorizer" - icontext "github.com/influxdata/influxdb/context" - "github.com/influxdata/influxdb/kv" - "github.com/influxdata/influxdb/mock" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/authorizer" + icontext "github.com/influxdata/influxdb/v2/context" + "github.com/influxdata/influxdb/v2/kv" + "github.com/influxdata/influxdb/v2/mock" "go.uber.org/zap/zaptest" ) diff --git a/testing/id.go b/testing/id.go index f136312d6f..8184dfe6bf 100644 --- a/testing/id.go +++ b/testing/id.go @@ -1,6 +1,6 @@ package testing -import "github.com/influxdata/influxdb" +import "github.com/influxdata/influxdb/v2" // IDPtr returns a pointer to an influxdb.ID. func IDPtr(id influxdb.ID) *influxdb.ID { return &id } diff --git a/testing/index.go b/testing/index.go index b587ff1b7d..1cbbf95861 100644 --- a/testing/index.go +++ b/testing/index.go @@ -8,7 +8,7 @@ import ( "sort" "testing" - "github.com/influxdata/influxdb/kv" + "github.com/influxdata/influxdb/v2/kv" ) const ( diff --git a/testing/keyvalue_log.go b/testing/keyvalue_log.go index 6cfb9fdc71..b50473b31c 100644 --- a/testing/keyvalue_log.go +++ b/testing/keyvalue_log.go @@ -7,7 +7,7 @@ import ( "time" "github.com/google/go-cmp/cmp" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) var keyValueLogCmpOptions = cmp.Options{ diff --git a/testing/kv.go b/testing/kv.go index 2b3d980a47..6588e4383f 100644 --- a/testing/kv.go +++ b/testing/kv.go @@ -10,7 +10,7 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb/kv" + "github.com/influxdata/influxdb/v2/kv" ) // KVStoreFields are background data that has to be set before diff --git a/testing/label_service.go b/testing/label_service.go index 31af807802..2a0153abe0 100644 --- a/testing/label_service.go +++ b/testing/label_service.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/mock" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" ) const ( diff --git a/testing/migration.go b/testing/migration.go index d2ae4583d3..61f8cff4f5 100644 --- a/testing/migration.go +++ b/testing/migration.go @@ -7,8 +7,8 @@ import ( "testing" "time" - influxdb "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kv" + influxdb "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kv" "go.uber.org/zap" ) diff --git a/testing/notification_endpoint.go b/testing/notification_endpoint.go index 6c0212edbf..3c9ae30806 100644 --- a/testing/notification_endpoint.go +++ b/testing/notification_endpoint.go @@ -9,9 +9,9 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/mock" - "github.com/influxdata/influxdb/notification/endpoint" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" + "github.com/influxdata/influxdb/v2/notification/endpoint" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/testing/notification_rule.go b/testing/notification_rule.go index ee88e10cdc..a7226a3ffb 100644 --- a/testing/notification_rule.go +++ b/testing/notification_rule.go @@ -7,11 +7,11 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/mock" - "github.com/influxdata/influxdb/notification" - "github.com/influxdata/influxdb/notification/endpoint" - "github.com/influxdata/influxdb/notification/rule" + "github.com/influxdata/influxdb/v2" + "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" ) // NotificationRuleFields includes prepopulated data for mapping tests. diff --git a/testing/onboarding.go b/testing/onboarding.go index cd2589f919..56dae05b1c 100644 --- a/testing/onboarding.go +++ b/testing/onboarding.go @@ -6,8 +6,8 @@ import ( "time" "github.com/google/go-cmp/cmp" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/mock" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" ) // OnboardingFields will include the IDGenerator, TokenGenerator diff --git a/testing/organization_service.go b/testing/organization_service.go index eb70ad63fc..fae3238929 100644 --- a/testing/organization_service.go +++ b/testing/organization_service.go @@ -8,9 +8,9 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/mock" + "github.com/influxdata/influxdb/v2" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" ) const ( diff --git a/testing/passwords.go b/testing/passwords.go index 59b6634ed8..56464951f1 100644 --- a/testing/passwords.go +++ b/testing/passwords.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) // PasswordFields will include the IDGenerator, and users and their passwords. diff --git a/testing/scraper_target.go b/testing/scraper_target.go index 615c88fc7e..324fe842bc 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/influxdb" - "github.com/influxdata/influxdb/mock" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" ) const ( diff --git a/testing/secret.go b/testing/secret.go index 73227f4aa1..2c7f6e5ce8 100644 --- a/testing/secret.go +++ b/testing/secret.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) var secretCmpOptions = cmp.Options{ diff --git a/testing/session.go b/testing/session.go index f76a1edf5f..809bd69dbf 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" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/mock" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" ) const ( diff --git a/testing/source.go b/testing/source.go index a09b4ec2d9..5f0cf03e13 100644 --- a/testing/source.go +++ b/testing/source.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/mock" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" ) const ( diff --git a/testing/telegraf.go b/testing/telegraf.go index 02fd8d30da..711d4dc134 100644 --- a/testing/telegraf.go +++ b/testing/telegraf.go @@ -8,10 +8,10 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/mock" - "github.com/influxdata/influxdb/telegraf/plugins/inputs" - "github.com/influxdata/influxdb/telegraf/plugins/outputs" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" + "github.com/influxdata/influxdb/v2/telegraf/plugins/inputs" + "github.com/influxdata/influxdb/v2/telegraf/plugins/outputs" ) // TelegrafConfigFields includes prepopulated data for mapping tests. diff --git a/testing/tenant.go b/testing/tenant.go index b56e60d0af..9f5c5f7586 100644 --- a/testing/tenant.go +++ b/testing/tenant.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb/v2" ) type TenantFields struct { diff --git a/testing/user_resource_mapping_service.go b/testing/user_resource_mapping_service.go index 866d737ffc..b4a243b016 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" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) var userResourceMappingCmpOptions = cmp.Options{ diff --git a/testing/user_service.go b/testing/user_service.go index 557fad84c6..9dfd1f97e4 100644 --- a/testing/user_service.go +++ b/testing/user_service.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/mock" + "github.com/influxdata/influxdb/v2" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" ) const ( diff --git a/testing/util.go b/testing/util.go index 8b13733b24..358a93010c 100644 --- a/testing/util.go +++ b/testing/util.go @@ -4,8 +4,8 @@ import ( "context" "testing" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kv" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kv" ) // TODO(goller): remove opPrefix argument diff --git a/testing/variable.go b/testing/variable.go index d700a1c7fa..f3aac6c366 100644 --- a/testing/variable.go +++ b/testing/variable.go @@ -9,9 +9,9 @@ import ( "time" "github.com/google/go-cmp/cmp" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/mock" - "github.com/influxdata/influxdb/pkg/testing/assert" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" + "github.com/influxdata/influxdb/v2/pkg/testing/assert" "github.com/stretchr/testify/require" ) diff --git a/toml/toml_test.go b/toml/toml_test.go index 08c963b84e..46e6530fcd 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/influxdb/toml" + itoml "github.com/influxdata/influxdb/v2/toml" ) func TestSize_UnmarshalText(t *testing.T) { diff --git a/tsdb/cursors/arrayvalues_test.go b/tsdb/cursors/arrayvalues_test.go index 8e0a90e70d..ac991a1ee8 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/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2/tsdb/cursors" ) func makeBooleanArray(v ...interface{}) *cursors.BooleanArray { diff --git a/tsdb/cursors/cursor.go b/tsdb/cursors/cursor.go index 8b89e23068..a3307661eb 100644 --- a/tsdb/cursors/cursor.go +++ b/tsdb/cursors/cursor.go @@ -3,7 +3,7 @@ package cursors import ( "context" - "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/v2/models" ) const DefaultMaxPointsPerBlock = 1000 diff --git a/tsdb/explode.go b/tsdb/explode.go index 1b9f2e25a3..1f6801a847 100644 --- a/tsdb/explode.go +++ b/tsdb/explode.go @@ -3,8 +3,8 @@ package tsdb import ( "encoding/binary" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/models" ) // DecodeName converts tsdb internal serialization back to organization and bucket IDs. diff --git a/tsdb/explode_test.go b/tsdb/explode_test.go index 0b74090a8c..1061cb22c1 100644 --- a/tsdb/explode_test.go +++ b/tsdb/explode_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/tsdb" ) func TestNames(t *testing.T) { diff --git a/tsdb/meta.go b/tsdb/meta.go index 6118fa8013..43755c71fa 100644 --- a/tsdb/meta.go +++ b/tsdb/meta.go @@ -1,7 +1,7 @@ package tsdb import ( - "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/v2/models" ) // MakeTagsKey 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 a512cc2ea3..ec35381439 100644 --- a/tsdb/meta_test.go +++ b/tsdb/meta_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/tsdb" ) // Ensure tags can be marshaled into a byte slice. diff --git a/tsdb/migrate/migrate.go b/tsdb/migrate/migrate.go index ab9c213b02..8d3799401d 100644 --- a/tsdb/migrate/migrate.go +++ b/tsdb/migrate/migrate.go @@ -16,19 +16,19 @@ import ( "strings" "time" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/bolt" - "github.com/influxdata/influxdb/cmd/influx_inspect/buildtsi" - "github.com/influxdata/influxdb/kv" - "github.com/influxdata/influxdb/logger" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/pkg/bufio" - "github.com/influxdata/influxdb/pkg/fs" - "github.com/influxdata/influxdb/storage" - "github.com/influxdata/influxdb/tsdb" - "github.com/influxdata/influxdb/tsdb/seriesfile" - "github.com/influxdata/influxdb/tsdb/tsi1" - "github.com/influxdata/influxdb/tsdb/tsm1" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/bolt" + "github.com/influxdata/influxdb/v2/cmd/influx_inspect/buildtsi" + "github.com/influxdata/influxdb/v2/kv" + "github.com/influxdata/influxdb/v2/logger" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/pkg/bufio" + "github.com/influxdata/influxdb/v2/pkg/fs" + "github.com/influxdata/influxdb/v2/storage" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/seriesfile" + "github.com/influxdata/influxdb/v2/tsdb/tsi1" + "github.com/influxdata/influxdb/v2/tsdb/tsm1" "go.uber.org/zap" ) diff --git a/tsdb/migrate/migrate_test.go b/tsdb/migrate/migrate_test.go index a4c4cec1ba..2871bb62d4 100644 --- a/tsdb/migrate/migrate_test.go +++ b/tsdb/migrate/migrate_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/influxdata/influxdb/pkg/slices" + "github.com/influxdata/influxdb/v2/pkg/slices" ) func Test_sortShardDirs(t *testing.T) { diff --git a/tsdb/series_collection.go b/tsdb/series_collection.go index cfb697c9c0..d22ca698ec 100644 --- a/tsdb/series_collection.go +++ b/tsdb/series_collection.go @@ -5,8 +5,8 @@ import ( "sync/atomic" "unsafe" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/pkg/bytesutil" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/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 79c566f6ba..167358a19f 100644 --- a/tsdb/series_collection_test.go +++ b/tsdb/series_collection_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/v2/models" ) func TestSeriesCollection(t *testing.T) { diff --git a/tsdb/series_id.go b/tsdb/series_id.go index 90632e9752..a3667863fb 100644 --- a/tsdb/series_id.go +++ b/tsdb/series_id.go @@ -3,7 +3,7 @@ package tsdb import ( "unsafe" - "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/v2/models" ) const ( diff --git a/tsdb/series_id_test.go b/tsdb/series_id_test.go index 873558f21f..4406d910dc 100644 --- a/tsdb/series_id_test.go +++ b/tsdb/series_id_test.go @@ -4,7 +4,7 @@ import ( "math/rand" "testing" - "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/v2/models" ) func TestSeriesID(t *testing.T) { diff --git a/tsdb/series_iterators_test.go b/tsdb/series_iterators_test.go index 9d3b6c8be6..d56da00b7c 100644 --- a/tsdb/series_iterators_test.go +++ b/tsdb/series_iterators_test.go @@ -11,12 +11,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/seriesfile" - "github.com/influxdata/influxdb/tsdb/tsi1" + "github.com/influxdata/influxdb/v2/logger" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/query" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/seriesfile" + "github.com/influxdata/influxdb/v2/tsdb/tsi1" "github.com/influxdata/influxql" ) diff --git a/tsdb/seriesfile/metrics.go b/tsdb/seriesfile/metrics.go index 35fe93c8a9..b565267407 100644 --- a/tsdb/seriesfile/metrics.go +++ b/tsdb/seriesfile/metrics.go @@ -4,7 +4,7 @@ import ( "sort" "sync" - "github.com/influxdata/influxdb/pkg/rhh" + "github.com/influxdata/influxdb/v2/pkg/rhh" "github.com/prometheus/client_golang/prometheus" ) diff --git a/tsdb/seriesfile/metrics_test.go b/tsdb/seriesfile/metrics_test.go index ef0df14000..b653cc67e9 100644 --- a/tsdb/seriesfile/metrics_test.go +++ b/tsdb/seriesfile/metrics_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "github.com/influxdata/influxdb/kit/prom/promtest" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/v2/kit/prom/promtest" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/tsdb" "github.com/prometheus/client_golang/prometheus" dto "github.com/prometheus/client_model/go" ) diff --git a/tsdb/seriesfile/series_file.go b/tsdb/seriesfile/series_file.go index ad5f9718d9..b83a77d3dc 100644 --- a/tsdb/seriesfile/series_file.go +++ b/tsdb/seriesfile/series_file.go @@ -12,13 +12,13 @@ import ( "sync" "github.com/cespare/xxhash" - "github.com/influxdata/influxdb/kit/tracing" - "github.com/influxdata/influxdb/logger" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/pkg/binaryutil" - "github.com/influxdata/influxdb/pkg/lifecycle" - "github.com/influxdata/influxdb/pkg/rhh" - "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/v2/kit/tracing" + "github.com/influxdata/influxdb/v2/logger" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/pkg/binaryutil" + "github.com/influxdata/influxdb/v2/pkg/lifecycle" + "github.com/influxdata/influxdb/v2/pkg/rhh" + "github.com/influxdata/influxdb/v2/tsdb" "github.com/prometheus/client_golang/prometheus" "go.uber.org/multierr" "go.uber.org/zap" diff --git a/tsdb/seriesfile/series_file_test.go b/tsdb/seriesfile/series_file_test.go index b5d5f15238..a78b8cc22d 100644 --- a/tsdb/seriesfile/series_file_test.go +++ b/tsdb/seriesfile/series_file_test.go @@ -9,10 +9,10 @@ import ( "path" "testing" - "github.com/influxdata/influxdb/logger" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/tsdb" - "github.com/influxdata/influxdb/tsdb/seriesfile" + "github.com/influxdata/influxdb/v2/logger" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/seriesfile" "golang.org/x/sync/errgroup" ) diff --git a/tsdb/seriesfile/series_index.go b/tsdb/seriesfile/series_index.go index 7a71acad2b..5cbeb3f10e 100644 --- a/tsdb/seriesfile/series_index.go +++ b/tsdb/seriesfile/series_index.go @@ -7,10 +7,10 @@ import ( "io" "os" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/pkg/mmap" - "github.com/influxdata/influxdb/pkg/rhh" - "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/pkg/mmap" + "github.com/influxdata/influxdb/v2/pkg/rhh" + "github.com/influxdata/influxdb/v2/tsdb" "github.com/prometheus/client_golang/prometheus" ) diff --git a/tsdb/seriesfile/series_index_test.go b/tsdb/seriesfile/series_index_test.go index 3aa972ee25..8548a84f6d 100644 --- a/tsdb/seriesfile/series_index_test.go +++ b/tsdb/seriesfile/series_index_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/tsdb" - "github.com/influxdata/influxdb/tsdb/seriesfile" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/seriesfile" ) func toTypedSeriesID(id uint64) tsdb.SeriesIDTyped { diff --git a/tsdb/seriesfile/series_partition.go b/tsdb/seriesfile/series_partition.go index 03eaa22f82..1d6aedda40 100644 --- a/tsdb/seriesfile/series_partition.go +++ b/tsdb/seriesfile/series_partition.go @@ -11,12 +11,12 @@ import ( "sync" "time" - "github.com/influxdata/influxdb/kit/tracing" - "github.com/influxdata/influxdb/logger" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/pkg/fs" - "github.com/influxdata/influxdb/pkg/rhh" - "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/v2/kit/tracing" + "github.com/influxdata/influxdb/v2/logger" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/pkg/fs" + "github.com/influxdata/influxdb/v2/pkg/rhh" + "github.com/influxdata/influxdb/v2/tsdb" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" ) diff --git a/tsdb/seriesfile/series_partition_test.go b/tsdb/seriesfile/series_partition_test.go index b03e111d0b..5b16aea9d9 100644 --- a/tsdb/seriesfile/series_partition_test.go +++ b/tsdb/seriesfile/series_partition_test.go @@ -7,10 +7,10 @@ import ( "strconv" "testing" - "github.com/influxdata/influxdb/logger" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/tsdb" - "github.com/influxdata/influxdb/tsdb/seriesfile" + "github.com/influxdata/influxdb/v2/logger" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/seriesfile" ) func BenchmarkSeriesPartition_CreateSeriesListIfNotExists(b *testing.B) { diff --git a/tsdb/seriesfile/series_segment.go b/tsdb/seriesfile/series_segment.go index 9734587276..fc1c39b2bf 100644 --- a/tsdb/seriesfile/series_segment.go +++ b/tsdb/seriesfile/series_segment.go @@ -11,9 +11,9 @@ import ( "regexp" "strconv" - "github.com/influxdata/influxdb/pkg/fs" - "github.com/influxdata/influxdb/pkg/mmap" - "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/v2/pkg/fs" + "github.com/influxdata/influxdb/v2/pkg/mmap" + "github.com/influxdata/influxdb/v2/tsdb" ) const ( diff --git a/tsdb/seriesfile/series_segment_test.go b/tsdb/seriesfile/series_segment_test.go index d5f0a9b639..0583a06216 100644 --- a/tsdb/seriesfile/series_segment_test.go +++ b/tsdb/seriesfile/series_segment_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb/tsdb" - "github.com/influxdata/influxdb/tsdb/seriesfile" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/seriesfile" ) func MustTempDir() (string, func()) { diff --git a/tsdb/seriesfile/series_verify.go b/tsdb/seriesfile/series_verify.go index c04e3f8705..31c8ce3771 100644 --- a/tsdb/seriesfile/series_verify.go +++ b/tsdb/seriesfile/series_verify.go @@ -9,7 +9,7 @@ import ( "sort" "sync" - "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/v2/tsdb" "go.uber.org/zap" ) diff --git a/tsdb/seriesfile/series_verify_test.go b/tsdb/seriesfile/series_verify_test.go index 873e4f37b4..fd2dde9ccf 100644 --- a/tsdb/seriesfile/series_verify_test.go +++ b/tsdb/seriesfile/series_verify_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/tsdb" - "github.com/influxdata/influxdb/tsdb/seriesfile" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/seriesfile" "go.uber.org/zap" ) diff --git a/tsdb/tsi1/cache.go b/tsdb/tsi1/cache.go index a57c526502..908a0a8205 100644 --- a/tsdb/tsi1/cache.go +++ b/tsdb/tsi1/cache.go @@ -4,7 +4,7 @@ import ( "container/list" "sync" - "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/v2/tsdb" "github.com/prometheus/client_golang/prometheus" ) diff --git a/tsdb/tsi1/cache_test.go b/tsdb/tsi1/cache_test.go index 21eb641379..0d10fe2604 100644 --- a/tsdb/tsi1/cache_test.go +++ b/tsdb/tsi1/cache_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/v2/tsdb" ) func newSeriesIDSet(ids ...int) *tsdb.SeriesIDSet { diff --git a/tsdb/tsi1/config.go b/tsdb/tsi1/config.go index 2355d20924..7591781027 100644 --- a/tsdb/tsi1/config.go +++ b/tsdb/tsi1/config.go @@ -3,7 +3,7 @@ package tsi1 import ( "time" - "github.com/influxdata/influxdb/toml" + "github.com/influxdata/influxdb/v2/toml" ) // DefaultMaxIndexLogFileSize is the default threshold, in bytes, when an index diff --git a/tsdb/tsi1/dump_tsi1.go b/tsdb/tsi1/dump_tsi1.go index a3946b731e..3272ca6185 100644 --- a/tsdb/tsi1/dump_tsi1.go +++ b/tsdb/tsi1/dump_tsi1.go @@ -9,8 +9,8 @@ import ( "regexp" "text/tabwriter" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/tsdb/seriesfile" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/tsdb/seriesfile" "go.uber.org/zap" ) diff --git a/tsdb/tsi1/file_set.go b/tsdb/tsi1/file_set.go index f42ff39e67..ef99a667c4 100644 --- a/tsdb/tsi1/file_set.go +++ b/tsdb/tsi1/file_set.go @@ -7,9 +7,9 @@ import ( "regexp" "unsafe" - "github.com/influxdata/influxdb/pkg/lifecycle" - "github.com/influxdata/influxdb/tsdb" - "github.com/influxdata/influxdb/tsdb/seriesfile" + "github.com/influxdata/influxdb/v2/pkg/lifecycle" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/seriesfile" "github.com/influxdata/influxql" ) diff --git a/tsdb/tsi1/file_set_test.go b/tsdb/tsi1/file_set_test.go index eb05ebab0c..5250129791 100644 --- a/tsdb/tsi1/file_set_test.go +++ b/tsdb/tsi1/file_set_test.go @@ -6,10 +6,10 @@ import ( "sort" "testing" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/tsdb" - "github.com/influxdata/influxdb/tsdb/seriesfile" - "github.com/influxdata/influxdb/tsdb/tsi1" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/seriesfile" + "github.com/influxdata/influxdb/v2/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 4d33325776..e8da81ef7c 100644 --- a/tsdb/tsi1/index.go +++ b/tsdb/tsi1/index.go @@ -18,13 +18,13 @@ import ( "unsafe" "github.com/cespare/xxhash" - "github.com/influxdata/influxdb/kit/tracing" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/pkg/lifecycle" - "github.com/influxdata/influxdb/pkg/slices" - "github.com/influxdata/influxdb/query" - "github.com/influxdata/influxdb/tsdb" - "github.com/influxdata/influxdb/tsdb/seriesfile" + "github.com/influxdata/influxdb/v2/kit/tracing" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/pkg/lifecycle" + "github.com/influxdata/influxdb/v2/pkg/slices" + "github.com/influxdata/influxdb/v2/query" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/seriesfile" "github.com/influxdata/influxql" "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 1c5d623416..fe82c54ea2 100644 --- a/tsdb/tsi1/index_file.go +++ b/tsdb/tsi1/index_file.go @@ -9,11 +9,11 @@ import ( "sync" "unsafe" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/pkg/lifecycle" - "github.com/influxdata/influxdb/pkg/mmap" - "github.com/influxdata/influxdb/tsdb" - "github.com/influxdata/influxdb/tsdb/seriesfile" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/pkg/lifecycle" + "github.com/influxdata/influxdb/v2/pkg/mmap" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/seriesfile" ) // 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 17b88d49e9..8276249831 100644 --- a/tsdb/tsi1/index_file_test.go +++ b/tsdb/tsi1/index_file_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/tsdb" - "github.com/influxdata/influxdb/tsdb/seriesfile" - "github.com/influxdata/influxdb/tsdb/tsi1" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/seriesfile" + "github.com/influxdata/influxdb/v2/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 d0cdad47a7..5a4897d8c0 100644 --- a/tsdb/tsi1/index_files.go +++ b/tsdb/tsi1/index_files.go @@ -7,10 +7,10 @@ import ( "sort" "time" - "github.com/influxdata/influxdb/pkg/bytesutil" - "github.com/influxdata/influxdb/pkg/lifecycle" - "github.com/influxdata/influxdb/tsdb" - "github.com/influxdata/influxdb/tsdb/seriesfile" + "github.com/influxdata/influxdb/v2/pkg/bytesutil" + "github.com/influxdata/influxdb/v2/pkg/lifecycle" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/seriesfile" ) // 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 a75e60cd8d..06ac03aa04 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/influxdb/models" - "github.com/influxdata/influxdb/tsdb/tsi1" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/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 625e3ad55b..3a7330ce8f 100644 --- a/tsdb/tsi1/index_test.go +++ b/tsdb/tsi1/index_test.go @@ -15,11 +15,11 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb/logger" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/tsdb" - "github.com/influxdata/influxdb/tsdb/seriesfile" - "github.com/influxdata/influxdb/tsdb/tsi1" + "github.com/influxdata/influxdb/v2/logger" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/seriesfile" + "github.com/influxdata/influxdb/v2/tsdb/tsi1" "go.uber.org/zap" "go.uber.org/zap/zaptest" ) diff --git a/tsdb/tsi1/legacy_test.go b/tsdb/tsi1/legacy_test.go index c0f2974cb8..8ea8784d1e 100644 --- a/tsdb/tsi1/legacy_test.go +++ b/tsdb/tsi1/legacy_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/influxdata/influxdb/tsdb/seriesfile" + "github.com/influxdata/influxdb/v2/tsdb/seriesfile" ) func TestLegacyOpen(t *testing.T) { diff --git a/tsdb/tsi1/log_file.go b/tsdb/tsi1/log_file.go index bef122ba24..ee444ef43f 100644 --- a/tsdb/tsi1/log_file.go +++ b/tsdb/tsi1/log_file.go @@ -14,12 +14,12 @@ import ( "time" "unsafe" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/pkg/bloom" - "github.com/influxdata/influxdb/pkg/lifecycle" - "github.com/influxdata/influxdb/pkg/mmap" - "github.com/influxdata/influxdb/tsdb" - "github.com/influxdata/influxdb/tsdb/seriesfile" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/pkg/bloom" + "github.com/influxdata/influxdb/v2/pkg/lifecycle" + "github.com/influxdata/influxdb/v2/pkg/mmap" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/seriesfile" ) // Log errors. diff --git a/tsdb/tsi1/log_file_test.go b/tsdb/tsi1/log_file_test.go index fdadd6cef5..20245fec33 100644 --- a/tsdb/tsi1/log_file_test.go +++ b/tsdb/tsi1/log_file_test.go @@ -13,13 +13,13 @@ import ( "testing" "time" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/pkg/bloom" - "github.com/influxdata/influxdb/pkg/fs" - "github.com/influxdata/influxdb/pkg/slices" - "github.com/influxdata/influxdb/tsdb" - "github.com/influxdata/influxdb/tsdb/seriesfile" - "github.com/influxdata/influxdb/tsdb/tsi1" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/pkg/bloom" + "github.com/influxdata/influxdb/v2/pkg/fs" + "github.com/influxdata/influxdb/v2/pkg/slices" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/seriesfile" + "github.com/influxdata/influxdb/v2/tsdb/tsi1" ) // Ensure log file can append series. diff --git a/tsdb/tsi1/measurement_block.go b/tsdb/tsi1/measurement_block.go index 959c0a9d68..744fe881e7 100644 --- a/tsdb/tsi1/measurement_block.go +++ b/tsdb/tsi1/measurement_block.go @@ -8,8 +8,8 @@ import ( "sort" "unsafe" - "github.com/influxdata/influxdb/pkg/rhh" - "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/v2/pkg/rhh" + "github.com/influxdata/influxdb/v2/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 25a754f112..90a630b162 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/influxdb/tsdb" - "github.com/influxdata/influxdb/tsdb/tsi1" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/tsi1" ) func TestReadMeasurementBlockTrailer(t *testing.T) { diff --git a/tsdb/tsi1/metrics_test.go b/tsdb/tsi1/metrics_test.go index 7f343d6615..3a96c81c68 100644 --- a/tsdb/tsi1/metrics_test.go +++ b/tsdb/tsi1/metrics_test.go @@ -3,7 +3,7 @@ package tsi1 import ( "testing" - "github.com/influxdata/influxdb/kit/prom/promtest" + "github.com/influxdata/influxdb/v2/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 23d92686b7..787991b3a3 100644 --- a/tsdb/tsi1/partition.go +++ b/tsdb/tsi1/partition.go @@ -15,13 +15,13 @@ import ( "time" "unsafe" - "github.com/influxdata/influxdb/kit/tracing" - "github.com/influxdata/influxdb/logger" - "github.com/influxdata/influxdb/pkg/bytesutil" - "github.com/influxdata/influxdb/pkg/fs" - "github.com/influxdata/influxdb/pkg/lifecycle" - "github.com/influxdata/influxdb/tsdb" - "github.com/influxdata/influxdb/tsdb/seriesfile" + "github.com/influxdata/influxdb/v2/kit/tracing" + "github.com/influxdata/influxdb/v2/logger" + "github.com/influxdata/influxdb/v2/pkg/bytesutil" + "github.com/influxdata/influxdb/v2/pkg/fs" + "github.com/influxdata/influxdb/v2/pkg/lifecycle" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/seriesfile" "github.com/influxdata/influxql" "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 b5f3fcf16e..e6f55ac8a5 100644 --- a/tsdb/tsi1/partition_test.go +++ b/tsdb/tsi1/partition_test.go @@ -7,8 +7,8 @@ import ( "path/filepath" "testing" - "github.com/influxdata/influxdb/tsdb/seriesfile" - "github.com/influxdata/influxdb/tsdb/tsi1" + "github.com/influxdata/influxdb/v2/tsdb/seriesfile" + "github.com/influxdata/influxdb/v2/tsdb/tsi1" ) func TestPartition_Open(t *testing.T) { diff --git a/tsdb/tsi1/report.go b/tsdb/tsi1/report.go index 8d6dfd811f..257a3c4bc5 100644 --- a/tsdb/tsi1/report.go +++ b/tsdb/tsi1/report.go @@ -10,10 +10,10 @@ import ( "text/tabwriter" "time" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/tsdb" - "github.com/influxdata/influxdb/tsdb/seriesfile" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/seriesfile" ) const ( diff --git a/tsdb/tsi1/sql_index_exporter_test.go b/tsdb/tsi1/sql_index_exporter_test.go index a0c086aa1a..c7b99c775a 100644 --- a/tsdb/tsi1/sql_index_exporter_test.go +++ b/tsdb/tsi1/sql_index_exporter_test.go @@ -5,10 +5,10 @@ import ( "os" "testing" - "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/v2/logger" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/tsi1" ) func TestSQLIndexExporter_ExportIndex(t *testing.T) { diff --git a/tsdb/tsi1/stats.go b/tsdb/tsi1/stats.go index 2c0ed48422..c8499eec91 100644 --- a/tsdb/tsi1/stats.go +++ b/tsdb/tsi1/stats.go @@ -8,7 +8,7 @@ import ( "io" "sort" - "github.com/influxdata/influxdb/pkg/binaryutil" + "github.com/influxdata/influxdb/v2/pkg/binaryutil" ) const ( diff --git a/tsdb/tsi1/stats_test.go b/tsdb/tsi1/stats_test.go index d2c4dff212..bd632f3d92 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/influxdb/tsdb/tsi1" + "github.com/influxdata/influxdb/v2/tsdb/tsi1" ) func TestMeasurementCardinalityStats_WriteTo(t *testing.T) { diff --git a/tsdb/tsi1/tag_block.go b/tsdb/tsi1/tag_block.go index 825ebb6ad9..653a9c4777 100644 --- a/tsdb/tsi1/tag_block.go +++ b/tsdb/tsi1/tag_block.go @@ -7,8 +7,8 @@ import ( "fmt" "io" - "github.com/influxdata/influxdb/pkg/rhh" - "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/v2/pkg/rhh" + "github.com/influxdata/influxdb/v2/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 16f3b222f8..664144b0d1 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/influxdb/tsdb" - "github.com/influxdata/influxdb/tsdb/tsi1" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/tsi1" ) func newSeriesIDSet(ids ...int) *tsdb.SeriesIDSet { diff --git a/tsdb/tsi1/tsi1.go b/tsdb/tsi1/tsi1.go index 58fb5a1e71..190349def8 100644 --- a/tsdb/tsi1/tsi1.go +++ b/tsdb/tsi1/tsi1.go @@ -6,7 +6,7 @@ import ( "fmt" "io" - "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/v2/tsdb" ) // LoadFactor is the fill percent for RHH indexes. diff --git a/tsdb/tsi1/tsi1_test.go b/tsdb/tsi1/tsi1_test.go index 6d38bfd273..b4c743d41f 100644 --- a/tsdb/tsi1/tsi1_test.go +++ b/tsdb/tsi1/tsi1_test.go @@ -9,10 +9,10 @@ import ( "reflect" "testing" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/tsdb" - "github.com/influxdata/influxdb/tsdb/seriesfile" - "github.com/influxdata/influxdb/tsdb/tsi1" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/seriesfile" + "github.com/influxdata/influxdb/v2/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 2e7f1b2fc9..9d7d421e6f 100644 --- a/tsdb/tsm1/array_cursor.gen.go +++ b/tsdb/tsm1/array_cursor.gen.go @@ -9,7 +9,7 @@ package tsm1 import ( "sort" - "github.com/influxdata/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2/tsdb/cursors" ) // Array Cursors diff --git a/tsdb/tsm1/array_cursor_iterator.gen.go b/tsdb/tsm1/array_cursor_iterator.gen.go index 3fd79da8f2..9b72f781c5 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/influxdb/models" - "github.com/influxdata/influxdb/query" - "github.com/influxdata/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/query" + "github.com/influxdata/influxdb/v2/tsdb/cursors" ) // buildFloatArrayCursor creates an array cursor for a float field. diff --git a/tsdb/tsm1/array_cursor_iterator.go b/tsdb/tsm1/array_cursor_iterator.go index 6b861eda58..4468f84658 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/influxdb/models" - "github.com/influxdata/influxdb/pkg/metrics" - "github.com/influxdata/influxdb/query" - "github.com/influxdata/influxdb/tsdb/cursors" - "github.com/influxdata/influxdb/tsdb/seriesfile" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/pkg/metrics" + "github.com/influxdata/influxdb/v2/query" + "github.com/influxdata/influxdb/v2/tsdb/cursors" + "github.com/influxdata/influxdb/v2/tsdb/seriesfile" ) type arrayCursorIterator struct { diff --git a/tsdb/tsm1/array_cursor_test.go b/tsdb/tsm1/array_cursor_test.go index 71d16d3d90..02b1051b21 100644 --- a/tsdb/tsm1/array_cursor_test.go +++ b/tsdb/tsm1/array_cursor_test.go @@ -10,8 +10,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb/pkg/fs" - "github.com/influxdata/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2/pkg/fs" + "github.com/influxdata/influxdb/v2/tsdb/cursors" "github.com/stretchr/testify/assert" ) diff --git a/tsdb/tsm1/array_encoding.go b/tsdb/tsm1/array_encoding.go index 416f08b4d2..e3e9e6f365 100644 --- a/tsdb/tsm1/array_encoding.go +++ b/tsdb/tsm1/array_encoding.go @@ -3,7 +3,7 @@ package tsm1 import ( "fmt" - "github.com/influxdata/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2/tsdb/cursors" ) // 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 e4f6078c6f..c68b0f10eb 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/influxdb/tsdb/cursors" - "github.com/influxdata/influxdb/tsdb/tsm1" + "github.com/influxdata/influxdb/v2/tsdb/cursors" + "github.com/influxdata/influxdb/v2/tsdb/tsm1" ) func TestDecodeFloatArrayBlock(t *testing.T) { diff --git a/tsdb/tsm1/batch_boolean_test.go b/tsdb/tsm1/batch_boolean_test.go index 4033322627..8ea0d1df43 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/influxdb/tsdb/tsm1" + "github.com/influxdata/influxdb/v2/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 d3a9ab7aae..44be432cef 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/influxdb/tsdb/tsm1" + "github.com/influxdata/influxdb/v2/tsdb/tsm1" ) var fullBlockFloat64Ones []float64 diff --git a/tsdb/tsm1/batch_integer.go b/tsdb/tsm1/batch_integer.go index fc26ffb7e8..bc5afad7db 100644 --- a/tsdb/tsm1/batch_integer.go +++ b/tsdb/tsm1/batch_integer.go @@ -5,7 +5,7 @@ import ( "fmt" "unsafe" - "github.com/influxdata/influxdb/pkg/encoding/simple8b" + "github.com/influxdata/influxdb/v2/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 e5da21b7f3..e7736f14ef 100644 --- a/tsdb/tsm1/batch_string_test.go +++ b/tsdb/tsm1/batch_string_test.go @@ -10,8 +10,8 @@ import ( "testing/quick" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb/internal/testutil" - "github.com/influxdata/influxdb/uuid" + "github.com/influxdata/influxdb/v2/internal/testutil" + "github.com/influxdata/influxdb/v2/uuid" ) func equalError(a, b error) bool { diff --git a/tsdb/tsm1/batch_timestamp.go b/tsdb/tsm1/batch_timestamp.go index 5dbc5c3b65..b0be9d9b8e 100644 --- a/tsdb/tsm1/batch_timestamp.go +++ b/tsdb/tsm1/batch_timestamp.go @@ -6,7 +6,7 @@ import ( "math" "unsafe" - "github.com/influxdata/influxdb/pkg/encoding/simple8b" + "github.com/influxdata/influxdb/v2/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 897a9f1829..0f658f4f2c 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/influxdb/tsdb/tsm1" + "github.com/influxdata/influxdb/v2/tsdb/tsm1" ) func TestBitStreamEOF(t *testing.T) { diff --git a/tsdb/tsm1/block_exporter.go b/tsdb/tsm1/block_exporter.go index 3ce9af3ac2..9b93f214d3 100644 --- a/tsdb/tsm1/block_exporter.go +++ b/tsdb/tsm1/block_exporter.go @@ -8,8 +8,8 @@ import ( "strings" "unicode/utf8" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/tsdb" ) // BlockExporter writes all blocks in a file to a given format. diff --git a/tsdb/tsm1/bool_test.go b/tsdb/tsm1/bool_test.go index f646f8179d..a361e42856 100644 --- a/tsdb/tsm1/bool_test.go +++ b/tsdb/tsm1/bool_test.go @@ -6,7 +6,7 @@ import ( "testing" "testing/quick" - "github.com/influxdata/influxdb/tsdb/tsm1" + "github.com/influxdata/influxdb/v2/tsdb/tsm1" ) func Test_BooleanEncoder_NoValues(t *testing.T) { diff --git a/tsdb/tsm1/cache.go b/tsdb/tsm1/cache.go index b01cf5674d..ae5b7e83a6 100644 --- a/tsdb/tsm1/cache.go +++ b/tsdb/tsm1/cache.go @@ -9,10 +9,10 @@ import ( "sync/atomic" "time" - "github.com/influxdata/influxdb/kit/tracing" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/storage/wal" - "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/v2/kit/tracing" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/storage/wal" + "github.com/influxdata/influxdb/v2/tsdb" "github.com/influxdata/influxql" "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 9f7f0a2c2f..d23d788237 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/influxdb/tsdb/tsm1" + "github.com/influxdata/influxdb/v2/tsdb/tsm1" ) func TestCacheCheckConcurrentReadsAreSafe(t *testing.T) { diff --git a/tsdb/tsm1/cache_test.go b/tsdb/tsm1/cache_test.go index ec7ea861eb..ef206da8ab 100644 --- a/tsdb/tsm1/cache_test.go +++ b/tsdb/tsm1/cache_test.go @@ -15,10 +15,9 @@ import ( "sync/atomic" "testing" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/storage/wal" - "github.com/golang/snappy" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/storage/wal" ) func TestCache_NewCache(t *testing.T) { diff --git a/tsdb/tsm1/compact.gen.go b/tsdb/tsm1/compact.gen.go index f376dfb8b1..16c811d195 100644 --- a/tsdb/tsm1/compact.gen.go +++ b/tsdb/tsm1/compact.gen.go @@ -9,7 +9,7 @@ package tsm1 import ( "sort" - "github.com/influxdata/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2/tsdb/cursors" ) // merge combines the next set of blocks into merged blocks. diff --git a/tsdb/tsm1/compact.go b/tsdb/tsm1/compact.go index 612ce3be5e..7e8628473c 100644 --- a/tsdb/tsm1/compact.go +++ b/tsdb/tsm1/compact.go @@ -26,9 +26,9 @@ import ( "sync/atomic" "time" - "github.com/influxdata/influxdb/kit/tracing" - "github.com/influxdata/influxdb/pkg/limiter" - "github.com/influxdata/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2/kit/tracing" + "github.com/influxdata/influxdb/v2/pkg/limiter" + "github.com/influxdata/influxdb/v2/tsdb/cursors" ) const maxTSMFileSize = uint32(2048 * 1024 * 1024) // 2GB diff --git a/tsdb/tsm1/compact_test.go b/tsdb/tsm1/compact_test.go index f52fba433f..4e3dd3572b 100644 --- a/tsdb/tsm1/compact_test.go +++ b/tsdb/tsm1/compact_test.go @@ -12,9 +12,9 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb/pkg/fs" - "github.com/influxdata/influxdb/tsdb/cursors" - "github.com/influxdata/influxdb/tsdb/tsm1" + "github.com/influxdata/influxdb/v2/pkg/fs" + "github.com/influxdata/influxdb/v2/tsdb/cursors" + "github.com/influxdata/influxdb/v2/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 0bfe468571..b1175e93eb 100644 --- a/tsdb/tsm1/config.go +++ b/tsdb/tsm1/config.go @@ -4,7 +4,7 @@ import ( "runtime" "time" - "github.com/influxdata/influxdb/toml" + "github.com/influxdata/influxdb/v2/toml" ) var DefaultMaxConcurrentOpens = runtime.GOMAXPROCS(0) diff --git a/tsdb/tsm1/encoding.gen.go b/tsdb/tsm1/encoding.gen.go index ad2f4db64f..7c20d26eb8 100644 --- a/tsdb/tsm1/encoding.gen.go +++ b/tsdb/tsm1/encoding.gen.go @@ -9,7 +9,7 @@ package tsm1 import ( "sort" - "github.com/influxdata/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2/tsdb/cursors" ) // Values represents a slice of values. diff --git a/tsdb/tsm1/encoding.go b/tsdb/tsm1/encoding.go index 7bfcf58699..8c62ba7818 100644 --- a/tsdb/tsm1/encoding.go +++ b/tsdb/tsm1/encoding.go @@ -5,7 +5,7 @@ import ( "fmt" "runtime" - "github.com/influxdata/influxdb/pkg/pool" + "github.com/influxdata/influxdb/v2/pkg/pool" "github.com/influxdata/influxql" ) diff --git a/tsdb/tsm1/encoding_test.go b/tsdb/tsm1/encoding_test.go index 49ec11a766..e7fa8dd636 100644 --- a/tsdb/tsm1/encoding_test.go +++ b/tsdb/tsm1/encoding_test.go @@ -9,7 +9,7 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb/tsdb/tsm1" + "github.com/influxdata/influxdb/v2/tsdb/tsm1" ) func TestEncoding_FloatBlock(t *testing.T) { diff --git a/tsdb/tsm1/engine.go b/tsdb/tsm1/engine.go index d13ffe3a6c..a4ca605c9f 100644 --- a/tsdb/tsm1/engine.go +++ b/tsdb/tsm1/engine.go @@ -15,17 +15,17 @@ import ( "sync/atomic" "time" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/kit/tracing" - "github.com/influxdata/influxdb/logger" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/pkg/lifecycle" - "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/seriesfile" - "github.com/influxdata/influxdb/tsdb/tsi1" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/kit/tracing" + "github.com/influxdata/influxdb/v2/logger" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/pkg/lifecycle" + "github.com/influxdata/influxdb/v2/pkg/limiter" + "github.com/influxdata/influxdb/v2/pkg/metrics" + "github.com/influxdata/influxdb/v2/query" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/seriesfile" + "github.com/influxdata/influxdb/v2/tsdb/tsi1" "github.com/influxdata/influxql" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" @@ -93,8 +93,12 @@ type Snapshotter interface { type noSnapshotter struct{} -func (noSnapshotter) AcquireSegments(_ context.Context, fn func([]string) error) error { return fn(nil) } -func (noSnapshotter) CommitSegments(_ context.Context, _ []string, fn func() error) error { return fn() } +func (noSnapshotter) AcquireSegments(_ context.Context, fn func([]string) error) error { + return fn(nil) +} +func (noSnapshotter) CommitSegments(_ context.Context, _ []string, fn func() error) error { + return fn() +} // WithSnapshotter sets the callbacks for the engine to use when creating snapshots. func WithSnapshotter(snapshotter Snapshotter) EngineOption { diff --git a/tsdb/tsm1/engine_cursor.go b/tsdb/tsm1/engine_cursor.go index d09ff61190..fbd3c6b8dd 100644 --- a/tsdb/tsm1/engine_cursor.go +++ b/tsdb/tsm1/engine_cursor.go @@ -3,7 +3,7 @@ package tsm1 import ( "context" - "github.com/influxdata/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2/tsdb/cursors" ) func (e *Engine) CreateCursorIterator(ctx context.Context) (cursors.CursorIterator, error) { diff --git a/tsdb/tsm1/engine_cursor_test.go b/tsdb/tsm1/engine_cursor_test.go index ec818e7757..321a8de22d 100644 --- a/tsdb/tsm1/engine_cursor_test.go +++ b/tsdb/tsm1/engine_cursor_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/tsdb" - "github.com/influxdata/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/cursors" ) func TestEngine_CursorIterator_Stats(t *testing.T) { diff --git a/tsdb/tsm1/engine_delete_prefix.go b/tsdb/tsm1/engine_delete_prefix.go index 91803478c0..378ebd8c9a 100644 --- a/tsdb/tsm1/engine_delete_prefix.go +++ b/tsdb/tsm1/engine_delete_prefix.go @@ -9,10 +9,10 @@ import ( "sync" "time" - "github.com/influxdata/influxdb/kit/tracing" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/tsdb" - "github.com/influxdata/influxdb/tsdb/tsi1" + "github.com/influxdata/influxdb/v2/kit/tracing" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/tsi1" "github.com/influxdata/influxql" ) diff --git a/tsdb/tsm1/engine_delete_prefix_test.go b/tsdb/tsm1/engine_delete_prefix_test.go index ee2158824e..8cc010a3d6 100644 --- a/tsdb/tsm1/engine_delete_prefix_test.go +++ b/tsdb/tsm1/engine_delete_prefix_test.go @@ -7,8 +7,8 @@ import ( "reflect" "testing" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/tsdb/tsm1" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/tsdb/tsm1" ) func TestEngine_DeletePrefix(t *testing.T) { diff --git a/tsdb/tsm1/engine_measurement_schema.go b/tsdb/tsm1/engine_measurement_schema.go index 392a038bc5..bc55c4d3bc 100644 --- a/tsdb/tsm1/engine_measurement_schema.go +++ b/tsdb/tsm1/engine_measurement_schema.go @@ -6,10 +6,10 @@ import ( "sort" "strings" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/tsdb" - "github.com/influxdata/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/cursors" "github.com/influxdata/influxql" "go.uber.org/zap" ) diff --git a/tsdb/tsm1/engine_measurement_schema_test.go b/tsdb/tsm1/engine_measurement_schema_test.go index c63add9bb7..9f0a59905f 100644 --- a/tsdb/tsm1/engine_measurement_schema_test.go +++ b/tsdb/tsm1/engine_measurement_schema_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/tsdb/cursors" - "github.com/influxdata/influxdb/tsdb/tsm1" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/tsdb/cursors" + "github.com/influxdata/influxdb/v2/tsdb/tsm1" "github.com/influxdata/influxql" "github.com/stretchr/testify/assert" ) diff --git a/tsdb/tsm1/engine_schema.go b/tsdb/tsm1/engine_schema.go index 961bfd29da..5300aef623 100644 --- a/tsdb/tsm1/engine_schema.go +++ b/tsdb/tsm1/engine_schema.go @@ -8,11 +8,11 @@ import ( "sort" "strings" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/tsdb" - "github.com/influxdata/influxdb/tsdb/cursors" - "github.com/influxdata/influxdb/tsdb/seriesfile" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/cursors" + "github.com/influxdata/influxdb/v2/tsdb/seriesfile" "github.com/influxdata/influxql" ) diff --git a/tsdb/tsm1/engine_schema_test.go b/tsdb/tsm1/engine_schema_test.go index df3fa0da3e..0869da149e 100644 --- a/tsdb/tsm1/engine_schema_test.go +++ b/tsdb/tsm1/engine_schema_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/tsdb/cursors" - "github.com/influxdata/influxdb/tsdb/tsm1" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/tsdb/cursors" + "github.com/influxdata/influxdb/v2/tsdb/tsm1" "github.com/influxdata/influxql" ) diff --git a/tsdb/tsm1/engine_test.go b/tsdb/tsm1/engine_test.go index 00b1e756cb..2c147228dd 100644 --- a/tsdb/tsm1/engine_test.go +++ b/tsdb/tsm1/engine_test.go @@ -13,14 +13,14 @@ import ( "testing" "time" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/logger" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/toml" - "github.com/influxdata/influxdb/tsdb" - "github.com/influxdata/influxdb/tsdb/seriesfile" - "github.com/influxdata/influxdb/tsdb/tsi1" - "github.com/influxdata/influxdb/tsdb/tsm1" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/logger" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/toml" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/seriesfile" + "github.com/influxdata/influxdb/v2/tsdb/tsi1" + "github.com/influxdata/influxdb/v2/tsdb/tsm1" "github.com/influxdata/influxql" "go.uber.org/zap/zaptest" ) diff --git a/tsdb/tsm1/file_store.go b/tsdb/tsm1/file_store.go index 0b4d7598b3..847b8af4c8 100644 --- a/tsdb/tsm1/file_store.go +++ b/tsdb/tsm1/file_store.go @@ -17,12 +17,12 @@ import ( "sync/atomic" "time" - "github.com/influxdata/influxdb/kit/tracing" - "github.com/influxdata/influxdb/pkg/fs" - "github.com/influxdata/influxdb/pkg/limiter" - "github.com/influxdata/influxdb/pkg/metrics" - "github.com/influxdata/influxdb/query" - "github.com/influxdata/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2/kit/tracing" + "github.com/influxdata/influxdb/v2/pkg/fs" + "github.com/influxdata/influxdb/v2/pkg/limiter" + "github.com/influxdata/influxdb/v2/pkg/metrics" + "github.com/influxdata/influxdb/v2/query" + "github.com/influxdata/influxdb/v2/tsdb/cursors" "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 71e1565f96..0a2cfd1b2c 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/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2/tsdb/cursors" ) // 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 d40eb92b49..6132f1c5f4 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/influxdb/tsdb/cursors" - "github.com/influxdata/influxdb/tsdb/tsm1" + "github.com/influxdata/influxdb/v2/tsdb/cursors" + "github.com/influxdata/influxdb/v2/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 244b34b9b9..6652f92d0d 100644 --- a/tsdb/tsm1/file_store_test.go +++ b/tsdb/tsm1/file_store_test.go @@ -13,9 +13,9 @@ import ( "testing" "time" - "github.com/influxdata/influxdb/logger" - "github.com/influxdata/influxdb/pkg/fs" - "github.com/influxdata/influxdb/tsdb/tsm1" + "github.com/influxdata/influxdb/v2/logger" + "github.com/influxdata/influxdb/v2/pkg/fs" + "github.com/influxdata/influxdb/v2/tsdb/tsm1" ) func TestFileStore_Read(t *testing.T) { diff --git a/tsdb/tsm1/float_test.go b/tsdb/tsm1/float_test.go index ed8b2ab583..7c9650020f 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/influxdb/tsdb/tsm1" + "github.com/influxdata/influxdb/v2/tsdb/tsm1" ) func TestFloatEncoder_Simple(t *testing.T) { diff --git a/tsdb/tsm1/metrics_test.go b/tsdb/tsm1/metrics_test.go index d0c1ea4e85..6fd6cf9d09 100644 --- a/tsdb/tsm1/metrics_test.go +++ b/tsdb/tsm1/metrics_test.go @@ -3,7 +3,7 @@ package tsm1 import ( "testing" - "github.com/influxdata/influxdb/kit/prom/promtest" + "github.com/influxdata/influxdb/v2/kit/prom/promtest" "github.com/prometheus/client_golang/prometheus" ) diff --git a/tsdb/tsm1/predicate.go b/tsdb/tsm1/predicate.go index b76cb22f5c..de5c2db146 100644 --- a/tsdb/tsm1/predicate.go +++ b/tsdb/tsm1/predicate.go @@ -5,8 +5,8 @@ import ( "fmt" "regexp" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/storage/reads/datatypes" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/storage/reads/datatypes" ) // Predicate is something that can match on a series key. diff --git a/tsdb/tsm1/predicate_test.go b/tsdb/tsm1/predicate_test.go index cc54de2cc0..ff9350911c 100644 --- a/tsdb/tsm1/predicate_test.go +++ b/tsdb/tsm1/predicate_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/influxdata/influxdb/storage/reads/datatypes" + "github.com/influxdata/influxdb/v2/storage/reads/datatypes" ) func TestPredicatePopTagEscape(t *testing.T) { diff --git a/tsdb/tsm1/reader.gen.go b/tsdb/tsm1/reader.gen.go index 426ccaed56..7c95244bdd 100644 --- a/tsdb/tsm1/reader.gen.go +++ b/tsdb/tsm1/reader.gen.go @@ -7,7 +7,7 @@ package tsm1 import ( - "github.com/influxdata/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2/tsdb/cursors" ) // ReadFloatBlockAt returns the float values corresponding to the given index entry. diff --git a/tsdb/tsm1/reader_mmap.go b/tsdb/tsm1/reader_mmap.go index 2a8b384e06..02518d6626 100644 --- a/tsdb/tsm1/reader_mmap.go +++ b/tsdb/tsm1/reader_mmap.go @@ -7,7 +7,7 @@ import ( "sync" "sync/atomic" - "github.com/influxdata/influxdb/pkg/fs" + "github.com/influxdata/influxdb/v2/pkg/fs" "go.uber.org/zap" ) diff --git a/tsdb/tsm1/reader_range_iterator.go b/tsdb/tsm1/reader_range_iterator.go index 0bf4a2e27d..577be69822 100644 --- a/tsdb/tsm1/reader_range_iterator.go +++ b/tsdb/tsm1/reader_range_iterator.go @@ -1,7 +1,7 @@ package tsm1 import ( - "github.com/influxdata/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2/tsdb/cursors" ) // TimeRangeIterator will iterate over the keys of a TSM file, starting at diff --git a/tsdb/tsm1/reader_range_iterator_test.go b/tsdb/tsm1/reader_range_iterator_test.go index b6f403b83c..cf515182a7 100644 --- a/tsdb/tsm1/reader_range_iterator_test.go +++ b/tsdb/tsm1/reader_range_iterator_test.go @@ -6,10 +6,10 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/tsdb" - "github.com/influxdata/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/cursors" ) func TestTimeRangeIterator(t *testing.T) { diff --git a/tsdb/tsm1/report.go b/tsdb/tsm1/report.go index df85613c2c..825b00db02 100644 --- a/tsdb/tsm1/report.go +++ b/tsdb/tsm1/report.go @@ -15,10 +15,10 @@ import ( "text/tabwriter" "time" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/pkg/hll" - "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/pkg/hll" + "github.com/influxdata/influxdb/v2/tsdb" ) // Report runs a report over tsm data diff --git a/tsdb/tsm1/ring.go b/tsdb/tsm1/ring.go index 0ec2ee3cc7..541076dfac 100644 --- a/tsdb/tsm1/ring.go +++ b/tsdb/tsm1/ring.go @@ -5,7 +5,7 @@ import ( "sync/atomic" "github.com/cespare/xxhash" - "github.com/influxdata/influxdb/pkg/bytesutil" + "github.com/influxdata/influxdb/v2/pkg/bytesutil" ) // numPartitions 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 be86ee9335..9ae8dc0d9d 100644 --- a/tsdb/tsm1/stats.go +++ b/tsdb/tsm1/stats.go @@ -9,7 +9,7 @@ import ( "sort" "strings" - "github.com/influxdata/influxdb/pkg/binaryutil" + "github.com/influxdata/influxdb/v2/pkg/binaryutil" ) const ( diff --git a/tsdb/tsm1/stats_test.go b/tsdb/tsm1/stats_test.go index b2e15c4585..2505a20c41 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/influxdb/tsdb/tsm1" + "github.com/influxdata/influxdb/v2/tsdb/tsm1" ) func TestMeasurementStats_WriteTo(t *testing.T) { diff --git a/tsdb/tsm1/string_test.go b/tsdb/tsm1/string_test.go index 41035a4ac2..72765d322e 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/influxdb/internal/testutil" + "github.com/influxdata/influxdb/v2/internal/testutil" ) func Test_StringEncoder_NoValues(t *testing.T) { diff --git a/tsdb/tsm1/tombstone.go b/tsdb/tsm1/tombstone.go index b570fcb07f..f096597c46 100644 --- a/tsdb/tsm1/tombstone.go +++ b/tsdb/tsm1/tombstone.go @@ -56,7 +56,7 @@ import ( "strings" "sync" - "github.com/influxdata/influxdb/pkg/fs" + "github.com/influxdata/influxdb/v2/pkg/fs" ) const ( diff --git a/tsdb/tsm1/tombstone_test.go b/tsdb/tsm1/tombstone_test.go index bd756d8def..4b675b37fc 100644 --- a/tsdb/tsm1/tombstone_test.go +++ b/tsdb/tsm1/tombstone_test.go @@ -11,8 +11,8 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb/pkg/fs" - "github.com/influxdata/influxdb/tsdb/tsm1" + "github.com/influxdata/influxdb/v2/pkg/fs" + "github.com/influxdata/influxdb/v2/tsdb/tsm1" ) func TestTombstoner_Add(t *testing.T) { diff --git a/tsdb/tsm1/value.go b/tsdb/tsm1/value.go index 3739b83cad..fb0ba9e6cc 100644 --- a/tsdb/tsm1/value.go +++ b/tsdb/tsm1/value.go @@ -4,9 +4,9 @@ import ( "fmt" "time" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/tsdb" - "github.com/influxdata/influxdb/tsdb/value" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/value" ) type ( diff --git a/tsdb/tsm1/verify_tsm.go b/tsdb/tsm1/verify_tsm.go index 82b362a16c..d1e0e2f122 100644 --- a/tsdb/tsm1/verify_tsm.go +++ b/tsdb/tsm1/verify_tsm.go @@ -7,9 +7,9 @@ import ( "io" "os" - "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/tsdb" - "github.com/influxdata/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/tsdb" + "github.com/influxdata/influxdb/v2/tsdb/cursors" ) type VerifyTSM struct { diff --git a/tsdb/tsm1/writer.go b/tsdb/tsm1/writer.go index 35e8525da2..f7810bc236 100644 --- a/tsdb/tsm1/writer.go +++ b/tsdb/tsm1/writer.go @@ -74,8 +74,8 @@ import ( "strings" "time" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/pkg/fs" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/pkg/fs" ) const ( diff --git a/tsdb/tsm1/writer_test.go b/tsdb/tsm1/writer_test.go index 672bf44a4b..cd0d50dea4 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/influxdb/tsdb/tsm1" + "github.com/influxdata/influxdb/v2/tsdb/tsm1" ) func TestTSMWriter_Write_Empty(t *testing.T) { diff --git a/tsdb/value/value.go b/tsdb/value/value.go index a0578cd438..4070e2751c 100644 --- a/tsdb/value/value.go +++ b/tsdb/value/value.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/influxdata/influxdb/query" + "github.com/influxdata/influxdb/v2/query" ) // Value represents a TSM-encoded value. @@ -47,7 +47,9 @@ func NewValue(t int64, value interface{}) Value { func NewRawIntegerValue(t int64, v int64) IntegerValue { return IntegerValue{unixnano: t, value: v} } // NewRawUnsignedValue returns a new unsigned integer value. -func NewRawUnsignedValue(t int64, v uint64) UnsignedValue { return UnsignedValue{unixnano: t, value: v} } +func NewRawUnsignedValue(t int64, v uint64) UnsignedValue { + return UnsignedValue{unixnano: t, value: v} +} // NewRawFloatValue returns a new float value. func NewRawFloatValue(t int64, v float64) FloatValue { return FloatValue{unixnano: t, value: v} } diff --git a/user_resource_mapping_test.go b/user_resource_mapping_test.go index b33e015fd2..fd9c6ff76b 100644 --- a/user_resource_mapping_test.go +++ b/user_resource_mapping_test.go @@ -3,9 +3,9 @@ package influxdb_test import ( "testing" - "github.com/influxdata/influxdb" - platform "github.com/influxdata/influxdb" - platformtesting "github.com/influxdata/influxdb/testing" + "github.com/influxdata/influxdb/v2" + platform "github.com/influxdata/influxdb/v2" + platformtesting "github.com/influxdata/influxdb/v2/testing" "github.com/stretchr/testify/require" ) diff --git a/variable_test.go b/variable_test.go index c559da4784..bc07e80c5f 100644 --- a/variable_test.go +++ b/variable_test.go @@ -5,8 +5,8 @@ import ( "reflect" "testing" - platform "github.com/influxdata/influxdb" - platformtesting "github.com/influxdata/influxdb/testing" + platform "github.com/influxdata/influxdb/v2" + platformtesting "github.com/influxdata/influxdb/v2/testing" ) var ( diff --git a/vault/secret.go b/vault/secret.go index da41da6479..6fe6215527 100644 --- a/vault/secret.go +++ b/vault/secret.go @@ -8,7 +8,7 @@ import ( "time" "github.com/hashicorp/vault/api" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) var _ platform.SecretService = (*SecretService)(nil) diff --git a/vault/secret_test.go b/vault/secret_test.go index d8ac6e9ef9..3b6c26388e 100644 --- a/vault/secret_test.go +++ b/vault/secret_test.go @@ -7,9 +7,9 @@ import ( "fmt" "testing" - "github.com/influxdata/influxdb" - influxdbtesting "github.com/influxdata/influxdb/testing" - "github.com/influxdata/influxdb/vault" + "github.com/influxdata/influxdb/v2" + influxdbtesting "github.com/influxdata/influxdb/v2/testing" + "github.com/influxdata/influxdb/v2/vault" testcontainer "github.com/testcontainers/testcontainers-go" ) diff --git a/write/batcher.go b/write/batcher.go index e610267158..5ac06d16b8 100644 --- a/write/batcher.go +++ b/write/batcher.go @@ -8,7 +8,7 @@ import ( "io" "time" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" ) const ( diff --git a/write/batcher_test.go b/write/batcher_test.go index f04a9006be..ab546eb71c 100644 --- a/write/batcher_test.go +++ b/write/batcher_test.go @@ -11,8 +11,8 @@ import ( "time" "github.com/google/go-cmp/cmp" - platform "github.com/influxdata/influxdb" - "github.com/influxdata/influxdb/mock" + platform "github.com/influxdata/influxdb/v2" + "github.com/influxdata/influxdb/v2/mock" ) func TestScanLines(t *testing.T) { diff --git a/zap/auth_service.go b/zap/auth_service.go index 99cd5decec..c24d022238 100644 --- a/zap/auth_service.go +++ b/zap/auth_service.go @@ -3,7 +3,7 @@ package zap import ( "context" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" "go.uber.org/zap" ) diff --git a/zap/proxy_query_service.go b/zap/proxy_query_service.go index 84259c168e..32bc01c7b8 100644 --- a/zap/proxy_query_service.go +++ b/zap/proxy_query_service.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/influxdata/influxdb/query" + "github.com/influxdata/influxdb/v2/query" "go.uber.org/zap" ) diff --git a/zap/tracer.go b/zap/tracer.go index 5776f3504b..ade475ab09 100644 --- a/zap/tracer.go +++ b/zap/tracer.go @@ -8,7 +8,7 @@ import ( "net/http" "time" - platform "github.com/influxdata/influxdb" + platform "github.com/influxdata/influxdb/v2" opentracing "github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go/log" "go.uber.org/zap" From ace02b1b351bb4a46dbd972c9ba53a54d53d1e4e Mon Sep 17 00:00:00 2001 From: "Yiqun (Ethan) Zhang" Date: Fri, 3 Apr 2020 15:03:39 -0400 Subject: [PATCH 09/18] fix: nil timestamp panic in to() (#17591) --- query/stdlib/influxdata/influxdb/to.go | 8 +- query/stdlib/influxdata/influxdb/to_test.go | 108 ++++++++++++++++++++ 2 files changed, 115 insertions(+), 1 deletion(-) diff --git a/query/stdlib/influxdata/influxdb/to.go b/query/stdlib/influxdata/influxdb/to.go index a70161bf32..ab6a863166 100644 --- a/query/stdlib/influxdata/influxdb/to.go +++ b/query/stdlib/influxdata/influxdb/to.go @@ -563,6 +563,7 @@ func writeTable(ctx context.Context, t *ToTransformation, tbl flux.Table) (err e var tags models.Tags kv := make([][]byte, 2, er.Len()*2+2) // +2 for field key, value var fieldValues values.Object + outer: for i := 0; i < er.Len(); i++ { measurementName = "" fields := make(models.Fields) @@ -577,7 +578,12 @@ func writeTable(ctx context.Context, t *ToTransformation, tbl flux.Table) (err e kv[0] = models.MeasurementTagKeyBytes kv[1] = er.Strings(j).Value(i) case col.Label == timeColLabel: - pointTime = execute.ValueForRow(er, i, j).Time().Time() + valueTime := execute.ValueForRow(er, i, j) + if valueTime.IsNull() { + // skip rows with null timestamp + continue outer + } + pointTime = valueTime.Time().Time() case isTag[j]: if col.Type != flux.TString { return errors.New("invalid type for tag column") diff --git a/query/stdlib/influxdata/influxdb/to_test.go b/query/stdlib/influxdata/influxdb/to_test.go index 8afc9128a8..8c2c2008e2 100644 --- a/query/stdlib/influxdata/influxdb/to_test.go +++ b/query/stdlib/influxdata/influxdb/to_test.go @@ -787,6 +787,114 @@ m,tag1=c,tag2=ee _value=4 41`), }}, }, }, + { + name: "nil timestamp", + spec: &influxdb.ToProcedureSpec{ + Spec: &influxdb.ToOpSpec{ + Org: "my-org", + Bucket: "my-bucket", + TimeColumn: "_time", + TagColumns: []string{"tag1", "tag2"}, + MeasurementColumn: "_measurement", + }, + }, + data: []flux.Table{executetest.MustCopyTable(&executetest.Table{ + ColMeta: []flux.ColMeta{ + {Label: "_time", Type: flux.TTime}, + {Label: "_measurement", Type: flux.TString}, + {Label: "_field", Type: flux.TString}, + {Label: "_value", Type: flux.TFloat}, + {Label: "tag2", Type: flux.TString}, + {Label: "tag1", Type: flux.TString}, + }, + Data: [][]interface{}{ + {execute.Time(11), "m", "_value", 2.0, "aa", "a"}, + {execute.Time(21), "m", "_value", 2.0, "bb", "a"}, + {execute.Time(21), "m", "_value", 1.0, "cc", "b"}, + {execute.Time(31), "m", "_value", 3.0, "dd", "a"}, + {nil, "m", "_value", 4.0, "ee", "c"}, + }, + })}, + want: wanted{ + result: &mock.PointsWriter{ + Points: mockPoints(oid, bid, `m,tag1=a,tag2=aa _value=2 11 +m,tag1=a,tag2=bb _value=2 21 +m,tag1=b,tag2=cc _value=1 21 +m,tag1=a,tag2=dd _value=3 31`), + }, + tables: []*executetest.Table{{ + ColMeta: []flux.ColMeta{ + {Label: "_time", Type: flux.TTime}, + {Label: "_measurement", Type: flux.TString}, + {Label: "_field", Type: flux.TString}, + {Label: "_value", Type: flux.TFloat}, + {Label: "tag2", Type: flux.TString}, + {Label: "tag1", Type: flux.TString}, + }, + Data: [][]interface{}{ + {execute.Time(11), "m", "_value", 2.0, "aa", "a"}, + {execute.Time(21), "m", "_value", 2.0, "bb", "a"}, + {execute.Time(21), "m", "_value", 1.0, "cc", "b"}, + {execute.Time(31), "m", "_value", 3.0, "dd", "a"}, + }, + }}, + }, + }, + { + name: "nil tag", + spec: &influxdb.ToProcedureSpec{ + Spec: &influxdb.ToOpSpec{ + Org: "my-org", + Bucket: "my-bucket", + TimeColumn: "_time", + TagColumns: []string{"tag1", "tag2"}, + MeasurementColumn: "_measurement", + }, + }, + data: []flux.Table{executetest.MustCopyTable(&executetest.Table{ + ColMeta: []flux.ColMeta{ + {Label: "_time", Type: flux.TTime}, + {Label: "_measurement", Type: flux.TString}, + {Label: "_field", Type: flux.TString}, + {Label: "_value", Type: flux.TFloat}, + {Label: "tag2", Type: flux.TString}, + {Label: "tag1", Type: flux.TString}, + }, + Data: [][]interface{}{ + {execute.Time(11), "m", "_value", 2.0, "aa", "a"}, + {execute.Time(21), "m", "_value", 2.0, "bb", "a"}, + {execute.Time(21), "m", "_value", 1.0, "cc", "b"}, + {execute.Time(31), "m", "_value", 3.0, "dd", "a"}, + {execute.Time(41), "m", "_value", 4.0, nil, "c"}, + }, + })}, + want: wanted{ + result: &mock.PointsWriter{ + Points: mockPoints(oid, bid, `m,tag1=a,tag2=aa _value=2 11 +m,tag1=a,tag2=bb _value=2 21 +m,tag1=b,tag2=cc _value=1 21 +m,tag1=a,tag2=dd _value=3 31 +m,tag1=c _value=4 41`), + }, + tables: []*executetest.Table{{ + ColMeta: []flux.ColMeta{ + {Label: "_time", Type: flux.TTime}, + {Label: "_measurement", Type: flux.TString}, + {Label: "_field", Type: flux.TString}, + {Label: "_value", Type: flux.TFloat}, + {Label: "tag2", Type: flux.TString}, + {Label: "tag1", Type: flux.TString}, + }, + Data: [][]interface{}{ + {execute.Time(11), "m", "_value", 2.0, "aa", "a"}, + {execute.Time(21), "m", "_value", 2.0, "bb", "a"}, + {execute.Time(21), "m", "_value", 1.0, "cc", "b"}, + {execute.Time(31), "m", "_value", 3.0, "dd", "a"}, + {execute.Time(41), "m", "_value", 4.0, nil, "c"}, + }, + }}, + }, + }, } for _, tc := range testCases { From b394fdf28c1e8b068d6fcb3d8861a82a4e1b4810 Mon Sep 17 00:00:00 2001 From: alexpaxton Date: Fri, 3 Apr 2020 12:28:20 -0700 Subject: [PATCH 10/18] feat(ui): redesign alerting index to be responsive (#17583) * feat(ui): redesign alerting index to be responsive * chore(ui): update changelog * fix(ui): ensure tested elements are visible * fix(ui): actually fix e2e tests --- CHANGELOG.md | 4 + ui/cypress/e2e/checks.test.ts | 3 + ui/cypress/e2e/notificationEndpoints.test.ts | 3 + ui/cypress/e2e/notificationRules.test.ts | 3 + ui/src/alerting/components/AlertingIndex.scss | 62 ++++++++++--- ui/src/alerting/components/AlertingIndex.tsx | 89 +++++++++++++------ ui/src/alerting/components/AlertsColumn.tsx | 6 +- 7 files changed, 132 insertions(+), 38 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0097a1ee9a..0a98bf0169 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ 1. [17490](https://github.com/influxdata/influxdb/pull/17490): `influx config -`, to switch back to previous activated configuration +### UI Improvements + +1. [17583](https://github.com/influxdata/influxdb/pull/17583): Update layout of Alerts page to work on all screen sizes + ## v2.0.0-beta.7 [2020-03-27] ### Features diff --git a/ui/cypress/e2e/checks.test.ts b/ui/cypress/e2e/checks.test.ts index 76d10f34c6..2fdd42f38c 100644 --- a/ui/cypress/e2e/checks.test.ts +++ b/ui/cypress/e2e/checks.test.ts @@ -22,6 +22,9 @@ describe('Checks', () => { }) }) cy.get('[data-testid="resource-list--body"]', {timeout: PAGE_LOAD_SLA}) + + // User can only see all panels at once on large screens + cy.getByTestID('alerting-tab--checks').click({force: true}) }) it('can validate a threshold check', () => { diff --git a/ui/cypress/e2e/notificationEndpoints.test.ts b/ui/cypress/e2e/notificationEndpoints.test.ts index fbce237d3f..772e76213e 100644 --- a/ui/cypress/e2e/notificationEndpoints.test.ts +++ b/ui/cypress/e2e/notificationEndpoints.test.ts @@ -29,6 +29,9 @@ describe('Notification Endpoints', () => { cy.wrap(body).as('endpoint') }) cy.visit(`${orgs}/${id}${alerting}`) + + // User can only see all panels at once on large screens + cy.getByTestID('alerting-tab--endpoints').click({force: true}) }) }) }) diff --git a/ui/cypress/e2e/notificationRules.test.ts b/ui/cypress/e2e/notificationRules.test.ts index f97dbcda5a..b763e41d79 100644 --- a/ui/cypress/e2e/notificationRules.test.ts +++ b/ui/cypress/e2e/notificationRules.test.ts @@ -152,6 +152,9 @@ describe('NotificationRules', () => { }) it('can create a notification rule', () => { + // User can only see all panels at once on large screens + cy.getByTestID('alerting-tab--rules').click({force: true}) + const ruleName = 'my-new-rule' cy.getByTestID('create-rule').click() diff --git a/ui/src/alerting/components/AlertingIndex.scss b/ui/src/alerting/components/AlertingIndex.scss index 32a740e3fc..27f56e49a5 100644 --- a/ui/src/alerting/components/AlertingIndex.scss +++ b/ui/src/alerting/components/AlertingIndex.scss @@ -1,32 +1,70 @@ -.alerting-index, -.alerting-index > .cf-grid--row, -.alerting-index > .cf-grid--row > .cf-grid--column { - height: 100%; +/* + Small Screen Layout + ------------------------------------------------------------------------------ +*/ + +.alerting-index .cf-page-contents__fluid { + display: flex; + flex-direction: column; + align-items: stretch; +} + +.alerting-index--selector { + width: 100%; + margin-bottom: $cf-marg-b; +} + +.alerting-index--columns { + display: flex; + align-items: stretch; + flex: 1 0 0; } .alerting-index--column { - height: calc(100% - #{$ix-marg-d}); + display: none; + flex-direction: column; + flex: 1 0 0; overflow: hidden; + margin-bottom: $cf-marg-c; } -.alert-column--empty { - min-height: 160px; - justify-content: center; +.alerting-index__checks .alerting-index--checks, +.alerting-index__endpoints .alerting-index--notification-endpoints, +.alerting-index__rules .alerting-index--notification-rules { + display: flex; } .alerting-index--column-body { flex: 1 0 0; - position: relative; - height: 90%; - padding-bottom: $ix-marg-d; } .alerting-index--list, .alerting-index--search { - padding: 18px; + padding: 20px; padding-top: 0; } +/* + Large Screen Layout + ------------------------------------------------------------------------------ +*/ + +@media screen and (min-width: $cf-grid--breakpoint-lg) { + .alerting-index--selector { + display: none; + } + + .alerting-index--column { + display: flex; + margin-bottom: $cf-marg-d; + margin-right: $cf-marg-b; + + &:last-child { + margin-right: 0; + } + } +} + /* First time widget ------------------------------------------------------------------------------ diff --git a/ui/src/alerting/components/AlertingIndex.tsx b/ui/src/alerting/components/AlertingIndex.tsx index a268977d96..f551cca371 100644 --- a/ui/src/alerting/components/AlertingIndex.tsx +++ b/ui/src/alerting/components/AlertingIndex.tsx @@ -1,9 +1,9 @@ // Libraries -import React, {FunctionComponent} from 'react' +import React, {FunctionComponent, useState} from 'react' import {connect} from 'react-redux' //Components -import {Grid, GridRow, GridColumn, Page} from '@influxdata/clockface' +import {Page, SelectGroup, ButtonShape} from '@influxdata/clockface' import ChecksColumn from 'src/checks/components/ChecksColumn' import RulesColumn from 'src/notifications/rules/components/RulesColumn' import EndpointsColumn from 'src/notifications/endpoints/components/EndpointsColumn' @@ -28,19 +28,33 @@ interface StateProps { limitedResources: string } +type ActiveColumn = 'checks' | 'endpoints' | 'rules' + const AlertingIndex: FunctionComponent = ({ children, limitStatus, limitedResources, }) => { + const [activeColumn, setActiveColumn] = useState('checks') + + const pageContentsClassName = `alerting-index alerting-index__${activeColumn}` + + const handleTabClick = (selectGroupOptionID: ActiveColumn): void => { + setActiveColumn(selectGroupOptionID) + } + return ( <> - + - + = ({ limitStatus={limitStatus} className="load-data--asset-alert" /> - - - - - - - - - - - - - - - - - - - + + + Checks + + + Notification Endpoints + + + Notification Rules + + +
+ + + + + + + + + +
diff --git a/ui/src/alerting/components/AlertsColumn.tsx b/ui/src/alerting/components/AlertsColumn.tsx index 0b456e565b..0129aca3ac 100644 --- a/ui/src/alerting/components/AlertsColumn.tsx +++ b/ui/src/alerting/components/AlertsColumn.tsx @@ -39,10 +39,14 @@ const AlertsColumnHeader: FC = ({ questionMarkTooltipContents, }) => { const [searchTerm, onChangeSearchTerm] = useState('') + + const formattedTitle = title.toLowerCase().replace(' ', '-') + const panelClassName = `alerting-index--column alerting-index--${formattedTitle}` + return ( From 9678dc67d824ed11fab79db5869fabe9b008ccb5 Mon Sep 17 00:00:00 2001 From: alexpaxton Date: Fri, 3 Apr 2020 13:14:24 -0700 Subject: [PATCH 11/18] chore(ui): remove most fancy scrollbars (#17543) * chore(ui): remove unused component * refactor(ui): remove fancy scroll and clean up alert builder * chore(ui): delete unused components * refactor(ui): replace fancy scrollbar in query builder * refactor(ui): replace fancyscrollbars in token viewer * refactor(ui): replace fancyscrollbars in telegraf config builder * refactor(ui): replace fancy scrollbars * refactor(ui): replace fancyscrollbar in empty graph error * refactor(ui): update markdown cell styles and remove fancy scrollbars * refactor(ui): ensure markdown changes look good in light mode * refactor(ui): refactor code snippet to not use fancy scrollbars * refactor(ui): replace last 2 instances of Fancy scrollbars * pull mock and import out of describe block * fix(ui): use less magic numbers for font sizes Co-authored-by: Bucky Schwarz --- .../components/builder/AlertBuilder.scss | 16 +-- .../components/builder/AlertBuilder.tsx | 19 +-- .../components/DashboardLightMode.scss | 10 +- .../components/DashboardSwitcher.tsx | 102 --------------- .../configure/PluginConfigForm.tsx | 7 +- .../configure/TelegrafPluginInstructions.tsx | 7 +- .../select/SelectCollectorsStep.tsx | 7 +- .../verify/VerifyCollectorsStep.tsx | 7 +- .../components/side_bar/SideBar.tsx | 6 +- .../onboarding/components/CompletionStep.tsx | 6 +- ui/src/shared/components/CodeSnippet.scss | 42 +++--- ui/src/shared/components/CodeSnippet.tsx | 9 +- ui/src/shared/components/DropdownMenu.tsx | 122 ------------------ ui/src/shared/components/DropdownMenuItem.tsx | 79 ------------ ui/src/shared/components/EmptyGraphError.scss | 16 ++- ui/src/shared/components/EmptyGraphError.tsx | 6 +- ui/src/shared/components/TokenCodeSnippet.tsx | 9 +- .../permissionsWidget/PermissionsWidget.tsx | 4 +- ui/src/shared/components/views/Markdown.scss | 47 +++---- ui/src/shared/components/views/Markdown.tsx | 6 +- ui/src/tasks/components/RunLogsList.tsx | 7 +- .../components/TelegrafOutputOverlay.test.tsx | 11 +- ui/src/timeMachine/components/Queries.scss | 2 - .../timeMachine/components/QueryBuilder.tsx | 6 +- .../components/TimeMachineAlerting.tsx | 2 +- .../components/builderCard/BuilderCard.scss | 1 + 26 files changed, 111 insertions(+), 445 deletions(-) delete mode 100644 ui/src/dashboards/components/DashboardSwitcher.tsx delete mode 100644 ui/src/shared/components/DropdownMenu.tsx delete mode 100644 ui/src/shared/components/DropdownMenuItem.tsx diff --git a/ui/src/alerting/components/builder/AlertBuilder.scss b/ui/src/alerting/components/builder/AlertBuilder.scss index a34513223e..ef23a176e4 100644 --- a/ui/src/alerting/components/builder/AlertBuilder.scss +++ b/ui/src/alerting/components/builder/AlertBuilder.scss @@ -4,17 +4,17 @@ */ .alert-builder { - padding: 0 $ix-marg-c; - background-color: $g2-kevlar; -} - -.alert-builder--controls { - border-bottom: 0; - padding-right: $ix-marg-c; + height: 100%; + padding-top: $cf-marg-b; + display: flex; } .alert-builder--card { - margin-bottom: $ix-marg-c; + margin-right: $ix-marg-b; + + &:last-child { + margin-right: 0; + } .builder-card--contents { min-height: 100%; diff --git a/ui/src/alerting/components/builder/AlertBuilder.tsx b/ui/src/alerting/components/builder/AlertBuilder.tsx index 6ab16dd553..f1d1800a1e 100644 --- a/ui/src/alerting/components/builder/AlertBuilder.tsx +++ b/ui/src/alerting/components/builder/AlertBuilder.tsx @@ -2,7 +2,6 @@ import React, {FC} from 'react' // Components -import FancyScrollbar from 'src/shared/components/fancy_scrollbar/FancyScrollbar' import CheckMetaCard from 'src/checks/components/CheckMetaCard' import CheckMessageCard from 'src/checks/components/CheckMessageCard' import CheckConditionsCard from 'src/checks/components/CheckConditionsCard' @@ -11,19 +10,11 @@ import {isFlagEnabled} from 'src/shared/utils/featureFlag' const AlertBuilder: FC = () => { return ( -
-
- -
- - - - {isFlagEnabled('matchingNotificationRules') && ( - - )} -
- -
+
+ + + + {isFlagEnabled('matchingNotificationRules') && }
) } diff --git a/ui/src/dashboards/components/DashboardLightMode.scss b/ui/src/dashboards/components/DashboardLightMode.scss index 801e9812d3..33e734f0ad 100644 --- a/ui/src/dashboards/components/DashboardLightMode.scss +++ b/ui/src/dashboards/components/DashboardLightMode.scss @@ -63,9 +63,17 @@ color: $g7-graphite; code { - font-weight: 700; + background-color: $g19-ghost; color: $c-star; } + + pre { + background-color: $g19-ghost; + } + } + + .markdown-cell .cf-dapper-scrollbars--track-y { + background-color: $g17-whisper !important; } .cell--view-empty { diff --git a/ui/src/dashboards/components/DashboardSwitcher.tsx b/ui/src/dashboards/components/DashboardSwitcher.tsx deleted file mode 100644 index 1bfaca1ef2..0000000000 --- a/ui/src/dashboards/components/DashboardSwitcher.tsx +++ /dev/null @@ -1,102 +0,0 @@ -import React, {PureComponent} from 'react' -import {Link, withRouter, WithRouterProps} from 'react-router' -import _ from 'lodash' -import classnames from 'classnames' - -import {ClickOutside} from 'src/shared/components/ClickOutside' -import FancyScrollbar from 'src/shared/components/fancy_scrollbar/FancyScrollbar' - -import {ErrorHandling} from 'src/shared/decorators/errors' - -import {DROPDOWN_MENU_MAX_HEIGHT} from 'src/shared/constants/index' -import {DashboardSwitcherLinks} from 'src/types/dashboards' - -interface Props { - dashboardLinks: DashboardSwitcherLinks -} - -interface State { - isOpen: boolean -} - -@ErrorHandling -class DashboardSwitcher extends PureComponent { - constructor(props) { - super(props) - - this.state = {isOpen: false} - } - - public render() { - const {isOpen} = this.state - - const openClass = isOpen ? 'open' : '' - - return ( - -
- -
    - - {this.links} - -
-
- - ) - } - - public handleClickOutside = () => { - this.setState({isOpen: false}) - } - - private handleToggleMenu = () => { - this.setState({isOpen: !this.state.isOpen}) - } - - private handleCloseMenu = () => { - this.setState({isOpen: false}) - } - - private get links(): JSX.Element[] { - const {links, active} = this.props.dashboardLinks - - return _.sortBy(links, ['text', 'key']).map(link => { - return ( -
  • - - {link.text} - -
    • - ) - }) - } - - private get sourceID(): {sourceID: string} | {} { - const {query} = this.props.location - const {sourceID} = query - if (query.sourceID) { - return {sourceID} - } - - return {} - } -} - -export default withRouter(DashboardSwitcher) diff --git a/ui/src/dataLoaders/components/collectorsWizard/configure/PluginConfigForm.tsx b/ui/src/dataLoaders/components/collectorsWizard/configure/PluginConfigForm.tsx index 940a4dbb53..a27ced93e4 100644 --- a/ui/src/dataLoaders/components/collectorsWizard/configure/PluginConfigForm.tsx +++ b/ui/src/dataLoaders/components/collectorsWizard/configure/PluginConfigForm.tsx @@ -4,9 +4,8 @@ import {connect} from 'react-redux' import _ from 'lodash' // Components -import {Form} from '@influxdata/clockface' +import {Form, DapperScrollbars} from '@influxdata/clockface' import ConfigFieldHandler from 'src/dataLoaders/components/collectorsWizard/configure/ConfigFieldHandler' -import FancyScrollbar from 'src/shared/components/fancy_scrollbar/FancyScrollbar' // Actions import { @@ -40,7 +39,7 @@ export class PluginConfigForm extends PureComponent { const {configFields, telegrafPlugin} = this.props return (
    - @@ -65,7 +64,7 @@ export class PluginConfigForm extends PureComponent { configFields={configFields} telegrafPlugin={telegrafPlugin} /> - + { visible={this.sideBarVisible} />
    - @@ -114,7 +113,7 @@ export class TelegrafPluginInstructions extends PureComponent { size={ComponentSize.Medium} /> - +
    diff --git a/ui/src/dataLoaders/components/collectorsWizard/select/SelectCollectorsStep.tsx b/ui/src/dataLoaders/components/collectorsWizard/select/SelectCollectorsStep.tsx index 1280ebc809..15629f72a4 100644 --- a/ui/src/dataLoaders/components/collectorsWizard/select/SelectCollectorsStep.tsx +++ b/ui/src/dataLoaders/components/collectorsWizard/select/SelectCollectorsStep.tsx @@ -3,11 +3,10 @@ import React, {PureComponent} from 'react' import {connect} from 'react-redux' // Components -import {Form} from '@influxdata/clockface' +import {Form, DapperScrollbars} from '@influxdata/clockface' import {ErrorHandling} from 'src/shared/decorators/errors' import StreamingSelector from 'src/dataLoaders/components/collectorsWizard/select/StreamingSelector' import OnboardingButtons from 'src/onboarding/components/OnboardingButtons' -import FancyScrollbar from 'src/shared/components/fancy_scrollbar/FancyScrollbar' // Actions import { @@ -49,7 +48,7 @@ export class SelectCollectorsStep extends PureComponent { onSubmit={this.props.onIncrementCurrentStepIndex} className="data-loading--form" > - @@ -86,7 +85,7 @@ export class SelectCollectorsStep extends PureComponent { Configure these Plugins - + { return ( - @@ -57,7 +56,7 @@ export class VerifyCollectorStep extends PureComponent { token={token} configID={telegrafConfigID} /> - + {

    {title}

    - +
    {this.childTabs}
    -     +
    ) diff --git a/ui/src/onboarding/components/CompletionStep.tsx b/ui/src/onboarding/components/CompletionStep.tsx index 3fcac670f1..326445211b 100644 --- a/ui/src/onboarding/components/CompletionStep.tsx +++ b/ui/src/onboarding/components/CompletionStep.tsx @@ -6,7 +6,6 @@ import {ErrorHandling} from 'src/shared/decorators/errors' import ResourceFetcher from 'src/shared/components/resource_fetcher' import CompletionAdvancedButton from 'src/onboarding/components/CompletionAdvancedButton' import CompletionQuickStartButton from 'src/onboarding/components/CompletionQuickStartButton' -import FancyScrollbar from 'src/shared/components/fancy_scrollbar/FancyScrollbar' // Constants import { @@ -30,6 +29,7 @@ import { ComponentSize, Columns, Grid, + DapperScrollbars, } from '@influxdata/clockface' import {Dashboard, Organization} from 'src/types' import {ScraperTargetRequest} from '@influxdata/influx' @@ -66,7 +66,7 @@ class CompletionStep extends PureComponent { return (
    - +

    You are ready to go!

    @@ -145,7 +145,7 @@ class CompletionStep extends PureComponent {
    -     +
    ) diff --git a/ui/src/shared/components/CodeSnippet.scss b/ui/src/shared/components/CodeSnippet.scss index b4ac2eb9d1..1f76a3ea63 100644 --- a/ui/src/shared/components/CodeSnippet.scss +++ b/ui/src/shared/components/CodeSnippet.scss @@ -4,27 +4,32 @@ */ .code-snippet { - margin: $ix-marg-a 0; - border-radius: $ix-radius; + border-radius: $cf-radius; overflow: hidden; + border: $cf-border solid $g2-kevlar; + background-color: $g2-kevlar; + margin-bottom: $cf-marg-b; } .code-snippet--scroll { min-height: 26px !important; - background-color: $g4-onyx; + max-height: 350px; + border-radius: $cf-radius-sm; + overflow: hidden; } .code-snippet--text { - font-size: 13px; - line-height: 20px; + font-size: $cf-form-md-font; color: $c-potassium; - font-weight: 600; + font-weight: $cf-font-weight--bold; font-family: $cf-code-font; - padding: $ix-marg-a $ix-marg-c; + border-radius: $cf-radius-sm; + background-color: $g0-obsidian; pre { display: inline-block; white-space: pre-wrap; + padding: $cf-marg-b $cf-marg-c; } pre, @@ -35,34 +40,19 @@ } .new-token--btn { - margin: $ix-marg-a $ix-marg-c; + margin: $cf-marg-a $cf-marg-c; } .code-snippet--footer { - background-color: rgba($g4-onyx, 0.5); display: flex; - border-top: $ix-border solid $g5-pepper; align-items: center; justify-content: space-between; - padding: $ix-marg-b $ix-marg-c; + padding: $cf-marg-b $cf-marg-c; + border-top: $cf-border solid $g2-kevlar; } .code-snippet--label { - font-size: $ix-text-base; + font-size: $cf-text-base; color: $g11-sidewalk; margin: 0; } - -.copy-button { - position: absolute; - right: $ix-marg-b; - top: calc(50% - 15px); - opacity: 0; - transition: opacity 0.2s ease-in-out; -} - -.script-snippet--container:hover { - .copy-button { - opacity: 1; - } -} diff --git a/ui/src/shared/components/CodeSnippet.tsx b/ui/src/shared/components/CodeSnippet.tsx index 925a835b4b..e06d8c9a1b 100644 --- a/ui/src/shared/components/CodeSnippet.tsx +++ b/ui/src/shared/components/CodeSnippet.tsx @@ -6,7 +6,7 @@ import {ErrorHandling} from 'src/shared/decorators/errors' import {Notification} from 'src/types' // Components -import FancyScrollbar from 'src/shared/components/fancy_scrollbar/FancyScrollbar' +import {DapperScrollbars} from '@influxdata/clockface' import CopyButton from 'src/shared/components/CopyButton' export interface Props { @@ -28,10 +28,9 @@ class CodeSnippet extends PureComponent { return (
    -
    @@ -39,7 +38,7 @@ class CodeSnippet extends PureComponent { {copyText}
    -     +
    = ({url, text}) => ( -
  • - - {text} - -
    • -) - -interface AddNew { - url: string - text: string -} - -interface Props { - onAction?: OnActionHandler - actions: DropdownAction[] - items: DropdownItem[] - selected: string - addNew?: AddNew - iconName?: string - buttonColor?: string - menuWidth?: string - menuLabel?: string - menuClass?: string - useAutoComplete?: boolean - disabled?: boolean - searchTerm?: string - onSelection?: OnSelectionHandler - onHighlight?: OnHighlightHandler - highlightedItemIndex?: number -} - -const DropdownMenu: SFC = ({ - items, - addNew, - actions, - selected, - onAction, - menuClass, - menuWidth, - menuLabel, - onSelection, - onHighlight, - useAutoComplete, - highlightedItemIndex, -}) => { - return ( -
      - - {menuLabel ?
    • {menuLabel}
      • : null} - {items.map((item, i) => ( - - ))} - {addNew && } -       -
    - ) -} - -interface DropdownMenuEmptyProps { - useAutoComplete?: boolean - menuClass: string -} - -export const DropdownMenuEmpty: SFC = ({ - useAutoComplete, - menuClass, -}) => ( -
      -
    • No matching items
      • -
    -) - -export default DropdownMenu diff --git a/ui/src/shared/components/DropdownMenuItem.tsx b/ui/src/shared/components/DropdownMenuItem.tsx deleted file mode 100644 index b664fcd32e..0000000000 --- a/ui/src/shared/components/DropdownMenuItem.tsx +++ /dev/null @@ -1,79 +0,0 @@ -import React, {SFC, MouseEvent} from 'react' - -import _ from 'lodash' -import classnames from 'classnames' -import {DropdownAction, DropdownItem} from 'src/types' - -export type OnSelectionHandler = ( - item: DropdownItem -) => (e: MouseEvent) => void - -export type OnHighlightHandler = ( - key: number -) => (e: MouseEvent) => void - -export type OnActionHandler = ( - action: DropdownAction, - item: DropdownItem -) => (e: MouseEvent) => void - -interface ItemProps { - index: number - selected: string - item: DropdownItem - highlightedItemIndex?: number - onSelection?: OnSelectionHandler - onHighlight?: OnHighlightHandler - actions?: DropdownAction[] - onAction?: OnActionHandler -} - -const DropdownMenuItem: SFC = ({ - item, - highlightedItemIndex, - onSelection, - onHighlight, - actions, - onAction, - selected, - index, -}) => { - if (_.isString(item)) { - item = {text: item} - } - - if (item.text === 'SEPARATOR') { - return
  • - } - - return ( -
  • - - {item.text} - - {actions && !!actions.length && ( -
    - {actions.map(action => { - return ( - - ) - })} -
    - )} -
    • - ) -} - -export default DropdownMenuItem diff --git a/ui/src/shared/components/EmptyGraphError.scss b/ui/src/shared/components/EmptyGraphError.scss index d86328dfec..84e52d91ac 100644 --- a/ui/src/shared/components/EmptyGraphError.scss +++ b/ui/src/shared/components/EmptyGraphError.scss @@ -1,14 +1,15 @@ .empty-graph-error { width: 100%; height: 100%; - border-radius: $radius; - background: $g2-kevlar; + border-radius: $cf-radius; + background-color: $g0-obsidian; position: relative; color: $c-dreamsicle; + border: $cf-border solid $g2-kevlar; pre { font-size: 14px; - padding: $ix-marg-c; + padding: $cf-marg-b; user-select: text !important; cursor: text; } @@ -16,5 +17,10 @@ .empty-graph-error--icon { display: inline-block; - margin-right: $ix-marg-b; -} \ No newline at end of file + margin-right: $cf-marg-b; +} + +.empty-graph-error--copy { + margin-top: $cf-marg-a; + margin-right: $cf-marg-a; +} diff --git a/ui/src/shared/components/EmptyGraphError.tsx b/ui/src/shared/components/EmptyGraphError.tsx index 08d6273630..46697d9ccc 100644 --- a/ui/src/shared/components/EmptyGraphError.tsx +++ b/ui/src/shared/components/EmptyGraphError.tsx @@ -8,8 +8,8 @@ import { ComponentSize, ComponentColor, IconFont, + DapperScrollbars, } from '@influxdata/clockface' -import FancyScrollbar from 'src/shared/components/fancy_scrollbar/FancyScrollbar' interface Props { message: string @@ -40,7 +40,7 @@ const EmptyGraphError: FunctionComponent = ({message, testID}) => { className="empty-graph-error--copy" /> - = ({message, testID}) => { /> {message} - +
    ) diff --git a/ui/src/shared/components/TokenCodeSnippet.tsx b/ui/src/shared/components/TokenCodeSnippet.tsx index 63ca64e62a..c79eda4e32 100644 --- a/ui/src/shared/components/TokenCodeSnippet.tsx +++ b/ui/src/shared/components/TokenCodeSnippet.tsx @@ -7,13 +7,13 @@ import { ComponentSize, ComponentStatus, IconFont, + DapperScrollbars, } from '@influxdata/clockface' // Decorator import {Notification} from 'src/types' // Components -import FancyScrollbar from 'src/shared/components/fancy_scrollbar/FancyScrollbar' import CopyButton from 'src/shared/components/CopyButton' // Actions @@ -46,16 +46,15 @@ const TokenCodeSnippet: FC = ({ return (
    - 
    {token}
    -     +
    {
    {this.headerText}
    - {this.sections} + {this.sections}
    ) diff --git a/ui/src/shared/components/views/Markdown.scss b/ui/src/shared/components/views/Markdown.scss index 5522a0716a..63ebdf9c81 100644 --- a/ui/src/shared/components/views/Markdown.scss +++ b/ui/src/shared/components/views/Markdown.scss @@ -3,32 +3,13 @@ ------------------------------------------------------------------------------ */ -.markdown-cell { - position: absolute !important; - top: 0; - left: 0; - border-radius: $ix-radius; +.markdown-cell .cf-dapper-scrollbars--track-y { + background-color: $g2-kevlar !important; } .markdown-cell--contents { - padding: $ix-marg-b + $ix-marg-a 26px; - font-size: 13px; -} - -.markdown-cell > .fancy-scroll--track-v, -.markdown-cell > .fancy-scroll--track-h { - z-index: 2; -} - -.markdown-cell:after { - pointer-events: none; - content: ''; - position: absolute; - bottom: 0; - left: 0; - width: 100%; - @include gradient-v(rgba($g3-castle, 0), $g3-castle); - z-index: 1; + padding: $cf-marg-b + $cf-marg-a 26px; + font-size: 1.2em; } /* @@ -44,17 +25,17 @@ p { font-size: 1em; line-height: 1.25em; - font-weight: 500; + font-weight: $cf-font-weight--medium; } h3, h4 { - border-bottom: 2px solid $g4-onyx; + border-bottom: $cf-border solid $g4-onyx; padding-bottom: 0.25em; } strong { - font-weight: 900; + font-weight: $cf-font-weight--black; color: $g16-pearl; } @@ -64,8 +45,8 @@ td, th { - padding: 4px 8px; - border: $ix-border solid $g5-pepper; + padding: $cf-marg-a $cf-marg-b; + border: $cf-border solid $g5-pepper; } th { @@ -73,17 +54,19 @@ } code { - border-radius: 3px; + border-radius: $cf-radius-sm; margin: 0; padding: 2px 6px; color: $c-potassium; letter-spacing: 0; - font-weight: 500; + font-weight: $cf-font-weight--bold; + background-color: $g1-raven; } pre { - border-radius: 3px; + border-radius: $cf-radius-sm; padding: 6px; + background-color: $g1-raven; code { padding: 0; @@ -91,7 +74,7 @@ } img { - border-radius: $ix-radius; + border-radius: $cf-radius; max-width: 100%; } diff --git a/ui/src/shared/components/views/Markdown.tsx b/ui/src/shared/components/views/Markdown.tsx index d61bdca77e..c4d0a19ae7 100644 --- a/ui/src/shared/components/views/Markdown.tsx +++ b/ui/src/shared/components/views/Markdown.tsx @@ -3,7 +3,7 @@ import React, {PureComponent} from 'react' import ReactMarkdown from 'react-markdown' // Components -import FancyScrollbar from 'src/shared/components/fancy_scrollbar/FancyScrollbar' +import {DapperScrollbars} from '@influxdata/clockface' // Utils import {humanizeNote} from 'src/dashboards/utils/notes' @@ -21,14 +21,14 @@ class Markdown extends PureComponent { const {text} = this.props return ( - +
    -     + ) } } diff --git a/ui/src/tasks/components/RunLogsList.tsx b/ui/src/tasks/components/RunLogsList.tsx index cb458162d9..19a953764b 100644 --- a/ui/src/tasks/components/RunLogsList.tsx +++ b/ui/src/tasks/components/RunLogsList.tsx @@ -3,9 +3,8 @@ import React, {PureComponent} from 'react' import _ from 'lodash' //Components -import {Overlay, IndexList} from '@influxdata/clockface' +import {Overlay, IndexList, DapperScrollbars} from '@influxdata/clockface' import RunLogRow from 'src/tasks/components/RunLogRow' -import FancyScrollbar from 'src/shared/components/fancy_scrollbar/FancyScrollbar' // Types import {LogEvent} from 'src/types' @@ -27,7 +26,7 @@ class RunLogsOverlay extends PureComponent { - + @@ -37,7 +36,7 @@ class RunLogsOverlay extends PureComponent { {this.listLogs} - + ) diff --git a/ui/src/telegrafs/components/TelegrafOutputOverlay.test.tsx b/ui/src/telegrafs/components/TelegrafOutputOverlay.test.tsx index c2d4e8b7aa..5d175f7cd9 100644 --- a/ui/src/telegrafs/components/TelegrafOutputOverlay.test.tsx +++ b/ui/src/telegrafs/components/TelegrafOutputOverlay.test.tsx @@ -2,6 +2,11 @@ import React from 'react' import {render} from 'react-testing-library' +// NOTE: stubbing is required here as the CopyButton component +// requires a redux store (alex) +jest.mock('src/shared/components/CopyButton', () => () => null) +import {TelegrafOutputOverlay} from 'src/telegrafs/components/TelegrafOutputOverlay' + describe('Telegrafs.Components.TelegrafOutputOverlay', () => { beforeEach(() => { jest.resetModules() @@ -15,12 +20,6 @@ describe('Telegrafs.Components.TelegrafOutputOverlay', () => { buckets: [], onClose: () => {}, } - // NOTE: stubbing is required here as the CopyButton component - // requires a redux store (alex) - jest.mock('src/shared/components/CopyButton', () => () => null) - const { - TelegrafOutputOverlay, - } = require('src/telegrafs/components/TelegrafOutputOverlay') const {getByTestId} = render() const root = getByTestId('telegraf-output-overlay--code-snippet') diff --git a/ui/src/timeMachine/components/Queries.scss b/ui/src/timeMachine/components/Queries.scss index 1cd8af3e74..a4c7eaf9f3 100644 --- a/ui/src/timeMachine/components/Queries.scss +++ b/ui/src/timeMachine/components/Queries.scss @@ -59,10 +59,8 @@ } .time-machine--editor-title { - height: 38px; user-select: none; font-weight: 500; - line-height: 30px; padding-left: 6px; color: $g13-mist; } diff --git a/ui/src/timeMachine/components/QueryBuilder.tsx b/ui/src/timeMachine/components/QueryBuilder.tsx index 1ed218bc0e..8b6e3608f4 100644 --- a/ui/src/timeMachine/components/QueryBuilder.tsx +++ b/ui/src/timeMachine/components/QueryBuilder.tsx @@ -5,11 +5,11 @@ import {range} from 'lodash' // Components import TagSelector from 'src/timeMachine/components/TagSelector' -import FancyScrollbar from 'src/shared/components/fancy_scrollbar/FancyScrollbar' import FunctionSelector from 'src/timeMachine/components/FunctionSelector' import AddCardButton from 'src/timeMachine/components/AddCardButton' import BuilderCard from 'src/timeMachine/components/builderCard/BuilderCard' import BucketsSelector from 'src/timeMachine/components/queryBuilder/BucketsSelector' +import {DapperScrollbars} from '@influxdata/clockface' // Actions import {loadBuckets, addTagSelector} from 'src/timeMachine/actions/queryBuilder' @@ -47,7 +47,7 @@ class TimeMachineQueryBuilder extends PureComponent { return (
    - +
    @@ -58,7 +58,7 @@ class TimeMachineQueryBuilder extends PureComponent { ))} {this.addButton}
    -     + {this.functionSelector}
    diff --git a/ui/src/timeMachine/components/TimeMachineAlerting.tsx b/ui/src/timeMachine/components/TimeMachineAlerting.tsx index 2330c6b102..4dc91749e6 100644 --- a/ui/src/timeMachine/components/TimeMachineAlerting.tsx +++ b/ui/src/timeMachine/components/TimeMachineAlerting.tsx @@ -17,7 +17,7 @@ import {isFlagEnabled} from 'src/shared/utils/featureFlag' const TimeMachineAlerting: FunctionComponent = () => { return (
    -
    +
    Configure a Check
    * { From 53a13e5a778ec649f3106db7162c529d533337d0 Mon Sep 17 00:00:00 2001 From: Ariel Salem Date: Fri, 3 Apr 2020 13:31:05 -0700 Subject: [PATCH 12/18] fix(regression): function inserts now happen on new line (#17552) --- CHANGELOG.md | 1 + .../components/TimeMachineFluxEditor.tsx | 75 ++++++++++++++----- .../timeMachine/utils/insertFunction.test.ts | 17 +---- ui/src/timeMachine/utils/insertFunction.ts | 13 +--- 4 files changed, 61 insertions(+), 45 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a98bf0169..a55a636426 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,7 @@ 1. [17515](https://github.com/influxdata/influxdb/pull/17515): Editing a table cell shows the proper values and respects changes 1. [17521](https://github.com/influxdata/influxdb/pull/17521): Table view scrolling should be slightly smoother 1. [17601](https://github.com/influxdata/influxdb/pull/17601): URL table values on single columns are being correctly parsed +1. [17552](https://github.com/influxdata/influxdb/pull/17552): Fixed a regression bug that insert aggregate functions where the cursor is rather than a new line ### UI Improvements diff --git a/ui/src/timeMachine/components/TimeMachineFluxEditor.tsx b/ui/src/timeMachine/components/TimeMachineFluxEditor.tsx index e5ad23e572..cf4a5263d6 100644 --- a/ui/src/timeMachine/components/TimeMachineFluxEditor.tsx +++ b/ui/src/timeMachine/components/TimeMachineFluxEditor.tsx @@ -13,12 +13,13 @@ import {saveAndExecuteQueries} from 'src/timeMachine/actions/queries' // Utils import {getActiveQuery, getActiveTimeMachine} from 'src/timeMachine/selectors' import { - formatFunctionForInsert, + functionRequiresNewLine, generateImport, } from 'src/timeMachine/utils/insertFunction' // Types import {AppState, FluxToolbarFunction, EditorType} from 'src/types' +import * as monacoEditor from 'monaco-editor/esm/vs/editor/editor.api' interface StateProps { activeQueryText: string @@ -56,31 +57,69 @@ const TimeMachineFluxEditor: FC = ({ onSetActiveQueryText(editorInstance.getValue()) } - const handleInsertFluxFunction = (func: FluxToolbarFunction): void => { + const getInsertLineNumber = (currentLineNumber: number): number => { + const scriptLines = activeQueryText.split('\n') + + const currentLine = + scriptLines[currentLineNumber] || scriptLines[scriptLines.length - 1] + + // Insert on the current line if its an empty line + if (!currentLine.trim()) { + return currentLineNumber + } + + return currentLineNumber + 1 + } + + const defaultColumnPosition = 1 // beginning column of the row + + const getFluxTextAndRange = ( + func: FluxToolbarFunction + ): {text: string; range: monacoEditor.Range} => { const p = editorInstance.getPosition() - // sets the range based on the current position - let range = new window.monaco.Range( - p.lineNumber, - p.column, - p.lineNumber, - p.column - ) + const insertLineNumber = getInsertLineNumber(p.lineNumber) + + let row = insertLineNumber + + const [currentRange] = editorInstance.getVisibleRanges() + // Determines whether the new insert line is beyond the current range + let shouldInsertOnLastLine = insertLineNumber > currentRange.endLineNumber // edge case for when user toggles to the script editor // this defaults the cursor to the initial position (top-left, 1:1 position) - if (p.lineNumber === 1 && p.column === 1) { - const [currentRange] = editorInstance.getVisibleRanges() + if (p.lineNumber === 1 && p.column === defaultColumnPosition) { // adds the function to the end of the query - range = new window.monaco.Range( - currentRange.endLineNumber + 1, - p.column, - currentRange.endLineNumber + 1, - p.column - ) + shouldInsertOnLastLine = true + row = currentRange.endLineNumber + 1 } + + let text = '' + if (shouldInsertOnLastLine) { + text = `\n |> ${func.example}` + } else { + text = ` |> ${func.example}\n` + } + + if (functionRequiresNewLine(func.name)) { + text = `\n${func.example}\n` + } + + const range = new window.monaco.Range( + row, + defaultColumnPosition, + row, + defaultColumnPosition + ) + + return {text, range} + } + + const handleInsertFluxFunction = (func: FluxToolbarFunction): void => { + const {text, range} = getFluxTextAndRange(func) + const edits = [ { range, - text: formatFunctionForInsert(func.name, func.example), + text, }, ] const importStatement = generateImport( diff --git a/ui/src/timeMachine/utils/insertFunction.test.ts b/ui/src/timeMachine/utils/insertFunction.test.ts index 747ff0dd1f..1ea03cef56 100644 --- a/ui/src/timeMachine/utils/insertFunction.test.ts +++ b/ui/src/timeMachine/utils/insertFunction.test.ts @@ -1,10 +1,7 @@ -import { - generateImport, - formatFunctionForInsert, -} from 'src/timeMachine/utils/insertFunction' +import {generateImport} from 'src/timeMachine/utils/insertFunction' describe('insertFunction', () => { - test('generateImport', () => { + test('generateImport should generate an import statement', () => { const emptyImport = generateImport('', '') expect(emptyImport).toEqual(false) const func = 'aggregateWindow' @@ -14,14 +11,4 @@ describe('insertFunction', () => { const actual = generateImport(func, script) expect(actual).toEqual(`import "${func}"`) }) - - test('formatFunctionForInsert', () => { - const fluxFunc = 'funky' - const union = 'union' - const requiresNewLine = formatFunctionForInsert(union, fluxFunc) - expect(requiresNewLine).toEqual(`\n${fluxFunc}`) - const to = 'to' - const fluxNewLine = formatFunctionForInsert(to, fluxFunc) - expect(fluxNewLine).toEqual(`\n |> ${fluxFunc}`) - }) }) diff --git a/ui/src/timeMachine/utils/insertFunction.ts b/ui/src/timeMachine/utils/insertFunction.ts index e3af6d6d32..f3221ae601 100644 --- a/ui/src/timeMachine/utils/insertFunction.ts +++ b/ui/src/timeMachine/utils/insertFunction.ts @@ -1,7 +1,7 @@ // Constants import {FROM, UNION} from 'src/shared/constants/fluxFunctions' -const functionRequiresNewLine = (funcName: string): boolean => { +export const functionRequiresNewLine = (funcName: string): boolean => { switch (funcName) { case FROM.name: case UNION.name: { @@ -12,17 +12,6 @@ const functionRequiresNewLine = (funcName: string): boolean => { } } -export const formatFunctionForInsert = ( - funcName: string, - fluxFunction: string -) => { - if (functionRequiresNewLine(funcName)) { - return `\n${fluxFunction}` - } - - return `\n |> ${fluxFunction}` -} - export const generateImport = ( funcPackage: string, script: string From d2ea7c30ece8e2db9578a5b89ef19887442c9526 Mon Sep 17 00:00:00 2001 From: Ariel Salem Date: Fri, 3 Apr 2020 15:17:08 -0700 Subject: [PATCH 13/18] chore(ui): updated login page styling to match Quartz (#17600) --- ui/src/onboarding/containers/LoginPage.scss | 11 +---- ui/src/onboarding/containers/LoginPage.tsx | 7 +-- .../containers/LoginPageContents.tsx | 45 +++++++++++++++++-- ui/src/shared/utils/pageTitles.ts | 4 +- 4 files changed, 49 insertions(+), 18 deletions(-) diff --git a/ui/src/onboarding/containers/LoginPage.scss b/ui/src/onboarding/containers/LoginPage.scss index 6a2df64d61..5bfd8eb61c 100644 --- a/ui/src/onboarding/containers/LoginPage.scss +++ b/ui/src/onboarding/containers/LoginPage.scss @@ -1,12 +1,3 @@ -.clockface--app-wrapper.sign-up--page { - .cf-funnel-page { - background-image: url('../../assets/images/influxLogoBg.svg'); - background-position: center; - background-repeat: none; - background-size: cover; - } -} - .create-account--button { margin: 15px 0; } @@ -39,7 +30,7 @@ } .heading--margins { - margin-bottom: $ix-marg-c; + margin: $ix-marg-c 0; } .login--forgot-password { diff --git a/ui/src/onboarding/containers/LoginPage.tsx b/ui/src/onboarding/containers/LoginPage.tsx index 0ca5750656..d795f3d32a 100644 --- a/ui/src/onboarding/containers/LoginPage.tsx +++ b/ui/src/onboarding/containers/LoginPage.tsx @@ -16,14 +16,15 @@ import LoginPageContents from 'src/onboarding/containers/LoginPageContents' export const LoginPage: FC = () => ( - + } > Create your Free InfluxDB Cloud Account diff --git a/ui/src/onboarding/containers/LoginPageContents.tsx b/ui/src/onboarding/containers/LoginPageContents.tsx index f6656613cc..1925ccfe05 100644 --- a/ui/src/onboarding/containers/LoginPageContents.tsx +++ b/ui/src/onboarding/containers/LoginPageContents.tsx @@ -8,11 +8,15 @@ import { ComponentStatus, FlexBox, FlexDirection, + FontWeight, Grid, + Heading, + HeadingElement, JustifyContent, Method, Panel, SelectGroup, + Typeface, } from '@influxdata/clockface' import auth0js, {WebAuth} from 'auth0-js' @@ -88,6 +92,10 @@ class LoginPageContents extends PureComponent { }) } catch (error) { console.error(error) + // TODO: uncomment after demo day + // redirect to universal login page if there's an error + // window.location.href = + // 'https://auth.a.influxcloud.net/' throw error } } @@ -122,7 +130,14 @@ class LoginPageContents extends PureComponent { size={ComponentSize.Large} justifyContent={JustifyContent.Center} > -

    Continue with

    + + Continue with + @@ -153,7 +168,14 @@ class LoginPageContents extends PureComponent {     -
    OR
    + + OR + { ...errors, emailError: 'Please enter a valid email address', }) - } else if (auth0Err.code === 'user_exists') { + } else if ( + auth0Err.code === 'access_denied' || + auth0Err.code === 'user_exists' + ) { const emailError = `An account with that email address already exists. Try logging in instead.` this.setState({...errors, emailError}) } else { @@ -407,7 +432,19 @@ class LoginPageContents extends PureComponent { } private handleTabChange = (value: ActiveTab) => { - this.setState({activeTab: value}) + this.setState({ + activeTab: value, + confirmPassword: '', + confirmPasswordError: '', + email: '', + emailError: '', + firstName: '', + firstNameError: '', + lastName: '', + lastNameError: '', + password: '', + passwordError: '', + }) } private handleSocialClick = (connection: Auth0Connection) => { diff --git a/ui/src/shared/utils/pageTitles.ts b/ui/src/shared/utils/pageTitles.ts index 9506e14d9b..fbfb6de8cc 100644 --- a/ui/src/shared/utils/pageTitles.ts +++ b/ui/src/shared/utils/pageTitles.ts @@ -1,10 +1,12 @@ import {getOrg} from 'src/organizations/selectors' import {store} from 'src/index' +import {CLOUD} from 'src/shared/constants' export const pageTitleSuffixer = (pageTitles: string[]): string => { const state = store.getState() const {name} = getOrg(state) || null - const titles = [...pageTitles, name, 'InfluxDB 2.0'] + const title = CLOUD ? 'InfluxDB Cloud' : 'InfluxDB' + const titles = [...pageTitles, name, title] return titles.join(' | ') } From 6e4cf7ffef0c4c457d21b4d990f58e95fb6ed2c7 Mon Sep 17 00:00:00 2001 From: "Jonathan A. Sternberg" Date: Fri, 3 Apr 2020 17:40:36 -0500 Subject: [PATCH 14/18] refactor: fix imports from go template files (#17615) --- pkg/data/gen/arrays.gen.go.tmpl | 6 +++--- pkg/data/gen/precision_string.go | 12 ++++++++++++ pkg/data/gen/values_sequence.gen.go.tmpl | 6 +++--- storage/flux/table.gen.go.tmpl | 6 +++--- storage/reads/array_cursor.gen.go.tmpl | 2 +- storage/reads/datatypes/storage_common.pb.go | 2 +- tsdb/tsm1/array_cursor.gen.go.tmpl | 2 +- tsdb/tsm1/array_cursor_iterator.gen.go.tmpl | 6 +++--- tsdb/tsm1/compact.gen.go.tmpl | 2 +- tsdb/tsm1/encoding.gen.go.tmpl | 2 +- tsdb/tsm1/engine.go | 6 +++--- tsdb/tsm1/file_store.gen.go.tmpl | 2 +- tsdb/tsm1/reader.gen.go.tmpl | 2 +- 13 files changed, 34 insertions(+), 22 deletions(-) diff --git a/pkg/data/gen/arrays.gen.go.tmpl b/pkg/data/gen/arrays.gen.go.tmpl index 7e011ff350..776b1a8ec0 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/influxdb/tsdb/cursors" - "github.com/influxdata/influxdb/tsdb/tsm1" + "github.com/influxdata/influxdb/v2/tsdb/cursors" + "github.com/influxdata/influxdb/v2/tsdb/tsm1" ) {{range .}} @@ -33,4 +33,4 @@ func (a *{{$typename}}) Copy(dst *cursors.{{$tsdbname}}) { dst.Timestamps = append(dst.Timestamps[:0], a.Timestamps...) dst.Values = append(dst.Values[:0], a.Values...) } -{{end}} \ No newline at end of file +{{end}} diff --git a/pkg/data/gen/precision_string.go b/pkg/data/gen/precision_string.go index 8c78f3fc97..e53b4712ba 100644 --- a/pkg/data/gen/precision_string.go +++ b/pkg/data/gen/precision_string.go @@ -4,6 +4,18 @@ package gen import "strconv" +func _() { + // An "invalid array index" compiler error signifies that the constant values have changed. + // Re-run the stringer command to generate them again. + var x [1]struct{} + _ = x[precisionMillisecond-0] + _ = x[precisionNanosecond-1] + _ = x[precisionMicrosecond-2] + _ = x[precisionSecond-3] + _ = x[precisionMinute-4] + _ = x[precisionHour-5] +} + const _precision_name = "MillisecondNanosecondMicrosecondSecondMinuteHour" var _precision_index = [...]uint8{0, 11, 21, 32, 38, 44, 48} diff --git a/pkg/data/gen/values_sequence.gen.go.tmpl b/pkg/data/gen/values_sequence.gen.go.tmpl index be57d8a2c9..562704cf5b 100644 --- a/pkg/data/gen/values_sequence.gen.go.tmpl +++ b/pkg/data/gen/values_sequence.gen.go.tmpl @@ -1,8 +1,8 @@ package gen import ( - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/tsdb/cursors" ) {{range .}} @@ -57,4 +57,4 @@ func (s *time{{.Name}}ValuesSequence) Values() Values { func (s *time{{.Name}}ValuesSequence) ValueType() models.FieldType { return models.{{.Name}} } -{{end}} \ No newline at end of file +{{end}} diff --git a/storage/flux/table.gen.go.tmpl b/storage/flux/table.gen.go.tmpl index 863fce0369..d55592df49 100644 --- a/storage/flux/table.gen.go.tmpl +++ b/storage/flux/table.gen.go.tmpl @@ -7,9 +7,9 @@ import ( "github.com/influxdata/flux/arrow" "github.com/influxdata/flux/execute" "github.com/influxdata/flux/memory" - "github.com/influxdata/influxdb/models" - storage "github.com/influxdata/influxdb/storage/reads" - "github.com/influxdata/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2/models" + storage "github.com/influxdata/influxdb/v2/storage/reads" + "github.com/influxdata/influxdb/v2/tsdb/cursors" "github.com/pkg/errors" ) {{range .}} diff --git a/storage/reads/array_cursor.gen.go.tmpl b/storage/reads/array_cursor.gen.go.tmpl index dbb6ca5e7a..931b86380f 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/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2/tsdb/cursors" ) const ( diff --git a/storage/reads/datatypes/storage_common.pb.go b/storage/reads/datatypes/storage_common.pb.go index 5f16e9bcc7..f963f5bcc7 100644 --- a/storage/reads/datatypes/storage_common.pb.go +++ b/storage/reads/datatypes/storage_common.pb.go @@ -2222,7 +2222,7 @@ func (m *CapabilitiesResponse) MarshalTo(dAtA []byte) (int, error) { var l int _ = l if len(m.Caps) > 0 { - for k := range m.Caps { + for k, _ := range m.Caps { dAtA[i] = 0xa i++ v := m.Caps[k] diff --git a/tsdb/tsm1/array_cursor.gen.go.tmpl b/tsdb/tsm1/array_cursor.gen.go.tmpl index 5c7cd9a5a8..ea1f1d0ac5 100644 --- a/tsdb/tsm1/array_cursor.gen.go.tmpl +++ b/tsdb/tsm1/array_cursor.gen.go.tmpl @@ -3,7 +3,7 @@ package tsm1 import ( "sort" - "github.com/influxdata/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2/tsdb/cursors" ) // Array Cursors diff --git a/tsdb/tsm1/array_cursor_iterator.gen.go.tmpl b/tsdb/tsm1/array_cursor_iterator.gen.go.tmpl index 1b68269232..4140033ca7 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/influxdb/models" - "github.com/influxdata/influxdb/query" - "github.com/influxdata/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2/models" + "github.com/influxdata/influxdb/v2/query" + "github.com/influxdata/influxdb/v2/tsdb/cursors" ) {{range .}} diff --git a/tsdb/tsm1/compact.gen.go.tmpl b/tsdb/tsm1/compact.gen.go.tmpl index 00bc6c393d..f35fa2b0fb 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/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2/tsdb/cursors" ) {{range .}} diff --git a/tsdb/tsm1/encoding.gen.go.tmpl b/tsdb/tsm1/encoding.gen.go.tmpl index 3bdc6d9f57..f4fc3c1831 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/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2/tsdb/cursors" ) {{range .}} diff --git a/tsdb/tsm1/engine.go b/tsdb/tsm1/engine.go index a4ca605c9f..0a5655979e 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/influxdb/tsdb/tsm1" +package tsm1 import ( "bytes" @@ -32,8 +32,8 @@ import ( ) //go:generate env GO111MODULE=on go run github.com/benbjohnson/tmpl -data=@array_cursor.gen.go.tmpldata array_cursor.gen.go.tmpl array_cursor_iterator.gen.go.tmpl -//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/influxdata/influxdb/v2/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/v2/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/file_store.gen.go.tmpl b/tsdb/tsm1/file_store.gen.go.tmpl index 88d8c4126c..e96186d61d 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/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2/tsdb/cursors" ) {{$isArray := .D.isArray}} {{$isNotArray := not $isArray}} diff --git a/tsdb/tsm1/reader.gen.go.tmpl b/tsdb/tsm1/reader.gen.go.tmpl index a7b25f3d6d..68f550caaf 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/influxdb/tsdb/cursors" + "github.com/influxdata/influxdb/v2/tsdb/cursors" ) {{range .}} From d2aefbd8fdbdd0878d37c119a92348fe194c815d Mon Sep 17 00:00:00 2001 From: Alex Boatwright Date: Fri, 3 Apr 2020 16:16:55 -0700 Subject: [PATCH 15/18] fix: hierarchy of variables is back (#17609) --- ui/src/dashboards/actions/thunks.ts | 3 ++- ui/src/external/monaco.flux.server.ts | 2 +- ui/src/timeMachine/actions/queries.ts | 3 +++ ui/src/types/variables.ts | 19 +++++++++++++++++-- ui/src/variables/actions/thunks.ts | 4 ++-- ui/src/variables/selectors/index.tsx | 8 ++++++++ ui/src/variables/utils/buildVarsOption.ts | 2 +- ui/src/variables/utils/hydrateVars.ts | 7 +++++++ 8 files changed, 41 insertions(+), 7 deletions(-) diff --git a/ui/src/dashboards/actions/thunks.ts b/ui/src/dashboards/actions/thunks.ts index a18d64f199..9aa061233e 100644 --- a/ui/src/dashboards/actions/thunks.ts +++ b/ui/src/dashboards/actions/thunks.ts @@ -286,7 +286,8 @@ export const getDashboard = (dashboardID: string) => async ( throw new Error(resp.data.message) } - dispatch(hydrateVariables()) + const skipCache = true + dispatch(hydrateVariables(skipCache)) const normDash = normalize( resp.data, diff --git a/ui/src/external/monaco.flux.server.ts b/ui/src/external/monaco.flux.server.ts index 74cdc30767..fb10bba096 100644 --- a/ui/src/external/monaco.flux.server.ts +++ b/ui/src/external/monaco.flux.server.ts @@ -202,7 +202,7 @@ export class LSPServer { // drift between the parser and the internal representation const variables = getAllVariables(state, contextID) .map(v => asAssignment(v)) - .filter(v => !(v.init.type === 'StringLiteral' && !v.init.value)) + .filter(v => !!v) const file = buildVarsOption(variables) diff --git a/ui/src/timeMachine/actions/queries.ts b/ui/src/timeMachine/actions/queries.ts index 8badd09b17..a350715fcf 100644 --- a/ui/src/timeMachine/actions/queries.ts +++ b/ui/src/timeMachine/actions/queries.ts @@ -12,6 +12,7 @@ import {runStatusesQuery} from 'src/alerting/utils/statusEvents' // Actions import {notify} from 'src/shared/actions/notifications' +import {hydrateVariables} from 'src/variables/actions/thunks' // Constants import {rateLimitReached, resultTooLarge} from 'src/shared/copy/notifications' @@ -115,6 +116,8 @@ export const executeQueries = () => async (dispatch, getState: GetState) => { try { dispatch(setQueryResults(RemoteDataState.Loading, [], null)) + await dispatch(hydrateVariables()) + //TODO: replace with activeContext selector const contextID = activeTimeMachine.contextID || state.timeMachines.activeTimeMachineID diff --git a/ui/src/types/variables.ts b/ui/src/types/variables.ts index 8722d10ba6..275fdf962f 100644 --- a/ui/src/types/variables.ts +++ b/ui/src/types/variables.ts @@ -1,8 +1,13 @@ import {Variable as GenVariable, Label} from 'src/client' -import {VariableProperties as GenVariableProperties} from 'src/client' +import { + QueryVariableProperties as GenQueryVariableProperties, + ConstantVariableProperties as GenConstantVariableProperties, + MapVariableProperties as GenMapVariableProperties, +} from 'src/client' import { VariableArgumentType, + VariableMapObject, QueryArguments, MapArguments, CSVArguments, @@ -16,9 +21,19 @@ export interface SystemVariableProperties { type?: 'system' values?: any } +export interface QueryVariableProperties + extends Omit { + values?: { + query?: string + language?: string + results?: string[] | VariableMapObject + } +} export type VariableProperties = | SystemVariableProperties - | GenVariableProperties + | QueryVariableProperties + | GenConstantVariableProperties + | GenMapVariableProperties export interface Variable extends Omit, 'arguments'> { diff --git a/ui/src/variables/actions/thunks.ts b/ui/src/variables/actions/thunks.ts index 8833d829f6..1676282166 100644 --- a/ui/src/variables/actions/thunks.ts +++ b/ui/src/variables/actions/thunks.ts @@ -97,7 +97,7 @@ export const getVariables = () => async ( } } -export const hydrateVariables = () => async ( +export const hydrateVariables = (skipCache?: boolean) => async ( dispatch: Dispatch, getState: GetState ) => { @@ -107,7 +107,7 @@ export const hydrateVariables = () => async ( const vals = await hydrateVars(vars, getAllVariablesFromState(state), { orgID: org.id, url: state.links.query.self, - skipCache: true, + skipCache, }).promise vars diff --git a/ui/src/variables/selectors/index.tsx b/ui/src/variables/selectors/index.tsx index 7cee083e7f..bd55cfb073 100644 --- a/ui/src/variables/selectors/index.tsx +++ b/ui/src/variables/selectors/index.tsx @@ -175,6 +175,11 @@ export const getVariable = ( if (!vari.selected) { if (vari.arguments.type === 'map') { vari.selected = [Object.keys(vari.arguments.values)[0]] + } else if ( + vari.arguments.type === 'query' && + vari.arguments.values.results + ) { + vari.selected = [vari.arguments.values.results[0]] } else { vari.selected = [vari.arguments.values[0]] } @@ -252,6 +257,9 @@ export const asAssignment = (variable: Variable): VariableAssignment => { } if (variable.arguments.type === 'query') { + if (!variable.selected || !variable.selected[0]) { + return null + } out.init = { type: 'StringLiteral', value: variable.selected[0], diff --git a/ui/src/variables/utils/buildVarsOption.ts b/ui/src/variables/utils/buildVarsOption.ts index 203deb191a..077a6ef097 100644 --- a/ui/src/variables/utils/buildVarsOption.ts +++ b/ui/src/variables/utils/buildVarsOption.ts @@ -20,7 +20,7 @@ export const buildVarsOption = (variables: VariableAssignment[]): File => ({ }, init: { type: 'ObjectExpression', - properties: variables.map(assignmentToProperty), + properties: variables.filter(v => !!v).map(assignmentToProperty), }, }, }, diff --git a/ui/src/variables/utils/hydrateVars.ts b/ui/src/variables/utils/hydrateVars.ts index 4fdaeec9a4..2a9894c204 100644 --- a/ui/src/variables/utils/hydrateVars.ts +++ b/ui/src/variables/utils/hydrateVars.ts @@ -372,7 +372,14 @@ export const hydrateVars = ( node.status === RemoteDataState.Loading try { + // TODO: remove the concept of node.values, just use node.variable node.values = await hydrateVarsHelper(node, options) + if (node.variable.arguments.type === 'query') { + node.variable.arguments.values.results = node.values.values + } else { + node.variable.arguments.values = node.values.values + } + node.variable.selected = node.values.selected node.status = RemoteDataState.Done return Promise.all(node.parents.filter(readyToResolve).map(resolve)) From 7bf234ab89551af3960a78455126dfca8f00fcff Mon Sep 17 00:00:00 2001 From: Bucky Schwarz Date: Fri, 3 Apr 2020 14:24:51 -0700 Subject: [PATCH 16/18] feat(cloud): change text on Upgrade button to Upgrade Now --- ui/src/pageLayout/components/CloudNav.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/pageLayout/components/CloudNav.tsx b/ui/src/pageLayout/components/CloudNav.tsx index 93ece543a0..5de29da99e 100644 --- a/ui/src/pageLayout/components/CloudNav.tsx +++ b/ui/src/pageLayout/components/CloudNav.tsx @@ -69,7 +69,7 @@ const CloudNav: FC = ({org, me}) => {