Skip to content

Commit

Permalink
fix: Properly upgrading library for new major version
Browse files Browse the repository at this point in the history
  • Loading branch information
vlastahajek committed Aug 14, 2020
1 parent 12ae124 commit f685021
Show file tree
Hide file tree
Showing 46 changed files with 117 additions and 102 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
## 2.1.0 [In progress]
## 2.0.1 [In progress]
### Bug fixes
1. [#187](https://github.com/influxdata/influxdb-client-go/pull/187) Properly updated library for new major version.

## 2.0.0 [2020-08-14]
### Breaking changes
1. [#173](https://github.com/influxdata/influxdb-client-go/pull/173) Removed deprecated API.
Expand Down
18 changes: 11 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ import (
"fmt"
"time"

"github.com/influxdata/influxdb-client-go"
"github.com/influxdata/influxdb-client-go/v2"
)

func main() {
Expand Down Expand Up @@ -154,9 +154,10 @@ package main

import (
"fmt"
"github.com/influxdata/influxdb-client-go"
"math/rand"
"time"

"github.com/influxdata/influxdb-client-go/v2"
)

func main() {
Expand Down Expand Up @@ -205,7 +206,7 @@ import (
"math/rand"
"time"

"github.com/influxdata/influxdb-client-go"
"github.com/influxdata/influxdb-client-go/v2"
)

func main() {
Expand Down Expand Up @@ -253,9 +254,10 @@ package main
import (
"context"
"fmt"
"github.com/influxdata/influxdb-client-go"
"math/rand"
"time"

"github.com/influxdata/influxdb-client-go/v2"
)

func main() {
Expand Down Expand Up @@ -305,7 +307,8 @@ package main
import (
"context"
"fmt"
"github.com/influxdata/influxdb-client-go"

"github.com/influxdata/influxdb-client-go/v2"
)

func main() {
Expand Down Expand Up @@ -347,7 +350,8 @@ package main
import (
"context"
"fmt"
"github.com/influxdata/influxdb-client-go"

"github.com/influxdata/influxdb-client-go/v2"
)

func main() {
Expand Down Expand Up @@ -397,7 +401,7 @@ import (
"fmt"
"time"

"github.com/influxdata/influxdb-client-go"
"github.com/influxdata/influxdb-client-go/v2"
)

func main() {
Expand Down
3 changes: 2 additions & 1 deletion api/authorizations.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ package api

import (
"context"
"github.com/influxdata/influxdb-client-go/domain"

"github.com/influxdata/influxdb-client-go/v2/domain"
)

// AuthorizationsAPI provides methods for organizing Authorization in a InfluxDB server
Expand Down
9 changes: 5 additions & 4 deletions api/authorizations_e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@ package api_test

import (
"context"
influxdb2 "github.com/influxdata/influxdb-client-go"
"github.com/influxdata/influxdb-client-go/domain"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"os"
"testing"

influxdb2 "github.com/influxdata/influxdb-client-go/v2"
"github.com/influxdata/influxdb-client-go/v2/domain"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

var authToken string
Expand Down
3 changes: 2 additions & 1 deletion api/buckets.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ package api
import (
"context"
"fmt"
"github.com/influxdata/influxdb-client-go/domain"

"github.com/influxdata/influxdb-client-go/v2/domain"
)

// BucketsAPI provides methods for managing Buckets in a InfluxDB server.
Expand Down
6 changes: 3 additions & 3 deletions api/buckets_e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"strings"
"testing"

influxdb2 "github.com/influxdata/influxdb-client-go"
"github.com/influxdata/influxdb-client-go/api"
"github.com/influxdata/influxdb-client-go/domain"
influxdb2 "github.com/influxdata/influxdb-client-go/v2"
"github.com/influxdata/influxdb-client-go/v2/api"
"github.com/influxdata/influxdb-client-go/v2/domain"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
2 changes: 1 addition & 1 deletion api/delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package api

import (
"context"
"github.com/influxdata/influxdb-client-go/domain"
"github.com/influxdata/influxdb-client-go/v2/domain"
"time"
)

Expand Down
6 changes: 3 additions & 3 deletions api/delete_e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ package api_test

import (
"context"
"github.com/influxdata/influxdb-client-go/api/write"
"github.com/influxdata/influxdb-client-go/domain"
"strconv"
"strings"
"testing"
"time"

influxdb2 "github.com/influxdata/influxdb-client-go"
influxdb2 "github.com/influxdata/influxdb-client-go/v2"
"github.com/influxdata/influxdb-client-go/v2/api/write"
"github.com/influxdata/influxdb-client-go/v2/domain"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
9 changes: 5 additions & 4 deletions api/examples_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ package api_test
import (
"context"
"fmt"
"github.com/influxdata/influxdb-client-go/api"
"github.com/influxdata/influxdb-client-go/api/write"
"github.com/influxdata/influxdb-client-go/domain"
influxdb2 "github.com/influxdata/influxdb-client-go/internal/examples"
"math/rand"
"time"

"github.com/influxdata/influxdb-client-go/v2/api"
"github.com/influxdata/influxdb-client-go/v2/api/write"
"github.com/influxdata/influxdb-client-go/v2/domain"
influxdb2 "github.com/influxdata/influxdb-client-go/v2/internal/examples"
)

func ExampleBucketsAPI() {
Expand Down
2 changes: 1 addition & 1 deletion api/http/options_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"testing"
"time"

"github.com/influxdata/influxdb-client-go/api/http"
"github.com/influxdata/influxdb-client-go/v2/api/http"
"github.com/stretchr/testify/assert"
)

Expand Down
4 changes: 2 additions & 2 deletions api/http/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"net/url"
"strconv"

http2 "github.com/influxdata/influxdb-client-go/internal/http"
"github.com/influxdata/influxdb-client-go/internal/log"
http2 "github.com/influxdata/influxdb-client-go/v2/internal/http"
"github.com/influxdata/influxdb-client-go/v2/internal/log"
)

// RequestCallback defines function called after a request is created before any call
Expand Down
3 changes: 2 additions & 1 deletion api/labels.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ package api
import (
"context"
"fmt"
"github.com/influxdata/influxdb-client-go/domain"

"github.com/influxdata/influxdb-client-go/v2/domain"
)

// LabelsAPI provides methods for managing labels in a InfluxDB server.
Expand Down
4 changes: 2 additions & 2 deletions api/labels_e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ package api_test

import (
"context"
"github.com/influxdata/influxdb-client-go/domain"
"testing"

influxdb2 "github.com/influxdata/influxdb-client-go"
influxdb2 "github.com/influxdata/influxdb-client-go/v2"
"github.com/influxdata/influxdb-client-go/v2/domain"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
3 changes: 2 additions & 1 deletion api/organizations.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ package api
import (
"context"
"fmt"
"github.com/influxdata/influxdb-client-go/domain"

"github.com/influxdata/influxdb-client-go/v2/domain"
)

// OrganizationsAPI provides methods for managing Organizations in a InfluxDB server.
Expand Down
4 changes: 2 additions & 2 deletions api/organizations_e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"context"
"testing"

influxdb2 "github.com/influxdata/influxdb-client-go"
"github.com/influxdata/influxdb-client-go/domain"
influxdb2 "github.com/influxdata/influxdb-client-go/v2"
"github.com/influxdata/influxdb-client-go/v2/domain"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
2 changes: 1 addition & 1 deletion api/paging.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

package api

import "github.com/influxdata/influxdb-client-go/domain"
import "github.com/influxdata/influxdb-client-go/v2/domain"

type PagingOption func(p *Paging)

Expand Down
5 changes: 3 additions & 2 deletions api/paging_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
package api

import (
"github.com/influxdata/influxdb-client-go/domain"
"github.com/stretchr/testify/assert"
"testing"

"github.com/influxdata/influxdb-client-go/v2/domain"
"github.com/stretchr/testify/assert"
)

func TestPaging(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions api/query.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import (
"sync"
"time"

http2 "github.com/influxdata/influxdb-client-go/api/http"
"github.com/influxdata/influxdb-client-go/api/query"
"github.com/influxdata/influxdb-client-go/domain"
"github.com/influxdata/influxdb-client-go/internal/log"
http2 "github.com/influxdata/influxdb-client-go/v2/api/http"
"github.com/influxdata/influxdb-client-go/v2/api/query"
"github.com/influxdata/influxdb-client-go/v2/domain"
"github.com/influxdata/influxdb-client-go/v2/internal/log"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions api/query_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import (
"testing"
"time"

http2 "github.com/influxdata/influxdb-client-go/api/http"
"github.com/influxdata/influxdb-client-go/api/query"
"github.com/influxdata/influxdb-client-go/internal/gzip"
http2 "github.com/influxdata/influxdb-client-go/v2/api/http"
"github.com/influxdata/influxdb-client-go/v2/api/query"
"github.com/influxdata/influxdb-client-go/v2/internal/gzip"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
2 changes: 1 addition & 1 deletion api/users.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package api
import (
"context"
"fmt"
"github.com/influxdata/influxdb-client-go/domain"
"github.com/influxdata/influxdb-client-go/v2/domain"
)

// UsersAPI provides methods for managing users in a InfluxDB server
Expand Down
4 changes: 2 additions & 2 deletions api/users_e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"context"
"testing"

influxdb2 "github.com/influxdata/influxdb-client-go"
"github.com/influxdata/influxdb-client-go/domain"
influxdb2 "github.com/influxdata/influxdb-client-go/v2"
"github.com/influxdata/influxdb-client-go/v2/domain"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
8 changes: 4 additions & 4 deletions api/write.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"strings"
"time"

http2 "github.com/influxdata/influxdb-client-go/api/http"
"github.com/influxdata/influxdb-client-go/api/write"
"github.com/influxdata/influxdb-client-go/internal/log"
iwrite "github.com/influxdata/influxdb-client-go/internal/write"
http2 "github.com/influxdata/influxdb-client-go/v2/api/http"
"github.com/influxdata/influxdb-client-go/v2/api/write"
"github.com/influxdata/influxdb-client-go/v2/internal/log"
iwrite "github.com/influxdata/influxdb-client-go/v2/internal/write"
)

// WriteAPI is Write client interface with non-blocking methods for writing time series data asynchronously in batches into an InfluxDB server.
Expand Down
2 changes: 1 addition & 1 deletion api/write/options_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"testing"
"time"

"github.com/influxdata/influxdb-client-go/api/write"
"github.com/influxdata/influxdb-client-go/v2/api/write"
)

func TestDefaultOptions(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions api/writeAPIBlocking.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"context"
"strings"

http2 "github.com/influxdata/influxdb-client-go/api/http"
"github.com/influxdata/influxdb-client-go/api/write"
iwrite "github.com/influxdata/influxdb-client-go/internal/write"
http2 "github.com/influxdata/influxdb-client-go/v2/api/http"
"github.com/influxdata/influxdb-client-go/v2/api/write"
iwrite "github.com/influxdata/influxdb-client-go/v2/internal/write"
)

// WriteAPIBlocking offers blocking methods for writing time series data synchronously into an InfluxDB server.
Expand Down
6 changes: 3 additions & 3 deletions api/writeAPIBlocking_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"testing"
"time"

http2 "github.com/influxdata/influxdb-client-go/api/http"
"github.com/influxdata/influxdb-client-go/api/write"
"github.com/influxdata/influxdb-client-go/internal/test"
http2 "github.com/influxdata/influxdb-client-go/v2/api/http"
"github.com/influxdata/influxdb-client-go/v2/api/write"
"github.com/influxdata/influxdb-client-go/v2/internal/test"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
8 changes: 4 additions & 4 deletions api/write_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import (
"testing"
"time"

"github.com/influxdata/influxdb-client-go/api/http"
"github.com/influxdata/influxdb-client-go/api/write"
"github.com/influxdata/influxdb-client-go/internal/test"
"github.com/influxdata/influxdb-client-go/log"
"github.com/influxdata/influxdb-client-go/v2/api/http"
"github.com/influxdata/influxdb-client-go/v2/api/write"
"github.com/influxdata/influxdb-client-go/v2/internal/test"
"github.com/influxdata/influxdb-client-go/v2/log"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
10 changes: 5 additions & 5 deletions client.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import (
"strings"
"sync"

"github.com/influxdata/influxdb-client-go/api"
"github.com/influxdata/influxdb-client-go/api/http"
"github.com/influxdata/influxdb-client-go/domain"
ilog "github.com/influxdata/influxdb-client-go/internal/log"
"github.com/influxdata/influxdb-client-go/log"
"github.com/influxdata/influxdb-client-go/v2/api"
"github.com/influxdata/influxdb-client-go/v2/api/http"
"github.com/influxdata/influxdb-client-go/v2/domain"
ilog "github.com/influxdata/influxdb-client-go/v2/internal/log"
"github.com/influxdata/influxdb-client-go/v2/log"
)

// Client provides API to communicate with InfluxDBServer.
Expand Down

0 comments on commit f685021

Please sign in to comment.