Merge pull request #18085 from dotnwat/net-module-new-style

[CORE-2054] Convert net module to new style

src/v/CMakeLists.txt

@@ -101,12 +101,12 @@ add_subdirectory(io)
 add_subdirectory(ssx)
 add_subdirectory(wasm)
 add_subdirectory(transform)
+add_subdirectory(net)
 
 # libraries
 add_subdirectory(test_utils)
 add_subdirectory(finjector)
 add_subdirectory(utils)
-add_subdirectory(net)
 add_subdirectory(rpc)
 add_subdirectory(metrics)
 add_subdirectory(model)

src/v/archival/tests/ntp_archiver_test.cc

@@ -27,7 +27,6 @@
 #include "model/metadata.h"
 #include "model/record_batch_types.h"
 #include "net/types.h"
-#include "net/unresolved_address.h"
 #include "ssx/sformat.h"
 #include "storage/disk_log_impl.h"
 #include "storage/parser.h"
@@ -37,6 +36,7 @@
 #include "test_utils/fixture.h"
 #include "test_utils/scoped_config.h"
 #include "utils/retry_chain_node.h"
+#include "utils/unresolved_address.h"
 
 #include <seastar/core/future-util.hh>
 #include <seastar/core/sstring.hh>

src/v/cloud_storage_clients/tests/s3_client_test.cc

@@ -17,9 +17,9 @@
 #include "hashing/secure.h"
 #include "net/dns.h"
 #include "net/types.h"
-#include "net/unresolved_address.h"
 #include "test_utils/fixture.h"
 #include "utils/base64.h"
+#include "utils/unresolved_address.h"
 
 #include <seastar/core/future.hh>
 #include <seastar/core/iostream.hh>

src/v/cluster/metadata_dissemination_service.cc

@@ -28,10 +28,10 @@
 #include "model/metadata.h"
 #include "model/namespace.h"
 #include "model/timeout_clock.h"
-#include "net/unresolved_address.h"
 #include "rpc/connection_cache.h"
 #include "rpc/types.h"
 #include "utils/retry.h"
+#include "utils/unresolved_address.h"
 
 #include <seastar/core/abort_source.hh>
 #include <seastar/core/chunked_fifo.hh>

src/v/cluster/metadata_dissemination_service.h

@@ -19,11 +19,11 @@
 #include "features/fwd.h"
 #include "model/fundamental.h"
 #include "model/metadata.h"
-#include "net/unresolved_address.h"
 #include "raft/fwd.h"
 #include "rpc/fwd.h"
 #include "utils/mutex.h"
 #include "utils/retry.h"
+#include "utils/unresolved_address.h"
 
 #include <seastar/core/abort_source.hh>
 #include <seastar/core/sharded.hh>

src/v/cluster/metrics_reporter.cc

@@ -32,11 +32,11 @@
 #include "model/timeout_clock.h"
 #include "net/tls.h"
 #include "net/tls_certificate_probe.h"
-#include "net/unresolved_address.h"
 #include "reflection/adl.h"
 #include "rpc/types.h"
 #include "security/role_store.h"
 #include "ssx/sformat.h"
+#include "utils/unresolved_address.h"
 
 #include <seastar/core/abort_source.hh>
 #include <seastar/core/coroutine.hh>

src/v/cluster/tests/cluster_tests.cc

@@ -14,8 +14,8 @@
 #include "config/configuration.h"
 #include "features/feature_table_snapshot.h"
 #include "model/metadata.h"
-#include "net/unresolved_address.h"
 #include "test_utils/fixture.h"
+#include "utils/unresolved_address.h"
 
 using namespace std::chrono_literals; // NOLINT
 

src/v/cluster/tests/cluster_utils_tests.cc

@@ -11,10 +11,10 @@
 #include "cluster/members_table.h"
 #include "cluster/types.h"
 #include "model/metadata.h"
-#include "net/unresolved_address.h"
 #include "storage/tests/kvstore_fixture.h"
 #include "test_utils/fixture.h"
 #include "utils/prefix_logger.h"
+#include "utils/unresolved_address.h"
 
 #include <seastar/core/shared_ptr.hh>
 #include <seastar/net/inet_address.hh>

src/v/cluster/tests/configuration_change_test.cc

@@ -15,8 +15,8 @@
 #include "cluster/types.h"
 #include "config/configuration.h"
 #include "model/metadata.h"
-#include "net/unresolved_address.h"
 #include "test_utils/fixture.h"
+#include "utils/unresolved_address.h"
 
 #include <seastar/core/future-util.hh>
 #include <seastar/core/sstring.hh>

src/v/cluster/tests/controller_state_test.cc

@@ -18,9 +18,9 @@
 #include "config/configuration.h"
 #include "model/metadata.h"
 #include "model/timeout_clock.h"
-#include "net/unresolved_address.h"
 #include "test_utils/async.h"
 #include "test_utils/fixture.h"
