diff --git a/.build-tools/go.mod b/.build-tools/go.mod index c8791a897d5..a32f237da36 100644 --- a/.build-tools/go.mod +++ b/.build-tools/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( github.com/google/go-containerregistry v0.11.1-0.20220802162123-c1f9836a4fa9 github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 - github.com/spf13/cobra v1.5.0 + github.com/spf13/cobra v1.7.0 ) require ( @@ -14,7 +14,7 @@ require ( github.com/docker/distribution v2.8.1+incompatible // indirect github.com/docker/docker v20.10.17+incompatible // indirect github.com/docker/docker-credential-helpers v0.6.4 // indirect - github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/klauspost/compress v1.15.8 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect @@ -23,6 +23,6 @@ require ( github.com/sirupsen/logrus v1.9.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/vbatts/tar-split v0.11.2 // indirect - golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect - golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect + golang.org/x/sync v0.3.0 // indirect + golang.org/x/sys v0.10.0 // indirect ) diff --git a/.build-tools/go.sum b/.build-tools/go.sum index 11871a68099..2dc45a0e338 100644 --- a/.build-tools/go.sum +++ b/.build-tools/go.sum @@ -18,8 +18,8 @@ github.com/docker/docker-credential-helpers v0.6.4/go.mod h1:ofX3UI0Gz1TteYBjtgs github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= github.com/google/go-containerregistry v0.11.1-0.20220802162123-c1f9836a4fa9 h1:CUtt5NgbyWugcBKsuZ2MqU9sWtvnn9GlF7E0wCVkN2A= github.com/google/go-containerregistry v0.11.1-0.20220802162123-c1f9836a4fa9/go.mod h1:jKEnAxppqUcGiMBChcvD0yTlWQwbZBitVvUeOaYUUTE= -github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= -github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= +github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/klauspost/compress v1.15.7/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= github.com/klauspost/compress v1.15.8 h1:JahtItbkWjf2jzm/T+qgMxkP9EMHsqEUA6vCMGmXvhA= github.com/klauspost/compress v1.15.8/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= @@ -42,8 +42,8 @@ github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeV github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= -github.com/spf13/cobra v1.5.0 h1:X+jTBEBqF0bHN+9cSMgmfuvv2VHJ9ezmFNf9Y/XstYU= -github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM= +github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= +github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -60,16 +60,17 @@ github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f h1:Ax0t5p6N38Ga0dThY21weqDEyz2oklo4IvDkpigvkD8= -golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= +golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0= diff --git a/go.mod b/go.mod index f40f1bfb3a7..72161fe4e88 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/PuerkitoBio/purell v1.2.0 github.com/argoproj/argo-rollouts v1.4.1 github.com/cenkalti/backoff/v4 v4.2.1 - github.com/dapr/components-contrib v1.11.3-0.20230721142610-9957d6969dda + github.com/dapr/components-contrib v1.11.3-0.20230725200615-9ca07d9bca9d github.com/dapr/kit v0.11.3 github.com/evanphx/json-patch/v5 v5.6.0 github.com/go-chi/chi/v5 v5.0.8 diff --git a/go.sum b/go.sum index cb2dad1f075..1dfcd68afad 100644 --- a/go.sum +++ b/go.sum @@ -386,8 +386,8 @@ github.com/dancannon/gorethink v4.0.0+incompatible h1:KFV7Gha3AuqT+gr0B/eKvGhbjm github.com/dancannon/gorethink v4.0.0+incompatible/go.mod h1:BLvkat9KmZc1efyYwhz3WnybhRZtgF1K929FD8z1avU= github.com/danieljoos/wincred v1.1.2 h1:QLdCxFs1/Yl4zduvBdcHB8goaYk9RARS2SgLLRuAyr0= github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnGqR5Vl2tAx0= -github.com/dapr/components-contrib v1.11.3-0.20230721142610-9957d6969dda h1:/mqw0Y7Y+97Miw7dsU+co72asz7AvU8dfxL/NBVH1VU= -github.com/dapr/components-contrib v1.11.3-0.20230721142610-9957d6969dda/go.mod h1:dNF+ZsfsVwmPFDNkbZgbNv34XszWXCFH3xaSppWSY58= +github.com/dapr/components-contrib v1.11.3-0.20230725200615-9ca07d9bca9d h1:m21ws4yvLi8tieljmNNXPi3FP5wwwHQcBd6n8pZnBjM= +github.com/dapr/components-contrib v1.11.3-0.20230725200615-9ca07d9bca9d/go.mod h1:dNF+ZsfsVwmPFDNkbZgbNv34XszWXCFH3xaSppWSY58= github.com/dapr/kit v0.11.3 h1:u1X92tE8xsrwXIej7nkcI5Z1t1CFznPwlL18tizNEw4= github.com/dapr/kit v0.11.3/go.mod h1:hQA6xOhcLAiccXTj7e3/bzpHwvAJCSCp70p2xg3jB40= github.com/dave/jennifer v1.4.0/go.mod h1:fIb+770HOpJ2fmN9EPPKOqm1vMGhB+TwXKMZhrIygKg= diff --git a/pkg/actors/actors.go b/pkg/actors/actors.go index f1042de8b5e..b8e1034b1e7 100644 --- a/pkg/actors/actors.go +++ b/pkg/actors/actors.go @@ -65,10 +65,11 @@ const ( var ( log = logger.NewLogger("dapr.runtime.actor") - ErrIncompatibleStateStore = errors.New("actor state store does not exist, or does not support transactions which are required to save state - please see https://docs.dapr.io/operations/components/setup-state-store/supported-state-stores/") - ErrDaprResponseHeader = errors.New("error indicated via actor header response") - ErrReminderOpActorNotHosted = errors.New("operations on actor reminders are only possible on hosted actor types") - ErrReminderCanceled = internal.ErrReminderCanceled + ErrIncompatibleStateStore = errors.New("actor state store does not exist, or does not support transactions which are required to save state - please see https://docs.dapr.io/operations/components/setup-state-store/supported-state-stores/") + ErrDaprResponseHeader = errors.New("error indicated via actor header response") + ErrReminderOpActorNotHosted = errors.New("operations on actor reminders are only possible on hosted actor types") + ErrTransactionsTooManyOperations = errors.New("the transaction contains more operations than supported by the state store") + ErrReminderCanceled = internal.ErrReminderCanceled ) // Actors allow calling into virtual actors as well as actor state management. @@ -656,13 +657,19 @@ func (a *actorsRuntime) TransactionalStateOperation(ctx context.Context, req *Tr } func (a *actorsRuntime) executeStateStoreTransaction(ctx context.Context, store internal.TransactionalStateStore, operations []state.TransactionalStateOperation, metadata map[string]string) error { - policyRunner := resiliency.NewRunner[struct{}](ctx, - a.resiliency.ComponentOutboundPolicy(a.storeName, resiliency.Statestore), - ) + if maxMulti, ok := store.(state.TransactionalStoreMultiMaxSize); ok { + max := maxMulti.MultiMaxSize() + if max > 0 && len(operations) > max { + return ErrTransactionsTooManyOperations + } + } stateReq := &state.TransactionalStateRequest{ Operations: operations, Metadata: metadata, } + policyRunner := resiliency.NewRunner[struct{}](ctx, + a.resiliency.ComponentOutboundPolicy(a.storeName, resiliency.Statestore), + ) _, err := policyRunner(func(ctx context.Context) (struct{}, error) { return struct{}{}, store.Multi(ctx, stateReq) }) diff --git a/pkg/actors/actors_test.go b/pkg/actors/actors_test.go index a62c408dd47..ace08f2b6a5 100644 --- a/pkg/actors/actors_test.go +++ b/pkg/actors/actors_test.go @@ -16,6 +16,7 @@ package actors import ( "context" "encoding/json" + "fmt" "strconv" "strings" "testing" @@ -837,6 +838,39 @@ func TestTransactionalState(t *testing.T) { assert.NoError(t, err) }) + t.Run("Too many requests fail", func(t *testing.T) { + testActorsRuntime := newTestActorsRuntime() + defer testActorsRuntime.Stop() + + store, err := testActorsRuntime.stateStore() + require.NoError(t, err) + fakeStore, ok := store.(*daprt.FakeStateStore) + require.True(t, ok) + fakeStore.MaxOperations = 10 + + actorType, actorID := getTestActorTypeAndID() + + fakeCallAndActivateActor(testActorsRuntime, actorType, actorID, testActorsRuntime.clock) + + ops := make([]TransactionalOperation, 20) + for i := 0; i < 20; i++ { + ops[i] = TransactionalOperation{ + Operation: Upsert, + Request: TransactionalUpsert{ + Key: fmt.Sprintf("key%d", i), + Value: "hello", + }, + } + } + err = testActorsRuntime.TransactionalStateOperation(ctx, &TransactionalRequest{ + ActorType: actorType, + ActorID: actorID, + Operations: ops, + }) + assert.Error(t, err) + assert.ErrorIs(t, err, ErrTransactionsTooManyOperations) + }) + t.Run("Wrong request body - should fail", func(t *testing.T) { testActorsRuntime := newTestActorsRuntime() defer testActorsRuntime.Stop() diff --git a/pkg/components/bindings/input_pluggable.go b/pkg/components/bindings/input_pluggable.go index b2d06df93bb..514b9fb0227 100644 --- a/pkg/components/bindings/input_pluggable.go +++ b/pkg/components/bindings/input_pluggable.go @@ -152,12 +152,6 @@ func (b *grpcInputBinding) Close() error { return b.InputBinding.Close() } -// Returns the component metadata options -func (b *grpcInputBinding) GetComponentMetadata() map[string]string { - // GetComponentMetadata does not apply to pluggable components as there is no standard metadata to return - return map[string]string{} -} - // inputFromConnector creates a new GRPC inputbinding using the given underlying connector. func inputFromConnector(l logger.Logger, connector *pluggable.GRPCConnector[proto.InputBindingClient]) *grpcInputBinding { return &grpcInputBinding{ diff --git a/pkg/components/bindings/output_pluggable.go b/pkg/components/bindings/output_pluggable.go index 2b10695f991..03ecc0f3a1e 100644 --- a/pkg/components/bindings/output_pluggable.go +++ b/pkg/components/bindings/output_pluggable.go @@ -90,12 +90,6 @@ func (b *grpcOutputBinding) Invoke(ctx context.Context, req *bindings.InvokeRequ }, nil } -// Returns the component metadata options -func (b *grpcOutputBinding) GetComponentMetadata() map[string]string { - // GetComponentMetadata does not apply to pluggable components as there is no standard metadata to return - return map[string]string{} -} - // outputFromConnector creates a new GRPC outputbinding using the given underlying connector. func outputFromConnector(_ logger.Logger, connector *pluggable.GRPCConnector[proto.OutputBindingClient]) *grpcOutputBinding { return &grpcOutputBinding{ diff --git a/pkg/components/pubsub/pluggable.go b/pkg/components/pubsub/pluggable.go index c1c442fc0f4..8011ad5f625 100644 --- a/pkg/components/pubsub/pluggable.go +++ b/pkg/components/pubsub/pluggable.go @@ -214,12 +214,6 @@ func (p *grpcPubSub) Subscribe(ctx context.Context, req pubsub.SubscribeRequest, return p.pullMessages(ctx, subscription, handler) } -// Returns the component metadata options -func (p *grpcPubSub) GetComponentMetadata() map[string]string { - // GetComponentMetadata does not apply to pluggable components as there is no standard metadata to return - return map[string]string{} -} - // fromConnector creates a new GRPC pubsub using the given underlying connector. func fromConnector(l logger.Logger, connector *pluggable.GRPCConnector[proto.PubSubClient]) *grpcPubSub { return &grpcPubSub{ diff --git a/pkg/components/state/pluggable.go b/pkg/components/state/pluggable.go index de7fe88f781..32748943a9a 100644 --- a/pkg/components/state/pluggable.go +++ b/pkg/components/state/pluggable.go @@ -185,12 +185,6 @@ func (ss *grpcStateStore) Features() []state.Feature { return ss.features } -// Returns the component metadata options -func (ss *grpcStateStore) GetComponentMetadata() map[string]string { - // GetComponentMetadata does not apply to pluggable components as there is no standard metadata to return - return map[string]string{} -} - // Delete performs a delete operation. func (ss *grpcStateStore) Delete(ctx context.Context, req *state.DeleteRequest) error { _, err := ss.Client.Delete(ctx, toDeleteRequest(req)) diff --git a/pkg/grpc/api.go b/pkg/grpc/api.go index d956f3551b6..3048e629ecb 100644 --- a/pkg/grpc/api.go +++ b/pkg/grpc/api.go @@ -909,6 +909,15 @@ func (a *api) ExecuteStateTransaction(ctx context.Context, in *runtimev1pb.Execu } } + if maxMulti, ok := store.(state.TransactionalStoreMultiMaxSize); ok { + max := maxMulti.MultiMaxSize() + if max > 0 && len(operations) > max { + err := messages.ErrStateTooManyTransactionalOp.WithFormat(len(operations), max) + apiServerLogger.Debug(err) + return &emptypb.Empty{}, err + } + } + if encryption.EncryptedStateStore(in.StoreName) { for i, op := range operations { switch req := op.(type) { diff --git a/pkg/grpc/api_test.go b/pkg/grpc/api_test.go index 36fd6ea2ade..ab482eeeb43 100644 --- a/pkg/grpc/api_test.go +++ b/pkg/grpc/api_test.go @@ -40,7 +40,6 @@ import ( "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" "google.golang.org/protobuf/types/known/emptypb" - v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -2682,6 +2681,7 @@ func TestTransactionStateStoreNotImplemented(t *testing.T) { func TestExecuteStateTransaction(t *testing.T) { fakeStore := &daprt.TransactionalStoreMock{} + fakeStore.MaxOperations = 10 matchKeyFn := func(ctx context.Context, req *state.TransactionalStateRequest, key string) bool { if len(req.Operations) == 1 { if rr, ok := req.Operations[0].(state.SetRequest); ok { @@ -2725,6 +2725,17 @@ func TestExecuteStateTransaction(t *testing.T) { client := runtimev1pb.NewDaprClient(clientConn) + tooManyOperations := make([]*runtimev1pb.TransactionalStateOperation, 20) + for i := 0; i < 20; i++ { + tooManyOperations[i] = &runtimev1pb.TransactionalStateOperation{ + OperationType: string(state.OperationUpsert), + Request: &commonv1pb.StateItem{ + Key: fmt.Sprintf("op%d", i), + Value: []byte("1"), + }, + } + } + stateOptions, _ := GenerateStateOptionsTestCase() testCases := []struct { testName string @@ -2732,6 +2743,7 @@ func TestExecuteStateTransaction(t *testing.T) { operation state.OperationType key string value []byte + ops []*runtimev1pb.TransactionalStateOperation options *commonv1pb.StateOptions errorExcepted bool expectedError codes.Code @@ -2769,13 +2781,23 @@ func TestExecuteStateTransaction(t *testing.T) { errorExcepted: true, expectedError: codes.Internal, }, + { + testName: "fails with too many operations", + storeName: "store1", + ops: tooManyOperations, + errorExcepted: true, + expectedError: codes.InvalidArgument, + }, } for _, tt := range testCases { t.Run(tt.testName, func(t *testing.T) { req := &runtimev1pb.ExecuteStateTransactionRequest{ - StoreName: tt.storeName, - Operations: []*runtimev1pb.TransactionalStateOperation{ + StoreName: tt.storeName, + Operations: tt.ops, + } + if tt.ops == nil { + req.Operations = []*runtimev1pb.TransactionalStateOperation{ { OperationType: string(tt.operation), Request: &commonv1pb.StateItem{ @@ -2784,7 +2806,7 @@ func TestExecuteStateTransaction(t *testing.T) { Options: stateOptions, }, }, - }, + } } _, err := client.ExecuteStateTransaction(context.Background(), req) @@ -3749,10 +3771,6 @@ func (m *mockConfigStore) Init(ctx context.Context, metadata configuration.Metad return nil } -func (m *mockConfigStore) GetComponentMetadata() map[string]string { - return map[string]string{} -} - func (m *mockConfigStore) Get(ctx context.Context, req *configuration.GetRequest) (*configuration.GetResponse, error) { items := map[string]*configuration.Item{ "key1": {Value: "val1"}, diff --git a/pkg/http/api.go b/pkg/http/api.go index 023517fb3fb..f0e4ca42b3b 100644 --- a/pkg/http/api.go +++ b/pkg/http/api.go @@ -2153,6 +2153,16 @@ func (a *api) onPostStateTransaction(reqCtx *fasthttp.RequestCtx) { } } + if maxMulti, ok := store.(state.TransactionalStoreMultiMaxSize); ok { + max := maxMulti.MultiMaxSize() + if max > 0 && len(operations) > max { + err := messages.ErrStateTooManyTransactionalOp.WithFormat(len(operations), max) + log.Debug(err) + universalFastHTTPErrorResponder(reqCtx, err) + return + } + } + if encryption.EncryptedStateStore(storeName) { for i, op := range operations { switch req := op.(type) { diff --git a/pkg/http/api_test.go b/pkg/http/api_test.go index 36ff71acc74..2014b4475c7 100644 --- a/pkg/http/api_test.go +++ b/pkg/http/api_test.go @@ -4873,10 +4873,6 @@ func newFakeStateStore() fakeStateStore { return s } -func (c fakeStateStore) GetComponentMetadata() map[string]string { - return map[string]string{} -} - func (c fakeStateStore) Ping() error { return nil } @@ -4937,6 +4933,10 @@ type fakeStateStoreQuerier struct { state.TransactionalStore } +func (c fakeStateStoreQuerier) MultiMaxSize() int { + return 10 +} + func newFakeStateStoreQuerier() fakeStateStoreQuerier { s := newFakeStateStore() return fakeStateStoreQuerier{ @@ -5266,10 +5266,6 @@ func (c *fakeConfigurationStore) Unsubscribe(ctx context.Context, req *configura return nil } -func (c *fakeConfigurationStore) GetComponentMetadata() map[string]string { - return map[string]string{} -} - type fakeLockStore struct{} func (l fakeLockStore) Ping() error { @@ -5336,10 +5332,6 @@ func (l *fakeLockStore) Unlock(ctx context.Context, req *lock.UnlockRequest) (*l }, nil } -func (l *fakeLockStore) GetComponentMetadata() map[string]string { - return map[string]string{} -} - func TestV1HealthzEndpoint(t *testing.T) { fakeServer := newFakeHTTPServer() @@ -5515,6 +5507,32 @@ func TestV1TransactionEndpoints(t *testing.T) { } }) + t.Run("Too many transactions for state store - 400 ERR_MALFORMED_REQUEST", func(t *testing.T) { + apiPath := fmt.Sprintf("v1.0/state/%s/transaction", storeName) + + testTransactionalOperations := make([]stateTransactionRequestBodyOperation, 20) + for i := 0; i < 20; i++ { + testTransactionalOperations[i] = stateTransactionRequestBodyOperation{ + Operation: string(state.OperationUpsert), + Request: map[string]any{ + "key": fmt.Sprintf("key%d", i), + "value": fakeBodyObject, + }, + } + } + + inputBodyBytes, err := json.Marshal(stateTransactionRequestBody{ + Operations: testTransactionalOperations, + }) + + assert.NoError(t, err) + resp := fakeServer.DoRequest("POST", apiPath, inputBodyBytes, nil) + + // assert + assert.Equal(t, gohttp.StatusBadRequest, resp.StatusCode, "Dapr should return 400") + assert.Equal(t, "ERR_STATE_STORE_TOO_MANY_TRANSACTIONS", resp.ErrorBody["errorCode"], apiPath) + }) + t.Run("Non Transactional State Store - 500 ERR_STATE_STORE_NOT_SUPPORTED", func(t *testing.T) { apiPath := fmt.Sprintf("v1.0/state/%s/transaction", nonTransactionalStoreName) testTransactionalOperations := []stateTransactionRequestBodyOperation{ diff --git a/pkg/messages/predefined.go b/pkg/messages/predefined.go index 8cb0431ba71..6661dc6392e 100644 --- a/pkg/messages/predefined.go +++ b/pkg/messages/predefined.go @@ -100,10 +100,11 @@ var ( ErrHealthAppIDNotMatch = APIError{"dapr app-id does not match", "ERR_HEALTH_APPID_NOT_MATCH", http.StatusInternalServerError, grpcCodes.Internal} // State. - ErrStateStoresNotConfigured = APIError{"state store is not configured", "ERR_STATE_STORE_NOT_CONFIGURED", http.StatusInternalServerError, grpcCodes.FailedPrecondition} - ErrStateStoreNotFound = APIError{"state store %s is not found", "ERR_STATE_STORE_NOT_FOUND", http.StatusBadRequest, grpcCodes.InvalidArgument} - ErrStateQueryFailed = APIError{"failed query in state store %s: %s", "ERR_STATE_QUERY", http.StatusInternalServerError, grpcCodes.Internal} - ErrStateQueryUnsupported = APIError{"state store does not support querying", "ERR_STATE_STORE_NOT_SUPPORTED", http.StatusInternalServerError, grpcCodes.Internal} + ErrStateStoresNotConfigured = APIError{"state store is not configured", "ERR_STATE_STORE_NOT_CONFIGURED", http.StatusInternalServerError, grpcCodes.FailedPrecondition} + ErrStateStoreNotFound = APIError{"state store %s is not found", "ERR_STATE_STORE_NOT_FOUND", http.StatusBadRequest, grpcCodes.InvalidArgument} + ErrStateQueryFailed = APIError{"failed query in state store %s: %s", "ERR_STATE_QUERY", http.StatusInternalServerError, grpcCodes.Internal} + ErrStateQueryUnsupported = APIError{"state store does not support querying", "ERR_STATE_STORE_NOT_SUPPORTED", http.StatusInternalServerError, grpcCodes.Internal} + ErrStateTooManyTransactionalOp = APIError{"the transaction contains %d operations, which is more than what the state store supports: %d", "ERR_STATE_STORE_TOO_MANY_TRANSACTIONS", http.StatusBadRequest, grpcCodes.InvalidArgument} // PubSub. ErrPubSubMetadataDeserialize = APIError{"failed deserializing metadata: %v", "ERR_PUBSUB_REQUEST_METADATA", http.StatusBadRequest, grpcCodes.InvalidArgument} diff --git a/pkg/runtime/mock/mock.go b/pkg/runtime/mock/mock.go index 670b66a3c86..ddcaa653e80 100644 --- a/pkg/runtime/mock/mock.go +++ b/pkg/runtime/mock/mock.go @@ -90,7 +90,3 @@ func (b *Binding) Invoke(ctx context.Context, req *bindings.InvokeRequest) (*bin func (b *Binding) Close() error { return b.CloseErr } - -func (b *Binding) GetComponentMetadata() map[string]string { - return b.Metadata -} diff --git a/pkg/runtime/processor/pubsub/bulk_subscriber_test.go b/pkg/runtime/processor/pubsub/bulk_subscriber_test.go index 89f8b8aed1c..d7dd9f629e2 100644 --- a/pkg/runtime/processor/pubsub/bulk_subscriber_test.go +++ b/pkg/runtime/processor/pubsub/bulk_subscriber_test.go @@ -1736,10 +1736,6 @@ func (m *mockSubscribePubSub) BulkSubscribe(ctx context.Context, req contribpubs return nil } -func (m *mockSubscribePubSub) GetComponentMetadata() map[string]string { - return map[string]string{} -} - func (m *mockSubscribePubSub) GetBulkResponse() contribpubsub.BulkSubscribeResponse { return m.bulkReponse } diff --git a/pkg/runtime/processor/pubsub/pubsub_test.go b/pkg/runtime/processor/pubsub/pubsub_test.go index c1aaa4f3223..f30fd4d44d2 100644 --- a/pkg/runtime/processor/pubsub/pubsub_test.go +++ b/pkg/runtime/processor/pubsub/pubsub_test.go @@ -1296,10 +1296,6 @@ func (m *mockPublishPubSub) Features() []contribpubsub.Feature { return nil } -func (m *mockPublishPubSub) GetComponentMetadata() map[string]string { - return map[string]string{} -} - func TestPubsubWithResiliency(t *testing.T) { ps := New(Options{ Registry: registry.New(registry.NewOptions()).PubSubs(), diff --git a/pkg/runtime/runtime_test.go b/pkg/runtime/runtime_test.go index 800d4ad38bd..c143a00b4dc 100644 --- a/pkg/runtime/runtime_test.go +++ b/pkg/runtime/runtime_test.go @@ -2982,10 +2982,6 @@ func (m *MockKubernetesStateStore) Features() []secretstores.Feature { return []secretstores.Feature{} } -func (m MockKubernetesStateStore) GetComponentMetadata() map[string]string { - return nil -} - func NewMockKubernetesStore() secretstores.SecretStore { return &MockKubernetesStateStore{} } diff --git a/pkg/runtime/wfengine/component.go b/pkg/runtime/wfengine/component.go index 02cd3779ef1..f0ec60a2338 100644 --- a/pkg/runtime/wfengine/component.go +++ b/pkg/runtime/wfengine/component.go @@ -254,10 +254,6 @@ func (c *workflowEngineComponent) PurgeWorkflow(ctx context.Context, req *workfl return nil } -func (c *workflowEngineComponent) GetComponentMetadata() map[string]string { - return nil -} - func getStatusString(status int32) string { if statusStr, ok := statusMap[status]; ok { return statusStr diff --git a/pkg/testing/bindings_mock.go b/pkg/testing/bindings_mock.go index afdff189b29..46dd852a8cb 100644 --- a/pkg/testing/bindings_mock.go +++ b/pkg/testing/bindings_mock.go @@ -20,10 +20,6 @@ func (m *MockBinding) Init(ctx context.Context, metadata bindings.Metadata) erro return nil } -func (m *MockBinding) GetComponentMetadata() map[string]string { - return map[string]string{} -} - // Read is a mock read method. func (m *MockBinding) Read(ctx context.Context, handler bindings.Handler) error { args := m.Called(ctx, handler) @@ -69,10 +65,6 @@ func (m *FailingBinding) Init(ctx context.Context, metadata bindings.Metadata) e return nil } -func (m *FailingBinding) GetComponentMetadata() map[string]string { - return map[string]string{} -} - // Invoke is a mock invoke method. func (m *FailingBinding) Invoke(ctx context.Context, req *bindings.InvokeRequest) (*bindings.InvokeResponse, error) { key := string(req.Data) diff --git a/pkg/testing/fake_state_store.go b/pkg/testing/fake_state_store.go index 74267edca15..ec6caf51b6f 100644 --- a/pkg/testing/fake_state_store.go +++ b/pkg/testing/fake_state_store.go @@ -31,8 +31,9 @@ type FakeStateStoreItem struct { } type FakeStateStore struct { - NoLock bool - Items map[string]*FakeStateStoreItem + MaxOperations int + NoLock bool + Items map[string]*FakeStateStoreItem lock sync.RWMutex callCount map[string]*atomic.Uint64 @@ -147,10 +148,6 @@ func (f *FakeStateStore) Set(ctx context.Context, req *state.SetRequest) error { return nil } -func (f *FakeStateStore) GetComponentMetadata() map[string]string { - return map[string]string{} -} - func (f *FakeStateStore) BulkSet(ctx context.Context, req []state.SetRequest, opts state.BulkStoreOpts) error { f.callCount["BulkSet"].Add(1) @@ -209,6 +206,10 @@ func (f *FakeStateStore) CallCount(op string) uint64 { return f.callCount[op].Load() } +func (f *FakeStateStore) MultiMaxSize() int { + return f.MaxOperations +} + // Adapted from https://github.com/dapr/components-contrib/blob/a4b27ae49b7c99820c6e921d3891f03334692714/state/utils/utils.go#L16 func marshal(val interface{}) ([]byte, error) { var err error = nil diff --git a/pkg/testing/lock_mock.go b/pkg/testing/lock_mock.go index 5f5881d65d5..098ddcdcf83 100644 --- a/pkg/testing/lock_mock.go +++ b/pkg/testing/lock_mock.go @@ -71,10 +71,6 @@ func (m *MockStore) Unlock(ctx context.Context, req *lock.UnlockRequest) (*lock. return ret0, ret1 } -func (m *MockStore) GetComponentMetadata() map[string]string { - return map[string]string{} -} - // Unlock indicates an expected call of Unlock. func (mr *MockStoreMockRecorder) Unlock(ctx context.Context, req interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() diff --git a/pkg/testing/nameresolution_mock.go b/pkg/testing/nameresolution_mock.go index 37a20dd27f9..f22261a88b1 100644 --- a/pkg/testing/nameresolution_mock.go +++ b/pkg/testing/nameresolution_mock.go @@ -17,10 +17,6 @@ func (m *MockResolver) Init(metadata nr.Metadata) error { return args.Error(0) } -func (m *MockResolver) GetComponentMetadata() map[string]string { - return map[string]string{} -} - // ResolveID is a mock resolve method. func (m *MockResolver) ResolveID(req nr.ResolveRequest) (string, error) { args := m.Called(req) diff --git a/pkg/testing/pubsub_mock.go b/pkg/testing/pubsub_mock.go index dc7ae2ce883..30d1b4d4690 100644 --- a/pkg/testing/pubsub_mock.go +++ b/pkg/testing/pubsub_mock.go @@ -20,10 +20,6 @@ func (m *MockPubSub) Init(ctx context.Context, metadata pubsub.Metadata) error { return args.Error(0) } -func (m *MockPubSub) GetComponentMetadata() map[string]string { - return map[string]string{} -} - // Publish is a mock publish method. func (m *MockPubSub) Publish(ctx context.Context, req *pubsub.PublishRequest) error { args := m.Called(req) @@ -63,10 +59,6 @@ type FailingPubsub struct { Failure Failure } -func (f *FailingPubsub) GetComponentMetadata() map[string]string { - return map[string]string{} -} - func (f *FailingPubsub) Init(ctx context.Context, metadata pubsub.Metadata) error { return nil } @@ -270,10 +262,6 @@ func (m *InMemoryPubsub) Features() []pubsub.Feature { return nil } -func (m *InMemoryPubsub) GetComponentMetadata() map[string]string { - return map[string]string{} -} - func (m *InMemoryPubsub) SetHandler(h func(topic string, msg *pubsub.NewMessage)) { m.handler = h } diff --git a/pkg/testing/secrets_mock.go b/pkg/testing/secrets_mock.go index e80b870dec0..4ca5c75f13c 100644 --- a/pkg/testing/secrets_mock.go +++ b/pkg/testing/secrets_mock.go @@ -57,10 +57,6 @@ func (c FakeSecretStore) Features() []secretstores.Feature { return []secretstores.Feature{secretstores.FeatureMultipleKeyValuesPerSecret} } -func (c FakeSecretStore) GetComponentMetadata() map[string]string { - return nil -} - type FailingSecretStore struct { Failure Failure } @@ -99,7 +95,3 @@ func (c FailingSecretStore) Close() error { func (c FailingSecretStore) Features() []secretstores.Feature { return []secretstores.Feature{} } - -func (c FailingSecretStore) GetComponentMetadata() map[string]string { - return nil -} diff --git a/pkg/testing/state_mock.go b/pkg/testing/state_mock.go index 055654db2c7..a60a8a51e95 100644 --- a/pkg/testing/state_mock.go +++ b/pkg/testing/state_mock.go @@ -110,10 +110,6 @@ func (_m *MockStateStore) Ping() error { return nil } -func (_m *MockStateStore) GetComponentMetadata() map[string]string { - return map[string]string{} -} - // Set provides a mock function with given fields: req func (_m *MockStateStore) Set(ctx context.Context, req *state.SetRequest) error { ret := _m.Called(ctx, req) @@ -142,10 +138,6 @@ type FailingStatestore struct { BulkFailKey string } -func (f *FailingStatestore) GetComponentMetadata() map[string]string { - return map[string]string{} -} - func (f *FailingStatestore) BulkDelete(ctx context.Context, req []state.DeleteRequest, opts state.BulkStoreOpts) error { for _, val := range req { err := f.Failure.PerformFailure(val.Key) diff --git a/pkg/testing/store_mock.go b/pkg/testing/store_mock.go index a7e4c73f976..99c15faaac0 100644 --- a/pkg/testing/store_mock.go +++ b/pkg/testing/store_mock.go @@ -61,10 +61,6 @@ func (_m *MockConfigurationStore) Init(ctx context.Context, metadata configurati return r0 } -func (_m *MockConfigurationStore) GetComponentMetadata() map[string]string { - return map[string]string{} -} - // Subscribe provides a mock function with given fields: ctx, req, handler func (_m *MockConfigurationStore) Subscribe(ctx context.Context, req *configuration.SubscribeRequest, handler configuration.UpdateHandler) (string, error) { ret := _m.Called(ctx, req, handler) @@ -115,10 +111,6 @@ func (f *FailingConfigurationStore) Init(ctx context.Context, metadata configura return nil } -func (f *FailingConfigurationStore) GetComponentMetadata() map[string]string { - return map[string]string{} -} - func (f *FailingConfigurationStore) Subscribe(ctx context.Context, req *configuration.SubscribeRequest, handler configuration.UpdateHandler) (string, error) { if err := f.Failure.PerformFailure(req.Metadata["key"]); err != nil { return "", err diff --git a/pkg/testing/subtlecrypto_mock.go b/pkg/testing/subtlecrypto_mock.go index 034fe529e49..f40742c1b4d 100644 --- a/pkg/testing/subtlecrypto_mock.go +++ b/pkg/testing/subtlecrypto_mock.go @@ -151,10 +151,6 @@ func (c FakeSubtleCrypto) Features() []contribCrypto.Feature { return []contribCrypto.Feature{} } -func (c FakeSubtleCrypto) GetComponentMetadata() map[string]string { - return nil -} - type FailingSubtleCrypto struct { FakeSubtleCrypto Failure Failure diff --git a/pkg/testing/transactionalstore_mock.go b/pkg/testing/transactionalstore_mock.go index 453e7ec230a..ba407d96142 100644 --- a/pkg/testing/transactionalstore_mock.go +++ b/pkg/testing/transactionalstore_mock.go @@ -20,6 +20,7 @@ import ( ) type TransactionalStoreMock struct { + MaxOperations int MockStateStore } @@ -45,6 +46,10 @@ func (storeMock *TransactionalStoreMock) Close() error { return nil } +func (storeMock *TransactionalStoreMock) MultiMaxSize() int { + return storeMock.MaxOperations +} + func (f *FailingStatestore) Multi(ctx context.Context, request *state.TransactionalStateRequest) error { for _, op := range request.Operations { switch req := op.(type) { diff --git a/pkg/testing/workflow_mock.go b/pkg/testing/workflow_mock.go index 7c9113a8259..0b3e6d0f016 100644 --- a/pkg/testing/workflow_mock.go +++ b/pkg/testing/workflow_mock.go @@ -91,7 +91,3 @@ func (w *MockWorkflow) Purge(ctx context.Context, req *workflowContrib.PurgeRequ } return nil } - -func (w *MockWorkflow) GetComponentMetadata() map[string]string { - return map[string]string{} -} diff --git a/tests/apps/actorload/go.mod b/tests/apps/actorload/go.mod index 803fc8638e9..e3656e09fd4 100644 --- a/tests/apps/actorload/go.mod +++ b/tests/apps/actorload/go.mod @@ -25,6 +25,6 @@ require ( github.com/prometheus/procfs v0.7.3 // indirect go.opentelemetry.io/otel/sdk v1.7.0 // indirect go.opentelemetry.io/otel/trace v1.7.0 // indirect - golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect + golang.org/x/sys v0.10.0 // indirect google.golang.org/protobuf v1.26.0 // indirect ) diff --git a/tests/apps/actorload/go.sum b/tests/apps/actorload/go.sum index 99e986fe02f..ce1ac319331 100644 --- a/tests/apps/actorload/go.sum +++ b/tests/apps/actorload/go.sum @@ -341,8 +341,9 @@ golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= +golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/tests/apps/perf/actor-activation-locker/go.mod b/tests/apps/perf/actor-activation-locker/go.mod index 9040f664d00..11db0a3462c 100644 --- a/tests/apps/perf/actor-activation-locker/go.mod +++ b/tests/apps/perf/actor-activation-locker/go.mod @@ -15,9 +15,9 @@ require ( github.com/golang/protobuf v1.5.2 // indirect github.com/gorilla/mux v1.8.0 // indirect github.com/pkg/errors v0.9.1 // indirect - golang.org/x/net v0.7.0 // indirect - golang.org/x/sys v0.5.0 // indirect - golang.org/x/text v0.7.0 // indirect + golang.org/x/net v0.12.0 // indirect + golang.org/x/sys v0.10.0 // indirect + golang.org/x/text v0.11.0 // indirect google.golang.org/genproto v0.0.0-20220622171453-ea41d75dfa0f // indirect google.golang.org/grpc v1.47.0 // indirect google.golang.org/protobuf v1.28.0 // indirect diff --git a/tests/apps/perf/actor-activation-locker/go.sum b/tests/apps/perf/actor-activation-locker/go.sum index fcc0da7ef8e..899e474b2e2 100644 --- a/tests/apps/perf/actor-activation-locker/go.sum +++ b/tests/apps/perf/actor-activation-locker/go.sum @@ -93,8 +93,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= -golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= +golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -110,14 +110,14 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= +golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= +golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= diff --git a/tests/apps/perf/service_invocation_grpc/go.mod b/tests/apps/perf/service_invocation_grpc/go.mod index 45f3ca8e7dc..c7042e29c45 100644 --- a/tests/apps/perf/service_invocation_grpc/go.mod +++ b/tests/apps/perf/service_invocation_grpc/go.mod @@ -6,11 +6,11 @@ require github.com/dapr/go-sdk v1.3.1 require ( github.com/dapr/dapr v1.6.0 // indirect - github.com/golang/protobuf v1.5.2 // indirect + github.com/golang/protobuf v1.5.3 // indirect github.com/pkg/errors v0.9.1 // indirect - golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect - golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac // indirect - golang.org/x/text v0.3.7 // indirect + golang.org/x/net v0.12.0 // indirect + golang.org/x/sys v0.10.0 // indirect + golang.org/x/text v0.11.0 // indirect google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2 // indirect google.golang.org/grpc v1.40.0 // indirect google.golang.org/protobuf v1.27.1 // indirect diff --git a/tests/apps/perf/service_invocation_grpc/go.sum b/tests/apps/perf/service_invocation_grpc/go.sum index 5480fbfb41d..d84b78852cb 100644 --- a/tests/apps/perf/service_invocation_grpc/go.sum +++ b/tests/apps/perf/service_invocation_grpc/go.sum @@ -36,8 +36,9 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -78,8 +79,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210825183410-e898025ed96a h1:bRuuGXV8wwSdGTB+CtJf+FjgO1APK1CoO39T4BN/XBw= -golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= +golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -94,14 +95,14 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac h1:oN6lz7iLW/YC7un8pq+9bOLyXrprv2+DKfkJY+2LJJw= -golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= +golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= +golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= diff --git a/tests/apps/pluggable_kafka-bindings/go.mod b/tests/apps/pluggable_kafka-bindings/go.mod index bbfec0dfbe0..c26784a95c4 100644 --- a/tests/apps/pluggable_kafka-bindings/go.mod +++ b/tests/apps/pluggable_kafka-bindings/go.mod @@ -16,7 +16,7 @@ require ( github.com/eapache/go-resiliency v1.3.0 // indirect github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect github.com/eapache/queue v1.1.0 // indirect - github.com/golang/protobuf v1.5.2 // indirect + github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/uuid v1.3.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect @@ -36,13 +36,13 @@ require ( github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.1 // indirect github.com/xdg-go/stringprep v1.0.3 // indirect - golang.org/x/crypto v0.1.0 // indirect - golang.org/x/net v0.4.0 // indirect - golang.org/x/oauth2 v0.1.0 // indirect - golang.org/x/sys v0.3.0 // indirect - golang.org/x/text v0.5.0 // indirect + golang.org/x/crypto v0.11.0 // indirect + golang.org/x/net v0.12.0 // indirect + golang.org/x/oauth2 v0.10.0 // indirect + golang.org/x/sys v0.10.0 // indirect + golang.org/x/text v0.11.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20221207170731-23e4bf6bdc37 // indirect google.golang.org/grpc v1.51.0 // indirect - google.golang.org/protobuf v1.28.1 // indirect + google.golang.org/protobuf v1.31.0 // indirect ) diff --git a/tests/apps/pluggable_kafka-bindings/go.sum b/tests/apps/pluggable_kafka-bindings/go.sum index 0b32c609780..dfbf49e6327 100644 --- a/tests/apps/pluggable_kafka-bindings/go.sum +++ b/tests/apps/pluggable_kafka-bindings/go.sum @@ -23,8 +23,8 @@ github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFP github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= @@ -82,17 +82,17 @@ github.com/xdg-go/stringprep v1.0.3 h1:kdwGpVNwPFtjs98xCGkHjQtGKh86rDcRZN17QEMCO github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU= -golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= +golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA= +golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= golang.org/x/exp v0.0.0-20221028150844-83b7d23a625f h1:Al51T6tzvuh3oiwX11vex3QgJ2XTedFPGmbEVh8cdoc= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220725212005-46097bf591d3/go.mod h1:AaygXjzTFtRAg2ttMY5RMuhpJ3cNnI0XpyFJD1iQRSM= -golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU= -golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= -golang.org/x/oauth2 v0.1.0 h1:isLCZuhj4v+tYv7eskaN4v/TM+A1begWWgyVJDdl1+Y= -golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A= +golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= +golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= +golang.org/x/oauth2 v0.10.0 h1:zHCpF2Khkwy4mMB4bv0U37YtJdTGW8jI0glAApi0Kh8= +golang.org/x/oauth2 v0.10.0/go.mod h1:kTpgurOux7LqtuxjuyZa4Gj2gdezIt/jQtGnNFfypQI= golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -100,16 +100,16 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ= -golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= +golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM= -golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= +golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= @@ -120,8 +120,8 @@ google.golang.org/grpc v1.51.0 h1:E1eGv1FTqoLIdnBCZufiSHgKjlqG6fKFf6pPWtMTh8U= google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= -google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/tests/apps/pluggable_redis-pubsub/go.mod b/tests/apps/pluggable_redis-pubsub/go.mod index b5e956aff83..dc06a05197d 100644 --- a/tests/apps/pluggable_redis-pubsub/go.mod +++ b/tests/apps/pluggable_redis-pubsub/go.mod @@ -18,9 +18,9 @@ require ( github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/sirupsen/logrus v1.9.0 // indirect - golang.org/x/net v0.4.0 // indirect - golang.org/x/sys v0.3.0 // indirect - golang.org/x/text v0.5.0 // indirect + golang.org/x/net v0.12.0 // indirect + golang.org/x/sys v0.10.0 // indirect + golang.org/x/text v0.11.0 // indirect google.golang.org/genproto v0.0.0-20221207170731-23e4bf6bdc37 // indirect google.golang.org/grpc v1.51.0 // indirect google.golang.org/protobuf v1.28.1 // indirect diff --git a/tests/apps/pluggable_redis-pubsub/go.sum b/tests/apps/pluggable_redis-pubsub/go.sum index d8225721814..a8b9be231e4 100644 --- a/tests/apps/pluggable_redis-pubsub/go.sum +++ b/tests/apps/pluggable_redis-pubsub/go.sum @@ -38,13 +38,13 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= golang.org/x/exp v0.0.0-20221028150844-83b7d23a625f h1:Al51T6tzvuh3oiwX11vex3QgJ2XTedFPGmbEVh8cdoc= -golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU= -golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= +golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= +golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ= -golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM= -golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= +golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= +golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto v0.0.0-20221207170731-23e4bf6bdc37 h1:jmIfw8+gSvXcZSgaFAGyInDXeWzUhvYH57G/5GKMn70= google.golang.org/genproto v0.0.0-20221207170731-23e4bf6bdc37/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= diff --git a/tests/apps/pluggable_redis-statestore/go.mod b/tests/apps/pluggable_redis-statestore/go.mod index 970d37d45ca..4cf4a814034 100644 --- a/tests/apps/pluggable_redis-statestore/go.mod +++ b/tests/apps/pluggable_redis-statestore/go.mod @@ -21,9 +21,9 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/sirupsen/logrus v1.9.0 // indirect - golang.org/x/net v0.4.0 // indirect - golang.org/x/sys v0.3.0 // indirect - golang.org/x/text v0.5.0 // indirect + golang.org/x/net v0.12.0 // indirect + golang.org/x/sys v0.10.0 // indirect + golang.org/x/text v0.11.0 // indirect google.golang.org/genproto v0.0.0-20221207170731-23e4bf6bdc37 // indirect google.golang.org/grpc v1.51.0 // indirect google.golang.org/protobuf v1.28.1 // indirect diff --git a/tests/apps/pluggable_redis-statestore/go.sum b/tests/apps/pluggable_redis-statestore/go.sum index 7333217217a..9f7b0126a65 100644 --- a/tests/apps/pluggable_redis-statestore/go.sum +++ b/tests/apps/pluggable_redis-statestore/go.sum @@ -50,13 +50,13 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/yuin/gopher-lua v0.0.0-20210529063254-f4c35e4016d9 h1:k/gmLsJDWwWqbLCur2yWnJzwQEKRcAHXo6seXGuSwWw= golang.org/x/exp v0.0.0-20221028150844-83b7d23a625f h1:Al51T6tzvuh3oiwX11vex3QgJ2XTedFPGmbEVh8cdoc= -golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU= -golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= +golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= +golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ= -golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM= -golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= +golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= +golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto v0.0.0-20221207170731-23e4bf6bdc37 h1:jmIfw8+gSvXcZSgaFAGyInDXeWzUhvYH57G/5GKMn70= google.golang.org/genproto v0.0.0-20221207170731-23e4bf6bdc37/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= diff --git a/tests/apps/service_invocation_grpc_proxy_server/go.mod b/tests/apps/service_invocation_grpc_proxy_server/go.mod index b0a13e4e456..290bc4c55cc 100644 --- a/tests/apps/service_invocation_grpc_proxy_server/go.mod +++ b/tests/apps/service_invocation_grpc_proxy_server/go.mod @@ -9,9 +9,9 @@ require ( require ( github.com/golang/protobuf v1.5.3 // indirect - golang.org/x/net v0.8.0 // indirect - golang.org/x/sys v0.6.0 // indirect - golang.org/x/text v0.8.0 // indirect + golang.org/x/net v0.12.0 // indirect + golang.org/x/sys v0.10.0 // indirect + golang.org/x/text v0.11.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230626202813-9b080da550b3 // indirect google.golang.org/protobuf v1.30.0 // indirect ) diff --git a/tests/apps/service_invocation_grpc_proxy_server/go.sum b/tests/apps/service_invocation_grpc_proxy_server/go.sum index 7b0a4aa2d73..95271178806 100644 --- a/tests/apps/service_invocation_grpc_proxy_server/go.sum +++ b/tests/apps/service_invocation_grpc_proxy_server/go.sum @@ -46,8 +46,8 @@ golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= -golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= +golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= +golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -56,11 +56,11 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= -golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= +golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68= -golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= +golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=