Skip to content

Commit d508479

Browse files
abossardabossard
authored
Merge branch 'dapr:main' into supporting_more_properties_for_rabbitmq_on_main
2 parents af3fca0 + d8ac01b commit d508479

File tree

180 files changed

+1727
-1798
lines changed

Some content is hidden

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

180 files changed

+1727
-1798
lines changed

‎.build-tools/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/dapr/components-contrib/build-tools
22

3-
go 1.23.6
3+
go 1.24.1
44

55
require (
66
github.com/dapr/components-contrib v0.0.0

‎.github/workflows/components-contrib-all.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
GOOS: ${{ matrix.target_os }}
6666
GOARCH: ${{ matrix.target_arch }}
6767
GOPROXY: https://proxy.golang.org
68-
GOLANGCI_LINT_VER: "v1.61.0"
68+
GOLANGCI_LINT_VER: "v1.64.6"
6969
strategy:
7070
matrix:
7171
os: [ubuntu-latest, windows-latest, macOS-latest]

‎.github/workflows/components-contrib.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
GOOS: linux
3434
GOARCH: amd64
3535
GOPROXY: https://proxy.golang.org
36-
GOLANGCI_LINT_VER: "v1.61.0"
36+
GOLANGCI_LINT_VER: "v1.64.6"
3737
steps:
3838
- name: Check out code into the Go module directory
3939
if: ${{ steps.skip_check.outputs.should_skip != 'true' }}

‎.golangci.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ linters-settings:
6060
# [deprecated] comma-separated list of pairs of the form pkg:regex
6161
# the regex is used to ignore names within pkg. (default "fmt:.*").
6262
# see https://github.com/kisielk/errcheck#the-deprecated-method for details
63-
ignore: fmt:.*,io/ioutil:^Read.*
63+
exclude-functions: fmt:.*,io/ioutil:^Read.*
6464

6565
# path to a file containing a list of functions to exclude from checking
6666
# see https://github.com/kisielk/errcheck#excluding-functions for details
@@ -285,7 +285,6 @@ linters:
285285
- unparam
286286
- wsl
287287
- mnd
288-
- gomnd
289288
- testpackage
290289
- err113
291290
- nestif

‎bindings/alicloud/dingtalk/webhook/webhook_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ func TestPublishMsg(t *testing.T) { //nolint:paralleltest
5757
}}}
5858

5959
d := NewDingTalkWebhook(logger.NewLogger("test"))
60-
err := d.Init(context.Background(), m)
60+
err := d.Init(t.Context(), m)
6161
require.NoError(t, err)
6262

6363
req := &bindings.InvokeRequest{Data: []byte(msg), Operation: bindings.CreateOperation, Metadata: map[string]string{}}
64-
_, err = d.Invoke(context.Background(), req)
64+
_, err = d.Invoke(t.Context(), req)
6565
require.NoError(t, err)
6666
}
6767

@@ -78,7 +78,7 @@ func TestBindingReadAndInvoke(t *testing.T) { //nolint:paralleltest
7878
}}
7979

8080
d := NewDingTalkWebhook(logger.NewLogger("test"))
81-
err := d.Init(context.Background(), m)
81+
err := d.Init(t.Context(), m)
8282
require.NoError(t, err)
8383

8484
var count int32
@@ -92,11 +92,11 @@ func TestBindingReadAndInvoke(t *testing.T) { //nolint:paralleltest
9292
return nil, nil
9393
}
9494

95-
err = d.Read(context.Background(), handler)
95+
err = d.Read(t.Context(), handler)
9696
require.NoError(t, err)
9797

9898
req := &bindings.InvokeRequest{Data: []byte(msg), Operation: bindings.GetOperation, Metadata: map[string]string{}}
99-
_, err = d.Invoke(context.Background(), req)
99+
_, err = d.Invoke(t.Context(), req)
100100
require.NoError(t, err)
101101

102102
select {
@@ -117,7 +117,7 @@ func TestBindingClose(t *testing.T) {
117117
"id": "x",
118118
},
119119
}}
120-
require.NoError(t, d.Init(context.Background(), m))
120+
require.NoError(t, d.Init(t.Context(), m))
121121
require.NoError(t, d.Close())
122122
require.NoError(t, d.Close(), "second close should not error")
123123
}

