Update Google SDK to version 1.23 (#27381)

This commit updates the google-api-client library to version 1.23.0. Related to #26636
elastic · Nov 15, 2017 · 50a2459 · 50a2459
1 parent 7b71cdd
commit 50a2459
Show file tree

Hide file tree

Showing 23 changed files with 21 additions and 16 deletions.
diff --git 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
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
@@ -0,0 +1 @@
+522ea860eb48dee71dfe2c61a1fd09663539f556
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
@@ -0,0 +1 @@
+004169bfe1cf0e8b2013c9c479e43b731958bc64
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
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
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
@@ -0,0 +1 @@
+8e86c84ff3c98eca6423e97780325b299133d858
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
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
@@ -0,0 +1 @@
+fd6761f4046a8cb0455e6fa5f58e12b061e9826e
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
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
@@ -0,0 +1 @@
+e57ea1e2220bda5a2bd24ff17860212861f3c5cf
diff --git 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
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
@@ -0,0 +1 @@
+522ea860eb48dee71dfe2c61a1fd09663539f556
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
@@ -0,0 +1 @@
+ba4fb6c5dc8d5ad94dedd9927ceee10a31a59abd
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
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
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
@@ -0,0 +1 @@
+8e86c84ff3c98eca6423e97780325b299133d858
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
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
@@ -0,0 +1 @@
+fd6761f4046a8cb0455e6fa5f58e12b061e9826e
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
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
@@ -0,0 +1 @@
+e57ea1e2220bda5a2bd24ff17860212861f3c5cf
diff --git a/...ns/repository-gcs/src/test/java/org/elasticsearch/repositories/gcs/MockHttpTransport.java b/...ns/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 {