Yaml format Sarama config for Kafka connection. -It follows the struct of sarama.Config. See https://github.com/Shopify/sarama/blob/main/config.go +It follows the struct of sarama.Config. See https://github.com/IBM/sarama/blob/main/config.go e.g.
consumer: fetch: diff --git a/api/event-source.md b/api/event-source.md index 003637b250..a3bf98ea22 100644 --- a/api/event-source.md +++ b/api/event-source.md @@ -3899,7 +3899,7 @@ Filter
Yaml format Sarama config for Kafka connection. It follows the struct of sarama.Config. See -https://github.com/Shopify/sarama/blob/main/config.go +https://github.com/IBM/sarama/blob/main/config.go e.g.
diff --git a/api/jsonschema/schema.json b/api/jsonschema/schema.json index 44ed8c853f..b7b04f0c43 100644 --- a/api/jsonschema/schema.json +++ b/api/jsonschema/schema.json @@ -2035,7 +2035,7 @@ "description": "KafkaEventSource refers to event-source for Kafka related events", "properties": { "config": { - "description": "Yaml format Sarama config for Kafka connection. It follows the struct of sarama.Config. See https://github.com/Shopify/sarama/blob/main/config.go e.g.\n\nconsumer:\n fetch:\n min: 1\nnet:\n MaxOpenRequests: 5", + "description": "Yaml format Sarama config for Kafka connection. It follows the struct of sarama.Config. See https://github.com/IBM/sarama/blob/main/config.go e.g.\n\nconsumer:\n fetch:\n min: 1\nnet:\n MaxOpenRequests: 5", "type": "string" }, "connectionBackoff": { diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index 298282c0f2..a4dfd080a6 100644 --- a/api/openapi-spec/swagger.json +++ b/api/openapi-spec/swagger.json @@ -2023,7 +2023,7 @@ ], "properties": { "config": { - "description": "Yaml format Sarama config for Kafka connection. It follows the struct of sarama.Config. See https://github.com/Shopify/sarama/blob/main/config.go e.g.\n\nconsumer:\n fetch:\n min: 1\nnet:\n MaxOpenRequests: 5", + "description": "Yaml format Sarama config for Kafka connection. It follows the struct of sarama.Config. See https://github.com/IBM/sarama/blob/main/config.go e.g.\n\nconsumer:\n fetch:\n min: 1\nnet:\n MaxOpenRequests: 5", "type": "string" }, "connectionBackoff": { diff --git a/common/saramaconfig.go b/common/saramaconfig.go index 2e93989c78..f9bf4836b1 100644 --- a/common/saramaconfig.go +++ b/common/saramaconfig.go @@ -4,7 +4,7 @@ import ( "bytes" "fmt" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/spf13/viper" ) diff --git a/eventbus/kafka/base/kafka.go b/eventbus/kafka/base/kafka.go index b39fcb8dd3..b2abc11944 100644 --- a/eventbus/kafka/base/kafka.go +++ b/eventbus/kafka/base/kafka.go @@ -3,7 +3,7 @@ package base import ( "strings" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/argoproj/argo-events/common" eventbusv1alpha1 "github.com/argoproj/argo-events/pkg/apis/eventbus/v1alpha1" "go.uber.org/zap" @@ -46,11 +46,11 @@ func (k *Kafka) Config() (*sarama.Config, error) { switch k.config.ConsumerGroup.RebalanceStrategy { case "sticky": - config.Consumer.Group.Rebalance.GroupStrategies = []sarama.BalanceStrategy{sarama.BalanceStrategySticky} + config.Consumer.Group.Rebalance.GroupStrategies = []sarama.BalanceStrategy{sarama.NewBalanceStrategySticky()} case "roundrobin": - config.Consumer.Group.Rebalance.GroupStrategies = []sarama.BalanceStrategy{sarama.BalanceStrategyRoundRobin} + config.Consumer.Group.Rebalance.GroupStrategies = []sarama.BalanceStrategy{sarama.NewBalanceStrategyRoundRobin()} default: - config.Consumer.Group.Rebalance.GroupStrategies = []sarama.BalanceStrategy{sarama.BalanceStrategyRange} + config.Consumer.Group.Rebalance.GroupStrategies = []sarama.BalanceStrategy{sarama.NewBalanceStrategyRange()} } // producer config diff --git a/eventbus/kafka/eventsource/source_conn.go b/eventbus/kafka/eventsource/source_conn.go index 0463990482..f9e79925d6 100644 --- a/eventbus/kafka/eventsource/source_conn.go +++ b/eventbus/kafka/eventsource/source_conn.go @@ -3,7 +3,7 @@ package eventsource import ( "context" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/argoproj/argo-events/eventbus/common" "github.com/argoproj/argo-events/eventbus/kafka/base" "go.uber.org/zap" diff --git a/eventbus/kafka/eventsource/source_kafka.go b/eventbus/kafka/eventsource/source_kafka.go index d73e0d193f..4b61562c2a 100644 --- a/eventbus/kafka/eventsource/source_kafka.go +++ b/eventbus/kafka/eventsource/source_kafka.go @@ -1,7 +1,7 @@ package eventsource import ( - "github.com/Shopify/sarama" + "github.com/IBM/sarama" eventbuscommon "github.com/argoproj/argo-events/eventbus/common" "github.com/argoproj/argo-events/eventbus/kafka/base" eventbusv1alpha1 "github.com/argoproj/argo-events/pkg/apis/eventbus/v1alpha1" diff --git a/eventbus/kafka/sensor/kafka_handler.go b/eventbus/kafka/sensor/kafka_handler.go index 6c30f1c6db..a14512c86f 100644 --- a/eventbus/kafka/sensor/kafka_handler.go +++ b/eventbus/kafka/sensor/kafka_handler.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/argoproj/argo-events/eventbus/kafka/base" "go.uber.org/zap" ) diff --git a/eventbus/kafka/sensor/kafka_sensor.go b/eventbus/kafka/sensor/kafka_sensor.go index ea0cdb279b..593419cf8d 100644 --- a/eventbus/kafka/sensor/kafka_sensor.go +++ b/eventbus/kafka/sensor/kafka_sensor.go @@ -8,8 +8,8 @@ import ( "sync" "time" + "github.com/IBM/sarama" "github.com/Knetic/govaluate" - "github.com/Shopify/sarama" eventbuscommon "github.com/argoproj/argo-events/eventbus/common" "github.com/argoproj/argo-events/eventbus/kafka/base" eventbusv1alpha1 "github.com/argoproj/argo-events/pkg/apis/eventbus/v1alpha1" diff --git a/eventbus/kafka/sensor/kafka_transaction.go b/eventbus/kafka/sensor/kafka_transaction.go index 8bb42ded98..fce906e376 100644 --- a/eventbus/kafka/sensor/kafka_transaction.go +++ b/eventbus/kafka/sensor/kafka_transaction.go @@ -1,7 +1,7 @@ package kafka import ( - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "go.uber.org/zap" ) diff --git a/eventsources/sources/kafka/start.go b/eventsources/sources/kafka/start.go index 4926999e0a..4e73de0173 100644 --- a/eventsources/sources/kafka/start.go +++ b/eventsources/sources/kafka/start.go @@ -26,7 +26,7 @@ import ( "sync" "time" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "go.uber.org/zap" "github.com/argoproj/argo-events/common" @@ -96,14 +96,14 @@ func (el *EventListener) consumerGroupConsumer(ctx context.Context, log *zap.Sug switch kafkaEventSource.ConsumerGroup.RebalanceStrategy { case "sticky": - config.Consumer.Group.Rebalance.GroupStrategies = []sarama.BalanceStrategy{sarama.BalanceStrategySticky} + config.Consumer.Group.Rebalance.GroupStrategies = []sarama.BalanceStrategy{sarama.NewBalanceStrategySticky()} case "roundrobin": - config.Consumer.Group.Rebalance.GroupStrategies = []sarama.BalanceStrategy{sarama.BalanceStrategyRoundRobin} + config.Consumer.Group.Rebalance.GroupStrategies = []sarama.BalanceStrategy{sarama.NewBalanceStrategyRoundRobin()} case "range": - config.Consumer.Group.Rebalance.GroupStrategies = []sarama.BalanceStrategy{sarama.BalanceStrategyRange} + config.Consumer.Group.Rebalance.GroupStrategies = []sarama.BalanceStrategy{sarama.NewBalanceStrategyRange()} default: log.Info("Invalid rebalance strategy, using default: range") - config.Consumer.Group.Rebalance.GroupStrategies = []sarama.BalanceStrategy{sarama.BalanceStrategyRange} + config.Consumer.Group.Rebalance.GroupStrategies = []sarama.BalanceStrategy{sarama.NewBalanceStrategyRange()} } consumer := Consumer{ @@ -354,16 +354,14 @@ func (consumer *Consumer) Cleanup(sarama.ConsumerGroupSession) error { return nil } -var ( - eventBusErr *eventbuscommon.EventBusError -) +var eventBusErr *eventbuscommon.EventBusError // ConsumeClaim must start a consumer loop of ConsumerGroupClaim's Messages(). func (consumer *Consumer) ConsumeClaim(session sarama.ConsumerGroupSession, claim sarama.ConsumerGroupClaim) error { // NOTE: // Do not move the code below to a goroutine. // The `ConsumeClaim` itself is called within a goroutine, see: - // https://github.com/Shopify/sarama/blob/master/consumer_group.go#L27-L29 + // https://github.com/IBM/sarama/blob/master/consumer_group.go#L27-L29 for message := range claim.Messages() { if err := consumer.processOne(session, message); err != nil { consumer.metrics.EventProcessingFailed(consumer.eventSourceName, consumer.eventName) diff --git a/go.mod b/go.mod index d91f2c03b6..4943945146 100644 --- a/go.mod +++ b/go.mod @@ -14,9 +14,9 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0 github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus v1.4.1 github.com/Azure/azure-sdk-for-go/sdk/storage/azqueue v1.0.0 + github.com/IBM/sarama v1.41.2 github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible github.com/Masterminds/sprig/v3 v3.2.3 - github.com/Shopify/sarama v1.38.0 github.com/ahmetb/gen-crd-api-reference-docs v0.3.0 github.com/antonmedv/expr v1.15.2 github.com/apache/openwhisk-client-go v0.0.0-20190915054138-716c6f973eb2 @@ -138,7 +138,7 @@ require ( github.com/oliveagle/jsonpath v0.0.0-20180606110733-2e52cf6e6852 // indirect github.com/opsgenie/opsgenie-go-sdk-v2 v1.0.5 // indirect github.com/pelletier/go-toml/v2 v2.0.8 // indirect - github.com/pierrec/lz4/v4 v4.1.17 // indirect + github.com/pierrec/lz4/v4 v4.1.18 // indirect github.com/pjbgf/sha1cd v0.3.0 // indirect github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect github.com/pkg/errors v0.9.1 // indirect @@ -188,8 +188,8 @@ require ( github.com/devigned/tab v0.1.1 // indirect github.com/doublerebel/bellows v0.0.0-20160303004610-f177d92a03d3 github.com/dustin/go-humanize v1.0.1 // indirect - github.com/eapache/go-resiliency v1.3.0 // indirect - github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect + github.com/eapache/go-resiliency v1.4.0 // indirect + github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect github.com/eapache/queue v1.1.0 // indirect github.com/emirpasic/gods v1.18.1 // indirect github.com/evanphx/json-patch v5.6.0+incompatible // indirect @@ -231,7 +231,7 @@ require ( github.com/jcmturner/aescts/v2 v2.0.0 // indirect github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect github.com/jcmturner/gofork v1.7.6 // indirect - github.com/jcmturner/gokrb5/v8 v8.4.3 // indirect + github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect github.com/jcmturner/rpc/v2 v2.0.3 // indirect github.com/jessevdk/go-flags v1.5.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect diff --git a/go.sum b/go.sum index 56134a3d8c..2a4cf19aae 100644 --- a/go.sum +++ b/go.sum @@ -676,6 +676,8 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/zstd v1.5.0 h1:+K/VEwIAaPcHiMtQvpLD4lqW7f0Gk3xdYZmI1hD+CXo= github.com/DataDog/zstd v1.5.0/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= +github.com/IBM/sarama v1.41.2 h1:ZDBZfGPHAD4uuAtSv4U22fRZBgst0eEwGFzLj0fb85c= +github.com/IBM/sarama v1.41.2/go.mod h1:xdpu7sd6OE1uxNdjYTSKUfY8FaKkJES9/+EyjSgiGQk= github.com/Jeffail/gabs v1.4.0 h1://5fYRRTq1edjfIrQGvdkcd22pkYUrHZ5YC/H2GJVAo= github.com/Jeffail/gabs v1.4.0/go.mod h1:6xMvQMK4k33lb7GUUpaAPh6nKMmemQeg5d4gn7/bOXc= github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk= @@ -704,9 +706,6 @@ github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdko github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/RocketChat/Rocket.Chat.Go.SDK v0.0.0-20210112200207-10ab4d695d60 h1:prBTRx78AQnXzivNT9Crhu564W/zPPr3ibSlpT9xKcE= github.com/RocketChat/Rocket.Chat.Go.SDK v0.0.0-20210112200207-10ab4d695d60/go.mod h1:rjP7sIipbZcagro/6TCk6X0ZeFT2eyudH5+fve/cbBA= -github.com/Shopify/sarama v1.38.0 h1:Q81EWxDT2Xs7kCaaiDGV30GyNCWd6K1Xmd4k2qpTWE8= -github.com/Shopify/sarama v1.38.0/go.mod h1:djdek3V4gS0N9LZ+OhfuuM6rE1bEKeDffYY8UvsRNyM= -github.com/Shopify/toxiproxy/v2 v2.5.0 h1:i4LPT+qrSlKNtQf5QliVjdP08GyAH8+BUIc9gT0eahc= github.com/UnnoTed/fileb0x v1.1.4/go.mod h1:X59xXT18tdNk/D6j+KZySratBsuKJauMtVuJ9cgOiZs= github.com/acomagu/bufpipe v1.0.4 h1:e3H4WUzM3npvo5uv95QuJM3cQspFNtFBzvJ2oNjKIDQ= github.com/acomagu/bufpipe v1.0.4/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4= @@ -872,10 +871,10 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/dvsekhvalnov/jose2go v1.5.0 h1:3j8ya4Z4kMCwT5nXIKFSV84YS+HdqSSO0VsTQxaLAeM= github.com/dvsekhvalnov/jose2go v1.5.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU= -github.com/eapache/go-resiliency v1.3.0 h1:RRL0nge+cWGlxXbUzJ7yMcq6w2XBEr19dCN6HECGaT0= -github.com/eapache/go-resiliency v1.3.0/go.mod h1:5yPzW0MIvSe0JDsv0v+DvcjEv2FyD6iZYSs1ZI+iQho= -github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 h1:YEetp8/yCZMuEPMUDHG0CW/brkkEp8mzqk2+ODEitlw= -github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= +github.com/eapache/go-resiliency v1.4.0 h1:3OK9bWpPk5q6pbFAaYSEwD9CLUSHG8bnZuqX2yMt3B0= +github.com/eapache/go-resiliency v1.4.0/go.mod h1:5yPzW0MIvSe0JDsv0v+DvcjEv2FyD6iZYSs1ZI+iQho= +github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 h1:Oy0F4ALJ04o5Qqpdz8XLIpNA3WM/iSIXqxtqo7UGVws= +github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3/go.mod h1:YvSRo5mw33fLEx1+DlK6L2VV43tJt5Eyel9n9XBcR+0= 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.2.0/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts= @@ -1339,8 +1338,8 @@ github.com/jcmturner/gofork v1.7.6 h1:QH0l3hzAU1tfT3rZCnW5zXl+orbkNMMRGJfdJjHVET github.com/jcmturner/gofork v1.7.6/go.mod h1:1622LH6i/EZqLloHfE7IeZ0uEJwMSUyQ/nDd82IeqRo= github.com/jcmturner/goidentity/v6 v6.0.1 h1:VKnZd2oEIMorCTsFBnJWbExfNN7yZr3EhJAxwOkZg6o= github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg= -github.com/jcmturner/gokrb5/v8 v8.4.3 h1:iTonLeSJOn7MVUtyMT+arAn5AKAPrkilzhGw8wE/Tq8= -github.com/jcmturner/gokrb5/v8 v8.4.3/go.mod h1:dqRwJGXznQrzw6cWmyo6kH+E7jksEQG/CyVWsJEsJO0= +github.com/jcmturner/gokrb5/v8 v8.4.4 h1:x1Sv4HaTpepFkXbt2IkL29DXRf8sOfZXo8eRKh687T8= +github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs= github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY= github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= @@ -1605,8 +1604,8 @@ github.com/phpdave11/gofpdi v1.0.13/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk github.com/pierrec/lz4 v2.6.1+incompatible h1:9UY3+iC23yxF0UfGaYrGplQ+79Rg+h/q9FV9ix19jjM= github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= -github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc= -github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ= +github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4= github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI= github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU= @@ -1942,6 +1941,7 @@ golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= +golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck= @@ -2076,7 +2076,6 @@ golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.0.0-20220725212005-46097bf591d3/go.mod h1:AaygXjzTFtRAg2ttMY5RMuhpJ3cNnI0XpyFJD1iQRSM= golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= diff --git a/pkg/apis/eventsource/v1alpha1/generated.proto b/pkg/apis/eventsource/v1alpha1/generated.proto index 083e90db58..10d0c242ad 100644 --- a/pkg/apis/eventsource/v1alpha1/generated.proto +++ b/pkg/apis/eventsource/v1alpha1/generated.proto @@ -946,7 +946,7 @@ message KafkaEventSource { optional EventSourceFilter filter = 12; // Yaml format Sarama config for Kafka connection. - // It follows the struct of sarama.Config. See https://github.com/Shopify/sarama/blob/main/config.go + // It follows the struct of sarama.Config. See https://github.com/IBM/sarama/blob/main/config.go // e.g. // // consumer: diff --git a/pkg/apis/eventsource/v1alpha1/openapi_generated.go b/pkg/apis/eventsource/v1alpha1/openapi_generated.go index fdfa744ec5..527f511205 100644 --- a/pkg/apis/eventsource/v1alpha1/openapi_generated.go +++ b/pkg/apis/eventsource/v1alpha1/openapi_generated.go @@ -2589,7 +2589,7 @@ func schema_pkg_apis_eventsource_v1alpha1_KafkaEventSource(ref common.ReferenceC }, "config": { SchemaProps: spec.SchemaProps{ - Description: "Yaml format Sarama config for Kafka connection. It follows the struct of sarama.Config. See https://github.com/Shopify/sarama/blob/main/config.go e.g.\n\nconsumer:\n fetch:\n min: 1\nnet:\n MaxOpenRequests: 5", + Description: "Yaml format Sarama config for Kafka connection. It follows the struct of sarama.Config. See https://github.com/IBM/sarama/blob/main/config.go e.g.\n\nconsumer:\n fetch:\n min: 1\nnet:\n MaxOpenRequests: 5", Type: []string{"string"}, Format: "", }, diff --git a/pkg/apis/eventsource/v1alpha1/types.go b/pkg/apis/eventsource/v1alpha1/types.go index aaa60b5686..d85526914d 100644 --- a/pkg/apis/eventsource/v1alpha1/types.go +++ b/pkg/apis/eventsource/v1alpha1/types.go @@ -551,7 +551,7 @@ type KafkaEventSource struct { // +optional Filter *EventSourceFilter `json:"filter,omitempty" protobuf:"bytes,12,opt,name=filter"` // Yaml format Sarama config for Kafka connection. - // It follows the struct of sarama.Config. See https://github.com/Shopify/sarama/blob/main/config.go + // It follows the struct of sarama.Config. See https://github.com/IBM/sarama/blob/main/config.go // e.g. // // consumer: diff --git a/sensors/context.go b/sensors/context.go index 2b1b71b486..492523ee74 100644 --- a/sensors/context.go +++ b/sensors/context.go @@ -22,7 +22,7 @@ import ( eventhubs "github.com/Azure/azure-event-hubs-go/v3" servicebus "github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/apache/openwhisk-client-go/whisk" "github.com/apache/pulsar-client-go/pulsar" "github.com/aws/aws-sdk-go/service/lambda" diff --git a/sensors/triggers/kafka/kafka.go b/sensors/triggers/kafka/kafka.go index 572ac272cd..a02dac2b25 100644 --- a/sensors/triggers/kafka/kafka.go +++ b/sensors/triggers/kafka/kafka.go @@ -26,7 +26,7 @@ import ( "github.com/hamba/avro" "github.com/riferrei/srclient" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "go.uber.org/zap" "github.com/argoproj/argo-events/common" diff --git a/sensors/triggers/kafka/kafka_test.go b/sensors/triggers/kafka/kafka_test.go index 84d51134ed..50d46faf47 100644 --- a/sensors/triggers/kafka/kafka_test.go +++ b/sensors/triggers/kafka/kafka_test.go @@ -19,8 +19,8 @@ import ( "context" "testing" - "github.com/Shopify/sarama" - "github.com/Shopify/sarama/mocks" + "github.com/IBM/sarama" + "github.com/IBM/sarama/mocks" cloudevents "github.com/cloudevents/sdk-go/v2" "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"