‎bindings/alicloud/tablestore/tablestore_test.go

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ limitations under the License.
1414
package tablestore
1515

1616
import (
17-
"context"
1817
"encoding/json"
1918
"os"
2019
"testing"
@@ -52,7 +51,7 @@ func TestDataEncodeAndDecode(t *testing.T) {
5251
metadata := bindings.Metadata{Base: metadata.Base{
5352
Properties: getTestProperties(),
5453
}}
55-
aliCloudTableStore.Init(context.Background(), metadata)
54+
aliCloudTableStore.Init(t.Context(), metadata)
5655

5756
// test create
5857
putData := map[string]interface{}{
@@ -71,7 +70,7 @@ func TestDataEncodeAndDecode(t *testing.T) {
7170
Data: data,
7271
}
7372

74-
putInvokeResp, err := aliCloudTableStore.Invoke(context.Background(), putRowReq)
73+
putInvokeResp, err := aliCloudTableStore.Invoke(t.Context(), putRowReq)
7574

7675
require.NoError(t, err)
7776
assert.NotNil(t, putInvokeResp)
@@ -82,7 +81,7 @@ func TestDataEncodeAndDecode(t *testing.T) {
8281
"column2": int64(2),
8382
})
8483

85-
putInvokeResp, err = aliCloudTableStore.Invoke(context.Background(), putRowReq)
84+
putInvokeResp, err = aliCloudTableStore.Invoke(t.Context(), putRowReq)
8685

8786
require.NoError(t, err)
8887
assert.NotNil(t, putInvokeResp)
@@ -102,7 +101,7 @@ func TestDataEncodeAndDecode(t *testing.T) {
102101
Data: getData,
103102
}
104103

105-
getInvokeResp, err := aliCloudTableStore.Invoke(context.Background(), getInvokeReq)
104+
getInvokeResp, err := aliCloudTableStore.Invoke(t.Context(), getInvokeReq)
106105

107106
require.NoError(t, err)
108107
assert.NotNil(t, getInvokeResp)
@@ -136,7 +135,7 @@ func TestDataEncodeAndDecode(t *testing.T) {
136135
Data: listData,
137136
}
138137

139-
listResp, err := aliCloudTableStore.Invoke(context.Background(), listReq)
138+
listResp, err := aliCloudTableStore.Invoke(t.Context(), listReq)
140139
require.NoError(t, err)
141140
assert.NotNil(t, listResp)
142141

@@ -164,12 +163,12 @@ func TestDataEncodeAndDecode(t *testing.T) {
164163
Data: deleteData,
165164
}
166165

167-
deleteResp, err := aliCloudTableStore.Invoke(context.Background(), deleteReq)
166+
deleteResp, err := aliCloudTableStore.Invoke(t.Context(), deleteReq)
168167

169168
require.NoError(t, err)
170169
assert.NotNil(t, deleteResp)
171170

172-
getInvokeResp, err = aliCloudTableStore.Invoke(context.Background(), getInvokeReq)
171+
getInvokeResp, err = aliCloudTableStore.Invoke(t.Context(), getInvokeReq)
173172

174173
require.NoError(t, err)
175174
assert.Nil(t, getInvokeResp.Data)

‎bindings/apns/apns_test.go

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ package apns
1515

1616
import (
1717
"bytes"
18-
"context"
1918
"io"
2019
"net/http"
2120
"strings"
@@ -52,7 +51,7 @@ func TestInit(t *testing.T) {
5251
},
5352
}}
5453
binding := NewAPNS(testLogger).(*APNS)
55-
err := binding.Init(context.Background(), metadata)
54+
err := binding.Init(t.Context(), metadata)
5655
require.NoError(t, err)
5756
assert.Equal(t, developmentPrefix, binding.urlPrefix)
5857
})
@@ -67,7 +66,7 @@ func TestInit(t *testing.T) {
6766
},
6867
}}
6968
binding := NewAPNS(testLogger).(*APNS)
70-
err := binding.Init(context.Background(), metadata)
69+
err := binding.Init(t.Context(), metadata)
7170
require.NoError(t, err)
7271
assert.Equal(t, productionPrefix, binding.urlPrefix)
7372
})
@@ -81,7 +80,7 @@ func TestInit(t *testing.T) {
8180
},
8281
}}
8382
binding := NewAPNS(testLogger).(*APNS)
84-
err := binding.Init(context.Background(), metadata)
83+
err := binding.Init(t.Context(), metadata)
8584
require.NoError(t, err)
8685
assert.Equal(t, productionPrefix, binding.urlPrefix)
8786
})
@@ -94,7 +93,7 @@ func TestInit(t *testing.T) {
9493
},
9594
}}
9695
binding := NewAPNS(testLogger).(*APNS)
97-
err := binding.Init(context.Background(), metadata)
96+
err := binding.Init(t.Context(), metadata)
9897
require.Error(t, err, "the key-id parameter is required")
9998
})
10099

