From 6f5b77c0eaf51d1a749707a64caec4a69e9ae60c Mon Sep 17 00:00:00 2001 From: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com> Date: Mon, 24 Oct 2022 22:49:23 +0000 Subject: [PATCH] Added "pubsub.azure.servicebus.queues" component Also renamed "pubsub.azure.servicebus" to "pubsub.azure.servicebus.topics" (with old name as alias) Signed-off-by: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com> --- ...s.go => pubsub_azure_servicebus_queues.go} | 4 ++-- .../pubsub_azure_servicebus_topics.go | 24 +++++++++++++++++++ go.mod | 6 ++--- go.sum | 10 ++++---- tests/apps/pluggable_kafka-bindings/go.mod | 2 +- tests/apps/pluggable_kafka-bindings/go.sum | 4 ++-- tests/apps/pluggable_redis-pubsub/go.mod | 2 +- tests/apps/pluggable_redis-pubsub/go.sum | 4 ++-- tests/apps/pluggable_redis-statestore/go.mod | 2 +- tests/apps/pluggable_redis-statestore/go.sum | 6 ++--- 10 files changed, 44 insertions(+), 20 deletions(-) rename cmd/daprd/components/{pubsub_azure_servicebus.go => pubsub_azure_servicebus_queues.go} (79%) create mode 100644 cmd/daprd/components/pubsub_azure_servicebus_topics.go diff --git a/cmd/daprd/components/pubsub_azure_servicebus.go b/cmd/daprd/components/pubsub_azure_servicebus_queues.go similarity index 79% rename from cmd/daprd/components/pubsub_azure_servicebus.go rename to cmd/daprd/components/pubsub_azure_servicebus_queues.go index 97bc56bfee9..9f1a1af0db9 100644 --- a/cmd/daprd/components/pubsub_azure_servicebus.go +++ b/cmd/daprd/components/pubsub_azure_servicebus_queues.go @@ -14,10 +14,10 @@ limitations under the License. package components import ( - "github.com/dapr/components-contrib/pubsub/azure/servicebus" + "github.com/dapr/components-contrib/pubsub/azure/servicebus/queues" pubsubLoader "github.com/dapr/dapr/pkg/components/pubsub" ) func init() { - pubsubLoader.DefaultRegistry.RegisterComponent(servicebus.NewAzureServiceBus, "azure.servicebus") + pubsubLoader.DefaultRegistry.RegisterComponent(queues.NewAzureServiceBusQueues, "azure.servicebus.queues") } diff --git a/cmd/daprd/components/pubsub_azure_servicebus_topics.go b/cmd/daprd/components/pubsub_azure_servicebus_topics.go new file mode 100644 index 00000000000..141d1f9892f --- /dev/null +++ b/cmd/daprd/components/pubsub_azure_servicebus_topics.go @@ -0,0 +1,24 @@ +/* +Copyright 2021 The Dapr Authors +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package components + +import ( + "github.com/dapr/components-contrib/pubsub/azure/servicebus/topics" + pubsubLoader "github.com/dapr/dapr/pkg/components/pubsub" +) + +func init() { + // "azure.servicebus" is the old name of the component and maintained for backwards-compatibility + pubsubLoader.DefaultRegistry.RegisterComponent(topics.NewAzureServiceBusTopics, "azure.servicebus.topics", "azure.servicebus") +} diff --git a/go.mod b/go.mod index 49ecb94d0ab..61e761ae71d 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/PuerkitoBio/purell v1.2.0 github.com/agrea/ptr v0.0.0-20180711073057-77a518d99b7b github.com/cenkalti/backoff/v4 v4.1.3 - github.com/dapr/components-contrib v1.9.1-0.20221020020823-038f63d30938 + github.com/dapr/components-contrib v1.9.1-0.20221024220536-cc856d4e1377 github.com/dapr/kit v0.0.3-0.20221009070203-ca4d40d89ed5 github.com/fasthttp/router v1.4.12 github.com/fsnotify/fsnotify v1.6.0 @@ -172,7 +172,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/eclipse/paho.mqtt.golang v1.4.1 // indirect + github.com/eclipse/paho.mqtt.golang v1.4.2-0.20221018190109-a1800d8df9a4 // indirect github.com/emicklei/go-restful/v3 v3.8.0 // indirect github.com/emirpasic/gods v1.12.0 // indirect github.com/evanphx/json-patch v4.12.0+incompatible // indirect @@ -388,8 +388,6 @@ require ( replace ( // this is a fork which addresses a performance issues due to go routines dubbo.apache.org/dubbo-go/v3 => dubbo.apache.org/dubbo-go/v3 v3.0.3-0.20220610080020-48691a404537 - // this fork is used due to a feature missing from upstream - github.com/eclipse/paho.mqtt.golang => github.com/shivamkm07/paho.mqtt.golang v1.3.6-0.20220106130409-e28a1db639f8 // this is necessary for a license issue github.com/toolkits/concurrent => github.com/niean/gotools v0.0.0-20151221085310-ff3f51fc5c60 gopkg.in/couchbaselabs/gocbconnstr.v1 => github.com/couchbaselabs/gocbconnstr v1.0.5 diff --git a/go.sum b/go.sum index 9751afa5f95..f2b8cbc5a3d 100644 --- a/go.sum +++ b/go.sum @@ -406,8 +406,10 @@ 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.9.1-0.20221020020823-038f63d30938 h1:NhktrtFtznZD3/4iYvn/XZ+ZiAVXCWtCxud/eQfUhxs= -github.com/dapr/components-contrib v1.9.1-0.20221020020823-038f63d30938/go.mod h1:kOudI10ue7r0pjsbMR1BPgms3EhuBur4wzNugo4mUjE= +github.com/dapr/components-contrib v1.9.1-0.20221024210723-04242ce38a21 h1:S9oUjCQLBNlr06pmoDH7PQK/nG2IaNZad0nvpP5anxs= +github.com/dapr/components-contrib v1.9.1-0.20221024210723-04242ce38a21/go.mod h1:kJUEIl8aisjgepaWZApm/D2W4quCyO2hAeWhpmC2l2c= +github.com/dapr/components-contrib v1.9.1-0.20221024220536-cc856d4e1377 h1:dwQqMJAW6OA3wPiK0lUjRt5RPEtbYcvI5sAWfxbPlwo= +github.com/dapr/components-contrib v1.9.1-0.20221024220536-cc856d4e1377/go.mod h1:kJUEIl8aisjgepaWZApm/D2W4quCyO2hAeWhpmC2l2c= github.com/dapr/kit v0.0.3-0.20221009070203-ca4d40d89ed5 h1:Jx8u3y/BMjUar0Gp+dzZybBo1Kvbj+18XPbiJ28Xa7A= github.com/dapr/kit v0.0.3-0.20221009070203-ca4d40d89ed5/go.mod h1:FR+yc0R0szlKnJooVqJvl7FhWf21wzY4/EzmyFQrESw= github.com/dave/jennifer v1.4.0/go.mod h1:fIb+770HOpJ2fmN9EPPKOqm1vMGhB+TwXKMZhrIygKg= @@ -469,6 +471,8 @@ github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 h1:YEetp8 github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= +github.com/eclipse/paho.mqtt.golang v1.4.2-0.20221018190109-a1800d8df9a4 h1:yJj84YKRTY+zu/s9peWf0kuSq38zKT4KJUaFcJ1uRJM= +github.com/eclipse/paho.mqtt.golang v1.4.2-0.20221018190109-a1800d8df9a4/go.mod h1:JGt0RsEwEX+Xa/agj90YJ9d9DH2b7upDZMK9HRbFvCA= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153 h1:yUdfgN0XgIJw7foRItutHYUIhlcKzcSf5vDpdhQAKTc= github.com/emicklei/go-restful/v3 v3.8.0 h1:eCZ8ulSerjdAiaNpF7GxXIE7ZCMo1moN1qX+S609eVw= @@ -1316,8 +1320,6 @@ github.com/shirou/gopsutil v3.20.11+incompatible h1:LJr4ZQK4mPpIV5gOa4jCOKOGb4ty github.com/shirou/gopsutil v3.20.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shirou/gopsutil/v3 v3.21.6 h1:vU7jrp1Ic/2sHB7w6UNs7MIkn7ebVtTb5D9j45o9VYE= github.com/shirou/gopsutil/v3 v3.21.6/go.mod h1:JfVbDpIBLVzT8oKbvMg9P3wEIMDDpVn+LwHTKj0ST88= -github.com/shivamkm07/paho.mqtt.golang v1.3.6-0.20220106130409-e28a1db639f8 h1:BXKXQzeHuVnSrHAKjvq9ICrgPC27tJ/hXWLMQo36c5s= -github.com/shivamkm07/paho.mqtt.golang v1.3.6-0.20220106130409-e28a1db639f8/go.mod h1:JGt0RsEwEX+Xa/agj90YJ9d9DH2b7upDZMK9HRbFvCA= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sijms/go-ora/v2 v2.5.3 h1:klGKmhqRONVTtIzTdfYTvrW94kdJkdmZl93u2A3vchI= github.com/sijms/go-ora/v2 v2.5.3/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= diff --git a/tests/apps/pluggable_kafka-bindings/go.mod b/tests/apps/pluggable_kafka-bindings/go.mod index 49c1694ca63..101aa86c3a6 100644 --- a/tests/apps/pluggable_kafka-bindings/go.mod +++ b/tests/apps/pluggable_kafka-bindings/go.mod @@ -6,7 +6,7 @@ replace github.com/dapr/dapr => ../../../ require ( github.com/dapr-sandbox/components-go-sdk v0.0.0-20221020133829-d48efa38c091 - github.com/dapr/components-contrib v1.9.1-0.20221020020823-038f63d30938 + github.com/dapr/components-contrib v1.9.1-0.20221024210723-04242ce38a21 github.com/dapr/kit v0.0.3-0.20221009070203-ca4d40d89ed5 ) diff --git a/tests/apps/pluggable_kafka-bindings/go.sum b/tests/apps/pluggable_kafka-bindings/go.sum index 80d80e90e91..14d7cd15534 100644 --- a/tests/apps/pluggable_kafka-bindings/go.sum +++ b/tests/apps/pluggable_kafka-bindings/go.sum @@ -5,8 +5,8 @@ github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8 github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/dapr-sandbox/components-go-sdk v0.0.0-20221020133829-d48efa38c091 h1:OomLrjnBDXESUmztS/SZaN5pDBGjw8BmpMVS9QhJwg4= github.com/dapr-sandbox/components-go-sdk v0.0.0-20221020133829-d48efa38c091/go.mod h1:7CpOwUfY7KlADHWTCmOtf0nRjvLt/62lHJKrgueVE1I= -github.com/dapr/components-contrib v1.9.1-0.20221020020823-038f63d30938 h1:NhktrtFtznZD3/4iYvn/XZ+ZiAVXCWtCxud/eQfUhxs= -github.com/dapr/components-contrib v1.9.1-0.20221020020823-038f63d30938/go.mod h1:kOudI10ue7r0pjsbMR1BPgms3EhuBur4wzNugo4mUjE= +github.com/dapr/components-contrib v1.9.1-0.20221024210723-04242ce38a21 h1:S9oUjCQLBNlr06pmoDH7PQK/nG2IaNZad0nvpP5anxs= +github.com/dapr/components-contrib v1.9.1-0.20221024210723-04242ce38a21/go.mod h1:kJUEIl8aisjgepaWZApm/D2W4quCyO2hAeWhpmC2l2c= github.com/dapr/kit v0.0.3-0.20221009070203-ca4d40d89ed5 h1:Jx8u3y/BMjUar0Gp+dzZybBo1Kvbj+18XPbiJ28Xa7A= github.com/dapr/kit v0.0.3-0.20221009070203-ca4d40d89ed5/go.mod h1:FR+yc0R0szlKnJooVqJvl7FhWf21wzY4/EzmyFQrESw= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/tests/apps/pluggable_redis-pubsub/go.mod b/tests/apps/pluggable_redis-pubsub/go.mod index 0fe76c04c4c..38a8c35502b 100644 --- a/tests/apps/pluggable_redis-pubsub/go.mod +++ b/tests/apps/pluggable_redis-pubsub/go.mod @@ -6,7 +6,7 @@ replace github.com/dapr/dapr => ../../../ require ( github.com/dapr-sandbox/components-go-sdk v0.0.0-20221020133829-d48efa38c091 - github.com/dapr/components-contrib v1.9.1-0.20221020020823-038f63d30938 + github.com/dapr/components-contrib v1.9.1-0.20221024210723-04242ce38a21 github.com/dapr/kit v0.0.3-0.20221009070203-ca4d40d89ed5 ) diff --git a/tests/apps/pluggable_redis-pubsub/go.sum b/tests/apps/pluggable_redis-pubsub/go.sum index 71de5f3cd65..ab039b5464d 100644 --- a/tests/apps/pluggable_redis-pubsub/go.sum +++ b/tests/apps/pluggable_redis-pubsub/go.sum @@ -2,8 +2,8 @@ github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cb github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/dapr-sandbox/components-go-sdk v0.0.0-20221020133829-d48efa38c091 h1:OomLrjnBDXESUmztS/SZaN5pDBGjw8BmpMVS9QhJwg4= github.com/dapr-sandbox/components-go-sdk v0.0.0-20221020133829-d48efa38c091/go.mod h1:7CpOwUfY7KlADHWTCmOtf0nRjvLt/62lHJKrgueVE1I= -github.com/dapr/components-contrib v1.9.1-0.20221020020823-038f63d30938 h1:NhktrtFtznZD3/4iYvn/XZ+ZiAVXCWtCxud/eQfUhxs= -github.com/dapr/components-contrib v1.9.1-0.20221020020823-038f63d30938/go.mod h1:kOudI10ue7r0pjsbMR1BPgms3EhuBur4wzNugo4mUjE= +github.com/dapr/components-contrib v1.9.1-0.20221024210723-04242ce38a21 h1:S9oUjCQLBNlr06pmoDH7PQK/nG2IaNZad0nvpP5anxs= +github.com/dapr/components-contrib v1.9.1-0.20221024210723-04242ce38a21/go.mod h1:kJUEIl8aisjgepaWZApm/D2W4quCyO2hAeWhpmC2l2c= github.com/dapr/kit v0.0.3-0.20221009070203-ca4d40d89ed5 h1:Jx8u3y/BMjUar0Gp+dzZybBo1Kvbj+18XPbiJ28Xa7A= github.com/dapr/kit v0.0.3-0.20221009070203-ca4d40d89ed5/go.mod h1:FR+yc0R0szlKnJooVqJvl7FhWf21wzY4/EzmyFQrESw= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/tests/apps/pluggable_redis-statestore/go.mod b/tests/apps/pluggable_redis-statestore/go.mod index a92707af543..24f63cbcdf4 100644 --- a/tests/apps/pluggable_redis-statestore/go.mod +++ b/tests/apps/pluggable_redis-statestore/go.mod @@ -6,7 +6,7 @@ replace github.com/dapr/dapr => ../../../ require ( github.com/dapr-sandbox/components-go-sdk v0.0.0-20221020133829-d48efa38c091 - github.com/dapr/components-contrib v1.9.1-0.20221020020823-038f63d30938 + github.com/dapr/components-contrib v1.9.1-0.20221024210723-04242ce38a21 github.com/dapr/kit v0.0.3-0.20221009070203-ca4d40d89ed5 ) diff --git a/tests/apps/pluggable_redis-statestore/go.sum b/tests/apps/pluggable_redis-statestore/go.sum index c803bcda57e..70548a99430 100644 --- a/tests/apps/pluggable_redis-statestore/go.sum +++ b/tests/apps/pluggable_redis-statestore/go.sum @@ -1,13 +1,13 @@ github.com/agrea/ptr v0.0.0-20180711073057-77a518d99b7b h1:WMhlIaJkDgEQSVJQM06YV+cYUl1r5OY5//ijMXJNqtA= github.com/agrea/ptr v0.0.0-20180711073057-77a518d99b7b/go.mod h1:Tie46d3UWzXpj+Fh9+DQTyaUxEpFBPOLXrnx7nxlKRo= github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a h1:HbKu58rmZpUGpz5+4FfNmIU+FmZg2P3Xaj2v2bfNWmk= -github.com/alicebob/miniredis/v2 v2.13.3 h1:kohgdtN58KW/r9ZDVmMJE3MrfbumwsDQStd0LPAGmmw= +github.com/alicebob/miniredis/v2 v2.23.0 h1:+lwAJYjvvdIVg6doFHuotFjueJ/7KY10xo/vm3X3Scw= github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/dapr-sandbox/components-go-sdk v0.0.0-20221020133829-d48efa38c091 h1:OomLrjnBDXESUmztS/SZaN5pDBGjw8BmpMVS9QhJwg4= github.com/dapr-sandbox/components-go-sdk v0.0.0-20221020133829-d48efa38c091/go.mod h1:7CpOwUfY7KlADHWTCmOtf0nRjvLt/62lHJKrgueVE1I= -github.com/dapr/components-contrib v1.9.1-0.20221020020823-038f63d30938 h1:NhktrtFtznZD3/4iYvn/XZ+ZiAVXCWtCxud/eQfUhxs= -github.com/dapr/components-contrib v1.9.1-0.20221020020823-038f63d30938/go.mod h1:kOudI10ue7r0pjsbMR1BPgms3EhuBur4wzNugo4mUjE= +github.com/dapr/components-contrib v1.9.1-0.20221024210723-04242ce38a21 h1:S9oUjCQLBNlr06pmoDH7PQK/nG2IaNZad0nvpP5anxs= +github.com/dapr/components-contrib v1.9.1-0.20221024210723-04242ce38a21/go.mod h1:kJUEIl8aisjgepaWZApm/D2W4quCyO2hAeWhpmC2l2c= github.com/dapr/kit v0.0.3-0.20221009070203-ca4d40d89ed5 h1:Jx8u3y/BMjUar0Gp+dzZybBo1Kvbj+18XPbiJ28Xa7A= github.com/dapr/kit v0.0.3-0.20221009070203-ca4d40d89ed5/go.mod h1:FR+yc0R0szlKnJooVqJvl7FhWf21wzY4/EzmyFQrESw= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=