Merge branch 'main' into dependabot/go_modules/dot-github/workflows/dapr-bot/golang.org/x/crypto-0.35.0

Author: mikeee

.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

@@ -38,9 +38,9 @@ jobs:
       CHECKOUT_REF: ${{ github.ref }}
     outputs:
       DAPR_INSTALL_URL: ${{ env.DAPR_INSTALL_URL }}
-      DAPR_CLI_VER: ${{ steps.outputs.outputs.DAPR_CLI_VER }}
+      DAPR_CLI_VER: 1.16.0-rc.1
       DAPR_CLI_REF: ${{ steps.outputs.outputs.DAPR_CLI_REF }}
-      DAPR_RUNTIME_VER: ${{ steps.outputs.outputs.DAPR_RUNTIME_VER }}
+      DAPR_RUNTIME_VER: 1.16.0-rc.3
       CHECKOUT_REPO: ${{ steps.outputs.outputs.CHECKOUT_REPO }}
       CHECKOUT_REF: ${{ steps.outputs.outputs.CHECKOUT_REF }}
       DAPR_REF: ${{ steps.outputs.outputs.DAPR_REF }}
@@ -166,7 +166,7 @@ jobs:
             "configuration",
             "conversation",
             "crypto",
-            "dist-scheduler",
+            "jobs",
             "grpc-service",
             "hello-world",
             "pubsub",
@@ -175,6 +175,7 @@ jobs:
             "socket",
             "workflow",
             "workflow-parallel",
+            "workflow-taskexecutionid"
           ]
     steps:
       - name: Check out code onto GOPATH

.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.go

@@ -355,7 +355,7 @@ func NewClientWithAddressContext(ctx context.Context, address string) (client Cl
 		return nil, fmt.Errorf("error parsing address '%s': %w", address, err)
 	}
 
-	at := &authToken{}
+	at := newAuthToken()
 
 	opts := []grpc.DialOption{
 		grpc.WithUserAgent(userAgent()),
@@ -404,7 +404,7 @@ func NewClientWithSocket(socket string) (client Client, err error) {
 	if socket == "" {
 		return nil, errors.New("nil socket")
 	}
-	at := &authToken{}
+	at := newAuthToken()
 	logger.Printf("dapr client initializing for: %s", socket)
 	addr := "unix://" + socket
 	conn, err := grpc.Dial( //nolint:staticcheck
@@ -421,11 +421,6 @@ func NewClientWithSocket(socket string) (client Client, err error) {
 }
 
 func newClientWithConnection(conn *grpc.ClientConn, authToken *authToken) Client {
-	apiToken := os.Getenv(apiTokenEnvVarName)
-	if apiToken != "" {
-		logger.Println("client uses API token")
-		authToken.set(apiToken)
-	}
 	return &GRPCClient{
 		connection:  conn,
 		protoClient: pb.NewDaprClient(conn),
@@ -435,14 +430,26 @@ func newClientWithConnection(conn *grpc.ClientConn, authToken *authToken) Client
 
 // NewClientWithConnection instantiates Dapr client using specific connection.
 func NewClientWithConnection(conn *grpc.ClientConn) Client {
-	return newClientWithConnection(conn, &authToken{})
+	return newClientWithConnection(conn, newAuthToken())
 }
 
+// NOTE: authToken must be created using newAuthToken()
+// it is crucial to correctly initialize the dapr client with the API token from the environment variable
 type authToken struct {
 	mu        sync.RWMutex
 	authToken string
 }
 
+func newAuthToken() *authToken {
+	apiToken := os.Getenv(apiTokenEnvVarName)
+	if apiToken != "" {
+		logger.Println("API Token loaded from the environment variable")
+	}
+	return &authToken{
+		authToken: apiToken,
+	}
+}
+
 func (a *authToken) get() string {
 	a.mu.RLock()
 	defer a.mu.RUnlock()