Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to v3, pull latest oapi changes #190

Merged
merged 4 commits into from
Jan 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
services:
typesense:
image: typesense/typesense:27.0
image: typesense/typesense:28.0.rc35
ports:
- 8108:8108/tcp
volumes:
Expand Down
36 changes: 21 additions & 15 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
module github.com/typesense/typesense-go/v2
module github.com/typesense/typesense-go/v3

go 1.18
go 1.22

toolchain go1.23.5

require (
github.com/google/uuid v1.5.0
github.com/google/uuid v1.6.0
github.com/jinzhu/copier v0.3.4
github.com/oapi-codegen/oapi-codegen/v2 v2.3.0
github.com/oapi-codegen/oapi-codegen/v2 v2.4.1
github.com/oapi-codegen/runtime v1.1.1
github.com/sony/gobreaker v0.5.0
github.com/sony/gobreaker v1.0.0
github.com/stretchr/testify v1.9.0
github.com/testcontainers/testcontainers-go v0.12.0
go.uber.org/mock v0.4.0
go.uber.org/mock v0.5.0
gopkg.in/yaml.v3 v3.0.1
)

Expand All @@ -27,13 +29,14 @@ require (
github.com/docker/docker v20.10.12+incompatible // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.4.0 // indirect
github.com/getkin/kin-openapi v0.124.0 // indirect
github.com/go-openapi/jsonpointer v0.20.2 // indirect
github.com/go-openapi/swag v0.22.8 // indirect
github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936 // indirect
github.com/getkin/kin-openapi v0.127.0 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/invopop/yaml v0.2.0 // indirect
github.com/invopop/yaml v0.3.1 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/magiconair/properties v1.8.5 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
Expand All @@ -49,13 +52,16 @@ require (
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/speakeasy-api/openapi-overlay v0.9.0 // indirect
github.com/ugorji/go/codec v1.2.12 // indirect
github.com/vmware-labs/yaml-jsonpath v0.3.2 // indirect
go.opencensus.io v0.23.0 // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/net v0.25.0 // indirect
golang.org/x/sys v0.20.0 // indirect
golang.org/x/text v0.15.0 // indirect
golang.org/x/tools v0.21.0 // indirect
golang.org/x/mod v0.18.0 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/text v0.18.0 // indirect
golang.org/x/tools v0.22.0 // indirect
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
google.golang.org/grpc v1.43.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
Expand Down
100 changes: 71 additions & 29 deletions go.sum

Large diffs are not rendered by default.

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

"github.com/typesense/typesense-go/v2/typesense/api"
"github.com/typesense/typesense-go/v3/typesense/api"
)

// AliasInterface is a type for Alias API operations
Expand Down
4 changes: 2 additions & 2 deletions typesense/alias_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"testing"

"github.com/stretchr/testify/assert"
"github.com/typesense/typesense-go/v2/typesense/api"
"github.com/typesense/typesense-go/v2/typesense/mocks"
"github.com/typesense/typesense-go/v3/typesense/api"
"github.com/typesense/typesense-go/v3/typesense/mocks"
"go.uber.org/mock/gomock"
)

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

"github.com/typesense/typesense-go/v2/typesense/api"
"github.com/typesense/typesense-go/v3/typesense/api"
)

// AliasesInterface is a type for Aliases API operations
Expand Down
6 changes: 3 additions & 3 deletions typesense/aliases_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import (
"net/http"
"testing"

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

"github.com/jinzhu/copier"
"github.com/stretchr/testify/assert"
"github.com/typesense/typesense-go/v2/typesense/api"
"github.com/typesense/typesense-go/v2/typesense/mocks"
"github.com/typesense/typesense-go/v3/typesense/api"
"github.com/typesense/typesense-go/v3/typesense/mocks"
"go.uber.org/mock/gomock"
)

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

"github.com/typesense/typesense-go/v2/typesense/api"
"github.com/typesense/typesense-go/v3/typesense/api"
)

type AnalyticsEventsInterface interface {
Expand Down
2 changes: 1 addition & 1 deletion typesense/analytics_events_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"testing"

"github.com/stretchr/testify/assert"
"github.com/typesense/typesense-go/v2/typesense/api"
"github.com/typesense/typesense-go/v3/typesense/api"
)

func TestAnalyticsEventsCreate(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion typesense/analytics_rule.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package typesense
import (
"context"

"github.com/typesense/typesense-go/v2/typesense/api"
"github.com/typesense/typesense-go/v3/typesense/api"
)

type AnalyticsRuleInterface interface {
Expand Down
4 changes: 2 additions & 2 deletions typesense/analytics_rule_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"testing"

"github.com/stretchr/testify/assert"
"github.com/typesense/typesense-go/v2/typesense/api"
"github.com/typesense/typesense-go/v2/typesense/api/pointer"
"github.com/typesense/typesense-go/v3/typesense/api"
"github.com/typesense/typesense-go/v3/typesense/api/pointer"
)

func TestAnalyticsRuleRetrieve(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion typesense/analytics_rules.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package typesense
import (
"context"

"github.com/typesense/typesense-go/v2/typesense/api"
"github.com/typesense/typesense-go/v3/typesense/api"
)

type AnalyticsRulesInterface interface {
Expand Down
4 changes: 2 additions & 2 deletions typesense/analytics_rules_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"testing"

"github.com/stretchr/testify/assert"
"github.com/typesense/typesense-go/v2/typesense/api"
"github.com/typesense/typesense-go/v2/typesense/api/pointer"
"github.com/typesense/typesense-go/v3/typesense/api"
"github.com/typesense/typesense-go/v3/typesense/api/pointer"
)

func TestAnalyticsRulesRetrieve(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion typesense/api/circuit/http_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package circuit
import (
"net/http"

"github.com/typesense/typesense-go/v2/typesense/api"
"github.com/typesense/typesense-go/v3/typesense/api"
)

type HTTPRequestDoer interface {
Expand Down
2 changes: 1 addition & 1 deletion typesense/api/circuit/http_client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"testing"

"github.com/stretchr/testify/assert"
"github.com/typesense/typesense-go/v2/typesense/api/circuit/mocks"
"github.com/typesense/typesense-go/v3/typesense/api/circuit/mocks"
"go.uber.org/mock/gomock"
)

Expand Down
2 changes: 2 additions & 0 deletions typesense/api/circuit/mocks/mock_circuit.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions typesense/api/client_gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading