diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 372d331b7a..08abe50520 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -115,7 +115,7 @@ fi # fix output location of logs bash .kokoro/coerce_logs.sh -if [[ "${ENABLE_BUILD_COP}" == "true" ]] +if [[ "${ENABLE_FLAKYBOT}" == "true" ]] then chmod +x ${KOKORO_GFILE_DIR}/linux_amd64/flakybot ${KOKORO_GFILE_DIR}/linux_amd64/flakybot -repo=googleapis/java-core diff --git a/.kokoro/nightly/integration.cfg b/.kokoro/nightly/integration.cfg index 0048c8ece7..e51c7b4c6c 100644 --- a/.kokoro/nightly/integration.cfg +++ b/.kokoro/nightly/integration.cfg @@ -22,7 +22,7 @@ env_vars: { } env_vars: { - key: "ENABLE_BUILD_COP" + key: "ENABLE_FLAKYBOT" value: "true" } diff --git a/.kokoro/nightly/samples.cfg b/.kokoro/nightly/samples.cfg index f25429314f..9761fd8648 100644 --- a/.kokoro/nightly/samples.cfg +++ b/.kokoro/nightly/samples.cfg @@ -33,6 +33,6 @@ env_vars: { } env_vars: { - key: "ENABLE_BUILD_COP" + key: "ENABLE_FLAKYBOT" value: "true" } diff --git a/CHANGELOG.md b/CHANGELOG.md index cb3b5fa1ea..3c504c24ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,21 @@ # Changelog +## [2.1.0](https://www.github.com/googleapis/java-core/compare/v2.0.5...v2.1.0) (2021-08-23) + + +### Features + +* support downloading an emulator from an access controlled URL ([#513](https://www.github.com/googleapis/java-core/issues/513)) ([f42a707](https://www.github.com/googleapis/java-core/commit/f42a7078522461018da96196a67657809d28b15b)) + + +### Dependencies + +* update dependency com.google.api:gax-bom to v2.3.0 ([#523](https://www.github.com/googleapis/java-core/issues/523)) ([6fa1d96](https://www.github.com/googleapis/java-core/commit/6fa1d96d07a7d255e7564407364216436cad6ca3)) +* update dependency com.google.auth:google-auth-library-bom to v1.1.0 ([#526](https://www.github.com/googleapis/java-core/issues/526)) ([0fc1532](https://www.github.com/googleapis/java-core/commit/0fc1532183148d09c3005a68e528c6c438cb6ddd)) +* update dependency com.google.code.gson:gson to v2.8.8 ([#529](https://www.github.com/googleapis/java-core/issues/529)) ([92b7f97](https://www.github.com/googleapis/java-core/commit/92b7f9715eeab0a07b64437a62dd47e5eed006de)) +* update dependency com.google.errorprone:error_prone_annotations to v2.9.0 ([#528](https://www.github.com/googleapis/java-core/issues/528)) ([5ecba07](https://www.github.com/googleapis/java-core/commit/5ecba07336499fc6fddae4cfdc2bc12105ec9b66)) +* update dependency io.grpc:grpc-bom to v1.40.0 ([#525](https://www.github.com/googleapis/java-core/issues/525)) ([a1e81f7](https://www.github.com/googleapis/java-core/commit/a1e81f73a4cc29e7186adf37f1cb718c1a88f41e)) + ### [2.0.5](https://www.github.com/googleapis/java-core/compare/v2.0.4...v2.0.5) (2021-08-11) diff --git a/google-cloud-core-bom/pom.xml b/google-cloud-core-bom/pom.xml index 66872a86cf..e2f6857ff2 100644 --- a/google-cloud-core-bom/pom.xml +++ b/google-cloud-core-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-core-bom - 2.0.5 + 2.1.0 pom com.google.cloud google-cloud-shared-config - 1.0.0 + 1.0.1 Google Cloud Core @@ -63,17 +63,17 @@ com.google.cloud google-cloud-core - 2.0.5 + 2.1.0 com.google.cloud google-cloud-core-grpc - 2.0.5 + 2.1.0 com.google.cloud google-cloud-core-http - 2.0.5 + 2.1.0 diff --git a/google-cloud-core-grpc/pom.xml b/google-cloud-core-grpc/pom.xml index f2ec098a3e..49eae9213c 100644 --- a/google-cloud-core-grpc/pom.xml +++ b/google-cloud-core-grpc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-core-grpc - 2.0.5 + 2.1.0 jar Google Cloud Core gRPC https://github.com/googleapis/java-core @@ -13,7 +13,7 @@ com.google.cloud google-cloud-core-parent - 2.0.5 + 2.1.0 google-cloud-core-grpc diff --git a/google-cloud-core-http/pom.xml b/google-cloud-core-http/pom.xml index c350b80ebc..d9dc11207b 100644 --- a/google-cloud-core-http/pom.xml +++ b/google-cloud-core-http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-core-http - 2.0.5 + 2.1.0 jar Google Cloud Core HTTP https://github.com/googleapis/java-core @@ -13,7 +13,7 @@ com.google.cloud google-cloud-core-parent - 2.0.5 + 2.1.0 google-cloud-core-http diff --git a/google-cloud-core/pom.xml b/google-cloud-core/pom.xml index ae00e42422..0eb5cb0f5c 100644 --- a/google-cloud-core/pom.xml +++ b/google-cloud-core/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-core - 2.0.5 + 2.1.0 jar Google Cloud Core https://github.com/googleapis/java-core @@ -13,7 +13,7 @@ com.google.cloud google-cloud-core-parent - 2.0.5 + 2.1.0 google-cloud-core diff --git a/google-cloud-core/src/main/java/com/google/cloud/testing/BaseEmulatorHelper.java b/google-cloud-core/src/main/java/com/google/cloud/testing/BaseEmulatorHelper.java index 9a0898960a..9679c6299c 100644 --- a/google-cloud-core/src/main/java/com/google/cloud/testing/BaseEmulatorHelper.java +++ b/google-cloud-core/src/main/java/com/google/cloud/testing/BaseEmulatorHelper.java @@ -38,6 +38,7 @@ import java.net.HttpURLConnection; import java.net.ServerSocket; import java.net.URL; +import java.net.URLConnection; import java.nio.channels.Channels; import java.nio.channels.ReadableByteChannel; import java.nio.file.Files; @@ -316,6 +317,7 @@ protected static class DownloadableEmulatorRunner implements EmulatorRunner { private final String md5CheckSum; private final URL downloadUrl; private final String fileName; + private String accessToken; private Process process; private static final Logger log = Logger.getLogger(DownloadableEmulatorRunner.class.getName()); @@ -328,6 +330,12 @@ public DownloadableEmulatorRunner( this.fileName = splitUrl[splitUrl.length - 1]; } + public DownloadableEmulatorRunner( + List commandText, URL downloadUrl, String md5CheckSum, String accessToken) { + this(commandText, downloadUrl, md5CheckSum); + this.accessToken = accessToken; + } + @Override public boolean isAvailable() { try { @@ -420,7 +428,11 @@ private File downloadZipFile() throws IOException { if (log.isLoggable(Level.FINE)) { log.fine("Fetching emulator"); } - ReadableByteChannel rbc = Channels.newChannel(downloadUrl.openStream()); + URLConnection urlConnection = downloadUrl.openConnection(); + if (accessToken != null) { + urlConnection.setRequestProperty("Authorization", "Bearer " + accessToken); + } + ReadableByteChannel rbc = Channels.newChannel(urlConnection.getInputStream()); try (FileOutputStream fos = new FileOutputStream(zipFile)) { fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); } diff --git a/google-cloud-core/src/test/java/com/google/cloud/testing/BaseEmulatorHelperTest.java b/google-cloud-core/src/test/java/com/google/cloud/testing/BaseEmulatorHelperTest.java index 3a799e2044..b002a6198b 100644 --- a/google-cloud-core/src/test/java/com/google/cloud/testing/BaseEmulatorHelperTest.java +++ b/google-cloud-core/src/test/java/com/google/cloud/testing/BaseEmulatorHelperTest.java @@ -108,6 +108,7 @@ public void testEmulatorHelperDownloadWithRetries() String mockInputStream = "mockInputStream"; String mockProtocol = "mockProtocol"; String mockFile = "mockFile"; + String mockAccessToken = "mockAccessToken"; String mockCommandText = "mockCommandText"; MockURLStreamHandler mockURLStreamHandler = EasyMock.createMock(MockURLStreamHandler.class); @@ -119,6 +120,7 @@ public void testEmulatorHelperDownloadWithRetries() EasyMock.expect(mockURLConnection.getInputStream()) .andReturn(new ByteArrayInputStream(mockInputStream.getBytes())) .anyTimes(); + mockURLConnection.setRequestProperty("Authorization", "Bearer " + mockAccessToken); EasyMock.expect(mockURLStreamHandler.openConnection(EasyMock.anyObject(URL.class))) .andThrow(new EOFException()) .times(1); @@ -130,7 +132,7 @@ public void testEmulatorHelperDownloadWithRetries() URL url = new URL(mockProtocol, null, 0, mockFile, mockURLStreamHandler); BaseEmulatorHelper.DownloadableEmulatorRunner runner = new BaseEmulatorHelper.DownloadableEmulatorRunner( - ImmutableList.of(mockCommandText), url, null); + ImmutableList.of(mockCommandText), url, null, mockAccessToken); File cachedFile = new File(System.getProperty("java.io.tmpdir"), mockExternalForm); cachedFile.delete(); // Clear the cached version so we're always testing the download diff --git a/pom.xml b/pom.xml index 9aa3b7bc4f..4534779a48 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-core-parent pom - 2.0.5 + 2.1.0 Google Cloud Core Parent https://github.com/googleapis/java-core @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.0.0 + 1.0.1 @@ -151,14 +151,14 @@ UTF-8 github google-cloud-core-parent - 2.1.0 + 2.3.0 2.0.1 2.3.2 1.0.14 - 1.0.0 + 1.1.0 1.32.1 1.39.2 - 1.39.0 + 1.40.0 3.17.3 0.28.0 1.3.2 @@ -169,8 +169,8 @@ 3.0.2 1.5.1 2.6 - 2.8.1 - 2.8.7 + 2.9.0 + 2.8.8 diff --git a/synth.metadata b/synth.metadata index 2d57825973..c3a8755261 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-core.git", - "sha": "91822485ff4b85d6ebff52682a74ee5d022b8655" + "sha": "55f19b5095602e39b153fb55feb8c0ab33737944" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "1a2878d6909dd10ca4e3c1b5943d6622e996054e" + "sha": "ff01716e16d2c6e87eaf87197b753ac9fcbbed5d" } } ], diff --git a/versions.txt b/versions.txt index 18c242318d..c0c922686a 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-core:2.0.5:2.0.5 \ No newline at end of file +google-cloud-core:2.1.0:2.1.0 \ No newline at end of file