Skip to content

Commit 398ad3d

Browse files
alallemaalallema
authored
Merge branch 'main' into bump-meilisearch-v0.26.0
2 parents a40c9b8 + 40b3c73 commit 398ad3d

File tree

6 files changed

+18
-16
lines changed

6 files changed

+18
-16
lines changed

‎client.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ type ClientConfig struct {
2525
Timeout time.Duration
2626
}
2727

28-
type waitParams struct {
28+
type WaitParams struct {
2929
Context context.Context
3030
Interval time.Duration
3131
}
@@ -53,7 +53,7 @@ type ClientInterface interface {
5353
IsHealthy() bool
5454
GetTask(taskID int64) (resp *Task, err error)
5555
GetTasks() (resp *ResultTask, err error)
56-
WaitForTask(task *Task, options ...waitParams) (*Task, error)
56+
WaitForTask(task *Task, options ...WaitParams) (*Task, error)
5757
GenerateTenantToken(searchRules map[string]interface{}, options *TenantTokenOptions) (resp string, err error)
5858
}
5959

@@ -293,11 +293,11 @@ func (c *Client) GetTasks() (resp *ResultTask, err error) {
293293
// the TaskStatus.
294294
// If no ctx and interval are provided WaitForTask will check each 50ms the
295295
// status of a task.
296-
func (c *Client) WaitForTask(task *Task, options ...waitParams) (*Task, error) {
296+
func (c *Client) WaitForTask(task *Task, options ...WaitParams) (*Task, error) {
297297
if options == nil {
298298
ctx, cancelFunc := context.WithTimeout(context.Background(), time.Second*5)
299299
defer cancelFunc()
300-
options = []waitParams{
300+
options = []WaitParams{
301301
{
302302
Context: ctx,
303303
Interval: time.Millisecond * 50,

‎client_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -880,7 +880,7 @@ func TestClient_WaitForTaskWithContext(t *testing.T) {
880880
ctx, cancelFunc := context.WithTimeout(context.Background(), tt.args.timeout)
881881
defer cancelFunc()
882882

883-
gotTask, err := c.WaitForTask(task, waitParams{Context: ctx, Interval: tt.args.interval})
883+
gotTask, err := c.WaitForTask(task, WaitParams{Context: ctx, Interval: tt.args.interval})
884884
if tt.args.timeout < tt.args.interval {
885885
require.Error(t, err)
886886
} else {

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ require (
77
github.com/mailru/easyjson v0.7.7
88
github.com/pkg/errors v0.9.1
99
github.com/stretchr/testify v1.7.0
10-
github.com/valyala/fasthttp v1.33.0
10+
github.com/valyala/fasthttp v1.34.0
1111
)

‎go.sum

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keL
66
github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
77
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
88
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
9-
github.com/klauspost/compress v1.14.1 h1:hLQYb23E8/fO+1u53d02A97a8UnsddcvYzq4ERRU4ds=
10-
github.com/klauspost/compress v1.14.1/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
9+
github.com/klauspost/compress v1.15.0 h1:xqfchp4whNFxn5A4XFyyYtitiWI8Hy5EW59jEwcyL6U=
10+
github.com/klauspost/compress v1.15.0/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
1111
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
1212
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
1313
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@@ -19,17 +19,19 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc
1919
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
2020
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
2121
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
22-
github.com/valyala/fasthttp v1.33.0 h1:mHBKd98J5NcXuBddgjvim1i3kWzlng1SzLhrnBOU9g8=
23-
github.com/valyala/fasthttp v1.33.0/go.mod h1:KJRK/MXx0J+yd0c5hlR+s1tIHD72sniU8ZJjl97LIw4=
22+
github.com/valyala/fasthttp v1.34.0 h1:d3AAQJ2DRcxJYHm7OXNXtXt2as1vMDfxeIcFvhmGGm4=
23+
github.com/valyala/fasthttp v1.34.0/go.mod h1:epZA5N+7pY6ZaEKRmstzOuYJx9HI8DI1oaCGZpdH4h0=
2424
github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc=
25-
golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
25+
golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
2626
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
27-
golang.org/x/net v0.0.0-20220111093109-d55c255bac03/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
27+
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
2828
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
2929
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
3030
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
31-
golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
31+
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
32+
golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
3233
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
34+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
3335
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
3436
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
3537
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

‎index.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ type IndexInterface interface {
6666
UpdateFilterableAttributes(request *[]string) (resp *Task, err error)
6767
ResetFilterableAttributes() (resp *Task, err error)
6868

69-
WaitForTask(task *Task, options ...waitParams) (*Task, error)
69+
WaitForTask(task *Task, options ...WaitParams) (*Task, error)
7070
}
7171

7272
var _ IndexInterface = &Index{}
@@ -195,6 +195,6 @@ func (i Index) GetTasks() (resp *ResultTask, err error) {
195195
// the TaskStatus.
196196
// If no ctx and interval are provided WaitForTask will check each 50ms the
197197
// status of a task.
198-
func (i Index) WaitForTask(task *Task, options ...waitParams) (*Task, error) {
198+
func (i Index) WaitForTask(task *Task, options ...WaitParams) (*Task, error) {
199199
return i.client.WaitForTask(task, options...)
200200
}

‎index_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ func TestIndex_WaitForTask(t *testing.T) {
418418
ctx, cancelFunc := context.WithTimeout(context.Background(), tt.args.timeout)
419419
defer cancelFunc()
420420

421-
gotTask, err := i.WaitForTask(task, waitParams{Context: ctx, Interval: tt.args.interval})
421+
gotTask, err := i.WaitForTask(task, WaitParams{Context: ctx, Interval: tt.args.interval})
422422
if tt.args.timeout < tt.args.interval {
423423
require.Error(t, err)
424424
} else {

0 commit comments

Comments
 (0)