Date: Mon, 7 Feb 2022 17:40:47 -0500
Subject: [PATCH 4/8] chore(test): fix api breakage in DirectPath integration
tests (#1157)
The ComputeEngineChannelBuilder layer no longer exists and thus should be removed.
This can only be tested by running kokoro test on GCE. Local IT tests pass but can't prove that this is going to fix it in kokoro.
---
.../data/v2/it/DirectPathFallbackIT.java | 23 ++++---------------
1 file changed, 4 insertions(+), 19 deletions(-)
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/DirectPathFallbackIT.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/DirectPathFallbackIT.java
index ff83192304..8666924a2f 100644
--- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/DirectPathFallbackIT.java
+++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/DirectPathFallbackIT.java
@@ -29,7 +29,6 @@
import com.google.common.base.Stopwatch;
import com.google.common.collect.ImmutableSet;
import io.grpc.ManagedChannelBuilder;
-import io.grpc.alts.ComputeEngineChannelBuilder;
import io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder;
import io.grpc.netty.shaded.io.netty.channel.ChannelDuplexHandler;
import io.grpc.netty.shaded.io.netty.channel.ChannelFactory;
@@ -40,7 +39,6 @@
import io.grpc.netty.shaded.io.netty.channel.socket.nio.NioSocketChannel;
import io.grpc.netty.shaded.io.netty.util.ReferenceCountUtil;
import java.io.IOException;
-import java.lang.reflect.Field;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
@@ -189,25 +187,12 @@ private boolean exerciseDirectPath() throws InterruptedException, TimeoutExcepti
/**
* This is a giant hack to enable testing DirectPath CFE fallback.
*
- * It unwraps the {@link ComputeEngineChannelBuilder} to inject a NettyChannelHandler to signal
- * IPv6 packet loss.
+ *
Injects a NettyChannelHandler to signal IPv6 packet loss.
*/
private void injectNettyChannelHandler(ManagedChannelBuilder channelBuilder) {
- try {
- // Extract the delegate NettyChannelBuilder using reflection
- Field delegateField = ComputeEngineChannelBuilder.class.getDeclaredField("delegate");
- delegateField.setAccessible(true);
-
- ComputeEngineChannelBuilder gceChannelBuilder =
- ((ComputeEngineChannelBuilder) channelBuilder);
- Object delegateChannelBuilder = delegateField.get(gceChannelBuilder);
-
- NettyChannelBuilder nettyChannelBuilder = (NettyChannelBuilder) delegateChannelBuilder;
- nettyChannelBuilder.channelFactory(channelFactory);
- nettyChannelBuilder.eventLoopGroup(eventLoopGroup);
- } catch (NoSuchFieldException | IllegalAccessException e) {
- throw new RuntimeException("Failed to inject the netty ChannelHandler", e);
- }
+ NettyChannelBuilder nettyChannelBuilder = (NettyChannelBuilder) channelBuilder;
+ nettyChannelBuilder.channelFactory(channelFactory);
+ nettyChannelBuilder.eventLoopGroup(eventLoopGroup);
}
/** @see com.google.cloud.bigtable.data.v2.it.DirectPathFallbackIT.MyChannelHandler */
From 8b6dc2ccb3b8a8cd408087f06353b982d32453ff Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Tue, 8 Feb 2022 00:53:06 +0000
Subject: [PATCH 5/8] chore: update auto-release script to fix breaking changes
in v5 (#1350) (#1159)
Source-Link: https://github.com/googleapis/synthtool/commit/53a58c23eb4decb3a17fab07388d42799e158b5f
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:3c950ed12391ebaffd1ee66d0374766a1c50144ebe6a7a0042300b2e6bb5856b
---
.github/.OwlBot.lock.yaml | 2 +-
.github/workflows/approve-readme.yaml | 15 +++++++++++
.github/workflows/auto-release.yaml | 27 ++++++++++++++-----
.github/workflows/ci.yaml | 15 +++++++++++
.github/workflows/samples.yaml | 15 +++++++++++
.kokoro/build.bat | 15 +++++++++++
.kokoro/nightly/java11-integration.cfg | 37 ++++++++++++++++++++++++++
7 files changed, 119 insertions(+), 7 deletions(-)
create mode 100644 .kokoro/nightly/java11-integration.cfg
diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index be3b9bde4f..9786771c43 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,4 +13,4 @@
# limitations under the License.
docker:
image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
- digest: sha256:7062473f423f339256346ddbee3d81fb1de6b784fabc2a4d959d7df2c720e375
+ digest: sha256:3c950ed12391ebaffd1ee66d0374766a1c50144ebe6a7a0042300b2e6bb5856b
diff --git a/.github/workflows/approve-readme.yaml b/.github/workflows/approve-readme.yaml
index c513242798..1bb1823276 100644
--- a/.github/workflows/approve-readme.yaml
+++ b/.github/workflows/approve-readme.yaml
@@ -1,3 +1,18 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# Github action job to test core java library features on
+# downstream client libraries before they are released.
on:
pull_request:
name: auto-merge-readme
diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml
index 59c7cadde3..18e23230d9 100644
--- a/.github/workflows/auto-release.yaml
+++ b/.github/workflows/auto-release.yaml
@@ -1,3 +1,18 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# Github action job to test core java library features on
+# downstream client libraries before they are released.
on:
pull_request:
name: auto-release
@@ -16,13 +31,13 @@ jobs:
return;
}
- // only approve PRs like "chore: release "
- if ( !context.payload.pull_request.title.startsWith("chore: release") ) {
+ // only approve PRs like "chore(main): release "
+ if ( !context.payload.pull_request.title.startsWith("chore(main): release") ) {
return;
}
// only approve PRs with pom.xml and versions.txt changes
- const filesPromise = github.pulls.listFiles.endpoint({
+ const filesPromise = github.rest.pulls.listFiles.endpoint({
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: context.payload.pull_request.number,
@@ -54,7 +69,7 @@ jobs:
return;
}
- const promise = github.pulls.list.endpoint({
+ const promise = github.rest.pulls.list.endpoint({
owner: context.repo.owner,
repo: context.repo.repo,
state: 'open'
@@ -71,7 +86,7 @@ jobs:
}
// approve release PR
- await github.pulls.createReview({
+ await github.rest.pulls.createReview({
owner: context.repo.owner,
repo: context.repo.repo,
body: 'Rubber stamped release!',
@@ -80,7 +95,7 @@ jobs:
});
// attach kokoro:force-run and automerge labels
- await github.issues.addLabels({
+ await github.rest.issues.addLabels({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: context.payload.pull_request.number,
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 05de1f60dc..6b5e56aaac 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,3 +1,18 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# Github action job to test core java library features on
+# downstream client libraries before they are released.
on:
push:
branches:
diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml
index c46230a78c..d5d964df15 100644
--- a/.github/workflows/samples.yaml
+++ b/.github/workflows/samples.yaml
@@ -1,3 +1,18 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# Github action job to test core java library features on
+# downstream client libraries before they are released.
on:
pull_request:
name: samples
diff --git a/.kokoro/build.bat b/.kokoro/build.bat
index 05826ad93f..cc602c9eba 100644
--- a/.kokoro/build.bat
+++ b/.kokoro/build.bat
@@ -1,3 +1,18 @@
:: See documentation in type-shell-output.bat
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# Github action job to test core java library features on
+# downstream client libraries before they are released.
"C:\Program Files\Git\bin\bash.exe" %~dp0build.sh
diff --git a/.kokoro/nightly/java11-integration.cfg b/.kokoro/nightly/java11-integration.cfg
new file mode 100644
index 0000000000..58049cc38f
--- /dev/null
+++ b/.kokoro/nightly/java11-integration.cfg
@@ -0,0 +1,37 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+ key: "TRAMPOLINE_IMAGE"
+ value: "gcr.io/cloud-devrel-public-resources/java11014"
+}
+
+env_vars: {
+ key: "JOB_TYPE"
+ value: "integration"
+}
+# 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: "ENABLE_FLAKYBOT"
+ value: "true"
+}
+
+env_vars: {
+ key: "GOOGLE_APPLICATION_CREDENTIALS"
+ value: "secret_manager/java-it-service-account"
+}
+
+env_vars: {
+ key: "SECRET_MANAGER_KEYS"
+ value: "java-it-service-account"
+}
From f50bcc0fa7e03be839571a9dea9d4b374955965a Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate
Date: Tue, 8 Feb 2022 16:11:49 +0100
Subject: [PATCH 6/8] build(deps): update dependency
com.google.cloud:google-cloud-shared-config to v1.2.7 (#1160)
---
google-cloud-bigtable-bom/pom.xml | 2 +-
google-cloud-bigtable-deps-bom/pom.xml | 2 +-
pom.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/google-cloud-bigtable-bom/pom.xml b/google-cloud-bigtable-bom/pom.xml
index 4288fe5db7..e21e2b1e29 100644
--- a/google-cloud-bigtable-bom/pom.xml
+++ b/google-cloud-bigtable-bom/pom.xml
@@ -8,7 +8,7 @@
com.google.cloud
google-cloud-shared-config
- 1.2.6
+ 1.2.7
Google Cloud Bigtable BOM
diff --git a/google-cloud-bigtable-deps-bom/pom.xml b/google-cloud-bigtable-deps-bom/pom.xml
index 4dc604c9bf..b9ce6c6259 100644
--- a/google-cloud-bigtable-deps-bom/pom.xml
+++ b/google-cloud-bigtable-deps-bom/pom.xml
@@ -7,7 +7,7 @@
com.google.cloud
google-cloud-shared-config
- 1.2.6
+ 1.2.7
com.google.cloud
diff --git a/pom.xml b/pom.xml
index 3283fa874f..9d8abdd061 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
com.google.cloud
google-cloud-shared-config
- 1.2.6
+ 1.2.7
From 8b00b5fb5b4e3a1ada514b0bdc60fd744833bd01 Mon Sep 17 00:00:00 2001
From: Igor Bernstein
Date: Tue, 8 Feb 2022 10:58:49 -0500
Subject: [PATCH 7/8] fix: integration tests (#1161)
Trigger a release of #1157
From 428aab314a5df168588b74ecb050630c29a86f55 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
<55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 8 Feb 2022 16:16:49 +0000
Subject: [PATCH 8/8] chore(main): release 2.5.3 (#1162)
:robot: I have created a release *beep* *boop*
---
### [2.5.3](https://github.com/googleapis/java-bigtable/compare/v2.5.2...v2.5.3) (2022-02-08)
### Bug Fixes
* integration tests ([#1161](https://github.com/googleapis/java-bigtable/issues/1161)) ([8b00b5f](https://github.com/googleapis/java-bigtable/commit/8b00b5fb5b4e3a1ada514b0bdc60fd744833bd01))
---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
CHANGELOG.md | 7 +++++++
google-cloud-bigtable-bom/pom.xml | 14 +++++++-------
google-cloud-bigtable-deps-bom/pom.xml | 2 +-
google-cloud-bigtable-emulator/pom.xml | 8 ++++----
google-cloud-bigtable-stats/pom.xml | 6 +++---
google-cloud-bigtable/pom.xml | 10 +++++-----
.../java/com/google/cloud/bigtable/Version.java | 2 +-
grpc-google-cloud-bigtable-admin-v2/pom.xml | 8 ++++----
grpc-google-cloud-bigtable-v2/pom.xml | 8 ++++----
pom.xml | 12 ++++++------
proto-google-cloud-bigtable-admin-v2/pom.xml | 8 ++++----
proto-google-cloud-bigtable-v2/pom.xml | 8 ++++----
samples/snapshot/pom.xml | 2 +-
versions.txt | 12 ++++++------
14 files changed, 57 insertions(+), 50 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23b1b4232b..965f672ea2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
# Changelog
+### [2.5.3](https://github.com/googleapis/java-bigtable/compare/v2.5.2...v2.5.3) (2022-02-08)
+
+
+### Bug Fixes
+
+* integration tests ([#1161](https://github.com/googleapis/java-bigtable/issues/1161)) ([8b00b5f](https://github.com/googleapis/java-bigtable/commit/8b00b5fb5b4e3a1ada514b0bdc60fd744833bd01))
+
### [2.5.2](https://github.com/googleapis/java-bigtable/compare/v2.5.1...v2.5.2) (2022-01-31)
diff --git a/google-cloud-bigtable-bom/pom.xml b/google-cloud-bigtable-bom/pom.xml
index e21e2b1e29..281d8a7680 100644
--- a/google-cloud-bigtable-bom/pom.xml
+++ b/google-cloud-bigtable-bom/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.cloud
google-cloud-bigtable-bom
- 2.5.3-SNAPSHOT
+ 2.5.3
pom
com.google.cloud
@@ -62,32 +62,32 @@
com.google.cloud
google-cloud-bigtable
- 2.5.3-SNAPSHOT
+ 2.5.3
com.google.cloud
google-cloud-bigtable-emulator
- 0.142.3-SNAPSHOT
+ 0.142.3
com.google.api.grpc
grpc-google-cloud-bigtable-admin-v2
- 2.5.3-SNAPSHOT
+ 2.5.3
com.google.api.grpc
grpc-google-cloud-bigtable-v2
- 2.5.3-SNAPSHOT
+ 2.5.3
com.google.api.grpc
proto-google-cloud-bigtable-admin-v2
- 2.5.3-SNAPSHOT
+ 2.5.3
com.google.api.grpc
proto-google-cloud-bigtable-v2
- 2.5.3-SNAPSHOT
+ 2.5.3