Merge branch 'main' into fix-api-token-init

Author: famarting

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

@@ -17,7 +17,7 @@ jobs:
     name: Test
     runs-on: ubuntu-latest
     env:
-      GOLANGCILINT_VER: v1.61.0
+      GOLANGCILINT_VER: v1.64.6
 
     steps:
       - name: Checkout

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

@@ -11,7 +11,7 @@ jobs:
     name: Test
     runs-on: ubuntu-latest
     env:
-      GOLANGCILINT_VER: v1.61.0
+      GOLANGCILINT_VER: v1.64.6
 
     steps:
       - name: Checkout

.github/workflows/test-tooling.yml

@@ -25,7 +25,7 @@ jobs:
           - "macos-latest"
     runs-on: ${{ matrix.os }}
     env:
-      GOLANGCILINT_VER: v1.61.0 # Make sure to bump /tools/check-lint-version/main_test.go
+      GOLANGCILINT_VER: v1.64.6 # Make sure to bump /tools/check-lint-version/main_test.go
 
     steps:
       - name: Checkout

.github/workflows/validate_examples.yaml

@@ -166,7 +166,7 @@ jobs:
             "configuration",
             "conversation",
             "crypto",
-            "dist-scheduler",
+            "jobs",
             "grpc-service",
             "hello-world",
             "pubsub",

.golangci.yml

@@ -234,7 +234,6 @@ linters:
     - lll
     - unparam
     - wsl
-    - gomnd
     - testpackage
     - nestif
     - nlreturn
@@ -271,8 +270,6 @@ linters:
     - tagalign
     - mnd
     - canonicalheader
-    - exportloopref
-    - execinquery
     - err113
     - fatcontext
     - forbidigo # TODO: Re-enable and remove fmt.println

Makefile

@@ -33,6 +33,10 @@ cover: ## Displays test coverage in the client and service packages
 lint: check-lint ## Lints the entire project
 	golangci-lint run --timeout=3m
 
+.PHONY: lint-fix
+lint-fix: check-lint ## Lints the entire project
+	golangci-lint run --timeout=3m --fix
+
 .PHONY: check-lint
 check-lint: ## Compares the locally installed linter with the workflow version
 	cd ./tools/check-lint-version && \

actor/runtime/actor_runtime_test.go

