RSCBC-147: Use same Address struct across core and connstr

Simplifies some code, and reduces repetition.

Author: Peter-Searby

sdk/couchbase-core/Cargo.toml

@@ -42,14 +42,14 @@ tokio-util = { version = "0.7", features = ["codec"] }
 
 tokio-rustls = { version = "0.26.0", optional = true }
 
+couchbase-connstr = { path = "../couchbase-connstr" }
+
 [dev-dependencies]
 chrono = "0.4.38"
 env_logger = "0.11"
 envconfig = "0.10"
 serial_test = "3.2.0"
 
-couchbase-connstr = { path = "../couchbase-connstr" }
-
 [features]
 dhat-heap = ["dhat"]
 

sdk/couchbase-core/src/address.rs

@@ -1,4 +1,3 @@
-use crate::address::Address;
 use crate::auth_mechanism::AuthMechanism;
 use crate::authenticator::Authenticator;
 use crate::cbconfig::TerseConfig;
@@ -48,6 +47,7 @@ use crate::vbucketrouter::{
 use crate::{httpx, mgmtx};
 
 use byteorder::BigEndian;
+use couchbase_connstr::Address;
 use futures::executor::block_on;
 use log::{debug, error, info, warn};
 use uuid::Uuid;

sdk/couchbase-core/src/agent.rs

@@ -1,4 +1,3 @@
-use crate::address::Address;
 use crate::auth_mechanism::AuthMechanism;
 use crate::authenticator::{Authenticator, UserPassPair};
 use crate::error::Error;
@@ -17,6 +16,7 @@ use crate::service_type::ServiceType;
 use crate::tls_config::TlsConfig;
 use crate::util::hostname_from_addr_str;
 use chrono::{DateTime, FixedOffset, Local, NaiveDateTime, Utc};
+use couchbase_connstr::Address;
 use futures::future::BoxFuture;
 use log::{debug, warn};
 use std::future::Future;

sdk/couchbase-core/src/kvclient.rs

@@ -2,7 +2,6 @@ extern crate core;
 #[macro_use]
 extern crate lazy_static;
 
-pub mod address;
 pub mod agent;
 pub mod agent_ops;
 pub mod auth_mechanism;

sdk/couchbase-core/src/lib.rs

@@ -1,6 +1,7 @@
 use crate::memdx::error::Error;
 use crate::memdx::error::Result;
 use crate::tls_config::TlsConfig;
+use couchbase_connstr::Address;
 use socket2::TcpKeepalive;
 use std::fmt::Debug;
 use std::io;
@@ -10,7 +11,6 @@ use tokio::io::{AsyncRead, AsyncWrite};
 use tokio::net::TcpStream;
 use tokio::time::{timeout_at, Instant};
 
-use crate::address::Address;
 #[cfg(all(feature = "rustls-tls", not(feature = "native-tls")))]
 use {
     tokio_rustls::rustls::pki_types::DnsName, tokio_rustls::rustls::pki_types::ServerName,

sdk/couchbase-core/src/memdx/connection.rs

@@ -1,4 +1,5 @@
-use crate::address::Address;
+use couchbase_connstr::Address;
+
 use crate::auth_mechanism::AuthMechanism;
 use crate::authenticator::Authenticator;
 use crate::tls_config::TlsConfig;

sdk/couchbase-core/src/options/agent.rs

@@ -1,8 +1,7 @@
 use crate::common::default_agent_options;
 use crate::common::node_version::NodeVersion;
 use crate::common::test_agent::TestAgent;
-use couchbase_connstr::ResolvedConnSpec;
-use couchbase_core::address::Address;
+use couchbase_connstr::{Address, ResolvedConnSpec};
 use couchbase_core::agent::Agent;
 use envconfig::Envconfig;
 use lazy_static::lazy_static;
@@ -166,14 +165,7 @@ pub async fn create_test_config(test_config: &EnvTestConfig) -> TestSetupConfig
     TestSetupConfig {
         username: test_config.username.clone(),
         password: test_config.password.clone(),
-        memd_addrs: resolved_conn_spec
-            .memd_hosts
-            .iter()
-            .map(|h| Address {
-                host: h.host.clone(),
-                port: h.port,
-            })
-            .collect(),
+        memd_addrs: resolved_conn_spec.memd_hosts.clone(),
         data_timeout: test_config.data_timeout.clone(),
         use_ssl: resolved_conn_spec.use_ssl,
         bucket: test_config.default_bucket.clone(),

sdk/couchbase-core/tests/common/test_config.rs

@@ -16,7 +16,6 @@ use crate::clients::user_mgmt_client::{
 use crate::error;
 use crate::options::cluster_options::ClusterOptions;
 use couchbase_connstr::{parse, resolve, Address, SrvRecord};
-use couchbase_core::address;
 use couchbase_core::ondemand_agentmanager::OnDemandAgentManager;
 use couchbase_core::options::agent::{CompressionConfig, SeedConfig};
 use couchbase_core::options::ondemand_agentmanager::OnDemandAgentManagerOptions;
@@ -193,24 +192,8 @@ impl CouchbaseClusterBackend {
         };
 
         let seed_config = SeedConfig::new()
-            .memd_addrs(
-                memd_hosts
-                    .into_iter()
-                    .map(|a| address::Address {
-                        host: a.host,
-                        port: a.port,
-                    })
-                    .collect(),
-            )
-            .http_addrs(
-                http_hosts
-                    .into_iter()
-                    .map(|a| address::Address {
-                        host: a.host,
-                        port: a.port,
-                    })
-                    .collect(),
-            );
+            .memd_addrs(memd_hosts.clone())
+            .http_addrs(http_hosts.clone());
 
         let mut compression_config = CompressionConfig::default();
         if let Some(cm) = opts.compression_mode {