Skip to content

Commit 04a3e16

Browse files
olavloiteolavloite
authored
Merge branch 'main' into main
2 parents b3615d2 + ace11d5 commit 04a3e16

File tree

38 files changed

+3383
-1154
lines changed

38 files changed

+3383
-1154
lines changed

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
# For syntax help see:
55
# https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
66

7-
# The @googleapis/api-spanner-java is the default owner for changes in this repo
7+
# The @googleapis/spanner-client-libraries-java is the default owner for changes in this repo
88
* @googleapis/yoshi-java @googleapis/spanner-client-libraries-java

‎.repo-metadata.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"api_id": "spanner.googleapis.com",
1414
"library_type": "GAPIC_COMBO",
1515
"requires_billing": true,
16-
"codeowner_team": "@googleapis/api-spanner-java",
16+
"codeowner_team": "@googleapis/spanner-client-libraries-java",
1717
"excluded_poms": "google-cloud-spanner-bom",
1818
"issue_tracker": "https://issuetracker.google.com/issues?q=componentid:190851%2B%20status:open",
1919
"recommended_package": "com.google.cloud.spanner",

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ If you are using Maven without the BOM, add this to your dependencies:
4949
If you are using Gradle 5.x or later, add this to your dependencies:
5050

5151
```Groovy
52-
implementation platform('com.google.cloud:libraries-bom:26.54.0')
52+
implementation platform('com.google.cloud:libraries-bom:26.55.0')
5353
5454
implementation 'com.google.cloud:google-cloud-spanner'
5555
```

‎generation_config.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
gapic_generator_version: 2.53.0
2-
googleapis_commitish: 9605bff3d36fbdb1227b26bce68258c5f00815e4
3-
libraries_bom_version: 26.54.0
2+
googleapis_commitish: fbbbf5023815f9a662c85aa8af8f3b72467fcb6f
3+
libraries_bom_version: 26.55.0
44
libraries:
55
- api_shortname: spanner
66
name_pretty: Cloud Spanner
@@ -17,7 +17,7 @@ libraries:
1717
api_id: spanner.googleapis.com
1818
transport: grpc
1919
requires_billing: true
20-
codeowner_team: '@googleapis/api-spanner-java'
20+
codeowner_team: '@googleapis/spanner-client-libraries-java'
2121
library_type: GAPIC_COMBO
2222
excluded_poms: google-cloud-spanner-bom
2323
recommended_package: com.google.cloud.spanner