@@ -48,6 +48,7 @@ func TestRegisterActorFactoryAndInvokeMethod(t *testing.T) {
 	mockServer.EXPECT().RegisterActorImplFactory(gomock.Any())
 	rt.RegisterActorFactory(actorMock.ActorImplFactory)
 
+	//nolint:usetesting
 	mockServer.EXPECT().InvokeMethod(context.Background(), "mockActorID", "Invoke", []byte("param")).Return([]byte("response"), actorErr.Success)
 	rspData, err := rt.InvokeActorMethod("testActorType", "mockActorID", "Invoke", []byte("param"))
 
@@ -89,6 +90,7 @@ func TestInvokeReminder(t *testing.T) {
 	mockServer.EXPECT().RegisterActorImplFactory(gomock.Any())
 	rt.RegisterActorFactory(actorMock.ActorImplFactory)
 
+	//nolint:usetesting
 	mockServer.EXPECT().InvokeReminder(context.Background(), "mockActorID", "mockReminder", []byte("param")).Return(actorErr.Success)
 	err = rt.InvokeReminder("testActorType", "mockActorID", "mockReminder", []byte("param"))
 
@@ -109,6 +111,7 @@ func TestInvokeTimer(t *testing.T) {
 	mockServer.EXPECT().RegisterActorImplFactory(gomock.Any())
 	rt.RegisterActorFactory(actorMock.ActorImplFactory)
 
+	//nolint:usetesting
 	mockServer.EXPECT().InvokeTimer(context.Background(), "mockActorID", "mockTimer", []byte("param")).Return(actorErr.Success)
 	err = rt.InvokeTimer("testActorType", "mockActorID", "mockTimer", []byte("param"))
 

client/actor_test.go

@@ -14,7 +14,6 @@ limitations under the License.
 package client
 
 import (
-	"context"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -25,7 +24,7 @@ import (
 const testActorType = "test"
 
 func TestInvokeActor(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 	in := &InvokeActorRequest{
 		ActorID:   "fn",
 		Method:    "mockMethod",
@@ -74,7 +73,7 @@ func TestInvokeActor(t *testing.T) {
 }
 
 func TestRegisterActorReminder(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 	in := &RegisterActorReminderRequest{
 		ActorID:   "fn",
 		Data:      []byte(`{hello}`),
@@ -137,7 +136,7 @@ func TestRegisterActorReminder(t *testing.T) {
 }
 
 func TestRegisterActorTimer(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 	in := &RegisterActorTimerRequest{
 		ActorID:   "fn",
 		Data:      []byte(`{hello}`),
@@ -215,7 +214,7 @@ func TestRegisterActorTimer(t *testing.T) {
 }
 
 func TestUnregisterActorReminder(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 	in := &UnregisterActorReminderRequest{
 		ActorID:   "fn",
 		ActorType: testActorType,
@@ -260,7 +259,7 @@ func TestUnregisterActorReminder(t *testing.T) {
 }
 
 func TestUnregisterActorTimer(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 	in := &UnregisterActorTimerRequest{
 		ActorID:   "fn",
 		ActorType: testActorType,

client/binding_test.go

@@ -14,7 +14,6 @@ limitations under the License.
 package client
 
 import (
-	"context"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -25,7 +24,7 @@ import (
 // go test -timeout 30s ./client -count 1 -run ^TestInvokeBinding$
 
 func TestInvokeBinding(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 	in := &InvokeBindingRequest{
 		Name:      "test",
 		Operation: "fn",

client/client_test.go

@@ -32,6 +32,7 @@ import (
 	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/grpc/test/bufconn"
 	"google.golang.org/protobuf/types/known/anypb"
+	"google.golang.org/protobuf/types/known/durationpb"
 	"google.golang.org/protobuf/types/known/emptypb"
 
 	commonv1pb "github.com/dapr/dapr/pkg/proto/common/v1"
@@ -98,7 +99,7 @@ func TestNewClient(t *testing.T) {
 	})
 
 	t.Run("new client with trace ID", func(t *testing.T) {
-		_ = testClient.WithTraceID(context.Background(), "test")
+		_ = testClient.WithTraceID(t.Context(), "test")
 	})
 
 	t.Run("new socket client closed with token", func(t *testing.T) {
@@ -120,13 +121,13 @@ func TestNewClient(t *testing.T) {
 		c, err := NewClientWithSocket(testSocket)
 		require.NoError(t, err)
 		defer c.Close()
-		ctx := c.WithTraceID(context.Background(), "")
+		ctx := c.WithTraceID(t.Context(), "")
 		_ = c.WithTraceID(ctx, "test")
 	})
 }
 
 func TestShutdown(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 
 	t.Run("shutdown", func(t *testing.T) {
 		err := testClient.Shutdown(ctx)
@@ -563,10 +564,11 @@ func (s *testDaprServer) ScheduleJobAlpha1(ctx context.Context, in *pb.ScheduleJ
 
 func (s *testDaprServer) GetJobAlpha1(ctx context.Context, in *pb.GetJobRequest) (*pb.GetJobResponse, error) {
 	var (
-		schedule        = "@every 10s"
-		dueTime         = "10s"
-		repeats  uint32 = 4
-		ttl             = "10s"
+		schedule          = "@every 10s"
+		dueTime           = "10s"
+		repeats    uint32 = 4
+		ttl               = "10s"
+		maxRetries uint32 = 4
 	)
 	return &pb.GetJobResponse{
 		Job: &pb.Job{
@@ -576,6 +578,14 @@ func (s *testDaprServer) GetJobAlpha1(ctx context.Context, in *pb.GetJobRequest)
 			DueTime:  &dueTime,
 			Ttl:      &ttl,
 			Data:     nil,
+			FailurePolicy: &commonv1pb.JobFailurePolicy{
+				Policy: &commonv1pb.JobFailurePolicy_Constant{
+					Constant: &commonv1pb.JobFailurePolicyConstant{
+						MaxRetries: &maxRetries,
+						Interval:   &durationpb.Duration{Seconds: 10},
+					},
+				},
+			},
 		},
 	}, nil
 }