Merge pull request #2 from mikeee/update-dapr-dapr-mikeee

Update dapr dapr mikeee

.github/workflows/fossa.yml

@@ -35,12 +35,12 @@ jobs:
         uses: actions/checkout@v4
 
       - name: "Run FOSSA Scan"
-        uses: fossas/fossa-action@v1.1.0 # Use a specific version if locking is preferred
+        uses: fossas/fossa-action@v1.3.3 # Use a specific version if locking is preferred
         with:
           api-key: ${{ env.FOSSA_API_KEY }}
 
       - name: "Run FOSSA Test"
-        uses: fossas/fossa-action@v1.1.0 # Use a specific version if locking is preferred
+        uses: fossas/fossa-action@v1.3.3 # Use a specific version if locking is preferred
         with:
           api-key: ${{ env.FOSSA_API_KEY }}
           run-tests: true

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

@@ -39,7 +39,7 @@ jobs:
         uses: codecov/codecov-action@v4
 
       - name: Lint
-        uses: golangci/golangci-lint-action@v3.3.1
+        uses: golangci/golangci-lint-action@v6
         with:
           version: ${{ env.GOLANGCILINT_VER }}
           skip-cache: true

.github/workflows/test-tooling.yml

@@ -45,7 +45,7 @@ jobs:
         run: make tidy
 
       - name: Lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v6
         with:
           version: ${{ env.GOLANGCILINT_VER }}
           working-directory: ./tools/check-lint-version

Makefile

@@ -1,13 +1,12 @@
 RELEASE_VERSION  =v1.0.0-rc-3
 GDOC_PORT        =8888
-GO_COMPAT_VERSION=1.21
 
 .PHONY: all
 all: help
 
 .PHONY: tidy
 tidy: ## Updates the go modules
-	go mod tidy -compat=$(GO_COMPAT_VERSION)
+	go mod tidy
 
 .PHONY: test
 test:
@@ -57,3 +56,5 @@ check-diff:
 .PHONY: modtidy
 modtidy:
 	go mod tidy
+
+

client/client.go

@@ -325,7 +325,7 @@ func NewClientWithAddressContext(ctx context.Context, address string) (client Cl
 
 	opts := []grpc.DialOption{
 		grpc.WithUserAgent(userAgent()),
-		grpc.WithBlock(),
+		grpc.WithBlock(), //nolint:staticcheck
 		authTokenUnaryInterceptor(at),
 		authTokenStreamInterceptor(at),
 	}
@@ -337,7 +337,7 @@ func NewClientWithAddressContext(ctx context.Context, address string) (client Cl
 	}
 
 	ctx, cancel := context.WithTimeout(ctx, time.Duration(timeoutSeconds)*time.Second)
-	conn, err := grpc.DialContext(
+	conn, err := grpc.DialContext( //nolint:staticcheck
 		ctx,
 		parsedAddress.Target,
 		opts...,
@@ -373,7 +373,7 @@ func NewClientWithSocket(socket string) (client Client, err error) {
 	at := &authToken{}
 	logger.Printf("dapr client initializing for: %s", socket)
 	addr := "unix://" + socket
-	conn, err := grpc.Dial(
+	conn, err := grpc.Dial( //nolint:staticcheck
 		addr,
 		grpc.WithTransportCredentials(insecure.NewCredentials()),
 		grpc.WithUserAgent(userAgent()),

client/client_test.go

@@ -151,7 +151,7 @@ func getTestClient(ctx context.Context) (client Client, closer func()) {
 	d := grpc.WithContextDialer(func(context.Context, string) (net.Conn, error) {
 		return l.Dial()
 	})
-
+	//nolint:staticcheck
 	c, err := grpc.DialContext(ctx, "", d, grpc.WithTransportCredentials(insecure.NewCredentials()))
 	if err != nil {
 		logger.Fatalf("failed to dial test context: %v", err)

client/wait_test.go

@@ -103,7 +103,7 @@ func createUnresponsiveServer(network string, unresponsiveServerAddress string)
 }
 
 func createNonBlockingClient(ctx context.Context, serverAddr string) (client Client, err error) {
-	conn, err := grpc.DialContext(
+	conn, err := grpc.DialContext( //nolint:staticcheck
 		ctx,
 		serverAddr,
 		grpc.WithTransportCredentials(insecure.NewCredentials()),

examples/go.mod

@@ -0,0 +1,39 @@
+module github.com/dapr/go-sdk/examples
+
+go 1.22.5
+
+replace github.com/dapr/go-sdk => ../
+
+require (
+	github.com/alecthomas/kingpin/v2 v2.4.0
+	github.com/dapr/go-sdk v0.0.0-00010101000000-000000000000
+	github.com/go-redis/redis/v8 v8.11.5
+	github.com/google/uuid v1.6.0
+	google.golang.org/grpc v1.64.0
+	google.golang.org/grpc/examples v0.0.0-20240529235625-24e902437554
+)
+
+require (
+	github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
+	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/dapr/dapr v1.14.0-rc.1 // indirect
+	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+	github.com/go-chi/chi/v5 v5.0.12 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/kr/pretty v0.3.1 // indirect
+	github.com/marusama/semaphore/v2 v2.5.0 // indirect
+	github.com/microsoft/durabletask-go v0.5.0 // indirect
+	github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
+	go.opentelemetry.io/otel v1.27.0 // indirect
+	go.opentelemetry.io/otel/metric v1.27.0 // indirect
+	go.opentelemetry.io/otel/trace v1.27.0 // indirect
+	golang.org/x/net v0.26.0 // indirect
+	golang.org/x/sys v0.21.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240624140628-dc46fd24d27d // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)