diff --git a/README.md b/README.md index a8558f81..b67b110d 100644 --- a/README.md +++ b/README.md @@ -175,7 +175,7 @@ For non-Java applications or tools like `cqlsh`, you can run the Spanner Cassand **Configuration Notes:** * **Database URI**: You must specify the Spanner database URI. This is done via the `databaseUri` property in YAML or the `-DdatabaseUri` system property. - * **Host**: The default host is `0.0.0.0`. This can be overridden with the `host` property in YAML or `-Dhost`. + * **Host**: The default host is `127.0.0.1`. This can be overridden with the `host` property in YAML or `-Dhost`. * **Port**: The default port is `9042`. This can be overridden with the `port` property in YAML or `-Dport`. * **gRPC Channels**: The default number of gRPC channels is `4`. This can be overridden with `numGrpcChannels` in YAML or `-DnumGrpcChannels`. * **Health Check**: You can optionally enable a health check endpoint. diff --git a/docs/config-options.md b/docs/config-options.md index 18138543..030306ce 100644 --- a/docs/config-options.md +++ b/docs/config-options.md @@ -17,7 +17,7 @@ globalClientConfigs: listeners: # The name of the listener. It is recommended to use a meaningful name, such as the cluster name. - name: "listener_1" - # [Optional] The host to bind the listener to. Defaults to "0.0.0.0". + # [Optional] The host to bind the listener to. Defaults to "127.0.0.1". host: "127.0.0.1" # [Optional] The port to bind the listener to. Defaults to 9042. port: 9042 diff --git a/docs/cqlsh.md b/docs/cqlsh.md index 09a756ab..41c3f88d 100644 --- a/docs/cqlsh.md +++ b/docs/cqlsh.md @@ -63,6 +63,8 @@ Replace `` and `` with the appropriate v ### Option 2: Use Dockerized cqlsh +> **Note:** By default, the standalone Spanner Cassandra Launcher binds to `127.0.0.1`. To connect from inside a Docker container, either run the container with host networking (`docker run --network host -it nuvo/docker-cqlsh cqlsh 127.0.0.1 9042 --protocol-version 4`) or start the launcher with `-Dhost=0.0.0.0` (or `host: "0.0.0.0"` in `config.yaml`) behind appropriate firewall controls. + #### Step 1: Install Docker Ensure Docker is installed on your machine. Follow the instructions on the [Docker website](https://docs.docker.com/get-docker/) to install Docker for your operating system. diff --git a/google-cloud-spanner-cassandra/src/main/java/com/google/cloud/spanner/adapter/Adapter.java b/google-cloud-spanner-cassandra/src/main/java/com/google/cloud/spanner/adapter/Adapter.java index a0032d1c..8b96c6a5 100644 --- a/google-cloud-spanner-cassandra/src/main/java/com/google/cloud/spanner/adapter/Adapter.java +++ b/google-cloud-spanner-cassandra/src/main/java/com/google/cloud/spanner/adapter/Adapter.java @@ -30,6 +30,7 @@ import com.google.cloud.NoCredentials; import com.google.cloud.spanner.adapter.SpannerCqlSessionBuilder.InstanceType; import com.google.common.base.MoreObjects; +import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; import com.google.spanner.adapter.v1.AdapterClient; import com.google.spanner.adapter.v1.AdapterSettings; @@ -178,7 +179,10 @@ void start() { serverSocket = new ServerSocket( options.getTcpPort(), DEFAULT_CONNECTION_BACKLOG, options.getInetAddress()); - LOG.info("Local TCP server started on {}:{}", options.getInetAddress(), options.getTcpPort()); + LOG.info( + "Local TCP server started on {}:{}", + options.getInetAddress(), + serverSocket.getLocalPort()); if (executor == null) { executor = Executors.newCachedThreadPool(); @@ -211,6 +215,17 @@ void stop() throws IOException { LOG.info("Adapter stopped."); } + /** + * Returns the local port the server socket is bound to (the OS-assigned port when {@code tcpPort} + * is {@code 0}). + * + * @throws IllegalStateException if the adapter has not been started. + */ + int getBoundPort() { + Preconditions.checkState(started && serverSocket != null, "Adapter was never started!"); + return serverSocket.getLocalPort(); + } + private void acceptClientConnections() { try { while (!Thread.currentThread().isInterrupted()) { diff --git a/google-cloud-spanner-cassandra/src/main/java/com/google/cloud/spanner/adapter/AdapterOptions.java b/google-cloud-spanner-cassandra/src/main/java/com/google/cloud/spanner/adapter/AdapterOptions.java index 0121967d..ed1b7ba0 100644 --- a/google-cloud-spanner-cassandra/src/main/java/com/google/cloud/spanner/adapter/AdapterOptions.java +++ b/google-cloud-spanner-cassandra/src/main/java/com/google/cloud/spanner/adapter/AdapterOptions.java @@ -22,6 +22,7 @@ import com.google.common.base.Strings; import java.net.InetAddress; import java.time.Duration; +import java.util.Objects; import java.util.Optional; /** Options for creating the {@link Adapter}. */ @@ -33,7 +34,7 @@ class AdapterOptions { static class Builder { String spannerEndpoint = DEFAULT_SPANNER_ENDPOINT; int tcpPort; - InetAddress inetAddress; + InetAddress inetAddress = InetAddress.getLoopbackAddress(); String databaseUri; int numGrpcChannels = DEFAULT_NUM_GRPC_CHANNELS; Optional maxCommitDelay = Optional.empty(); @@ -60,7 +61,7 @@ Builder tcpPort(int tcpPort) { /** The specific local {@link InetAddress} for the server socket to bind to. */ Builder inetAddress(InetAddress inetAddress) { - this.inetAddress = inetAddress; + this.inetAddress = Objects.requireNonNull(inetAddress, "inetAddress cannot be null"); return this; } diff --git a/google-cloud-spanner-cassandra/src/main/java/com/google/cloud/spanner/adapter/Launcher.java b/google-cloud-spanner-cassandra/src/main/java/com/google/cloud/spanner/adapter/Launcher.java index ec0a8670..652ac628 100644 --- a/google-cloud-spanner-cassandra/src/main/java/com/google/cloud/spanner/adapter/Launcher.java +++ b/google-cloud-spanner-cassandra/src/main/java/com/google/cloud/spanner/adapter/Launcher.java @@ -62,7 +62,7 @@ *
    *
  • {@code databaseUri}: (Required) The URI of the target Spanner database. *
  • {@code host}: (Optional) The hostname or IP address to bind the service to. Defaults to - * "0.0.0.0". + * "127.0.0.1". *
  • {@code port}: (Optional) The port number to bind the service to. Defaults to 9042. *
  • {@code numGrpcChannels}: (Optional) The number of gRPC channels to use for communication * with Spanner. Defaults to 4. @@ -212,6 +212,7 @@ public void shutdown() { } private void startHealthCheckServer(HealthCheckConfig config) throws IOException { + warnIfNonLoopback(config.getHostAddress(), "health check server"); healthCheckServer = adapterFactory.createHealthCheckServer(config.getHostAddress(), config.getPort()); healthCheckServer.start(); @@ -264,6 +265,7 @@ private DatabaseName resolveDatabaseName(ListenerConfig config) { } private void startAdapter(ListenerConfig config) throws IOException { + warnIfNonLoopback(config.getHostAddress(), "listener"); LOG.info( "Starting Adapter for Spanner database {} on {}:{} with {} gRPC channels, max commit" + " delay of {} and built-in metrics enabled: {}", @@ -283,4 +285,22 @@ private void startAdapter(ListenerConfig config) throws IOException { adapters.add(adapter); adapter.start(); } + + /** + * Logs a WARN when {@code address} is {@code null} (wildcard) or non-loopback. + * + * @return {@code true} if a warning was logged. + */ + static boolean warnIfNonLoopback(InetAddress address, String component) { + if (address == null || !address.isLoopbackAddress()) { + LOG.warn( + "Binding {} to non-loopback address {} exposes the unauthenticated adapter over the" + + " network. Prefer 127.0.0.1 or ::1 unless remote access is secured by network" + + " controls.", + component, + address); + return true; + } + return false; + } } diff --git a/google-cloud-spanner-cassandra/src/main/java/com/google/cloud/spanner/adapter/LauncherConfig.java b/google-cloud-spanner-cassandra/src/main/java/com/google/cloud/spanner/adapter/LauncherConfig.java index 37773cd5..6ab79f72 100644 --- a/google-cloud-spanner-cassandra/src/main/java/com/google/cloud/spanner/adapter/LauncherConfig.java +++ b/google-cloud-spanner-cassandra/src/main/java/com/google/cloud/spanner/adapter/LauncherConfig.java @@ -21,6 +21,7 @@ import com.google.cloud.spanner.adapter.configs.ListenerConfigs; import com.google.cloud.spanner.adapter.configs.UserConfigs; import com.google.common.base.Strings; +import com.google.common.net.HostAndPort; import com.google.spanner.adapter.v1.DatabaseName; import java.net.InetAddress; import java.net.UnknownHostException; @@ -398,14 +399,21 @@ public int getPort() { } static HealthCheckConfig fromEndpointString(String endpoint) throws UnknownHostException { - String[] parts = endpoint.split(":"); - if (parts.length != 2) { + final HostAndPort hostAndPort; + try { + hostAndPort = HostAndPort.fromString(endpoint); + } catch (IllegalArgumentException e) { + throw new IllegalArgumentException( + "Invalid health check endpoint format '" + endpoint + "'. Expected 'host:port'.", e); + } + if (!hostAndPort.hasPort() || Strings.isNullOrEmpty(hostAndPort.getHost())) { throw new IllegalArgumentException( "Invalid health check endpoint format '" + endpoint + "'. Expected 'host:port'."); } - String host = parts[0]; - int port = parsePort(parts[1]); - return newBuilder().hostAddress(InetAddress.getByName(host)).port(port).build(); + return newBuilder() + .hostAddress(InetAddress.getByName(hostAndPort.getHost())) + .port(hostAndPort.getPort()) + .build(); } @Nullable diff --git a/google-cloud-spanner-cassandra/src/main/java/com/google/cloud/spanner/adapter/SpannerCqlSessionBuilder.java b/google-cloud-spanner-cassandra/src/main/java/com/google/cloud/spanner/adapter/SpannerCqlSessionBuilder.java index edc3e30c..ae6f1706 100644 --- a/google-cloud-spanner-cassandra/src/main/java/com/google/cloud/spanner/adapter/SpannerCqlSessionBuilder.java +++ b/google-cloud-spanner-cassandra/src/main/java/com/google/cloud/spanner/adapter/SpannerCqlSessionBuilder.java @@ -17,13 +17,18 @@ package com.google.cloud.spanner.adapter; import com.datastax.oss.driver.api.core.CqlSession; +import com.datastax.oss.driver.api.core.config.DefaultDriverOption; +import com.datastax.oss.driver.api.core.config.DriverConfigLoader; import com.datastax.oss.driver.api.core.metadata.EndPoint; import com.datastax.oss.driver.api.core.session.SessionBuilder; +import com.datastax.oss.driver.internal.core.metadata.DefaultEndPoint; import com.google.api.gax.rpc.TransportChannelProvider; import com.google.auth.Credentials; import com.google.cloud.spanner.adapter.metrics.BuiltInMetricsProvider; import com.google.cloud.spanner.adapter.metrics.BuiltInMetricsRecorder; +import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Strings; +import com.google.common.net.HostAndPort; import com.google.spanner.adapter.v1.DatabaseName; import io.opentelemetry.api.OpenTelemetry; import java.net.InetAddress; @@ -31,7 +36,9 @@ import java.net.SocketAddress; import java.net.UnknownHostException; import java.time.Duration; +import java.util.List; import java.util.Optional; +import java.util.Set; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; import javax.annotation.concurrent.NotThreadSafe; @@ -41,6 +48,11 @@ /** * Helper class to build a {@link CqlSession} instance that connects to Google Cloud Spanner. * + *

    When no contact point is configured, the embedded in-process adapter binds to a loopback + * address ({@code 127.0.0.1} or {@code ::1}) on an OS-assigned ephemeral port ({@code 0}). Any + * user-supplied contact point must resolve to a loopback address; non-loopback or unresolved + * contact points are rejected with {@link IllegalArgumentException}. + * *

    This class is mutable and not thread-safe. */ @NotThreadSafe @@ -55,8 +67,7 @@ public enum InstanceType { private static final Logger LOG = LoggerFactory.getLogger(SpannerCqlSessionBuilder.class); private final BuiltInMetricsProvider builtInMetricsProvider = BuiltInMetricsProvider.INSTANCE; - private static final int DEFAULT_PORT = 9042; - private static final String DEFAULT_HOST = "0.0.0.0"; + private static final int DEFAULT_PORT = 0; private static final int DEFAULT_NUM_GRPC_CHANNELS = 4; private static final int LARGEST_MAX_COMMIT_DELAY_MILLIS = 500; private static final String DEFAULT_SPANNER_ENDPOINT = "spanner.googleapis.com:443"; @@ -65,6 +76,12 @@ public enum InstanceType { private InetAddress iNetAddress; private int port; + // registeredAdapterEndPoint is builder-owned: it replaces userContactPoint in + // programmaticContactPoints only between createAndStartAdapter() and the next + // checkContactPoints(). + private EndPoint userContactPoint; + private EndPoint registeredAdapterEndPoint; + private boolean configContactPointProvided; private Adapter adapter; private int numGrpcChannels = DEFAULT_NUM_GRPC_CHANNELS; private String databaseUri = null; @@ -253,30 +270,110 @@ private void checkDatabaseUri() { } } - private void checkContactPoints() throws UnknownHostException { - if (programmaticContactPoints.size() > 1) { + @VisibleForTesting + void checkContactPoints() throws UnknownHostException { + configContactPointProvided = false; + // Restore original user contact-point state if a previous build registered an adapter + // endpoint on this builder instance, ensuring each build gets a fresh ephemeral port. + if (registeredAdapterEndPoint != null) { + programmaticContactPoints.remove(registeredAdapterEndPoint); + if (userContactPoint != null) { + programmaticContactPoints.add(userContactPoint); + } + registeredAdapterEndPoint = null; + } + + List configContactPoints = null; + try (DriverConfigLoader defaultLoader = configLoader == null ? defaultConfigLoader() : null) { + DriverConfigLoader effectiveLoader = configLoader != null ? configLoader : defaultLoader; + if (effectiveLoader != null + && effectiveLoader + .getInitialConfig() + .getDefaultProfile() + .isDefined(DefaultDriverOption.CONTACT_POINTS)) { + configContactPoints = + effectiveLoader + .getInitialConfig() + .getDefaultProfile() + .getStringList(DefaultDriverOption.CONTACT_POINTS); + } + } + + int configCount = configContactPoints != null ? configContactPoints.size() : 0; + if (programmaticContactPoints.size() + configCount > 1) { throw new IllegalArgumentException( "At most one contact point can be provided when using SpannerCqlSessionBuilder, as it" + " connects to the local adapter."); } + if (configCount == 1) { + HostAndPort parsed = HostAndPort.fromString(configContactPoints.get(0)); + if (!parsed.hasPort() || parsed.getPort() <= 0 || Strings.isNullOrEmpty(parsed.getHost())) { + throw new IllegalArgumentException( + "Contact point in DriverConfigLoader must specify host and a non-zero port, but got: " + + configContactPoints.get(0)); + } + final InetAddress[] resolvedAddresses; + try { + resolvedAddresses = InetAddress.getAllByName(parsed.getHost()); + } catch (UnknownHostException e) { + throw new IllegalArgumentException( + "Contact point for in-process SpannerCqlSessionBuilder must be a resolved loopback" + + " address, but could not resolve: " + + configContactPoints.get(0), + e); + } + for (InetAddress addr : resolvedAddresses) { + if (addr == null || !addr.isLoopbackAddress()) { + throw new IllegalArgumentException( + "Contact point for in-process SpannerCqlSessionBuilder must be a resolved loopback" + + " address, but got: " + + addr); + } + } + if (resolvedAddresses.length != 1) { + throw new IllegalArgumentException( + "At most one contact point address can be provided when using" + + " SpannerCqlSessionBuilder, but '" + + configContactPoints.get(0) + + "' resolved to " + + resolvedAddresses.length + + " addresses."); + } + iNetAddress = resolvedAddresses[0]; + userContactPoint = null; + configContactPointProvided = true; + port = parsed.getPort(); + LOG.debug("Using config-provided localhost contact point: {}:{}", iNetAddress, port); + return; + } + if (programmaticContactPoints.isEmpty()) { - iNetAddress = InetAddress.getByName(DEFAULT_HOST); + userContactPoint = null; + iNetAddress = InetAddress.getLoopbackAddress(); port = DEFAULT_PORT; LOG.info( - "No contact point provided. Defaulting to connect adapter via {}:{}", - DEFAULT_HOST, - DEFAULT_PORT); + "No contact point provided. Defaulting to connect adapter via {}:{}", iNetAddress, port); return; } // Exactly one contact point was provided by the user. Validate it. EndPoint providedEndPoint = programmaticContactPoints.iterator().next(); SocketAddress address = providedEndPoint.resolve(); + if (address == null) { + throw new IllegalArgumentException("Resolved contact point address cannot be null."); + } if (address instanceof InetSocketAddress) { InetSocketAddress inetSocketAddress = (InetSocketAddress) address; iNetAddress = inetSocketAddress.getAddress(); + if (iNetAddress == null || !iNetAddress.isLoopbackAddress()) { + throw new IllegalArgumentException( + "Contact point for in-process SpannerCqlSessionBuilder must be a resolved loopback" + + " address, but got: " + + inetSocketAddress); + } + userContactPoint = providedEndPoint; port = inetSocketAddress.getPort(); LOG.debug("Using user-provided localhost contact point: {}", inetSocketAddress); } else { @@ -301,7 +398,8 @@ private void checkMaxCommitDelay() { } } - private void createAndStartAdapter() { + @VisibleForTesting + void createAndStartAdapter() { if (instanceType == InstanceType.OMNI && !DatabaseName.isParsableFrom(databaseUri)) { databaseUri = DatabaseName.of(SPANNER_OMNI_ID, SPANNER_OMNI_ID, databaseUri).toString(); @@ -335,5 +433,47 @@ private void createAndStartAdapter() { .build(); adapter = new Adapter(adapterOptions); adapter.start(); + int boundPort = adapter.getBoundPort(); + if (!configContactPointProvided && (programmaticContactPoints.isEmpty() || port == 0)) { + registeredAdapterEndPoint = + new DefaultEndPoint(new InetSocketAddress(iNetAddress, boundPort)); + programmaticContactPoints.clear(); + programmaticContactPoints.add(registeredAdapterEndPoint); + } + } + + @VisibleForTesting + InetAddress getAdapterInetAddress() { + return iNetAddress; + } + + @VisibleForTesting + int getAdapterPort() { + return port; + } + + @VisibleForTesting + Adapter getAdapter() { + return adapter; + } + + @VisibleForTesting + Set getProgrammaticContactPoints() { + return programmaticContactPoints; + } + + @VisibleForTesting + EndPoint getUserContactPoint() { + return userContactPoint; + } + + @VisibleForTesting + String getHost() { + return host; + } + + @VisibleForTesting + InstanceType getInstanceType() { + return instanceType; } } diff --git a/google-cloud-spanner-cassandra/src/main/java/com/google/cloud/spanner/adapter/configs/ConfigConstants.java b/google-cloud-spanner-cassandra/src/main/java/com/google/cloud/spanner/adapter/configs/ConfigConstants.java index 04105a6a..9955aa73 100644 --- a/google-cloud-spanner-cassandra/src/main/java/com/google/cloud/spanner/adapter/configs/ConfigConstants.java +++ b/google-cloud-spanner-cassandra/src/main/java/com/google/cloud/spanner/adapter/configs/ConfigConstants.java @@ -28,7 +28,7 @@ private ConfigConstants() {} public static final String HOST_PROP_KEY = "host"; public static final String PORT_PROP_KEY = "port"; public static final String NUM_GRPC_CHANNELS_PROP_KEY = "numGrpcChannels"; - public static final String DEFAULT_HOST = "0.0.0.0"; + public static final String DEFAULT_HOST = "127.0.0.1"; public static final int DEFAULT_PORT = 9042; public static final int DEFAULT_NUM_GRPC_CHANNELS = 4; public static final String MAX_COMMIT_DELAY_PROP_KEY = "maxCommitDelayMillis"; diff --git a/google-cloud-spanner-cassandra/src/test/java/com/google/cloud/spanner/adapter/AdapterOptionsTest.java b/google-cloud-spanner-cassandra/src/test/java/com/google/cloud/spanner/adapter/AdapterOptionsTest.java index 3eb8271a..f0983fc6 100644 --- a/google-cloud-spanner-cassandra/src/test/java/com/google/cloud/spanner/adapter/AdapterOptionsTest.java +++ b/google-cloud-spanner-cassandra/src/test/java/com/google/cloud/spanner/adapter/AdapterOptionsTest.java @@ -17,8 +17,11 @@ package com.google.cloud.spanner.adapter; import static com.google.common.truth.Truth.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThrows; import com.google.cloud.spanner.adapter.SpannerCqlSessionBuilder.InstanceType; +import java.net.InetAddress; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -33,6 +36,18 @@ public void testDefaultInstanceType_isCloud() { assertThat(options.getInstanceType()).isEqualTo(InstanceType.CLOUD); } + @Test + public void testDefaultInetAddress_isLoopback() { + AdapterOptions options = AdapterOptions.newBuilder().build(); + + assertEquals(InetAddress.getLoopbackAddress(), options.getInetAddress()); + } + + @Test + public void testNullInetAddress_throwsNullPointerException() { + assertThrows(NullPointerException.class, () -> AdapterOptions.newBuilder().inetAddress(null)); + } + @Test public void testSetSpannerEndpointAndInstanceType_newWay() { AdapterOptions options = diff --git a/google-cloud-spanner-cassandra/src/test/java/com/google/cloud/spanner/adapter/AdapterTest.java b/google-cloud-spanner-cassandra/src/test/java/com/google/cloud/spanner/adapter/AdapterTest.java index 14e909eb..d131c82c 100644 --- a/google-cloud-spanner-cassandra/src/test/java/com/google/cloud/spanner/adapter/AdapterTest.java +++ b/google-cloud-spanner-cassandra/src/test/java/com/google/cloud/spanner/adapter/AdapterTest.java @@ -70,7 +70,9 @@ public void setUp() { public void successfulStartStopFlow() throws Exception { try (MockedConstruction mockedServerSocketConstruction = - mockConstruction(ServerSocket.class); + mockConstruction( + ServerSocket.class, + (mock, context) -> when(mock.getLocalPort()).thenReturn(TEST_PORT)); MockedStatic mockedExecutors = mockStatic(Executors.class); MockedStatic mockedStaticAdapterClient = mockStatic(AdapterClient.class); MockedStatic mockedGoogleCredentials = @@ -85,7 +87,9 @@ public void successfulStartStopFlow() throws Exception { ExecutorService mockExecutor = mock(ExecutorService.class); mockedExecutors.when(Executors::newCachedThreadPool).thenReturn(mockExecutor); + assertThrows(IllegalStateException.class, adapter::getBoundPort); adapter.start(); + assertEquals(TEST_PORT, adapter.getBoundPort()); adapter.stop(); verify(mockAdapterClient, times(1)).createSession(any(CreateSessionRequest.class)); diff --git a/google-cloud-spanner-cassandra/src/test/java/com/google/cloud/spanner/adapter/LauncherConfigParserTest.java b/google-cloud-spanner-cassandra/src/test/java/com/google/cloud/spanner/adapter/LauncherConfigParserTest.java index be2b77b6..98bbd02f 100644 --- a/google-cloud-spanner-cassandra/src/test/java/com/google/cloud/spanner/adapter/LauncherConfigParserTest.java +++ b/google-cloud-spanner-cassandra/src/test/java/com/google/cloud/spanner/adapter/LauncherConfigParserTest.java @@ -284,4 +284,42 @@ public void testParse_withValidUseClientCertConfigFile() throws Exception { assertThat(listenerConfig2.getClientCertPath()).isEqualTo("/path/to/client.crt"); assertThat(listenerConfig2.getClientKeyPath()).isEqualTo("/path/to/client.key.pkcs8"); } + + @Test + public void testDefaultHost_isLoopback() throws Exception { + Map properties = new HashMap<>(); + properties.put("databaseUri", DEFAULT_DATABASE_URI); + properties.put("healthCheckPort", "8080"); + + LauncherConfig fromProps = LauncherConfig.fromProperties(properties); + assertThat(fromProps.getListeners()).hasSize(1); + assertThat(fromProps.getListeners().get(0).getHostAddress()) + .isEqualTo(InetAddress.getByName("127.0.0.1")); + assertThat(fromProps.getHealthCheckConfig()).isNotNull(); + assertThat(fromProps.getHealthCheckConfig().getHostAddress()) + .isEqualTo(InetAddress.getByName("127.0.0.1")); + + UserConfigs userConfigs = + new UserConfigs( + null, + Collections.singletonList( + new ListenerConfigs( + "listener_default_host", + null, + 9042, + new SpannerConfigs(DEFAULT_DATABASE_URI, 4, null)))); + LauncherConfig fromYaml = LauncherConfig.fromUserConfigs(userConfigs); + assertThat(fromYaml.getListeners()).hasSize(1); + assertThat(fromYaml.getListeners().get(0).getHostAddress()) + .isEqualTo(InetAddress.getByName("127.0.0.1")); + } + + @Test + public void testHealthCheckEndpoint_ipv6Loopback() throws Exception { + HealthCheckConfig config = HealthCheckConfig.fromEndpointString("[::1]:8080"); + + assertThat(config).isNotNull(); + assertThat(config.getHostAddress()).isEqualTo(InetAddress.getByName("::1")); + assertThat(config.getPort()).isEqualTo(8080); + } } diff --git a/google-cloud-spanner-cassandra/src/test/java/com/google/cloud/spanner/adapter/LauncherTest.java b/google-cloud-spanner-cassandra/src/test/java/com/google/cloud/spanner/adapter/LauncherTest.java index 9d39fc68..c6fcdc33 100644 --- a/google-cloud-spanner-cassandra/src/test/java/com/google/cloud/spanner/adapter/LauncherTest.java +++ b/google-cloud-spanner-cassandra/src/test/java/com/google/cloud/spanner/adapter/LauncherTest.java @@ -23,6 +23,7 @@ import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.mockStatic; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -46,6 +47,8 @@ import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; +import org.mockito.MockedStatic; +import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) @@ -308,4 +311,44 @@ public void testRun_withUseClientCertMode_startsAdapterWithOptions() throws Exce assertThat(options.getClientCertPath()).isEqualTo("/path/to/client.crt"); assertThat(options.getClientKeyPath()).isEqualTo("/path/to/client.key.pkcs8"); } + + @Test + public void testWarnIfNonLoopback_emitsWarningOnlyForNonLoopback() throws Exception { + assertThat(Launcher.warnIfNonLoopback(null, "listener")).isTrue(); + assertThat(Launcher.warnIfNonLoopback(InetAddress.getByName("0.0.0.0"), "listener")).isTrue(); + assertThat(Launcher.warnIfNonLoopback(InetAddress.getByName("127.0.0.1"), "listener")) + .isFalse(); + assertThat(Launcher.warnIfNonLoopback(InetAddress.getByName("::1"), "listener")).isFalse(); + assertThat(Launcher.warnIfNonLoopback(InetAddress.getLoopbackAddress(), "health check server")) + .isFalse(); + + Map properties = new HashMap<>(); + properties.put("databaseUri", DEFAULT_DATABASE_URI); + properties.put("host", "0.0.0.0"); + properties.put("healthCheckPort", "8080"); + LauncherConfig config = LauncherConfig.fromProperties(properties); + + launcher.run(config); + verify(mockAdapterFactory, times(1)).createAdapter(adapterOptionsCaptor.capture()); + assertThat(adapterOptionsCaptor.getValue().getInetAddress()) + .isEqualTo(InetAddress.getByName("0.0.0.0")); + } + + @Test + public void testRun_withNonLoopbackHost_warnsForListenerAndHealthCheckServer() throws Exception { + Map properties = new HashMap<>(); + properties.put("databaseUri", DEFAULT_DATABASE_URI); + properties.put("host", "0.0.0.0"); + properties.put("healthCheckPort", "8080"); + LauncherConfig config = LauncherConfig.fromProperties(properties); + InetAddress wildcard = InetAddress.getByName("0.0.0.0"); + + try (MockedStatic mockedLauncher = + mockStatic(Launcher.class, Mockito.CALLS_REAL_METHODS)) { + launcher.run(config); + + mockedLauncher.verify(() -> Launcher.warnIfNonLoopback(wildcard, "listener")); + mockedLauncher.verify(() -> Launcher.warnIfNonLoopback(wildcard, "health check server")); + } + } } diff --git a/google-cloud-spanner-cassandra/src/test/java/com/google/cloud/spanner/adapter/SpannerCqlSessionBuilderTest.java b/google-cloud-spanner-cassandra/src/test/java/com/google/cloud/spanner/adapter/SpannerCqlSessionBuilderTest.java index d8540903..f67c8efe 100644 --- a/google-cloud-spanner-cassandra/src/test/java/com/google/cloud/spanner/adapter/SpannerCqlSessionBuilderTest.java +++ b/google-cloud-spanner-cassandra/src/test/java/com/google/cloud/spanner/adapter/SpannerCqlSessionBuilderTest.java @@ -17,46 +17,509 @@ package com.google.cloud.spanner.adapter; import static com.google.common.truth.Truth.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.mockStatic; +import static org.mockito.Mockito.when; +import com.datastax.oss.driver.api.core.config.DefaultDriverOption; +import com.datastax.oss.driver.api.core.config.DriverConfigLoader; +import com.datastax.oss.driver.api.core.metadata.EndPoint; +import com.google.auth.oauth2.GoogleCredentials; import com.google.cloud.spanner.adapter.SpannerCqlSessionBuilder.InstanceType; -import java.lang.reflect.Field; +import com.google.spanner.adapter.v1.AdapterClient; +import com.google.spanner.adapter.v1.AdapterSettings; +import com.google.spanner.adapter.v1.Session; +import com.typesafe.config.ConfigFactory; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.ServerSocket; +import java.net.SocketAddress; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Set; +import java.util.concurrent.CompletionStage; +import java.util.concurrent.ExecutionException; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import org.mockito.MockedStatic; @RunWith(JUnit4.class) public class SpannerCqlSessionBuilderTest { + private static final String TEST_DATABASE_URI = + "projects/test-project/instances/test-instance/databases/test-db"; + @Test - public void testSetExperimentalHostEndpoint_deprecatedButWorks() throws Exception { + public void testSetExperimentalHostEndpoint_deprecatedButWorks() { SpannerCqlSessionBuilder builder = new SpannerCqlSessionBuilder(); builder.setExperimentalHostEndpoint("experimental-host:15000"); - Field hostField = SpannerCqlSessionBuilder.class.getDeclaredField("host"); - hostField.setAccessible(true); - String host = (String) hostField.get(builder); - assertThat(host).isEqualTo("experimental-host:15000"); - - Field instanceTypeField = SpannerCqlSessionBuilder.class.getDeclaredField("instanceType"); - instanceTypeField.setAccessible(true); - InstanceType instanceType = (InstanceType) instanceTypeField.get(builder); - assertThat(instanceType).isEqualTo(InstanceType.OMNI); + assertThat(builder.getHost()).isEqualTo("experimental-host:15000"); + assertThat(builder.getInstanceType()).isEqualTo(InstanceType.OMNI); } @Test - public void testSetHostAndType_newWay() throws Exception { + public void testSetHostAndType_newWay() { SpannerCqlSessionBuilder builder = new SpannerCqlSessionBuilder(); builder.setHost("omni-host:15000"); builder.setInstanceType(InstanceType.OMNI); - Field hostField = SpannerCqlSessionBuilder.class.getDeclaredField("host"); - hostField.setAccessible(true); - String host = (String) hostField.get(builder); - assertThat(host).isEqualTo("omni-host:15000"); + assertThat(builder.getHost()).isEqualTo("omni-host:15000"); + assertThat(builder.getInstanceType()).isEqualTo(InstanceType.OMNI); + } + + @Test + public void testDefaultContactPoint_usesLoopbackAndEphemeralPort() throws Exception { + SpannerCqlSessionBuilder builder = new SpannerCqlSessionBuilder(); + + builder.checkContactPoints(); + + InetAddress inetAddress = builder.getAdapterInetAddress(); + int port = builder.getAdapterPort(); + + assertThat(inetAddress).isEqualTo(InetAddress.getLoopbackAddress()); + assertThat(inetAddress.isLoopbackAddress()).isTrue(); + assertThat(port).isEqualTo(0); + } + + @Test + public void testExplicitLoopbackContactPoint_accepted() throws Exception { + List loopbackAddresses = + Arrays.asList( + new InetSocketAddress("127.0.0.1", 9042), + new InetSocketAddress("localhost", 0), + new InetSocketAddress("::1", 0)); + + for (InetSocketAddress contactPoint : loopbackAddresses) { + SpannerCqlSessionBuilder builder = new SpannerCqlSessionBuilder(); + builder.addContactPoint(contactPoint); + + builder.checkContactPoints(); + + InetAddress resolved = builder.getAdapterInetAddress(); + int port = builder.getAdapterPort(); + assertThat(resolved).isNotNull(); + assertThat(resolved.isLoopbackAddress()).isTrue(); + assertThat(port).isEqualTo(contactPoint.getPort()); + assertThat(builder.getUserContactPoint()).isNotNull(); + } + } + + @Test + public void testNonLoopbackContactPoint_throwsIllegalArgumentException() throws Exception { + List invalidAddresses = + Arrays.asList( + new InetSocketAddress("0.0.0.0", 9042), + new InetSocketAddress("::", 9042), + new InetSocketAddress("192.168.1.1", 9042), + InetSocketAddress.createUnresolved("example.com", 9042)); + + try (MockedStatic mockedStaticAdapterClient = mockStatic(AdapterClient.class)) { + mockedStaticAdapterClient + .when(() -> AdapterClient.create(any(AdapterSettings.class))) + .thenThrow(new IllegalStateException("Adapter must not start for invalid contact point")); + + for (InetSocketAddress invalidAddress : invalidAddresses) { + SpannerCqlSessionBuilder builder = + new SpannerCqlSessionBuilder() + .setDatabaseUri(TEST_DATABASE_URI) + .setUsePlainText(true) + .addContactPoint(invalidAddress); + + CompletionStage stage = builder.buildAsync(); + ExecutionException thrown = + assertThrows(ExecutionException.class, () -> stage.toCompletableFuture().get()); + assertThat(thrown.getCause()).isInstanceOf(IllegalArgumentException.class); + } + } + } + + @Test + public void testCreateAndStartAdapter_registersBoundPortInContactPoints() throws Exception { + SpannerCqlSessionBuilder builder = + new SpannerCqlSessionBuilder() + .setDatabaseUri(TEST_DATABASE_URI) + .setHost("localhost:15000") + .setUsePlainText(true); + + Adapter startedAdapter = null; + try (MockedStatic mockedStaticAdapterClient = mockStatic(AdapterClient.class); + MockedStatic mockedGoogleCredentials = + mockStatic(GoogleCredentials.class)) { + AdapterClient mockAdapterClient = mock(AdapterClient.class); + Session mockSession = mock(Session.class); + mockedGoogleCredentials.when(GoogleCredentials::getApplicationDefault).thenReturn(null); + mockedStaticAdapterClient + .when(() -> AdapterClient.create(any(AdapterSettings.class))) + .thenReturn(mockAdapterClient); + when(mockAdapterClient.createSession(any())).thenReturn(mockSession); + + builder.checkContactPoints(); + builder.createAndStartAdapter(); + + startedAdapter = builder.getAdapter(); + assertThat(startedAdapter).isNotNull(); + int boundPort = startedAdapter.getBoundPort(); + assertThat(boundPort).isGreaterThan(0); + assertThat(boundPort).isNotEqualTo(9042); + + Set contactPoints = builder.getProgrammaticContactPoints(); + assertThat(contactPoints).hasSize(1); + InetSocketAddress resolved = (InetSocketAddress) contactPoints.iterator().next().resolve(); + assertThat(resolved.getAddress()).isEqualTo(InetAddress.getLoopbackAddress()); + assertThat(resolved.getPort()).isEqualTo(boundPort); + } finally { + if (startedAdapter != null) { + startedAdapter.stop(); + } + } + } + + @Test + public void testBuilderReuse_bindsDistinctEphemeralPorts() throws Exception { + SpannerCqlSessionBuilder builder = + new SpannerCqlSessionBuilder() + .setDatabaseUri(TEST_DATABASE_URI) + .setHost("localhost:15000") + .setUsePlainText(true); + + Adapter firstAdapter = null; + Adapter secondAdapter = null; + try (MockedStatic mockedStaticAdapterClient = mockStatic(AdapterClient.class); + MockedStatic mockedGoogleCredentials = + mockStatic(GoogleCredentials.class)) { + AdapterClient mockAdapterClient = mock(AdapterClient.class); + Session mockSession = mock(Session.class); + mockedGoogleCredentials.when(GoogleCredentials::getApplicationDefault).thenReturn(null); + mockedStaticAdapterClient + .when(() -> AdapterClient.create(any(AdapterSettings.class))) + .thenReturn(mockAdapterClient); + when(mockAdapterClient.createSession(any())).thenReturn(mockSession); + + builder.checkContactPoints(); + builder.createAndStartAdapter(); + firstAdapter = builder.getAdapter(); + int firstPort = firstAdapter.getBoundPort(); + assertThat(firstPort).isGreaterThan(0); + + builder.checkContactPoints(); + builder.createAndStartAdapter(); + secondAdapter = builder.getAdapter(); + int secondPort = secondAdapter.getBoundPort(); + assertThat(secondPort).isGreaterThan(0); + assertThat(secondPort).isNotEqualTo(firstPort); + + Set contactPoints = builder.getProgrammaticContactPoints(); + assertThat(contactPoints).hasSize(1); + InetSocketAddress resolved = (InetSocketAddress) contactPoints.iterator().next().resolve(); + assertThat(resolved.getPort()).isEqualTo(secondPort); + } finally { + if (firstAdapter != null) { + firstAdapter.stop(); + } + if (secondAdapter != null && secondAdapter != firstAdapter) { + secondAdapter.stop(); + } + } + } + + @Test + public void testConfigLoaderContactPoint_nonLoopbackThrowsIllegalArgumentException() { + DriverConfigLoader configLoader = + DriverConfigLoader.programmaticBuilder() + .withStringList( + DefaultDriverOption.CONTACT_POINTS, Collections.singletonList("10.0.0.1:9042")) + .build(); + SpannerCqlSessionBuilder builder = + new SpannerCqlSessionBuilder() + .setDatabaseUri(TEST_DATABASE_URI) + .withConfigLoader(configLoader); + + IllegalArgumentException exception = + assertThrows(IllegalArgumentException.class, builder::checkContactPoints); + assertTrue(exception.getMessage().contains("loopback address")); + } + + @Test + public void testConfigLoaderContactPoint_multipleContactPointsThrowsIllegalArgumentException() { + DriverConfigLoader configLoader = + DriverConfigLoader.programmaticBuilder() + .withStringList( + DefaultDriverOption.CONTACT_POINTS, + Arrays.asList("127.0.0.1:9042", "127.0.0.1:9043")) + .build(); + SpannerCqlSessionBuilder builder = + new SpannerCqlSessionBuilder() + .setDatabaseUri(TEST_DATABASE_URI) + .withConfigLoader(configLoader); + + assertThrows(IllegalArgumentException.class, builder::checkContactPoints); + } + + @Test + public void testConfigLoaderContactPoint_validLoopbackAccepted() throws Exception { + DriverConfigLoader configLoader = + DriverConfigLoader.programmaticBuilder() + .withStringList( + DefaultDriverOption.CONTACT_POINTS, Collections.singletonList("127.0.0.1:9042")) + .build(); + SpannerCqlSessionBuilder builder = + new SpannerCqlSessionBuilder() + .setDatabaseUri(TEST_DATABASE_URI) + .withConfigLoader(configLoader); + + builder.checkContactPoints(); + + assertEquals(InetAddress.getByName("127.0.0.1"), builder.getAdapterInetAddress()); + assertEquals(9042, builder.getAdapterPort()); + } + + @Test + public void testConfigLoaderContactPoint_multipleResolvedAddressesThrowsIllegalArgumentException() + throws Exception { + InetAddress ipv4Loopback = InetAddress.getByName("127.0.0.1"); + InetAddress ipv6Loopback = InetAddress.getByName("::1"); + InetAddress nonLoopback = InetAddress.getByName("10.0.0.1"); + + DriverConfigLoader configLoader = + DriverConfigLoader.programmaticBuilder() + .withStringList( + DefaultDriverOption.CONTACT_POINTS, Collections.singletonList("multi-host:9042")) + .build(); + SpannerCqlSessionBuilder builder = + new SpannerCqlSessionBuilder() + .setDatabaseUri(TEST_DATABASE_URI) + .withConfigLoader(configLoader); + + try (MockedStatic mockedInetAddress = mockStatic(InetAddress.class)) { + mockedInetAddress + .when(() -> InetAddress.getAllByName("multi-host")) + .thenReturn(new InetAddress[] {ipv4Loopback, ipv6Loopback}); + assertThrows(IllegalArgumentException.class, builder::checkContactPoints); + + mockedInetAddress + .when(() -> InetAddress.getAllByName("multi-host")) + .thenReturn(new InetAddress[] {ipv4Loopback, nonLoopback}); + assertThrows(IllegalArgumentException.class, builder::checkContactPoints); + } + } + + @Test + public void testConfigLoaderContactPoint_portZeroThrowsIllegalArgumentException() { + DriverConfigLoader configLoader = + DriverConfigLoader.programmaticBuilder() + .withStringList( + DefaultDriverOption.CONTACT_POINTS, Collections.singletonList("127.0.0.1:0")) + .build(); + + try (MockedStatic mockedStaticAdapterClient = mockStatic(AdapterClient.class)) { + mockedStaticAdapterClient + .when(() -> AdapterClient.create(any(AdapterSettings.class))) + .thenThrow(new IllegalStateException("Adapter must not start for port 0 in config")); + + SpannerCqlSessionBuilder builder = + new SpannerCqlSessionBuilder() + .setDatabaseUri(TEST_DATABASE_URI) + .setUsePlainText(true) + .withConfigLoader(configLoader); + + CompletionStage stage = builder.buildAsync(); + ExecutionException thrown = + assertThrows(ExecutionException.class, () -> stage.toCompletableFuture().get()); + assertEquals(IllegalArgumentException.class, thrown.getCause().getClass()); + } + } + + @Test + public void testDefaultConfigLoaderContactPoint_nonLoopbackThrowsIllegalArgumentException() { + String propertyKey = "datastax-java-driver.basic.contact-points.0"; + String previousValue = System.getProperty(propertyKey); + System.setProperty(propertyKey, "192.168.1.1:9042"); + try (MockedStatic mockedStaticAdapterClient = mockStatic(AdapterClient.class)) { + mockedStaticAdapterClient + .when(() -> AdapterClient.create(any(AdapterSettings.class))) + .thenThrow(new IllegalStateException("Adapter must not start for invalid contact point")); + + SpannerCqlSessionBuilder builder = + new SpannerCqlSessionBuilder().setDatabaseUri(TEST_DATABASE_URI).setUsePlainText(true); + + CompletionStage stage = builder.buildAsync(); + ExecutionException thrown = + assertThrows(ExecutionException.class, () -> stage.toCompletableFuture().get()); + assertEquals(IllegalArgumentException.class, thrown.getCause().getClass()); + } finally { + if (previousValue == null) { + System.clearProperty(propertyKey); + } else { + System.setProperty(propertyKey, previousValue); + } + ConfigFactory.invalidateCaches(); + } + } + + @Test + public void testConfigLoaderContactPoint_notDuplicatedIntoProgrammaticContactPoints() + throws Exception { + int freePort; + try (ServerSocket socket = new ServerSocket(0, 1, InetAddress.getLoopbackAddress())) { + freePort = socket.getLocalPort(); + } + DriverConfigLoader configLoader = + DriverConfigLoader.programmaticBuilder() + .withStringList( + DefaultDriverOption.CONTACT_POINTS, + Collections.singletonList("127.0.0.1:" + freePort)) + .build(); + SpannerCqlSessionBuilder builder = + new SpannerCqlSessionBuilder() + .setDatabaseUri(TEST_DATABASE_URI) + .setHost("localhost:15000") + .setUsePlainText(true) + .withConfigLoader(configLoader); + + Adapter adapter = null; + try (MockedStatic mockedStaticAdapterClient = mockStatic(AdapterClient.class); + MockedStatic mockedGoogleCredentials = + mockStatic(GoogleCredentials.class)) { + AdapterClient mockAdapterClient = mock(AdapterClient.class); + Session mockSession = mock(Session.class); + mockedGoogleCredentials.when(GoogleCredentials::getApplicationDefault).thenReturn(null); + mockedStaticAdapterClient + .when(() -> AdapterClient.create(any(AdapterSettings.class))) + .thenReturn(mockAdapterClient); + when(mockAdapterClient.createSession(any())).thenReturn(mockSession); + + builder.checkContactPoints(); + builder.createAndStartAdapter(); + adapter = builder.getAdapter(); + + assertEquals(freePort, adapter.getBoundPort()); + assertThat(builder.getProgrammaticContactPoints()).isEmpty(); + } finally { + if (adapter != null) { + adapter.stop(); + } + } + } + + @Test + public void testNullResolvedContactPoint_throwsIllegalArgumentException() { + EndPoint nullEndPoint = + new EndPoint() { + @Override + public SocketAddress resolve() { + return null; + } + + @Override + public String asMetricPrefix() { + return "null"; + } + }; + SpannerCqlSessionBuilder builder = + new SpannerCqlSessionBuilder() + .setDatabaseUri(TEST_DATABASE_URI) + .addContactEndPoint(nullEndPoint); + + assertThrows(IllegalArgumentException.class, builder::checkContactPoints); + } + + @Test + public void testExplicitLoopbackPortZero_registersBoundPortInContactPoints() throws Exception { + SpannerCqlSessionBuilder builder = + new SpannerCqlSessionBuilder() + .setDatabaseUri(TEST_DATABASE_URI) + .setUsePlainText(true) + .addContactPoint(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0)); + + Adapter adapter = null; + try (MockedStatic mockedStaticAdapterClient = mockStatic(AdapterClient.class); + MockedStatic mockedGoogleCredentials = + mockStatic(GoogleCredentials.class)) { + AdapterClient mockAdapterClient = mock(AdapterClient.class); + Session mockSession = mock(Session.class); + mockedGoogleCredentials.when(GoogleCredentials::getApplicationDefault).thenReturn(null); + mockedStaticAdapterClient + .when(() -> AdapterClient.create(any(AdapterSettings.class))) + .thenReturn(mockAdapterClient); + when(mockAdapterClient.createSession(any())).thenReturn(mockSession); + + builder.checkContactPoints(); + builder.createAndStartAdapter(); + adapter = builder.getAdapter(); + Set contactPoints = builder.getProgrammaticContactPoints(); + assertEquals(1, contactPoints.size()); + InetSocketAddress resolved = (InetSocketAddress) contactPoints.iterator().next().resolve(); + assertTrue("Expected bound port > 0, got " + resolved.getPort(), resolved.getPort() > 0); + + // Verify builder reuse restores the original user-supplied contact point. + builder.checkContactPoints(); + assertEquals(1, builder.getProgrammaticContactPoints().size()); + assertSame( + builder.getUserContactPoint(), builder.getProgrammaticContactPoints().iterator().next()); + } finally { + if (adapter != null) { + adapter.stop(); + } + } + } + + @Test + public void testCustomEndPointWithFixedPort_notReplacedByCreateAndStartAdapter() + throws Exception { + int freePort; + try (ServerSocket socket = new ServerSocket(0, 1, InetAddress.getLoopbackAddress())) { + freePort = socket.getLocalPort(); + } + InetSocketAddress customAddr = + new InetSocketAddress(InetAddress.getLoopbackAddress(), freePort); + EndPoint customEndPoint = + new EndPoint() { + @Override + public SocketAddress resolve() { + return customAddr; + } + + @Override + public String asMetricPrefix() { + return "custom"; + } + }; + SpannerCqlSessionBuilder builder = + new SpannerCqlSessionBuilder() + .setDatabaseUri(TEST_DATABASE_URI) + .setUsePlainText(true) + .addContactEndPoint(customEndPoint); + + Adapter adapter = null; + try (MockedStatic mockedStaticAdapterClient = mockStatic(AdapterClient.class); + MockedStatic mockedGoogleCredentials = + mockStatic(GoogleCredentials.class)) { + AdapterClient mockAdapterClient = mock(AdapterClient.class); + Session mockSession = mock(Session.class); + mockedGoogleCredentials.when(GoogleCredentials::getApplicationDefault).thenReturn(null); + mockedStaticAdapterClient + .when(() -> AdapterClient.create(any(AdapterSettings.class))) + .thenReturn(mockAdapterClient); + when(mockAdapterClient.createSession(any())).thenReturn(mockSession); - Field instanceTypeField = SpannerCqlSessionBuilder.class.getDeclaredField("instanceType"); - instanceTypeField.setAccessible(true); - InstanceType instanceType = (InstanceType) instanceTypeField.get(builder); - assertThat(instanceType).isEqualTo(InstanceType.OMNI); + builder.checkContactPoints(); + builder.createAndStartAdapter(); + adapter = builder.getAdapter(); + Set contactPoints = builder.getProgrammaticContactPoints(); + assertEquals(1, contactPoints.size()); + assertSame(customEndPoint, contactPoints.iterator().next()); + } finally { + if (adapter != null) { + adapter.stop(); + } + } } }