Skip to content

Commit 16374cd

Browse files
javier-aliagajavier-aliaga
authored
chore: Use latest dapr/dapr version (#731)
* chore: Use latest dapr/dapr version Signed-off-by: Javier Aliaga <[email protected]> * chore: Bump golangci version Signed-off-by: Javier Aliaga <[email protected]> * chore: Bump golangci-lint version Signed-off-by: Javier Aliaga <[email protected]> * chore: Fix lint errors on tooling Signed-off-by: Javier Aliaga <[email protected]> * chore: Increase sleep to service example Signed-off-by: Javier Aliaga <[email protected]> --------- Signed-off-by: Javier Aliaga <[email protected]>
1 parent a3df75f commit 16374cd

32 files changed

+168
-176
lines changed

‎.github/workflows/test-dapr-bot.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
name: Test
1818
runs-on: ubuntu-latest
1919
env:
20-
GOLANGCILINT_VER: v1.61.0
20+
GOLANGCILINT_VER: v1.64.6
2121

2222
steps:
2323
- name: Checkout

‎.github/workflows/test-on-push.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
name: Test
1212
runs-on: ubuntu-latest
1313
env:
14-
GOLANGCILINT_VER: v1.61.0
14+
GOLANGCILINT_VER: v1.64.6
1515

1616
steps:
1717
- name: Checkout

‎.github/workflows/test-tooling.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- "macos-latest"
2626
runs-on: ${{ matrix.os }}
2727
env:
28-
GOLANGCILINT_VER: v1.61.0 # Make sure to bump /tools/check-lint-version/main_test.go
28+
GOLANGCILINT_VER: v1.64.6 # Make sure to bump /tools/check-lint-version/main_test.go
2929

3030
steps:
3131
- name: Checkout

‎.golangci.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,6 @@ linters:
234234
- lll
235235
- unparam
236236
- wsl
237-
- gomnd
238237
- testpackage
239238
- nestif
240239
- nlreturn
@@ -271,8 +270,6 @@ linters:
271270
- tagalign
272271
- mnd
273272
- canonicalheader
274-
- exportloopref
275-
- execinquery
276273
- err113
277274
- fatcontext
278275
- forbidigo # TODO: Re-enable and remove fmt.println

‎Makefile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ cover: ## Displays test coverage in the client and service packages
3333
lint: check-lint ## Lints the entire project
3434
golangci-lint run --timeout=3m
3535

36+
.PHONY: lint-fix
37+
lint-fix: check-lint ## Lints the entire project
38+
golangci-lint run --timeout=3m --fix
39+
3640
.PHONY: check-lint
3741
check-lint: ## Compares the locally installed linter with the workflow version
3842
cd ./tools/check-lint-version && \

‎actor/runtime/actor_runtime_test.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ func TestRegisterActorFactoryAndInvokeMethod(t *testing.T) {
4848
mockServer.EXPECT().RegisterActorImplFactory(gomock.Any())
4949
rt.RegisterActorFactory(actorMock.ActorImplFactory)
5050

51+
//nolint:usetesting
5152
mockServer.EXPECT().InvokeMethod(context.Background(), "mockActorID", "Invoke", []byte("param")).Return([]byte("response"), actorErr.Success)
5253
rspData, err := rt.InvokeActorMethod("testActorType", "mockActorID", "Invoke", []byte("param"))
5354

@@ -89,6 +90,7 @@ func TestInvokeReminder(t *testing.T) {
8990
mockServer.EXPECT().RegisterActorImplFactory(gomock.Any())
9091
rt.RegisterActorFactory(actorMock.ActorImplFactory)
9192

93+
//nolint:usetesting
9294
mockServer.EXPECT().InvokeReminder(context.Background(), "mockActorID", "mockReminder", []byte("param")).Return(actorErr.Success)
9395
err = rt.InvokeReminder("testActorType", "mockActorID", "mockReminder", []byte("param"))
9496

@@ -109,6 +111,7 @@ func TestInvokeTimer(t *testing.T) {
109111
mockServer.EXPECT().RegisterActorImplFactory(gomock.Any())
110112
rt.RegisterActorFactory(actorMock.ActorImplFactory)
111113

114+
//nolint:usetesting
112115
mockServer.EXPECT().InvokeTimer(context.Background(), "mockActorID", "mockTimer", []byte("param")).Return(actorErr.Success)
113116
err = rt.InvokeTimer("testActorType", "mockActorID", "mockTimer", []byte("param"))
114117

‎client/actor_test.go‎

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

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

2019
"github.com/stretchr/testify/require"
@@ -25,7 +24,7 @@ import (
2524
const testActorType = "test"
2625

2726
func TestInvokeActor(t *testing.T) {
28-
ctx := context.Background()
27+
ctx := t.Context()
2928
in := &InvokeActorRequest{
3029
ActorID: "fn",
3130
Method: "mockMethod",
@@ -74,7 +73,7 @@ func TestInvokeActor(t *testing.T) {
7473
}
7574

7675
func TestRegisterActorReminder(t *testing.T) {
77-
ctx := context.Background()
76+
ctx := t.Context()
7877
in := &RegisterActorReminderRequest{
7978
ActorID: "fn",
8079
Data: []byte(`{hello}`),
@@ -137,7 +136,7 @@ func TestRegisterActorReminder(t *testing.T) {
137136
}
138137

139138
func TestRegisterActorTimer(t *testing.T) {
140-
ctx := context.Background()
139+
ctx := t.Context()
141140
in := &RegisterActorTimerRequest{
142141
ActorID: "fn",
143142
Data: []byte(`{hello}`),
@@ -215,7 +214,7 @@ func TestRegisterActorTimer(t *testing.T) {
215214
}
216215

217216
func TestUnregisterActorReminder(t *testing.T) {
218-
ctx := context.Background()
217+
ctx := t.Context()
219218
in := &UnregisterActorReminderRequest{
220219
ActorID: "fn",
221220
ActorType: testActorType,
@@ -260,7 +259,7 @@ func TestUnregisterActorReminder(t *testing.T) {
260259
}
261260

262261
func TestUnregisterActorTimer(t *testing.T) {
263-
ctx := context.Background()
262+
ctx := t.Context()
264263
in := &UnregisterActorTimerRequest{
265264
ActorID: "fn",
266265
ActorType: testActorType,

‎client/binding_test.go‎

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

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

2019
"github.com/stretchr/testify/require"
@@ -25,7 +24,7 @@ import (
2524
// go test -timeout 30s ./client -count 1 -run ^TestInvokeBinding$
2625

2726
func TestInvokeBinding(t *testing.T) {
28-
ctx := context.Background()
27+
ctx := t.Context()
2928
in := &InvokeBindingRequest{
3029
Name: "test",
3130
Operation: "fn",

‎client/client_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ func TestNewClient(t *testing.T) {
9898
})
9999

100100
t.Run("new client with trace ID", func(t *testing.T) {
101-
_ = testClient.WithTraceID(context.Background(), "test")
101+
_ = testClient.WithTraceID(t.Context(), "test")
102102
})
103103

104104
t.Run("new socket client closed with token", func(t *testing.T) {
@@ -120,13 +120,13 @@ func TestNewClient(t *testing.T) {
120120
c, err := NewClientWithSocket(testSocket)
121121
require.NoError(t, err)
122122
defer c.Close()
123-
ctx := c.WithTraceID(context.Background(), "")
123+
ctx := c.WithTraceID(t.Context(), "")
124124
_ = c.WithTraceID(ctx, "test")
125125
})
126126
}
127127

128128
func TestShutdown(t *testing.T) {
129-
ctx := context.Background()
129+
ctx := t.Context()
130130

131131
t.Run("shutdown", func(t *testing.T) {
132132
err := testClient.Shutdown(ctx)

‎client/configuration_test.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package client
22

33
import (
4-
"context"
54
"sync/atomic"
65
"testing"
76
"time"
@@ -16,7 +15,7 @@ const (
1615
)
1716

1817
func TestGetConfigurationItem(t *testing.T) {
19-
ctx := context.Background()
18+
ctx := t.Context()
2019

2120
t.Run("get configuration item", func(t *testing.T) {
2221
resp, err := testClient.GetConfigurationItem(ctx, "example-config", "mykey")
@@ -31,7 +30,7 @@ func TestGetConfigurationItem(t *testing.T) {
3130
}
3231

3332
func TestGetConfigurationItems(t *testing.T) {
34-
ctx := context.Background()
33+
ctx := t.Context()
3534

3635
keys := []string{"mykey1", "mykey2", "mykey3"}
3736
t.Run("Test get configuration items", func(t *testing.T) {
@@ -44,7 +43,7 @@ func TestGetConfigurationItems(t *testing.T) {
4443
}
4544

4645
func TestSubscribeConfigurationItems(t *testing.T) {
47-
ctx := context.Background()
46+
ctx := t.Context()
4847

4948
var counter, totalCounter uint32
5049
counter = 0
@@ -67,7 +66,7 @@ func TestSubscribeConfigurationItems(t *testing.T) {
6766
}
6867

6968
func TestUnSubscribeConfigurationItems(t *testing.T) {
70-
ctx := context.Background()
69+
ctx := t.Context()
7170

7271
var counter, totalCounter uint32
7372
t.Run("Test unsubscribe configuration items", func(t *testing.T) {

0 commit comments

Comments
 (0)