diff --git a/plugins/discovery-gce/build.gradle b/plugins/discovery-gce/build.gradle index ede168e1f9ded..fa6f33a633cd4 100644 --- a/plugins/discovery-gce/build.gradle +++ b/plugins/discovery-gce/build.gradle @@ -6,11 +6,11 @@ esplugin { } versions << [ - 'google': '1.20.0' + 'google': '1.23.0' ] dependencies { - compile "com.google.apis:google-api-services-compute:v1-rev71-${versions.google}" + compile "com.google.apis:google-api-services-compute:v1-rev160-${versions.google}" compile "com.google.api-client:google-api-client:${versions.google}" compile "com.google.oauth-client:google-oauth-client:${versions.google}" compile "com.google.http-client:google-http-client:${versions.google}" diff --git a/plugins/discovery-gce/licenses/google-api-client-1.20.0.jar.sha1 b/plugins/discovery-gce/licenses/google-api-client-1.20.0.jar.sha1 deleted file mode 100644 index 08c24d1df68a4..0000000000000 --- a/plugins/discovery-gce/licenses/google-api-client-1.20.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d3e66209ae9e749b2d6833761e7885f60f285564 diff --git a/plugins/discovery-gce/licenses/google-api-client-1.23.0.jar.sha1 b/plugins/discovery-gce/licenses/google-api-client-1.23.0.jar.sha1 new file mode 100644 index 0000000000000..0c35d8e08b91f --- /dev/null +++ b/plugins/discovery-gce/licenses/google-api-client-1.23.0.jar.sha1 @@ -0,0 +1 @@ +522ea860eb48dee71dfe2c61a1fd09663539f556 \ No newline at end of file diff --git a/plugins/discovery-gce/licenses/google-api-services-compute-v1-rev160-1.23.0.jar.sha1 b/plugins/discovery-gce/licenses/google-api-services-compute-v1-rev160-1.23.0.jar.sha1 new file mode 100644 index 0000000000000..17219dfe7ecc9 --- /dev/null +++ b/plugins/discovery-gce/licenses/google-api-services-compute-v1-rev160-1.23.0.jar.sha1 @@ -0,0 +1 @@ +004169bfe1cf0e8b2013c9c479e43b731958bc64 \ No newline at end of file diff --git a/plugins/discovery-gce/licenses/google-api-services-compute-v1-rev71-1.20.0.jar.sha1 b/plugins/discovery-gce/licenses/google-api-services-compute-v1-rev71-1.20.0.jar.sha1 deleted file mode 100644 index c6e694852752b..0000000000000 --- a/plugins/discovery-gce/licenses/google-api-services-compute-v1-rev71-1.20.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2fa36fff3b5bf59a63c4f2bbfac1f88251cd7986 diff --git a/plugins/discovery-gce/licenses/google-http-client-1.20.0.jar.sha1 b/plugins/discovery-gce/licenses/google-http-client-1.20.0.jar.sha1 deleted file mode 100644 index 66a2247eb56c4..0000000000000 --- a/plugins/discovery-gce/licenses/google-http-client-1.20.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -93d82db2bca534960253f43424b2ba9d7638b4d2 diff --git a/plugins/discovery-gce/licenses/google-http-client-1.23.0.jar.sha1 b/plugins/discovery-gce/licenses/google-http-client-1.23.0.jar.sha1 new file mode 100644 index 0000000000000..5526275d5a15f --- /dev/null +++ b/plugins/discovery-gce/licenses/google-http-client-1.23.0.jar.sha1 @@ -0,0 +1 @@ +8e86c84ff3c98eca6423e97780325b299133d858 \ No newline at end of file diff --git a/plugins/discovery-gce/licenses/google-http-client-jackson2-1.20.0.jar.sha1 b/plugins/discovery-gce/licenses/google-http-client-jackson2-1.20.0.jar.sha1 deleted file mode 100644 index 6d861e6d06ae6..0000000000000 --- a/plugins/discovery-gce/licenses/google-http-client-jackson2-1.20.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2408070b2abec043624d35b35e30450f1b663858 diff --git a/plugins/discovery-gce/licenses/google-http-client-jackson2-1.23.0.jar.sha1 b/plugins/discovery-gce/licenses/google-http-client-jackson2-1.23.0.jar.sha1 new file mode 100644 index 0000000000000..510856a517f04 --- /dev/null +++ b/plugins/discovery-gce/licenses/google-http-client-jackson2-1.23.0.jar.sha1 @@ -0,0 +1 @@ +fd6761f4046a8cb0455e6fa5f58e12b061e9826e \ No newline at end of file diff --git a/plugins/discovery-gce/licenses/google-oauth-client-1.20.0.jar.sha1 b/plugins/discovery-gce/licenses/google-oauth-client-1.20.0.jar.sha1 deleted file mode 100644 index c35c4bc66eb25..0000000000000 --- a/plugins/discovery-gce/licenses/google-oauth-client-1.20.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1d086ac5756475ddf451af2e2df6e288d18608ca diff --git a/plugins/discovery-gce/licenses/google-oauth-client-1.23.0.jar.sha1 b/plugins/discovery-gce/licenses/google-oauth-client-1.23.0.jar.sha1 new file mode 100644 index 0000000000000..036812b88b5e0 --- /dev/null +++ b/plugins/discovery-gce/licenses/google-oauth-client-1.23.0.jar.sha1 @@ -0,0 +1 @@ +e57ea1e2220bda5a2bd24ff17860212861f3c5cf \ No newline at end of file diff --git a/plugins/repository-gcs/build.gradle b/plugins/repository-gcs/build.gradle index 84316827a2091..7d3246376a8e5 100644 --- a/plugins/repository-gcs/build.gradle +++ b/plugins/repository-gcs/build.gradle @@ -23,11 +23,11 @@ esplugin { } versions << [ - 'google': '1.21.0', + 'google': '1.23.0', ] dependencies { - compile "com.google.apis:google-api-services-storage:v1-rev66-${versions.google}" + compile "com.google.apis:google-api-services-storage:v1-rev115-${versions.google}" compile "com.google.api-client:google-api-client:${versions.google}" compile "com.google.oauth-client:google-oauth-client:${versions.google}" compile "org.apache.httpcomponents:httpclient:${versions.httpclient}" diff --git a/plugins/repository-gcs/licenses/google-api-client-1.21.0.jar.sha1 b/plugins/repository-gcs/licenses/google-api-client-1.21.0.jar.sha1 deleted file mode 100644 index 56988521028e5..0000000000000 --- a/plugins/repository-gcs/licenses/google-api-client-1.21.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -16a6b3c680f3bf7b81bb42790ff5c1b72c5bbedc \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-api-client-1.23.0.jar.sha1 b/plugins/repository-gcs/licenses/google-api-client-1.23.0.jar.sha1 new file mode 100644 index 0000000000000..0c35d8e08b91f --- /dev/null +++ b/plugins/repository-gcs/licenses/google-api-client-1.23.0.jar.sha1 @@ -0,0 +1 @@ +522ea860eb48dee71dfe2c61a1fd09663539f556 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-api-services-storage-v1-rev115-1.23.0.jar.sha1 b/plugins/repository-gcs/licenses/google-api-services-storage-v1-rev115-1.23.0.jar.sha1 new file mode 100644 index 0000000000000..9f6f77ada3a69 --- /dev/null +++ b/plugins/repository-gcs/licenses/google-api-services-storage-v1-rev115-1.23.0.jar.sha1 @@ -0,0 +1 @@ +ba4fb6c5dc8d5ad94dedd9927ceee10a31a59abd \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-api-services-storage-v1-rev66-1.21.0.jar.sha1 b/plugins/repository-gcs/licenses/google-api-services-storage-v1-rev66-1.21.0.jar.sha1 deleted file mode 100644 index 2a97aed2b791b..0000000000000 --- a/plugins/repository-gcs/licenses/google-api-services-storage-v1-rev66-1.21.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -eb753d716e4f8dec203deb0f8fdca86913a79029 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-http-client-1.21.0.jar.sha1 b/plugins/repository-gcs/licenses/google-http-client-1.21.0.jar.sha1 deleted file mode 100644 index 401abd444ce1a..0000000000000 --- a/plugins/repository-gcs/licenses/google-http-client-1.21.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -42631630fe1276d4d6d6397bb07d53a4e4fec278 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-http-client-1.23.0.jar.sha1 b/plugins/repository-gcs/licenses/google-http-client-1.23.0.jar.sha1 new file mode 100644 index 0000000000000..5526275d5a15f --- /dev/null +++ b/plugins/repository-gcs/licenses/google-http-client-1.23.0.jar.sha1 @@ -0,0 +1 @@ +8e86c84ff3c98eca6423e97780325b299133d858 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-http-client-jackson2-1.21.0.jar.sha1 b/plugins/repository-gcs/licenses/google-http-client-jackson2-1.21.0.jar.sha1 deleted file mode 100644 index e7ca588741268..0000000000000 --- a/plugins/repository-gcs/licenses/google-http-client-jackson2-1.21.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8ce17bdd15fff0fd8cf359757f29e778fc7191ad \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-http-client-jackson2-1.23.0.jar.sha1 b/plugins/repository-gcs/licenses/google-http-client-jackson2-1.23.0.jar.sha1 new file mode 100644 index 0000000000000..510856a517f04 --- /dev/null +++ b/plugins/repository-gcs/licenses/google-http-client-jackson2-1.23.0.jar.sha1 @@ -0,0 +1 @@ +fd6761f4046a8cb0455e6fa5f58e12b061e9826e \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-oauth-client-1.21.0.jar.sha1 b/plugins/repository-gcs/licenses/google-oauth-client-1.21.0.jar.sha1 deleted file mode 100644 index 7e3de94a9bc74..0000000000000 --- a/plugins/repository-gcs/licenses/google-oauth-client-1.21.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -61ec42bbfc51aafde5eb8b4923c602c5b5965bc2 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-oauth-client-1.23.0.jar.sha1 b/plugins/repository-gcs/licenses/google-oauth-client-1.23.0.jar.sha1 new file mode 100644 index 0000000000000..036812b88b5e0 --- /dev/null +++ b/plugins/repository-gcs/licenses/google-oauth-client-1.23.0.jar.sha1 @@ -0,0 +1 @@ +e57ea1e2220bda5a2bd24ff17860212861f3c5cf \ No newline at end of file diff --git a/plugins/repository-gcs/src/test/java/org/elasticsearch/repositories/gcs/MockHttpTransport.java b/plugins/repository-gcs/src/test/java/org/elasticsearch/repositories/gcs/MockHttpTransport.java index df9c6c5da825f..f09854458cc14 100644 --- a/plugins/repository-gcs/src/test/java/org/elasticsearch/repositories/gcs/MockHttpTransport.java +++ b/plugins/repository-gcs/src/test/java/org/elasticsearch/repositories/gcs/MockHttpTransport.java @@ -271,7 +271,7 @@ public MockHttpTransport(String bucket) { // content-id: 1 // content-transfer-encoding: binary // - // DELETE https://www.googleapis.com/storage/v1/b/ohifkgu/o/foo%2Ftest + // DELETE https://www.googleapis.com/storage/v1/b/ohifkgu/o/foo%2Ftest HTTP/1.1 // // // --__END_OF_PART__ @@ -280,7 +280,7 @@ public MockHttpTransport(String bucket) { // content-id: 2 // content-transfer-encoding: binary // - // DELETE https://www.googleapis.com/storage/v1/b/ohifkgu/o/bar%2Ftest + // DELETE https://www.googleapis.com/storage/v1/b/ohifkgu/o/bar%2Ftest HTTP/1.1 // // // --__END_OF_PART__-- @@ -291,6 +291,11 @@ public MockHttpTransport(String bucket) { req.getStreamingContent().writeTo(os); Streams.readAllLines(new ByteArrayInputStream(os.toByteArray()), line -> { + final int indexOfHttp = line.indexOf(" HTTP/1.1"); + if (indexOfHttp > 0) { + line = line.substring(0, indexOfHttp); + } + Handler handler = handlers.retrieve(line, params); if (handler != null) { try {