Merge pull request #60952 from igomon-bloomberg/wip-65912-squid

squid: rgw/s3-notifications: use user-name/password topic attributes for SASL authentication

Reviewed-by: Yuval Lifshitz <ylifshit@redhat.com>

diff --cc doc/radosgw/notifications.rst
Simple merge

diff --cc src/rgw/rgw_kafka.cc
index 7420e68c2644865945916073dffa9e20f29e4b05,dbb22dcb5689aabeeb337968a2d0f68162c67942..dbc893d70c9ddf7d15e657d37c86406df043c2d1
--- 1/src/rgw/rgw_kafka.cc
--- 2/src/rgw/rgw_kafka.cc
+++ b/src/rgw/rgw_kafka.cc
@@@ -389,12 -385,13 +389,12 @@@ private
      }
  
      // create a new topic unless it was already created
 -    auto topic_it = std::find(conn->topics.begin(), conn->topics.end(), message->topic);
 -    rd_kafka_topic_t* topic = nullptr;
 +    auto topic_it = conn->topics.find(message->topic);
      if (topic_it == conn->topics.end()) {
 -      topic = rd_kafka_topic_new(conn->producer, message->topic.c_str(), nullptr);
 +      connection_t::topic_ptr topic(rd_kafka_topic_new(conn->producer, message->topic.c_str(), nullptr));
        if (!topic) {
          const auto err = rd_kafka_last_error();
-         ldout(conn->cct, 1) << "Kafka publish: failed to create topic: " << message->topic << " error: " 
+         ldout(conn->cct, 1) << "Kafka publish: failed to create topic: " << message->topic << " error: "
            << rd_kafka_err2str(err) << "(" << err << ")" << dendl;
          if (message->cb) {
            message->cb(-rd_kafka_err2errno(err));

diff --cc src/rgw/rgw_rest_pubsub.cc
Simple merge

diff --cc src/rgw/rgw_rest_s3.cc
Simple merge

diff --cc src/test/rgw/bucket_notification/test_bn.py
Simple merge