RSCBC-147: Fix http tests when running against cluster_run

Fix test_json_block_read in tests/http.rs to use the http port, not
just assume 8091.

Author: Peter-Searby

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

@@ -48,6 +48,7 @@ pub struct TestSetupConfig {
     pub username: String,
     pub password: String,
     pub memd_addrs: Vec<Address>,
+    pub http_addrs: Vec<Address>,
     pub data_timeout: String,
     pub use_ssl: bool,
     pub bucket: String,
@@ -166,6 +167,7 @@ pub async fn create_test_config(test_config: &EnvTestConfig) -> TestSetupConfig
         username: test_config.username.clone(),
         password: test_config.password.clone(),
         memd_addrs: resolved_conn_spec.memd_hosts.clone(),
+        http_addrs: resolved_conn_spec.http_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/http.rs

@@ -47,14 +47,17 @@ pub struct QueryMetrics {
 #[test]
 fn test_row_streamer() {
     setup_test(async |config| {
-        let addrs = config.memd_addrs;
+        let scheme = if config.use_ssl { "https" } else { "http" };
+        let addrs = config.http_addrs;
 
-        let host = addrs.first().unwrap().host.clone();
+        let addr = addrs.first().unwrap();
+        let host = &addr.host;
+        let port = addr.port;
 
         let basic_auth = BasicAuth::new(config.username, config.password);
 
         let request_body = json!({"statement": "select i from array_range(1, 10000) AS i;"});
-        let uri = format!("http://{host}:8093/query/service");
+        let uri = format!("{scheme}://{host}:{port}/_p/query/query/service");
 
         let request = Request::new(Method::POST, uri)
             .user_agent("rscbcorex".to_string())
@@ -116,12 +119,15 @@ fn test_row_streamer() {
 #[test]
 fn test_json_block_read() {
     setup_test(async |config| {
-        let addrs = config.memd_addrs;
+        let scheme = if config.use_ssl { "https" } else { "http" };
+        let addrs = config.http_addrs;
 
-        let host = addrs.first().unwrap().host.clone();
+        let addr = addrs.first().unwrap();
+        let host = &addr.host;
+        let port = addr.port;
 
         let basic_auth = BasicAuth::new(config.username, config.password);
-        let uri = format!("http://{host}:8091/pools/default/terseClusterInfo");
+        let uri = format!("{scheme}://{host}:{port}/pools/default/terseClusterInfo");
 
         let request = Request::new(Method::GET, uri)
             .user_agent("rscbcorex".to_string())