Skip to content

Commit e8d8bcd

Browse files
kishorenckishorenc
authored
Merge pull request #190 from haydenhoang/v3
Bump to v3, pull latest oapi changes
2 parents b748897 + 25d985c commit e8d8bcd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+731
-485
lines changed

‎.github/workflows/tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
services:
1515
typesense:
16-
image: typesense/typesense:27.0
16+
image: typesense/typesense:28.0.rc35
1717
ports:
1818
- 8108:8108/tcp
1919
volumes:

‎go.mod

+21-15
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
1-
module github.com/typesense/typesense-go/v2
1+
module github.com/typesense/typesense-go/v3
22

3-
go 1.18
3+
go 1.22
4+
5+
toolchain go1.23.5
46

57
require (
6-
github.com/google/uuid v1.5.0
8+
github.com/google/uuid v1.6.0
79
github.com/jinzhu/copier v0.3.4
8-
github.com/oapi-codegen/oapi-codegen/v2 v2.3.0
10+
github.com/oapi-codegen/oapi-codegen/v2 v2.4.1
911
github.com/oapi-codegen/runtime v1.1.1
10-
github.com/sony/gobreaker v0.5.0
12+
github.com/sony/gobreaker v1.0.0
1113
github.com/stretchr/testify v1.9.0
1214
github.com/testcontainers/testcontainers-go v0.12.0
13-
go.uber.org/mock v0.4.0
15+
go.uber.org/mock v0.5.0
1416
gopkg.in/yaml.v3 v3.0.1
1517
)
1618

