From fbf5a15f5511870c496f8faf641344513948fd10 Mon Sep 17 00:00:00 2001 From: Bernd Verst Date: Tue, 30 Apr 2024 16:10:49 -0700 Subject: [PATCH 1/5] Update dapr/kit to the same version used in runtime Signed-off-by: Bernd Verst --- .build-tools/go.mod | 2 +- .build-tools/go.sum | 4 +- 3346.patch | 76 +++++++++++++++++++++++++++++++ go.mod | 2 +- go.sum | 4 +- tests/certification/go.mod | 2 +- tests/certification/go.sum | 4 +- tests/e2e/pubsub/jetstream/go.mod | 2 +- tests/e2e/pubsub/jetstream/go.sum | 4 +- 9 files changed, 88 insertions(+), 12 deletions(-) create mode 100644 3346.patch diff --git a/.build-tools/go.mod b/.build-tools/go.mod index b218215b9c..a9a023d901 100644 --- a/.build-tools/go.mod +++ b/.build-tools/go.mod @@ -14,7 +14,7 @@ require ( ) require ( - github.com/dapr/kit v0.13.1-0.20240306152601-e33fbab74548 // indirect + github.com/dapr/kit v0.13.1-0.20240402103809-0c7cfce53d9e // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0 // indirect github.com/inconshreveable/mousetrap v1.0.1 // indirect diff --git a/.build-tools/go.sum b/.build-tools/go.sum index 06a3963c3c..9b08233839 100644 --- a/.build-tools/go.sum +++ b/.build-tools/go.sum @@ -1,6 +1,6 @@ github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/dapr/kit v0.13.1-0.20240306152601-e33fbab74548 h1:rh6cYZ/2nnufSAhnz+fwmsyNWljt0uyxmfIcG6t499I= -github.com/dapr/kit v0.13.1-0.20240306152601-e33fbab74548/go.mod h1:dons8V2bF6MPR2yFdxtTa86PfaE7EJtKAOkZ9hOavBQ= +github.com/dapr/kit v0.13.1-0.20240402103809-0c7cfce53d9e h1:mLvqfGuppb6uhsijmwTlF5sZVtGvig+Ua5ESKF17SxA= +github.com/dapr/kit v0.13.1-0.20240402103809-0c7cfce53d9e/go.mod h1:dons8V2bF6MPR2yFdxtTa86PfaE7EJtKAOkZ9hOavBQ= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/3346.patch b/3346.patch new file mode 100644 index 0000000000..20761807e2 --- /dev/null +++ b/3346.patch @@ -0,0 +1,76 @@ +From 873c147aef366bdcb9a5049521fedf622fd91340 Mon Sep 17 00:00:00 2001 +From: Bernd Verst +Date: Thu, 8 Feb 2024 13:11:56 -0800 +Subject: [PATCH] Recover interrupted eventhubs subscriptions (#3344) + +Signed-off-by: Bernd Verst +--- + .../component/azure/eventhubs/eventhubs.go | 39 +++++++++++++++---- + 1 file changed, 32 insertions(+), 7 deletions(-) + +diff --git a/internal/component/azure/eventhubs/eventhubs.go b/internal/component/azure/eventhubs/eventhubs.go +index b0e7c47376..854b459cca 100644 +--- a/internal/component/azure/eventhubs/eventhubs.go ++++ b/internal/component/azure/eventhubs/eventhubs.go +@@ -309,13 +309,16 @@ func (aeh *AzureEventHubs) Subscribe(subscribeCtx context.Context, config Subscr + Handler: retryHandler, + } + ++ subscriptionLoopFinished := make(chan bool, 1) ++ + // Process all partition clients as they come in +- go func() { ++ subscriberLoop := func() { + for { + // This will block until a new partition client is available + // It returns nil if processor.Run terminates or if the context is canceled + partitionClient := processor.NextPartitionClient(subscribeCtx) + if partitionClient == nil { ++ subscriptionLoopFinished <- true + return + } + aeh.logger.Debugf("Received client for partition %s", partitionClient.PartitionID()) +@@ -329,15 +332,37 @@ func (aeh *AzureEventHubs) Subscribe(subscribeCtx context.Context, config Subscr + } + }() + } +- }() ++ } + + // Start the processor + go func() { +- // This is a blocking call that runs until the context is canceled +- err = processor.Run(subscribeCtx) +- // Do not log context.Canceled which happens at shutdown +- if err != nil && !errors.Is(err, context.Canceled) { +- aeh.logger.Errorf("Error from event processor: %v", err) ++ for { ++ go subscriberLoop() ++ // This is a blocking call that runs until the context is canceled ++ err = processor.Run(subscribeCtx) ++ // Exit if the context is canceled ++ if err != nil && errors.Is(err, context.Canceled) { ++ return ++ } ++ if err != nil { ++ aeh.logger.Errorf("Error from event processor: %v", err) ++ } else { ++ aeh.logger.Debugf("Event processor terminated without error") ++ } ++ // wait for subscription loop finished signal ++ select { ++ case <-subscribeCtx.Done(): ++ return ++ case <-subscriptionLoopFinished: ++ // noop ++ } ++ // Waiting here is not strictly necessary, however, we will wait for a short time to increase the likelihood of transient errors having disappeared ++ select { ++ case <-subscribeCtx.Done(): ++ return ++ case <-time.After(5 * time.Second): ++ // noop - continue the for loop ++ } + } + }() + diff --git a/go.mod b/go.mod index a017191020..5b0f3649bb 100644 --- a/go.mod +++ b/go.mod @@ -55,7 +55,7 @@ require ( github.com/cloudwego/kitex-examples v0.1.1 github.com/cyphar/filepath-securejoin v0.2.4 github.com/dancannon/gorethink v4.0.0+incompatible - github.com/dapr/kit v0.13.1-0.20240306152601-e33fbab74548 + github.com/dapr/kit v0.13.1-0.20240402103809-0c7cfce53d9e github.com/didip/tollbooth/v7 v7.0.1 github.com/eclipse/paho.mqtt.golang v1.4.3 github.com/fasthttp-contrib/sessions v0.0.0-20160905201309-74f6ac73d5d5 diff --git a/go.sum b/go.sum index 731adac175..156839c328 100644 --- a/go.sum +++ b/go.sum @@ -452,8 +452,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/kit v0.13.1-0.20240306152601-e33fbab74548 h1:rh6cYZ/2nnufSAhnz+fwmsyNWljt0uyxmfIcG6t499I= -github.com/dapr/kit v0.13.1-0.20240306152601-e33fbab74548/go.mod h1:dons8V2bF6MPR2yFdxtTa86PfaE7EJtKAOkZ9hOavBQ= +github.com/dapr/kit v0.13.1-0.20240402103809-0c7cfce53d9e h1:mLvqfGuppb6uhsijmwTlF5sZVtGvig+Ua5ESKF17SxA= +github.com/dapr/kit v0.13.1-0.20240402103809-0c7cfce53d9e/go.mod h1:dons8V2bF6MPR2yFdxtTa86PfaE7EJtKAOkZ9hOavBQ= github.com/dave/jennifer v1.4.0/go.mod h1:fIb+770HOpJ2fmN9EPPKOqm1vMGhB+TwXKMZhrIygKg= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/tests/certification/go.mod b/tests/certification/go.mod index 5b561db661..c54bbd3f26 100644 --- a/tests/certification/go.mod +++ b/tests/certification/go.mod @@ -22,7 +22,7 @@ require ( github.com/dapr/components-contrib v1.13.0-rc.10 github.com/dapr/dapr v1.13.0 github.com/dapr/go-sdk v1.10.1 - github.com/dapr/kit v0.13.1-0.20240306152601-e33fbab74548 + github.com/dapr/kit v0.13.1-0.20240402103809-0c7cfce53d9e github.com/eclipse/paho.mqtt.golang v1.4.3 github.com/go-chi/chi/v5 v5.0.12 github.com/go-redis/redis/v8 v8.11.5 diff --git a/tests/certification/go.sum b/tests/certification/go.sum index 51443da93c..d8f48a07d9 100644 --- a/tests/certification/go.sum +++ b/tests/certification/go.sum @@ -394,8 +394,8 @@ github.com/dapr/dapr v1.13.0 h1:yExu47iCyqBSghAGVjgVjica4NfFd0dVlPXQTpQWR98= github.com/dapr/dapr v1.13.0/go.mod h1:VFjFGrLb84k5pjmWNn9reI5D28OQifdUbBdymXxbZDc= github.com/dapr/go-sdk v1.10.1 h1:g6mM2RXyGkrzsqWFfCy8rw+UAt1edQEgRaQXT+XP4PE= github.com/dapr/go-sdk v1.10.1/go.mod h1:lPjyF/xubh35fbdNdKkxBbFxFNCmta4zmvsk0JxuUG0= -github.com/dapr/kit v0.13.1-0.20240306152601-e33fbab74548 h1:rh6cYZ/2nnufSAhnz+fwmsyNWljt0uyxmfIcG6t499I= -github.com/dapr/kit v0.13.1-0.20240306152601-e33fbab74548/go.mod h1:dons8V2bF6MPR2yFdxtTa86PfaE7EJtKAOkZ9hOavBQ= +github.com/dapr/kit v0.13.1-0.20240402103809-0c7cfce53d9e h1:mLvqfGuppb6uhsijmwTlF5sZVtGvig+Ua5ESKF17SxA= +github.com/dapr/kit v0.13.1-0.20240402103809-0c7cfce53d9e/go.mod h1:dons8V2bF6MPR2yFdxtTa86PfaE7EJtKAOkZ9hOavBQ= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= diff --git a/tests/e2e/pubsub/jetstream/go.mod b/tests/e2e/pubsub/jetstream/go.mod index 04c483642b..94e7c08601 100644 --- a/tests/e2e/pubsub/jetstream/go.mod +++ b/tests/e2e/pubsub/jetstream/go.mod @@ -6,7 +6,7 @@ toolchain go1.22.2 require ( github.com/dapr/components-contrib v1.10.6-0.20230403162214-9ee9d56cb7ea - github.com/dapr/kit v0.13.1-0.20240306152601-e33fbab74548 + github.com/dapr/kit v0.13.1-0.20240402103809-0c7cfce53d9e ) require ( diff --git a/tests/e2e/pubsub/jetstream/go.sum b/tests/e2e/pubsub/jetstream/go.sum index cfc201192a..be7ae3a4a2 100644 --- a/tests/e2e/pubsub/jetstream/go.sum +++ b/tests/e2e/pubsub/jetstream/go.sum @@ -4,8 +4,8 @@ github.com/cloudevents/sdk-go/binding/format/protobuf/v2 v2.14.0 h1:dEopBSOSjB5f github.com/cloudevents/sdk-go/binding/format/protobuf/v2 v2.14.0/go.mod h1:qDSbb0fgIfFNjZrNTPtS5MOMScAGyQtn1KlSvoOdqYw= github.com/cloudevents/sdk-go/v2 v2.14.0 h1:Nrob4FwVgi5L4tV9lhjzZcjYqFVyJzsA56CwPaPfv6s= github.com/cloudevents/sdk-go/v2 v2.14.0/go.mod h1:xDmKfzNjM8gBvjaF8ijFjM1VYOVUEeUfapHMUX1T5To= -github.com/dapr/kit v0.13.1-0.20240306152601-e33fbab74548 h1:rh6cYZ/2nnufSAhnz+fwmsyNWljt0uyxmfIcG6t499I= -github.com/dapr/kit v0.13.1-0.20240306152601-e33fbab74548/go.mod h1:dons8V2bF6MPR2yFdxtTa86PfaE7EJtKAOkZ9hOavBQ= +github.com/dapr/kit v0.13.1-0.20240402103809-0c7cfce53d9e h1:mLvqfGuppb6uhsijmwTlF5sZVtGvig+Ua5ESKF17SxA= +github.com/dapr/kit v0.13.1-0.20240402103809-0c7cfce53d9e/go.mod h1:dons8V2bF6MPR2yFdxtTa86PfaE7EJtKAOkZ9hOavBQ= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= From 49c6ad776537b8959f67f5c42c44bdf0a4331780 Mon Sep 17 00:00:00 2001 From: Samantha Coyle Date: Mon, 6 May 2024 10:24:53 -0500 Subject: [PATCH 2/5] fix: update capitalization on metadata field Signed-off-by: Samantha Coyle --- bindings/azure/eventhubs/metadata.yaml | 6 +++--- pubsub/azure/eventhubs/metadata.yaml | 2 +- pubsub/rabbitmq/rabbitmq.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bindings/azure/eventhubs/metadata.yaml b/bindings/azure/eventhubs/metadata.yaml index f6250ce69d..439fc5a9e6 100644 --- a/bindings/azure/eventhubs/metadata.yaml +++ b/bindings/azure/eventhubs/metadata.yaml @@ -90,8 +90,8 @@ builtinAuthenticationProfiles: entity management is enabled. metadata: # Input-only metadata - # consumerGroup is an alias for consumerId, if both are defined consumerId takes precedence. - - name: consumerId + # consumerGroup is an alias for consumerID, if both are defined consumerID takes precedence. + - name: consumerID type: string required: true # consumerGroup is an alias for this field, let's promote this to default binding: @@ -108,7 +108,7 @@ metadata: output: false description: | The name of the Event Hubs Consumer Group to listen on. - Alias to consumerId. + Alias to consumerID. example: '"group1"' deprecated: true - name: storageAccountKey diff --git a/pubsub/azure/eventhubs/metadata.yaml b/pubsub/azure/eventhubs/metadata.yaml index b9cd436f24..768d472252 100644 --- a/pubsub/azure/eventhubs/metadata.yaml +++ b/pubsub/azure/eventhubs/metadata.yaml @@ -97,7 +97,7 @@ metadata: description: | Storage container name. example: '"myeventhubstoragecontainer"' - - name: consumerId + - name: consumerID type: string required: true # consumerGroup is an alias for this field, let's promote this to default description: | diff --git a/pubsub/rabbitmq/rabbitmq.go b/pubsub/rabbitmq/rabbitmq.go index 63d6e080f7..854ba098c7 100644 --- a/pubsub/rabbitmq/rabbitmq.go +++ b/pubsub/rabbitmq/rabbitmq.go @@ -521,7 +521,7 @@ func (r *rabbitMQ) subscribeForever(ctx context.Context, req pubsub.SubscribeReq msgs, err = channel.Consume( q.Name, - queueName, // consumerId + queueName, // consumerID r.metadata.AutoAck, // autoAck false, // exclusive false, // noLocal From 3d132536b46fa2a06291aa298132c41344a08d62 Mon Sep 17 00:00:00 2001 From: Samantha Coyle Date: Wed, 15 May 2024 13:33:10 -0500 Subject: [PATCH 3/5] style: clean up random patch Signed-off-by: Samantha Coyle --- 3346.patch | 76 ------------------------------------------------------ 1 file changed, 76 deletions(-) delete mode 100644 3346.patch diff --git a/3346.patch b/3346.patch deleted file mode 100644 index 20761807e2..0000000000 --- a/3346.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 873c147aef366bdcb9a5049521fedf622fd91340 Mon Sep 17 00:00:00 2001 -From: Bernd Verst -Date: Thu, 8 Feb 2024 13:11:56 -0800 -Subject: [PATCH] Recover interrupted eventhubs subscriptions (#3344) - -Signed-off-by: Bernd Verst ---- - .../component/azure/eventhubs/eventhubs.go | 39 +++++++++++++++---- - 1 file changed, 32 insertions(+), 7 deletions(-) - -diff --git a/internal/component/azure/eventhubs/eventhubs.go b/internal/component/azure/eventhubs/eventhubs.go -index b0e7c47376..854b459cca 100644 ---- a/internal/component/azure/eventhubs/eventhubs.go -+++ b/internal/component/azure/eventhubs/eventhubs.go -@@ -309,13 +309,16 @@ func (aeh *AzureEventHubs) Subscribe(subscribeCtx context.Context, config Subscr - Handler: retryHandler, - } - -+ subscriptionLoopFinished := make(chan bool, 1) -+ - // Process all partition clients as they come in -- go func() { -+ subscriberLoop := func() { - for { - // This will block until a new partition client is available - // It returns nil if processor.Run terminates or if the context is canceled - partitionClient := processor.NextPartitionClient(subscribeCtx) - if partitionClient == nil { -+ subscriptionLoopFinished <- true - return - } - aeh.logger.Debugf("Received client for partition %s", partitionClient.PartitionID()) -@@ -329,15 +332,37 @@ func (aeh *AzureEventHubs) Subscribe(subscribeCtx context.Context, config Subscr - } - }() - } -- }() -+ } - - // Start the processor - go func() { -- // This is a blocking call that runs until the context is canceled -- err = processor.Run(subscribeCtx) -- // Do not log context.Canceled which happens at shutdown -- if err != nil && !errors.Is(err, context.Canceled) { -- aeh.logger.Errorf("Error from event processor: %v", err) -+ for { -+ go subscriberLoop() -+ // This is a blocking call that runs until the context is canceled -+ err = processor.Run(subscribeCtx) -+ // Exit if the context is canceled -+ if err != nil && errors.Is(err, context.Canceled) { -+ return -+ } -+ if err != nil { -+ aeh.logger.Errorf("Error from event processor: %v", err) -+ } else { -+ aeh.logger.Debugf("Event processor terminated without error") -+ } -+ // wait for subscription loop finished signal -+ select { -+ case <-subscribeCtx.Done(): -+ return -+ case <-subscriptionLoopFinished: -+ // noop -+ } -+ // Waiting here is not strictly necessary, however, we will wait for a short time to increase the likelihood of transient errors having disappeared -+ select { -+ case <-subscribeCtx.Done(): -+ return -+ case <-time.After(5 * time.Second): -+ // noop - continue the for loop -+ } - } - }() - From 1106410e5ead60db39ec23311012898018663f2c Mon Sep 17 00:00:00 2001 From: Samantha Coyle Date: Wed, 15 May 2024 13:42:16 -0500 Subject: [PATCH 4/5] fix: rm other changes Signed-off-by: Samantha Coyle --- go.mod | 2 +- go.sum | 4 ++-- tests/certification/go.mod | 2 +- tests/certification/go.sum | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 197c12cf8c..9971cd6243 100644 --- a/go.mod +++ b/go.mod @@ -55,7 +55,7 @@ require ( github.com/cloudwego/kitex-examples v0.1.1 github.com/cyphar/filepath-securejoin v0.2.4 github.com/dancannon/gorethink v4.0.0+incompatible - github.com/dapr/kit v0.13.1-0.20240402103809-0c7cfce53d9e + github.com/dapr/kit v0.13.1-0.20240306152601-e33fbab74548 github.com/didip/tollbooth/v7 v7.0.1 github.com/eclipse/paho.mqtt.golang v1.4.3 github.com/fasthttp-contrib/sessions v0.0.0-20160905201309-74f6ac73d5d5 diff --git a/go.sum b/go.sum index b80d6a10af..625d76f2ce 100644 --- a/go.sum +++ b/go.sum @@ -452,8 +452,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/kit v0.13.1-0.20240402103809-0c7cfce53d9e h1:mLvqfGuppb6uhsijmwTlF5sZVtGvig+Ua5ESKF17SxA= -github.com/dapr/kit v0.13.1-0.20240402103809-0c7cfce53d9e/go.mod h1:dons8V2bF6MPR2yFdxtTa86PfaE7EJtKAOkZ9hOavBQ= +github.com/dapr/kit v0.13.1-0.20240306152601-e33fbab74548 h1:rh6cYZ/2nnufSAhnz+fwmsyNWljt0uyxmfIcG6t499I= +github.com/dapr/kit v0.13.1-0.20240306152601-e33fbab74548/go.mod h1:dons8V2bF6MPR2yFdxtTa86PfaE7EJtKAOkZ9hOavBQ= github.com/dave/jennifer v1.4.0/go.mod h1:fIb+770HOpJ2fmN9EPPKOqm1vMGhB+TwXKMZhrIygKg= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/tests/certification/go.mod b/tests/certification/go.mod index 2bf95e6a27..b476bdd656 100644 --- a/tests/certification/go.mod +++ b/tests/certification/go.mod @@ -22,7 +22,7 @@ require ( github.com/dapr/components-contrib v1.13.0-rc.10 github.com/dapr/dapr v1.13.0 github.com/dapr/go-sdk v1.10.1 - github.com/dapr/kit v0.13.1-0.20240402103809-0c7cfce53d9e + github.com/dapr/kit v0.13.1-0.20240306152601-e33fbab74548 github.com/eclipse/paho.mqtt.golang v1.4.3 github.com/go-chi/chi/v5 v5.0.12 github.com/go-redis/redis/v8 v8.11.5 diff --git a/tests/certification/go.sum b/tests/certification/go.sum index 494d50641f..d2802e20ef 100644 --- a/tests/certification/go.sum +++ b/tests/certification/go.sum @@ -394,8 +394,8 @@ github.com/dapr/dapr v1.13.0 h1:yExu47iCyqBSghAGVjgVjica4NfFd0dVlPXQTpQWR98= github.com/dapr/dapr v1.13.0/go.mod h1:VFjFGrLb84k5pjmWNn9reI5D28OQifdUbBdymXxbZDc= github.com/dapr/go-sdk v1.10.1 h1:g6mM2RXyGkrzsqWFfCy8rw+UAt1edQEgRaQXT+XP4PE= github.com/dapr/go-sdk v1.10.1/go.mod h1:lPjyF/xubh35fbdNdKkxBbFxFNCmta4zmvsk0JxuUG0= -github.com/dapr/kit v0.13.1-0.20240402103809-0c7cfce53d9e h1:mLvqfGuppb6uhsijmwTlF5sZVtGvig+Ua5ESKF17SxA= -github.com/dapr/kit v0.13.1-0.20240402103809-0c7cfce53d9e/go.mod h1:dons8V2bF6MPR2yFdxtTa86PfaE7EJtKAOkZ9hOavBQ= +github.com/dapr/kit v0.13.1-0.20240306152601-e33fbab74548 h1:rh6cYZ/2nnufSAhnz+fwmsyNWljt0uyxmfIcG6t499I= +github.com/dapr/kit v0.13.1-0.20240306152601-e33fbab74548/go.mod h1:dons8V2bF6MPR2yFdxtTa86PfaE7EJtKAOkZ9hOavBQ= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= From 7fa74fae0f41c2117154053a4991fa2598f97e22 Mon Sep 17 00:00:00 2001 From: Samantha Coyle Date: Wed, 15 May 2024 13:43:54 -0500 Subject: [PATCH 5/5] fix: rm other changes in dependencies Signed-off-by: Samantha Coyle --- .build-tools/go.mod | 2 +- .build-tools/go.sum | 4 ++-- tests/e2e/pubsub/jetstream/go.mod | 2 +- tests/e2e/pubsub/jetstream/go.sum | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.build-tools/go.mod b/.build-tools/go.mod index a9a023d901..b218215b9c 100644 --- a/.build-tools/go.mod +++ b/.build-tools/go.mod @@ -14,7 +14,7 @@ require ( ) require ( - github.com/dapr/kit v0.13.1-0.20240402103809-0c7cfce53d9e // indirect + github.com/dapr/kit v0.13.1-0.20240306152601-e33fbab74548 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0 // indirect github.com/inconshreveable/mousetrap v1.0.1 // indirect diff --git a/.build-tools/go.sum b/.build-tools/go.sum index 9b08233839..06a3963c3c 100644 --- a/.build-tools/go.sum +++ b/.build-tools/go.sum @@ -1,6 +1,6 @@ github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/dapr/kit v0.13.1-0.20240402103809-0c7cfce53d9e h1:mLvqfGuppb6uhsijmwTlF5sZVtGvig+Ua5ESKF17SxA= -github.com/dapr/kit v0.13.1-0.20240402103809-0c7cfce53d9e/go.mod h1:dons8V2bF6MPR2yFdxtTa86PfaE7EJtKAOkZ9hOavBQ= +github.com/dapr/kit v0.13.1-0.20240306152601-e33fbab74548 h1:rh6cYZ/2nnufSAhnz+fwmsyNWljt0uyxmfIcG6t499I= +github.com/dapr/kit v0.13.1-0.20240306152601-e33fbab74548/go.mod h1:dons8V2bF6MPR2yFdxtTa86PfaE7EJtKAOkZ9hOavBQ= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/tests/e2e/pubsub/jetstream/go.mod b/tests/e2e/pubsub/jetstream/go.mod index eabd66d5b9..28307780cd 100644 --- a/tests/e2e/pubsub/jetstream/go.mod +++ b/tests/e2e/pubsub/jetstream/go.mod @@ -6,7 +6,7 @@ toolchain go1.22.2 require ( github.com/dapr/components-contrib v1.10.6-0.20230403162214-9ee9d56cb7ea - github.com/dapr/kit v0.13.1-0.20240402103809-0c7cfce53d9e + github.com/dapr/kit v0.13.1-0.20240306152601-e33fbab74548 ) require ( diff --git a/tests/e2e/pubsub/jetstream/go.sum b/tests/e2e/pubsub/jetstream/go.sum index 8223c7873c..ac53fd570d 100644 --- a/tests/e2e/pubsub/jetstream/go.sum +++ b/tests/e2e/pubsub/jetstream/go.sum @@ -4,8 +4,8 @@ github.com/cloudevents/sdk-go/binding/format/protobuf/v2 v2.14.0 h1:dEopBSOSjB5f github.com/cloudevents/sdk-go/binding/format/protobuf/v2 v2.14.0/go.mod h1:qDSbb0fgIfFNjZrNTPtS5MOMScAGyQtn1KlSvoOdqYw= github.com/cloudevents/sdk-go/v2 v2.14.0 h1:Nrob4FwVgi5L4tV9lhjzZcjYqFVyJzsA56CwPaPfv6s= github.com/cloudevents/sdk-go/v2 v2.14.0/go.mod h1:xDmKfzNjM8gBvjaF8ijFjM1VYOVUEeUfapHMUX1T5To= -github.com/dapr/kit v0.13.1-0.20240402103809-0c7cfce53d9e h1:mLvqfGuppb6uhsijmwTlF5sZVtGvig+Ua5ESKF17SxA= -github.com/dapr/kit v0.13.1-0.20240402103809-0c7cfce53d9e/go.mod h1:dons8V2bF6MPR2yFdxtTa86PfaE7EJtKAOkZ9hOavBQ= +github.com/dapr/kit v0.13.1-0.20240306152601-e33fbab74548 h1:rh6cYZ/2nnufSAhnz+fwmsyNWljt0uyxmfIcG6t499I= +github.com/dapr/kit v0.13.1-0.20240306152601-e33fbab74548/go.mod h1:dons8V2bF6MPR2yFdxtTa86PfaE7EJtKAOkZ9hOavBQ= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=