Skip to content

Commit

Permalink
refactor: rewrite imports to include the /v2 suffix for version 2
Browse files Browse the repository at this point in the history
  • Loading branch information
jsternberg committed Apr 3, 2020
1 parent 96321ff commit 0ae8beb
Show file tree
Hide file tree
Showing 957 changed files with 2,352 additions and 2,363 deletions.
2 changes: 1 addition & 1 deletion authorizer/agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions authorizer/agent_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion authorizer/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"fmt"

"github.com/influxdata/influxdb"
"github.com/influxdata/influxdb/v2"
)

var _ influxdb.AuthorizationService = (*AuthorizationService)(nil)
Expand Down
10 changes: 5 additions & 5 deletions authorizer/auth_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
4 changes: 2 additions & 2 deletions authorizer/authorize.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion authorizer/authorize_find.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions authorizer/backup.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions authorizer/bucket.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
10 changes: 5 additions & 5 deletions authorizer/bucket_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion authorizer/check.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package authorizer
import (
"context"

"github.com/influxdata/influxdb"
"github.com/influxdata/influxdb/v2"
)

var _ influxdb.CheckService = (*CheckService)(nil)
Expand Down
13 changes: 6 additions & 7 deletions authorizer/check_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion authorizer/dashboard.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package authorizer
import (
"context"

"github.com/influxdata/influxdb"
"github.com/influxdata/influxdb/v2"
)

var _ influxdb.DashboardService = (*DashboardService)(nil)
Expand Down
10 changes: 5 additions & 5 deletions authorizer/dashboard_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion authorizer/document.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"fmt"

"github.com/influxdata/influxdb"
"github.com/influxdata/influxdb/v2"
)

var _ influxdb.DocumentService = (*DocumentService)(nil)
Expand Down
2 changes: 1 addition & 1 deletion authorizer/label.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"errors"

"github.com/influxdata/influxdb"
"github.com/influxdata/influxdb/v2"
)

var _ influxdb.LabelService = (*LabelService)(nil)
Expand Down
10 changes: 5 additions & 5 deletions authorizer/label_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion authorizer/notification_endpoint.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package authorizer
import (
"context"

"github.com/influxdata/influxdb"
"github.com/influxdata/influxdb/v2"
)

var _ influxdb.NotificationEndpointService = (*NotificationEndpointService)(nil)
Expand Down
12 changes: 6 additions & 6 deletions authorizer/notification_endpoint_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion authorizer/notification_rule.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package authorizer
import (
"context"

"github.com/influxdata/influxdb"
"github.com/influxdata/influxdb/v2"
)

var _ influxdb.NotificationRuleStore = (*NotificationRuleStore)(nil)
Expand Down
13 changes: 6 additions & 7 deletions authorizer/notification_rule_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion authorizer/org.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package authorizer
import (
"context"

"github.com/influxdata/influxdb"
"github.com/influxdata/influxdb/v2"
)

var _ influxdb.OrganizationService = (*OrgService)(nil)
Expand Down
10 changes: 5 additions & 5 deletions authorizer/org_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion authorizer/password.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions authorizer/password_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion authorizer/scraper.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package authorizer
import (
"context"

"github.com/influxdata/influxdb"
"github.com/influxdata/influxdb/v2"
)

var _ influxdb.ScraperTargetStoreService = (*ScraperTargetStoreService)(nil)
Expand Down
10 changes: 5 additions & 5 deletions authorizer/scraper_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion authorizer/secret.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package authorizer
import (
"context"

"github.com/influxdata/influxdb"
"github.com/influxdata/influxdb/v2"
)

var _ influxdb.SecretService = (*SecretService)(nil)
Expand Down
10 changes: 5 additions & 5 deletions authorizer/secret_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion authorizer/source.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package authorizer
import (
"context"

"github.com/influxdata/influxdb"
"github.com/influxdata/influxdb/v2"
)

var _ influxdb.SourceService = (*SourceService)(nil)
Expand Down
10 changes: 5 additions & 5 deletions authorizer/source_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
4 changes: 2 additions & 2 deletions authorizer/task.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
Loading

0 comments on commit 0ae8beb

Please sign in to comment.