Skip to content

Commit ee70bea

Browse files
committed
Merge remote-tracking branch 'upstream/main' into bi-di-pubsub-mikeee
2 parents 50f5700 + feb4bb6 commit ee70bea

File tree

29 files changed

+232
-729
lines changed

29 files changed

+232
-729
lines changed

.github/workflows/fossa.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ jobs:
3535
uses: actions/checkout@v4
3636

3737
- name: "Run FOSSA Scan"
38-
uses: fossas/fossa-action@v1.1.0 # Use a specific version if locking is preferred
38+
uses: fossas/fossa-action@v1.3.3 # Use a specific version if locking is preferred
3939
with:
4040
api-key: ${{ env.FOSSA_API_KEY }}
4141

4242
- name: "Run FOSSA Test"
43-
uses: fossas/fossa-action@v1.1.0 # Use a specific version if locking is preferred
43+
uses: fossas/fossa-action@v1.3.3 # Use a specific version if locking is preferred
4444
with:
4545
api-key: ${{ env.FOSSA_API_KEY }}
4646
run-tests: true

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
uses: codecov/codecov-action@v4
4040

4141
- name: Lint
42-
uses: golangci/golangci-lint-action@v3.3.1
42+
uses: golangci/golangci-lint-action@v6
4343
with:
4444
version: ${{ env.GOLANGCILINT_VER }}
4545
skip-cache: true

.github/workflows/test-tooling.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
run: make tidy
4646

4747
- name: Lint
48-
uses: golangci/golangci-lint-action@v3
48+
uses: golangci/golangci-lint-action@v6
4949
with:
5050
version: ${{ env.GOLANGCILINT_VER }}
5151
working-directory: ./tools/check-lint-version

client/client.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ func NewClientWithAddressContext(ctx context.Context, address string) (client Cl
333333

334334
opts := []grpc.DialOption{
335335
grpc.WithUserAgent(userAgent()),
336-
grpc.WithBlock(),
336+
grpc.WithBlock(), //nolint:staticcheck
337337
authTokenUnaryInterceptor(at),
338338
authTokenStreamInterceptor(at),
339339
}
@@ -345,7 +345,7 @@ func NewClientWithAddressContext(ctx context.Context, address string) (client Cl
345345
}
346346

347347
ctx, cancel := context.WithTimeout(ctx, time.Duration(timeoutSeconds)*time.Second)
348-
conn, err := grpc.DialContext(
348+
conn, err := grpc.DialContext( //nolint:staticcheck
349349
ctx,
350350
parsedAddress.Target,
351351
opts...,
@@ -381,7 +381,7 @@ func NewClientWithSocket(socket string) (client Client, err error) {
381381
at := &authToken{}
382382
logger.Printf("dapr client initializing for: %s", socket)
383383
addr := "unix://" + socket
384-
conn, err := grpc.Dial(
384+
conn, err := grpc.Dial( //nolint:staticcheck
385385
addr,
386386
grpc.WithTransportCredentials(insecure.NewCredentials()),
387387
grpc.WithUserAgent(userAgent()),

client/client_test.go

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

client/wait_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ func createUnresponsiveServer(network string, unresponsiveServerAddress string)
103103
}
104104

105105
func createNonBlockingClient(ctx context.Context, serverAddr string) (client Client, err error) {
106-
conn, err := grpc.DialContext(
106+
conn, err := grpc.DialContext( //nolint:staticcheck
107107
ctx,
108108
serverAddr,
109109
grpc.WithTransportCredentials(insecure.NewCredentials()),

examples/actor/go.mod

-29
This file was deleted.

examples/actor/go.sum

-67
This file was deleted.

examples/configuration/go.mod

-32
This file was deleted.

examples/configuration/go.sum

-74
This file was deleted.

examples/go.mod

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
module github.com/dapr/go-sdk/examples
2+
3+
go 1.21.8
4+
5+
replace github.com/dapr/go-sdk => ../
6+
7+
require (
8+
github.com/alecthomas/kingpin/v2 v2.4.0
9+
github.com/dapr/go-sdk v0.0.0-00010101000000-000000000000
10+
github.com/go-redis/redis/v8 v8.11.5
11+
github.com/google/uuid v1.6.0
12+
google.golang.org/grpc v1.64.0
13+
google.golang.org/grpc/examples v0.0.0-20240529235625-24e902437554
14+
)
15+
16+
require (
17+
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
18+
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
19+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
20+
github.com/dapr/dapr v1.13.0 // indirect
21+
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
22+
github.com/go-chi/chi/v5 v5.0.12 // indirect
23+
github.com/go-logr/logr v1.4.2 // indirect
24+
github.com/go-logr/stdr v1.2.2 // indirect
25+
github.com/golang/protobuf v1.5.4 // indirect
26+
github.com/kr/pretty v0.3.1 // indirect
27+
github.com/marusama/semaphore/v2 v2.5.0 // indirect
28+
github.com/microsoft/durabletask-go v0.4.1-0.20240122160106-fb5c4c05729d // indirect
29+
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
30+
go.opentelemetry.io/otel v1.27.0 // indirect
31+
go.opentelemetry.io/otel/metric v1.27.0 // indirect
32+
go.opentelemetry.io/otel/trace v1.27.0 // indirect
33+
golang.org/x/net v0.25.0 // indirect
34+
golang.org/x/sys v0.20.0 // indirect
35+
golang.org/x/text v0.15.0 // indirect
36+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528155852-a33235495d66 // indirect
37+
google.golang.org/protobuf v1.34.1 // indirect
38+
gopkg.in/yaml.v3 v3.0.1 // indirect
39+
)

0 commit comments

Comments
 (0)