Merge branch 'main' into default-sequence-kind

Author: olavloite

.github/CODEOWNERS

@@ -4,5 +4,5 @@
 # For syntax help see:
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
 
-# The @googleapis/api-spanner-java is the default owner for changes in this repo
+# The @googleapis/spanner-client-libraries-java is the default owner for changes in this repo
 *                       @googleapis/yoshi-java @googleapis/spanner-client-libraries-java

.repo-metadata.json

@@ -13,7 +13,7 @@
   "api_id": "spanner.googleapis.com",
   "library_type": "GAPIC_COMBO",
   "requires_billing": true,
-  "codeowner_team": "@googleapis/api-spanner-java",
+  "codeowner_team": "@googleapis/spanner-client-libraries-java",
   "excluded_poms": "google-cloud-spanner-bom",
   "issue_tracker": "https://issuetracker.google.com/issues?q=componentid:190851%2B%20status:open",
   "recommended_package": "com.google.cloud.spanner",

generation_config.yaml

@@ -1,5 +1,5 @@
 gapic_generator_version: 2.53.0
-googleapis_commitish: 6bc8e91bf92cc985da5ed0c227b48f12315cb695
+googleapis_commitish: fbbbf5023815f9a662c85aa8af8f3b72467fcb6f
 libraries_bom_version: 26.55.0
 libraries:
   - api_shortname: spanner
@@ -17,7 +17,7 @@ libraries:
     api_id: spanner.googleapis.com
     transport: grpc
     requires_billing: true
-    codeowner_team: '@googleapis/api-spanner-java'
+    codeowner_team: '@googleapis/spanner-client-libraries-java'
     library_type: GAPIC_COMBO
     excluded_poms: google-cloud-spanner-bom
     recommended_package: com.google.cloud.spanner

google-cloud-spanner/clirr-ignored-differences.xml

@@ -822,6 +822,13 @@
     <method>java.lang.Object runTransaction(com.google.cloud.spanner.connection.Connection$TransactionCallable)</method>
   </difference>
 
+  <!-- Added external host option -->
+  <difference>
+    <differenceType>7012</differenceType>
+    <className>com/google/cloud/spanner/SpannerOptions$SpannerEnvironment</className>
+    <method>com.google.auth.oauth2.GoogleCredentials getDefaultExternalHostCredentials()</method>
+  </difference>
+
   <!-- Default sequence kind -->
   <difference>
     <differenceType>7012</differenceType>
@@ -833,5 +840,4 @@
     <className>com/google/cloud/spanner/connection/Connection</className>
     <method>java.lang.String getDefaultSequenceKind()</method>
   </difference>
-  
 </differences>

google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java

@@ -34,6 +34,8 @@
 import com.google.api.gax.tracing.ApiTracerFactory;
 import com.google.api.gax.tracing.BaseApiTracerFactory;
 import com.google.api.gax.tracing.OpencensusTracerFactory;
+import com.google.auth.oauth2.AccessToken;
+import com.google.auth.oauth2.GoogleCredentials;
 import com.google.cloud.NoCredentials;
 import com.google.cloud.ServiceDefaults;
 import com.google.cloud.ServiceOptions;
@@ -56,6 +58,7 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
+import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
@@ -79,8 +82,11 @@
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.time.Duration;
 import java.util.ArrayList;