@@ -107,7 +106,7 @@ func TestInit(t *testing.T) {
107106
},
108107
}}
109108
binding := NewAPNS(testLogger).(*APNS)
110-
err := binding.Init(context.Background(), metadata)
109+
err := binding.Init(t.Context(), metadata)
111110
require.NoError(t, err)
112111
assert.Equal(t, testKeyID, binding.authorizationBuilder.keyID)
113112
})
@@ -120,7 +119,7 @@ func TestInit(t *testing.T) {
120119
},
121120
}}
122121
binding := NewAPNS(testLogger).(*APNS)
123-
err := binding.Init(context.Background(), metadata)
122+
err := binding.Init(t.Context(), metadata)
124123
require.Error(t, err, "the team-id parameter is required")
125124
})
126125

@@ -133,7 +132,7 @@ func TestInit(t *testing.T) {
133132
},
134133
}}
135134
binding := NewAPNS(testLogger).(*APNS)
136-
err := binding.Init(context.Background(), metadata)
135+
err := binding.Init(t.Context(), metadata)
137136
require.NoError(t, err)
138137
assert.Equal(t, testTeamID, binding.authorizationBuilder.teamID)
139138
})
@@ -146,7 +145,7 @@ func TestInit(t *testing.T) {
146145
},
147146
}}
148147
binding := NewAPNS(testLogger).(*APNS)
149-
err := binding.Init(context.Background(), metadata)
148+
err := binding.Init(t.Context(), metadata)
150149
require.Error(t, err, "the private-key parameter is required")
151150
})
152151

@@ -159,7 +158,7 @@ func TestInit(t *testing.T) {
159158
},
160159
}}
161160
binding := NewAPNS(testLogger).(*APNS)
162-
err := binding.Init(context.Background(), metadata)
161+
err := binding.Init(t.Context(), metadata)
163162
require.NoError(t, err)
164163
assert.NotNil(t, binding.authorizationBuilder.privateKey)
165164
})
@@ -192,7 +191,7 @@ func TestInvoke(t *testing.T) {
192191
t.Run("operation must be create", func(t *testing.T) {
193192
testBinding := makeTestBinding(t, testLogger)
194193
req := &bindings.InvokeRequest{Operation: bindings.DeleteOperation}
195-
_, err := testBinding.Invoke(context.TODO(), req)
194+
_, err := testBinding.Invoke(t.Context(), req)
196195
require.Error(t, err, "operation not supported: delete")
197196
})
198197

@@ -202,7 +201,7 @@ func TestInvoke(t *testing.T) {
202201
Operation: bindings.CreateOperation,
203202
Metadata: map[string]string{},
204203
}
205-
_, err := testBinding.Invoke(context.TODO(), req)
204+
_, err := testBinding.Invoke(t.Context(), req)
206205
require.Error(t, err, "the device-token parameter is required")
207206
})
208207

@@ -213,7 +212,7 @@ func TestInvoke(t *testing.T) {
213212

214213
return successResponse()
215214
})
216-
_, _ = testBinding.Invoke(context.TODO(), successRequest)
215+
_, _ = testBinding.Invoke(t.Context(), successRequest)
217216
})
218217

219218
t.Run("the push type header is sent", func(t *testing.T) {
@@ -224,7 +223,7 @@ func TestInvoke(t *testing.T) {
224223

225224
return successResponse()
226225
})
227-
_, _ = testBinding.Invoke(context.TODO(), successRequest)
226+
_, _ = testBinding.Invoke(t.Context(), successRequest)
228227
})
229228

