From 88f4df4e019df6340a00895d8afdbf6e36fa9aa0 Mon Sep 17 00:00:00 2001 From: Mridula Peddada Date: Thu, 21 Apr 2022 20:20:57 -0400 Subject: [PATCH 01/23] make gax-grpc a test scope dependency --- google-cloud-bigtable-emulator/pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/google-cloud-bigtable-emulator/pom.xml b/google-cloud-bigtable-emulator/pom.xml index 1353e91088..f70c0c849e 100644 --- a/google-cloud-bigtable-emulator/pom.xml +++ b/google-cloud-bigtable-emulator/pom.xml @@ -101,6 +101,7 @@ com.google.api api-common + io.grpc grpc-api @@ -147,6 +148,13 @@ test + + + com.google.api + gax-grpc + test + + com.google.truth truth From c97371d78fac182ea7c8086572039e627d11b3c6 Mon Sep 17 00:00:00 2001 From: Mridula Peddada Date: Thu, 21 Apr 2022 21:05:42 -0400 Subject: [PATCH 02/23] add resource config --- google-cloud-bigtable-emulator/pom.xml | 1 + .../google-cloud-bigtable-emulator/resource-config.json | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 google-cloud-bigtable-emulator/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-bigtable-emulator/resource-config.json diff --git a/google-cloud-bigtable-emulator/pom.xml b/google-cloud-bigtable-emulator/pom.xml index f70c0c849e..e79ae5a3d1 100644 --- a/google-cloud-bigtable-emulator/pom.xml +++ b/google-cloud-bigtable-emulator/pom.xml @@ -154,6 +154,7 @@ gax-grpc test + com.google.truth diff --git a/google-cloud-bigtable-emulator/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-bigtable-emulator/resource-config.json b/google-cloud-bigtable-emulator/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-bigtable-emulator/resource-config.json new file mode 100644 index 0000000000..739ad191bc --- /dev/null +++ b/google-cloud-bigtable-emulator/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-bigtable-emulator/resource-config.json @@ -0,0 +1,9 @@ +{ + "resources":{ + "includes":[ + { + "pattern":"\\Qgcloud/bigtable-linux-x86_64/platform/bigtable-emulator/cbtemulator\\E" + } + ]}, + "bundles":[] +} \ No newline at end of file From 89729bea5be3ed94f77afa8cf02dece8406a91e7 Mon Sep 17 00:00:00 2001 From: Mridula Peddada Date: Thu, 21 Apr 2022 21:08:28 -0400 Subject: [PATCH 03/23] skip tests that use mockito --- ...bleEmulatorRuleTest.java => ITBigtableEmulatorRuleTest.java} | 2 +- ...minClientTest.java => BigtableInstanceAdminClientTests.java} | 2 +- ...ettingsTest.java => BigtableInstanceAdminSettingsTests.java} | 2 +- ...eAdminClientTest.java => BigtableTableAdminClientTests.java} | 2 +- ...inSettingsTest.java => BigtableTableAdminSettingsTests.java} | 2 +- ...BigtableDataClientTest.java => BigtableDataClientTests.java} | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename google-cloud-bigtable-emulator/src/test/java/com/google/cloud/bigtable/emulator/v2/{BigtableEmulatorRuleTest.java => ITBigtableEmulatorRuleTest.java} (98%) rename google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/{BigtableInstanceAdminClientTest.java => BigtableInstanceAdminClientTests.java} (99%) rename google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/{BigtableInstanceAdminSettingsTest.java => BigtableInstanceAdminSettingsTests.java} (99%) rename google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/{BigtableTableAdminClientTest.java => BigtableTableAdminClientTests.java} (99%) rename google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/{BigtableTableAdminSettingsTest.java => BigtableTableAdminSettingsTests.java} (99%) rename google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/{BigtableDataClientTest.java => BigtableDataClientTests.java} (99%) diff --git a/google-cloud-bigtable-emulator/src/test/java/com/google/cloud/bigtable/emulator/v2/BigtableEmulatorRuleTest.java b/google-cloud-bigtable-emulator/src/test/java/com/google/cloud/bigtable/emulator/v2/ITBigtableEmulatorRuleTest.java similarity index 98% rename from google-cloud-bigtable-emulator/src/test/java/com/google/cloud/bigtable/emulator/v2/BigtableEmulatorRuleTest.java rename to google-cloud-bigtable-emulator/src/test/java/com/google/cloud/bigtable/emulator/v2/ITBigtableEmulatorRuleTest.java index f0eb965299..00e2969f80 100644 --- a/google-cloud-bigtable-emulator/src/test/java/com/google/cloud/bigtable/emulator/v2/BigtableEmulatorRuleTest.java +++ b/google-cloud-bigtable-emulator/src/test/java/com/google/cloud/bigtable/emulator/v2/ITBigtableEmulatorRuleTest.java @@ -38,7 +38,7 @@ import org.junit.runners.JUnit4; @RunWith(JUnit4.class) -public class BigtableEmulatorRuleTest { +public class ITBigtableEmulatorRuleTest { @Rule public BigtableEmulatorRule bigtableRule = BigtableEmulatorRule.create(); private BigtableTableAdminBlockingStub tableAdminStub; private BigtableBlockingStub dataStub; diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClientTest.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClientTests.java similarity index 99% rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClientTest.java rename to google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClientTests.java index 8a21f95c1a..6942e2773b 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClientTest.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClientTests.java @@ -81,7 +81,7 @@ import org.mockito.stubbing.Answer; @RunWith(JUnit4.class) -public class BigtableInstanceAdminClientTest { +public class BigtableInstanceAdminClientTests { @Rule public MockitoRule mockitoRule = MockitoJUnit.rule().strictness(Strictness.WARN); private static final String PROJECT_ID = "my-project"; diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettingsTest.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettingsTests.java similarity index 99% rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettingsTest.java rename to google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettingsTests.java index fd761ff915..fe7ef2355d 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettingsTest.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettingsTests.java @@ -29,7 +29,7 @@ import org.threeten.bp.Duration; @RunWith(JUnit4.class) -public class BigtableInstanceAdminSettingsTest { +public class BigtableInstanceAdminSettingsTests { @Test public void testProjectName() throws Exception { String projectId = "my-project"; diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTest.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTests.java similarity index 99% rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTest.java rename to google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTests.java index 6e6b445758..2d18fb28f4 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTest.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTests.java @@ -91,7 +91,7 @@ import org.threeten.bp.Instant; @RunWith(JUnit4.class) -public class BigtableTableAdminClientTest { +public class BigtableTableAdminClientTests { @Rule public final MockitoRule mockitoRule = MockitoJUnit.rule(); private static final String PROJECT_ID = "my-project"; diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettingsTest.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettingsTests.java similarity index 99% rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettingsTest.java rename to google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettingsTests.java index 773bd56665..909f8214cd 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettingsTest.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettingsTests.java @@ -31,7 +31,7 @@ import org.threeten.bp.Duration; @RunWith(JUnit4.class) -public class BigtableTableAdminSettingsTest { +public class BigtableTableAdminSettingsTests { @Test public void testInstanceName() throws IOException { diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BigtableDataClientTest.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BigtableDataClientTests.java similarity index 99% rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BigtableDataClientTest.java rename to google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BigtableDataClientTests.java index 940d632c12..c158c909d5 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BigtableDataClientTest.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BigtableDataClientTests.java @@ -56,7 +56,7 @@ import org.mockito.stubbing.Answer; @RunWith(JUnit4.class) -public class BigtableDataClientTest { +public class BigtableDataClientTests { @Rule public MockitoRule mockitoRule = MockitoJUnit.rule().strictness(Strictness.WARN); From 5a311919d36f7ad3ff5a6a4bd044ed0ae8b2a35e Mon Sep 17 00:00:00 2001 From: Mridula Peddada Date: Thu, 21 Apr 2022 21:36:02 -0400 Subject: [PATCH 04/23] fix dependency issue --- google-cloud-bigtable-emulator/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-bigtable-emulator/pom.xml b/google-cloud-bigtable-emulator/pom.xml index e79ae5a3d1..c35e526ce8 100644 --- a/google-cloud-bigtable-emulator/pom.xml +++ b/google-cloud-bigtable-emulator/pom.xml @@ -70,7 +70,7 @@ maven-dependency-plugin - io.grpc:grpc-netty-shaded + io.grpc:grpc-netty-shaded,com.google.api:gax-grpc From 513a769396153857050176f79a7fd99725dafa37 Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Fri, 22 Apr 2022 01:38:16 +0000 Subject: [PATCH 05/23] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20?= =?UTF-8?q?post-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 61363f9ad0..ee27cfab30 100644 --- a/README.md +++ b/README.md @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-bigtable' If you are using Gradle without BOM, add this to your dependencies ```Groovy -implementation 'com.google.cloud:google-cloud-bigtable:2.6.1' +implementation 'com.google.cloud:google-cloud-bigtable:2.6.2' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "2.6.1" +libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "2.6.2" ``` ## Authentication From 1bf69cc8fa9d1e12222f7f7ea4886ff56ca50973 Mon Sep 17 00:00:00 2001 From: Mridula Peddada Date: Tue, 26 Apr 2022 16:55:46 -0400 Subject: [PATCH 06/23] add gax as main dependency; include supported architectures --- google-cloud-bigtable-emulator/pom.xml | 7 +++---- .../resource-config.json | 12 ++++++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/google-cloud-bigtable-emulator/pom.xml b/google-cloud-bigtable-emulator/pom.xml index c35e526ce8..17ab7b706e 100644 --- a/google-cloud-bigtable-emulator/pom.xml +++ b/google-cloud-bigtable-emulator/pom.xml @@ -70,7 +70,7 @@ maven-dependency-plugin - io.grpc:grpc-netty-shaded,com.google.api:gax-grpc + io.grpc:grpc-netty-shaded @@ -148,13 +148,12 @@ test - + com.google.api gax-grpc - test - + com.google.truth diff --git a/google-cloud-bigtable-emulator/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-bigtable-emulator/resource-config.json b/google-cloud-bigtable-emulator/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-bigtable-emulator/resource-config.json index 739ad191bc..aa986d630d 100644 --- a/google-cloud-bigtable-emulator/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-bigtable-emulator/resource-config.json +++ b/google-cloud-bigtable-emulator/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-bigtable-emulator/resource-config.json @@ -3,6 +3,18 @@ "includes":[ { "pattern":"\\Qgcloud/bigtable-linux-x86_64/platform/bigtable-emulator/cbtemulator\\E" + }, + { + "pattern":"\\Qgcloud/bigtable-darwin-x86_64/platform/bigtable-emulator/cbtemulator\\E" + }, + { + "pattern":"\\Qgcloud/bigtable-linux-x86/platform/bigtable-emulator/cbtemulator\\E" + }, + { + "pattern": "\\Qgcloud/bigtable-windows-x86_64/platform/bigtable-emulator/cbtemulator.exe\\E" + }, + { + "pattern":"\\Qgcloud/bigtable-linux-arm/platform/bigtable-emulator/cbtemulator\\E" } ]}, "bundles":[] From db0c2a0e324916fcc735fee8c5c56bac526b7698 Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Tue, 26 Apr 2022 21:03:15 +0000 Subject: [PATCH 07/23] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20?= =?UTF-8?q?post-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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ee27cfab30..485bff4252 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ If you are using Maven without BOM, add this to your dependencies: If you are using Gradle 5.x or later, add this to your dependencies ```Groovy -implementation platform('com.google.cloud:libraries-bom:25.1.0') +implementation platform('com.google.cloud:libraries-bom:25.2.0') implementation 'com.google.cloud:google-cloud-bigtable' ``` From a43f3d1d9a939d742a69859234503f61b1f79a92 Mon Sep 17 00:00:00 2001 From: Mridula Peddada Date: Tue, 26 Apr 2022 17:28:31 -0400 Subject: [PATCH 08/23] fix dependency issue --- google-cloud-bigtable-emulator/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/google-cloud-bigtable-emulator/pom.xml b/google-cloud-bigtable-emulator/pom.xml index 17ab7b706e..6f7c895bd2 100644 --- a/google-cloud-bigtable-emulator/pom.xml +++ b/google-cloud-bigtable-emulator/pom.xml @@ -69,8 +69,8 @@ org.apache.maven.plugins maven-dependency-plugin - - io.grpc:grpc-netty-shaded + + io.grpc:grpc-netty-shaded,com.google.api:gax-grpc From 2a89d2db698513f0069671f01a01eed4af0d4e20 Mon Sep 17 00:00:00 2001 From: Mridula Peddada Date: Wed, 11 May 2022 13:57:03 -0400 Subject: [PATCH 09/23] add documentation; rever unnecessary changes --- CONTRIBUTING.md | 9 ++++++++- ...Tests.java => BigtableInstanceAdminSettingsTest.java} | 2 +- ...ngsTests.java => BigtableTableAdminSettingsTest.java} | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) rename google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/{BigtableInstanceAdminSettingsTests.java => BigtableInstanceAdminSettingsTest.java} (99%) rename google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/{BigtableTableAdminSettingsTests.java => BigtableTableAdminSettingsTest.java} (99%) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5d05ad023a..bfda3e3022 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -68,4 +68,11 @@ mvn install -DskipUnitTests # To skip all tests mvn install -DskipTests -``` \ No newline at end of file +``` + + +## Native Image Testing +Native Image testing is enabled for tests that follow a particular naming +convention (`IT*` or `*ClientTest`). Unit tests that use Mockito or EasyMock +have been excluded for the time being as they are not compatible with native +image compilation. \ No newline at end of file diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettingsTests.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettingsTest.java similarity index 99% rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettingsTests.java rename to google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettingsTest.java index fe7ef2355d..fd761ff915 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettingsTests.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettingsTest.java @@ -29,7 +29,7 @@ import org.threeten.bp.Duration; @RunWith(JUnit4.class) -public class BigtableInstanceAdminSettingsTests { +public class BigtableInstanceAdminSettingsTest { @Test public void testProjectName() throws Exception { String projectId = "my-project"; diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettingsTests.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettingsTest.java similarity index 99% rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettingsTests.java rename to google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettingsTest.java index 909f8214cd..773bd56665 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettingsTests.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettingsTest.java @@ -31,7 +31,7 @@ import org.threeten.bp.Duration; @RunWith(JUnit4.class) -public class BigtableTableAdminSettingsTests { +public class BigtableTableAdminSettingsTest { @Test public void testInstanceName() throws IOException { From a95bc9acd70e4d618a10573cf597eadc0cb50ec5 Mon Sep 17 00:00:00 2001 From: Mridula Peddada Date: Wed, 11 May 2022 15:10:23 -0400 Subject: [PATCH 10/23] add documentation for exclusion --- .../bigtable/admin/v2/BigtableTableAdminClientTests.java | 3 +++ .../cloud/bigtable/data/v2/BigtableDataClientTests.java | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTests.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTests.java index 2d18fb28f4..8cce3189d0 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTests.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTests.java @@ -91,6 +91,9 @@ import org.threeten.bp.Instant; @RunWith(JUnit4.class) +/** + * Tests for {@link BigtableTableAdminClient}. This test class uses Mockito so it has been explicitly excluded from Native Image testing. + */ public class BigtableTableAdminClientTests { @Rule public final MockitoRule mockitoRule = MockitoJUnit.rule(); diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BigtableDataClientTests.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BigtableDataClientTests.java index c158c909d5..11a9ce5d3b 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BigtableDataClientTests.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BigtableDataClientTests.java @@ -24,6 +24,7 @@ import com.google.api.gax.rpc.ResponseObserver; import com.google.api.gax.rpc.ServerStreamingCallable; import com.google.api.gax.rpc.UnaryCallable; +import com.google.cloud.bigtable.admin.v2.BigtableTableAdminClient; import com.google.cloud.bigtable.data.v2.models.BulkMutation; import com.google.cloud.bigtable.data.v2.models.ConditionalRowMutation; import com.google.cloud.bigtable.data.v2.models.Filters.Filter; @@ -56,6 +57,9 @@ import org.mockito.stubbing.Answer; @RunWith(JUnit4.class) +/** + * Tests for {@link BigtableDataClient}. This test class uses Mockito so it has been explicitly excluded from Native Image testing. + */ public class BigtableDataClientTests { @Rule public MockitoRule mockitoRule = MockitoJUnit.rule().strictness(Strictness.WARN); From 2832a12a64c9cac1ef5d78078e310704f014ab66 Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Wed, 11 May 2022 19:12:31 +0000 Subject: [PATCH 11/23] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20?= =?UTF-8?q?post-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 --- .../bigtable/admin/v2/BigtableTableAdminClientTests.java | 3 ++- .../cloud/bigtable/data/v2/BigtableDataClientTests.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTests.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTests.java index 8cce3189d0..69617c4c57 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTests.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTests.java @@ -92,7 +92,8 @@ @RunWith(JUnit4.class) /** - * Tests for {@link BigtableTableAdminClient}. This test class uses Mockito so it has been explicitly excluded from Native Image testing. + * Tests for {@link BigtableTableAdminClient}. This test class uses Mockito so it has been + * explicitly excluded from Native Image testing. */ public class BigtableTableAdminClientTests { @Rule public final MockitoRule mockitoRule = MockitoJUnit.rule(); diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BigtableDataClientTests.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BigtableDataClientTests.java index 11a9ce5d3b..3e33eead5d 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BigtableDataClientTests.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BigtableDataClientTests.java @@ -24,7 +24,6 @@ import com.google.api.gax.rpc.ResponseObserver; import com.google.api.gax.rpc.ServerStreamingCallable; import com.google.api.gax.rpc.UnaryCallable; -import com.google.cloud.bigtable.admin.v2.BigtableTableAdminClient; import com.google.cloud.bigtable.data.v2.models.BulkMutation; import com.google.cloud.bigtable.data.v2.models.ConditionalRowMutation; import com.google.cloud.bigtable.data.v2.models.Filters.Filter; @@ -58,7 +57,8 @@ @RunWith(JUnit4.class) /** - * Tests for {@link BigtableDataClient}. This test class uses Mockito so it has been explicitly excluded from Native Image testing. + * Tests for {@link BigtableDataClient}. This test class uses Mockito so it has been explicitly + * excluded from Native Image testing. */ public class BigtableDataClientTests { From d4747316e48d045af941204567713f8935167db9 Mon Sep 17 00:00:00 2001 From: Mridula Peddada Date: Wed, 11 May 2022 15:22:24 -0400 Subject: [PATCH 12/23] resolve conflicts --- .../bigtable/admin/v2/BigtableInstanceAdminClientTests.java | 5 +++++ .../bigtable/admin/v2/BigtableTableAdminClientTests.java | 5 +++-- .../cloud/bigtable/data/v2/BigtableDataClientTests.java | 5 +++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClientTests.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClientTests.java index 6942e2773b..08f887d422 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClientTests.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClientTests.java @@ -81,6 +81,11 @@ import org.mockito.stubbing.Answer; @RunWith(JUnit4.class) +/** + * Tests for {@link BigtableTableAdminClient}. This test class uses Mockito so + * it has been explicitly excluded from Native Image testing by not following + * the naming convention of (IT* and *ClientTest). + */ public class BigtableInstanceAdminClientTests { @Rule public MockitoRule mockitoRule = MockitoJUnit.rule().strictness(Strictness.WARN); diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTests.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTests.java index 69617c4c57..b1c82eada8 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTests.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTests.java @@ -92,8 +92,9 @@ @RunWith(JUnit4.class) /** - * Tests for {@link BigtableTableAdminClient}. This test class uses Mockito so it has been - * explicitly excluded from Native Image testing. + * Tests for {@link BigtableTableAdminClient}. This test class uses Mockito so + * it has been explicitly excluded from Native Image testing by not following + * the naming convention of (IT* and *ClientTest). */ public class BigtableTableAdminClientTests { @Rule public final MockitoRule mockitoRule = MockitoJUnit.rule(); diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BigtableDataClientTests.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BigtableDataClientTests.java index 3e33eead5d..21f412cded 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BigtableDataClientTests.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BigtableDataClientTests.java @@ -57,8 +57,9 @@ @RunWith(JUnit4.class) /** - * Tests for {@link BigtableDataClient}. This test class uses Mockito so it has been explicitly - * excluded from Native Image testing. + * Tests for {@link BigtableDataClient}. This test class uses Mockito so it has + * been explicitly excluded from Native Image testing by not following + * the naming convention of (IT* and *ClientTest). */ public class BigtableDataClientTests { From ed3e773e0d96a14570f4fd4f4696b04a38f56ca8 Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Wed, 11 May 2022 19:25:27 +0000 Subject: [PATCH 13/23] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20?= =?UTF-8?q?post-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 --- .../bigtable/admin/v2/BigtableInstanceAdminClientTests.java | 6 +++--- .../bigtable/admin/v2/BigtableTableAdminClientTests.java | 6 +++--- .../cloud/bigtable/data/v2/BigtableDataClientTests.java | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClientTests.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClientTests.java index 08f887d422..7e5d3a8b05 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClientTests.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClientTests.java @@ -82,9 +82,9 @@ @RunWith(JUnit4.class) /** - * Tests for {@link BigtableTableAdminClient}. This test class uses Mockito so - * it has been explicitly excluded from Native Image testing by not following - * the naming convention of (IT* and *ClientTest). + * Tests for {@link BigtableTableAdminClient}. This test class uses Mockito so it has been + * explicitly excluded from Native Image testing by not following the naming convention of (IT* and + * *ClientTest). */ public class BigtableInstanceAdminClientTests { @Rule public MockitoRule mockitoRule = MockitoJUnit.rule().strictness(Strictness.WARN); diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTests.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTests.java index b1c82eada8..f3d2261869 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTests.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTests.java @@ -92,9 +92,9 @@ @RunWith(JUnit4.class) /** - * Tests for {@link BigtableTableAdminClient}. This test class uses Mockito so - * it has been explicitly excluded from Native Image testing by not following - * the naming convention of (IT* and *ClientTest). + * Tests for {@link BigtableTableAdminClient}. This test class uses Mockito so it has been + * explicitly excluded from Native Image testing by not following the naming convention of (IT* and + * *ClientTest). */ public class BigtableTableAdminClientTests { @Rule public final MockitoRule mockitoRule = MockitoJUnit.rule(); diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BigtableDataClientTests.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BigtableDataClientTests.java index 21f412cded..34c9a29d71 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BigtableDataClientTests.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BigtableDataClientTests.java @@ -57,9 +57,9 @@ @RunWith(JUnit4.class) /** - * Tests for {@link BigtableDataClient}. This test class uses Mockito so it has - * been explicitly excluded from Native Image testing by not following - * the naming convention of (IT* and *ClientTest). + * Tests for {@link BigtableDataClient}. This test class uses Mockito so it has been explicitly + * excluded from Native Image testing by not following the naming convention of (IT* and + * *ClientTest). */ public class BigtableDataClientTests { From 39d9c4adf076850353c6b6ef02dfc7826ea76b27 Mon Sep 17 00:00:00 2001 From: Mridula Peddada Date: Wed, 11 May 2022 15:33:40 -0400 Subject: [PATCH 14/23] relocate gax-grpc dependency within pom.xml --- google-cloud-bigtable-emulator/pom.xml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/google-cloud-bigtable-emulator/pom.xml b/google-cloud-bigtable-emulator/pom.xml index 6f7c895bd2..18981e2688 100644 --- a/google-cloud-bigtable-emulator/pom.xml +++ b/google-cloud-bigtable-emulator/pom.xml @@ -102,6 +102,14 @@ api-common + + + + com.google.api + gax-grpc + + + io.grpc grpc-api @@ -148,13 +156,6 @@ test - - - com.google.api - gax-grpc - - - com.google.truth truth From d84d2be3569ee2dfb337e2e1d6cda1f2f54d5533 Mon Sep 17 00:00:00 2001 From: Mridula Peddada Date: Fri, 20 May 2022 14:33:34 -0400 Subject: [PATCH 15/23] try making gax-grpc provided --- google-cloud-bigtable-emulator/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/google-cloud-bigtable-emulator/pom.xml b/google-cloud-bigtable-emulator/pom.xml index 732f9cb3ea..0f3fe21a80 100644 --- a/google-cloud-bigtable-emulator/pom.xml +++ b/google-cloud-bigtable-emulator/pom.xml @@ -107,6 +107,7 @@ com.google.api gax-grpc + provided From 9e29da7facf0b9f2896cfce33f91cb5c4cc7e41c Mon Sep 17 00:00:00 2001 From: Mridula Peddada Date: Fri, 20 May 2022 18:03:22 -0400 Subject: [PATCH 16/23] explicitly include netty native image configurations --- google-cloud-bigtable-emulator/pom.xml | 9 ---- .../native-image.properties | 8 +++ .../reflect-config.json | 54 +++++++++++++++++++ 3 files changed, 62 insertions(+), 9 deletions(-) create mode 100644 google-cloud-bigtable-emulator/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-bigtable-emulator/native-image.properties create mode 100644 google-cloud-bigtable-emulator/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-bigtable-emulator/reflect-config.json diff --git a/google-cloud-bigtable-emulator/pom.xml b/google-cloud-bigtable-emulator/pom.xml index 0f3fe21a80..af595903b7 100644 --- a/google-cloud-bigtable-emulator/pom.xml +++ b/google-cloud-bigtable-emulator/pom.xml @@ -102,15 +102,6 @@ api-common - - - - com.google.api - gax-grpc - provided - - - io.grpc grpc-api diff --git a/google-cloud-bigtable-emulator/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-bigtable-emulator/native-image.properties b/google-cloud-bigtable-emulator/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-bigtable-emulator/native-image.properties new file mode 100644 index 0000000000..8343c9730e --- /dev/null +++ b/google-cloud-bigtable-emulator/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-bigtable-emulator/native-image.properties @@ -0,0 +1,8 @@ +Args = --allow-incomplete-classpath \ + --initialize-at-run-time=io.grpc.netty.shaded.io.netty.internal.tcnative.SSL,\ + io.grpc.netty.shaded.io.netty.internal.tcnative.CertificateVerifier,\ + io.grpc.netty.shaded.io.netty.internal.tcnative.SSLPrivateKeyMethod,\ + io.grpc.netty.shaded.io.netty.internal.tcnative.AsyncSSLPrivateKeyMethod,\ + io.grpc.netty.shaded.io.netty.channel.epoll,\ + io.grpc.netty.shaded.io.netty.channel.unix,\ + io.grpc.netty.shaded.io.netty.handler.ssl \ No newline at end of file diff --git a/google-cloud-bigtable-emulator/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-bigtable-emulator/reflect-config.json b/google-cloud-bigtable-emulator/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-bigtable-emulator/reflect-config.json new file mode 100644 index 0000000000..e68928a402 --- /dev/null +++ b/google-cloud-bigtable-emulator/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-bigtable-emulator/reflect-config.json @@ -0,0 +1,54 @@ +[{ + "name": "io.grpc.netty.shaded.io.netty.channel.socket.nio.NioSocketChannel", + "methods": [ + { "name": "", "parameterTypes": [] } + ] +}, + { + "name":"com.google.api.FieldBehavior", + "queriedMethods":[ + {"name":"getValueDescriptor","parameterTypes":[] }, + {"name":"valueOf","parameterTypes":["com.google.protobuf.Descriptors$EnumValueDescriptor"] } + ] + }, + { + "name":"com.google.protobuf.DescriptorProtos$FieldOptions", + "queryAllDeclaredMethods":true + }, + { + "name":"com.google.protobuf.DescriptorProtos$FieldOptions$Builder", + "queryAllDeclaredMethods":true + }, + { + "name":"com.google.protobuf.DescriptorProtos$FieldOptions$CType", + "queryAllDeclaredMethods":true + }, + { + "name":"com.google.protobuf.DescriptorProtos$FieldOptions$JSType", + "queryAllDeclaredMethods":true + }, + { + "name":"com.google.protobuf.DescriptorProtos$FileOptions", + "queryAllDeclaredMethods":true + }, + { + "name":"com.google.protobuf.DescriptorProtos$FileOptions$Builder", + "queryAllDeclaredMethods":true + }, + { + "name":"com.google.protobuf.DescriptorProtos$FileOptions$OptimizeMode", + "queryAllDeclaredMethods":true + }, + { + "name":"com.google.protobuf.DescriptorProtos$MessageOptions", + "queryAllDeclaredMethods":true + }, + { + "name":"com.google.protobuf.DescriptorProtos$MessageOptions$Builder", + "queryAllDeclaredMethods":true + }, + { + "name":"com.google.protobuf.DescriptorProtos$UninterpretedOption", + "queriedMethods":[{"name":"newBuilder","parameterTypes":[] }] + } +] \ No newline at end of file From 8365b6eefcd761b69a9a924707e4ab83d39a30cd Mon Sep 17 00:00:00 2001 From: Mridula Peddada Date: Fri, 20 May 2022 20:42:49 -0400 Subject: [PATCH 17/23] remove gax from used dep setting --- google-cloud-bigtable-emulator/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/google-cloud-bigtable-emulator/pom.xml b/google-cloud-bigtable-emulator/pom.xml index af595903b7..3bb20faaf5 100644 --- a/google-cloud-bigtable-emulator/pom.xml +++ b/google-cloud-bigtable-emulator/pom.xml @@ -69,8 +69,8 @@ org.apache.maven.plugins maven-dependency-plugin - - io.grpc:grpc-netty-shaded,com.google.api:gax-grpc + + io.grpc:grpc-netty-shaded From 2386fcef14ec4dc98231deb5fc41fdad38ce0bdd Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 19 May 2022 00:46:30 +0200 Subject: [PATCH 18/23] deps: update dependency com.google.cloud:google-cloud-shared-dependencies to v2.11.0 (#1253) --- google-cloud-bigtable-deps-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-bigtable-deps-bom/pom.xml b/google-cloud-bigtable-deps-bom/pom.xml index c12640bf5b..4cc82c7c81 100644 --- a/google-cloud-bigtable-deps-bom/pom.xml +++ b/google-cloud-bigtable-deps-bom/pom.xml @@ -65,7 +65,7 @@ com.google.cloud google-cloud-shared-dependencies - 2.10.0 + 2.11.0 pom import From 1322931b233e15ead8baf06d607ee89af09c8c96 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 19 May 2022 17:03:26 -0400 Subject: [PATCH 19/23] feat: add build scripts for native image testing in Java 17 (#1440) (#1255) Source-Link: https://github.com/googleapis/synthtool/commit/505ce5a7edb58bf6d9d4de10b4bb4e81000ae324 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:2567a120ce90fadb6201999b87d649d9f67459de28815ad239bce9ebfaa18a74 Co-authored-by: Owl Bot --- .github/.OwlBot.lock.yaml | 4 +-- .kokoro/build.sh | 5 ++++ .kokoro/presubmit/graalvm-native-17.cfg | 33 +++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 .kokoro/presubmit/graalvm-native-17.cfg diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index f60d774937..a79f06271b 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:fc52b202aa298a50a12c64efd04fea3884d867947effe2fa85382a246c09e813 -# created: 2022-04-06T16:30:03.627422514Z + digest: sha256:2567a120ce90fadb6201999b87d649d9f67459de28815ad239bce9ebfaa18a74 +# created: 2022-05-19T15:12:45.278246753Z diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 5c9c321e53..7e2fcc0d08 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -74,6 +74,11 @@ graalvm) mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test RETURN_CODE=$? ;; +graalvm17) + # Run Unit and Integration Tests with Native Image + mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test + RETURN_CODE=$? + ;; samples) SAMPLES_DIR=samples # only run ITs in snapshot/ on presubmit PRs. run ITs in all 3 samples/ subdirectories otherwise. diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg new file mode 100644 index 0000000000..a3f7fb9d49 --- /dev/null +++ b/.kokoro/presubmit/graalvm-native-17.cfg @@ -0,0 +1,33 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17" +} + +env_vars: { + key: "JOB_TYPE" + value: "graalvm17" +} + +# TODO: remove this after we've migrated all tests and scripts +env_vars: { + key: "GCLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_CLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "secret_manager/java-it-service-account" +} + +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "java-it-service-account" +} \ No newline at end of file From 27f15398e030d6ae4004d908ebb26e083a9a14d4 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 20 May 2022 02:00:17 +0200 Subject: [PATCH 20/23] deps: update dependency com.google.cloud:google-cloud-shared-dependencies to v2.12.0 (#1256) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-shared-dependencies](https://togithub.com/googleapis/java-shared-dependencies) | `2.11.0` -> `2.12.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.12.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.12.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.12.0/compatibility-slim/2.11.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.12.0/confidence-slim/2.11.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shared-dependencies ### [`v2.12.0`](https://togithub.com/googleapis/java-shared-dependencies/blob/HEAD/CHANGELOG.md#​2120-httpsgithubcomgoogleapisjava-shared-dependenciescomparev2110v2120-2022-05-19) [Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v2.11.0...v2.12.0) ##### Features - add build scripts for native image testing in Java 17 ([#​1440](https://togithub.com/googleapis/java-shared-dependencies/issues/1440)) ([#​697](https://togithub.com/googleapis/java-shared-dependencies/issues/697)) ([f10ec4e](https://togithub.com/googleapis/java-shared-dependencies/commit/f10ec4e664d8fde868effe366b7182a5fad08dd0)) ##### Dependencies - update gax.version to v2.18.1 ([#​695](https://togithub.com/googleapis/java-shared-dependencies/issues/695)) ([09bc61c](https://togithub.com/googleapis/java-shared-dependencies/commit/09bc61c9152a99bfe87554a07324f15ae6217d6e)) - update google.core.version to v2.7.1 ([#​698](https://togithub.com/googleapis/java-shared-dependencies/issues/698)) ([43de259](https://togithub.com/googleapis/java-shared-dependencies/commit/43de2593f1a6e8fa5e34799364ab683246ddd449))
--- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-bigtable). --- google-cloud-bigtable-deps-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-bigtable-deps-bom/pom.xml b/google-cloud-bigtable-deps-bom/pom.xml index 4cc82c7c81..1d707c3d74 100644 --- a/google-cloud-bigtable-deps-bom/pom.xml +++ b/google-cloud-bigtable-deps-bom/pom.xml @@ -65,7 +65,7 @@ com.google.cloud google-cloud-shared-dependencies - 2.11.0 + 2.12.0 pom import From 97784fb0a68bdf317b77fb49c1e253ef3e3ab815 Mon Sep 17 00:00:00 2001 From: kolea2 <45548808+kolea2@users.noreply.github.com> Date: Fri, 20 May 2022 16:19:49 -0400 Subject: [PATCH 21/23] build(fix): add in IT args for graalvm presubmit (#1258) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * build(fix): add in IT args for graalvm presubmit * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * Update owlbot.py * it changes * update graalvm config * owlbot * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * Update graalvm-native.cfg Co-authored-by: Owl Bot --- .kokoro/presubmit/graalvm-native-17.cfg | 7 ++++++- .kokoro/presubmit/graalvm-native.cfg | 5 +++++ owlbot.py | 2 ++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg index a3f7fb9d49..c91ac4f993 100644 --- a/.kokoro/presubmit/graalvm-native-17.cfg +++ b/.kokoro/presubmit/graalvm-native-17.cfg @@ -11,6 +11,11 @@ env_vars: { value: "graalvm17" } +env_vars: { + key: "INTEGRATION_TEST_ARGS" + value: "-P bigtable-emulator-it,bigtable-prod-it,bigtable-prod-batch-it -Dbigtable.project=gcloud-devel -Dbigtable.instance=google-cloud-bigtable -Dbigtable.table=integration-tests -Dbigtable.kms_key_name=projects/gcloud-devel/locations/us-east1/keyRings/cmek-test-key-ring/cryptoKeys/cmek-test-key -Dbigtable.wait-for-cmek-key-status=true" +} + # TODO: remove this after we've migrated all tests and scripts env_vars: { key: "GCLOUD_PROJECT" @@ -30,4 +35,4 @@ env_vars: { env_vars: { key: "SECRET_MANAGER_KEYS" value: "java-it-service-account" -} \ No newline at end of file +} diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg index 4c7225ec92..dcae17d91b 100644 --- a/.kokoro/presubmit/graalvm-native.cfg +++ b/.kokoro/presubmit/graalvm-native.cfg @@ -17,6 +17,11 @@ env_vars: { value: "gcloud-devel" } +env_vars: { + key: "INTEGRATION_TEST_ARGS" + value: "-P bigtable-emulator-it,bigtable-prod-it,bigtable-prod-batch-it -Dbigtable.project=gcloud-devel -Dbigtable.instance=google-cloud-bigtable -Dbigtable.table=integration-tests -Dbigtable.kms_key_name=projects/gcloud-devel/locations/us-east1/keyRings/cmek-test-key-ring/cryptoKeys/cmek-test-key -Dbigtable.wait-for-cmek-key-status=true" +} + env_vars: { key: "GOOGLE_CLOUD_PROJECT" value: "gcloud-devel" diff --git a/owlbot.py b/owlbot.py index 6a08b5638f..2daf394127 100644 --- a/owlbot.py +++ b/owlbot.py @@ -97,6 +97,8 @@ def make_internal_only(sources): java.common_templates(excludes=[ '.gitignore', '.kokoro/presubmit/integration.cfg', + '.kokoro/presubmit/graalvm-native.cfg', + '.kokoro/presubmit/graalvm-native-17.cfg', '.kokoro/nightly/integration.cfg', '.kokoro/presubmit/samples.cfg', '.kokoro/nightly/samples.cfg', From 80b82d8cc496d83c75a7a553be7155b71be04b9a Mon Sep 17 00:00:00 2001 From: Mridula Peddada Date: Thu, 26 May 2022 15:24:57 -0400 Subject: [PATCH 22/23] remove netty configs --- .../native-image.properties | 8 --- .../reflect-config.json | 54 ------------------- 2 files changed, 62 deletions(-) delete mode 100644 google-cloud-bigtable-emulator/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-bigtable-emulator/native-image.properties delete mode 100644 google-cloud-bigtable-emulator/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-bigtable-emulator/reflect-config.json diff --git a/google-cloud-bigtable-emulator/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-bigtable-emulator/native-image.properties b/google-cloud-bigtable-emulator/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-bigtable-emulator/native-image.properties deleted file mode 100644 index 8343c9730e..0000000000 --- a/google-cloud-bigtable-emulator/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-bigtable-emulator/native-image.properties +++ /dev/null @@ -1,8 +0,0 @@ -Args = --allow-incomplete-classpath \ - --initialize-at-run-time=io.grpc.netty.shaded.io.netty.internal.tcnative.SSL,\ - io.grpc.netty.shaded.io.netty.internal.tcnative.CertificateVerifier,\ - io.grpc.netty.shaded.io.netty.internal.tcnative.SSLPrivateKeyMethod,\ - io.grpc.netty.shaded.io.netty.internal.tcnative.AsyncSSLPrivateKeyMethod,\ - io.grpc.netty.shaded.io.netty.channel.epoll,\ - io.grpc.netty.shaded.io.netty.channel.unix,\ - io.grpc.netty.shaded.io.netty.handler.ssl \ No newline at end of file diff --git a/google-cloud-bigtable-emulator/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-bigtable-emulator/reflect-config.json b/google-cloud-bigtable-emulator/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-bigtable-emulator/reflect-config.json deleted file mode 100644 index e68928a402..0000000000 --- a/google-cloud-bigtable-emulator/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-bigtable-emulator/reflect-config.json +++ /dev/null @@ -1,54 +0,0 @@ -[{ - "name": "io.grpc.netty.shaded.io.netty.channel.socket.nio.NioSocketChannel", - "methods": [ - { "name": "", "parameterTypes": [] } - ] -}, - { - "name":"com.google.api.FieldBehavior", - "queriedMethods":[ - {"name":"getValueDescriptor","parameterTypes":[] }, - {"name":"valueOf","parameterTypes":["com.google.protobuf.Descriptors$EnumValueDescriptor"] } - ] - }, - { - "name":"com.google.protobuf.DescriptorProtos$FieldOptions", - "queryAllDeclaredMethods":true - }, - { - "name":"com.google.protobuf.DescriptorProtos$FieldOptions$Builder", - "queryAllDeclaredMethods":true - }, - { - "name":"com.google.protobuf.DescriptorProtos$FieldOptions$CType", - "queryAllDeclaredMethods":true - }, - { - "name":"com.google.protobuf.DescriptorProtos$FieldOptions$JSType", - "queryAllDeclaredMethods":true - }, - { - "name":"com.google.protobuf.DescriptorProtos$FileOptions", - "queryAllDeclaredMethods":true - }, - { - "name":"com.google.protobuf.DescriptorProtos$FileOptions$Builder", - "queryAllDeclaredMethods":true - }, - { - "name":"com.google.protobuf.DescriptorProtos$FileOptions$OptimizeMode", - "queryAllDeclaredMethods":true - }, - { - "name":"com.google.protobuf.DescriptorProtos$MessageOptions", - "queryAllDeclaredMethods":true - }, - { - "name":"com.google.protobuf.DescriptorProtos$MessageOptions$Builder", - "queryAllDeclaredMethods":true - }, - { - "name":"com.google.protobuf.DescriptorProtos$UninterpretedOption", - "queriedMethods":[{"name":"newBuilder","parameterTypes":[] }] - } -] \ No newline at end of file From d8f9224bb3f92305a2e3e18ec918220fb4a5e039 Mon Sep 17 00:00:00 2001 From: Mridula Peddada Date: Thu, 26 May 2022 15:26:47 -0400 Subject: [PATCH 23/23] fix pom.xml --- google-cloud-bigtable-emulator/pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/google-cloud-bigtable-emulator/pom.xml b/google-cloud-bigtable-emulator/pom.xml index 2d98cc8d27..cbf7c840c5 100644 --- a/google-cloud-bigtable-emulator/pom.xml +++ b/google-cloud-bigtable-emulator/pom.xml @@ -69,13 +69,8 @@ org.apache.maven.plugins maven-dependency-plugin -<<<<<<< rename-tests - - io.grpc:grpc-netty-shaded -======= com.google.api:gax-grpc ->>>>>>> main