From 1bc60747f3e831983c48dcf78d05023e4b50e06d Mon Sep 17 00:00:00 2001 From: gauravsnj Date: Wed, 23 Feb 2022 20:31:07 +0530 Subject: [PATCH 1/5] Added the string "pg-adapter" in the list of allowed client library token, so that when PG Adapter connects via client library by passing the string "pg-adapter" in the user-agent header, it doesn't get discarded. --- .../main/java/com/google/cloud/spanner/SpannerOptions.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java index 65de63b720f..b62b2d44556 100644 --- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java +++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java @@ -80,6 +80,7 @@ public class SpannerOptions extends ServiceOptions { private static final String JDBC_API_CLIENT_LIB_TOKEN = "sp-jdbc"; private static final String HIBERNATE_API_CLIENT_LIB_TOKEN = "sp-hib"; private static final String LIQUIBASE_API_CLIENT_LIB_TOKEN = "sp-liq"; + private static final String PG_ADAPTER_CLIENT_LIB_TOKEN = "pg-adapter"; private static final String API_SHORT_NAME = "Spanner"; private static final String DEFAULT_HOST = "https://spanner.googleapis.com"; @@ -657,7 +658,8 @@ public static class Builder ServiceOptions.getGoogApiClientLibName(), JDBC_API_CLIENT_LIB_TOKEN, HIBERNATE_API_CLIENT_LIB_TOKEN, - LIQUIBASE_API_CLIENT_LIB_TOKEN); + LIQUIBASE_API_CLIENT_LIB_TOKEN, + PG_ADAPTER_CLIENT_LIB_TOKEN); private TransportChannelProvider channelProvider; @SuppressWarnings("rawtypes") From dab9fcebe2b984e01075a2acc4b7d3e122c48f04 Mon Sep 17 00:00:00 2001 From: gauravsnj Date: Wed, 23 Feb 2022 20:42:05 +0530 Subject: [PATCH 2/5] Added an additional test case for the testSetClientLibToken test. --- .../com/google/cloud/spanner/SpannerOptionsTest.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerOptionsTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerOptionsTest.java index fc82954ad40..30892bf1945 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerOptionsTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerOptionsTest.java @@ -502,6 +502,7 @@ public void testDoNotCacheClosedSpannerInstance() { public void testSetClientLibToken() { final String jdbcToken = "sp-jdbc"; final String hibernateToken = "sp-hib"; + final String pgAdapterToken = "pg-adapter"; SpannerOptions options = SpannerOptions.newBuilder() .setProjectId("some-project") @@ -518,6 +519,14 @@ public void testSetClientLibToken() { .build(); assertThat(options.getClientLibToken()).isEqualTo(hibernateToken); + options = + SpannerOptions.newBuilder() + .setProjectId("some-project") + .setCredentials(NoCredentials.getInstance()) + .setClientLibToken(pgAdapterToken) + .build(); + assertThat(options.getClientLibToken()).isEqualTo(pgAdapterToken); + options = SpannerOptions.newBuilder() .setProjectId("some-project") From b42a810cd35f469eebbdf9d6ae4e82a053f2057f Mon Sep 17 00:00:00 2001 From: gauravsnj Date: Thu, 24 Feb 2022 15:24:42 +0530 Subject: [PATCH 3/5] Changed assertThat to assertEquals --- .../test/java/com/google/cloud/spanner/SpannerOptionsTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerOptionsTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerOptionsTest.java index 30892bf1945..1c2f93755f0 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerOptionsTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerOptionsTest.java @@ -19,6 +19,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertThrows; import static org.mockito.Mockito.mock; @@ -532,7 +533,7 @@ public void testSetClientLibToken() { .setProjectId("some-project") .setCredentials(NoCredentials.getInstance()) .build(); - assertThat(options.getClientLibToken()).isEqualTo(ServiceOptions.getGoogApiClientLibName()); + assertEquals(options.getClientLibToken(), ServiceOptions.getGoogApiClientLibName()); } @Test(expected = IllegalArgumentException.class) From 33932474810b35e9d7f029bf054bb3b6348d00ab Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Thu, 24 Feb 2022 21:46:33 +0000 Subject: [PATCH 4/5] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20po?= =?UTF-8?q?st-processor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0ca34109dc3..c12763f9052 100644 --- a/README.md +++ b/README.md @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-spanner' If you are using Gradle without BOM, add this to your dependencies ```Groovy -implementation 'com.google.cloud:google-cloud-spanner:6.19.1' +implementation 'com.google.cloud:google-cloud-spanner:6.20.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "6.19.1" +libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "6.20.0" ``` ## Authentication From cfeec6e422103c641cb517345763e021d5c356f0 Mon Sep 17 00:00:00 2001 From: gauravsnj Date: Fri, 25 Feb 2022 16:33:54 +0530 Subject: [PATCH 5/5] Changed assertThat to assertEquals --- .../test/java/com/google/cloud/spanner/SpannerOptionsTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerOptionsTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerOptionsTest.java index 1c2f93755f0..7d5c8a553aa 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerOptionsTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerOptionsTest.java @@ -526,7 +526,7 @@ public void testSetClientLibToken() { .setCredentials(NoCredentials.getInstance()) .setClientLibToken(pgAdapterToken) .build(); - assertThat(options.getClientLibToken()).isEqualTo(pgAdapterToken); + assertEquals(options.getClientLibToken(), pgAdapterToken); options = SpannerOptions.newBuilder()