diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index f60d77493..a79f06271 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 8066ba47e..53d9f5922 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 000000000..a3f7fb9d4 --- /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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c8e5aeea..afe26570f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,22 @@ # Changelog +## [1.10.0](https://github.com/googleapis/java-compute/compare/v1.9.1...v1.10.0) (2022-05-24) + + +### Features + +* add build scripts for native image testing in Java 17 ([#1440](https://github.com/googleapis/java-compute/issues/1440)) ([#691](https://github.com/googleapis/java-compute/issues/691)) ([6e1de08](https://github.com/googleapis/java-compute/commit/6e1de08694caa3ad45c5a41ed5e09ec87a837c95)) + + +### Bug Fixes + +* Add gax-grpc dependency for native image configurations ([#688](https://github.com/googleapis/java-compute/issues/688)) ([c4fc952](https://github.com/googleapis/java-compute/commit/c4fc952177a197ab7550163a482c244f2266298d)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.12.0 ([#690](https://github.com/googleapis/java-compute/issues/690)) ([c1e7193](https://github.com/googleapis/java-compute/commit/c1e7193a8771899ee0db397f7dd72002bcbd23a1)) + ### [1.9.1](https://github.com/googleapis/java-compute/compare/v1.9.0...v1.9.1) (2022-04-15) diff --git a/README.md b/README.md index 3741d4b8b..1c6265856 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you are using Maven, add this to your pom.xml file: com.google.cloud google-cloud-compute - 1.9.0 + 1.9.1 ``` @@ -27,13 +27,13 @@ If you are using Maven, add this to your pom.xml file: If you are using Gradle without BOM, add this to your dependencies ```Groovy -implementation 'com.google.cloud:google-cloud-compute:1.9.0' +implementation 'com.google.cloud:google-cloud-compute:1.9.1' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-compute" % "1.9.0" +libraryDependencies += "com.google.cloud" % "google-cloud-compute" % "1.9.1" ``` ## Authentication diff --git a/google-cloud-compute-bom/pom.xml b/google-cloud-compute-bom/pom.xml index 9c0dbc3d0..0e594f7d8 100644 --- a/google-cloud-compute-bom/pom.xml +++ b/google-cloud-compute-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-compute-bom - 1.9.1 + 1.10.0 pom com.google.cloud google-cloud-shared-config - 1.3.2 + 1.4.0 Google Compute Engine BOM @@ -52,12 +52,12 @@ com.google.cloud google-cloud-compute - 1.9.1 + 1.10.0 com.google.api.grpc proto-google-cloud-compute-v1 - 1.9.1 + 1.10.0 diff --git a/google-cloud-compute/pom.xml b/google-cloud-compute/pom.xml index 46ef80bba..2b1aa0faa 100644 --- a/google-cloud-compute/pom.xml +++ b/google-cloud-compute/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-compute - 1.9.1 + 1.10.0 jar Google Compute Engine https://github.com/googleapis/java-compute @@ -13,7 +13,7 @@ com.google.cloud google-cloud-compute-parent - 1.9.1 + 1.10.0 google-cloud-compute @@ -35,6 +35,14 @@ com.google.api gax + + + + com.google.api + gax-grpc + + com.google.api gax-httpjson @@ -92,7 +100,7 @@ maven-surefire-plugin - -Xmx1024m -XX:MaxPermSize=512m + @{argLine} -Xmx1024m -XX:MaxPermSize=512m @@ -121,7 +129,7 @@ maven-surefire-plugin - -Xmx1024m + @{argLine} -Xmx1024m diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/v1/integration/ITPaginationTest.java b/google-cloud-compute/src/test/java/com/google/cloud/compute/v1/integration/ITPaginationTest.java index 81c661667..aa5b856e2 100644 --- a/google-cloud-compute/src/test/java/com/google/cloud/compute/v1/integration/ITPaginationTest.java +++ b/google-cloud-compute/src/test/java/com/google/cloud/compute/v1/integration/ITPaginationTest.java @@ -114,13 +114,18 @@ public void testPaginationIterating() { ListZonesRequest.newBuilder().setProject(DEFAULT_PROJECT).setMaxResults(1).build(); ZonesClient.ListPagedResponse response = zonesClient.list(listZonesRequest); boolean presented = false; + int count = 0; for (Zone element : response.iterateAll()) { + count++; if (element.getName().equals(DEFAULT_ZONE)) { presented = true; } } Assert.assertTrue( - String.format("Zone %s was not found in zones list.", DEFAULT_ZONE), presented); + String.format( + "Zone %s was not found for %s in zones list (size: %d).", + DEFAULT_ZONE, DEFAULT_PROJECT, count), + presented); } @Test diff --git a/pom.xml b/pom.xml index 646de9662..761a4d1a2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-compute-parent pom - 1.9.1 + 1.10.0 Google Compute Engine Parent https://github.com/googleapis/java-compute @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.3.2 + 1.4.0 @@ -61,18 +61,18 @@ com.google.cloud google-cloud-compute - 1.9.1 + 1.10.0 com.google.api.grpc proto-google-cloud-compute-v1 - 1.9.1 + 1.10.0 com.google.cloud google-cloud-shared-dependencies - 2.10.0 + 2.12.0 pom import @@ -96,6 +96,7 @@ org.objenesis:objenesis javax.annotation:javax.annotation-api + com.google.api:gax-grpc @@ -114,7 +115,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.2.2 + 3.3.0 @@ -141,7 +142,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.2 + 3.4.0 html diff --git a/proto-google-cloud-compute-v1/pom.xml b/proto-google-cloud-compute-v1/pom.xml index 03088fdbf..de4f3c6fc 100644 --- a/proto-google-cloud-compute-v1/pom.xml +++ b/proto-google-cloud-compute-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-compute-v1 - 1.9.1 + 1.10.0 proto-google-cloud-compute-v1 Proto library for google-cloud-compute com.google.cloud google-cloud-compute-parent - 1.9.1 + 1.10.0 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 1bf3fe80f..3d3f4f340 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-compute - 1.9.0 + 1.9.1 diff --git a/samples/pom.xml b/samples/pom.xml index 072622afe..10fd467a6 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -46,7 +46,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.11 + 1.6.13 true diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 287e62f6f..255692801 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-compute - 1.9.0 + 1.9.1 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 1215f12b5..91fd19ade 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-compute - 1.9.0 + 1.9.1 diff --git a/versions.txt b/versions.txt index 9f9097303..f0d9e6606 100644 --- a/versions.txt +++ b/versions.txt @@ -1,5 +1,5 @@ # Format: # module:released-version:current-version -google-cloud-compute:1.9.1:1.9.1 -proto-google-cloud-compute-v1:1.9.1:1.9.1 +google-cloud-compute:1.10.0:1.10.0 +proto-google-cloud-compute-v1:1.10.0:1.10.0