+#include "utils/unresolved_address.h"
 
 #include <seastar/core/future-util.hh>
 #include <seastar/core/sstring.hh>

src/v/cluster/tests/metadata_dissemination_test.cc

@@ -17,9 +17,9 @@
 #include "model/fundamental.h"
 #include "model/metadata.h"
 #include "model/timeout_clock.h"
-#include "net/unresolved_address.h"
 #include "test_utils/async.h"
 #include "test_utils/fixture.h"
+#include "utils/unresolved_address.h"
 
 #include <seastar/util/defer.hh>
 

src/v/cluster/tests/partition_allocator_fixture.h

@@ -21,9 +21,9 @@
 #include "config/mock_property.h"
 #include "model/fundamental.h"
 #include "model/metadata.h"
-#include "net/unresolved_address.h"
 #include "random/fast_prng.h"
 #include "random/generators.h"
+#include "utils/unresolved_address.h"
 
 #include <seastar/core/chunked_fifo.hh>
 

src/v/compat/json.h

@@ -17,9 +17,9 @@
 #include "json/document.h"
 #include "json/json.h"
 #include "model/fundamental.h"
-#include "net/unresolved_address.h"
 #include "security/acl.h"
 #include "utils/base64.h"
+#include "utils/unresolved_address.h"
 
 #include <seastar/net/inet_address.hh>
 

src/v/config/broker_authn_endpoint.h

@@ -15,7 +15,7 @@
 #include "json/_include_first.h"
 #include "json/stringbuffer.h"
 #include "json/writer.h"
-#include "net/unresolved_address.h"
+#include "utils/unresolved_address.h"
 
 #include <seastar/core/sstring.hh>
 

src/v/config/configuration.h

@@ -26,8 +26,8 @@
 #include "model/fundamental.h"
 #include "model/metadata.h"
 #include "model/timestamp.h"
-#include "net/unresolved_address.h"
 #include "pandaproxy/schema_registry/schema_id_validation.h"
+#include "utils/unresolved_address.h"
 
 #include <seastar/core/sstring.hh>
 #include <seastar/net/inet_address.hh>

src/v/config/node_config.cc

@@ -10,7 +10,7 @@
 #include "node_config.h"
 
 #include "config/configuration.h"
