Connect to server specified in serverless bundle

Before this change, the driver, when connecting to a serverless cluster,
would try to resolve host-id.* domains as a proxy IP for each node.

This commit aligns the behavior with scylladb/python-driver#177 and
scylladb/gocql#106. Now, the "Server" field of bundle is the single
hostname/IP the driver will use for proxy connection.

This simplifies the setup we had in integration tests, removing the
necessity of hacks to work around previous behavior (driver trying to
resolve host-id.* domains).

Fixes #164
Fixes #167
Fixes #169

Author: avelanarius

driver-core/src/main/java/com/datastax/driver/core/Cluster.java

@@ -1406,7 +1406,7 @@ protected Builder withScyllaCloudConnectionConfig(ScyllaCloudConnectionConfig co
         Builder builder =
             withEndPointFactory(
                     new ScyllaCloudSniEndPointFactory(
-                        currentDatacenter.getNodeDomain(), proxyAddress.getPort()))
+                        proxyAddress, currentDatacenter.getNodeDomain()))
                 .withSSL(
                     (config.getCurrentAuthInfo().isInsecureSkipTlsVerify()
                         ? config.createBundle().getInsecureSSLOptions()
@@ -1423,7 +1423,7 @@ protected Builder withScyllaCloudConnectionConfig(ScyllaCloudConnectionConfig co
           throw new IllegalStateException(
               "Can't use withCloudSecureConnectBundle if you've already called addContactPoint(s)");
         }
-        builder.addContactPoint(new SniEndPoint(proxyAddress, proxyAddress.getHostName()));
+        builder.addContactPoint(new SniEndPoint(proxyAddress, currentDatacenter.getNodeDomain()));
 
         return builder;
       } catch (IOException e) {

driver-core/src/main/java/com/datastax/driver/core/ScyllaCloudSniEndPointFactory.java

@@ -25,11 +25,12 @@
 
 class ScyllaCloudSniEndPointFactory implements EndPointFactory {
   private final String nodeDomain;
-  private final int port;
 
-  public ScyllaCloudSniEndPointFactory(String nodeDomain, int port) {
+  private final InetSocketAddress proxy;
+
+  public ScyllaCloudSniEndPointFactory(InetSocketAddress proxy, String nodeDomain) {
+    this.proxy = proxy;
     this.nodeDomain = nodeDomain;
-    this.port = port;
   }
 
   @Override
@@ -39,7 +40,6 @@ public void init(Cluster cluster) {}
   public EndPoint create(Row row) {
     UUID host_id = row.getUUID("host_id");
     String sni = host_id.toString() + "." + nodeDomain;
-    InetSocketAddress proxy = InetSocketAddress.createUnresolved(sni, port);
     return new SniEndPoint(proxy, sni);
   }
 }

driver-core/src/test/java/com/datastax/driver/core/CCMTestsSupport.java

@@ -24,7 +24,6 @@
 import static com.datastax.driver.core.CreateCCM.TestMode.PER_CLASS;
 import static com.datastax.driver.core.CreateCCM.TestMode.PER_METHOD;
 import static com.datastax.driver.core.TestUtils.CREATE_KEYSPACE_SIMPLE_FORMAT;
-import static com.datastax.driver.core.TestUtils.addressOfNode;
 import static com.datastax.driver.core.TestUtils.executeNoFail;
 import static com.datastax.driver.core.TestUtils.ipOfNode;
 import static org.assertj.core.api.Assertions.fail;
@@ -40,7 +39,6 @@
 import com.google.common.util.concurrent.Uninterruptibles;
 import java.io.Closeable;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;
@@ -778,26 +776,7 @@ public Cluster.Builder createClusterBuilderScyllaCloud() throws IOException {
     File clusterFile = new File(ccmdir, ccm.getClusterName());
     File yamlFile = new File(clusterFile, "config_data.yaml");
 
-    final ScyllaCloudConnectionConfig cloudConfig =
-        ScyllaCloudConnectionConfig.fromInputStream(new FileInputStream(yamlFile));
-
-    builder.withScyllaCloudConnectionConfig(cloudConfig);
-    builder.withEndPointFactory(
-        new MockSniEndPointFactory(
-            InetSocketAddress.createUnresolved(
-                addressOfNode(1).getHostAddress(),
-                cloudConfig.getCurrentDatacenter().getServer().getPort()),
-            builder.getConfiguration().getPolicies().getEndPointFactory()));
-    builder.addContactPoint(
-        new SniEndPoint(
-            InetSocketAddress.createUnresolved(
-                addressOfNode(1).getHostAddress(),
-                cloudConfig.getCurrentDatacenter().getServer().getPort()),
-            cloudConfig.getCurrentDatacenter().getServer().getHostName()));
-
-    builder
-        .withCodecRegistry(new CodecRegistry())
-        .withPort(cloudConfig.getCurrentDatacenter().getServer().getPort());
+    builder.withScyllaCloudConnectionConfig(yamlFile);
     return builder;
   }