diff --git a/src/v/cloud_storage_clients/abs_client.cc b/src/v/cloud_storage_clients/abs_client.cc index a3fa91c54cf17..8f72c291e4560 100644 --- a/src/v/cloud_storage_clients/abs_client.cc +++ b/src/v/cloud_storage_clients/abs_client.cc @@ -851,7 +851,7 @@ ss::future abs_client::do_list_objects( std::optional marker, ss::lowres_clock::duration timeout, std::optional delimiter, - std::optional) { + std::optional collect_item_if) { auto header = _requestor.make_list_blobs_request( name, _adls_client.has_value(), @@ -884,8 +884,9 @@ ss::future abs_client::do_list_objects( co_return co_await ss::do_with( response_stream->as_input_stream(), xml_sax_parser{}, - [](ss::input_stream& stream, xml_sax_parser& p) mutable { - p.start_parse(std::make_unique()); + [pred = std::move(collect_item_if)]( + ss::input_stream& stream, xml_sax_parser& p) mutable { + p.start_parse(std::make_unique(std::move(pred))); return ss::do_until( [&stream] { return stream.eof(); }, [&stream, &p] { diff --git a/tests/rptest/tests/remote_label_test.py b/tests/rptest/tests/remote_label_test.py index 5148fdf42c818..faa4f8343a7e6 100644 --- a/tests/rptest/tests/remote_label_test.py +++ b/tests/rptest/tests/remote_label_test.py @@ -11,11 +11,12 @@ from rptest.clients.types import TopicSpec from rptest.services.cluster import cluster from rptest.clients.rpk import RpkTool -from rptest.services.redpanda import RedpandaService, SISettings, make_redpanda_service +from rptest.services.redpanda import RedpandaService, SISettings, get_cloud_storage_type, make_redpanda_service from rptest.services.kgo_verifier_services import KgoVerifierProducer from rptest.tests.redpanda_test import RedpandaTest from rptest.tests.read_replica_e2e_test import hwms_are_identical, create_read_replica_topic from rptest.util import wait_until +from ducktape.mark import matrix from ducktape.tests.test import TestContext from rptest.utils.si_utils import BucketView, NT, quiesce_uploads @@ -90,7 +91,8 @@ def produce(self, cluster: RedpandaService, topic_name: str, producer.free() @cluster(num_nodes=3) - def test_clusters_share_bucket(self) -> None: + @matrix(cloud_storage_type=get_cloud_storage_type()) + def test_clusters_share_bucket(self, cloud_storage_type) -> None: """ cluster 1 creates topic_a cluster 2 creates topic_a