‎google-cloud-spanner-executor/src/main/resources/META-INF/native-image/com.google.cloud.spanner.executor.v1/reflect-config.json‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1781,6 +1781,24 @@
17811781
"allDeclaredClasses": true,
17821782
"allPublicClasses": true
17831783
},
1784+
{
1785+
"name": "com.google.spanner.admin.database.v1.BackupInstancePartition",
1786+
"queryAllDeclaredConstructors": true,
1787+
"queryAllPublicConstructors": true,
1788+
"queryAllDeclaredMethods": true,
1789+
"allPublicMethods": true,
1790+
"allDeclaredClasses": true,
1791+
"allPublicClasses": true
1792+
},
1793+
{
1794+
"name": "com.google.spanner.admin.database.v1.BackupInstancePartition$Builder",
1795+
"queryAllDeclaredConstructors": true,
1796+
"queryAllPublicConstructors": true,
1797+
"queryAllDeclaredMethods": true,
1798+
"allPublicMethods": true,
1799+
"allDeclaredClasses": true,
1800+
"allPublicClasses": true
1801+
},
17841802
{
17851803
"name": "com.google.spanner.admin.database.v1.BackupSchedule",
17861804
"queryAllDeclaredConstructors": true,
@@ -6110,6 +6128,15 @@
61106128
"allDeclaredClasses": true,
61116129
"allPublicClasses": true
61126130
},
6131+
{
6132+
"name": "com.google.spanner.v1.TransactionOptions$IsolationLevel",
6133+
"queryAllDeclaredConstructors": true,
6134+
"queryAllPublicConstructors": true,
6135+
"queryAllDeclaredMethods": true,
6136+
"allPublicMethods": true,
6137+
"allDeclaredClasses": true,
6138+
"allPublicClasses": true
6139+
},
61136140
{
61146141
"name": "com.google.spanner.v1.TransactionOptions$PartitionedDml",
61156142
"queryAllDeclaredConstructors": true,

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -822,4 +822,10 @@
822822
<method>java.lang.Object runTransaction(com.google.cloud.spanner.connection.Connection$TransactionCallable)</method>
823823
</difference>
824824

825+
<!-- Added external host option -->
826+
<difference>
827+
<differenceType>7012</differenceType>
828+
<className>com/google/cloud/spanner/SpannerOptions$SpannerEnvironment</className>
829+
<method>com.google.auth.oauth2.GoogleCredentials getDefaultExternalHostCredentials()</method>
830+
</difference>
825831
</differences>

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

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
import com.google.api.gax.tracing.ApiTracerFactory;
3535
import com.google.api.gax.tracing.BaseApiTracerFactory;
3636
import com.google.api.gax.tracing.OpencensusTracerFactory;
37+
import com.google.auth.oauth2.AccessToken;
38+
import com.google.auth.oauth2.GoogleCredentials;
3739
import com.google.cloud.NoCredentials;
3840
import com.google.cloud.ServiceDefaults;
3941
import com.google.cloud.ServiceOptions;
@@ -56,6 +58,7 @@
5658
import com.google.common.annotations.VisibleForTesting;
5759
import com.google.common.base.MoreObjects;
5860
import com.google.common.base.Preconditions;
61+
import com.google.common.base.Strings;
5962
import com.google.common.collect.ImmutableMap;
6063
import com.google.common.collect.ImmutableSet;
6164
import com.google.common.util.concurrent.ThreadFactoryBuilder;
@@ -79,8 +82,11 @@
7982
import java.io.IOException;
8083
import java.net.MalformedURLException;
8184
import java.net.URL;
85+
import java.nio.file.Files;
86+
import java.nio.file.Paths;
8287
import java.time.Duration;
8388
import java.util.ArrayList;
89+
import java.util.Base64;
8490
import java.util.HashMap;
8591
import java.util.List;
8692
import java.util.Map;
@@ -92,6 +98,7 @@
9298
import java.util.concurrent.ThreadFactory;
9399
import java.util.concurrent.TimeUnit;
94100
import java.util.concurrent.atomic.AtomicInteger;
101+
import java.util.regex.Pattern;
95102
import javax.annotation.Nonnull;
96103
import javax.annotation.Nullable;
97104
import javax.annotation.concurrent.GuardedBy;
@@ -110,6 +117,11 @@ public class SpannerOptions extends ServiceOptions<Spanner, SpannerOptions> {
110117

111118
private static final String API_SHORT_NAME = "Spanner";
112119
private static final String DEFAULT_HOST = "https://spanner.googleapis.com";
120+
private static final String CLOUD_SPANNER_HOST_FORMAT = ".*\\.googleapis\\.com.*";
121+
122+
@VisibleForTesting
123+
static final Pattern CLOUD_SPANNER_HOST_PATTERN = Pattern.compile(CLOUD_SPANNER_HOST_FORMAT);
124+
113125
private static final ImmutableSet<String> SCOPES =
114126
ImmutableSet.of(
115127
"https://www.googleapis.com/auth/spanner.admin",
@@ -843,8 +855,15 @@ default boolean isEnableEndToEndTracing() {
843855
default String getMonitoringHost() {
844856
return null;
845857
}
858+
859+
default GoogleCredentials getDefaultExternalHostCredentials() {
860+
return null;
861+
}
846862
}
847863

864+
static final String DEFAULT_SPANNER_EXTERNAL_HOST_CREDENTIALS =
865+
"SPANNER_EXTERNAL_HOST_AUTH_TOKEN";
866+
848867
/**
849868
* Default implementation of {@link SpannerEnvironment}. Reads all configuration from environment
850869
* variables.
@@ -900,6 +919,11 @@ public boolean isEnableEndToEndTracing() {
900919
public String getMonitoringHost() {
901920
return System.getenv(SPANNER_MONITORING_HOST);
902921
}
922+
923+
@Override
924+
public GoogleCredentials getDefaultExternalHostCredentials() {
925+
return getOAuthTokenFromFile(System.getenv(DEFAULT_SPANNER_EXTERNAL_HOST_CREDENTIALS));
926+
}
903927
}
904928

905929
/** Builder for {@link SpannerOptions} instances. */
@@ -967,6 +991,7 @@ public static class Builder
967991
private boolean enableBuiltInMetrics = SpannerOptions.environment.isEnableBuiltInMetrics();
968992
private String monitoringHost = SpannerOptions.environment.getMonitoringHost();
969993
private SslContext mTLSContext = null;
994+
private boolean isExternalHost = false;
970995

971996
private static String createCustomClientLibToken(String token) {
972997
return token + " " + ServiceOptions.getGoogApiClientLibName();
@@ -1459,6 +1484,9 @@ public Builder setDecodeMode(DecodeMode decodeMode) {
14591484
@Override
14601485
public Builder setHost(String host) {
14611486
super.setHost(host);
1487+
if (!CLOUD_SPANNER_HOST_PATTERN.matcher(host).matches()) {
1488+
this.isExternalHost = true;
1489+
}
14621490
// Setting a host should override any SPANNER_EMULATOR_HOST setting.
14631491
setEmulatorHost(null);
14641492
return this;
@@ -1629,6 +1657,8 @@ public SpannerOptions build() {
16291657
this.setChannelConfigurator(ManagedChannelBuilder::usePlaintext);
16301658
// As we are using plain text, we should never send any credentials.
16311659
this.setCredentials(NoCredentials.getInstance());
1660+
} else if (isExternalHost && credentials == null) {
1661+
credentials = environment.getDefaultExternalHostCredentials();
16321662
}
16331663
if (this.numChannels == null) {
16341664
this.numChannels =
@@ -1669,6 +1699,24 @@ public static void useDefaultEnvironment() {
16691699
SpannerOptions.environment = SpannerEnvironmentImpl.INSTANCE;
16701700
}
16711701

1702+
@InternalApi
1703+
public static GoogleCredentials getDefaultExternalHostCredentialsFromSysEnv() {
1704+
return getOAuthTokenFromFile(System.getenv(DEFAULT_SPANNER_EXTERNAL_HOST_CREDENTIALS));
1705+
}
1706+
1707+
private static @Nullable GoogleCredentials getOAuthTokenFromFile(@Nullable String file) {
1708+
if (!Strings.isNullOrEmpty(file)) {
1709+
String token;
1710+
try {
1711+
token = Base64.getEncoder().encodeToString(Files.readAllBytes(Paths.get(file)));
1712+
} catch (IOException e) {
1713+
throw SpannerExceptionFactory.newSpannerException(e);
1714+
}
1715+
return GoogleCredentials.create(new AccessToken(token, null));
1716+
}
1717+
return null;
1718+
}
1719+
16721720
/**
16731721
* Enables OpenTelemetry traces. Enabling OpenTelemetry traces will disable OpenCensus traces. By
16741722
* default, OpenCensus traces are enabled.

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -921,6 +921,8 @@ private ConnectionOptions(Builder builder) {
921921
getInitialConnectionPropertyValue(AUTO_CONFIG_EMULATOR),
922922
usePlainText,
923923
System.getenv());
924+
GoogleCredentials defaultExternalHostCredentials =
925+
SpannerOptions.getDefaultExternalHostCredentialsFromSysEnv();
924926
// Using credentials on a plain text connection is not allowed, so if the user has not specified
925927
// any credentials and is using a plain text connection, we should not try to get the
926928
// credentials from the environment, but default to NoCredentials.
@@ -935,6 +937,8 @@ && getInitialConnectionPropertyValue(OAUTH_TOKEN) == null
935937
this.credentials =
936938
new GoogleCredentials(
937939
new AccessToken(getInitialConnectionPropertyValue(OAUTH_TOKEN), null));
940+
} else if (isExternalHost && defaultExternalHostCredentials != null) {
941+
this.credentials = defaultExternalHostCredentials;
938942
} else if (getInitialConnectionPropertyValue(CREDENTIALS_PROVIDER) != null) {
939943
try {
940944
this.credentials = getInitialConnectionPropertyValue(CREDENTIALS_PROVIDER).getCredentials();

‎google-cloud-spanner/src/main/resources/META-INF/native-image/com.google.cloud.spanner.admin.database.v1/reflect-config.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1781,6 +1781,24 @@
17811781
"allDeclaredClasses": true,
17821782
"allPublicClasses": true
17831783
},
1784+
{
1785+
"name": "com.google.spanner.admin.database.v1.BackupInstancePartition",
1786+
"queryAllDeclaredConstructors": true,
1787+
"queryAllPublicConstructors": true,
1788+
"queryAllDeclaredMethods": true,
1789+
"allPublicMethods": true,
1790+
"allDeclaredClasses": true,
1791+
"allPublicClasses": true
1792+
},
1793+
{
1794+
"name": "com.google.spanner.admin.database.v1.BackupInstancePartition$Builder",
1795+
"queryAllDeclaredConstructors": true,
1796+
"queryAllPublicConstructors": true,
1797+
"queryAllDeclaredMethods": true,
1798+
"allPublicMethods": true,
1799+
"allDeclaredClasses": true,
1800+
"allPublicClasses": true
1801+
},
17841802
{
17851803
"name": "com.google.spanner.admin.database.v1.BackupSchedule",
17861804
"queryAllDeclaredConstructors": true,

‎google-cloud-spanner/src/main/resources/META-INF/native-image/com.google.cloud.spanner.v1/reflect-config.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2249,6 +2249,15 @@
22492249
"allDeclaredClasses": true,
22502250
"allPublicClasses": true
22512251
},
2252+
{
2253+
"name": "com.google.spanner.v1.TransactionOptions$IsolationLevel",
2254+
"queryAllDeclaredConstructors": true,
2255+
"queryAllPublicConstructors": true,
2256+
"queryAllDeclaredMethods": true,
2257+
"allPublicMethods": true,
2258+
"allDeclaredClasses": true,
2259+
"allPublicClasses": true
2260+
},
22522261
{
22532262
"name": "com.google.spanner.v1.TransactionOptions$PartitionedDml",
22542263
"queryAllDeclaredConstructors": true,

0 commit comments

Comments
 (0)