230229
t.Run("the message ID is sent", func(t *testing.T) {
@@ -235,7 +234,7 @@ func TestInvoke(t *testing.T) {
235234

236235
return successResponse()
237236
})
238-
_, _ = testBinding.Invoke(context.TODO(), successRequest)
237+
_, _ = testBinding.Invoke(t.Context(), successRequest)
239238
})
240239

241240
t.Run("the expiration is sent", func(t *testing.T) {
@@ -246,7 +245,7 @@ func TestInvoke(t *testing.T) {
246245

247246
return successResponse()
248247
})
249-
_, _ = testBinding.Invoke(context.TODO(), successRequest)
248+
_, _ = testBinding.Invoke(t.Context(), successRequest)
250249
})
251250

252251
t.Run("the priority is sent", func(t *testing.T) {
@@ -257,7 +256,7 @@ func TestInvoke(t *testing.T) {
257256

258257
return successResponse()
259258
})
260-
_, _ = testBinding.Invoke(context.TODO(), successRequest)
259+
_, _ = testBinding.Invoke(t.Context(), successRequest)
261260
})
262261

263262
t.Run("the topic is sent", func(t *testing.T) {
@@ -268,7 +267,7 @@ func TestInvoke(t *testing.T) {
268267

269268
return successResponse()
270269
})
271-
_, _ = testBinding.Invoke(context.TODO(), successRequest)
270+
_, _ = testBinding.Invoke(t.Context(), successRequest)
272271
})
273272

274273
t.Run("the collapse ID is sent", func(t *testing.T) {
@@ -279,15 +278,15 @@ func TestInvoke(t *testing.T) {
279278

280279
return successResponse()
281280
})
282-
_, _ = testBinding.Invoke(context.TODO(), successRequest)
281+
_, _ = testBinding.Invoke(t.Context(), successRequest)
283282
})
284283

285284
t.Run("the message ID is returned", func(t *testing.T) {
286285
testBinding := makeTestBinding(t, testLogger)
287286
testBinding.client = newTestClient(func(req *http.Request) *http.Response {
288287
return successResponse()
289288
})
290-
response, err := testBinding.Invoke(context.TODO(), successRequest)
289+
response, err := testBinding.Invoke(t.Context(), successRequest)
291290
require.NoError(t, err)
292291
assert.NotNil(t, response.Data)
293292
var body notificationResponse
@@ -307,7 +306,7 @@ func TestInvoke(t *testing.T) {
307306
Body: io.NopCloser(strings.NewReader(body)),
308307
}
309308
})
310-
_, err := testBinding.Invoke(context.TODO(), successRequest)
309+
_, err := testBinding.Invoke(t.Context(), successRequest)
311310
require.Error(t, err, "BadDeviceToken")
312311
})
313312
}
@@ -322,7 +321,7 @@ func makeTestBinding(t *testing.T, log logger.Logger) *APNS {
322321
privateKeyKey: testPrivateKey,
323322
},
324323
}}
325-
err := testBinding.Init(context.Background(), bindingMetadata)
324+
err := testBinding.Init(t.Context(), bindingMetadata)
326325
require.NoError(t, err)
327326

328327
return testBinding

‎bindings/aws/s3/s3_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ limitations under the License.
1414
package s3
1515

1616
import (
17-
"context"
1817
"testing"
1918

2019
"github.com/stretchr/testify/assert"
@@ -176,7 +175,7 @@ func TestGetOption(t *testing.T) {
176175

177176
t.Run("return error if key is missing", func(t *testing.T) {
178177
r := bindings.InvokeRequest{}
179-
_, err := s3.get(context.Background(), &r)
178+
_, err := s3.get(t.Context(), &r)
180179
require.Error(t, err)
181180
})
182181
}
@@ -187,7 +186,7 @@ func TestDeleteOption(t *testing.T) {
187186

188187
t.Run("return error if key is missing", func(t *testing.T) {
189188
r := bindings.InvokeRequest{}
190-
_, err := s3.delete(context.Background(), &r)
189+
_, err := s3.delete(t.Context(), &r)
191190
require.Error(t, err)
192191
})
193192
}

0 commit comments

Comments
 (0)