Skip to content

Commit cefbadb

Browse files
JoshVanLJoshVanL
authored
Update github.com/dapr/dapr to v1.13.0-rc.1 (dapr#503)
* Update github.com/dapr/dapr to v1.13.0-rc.1 Signed-off-by: joshvanl <me@joshvanl.dev> * Revert go.mod to use Go 1.20 as minimum version Signed-off-by: joshvanl <me@joshvanl.dev> * github actions: only perform go mod diff on same go version Signed-off-by: joshvanl <me@joshvanl.dev> --------- Signed-off-by: joshvanl <me@joshvanl.dev>
1 parent 4585a36 commit cefbadb

File tree

29 files changed

+116
-108
lines changed

29 files changed

+116
-108
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
gover:
17-
- "1.20"
1817
- "1.21"
18+
- "1.20"
1919
env:
2020
GOVER: ${{ matrix.gover }}
2121
GOLANGCILINT_VER: v1.55.2
@@ -54,4 +54,8 @@ jobs:
5454
args: --timeout=10m0s
5555

5656
- name: Run go mod tidy check diff
57+
if: strategy.job-index == 0
5758
run: make modtidy check-diff
59+
- name: Run go mod tidy
60+
if: strategy.job-index != 0
61+
run: make modtidy

‎client/actor.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"reflect"
2121
"strconv"
2222

23-
anypb "github.com/golang/protobuf/ptypes/any"
23+
"google.golang.org/protobuf/types/known/anypb"
2424

2525
pb "github.com/dapr/dapr/pkg/proto/runtime/v1"
2626
"github.com/dapr/go-sdk/actor"

‎client/client_test.go

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ import (
2525
"testing"
2626
"time"
2727

28-
"github.com/golang/protobuf/ptypes/empty"
2928
"github.com/google/uuid"
3029
"github.com/stretchr/testify/assert"
3130
"github.com/stretchr/testify/require"
3231
"google.golang.org/grpc"
3332
"google.golang.org/grpc/credentials/insecure"
3433
"google.golang.org/grpc/test/bufconn"
3534
"google.golang.org/protobuf/types/known/anypb"
35+
"google.golang.org/protobuf/types/known/emptypb"
3636

3737
commonv1pb "github.com/dapr/dapr/pkg/proto/common/v1"
3838
pb "github.com/dapr/dapr/pkg/proto/runtime/v1"
@@ -289,11 +289,11 @@ func (s *testDaprServer) GetBulkState(ctx context.Context, in *pb.GetBulkStateRe
289289
}, nil
290290
}
291291

292-
func (s *testDaprServer) SaveState(ctx context.Context, req *pb.SaveStateRequest) (*empty.Empty, error) {
292+
func (s *testDaprServer) SaveState(ctx context.Context, req *pb.SaveStateRequest) (*emptypb.Empty, error) {
293293
for _, item := range req.GetStates() {
294294
s.state[item.GetKey()] = item.GetValue()
295295
}
296-
return &empty.Empty{}, nil
296+
return &emptypb.Empty{}, nil
297297
}
298298

299299
func (s *testDaprServer) QueryStateAlpha1(ctx context.Context, req *pb.QueryStateRequest) (*pb.QueryStateResponse, error) {
@@ -311,19 +311,19 @@ func (s *testDaprServer) QueryStateAlpha1(ctx context.Context, req *pb.QueryStat
311311
return ret, nil
312312
}
313313

314-
func (s *testDaprServer) DeleteState(ctx context.Context, req *pb.DeleteStateRequest) (*empty.Empty, error) {
314+
func (s *testDaprServer) DeleteState(ctx context.Context, req *pb.DeleteStateRequest) (*emptypb.Empty, error) {
315315
delete(s.state, req.GetKey())
316-
return &empty.Empty{}, nil
316+
return &emptypb.Empty{}, nil
317317
}
318318

319-
func (s *testDaprServer) DeleteBulkState(ctx context.Context, req *pb.DeleteBulkStateRequest) (*empty.Empty, error) {
319+
func (s *testDaprServer) DeleteBulkState(ctx context.Context, req *pb.DeleteBulkStateRequest) (*emptypb.Empty, error) {
320320
for _, item := range req.GetStates() {
321321
delete(s.state, item.GetKey())
322322
}
323-
return &empty.Empty{}, nil
323+
return &emptypb.Empty{}, nil
324324
}
325325

326-
func (s *testDaprServer) ExecuteStateTransaction(ctx context.Context, in *pb.ExecuteStateTransactionRequest) (*empty.Empty, error) {
326+
func (s *testDaprServer) ExecuteStateTransaction(ctx context.Context, in *pb.ExecuteStateTransactionRequest) (*emptypb.Empty, error) {
327327
for _, op := range in.GetOperations() {
328328
item := op.GetRequest()
329329
switch opType := op.GetOperationType(); opType {
@@ -332,10 +332,10 @@ func (s *testDaprServer) ExecuteStateTransaction(ctx context.Context, in *pb.Exe
332332
case "delete":
333333
delete(s.state, item.GetKey())
334334
default:
335-
return &empty.Empty{}, fmt.Errorf("invalid operation type: %s", opType)
335+
return &emptypb.Empty{}, fmt.Errorf("invalid operation type: %s", opType)
336336
}
337337
}
338-
return &empty.Empty{}, nil
338+
return &emptypb.Empty{}, nil
339339
}
340340

341341
func (s *testDaprServer) GetMetadata(ctx context.Context, req *pb.GetMetadataRequest) (metadata *pb.GetMetadataResponse, err error) {
@@ -349,12 +349,12 @@ func (s *testDaprServer) GetMetadata(ctx context.Context, req *pb.GetMetadataReq
349349
return resp, nil
350350
}
351351

352-
func (s *testDaprServer) SetMetadata(ctx context.Context, req *pb.SetMetadataRequest) (*empty.Empty, error) {
353-
return &empty.Empty{}, nil
352+
func (s *testDaprServer) SetMetadata(ctx context.Context, req *pb.SetMetadataRequest) (*emptypb.Empty, error) {
353+
return &emptypb.Empty{}, nil
354354
}
355355

356-
func (s *testDaprServer) PublishEvent(ctx context.Context, req *pb.PublishEventRequest) (*empty.Empty, error) {
357-
return &empty.Empty{}, nil
356+
func (s *testDaprServer) PublishEvent(ctx context.Context, req *pb.PublishEventRequest) (*emptypb.Empty, error) {
357+
return &emptypb.Empty{}, nil
358358
}
359359

360360
// BulkPublishEventAlpha1 mocks the BulkPublishEventAlpha1 API.
@@ -410,12 +410,12 @@ func (s *testDaprServer) GetBulkSecret(ctx context.Context, req *pb.GetBulkSecre
410410
}, nil
411411
}
412412

413-
func (s *testDaprServer) RegisterActorReminder(ctx context.Context, req *pb.RegisterActorReminderRequest) (*empty.Empty, error) {
414-
return &empty.Empty{}, nil
413+
func (s *testDaprServer) RegisterActorReminder(ctx context.Context, req *pb.RegisterActorReminderRequest) (*emptypb.Empty, error) {
414+
return &emptypb.Empty{}, nil
415415
}
416416

417-
func (s *testDaprServer) UnregisterActorReminder(ctx context.Context, req *pb.UnregisterActorReminderRequest) (*empty.Empty, error) {
418-
return &empty.Empty{}, nil
417+
func (s *testDaprServer) UnregisterActorReminder(ctx context.Context, req *pb.UnregisterActorReminderRequest) (*emptypb.Empty, error) {
418+
return &emptypb.Empty{}, nil
419419
}
420420

421421
func (s *testDaprServer) InvokeActor(context.Context, *pb.InvokeActorRequest) (*pb.InvokeActorResponse, error) {
@@ -424,16 +424,16 @@ func (s *testDaprServer) InvokeActor(context.Context, *pb.InvokeActorRequest) (*
424424
}, nil
425425
}
426426

427-
func (s *testDaprServer) RegisterActorTimer(context.Context, *pb.RegisterActorTimerRequest) (*empty.Empty, error) {
428-
return &empty.Empty{}, nil
427+
func (s *testDaprServer) RegisterActorTimer(context.Context, *pb.RegisterActorTimerRequest) (*emptypb.Empty, error) {
428+
return &emptypb.Empty{}, nil
429429
}
430430

431-
func (s *testDaprServer) UnregisterActorTimer(context.Context, *pb.UnregisterActorTimerRequest) (*empty.Empty, error) {
432-
return &empty.Empty{}, nil
431+
func (s *testDaprServer) UnregisterActorTimer(context.Context, *pb.UnregisterActorTimerRequest) (*emptypb.Empty, error) {
432+
return &emptypb.Empty{}, nil
433433
}
434434

435-
func (s *testDaprServer) Shutdown(ctx context.Context, req *pb.ShutdownRequest) (*empty.Empty, error) {
436-
return &empty.Empty{}, nil
435+
func (s *testDaprServer) Shutdown(ctx context.Context, req *pb.ShutdownRequest) (*emptypb.Empty, error) {
436+
return &emptypb.Empty{}, nil
437437
}
438438

439439
func (s *testDaprServer) GetConfiguration(ctx context.Context, in *pb.GetConfigurationRequest) (*pb.GetConfigurationResponse, error) {

‎client/invoke.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"fmt"
2121
"strings"
2222

23-
anypb "github.com/golang/protobuf/ptypes/any"
23+
"google.golang.org/protobuf/types/known/anypb"
2424

2525
v1 "github.com/dapr/dapr/pkg/proto/common/v1"
2626
pb "github.com/dapr/dapr/pkg/proto/runtime/v1"

‎client/metadata.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ func (c *GRPCClient) GetMetadata(ctx context.Context) (metadata *GetMetadataResp
5757
return nil, fmt.Errorf("error invoking service: %w", err)
5858
}
5959
if resp != nil {
60-
activeActorsCount := make([]*MetadataActiveActorsCount, len(resp.GetActiveActorsCount()))
61-
for i, a := range resp.GetActiveActorsCount() {
60+
activeActorsCount := make([]*MetadataActiveActorsCount, len(resp.GetActorRuntime().GetActiveActors()))
61+
for i, a := range resp.GetActorRuntime().GetActiveActors() {
6262
activeActorsCount[i] = &MetadataActiveActorsCount{
6363
Type: a.GetType(),
6464
Count: a.GetCount(),

‎client/state.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"fmt"
2020
"time"
2121

22-
"github.com/golang/protobuf/ptypes/duration"
22+
"google.golang.org/protobuf/types/known/durationpb"
2323

2424
v1 "github.com/dapr/dapr/pkg/proto/common/v1"
2525
pb "github.com/dapr/dapr/pkg/proto/runtime/v1"
@@ -248,11 +248,11 @@ func copyStateOptionDefault() *StateOptions {
248248
}
249249
}
250250

251-
func toProtoDuration(d time.Duration) *duration.Duration {
251+
func toProtoDuration(d time.Duration) *durationpb.Duration {
252252
nanos := d.Nanoseconds()
253253
secs := nanos / 1e9
254254
nanos -= secs * 1e9
255-
return &duration.Duration{
255+
return &durationpb.Duration{
256256
Seconds: secs,
257257
Nanos: int32(nanos),
258258
}

‎examples/actor/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
require (
1414
github.com/dapr/dapr v1.12.0-rc.4 // indirect
1515
github.com/go-chi/chi/v5 v5.0.10 // indirect
16-
github.com/golang/protobuf v1.5.3 // indirect
16+
google.golang.org/protobuf v1.5.3 // indirect
1717
github.com/kr/pretty v0.3.1 // indirect
1818
golang.org/x/net v0.15.0 // indirect
1919
golang.org/x/sys v0.12.0 // indirect

‎examples/actor/go.sum

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
55
github.com/go-chi/chi/v5 v5.0.10 h1:rLz5avzKpjqxrYwXNfmjkrYYXOyLJd37pz53UFHC6vk=
66
github.com/go-chi/chi/v5 v5.0.10/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
77
github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
8-
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
9-
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
10-
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
8+
google.golang.org/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
9+
google.golang.org/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
10+
google.golang.org/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
1111
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
1212
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
1313
github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=

‎examples/configuration/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require (
1414
require (
1515
github.com/cespare/xxhash/v2 v2.2.0 // indirect
1616
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
17-
github.com/golang/protobuf v1.5.3 // indirect
17+
google.golang.org/protobuf v1.5.3 // indirect
1818
github.com/google/uuid v1.3.0 // indirect
1919
github.com/kr/pretty v0.3.1 // indirect
2020
golang.org/x/net v0.10.0 // indirect

‎examples/configuration/go.sum

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cu
77
github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
88
github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI=
99
github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
10-
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
11-
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
12-
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
10+
google.golang.org/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
11+
google.golang.org/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
12+
google.golang.org/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
1313
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
1414
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
1515
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=

0 commit comments

Comments
 (0)