+import java.util.Base64;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -92,6 +98,7 @@
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.regex.Pattern;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.GuardedBy;
@@ -110,6 +117,11 @@ public class SpannerOptions extends ServiceOptions<Spanner, SpannerOptions> {
 
   private static final String API_SHORT_NAME = "Spanner";
   private static final String DEFAULT_HOST = "https://spanner.googleapis.com";
+  private static final String CLOUD_SPANNER_HOST_FORMAT = ".*\\.googleapis\\.com.*";
+
+  @VisibleForTesting
+  static final Pattern CLOUD_SPANNER_HOST_PATTERN = Pattern.compile(CLOUD_SPANNER_HOST_FORMAT);
+
   private static final ImmutableSet<String> SCOPES =
       ImmutableSet.of(
           "https://www.googleapis.com/auth/spanner.admin",
@@ -843,8 +855,15 @@ default boolean isEnableEndToEndTracing() {
     default String getMonitoringHost() {
       return null;
     }
+
+    default GoogleCredentials getDefaultExternalHostCredentials() {
+      return null;
+    }
   }
 
+  static final String DEFAULT_SPANNER_EXTERNAL_HOST_CREDENTIALS =
+      "SPANNER_EXTERNAL_HOST_AUTH_TOKEN";
+
   /**
    * Default implementation of {@link SpannerEnvironment}. Reads all configuration from environment
    * variables.
@@ -900,6 +919,11 @@ public boolean isEnableEndToEndTracing() {
     public String getMonitoringHost() {
       return System.getenv(SPANNER_MONITORING_HOST);
     }
+
+    @Override
+    public GoogleCredentials getDefaultExternalHostCredentials() {
+      return getOAuthTokenFromFile(System.getenv(DEFAULT_SPANNER_EXTERNAL_HOST_CREDENTIALS));
+    }
   }
 
   /** Builder for {@link SpannerOptions} instances. */
@@ -967,6 +991,7 @@ public static class Builder
     private boolean enableBuiltInMetrics = SpannerOptions.environment.isEnableBuiltInMetrics();
     private String monitoringHost = SpannerOptions.environment.getMonitoringHost();
     private SslContext mTLSContext = null;
+    private boolean isExternalHost = false;
 
     private static String createCustomClientLibToken(String token) {
       return token + " " + ServiceOptions.getGoogApiClientLibName();
@@ -1459,6 +1484,9 @@ public Builder setDecodeMode(DecodeMode decodeMode) {
     @Override
     public Builder setHost(String host) {
       super.setHost(host);
+      if (!CLOUD_SPANNER_HOST_PATTERN.matcher(host).matches()) {
+        this.isExternalHost = true;
+      }
       // Setting a host should override any SPANNER_EMULATOR_HOST setting.
       setEmulatorHost(null);
       return this;
@@ -1629,6 +1657,8 @@ public SpannerOptions build() {
         this.setChannelConfigurator(ManagedChannelBuilder::usePlaintext);
         // As we are using plain text, we should never send any credentials.
         this.setCredentials(NoCredentials.getInstance());
+      } else if (isExternalHost && credentials == null) {
+        credentials = environment.getDefaultExternalHostCredentials();
       }
       if (this.numChannels == null) {
         this.numChannels =
@@ -1669,6 +1699,24 @@ public static void useDefaultEnvironment() {
     SpannerOptions.environment = SpannerEnvironmentImpl.INSTANCE;
   }
 
+  @InternalApi
+  public static GoogleCredentials getDefaultExternalHostCredentialsFromSysEnv() {
+    return getOAuthTokenFromFile(System.getenv(DEFAULT_SPANNER_EXTERNAL_HOST_CREDENTIALS));
+  }
+
+  private static @Nullable GoogleCredentials getOAuthTokenFromFile(@Nullable String file) {
+    if (!Strings.isNullOrEmpty(file)) {
+      String token;
+      try {
+        token = Base64.getEncoder().encodeToString(Files.readAllBytes(Paths.get(file)));
+      } catch (IOException e) {
+        throw SpannerExceptionFactory.newSpannerException(e);
+      }
+      return GoogleCredentials.create(new AccessToken(token, null));
+    }
+    return null;
+  }
+
   /**
    * Enables OpenTelemetry traces. Enabling OpenTelemetry traces will disable OpenCensus traces. By
    * default, OpenCensus traces are enabled.

google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ConnectionOptions.java

@@ -923,6 +923,8 @@ private ConnectionOptions(Builder builder) {
             getInitialConnectionPropertyValue(AUTO_CONFIG_EMULATOR),
             usePlainText,
             System.getenv());
+    GoogleCredentials defaultExternalHostCredentials =
+        SpannerOptions.getDefaultExternalHostCredentialsFromSysEnv();
     // Using credentials on a plain text connection is not allowed, so if the user has not specified
     // any credentials and is using a plain text connection, we should not try to get the
     // credentials from the environment, but default to NoCredentials.
@@ -937,6 +939,8 @@ && getInitialConnectionPropertyValue(OAUTH_TOKEN) == null
       this.credentials =
           new GoogleCredentials(
               new AccessToken(getInitialConnectionPropertyValue(OAUTH_TOKEN), null));
+    } else if (isExternalHost && defaultExternalHostCredentials != null) {
+      this.credentials = defaultExternalHostCredentials;
     } else if (getInitialConnectionPropertyValue(CREDENTIALS_PROVIDER) != null) {
       try {
         this.credentials = getInitialConnectionPropertyValue(CREDENTIALS_PROVIDER).getCredentials();

google-cloud-spanner/src/test/java/com/google/cloud/spanner/MultiplexedSessionDatabaseClientMockServerTest.java

@@ -1569,49 +1569,55 @@ public void testInitialBeginTransactionWithRW_receivesUnimplemented_fallsBackToR
   // Tests the behavior of the server-side kill switch for read-write multiplexed sessions.
   @Test
   public void testPartitionedQuery_receivesUnimplemented_fallsBackToRegularSession() {
-    mockSpanner.setPartitionQueryExecutionTime(
-        SimulatedExecutionTime.ofException(
-            Status.INVALID_ARGUMENT
-                .withDescription(
-                    "Partitioned operations are not supported with multiplexed sessions")
-                .asRuntimeException()));
-    BatchClientImpl client = (BatchClientImpl) spanner.getBatchClient(DatabaseId.of("p", "i", "d"));
-
-    try (BatchReadOnlyTransaction transaction =
-        client.batchReadOnlyTransaction(TimestampBound.strong())) {
-      // Partitioned Query should fail
-      SpannerException spannerException =
-          assertThrows(
-              SpannerException.class,
-              () -> {
-                transaction.partitionQuery(PartitionOptions.getDefaultInstance(), STATEMENT);
-              });
-      assertEquals(ErrorCode.INVALID_ARGUMENT, spannerException.getErrorCode());
-
-      // Verify that we received one PartitionQueryRequest.
-      List<PartitionQueryRequest> partitionQueryRequests =
-          mockSpanner.getRequestsOfType(PartitionQueryRequest.class);
-      assertEquals(1, partitionQueryRequests.size());
-      // Verify the requests were executed using multiplexed sessions
-      Session session2 = mockSpanner.getSession(partitionQueryRequests.get(0).getSession());
-      assertNotNull(session2);
-      assertTrue(session2.getMultiplexed());
-      assertTrue(client.unimplementedForPartitionedOps.get());
-    }
-    try (BatchReadOnlyTransaction transaction =
-        client.batchReadOnlyTransaction(TimestampBound.strong())) {
-      // Partitioned Query should fail
-      transaction.partitionQuery(PartitionOptions.getDefaultInstance(), STATEMENT);
-
-      // // Verify that we received two PartitionQueryRequest. and it uses a regular session due to
-      // fallback.
-      List<PartitionQueryRequest> partitionQueryRequests =
-          mockSpanner.getRequestsOfType(PartitionQueryRequest.class);
-      assertEquals(2, partitionQueryRequests.size());
-      // Verify the requests are not executed using multiplexed sessions
-      Session session2 = mockSpanner.getSession(partitionQueryRequests.get(1).getSession());
-      assertNotNull(session2);
-      assertFalse(session2.getMultiplexed());
+    try {
+      mockSpanner.setPartitionQueryExecutionTime(
+          SimulatedExecutionTime.ofException(
+              Status.INVALID_ARGUMENT
+                  .withDescription(
+                      "Partitioned operations are not supported with multiplexed sessions")
+                  .asRuntimeException()));
+      BatchClientImpl client =
+          (BatchClientImpl) spanner.getBatchClient(DatabaseId.of("p", "i", "d"));
+
+      try (BatchReadOnlyTransaction transaction =
+          client.batchReadOnlyTransaction(TimestampBound.strong())) {
+        // Partitioned Query should fail
+        SpannerException spannerException =
+            assertThrows(
+                SpannerException.class,
+                () -> {
+                  transaction.partitionQuery(PartitionOptions.getDefaultInstance(), STATEMENT);
+                });
+        assertEquals(ErrorCode.INVALID_ARGUMENT, spannerException.getErrorCode());
+
+        // Verify that we received one PartitionQueryRequest.
+        List<PartitionQueryRequest> partitionQueryRequests =
+            mockSpanner.getRequestsOfType(PartitionQueryRequest.class);
+        assertEquals(1, partitionQueryRequests.size());
+        // Verify the requests were executed using multiplexed sessions
+        Session session2 = mockSpanner.getSession(partitionQueryRequests.get(0).getSession());
+        assertNotNull(session2);
+        assertTrue(session2.getMultiplexed());
+        assertTrue(BatchClientImpl.unimplementedForPartitionedOps.get());
+      }
+      try (BatchReadOnlyTransaction transaction =
+          client.batchReadOnlyTransaction(TimestampBound.strong())) {
+        // Partitioned Query should fail
+        transaction.partitionQuery(PartitionOptions.getDefaultInstance(), STATEMENT);
+
+        // // Verify that we received two PartitionQueryRequest. and it uses a regular session due
+        // to
+        // fallback.
+        List<PartitionQueryRequest> partitionQueryRequests =
+            mockSpanner.getRequestsOfType(PartitionQueryRequest.class);
+        assertEquals(2, partitionQueryRequests.size());
+        // Verify the requests are not executed using multiplexed sessions
+        Session session2 = mockSpanner.getSession(partitionQueryRequests.get(1).getSession());
+        assertNotNull(session2);
+        assertFalse(session2.getMultiplexed());
+      }
+    } finally {
+      BatchClientImpl.unimplementedForPartitionedOps.set(false);
     }
   }
 

google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerOptionsTest.java

@@ -16,6 +16,7 @@
 
 package com.google.cloud.spanner;
 
+import static com.google.cloud.spanner.SpannerOptions.CLOUD_SPANNER_HOST_PATTERN;
 import static com.google.common.truth.Truth.assertThat;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -1164,4 +1165,12 @@ public void checkGlobalOpenTelemetryWhenNotInjected() {
             .build();
     assertEquals(GlobalOpenTelemetry.get(), options.getOpenTelemetry());
   }
+
+  @Test
+  public void testCloudSpannerHostPattern() {
+    assertTrue(CLOUD_SPANNER_HOST_PATTERN.matcher("https://spanner.googleapis.com").matches());
+    assertTrue(
+        CLOUD_SPANNER_HOST_PATTERN.matcher("https://product-area.googleapis.com:443").matches());
+    assertFalse(CLOUD_SPANNER_HOST_PATTERN.matcher("https://some-company.com:443").matches());
+  }
 }

google-cloud-spanner/src/test/java/com/google/cloud/spanner/v1/SpannerClientTest.java

@@ -635,6 +635,7 @@ public void executeStreamingSqlTest() throws Exception {
             .setResumeToken(ByteString.EMPTY)
             .setStats(ResultSetStats.newBuilder().build())
             .setPrecommitToken(MultiplexedSessionPrecommitToken.newBuilder().build())
+            .setLast(true)
             .build();
     mockSpanner.addResponse(expectedResponse);
     ExecuteSqlRequest request =
@@ -861,6 +862,7 @@ public void streamingReadTest() throws Exception {
             .setResumeToken(ByteString.EMPTY)
             .setStats(ResultSetStats.newBuilder().build())
             .setPrecommitToken(MultiplexedSessionPrecommitToken.newBuilder().build())
+            .setLast(true)
             .build();
     mockSpanner.addResponse(expectedResponse);
     ReadRequest request =