@@ -27,13 +29,14 @@ require (
2729
github.com/docker/docker v20.10.12+incompatible // indirect
2830
github.com/docker/go-connections v0.4.0 // indirect
2931
github.com/docker/go-units v0.4.0 // indirect
30-
github.com/getkin/kin-openapi v0.124.0 // indirect
31-
github.com/go-openapi/jsonpointer v0.20.2 // indirect
32-
github.com/go-openapi/swag v0.22.8 // indirect
32+
github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936 // indirect
33+
github.com/getkin/kin-openapi v0.127.0 // indirect
34+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
35+
github.com/go-openapi/swag v0.23.0 // indirect
3336
github.com/gogo/protobuf v1.3.2 // indirect
3437
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3538
github.com/golang/protobuf v1.5.2 // indirect
36-
github.com/invopop/yaml v0.2.0 // indirect
39+
github.com/invopop/yaml v0.3.1 // indirect
3740
github.com/josharian/intern v1.0.0 // indirect
3841
github.com/magiconair/properties v1.8.5 // indirect
3942
github.com/mailru/easyjson v0.7.7 // indirect
@@ -49,13 +52,16 @@ require (
4952
github.com/pkg/errors v0.9.1 // indirect
5053
github.com/pmezard/go-difflib v1.0.0 // indirect
5154
github.com/sirupsen/logrus v1.8.1 // indirect
55+
github.com/speakeasy-api/openapi-overlay v0.9.0 // indirect
5256
github.com/ugorji/go/codec v1.2.12 // indirect
57+
github.com/vmware-labs/yaml-jsonpath v0.3.2 // indirect
5358
go.opencensus.io v0.23.0 // indirect
54-
golang.org/x/mod v0.17.0 // indirect
55-
golang.org/x/net v0.25.0 // indirect
56-
golang.org/x/sys v0.20.0 // indirect
57-
golang.org/x/text v0.15.0 // indirect
58-
golang.org/x/tools v0.21.0 // indirect
59+
golang.org/x/mod v0.18.0 // indirect
60+
golang.org/x/net v0.26.0 // indirect
61+
golang.org/x/sync v0.8.0 // indirect
62+
golang.org/x/sys v0.21.0 // indirect
63+
golang.org/x/text v0.18.0 // indirect
64+
golang.org/x/tools v0.22.0 // indirect
5965
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
6066
google.golang.org/grpc v1.43.0 // indirect
6167
google.golang.org/protobuf v1.31.0 // indirect

‎go.sum

+71-29
Large diffs are not rendered by default.

‎typesense/alias.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package typesense
33
import (
44
"context"
55

6-
"github.com/typesense/typesense-go/v2/typesense/api"
6+
"github.com/typesense/typesense-go/v3/typesense/api"
77
)
88

99
// AliasInterface is a type for Alias API operations

‎typesense/alias_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"testing"
88

99
"github.com/stretchr/testify/assert"
10-
"github.com/typesense/typesense-go/v2/typesense/api"
11-
"github.com/typesense/typesense-go/v2/typesense/mocks"
10+
"github.com/typesense/typesense-go/v3/typesense/api"
11+
"github.com/typesense/typesense-go/v3/typesense/mocks"
1212
"go.uber.org/mock/gomock"
1313
)
1414

‎typesense/aliases.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package typesense
33
import (
44
"context"
55

6-
"github.com/typesense/typesense-go/v2/typesense/api"
6+
"github.com/typesense/typesense-go/v3/typesense/api"
77
)
88

99
// AliasesInterface is a type for Aliases API operations

‎typesense/aliases_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ import (
66
"net/http"
77
"testing"
88

9-
"github.com/typesense/typesense-go/v2/typesense/api/pointer"
9+
"github.com/typesense/typesense-go/v3/typesense/api/pointer"
1010

1111
"github.com/jinzhu/copier"
1212
"github.com/stretchr/testify/assert"
13-
"github.com/typesense/typesense-go/v2/typesense/api"
14-
"github.com/typesense/typesense-go/v2/typesense/mocks"
13+
"github.com/typesense/typesense-go/v3/typesense/api"
14+
"github.com/typesense/typesense-go/v3/typesense/mocks"
1515
"go.uber.org/mock/gomock"
1616
)
1717

‎typesense/analytics_events.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package typesense
33
import (
44
"context"
55

6-
"github.com/typesense/typesense-go/v2/typesense/api"
6+
"github.com/typesense/typesense-go/v3/typesense/api"
77
)
88

99
type AnalyticsEventsInterface interface {

‎typesense/analytics_events_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"testing"
88

99
"github.com/stretchr/testify/assert"
10-
"github.com/typesense/typesense-go/v2/typesense/api"
10+
"github.com/typesense/typesense-go/v3/typesense/api"
1111
)
1212

1313
func TestAnalyticsEventsCreate(t *testing.T) {

‎typesense/analytics_rule.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package typesense
33
import (
44
"context"
55

6-
"github.com/typesense/typesense-go/v2/typesense/api"
6+
"github.com/typesense/typesense-go/v3/typesense/api"
77
)
88

99
type AnalyticsRuleInterface interface {

‎typesense/analytics_rule_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"testing"
77

88
"github.com/stretchr/testify/assert"
9-
"github.com/typesense/typesense-go/v2/typesense/api"
10-
"github.com/typesense/typesense-go/v2/typesense/api/pointer"
9+
"github.com/typesense/typesense-go/v3/typesense/api"
10+
"github.com/typesense/typesense-go/v3/typesense/api/pointer"
1111
)
1212

1313
func TestAnalyticsRuleRetrieve(t *testing.T) {

‎typesense/analytics_rules.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package typesense
33
import (
44
"context"
55

6-
"github.com/typesense/typesense-go/v2/typesense/api"
6+
"github.com/typesense/typesense-go/v3/typesense/api"
77
)
88

99
type AnalyticsRulesInterface interface {

‎typesense/analytics_rules_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"testing"
88

99
"github.com/stretchr/testify/assert"
10-
"github.com/typesense/typesense-go/v2/typesense/api"
11-
"github.com/typesense/typesense-go/v2/typesense/api/pointer"
10+
"github.com/typesense/typesense-go/v3/typesense/api"
11+
"github.com/typesense/typesense-go/v3/typesense/api/pointer"
1212
)
1313

1414
func TestAnalyticsRulesRetrieve(t *testing.T) {

‎typesense/api/circuit/http_client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ package circuit
55
import (
66
"net/http"
77

8-
"github.com/typesense/typesense-go/v2/typesense/api"
8+
"github.com/typesense/typesense-go/v3/typesense/api"
99
)
1010

1111
type HTTPRequestDoer interface {

‎typesense/api/circuit/http_client_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"testing"
77

88
"github.com/stretchr/testify/assert"
9-
"github.com/typesense/typesense-go/v2/typesense/api/circuit/mocks"
9+
"github.com/typesense/typesense-go/v3/typesense/api/circuit/mocks"
1010
"go.uber.org/mock/gomock"
1111
)
1212

‎typesense/api/circuit/mocks/mock_circuit.go

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎typesense/api/client_gen.go

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)