Skip to content

Commit 87bbb8c

Browse files
authored
Updates pinned runtime (#469)
This is needed in components-contrib as we cannot pin an updated runtime in cert tests without an updated Go SDK, due to a complex circular dependency Signed-off-by: ItalyPaleAle <[email protected]>
1 parent 57466dd commit 87bbb8c

File tree

6 files changed

+15
-11
lines changed

6 files changed

+15
-11
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ tidy: ## Updates the go modules
1111

1212
.PHONY: test
1313
test:
14-
go test -count=1 \
14+
CGO_ENABLED=1 go test -count=1 \
1515
-race \
1616
-coverprofile=coverage.txt \
1717
-covermode=atomic \

client/client.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import (
3333
"google.golang.org/grpc"
3434
"google.golang.org/grpc/credentials/insecure"
3535
"google.golang.org/grpc/metadata"
36-
"google.golang.org/protobuf/types/known/emptypb"
3736

3837
pb "github.com/dapr/dapr/pkg/proto/runtime/v1"
3938

@@ -369,7 +368,7 @@ func (c *GRPCClient) withAuthToken(ctx context.Context) context.Context {
369368

370369
// Shutdown the sidecar.
371370
func (c *GRPCClient) Shutdown(ctx context.Context) error {
372-
_, err := c.protoClient.Shutdown(c.withAuthToken(ctx), &emptypb.Empty{})
371+
_, err := c.protoClient.Shutdown(c.withAuthToken(ctx), &pb.ShutdownRequest{})
373372
if err != nil {
374373
return fmt.Errorf("error shutting down the sidecar: %w", err)
375374
}

client/client_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ func (s *testDaprServer) ExecuteStateTransaction(ctx context.Context, in *pb.Exe
338338
return &empty.Empty{}, nil
339339
}
340340

341-
func (s *testDaprServer) GetMetadata(ctx context.Context, req *empty.Empty) (metadata *pb.GetMetadataResponse, err error) {
341+
func (s *testDaprServer) GetMetadata(ctx context.Context, req *pb.GetMetadataRequest) (metadata *pb.GetMetadataResponse, err error) {
342342
resp := &pb.GetMetadataResponse{
343343
Id: uuid.NewString(),
344344
ActiveActorsCount: []*pb.ActiveActorsCount{},
@@ -432,7 +432,7 @@ func (s *testDaprServer) UnregisterActorTimer(context.Context, *pb.UnregisterAct
432432
return &empty.Empty{}, nil
433433
}
434434

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

client/metadata.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ import (
55
"errors"
66
"fmt"
77

8-
"google.golang.org/protobuf/types/known/emptypb"
9-
108
pb "github.com/dapr/dapr/pkg/proto/runtime/v1"
119
)
1210

@@ -54,7 +52,7 @@ type MetadataHTTPEndpoint struct {
5452

5553
// GetMetadata returns the metadata of the sidecar
5654
func (c *GRPCClient) GetMetadata(ctx context.Context) (metadata *GetMetadataResponse, err error) {
57-
resp, err := c.protoClient.GetMetadata(ctx, &emptypb.Empty{})
55+
resp, err := c.protoClient.GetMetadata(ctx, &pb.GetMetadataRequest{})
5856
if err != nil {
5957
return nil, fmt.Errorf("error invoking service: %w", err)
6058
}

go.mod

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/dapr/go-sdk
33
go 1.19
44

55
require (
6-
github.com/dapr/dapr v1.12.1-0.20231013174004-b6540a1c464d
6+
github.com/dapr/dapr v1.12.1-0.20231030205344-441017b888c5
77
github.com/go-chi/chi/v5 v5.0.10
88
github.com/golang/mock v1.6.0
99
github.com/golang/protobuf v1.5.3
@@ -18,6 +18,8 @@ require (
1818
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
1919
github.com/kr/text v0.2.0 // indirect
2020
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
21+
go.opentelemetry.io/otel v1.16.0 // indirect
22+
go.opentelemetry.io/otel/trace v1.16.0 // indirect
2123
golang.org/x/net v0.15.0 // indirect
2224
golang.org/x/sys v0.12.0 // indirect
2325
golang.org/x/text v0.13.0 // indirect

go.sum

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
2-
github.com/dapr/dapr v1.12.1-0.20231013174004-b6540a1c464d h1:7cEumjY6oXcXX/wapRB69WMxS+weWMK2Po5+/il5XjY=
3-
github.com/dapr/dapr v1.12.1-0.20231013174004-b6540a1c464d/go.mod h1:zHcMel+UwYnMWfvJwpaDr43p95JteXyvBsSjXNnPU+c=
2+
github.com/dapr/dapr v1.12.1-0.20231030205344-441017b888c5 h1:IlC2/2TemJw3dC1P8DsFZ4/ANl6IojDr50B7B8dIGIk=
3+
github.com/dapr/dapr v1.12.1-0.20231030205344-441017b888c5/go.mod h1:zHcMel+UwYnMWfvJwpaDr43p95JteXyvBsSjXNnPU+c=
44
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
55
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
66
github.com/go-chi/chi/v5 v5.0.10 h1:rLz5avzKpjqxrYwXNfmjkrYYXOyLJd37pz53UFHC6vk=
@@ -25,8 +25,13 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH
2525
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
2626
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
2727
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
28+
go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s=
29+
go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4=
30+
go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs=
31+
go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0=
2832
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
2933
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
34+
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g=
3035
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
3136
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
3237
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=

0 commit comments

Comments
 (0)