-#include "net/unresolved_address.h"
+#include "utils/unresolved_address.h"
 
 namespace config {
 

src/v/config/rest_authn_endpoint.h

@@ -15,7 +15,7 @@
 #include "json/_include_first.h"
 #include "json/stringbuffer.h"
 #include "json/writer.h"
-#include "net/unresolved_address.h"
+#include "utils/unresolved_address.h"
 
 #include <seastar/core/sstring.hh>
 

src/v/config/seed_server.h

@@ -13,7 +13,7 @@
 
 #include "base/seastarx.h"
 #include "config/convert.h"
-#include "net/unresolved_address.h"
+#include "utils/unresolved_address.h"
 
 #include <model/metadata.h>
 #include <yaml-cpp/yaml.h>

src/v/config/tests/seed_server_property_test.cc

@@ -9,7 +9,7 @@
 
 #include "config/node_config.h"
 #include "config/seed_server.h"
-#include "net/unresolved_address.h"
+#include "utils/unresolved_address.h"
 
 #include <seastar/testing/thread_test_case.hh>
 

src/v/config/validators.cc

@@ -15,8 +15,8 @@
 #include "config/configuration.h"
 #include "model/namespace.h"
 #include "model/validation.h"
-#include "net/inet_address_wrapper.h"
 #include "ssx/sformat.h"
+#include "utils/inet_address_wrapper.h"
 
 #include <absl/algorithm/container.h>
 #include <absl/container/flat_hash_set.h>

src/v/http/include/http/tests/http_imposter.h

@@ -13,7 +13,7 @@
 #include "base/seastarx.h"
 #include "base/vassert.h"
 #include "http/tests/registered_urls.h"
-#include "net/unresolved_address.h"
+#include "utils/unresolved_address.h"
 
 #include <seastar/core/sstring.hh>
 #include <seastar/http/httpd.hh>

src/v/json/json.h

@@ -17,8 +17,8 @@
 #include "json/stream.h"
 #include "json/stringbuffer.h"
 #include "json/writer.h"
-#include "net/unresolved_address.h"
 #include "utils/named_type.h"
+#include "utils/unresolved_address.h"
 
 #include <seastar/core/circular_buffer.hh>
 

src/v/kafka/client/client.cc

@@ -27,9 +27,9 @@
 #include "model/fundamental.h"
 #include "model/metadata.h"
 #include "model/timeout_clock.h"
-#include "net/unresolved_address.h"
 #include "random/generators.h"
 #include "ssx/future-util.h"
+#include "utils/unresolved_address.h"
 
 #include <seastar/core/coroutine.hh>
 #include <seastar/core/future.hh>

src/v/kafka/client/client.h

@@ -27,9 +27,9 @@
 #include "kafka/protocol/fetch.h"
 #include "kafka/protocol/list_offsets.h"
 #include "kafka/types.h"
-#include "net/unresolved_address.h"
 #include "ssx/semaphore.h"
 #include "utils/retry.h"
+#include "utils/unresolved_address.h"
 
 #include <seastar/core/condition-variable.hh>
 

src/v/kafka/client/test/consumer_group.cc

@@ -36,9 +36,9 @@
 #include "kafka/types.h"
 #include "model/fundamental.h"
 #include "model/metadata.h"
-#include "net/unresolved_address.h"
 #include "redpanda/tests/fixture.h"
 #include "ssx/future-util.h"
+#include "utils/unresolved_address.h"
 
 #include <seastar/core/loop.hh>
 #include <seastar/core/sleep.hh>

src/v/kafka/client/test/fetch.cc

@@ -21,8 +21,8 @@
 #include "kafka/types.h"
 #include "model/fundamental.h"
 #include "model/metadata.h"
-#include "net/unresolved_address.h"
 #include "redpanda/tests/fixture.h"
+#include "utils/unresolved_address.h"
 
 #include <boost/test/tools/old/interface.hpp>
 

src/v/kafka/client/test/produce.cc

@@ -17,7 +17,7 @@
 #include "kafka/protocol/metadata.h"
 #include "model/fundamental.h"
 #include "model/metadata.h"
-#include "net/unresolved_address.h"
+#include "utils/unresolved_address.h"
 
 #include <chrono>
 

src/v/kafka/client/test/reconnect.cc

@@ -17,8 +17,8 @@
 #include "kafka/protocol/produce.h"
 #include "model/fundamental.h"
 #include "model/metadata.h"
-#include "net/unresolved_address.h"
 #include "pandaproxy/test/utils.h"
+#include "utils/unresolved_address.h"
 
 #include <seastar/util/defer.hh>
 

src/v/migrations/CMakeLists.txt

@@ -9,4 +9,5 @@ v_cc_library(
     v::model
     v::config
     v::compression
+    v::net
 )

src/v/model/metadata.h

@@ -14,9 +14,9 @@
 #include "base/seastarx.h"
 #include "base/units.h"
 #include "model/fundamental.h"
-#include "net/unresolved_address.h"
 #include "serde/envelope.h"
 #include "utils/named_type.h"
+#include "utils/unresolved_address.h"
 #include "utils/xid.h"
 
 #include <seastar/core/sstring.hh>

src/v/model/tests/randoms.h

@@ -18,10 +18,10 @@
 #include "model/metadata.h"
 #include "model/record.h"
 #include "model/timestamp.h"
-#include "net/tests/randoms.h"
 #include "pandaproxy/schema_registry/subject_name_strategy.h"
 #include "random/generators.h"
 #include "test_utils/randoms.h"
+#include "utils/tests/randoms.h"
 
 namespace model {
 inline model::topic_namespace random_topic_namespace() {

src/v/net/conn_quota.cc

@@ -7,7 +7,7 @@
 // the Business Source License, use of this software will be governed
 // by the Apache License, Version 2.0
 
-#include "conn_quota.h"
+#include "net/conn_quota.h"
 
 #include "base/vlog.h"
 #include "config/configuration.h"

src/v/net/dns.cc

@@ -10,8 +10,8 @@
  */
 #include "net/dns.h"
 
-#include "net/unresolved_address.h"
 #include "utils/mutex.h"
+#include "utils/unresolved_address.h"
 
 #include <seastar/core/coroutine.hh>
 #include <seastar/net/dns.hh>

src/v/net/connection_rate.h → src/v/net/include/net/connection_rate.h

@@ -15,10 +15,10 @@
 #include "base/vassert.h"
 #include "config/validators.h"
 #include "net/connection_rate_counter.h"
-#include "net/inet_address_wrapper.h"
 #include "net/server_probe.h"
 #include "seastar/core/coroutine.hh"
 #include "ssx/future-util.h"
+#include "utils/inet_address_wrapper.h"
 
 #include <seastar/core/abort_source.hh>
 #include <seastar/core/gate.hh>

src/v/net/dns.h → src/v/net/include/net/dns.h

@@ -9,7 +9,7 @@
  * by the Apache License, Version 2.0
  */
 #pragma once
-#include "net/unresolved_address.h"
+#include "utils/unresolved_address.h"
 
 namespace net {
 

src/v/net/transport.h → src/v/net/include/net/transport.h

@@ -13,7 +13,7 @@
 #include "net/batched_output_stream.h"
 #include "net/client_probe.h"
 #include "net/types.h"
-#include "net/unresolved_address.h"
+#include "utils/unresolved_address.h"
 
 #include <seastar/core/gate.hh>
 #include <seastar/core/iostream.hh>

src/v/net/tests/dns.cc

@@ -10,7 +10,7 @@
 
 #include "net/dns.h"
 
-#include "net/unresolved_address.h"
+#include "utils/unresolved_address.h"
 
 #include <seastar/testing/thread_test_case.hh>