[
https://issues.apache.org/jira/browse/BEAM-5456?focusedWorklogId=167508&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-167508
]
ASF GitHub Bot logged work on BEAM-5456:
----------------------------------------
Author: ASF GitHub Bot
Created on: 19/Nov/18 21:10
Start Date: 19/Nov/18 21:10
Worklog Time Spent: 10m
Work Description: chamikaramj closed pull request #7044: [BEAM-5456]
Upgrades Google API Client libraries to 1.27.0.
URL: https://github.com/apache/beam/pull/7044
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
index 1c1838c5f31..20d7172e674 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -308,7 +308,7 @@ class BeamModulePlugin implements Plugin<Project> {
def generated_grpc_ga_version = "1.18.0"
def google_cloud_bigdataoss_version = "1.9.0"
def bigtable_version = "1.4.0"
- def google_clients_version = "1.24.1"
+ def google_clients_version = "1.27.0"
def google_auth_version = "0.10.0"
def grpc_version = "1.13.1"
def protobuf_version = "3.6.0"
@@ -364,12 +364,12 @@ class BeamModulePlugin implements Plugin<Project> {
google_api_client_jackson2 :
"com.google.api-client:google-api-client-jackson2:$google_clients_version",
google_api_client_java6 :
"com.google.api-client:google-api-client-java6:$google_clients_version",
google_api_common :
"com.google.api:api-common:1.6.0",
- google_api_services_bigquery :
"com.google.apis:google-api-services-bigquery:v2-rev402-$google_clients_version",
- google_api_services_clouddebugger :
"com.google.apis:google-api-services-clouddebugger:v2-rev253-$google_clients_version",
- google_api_services_cloudresourcemanager :
"com.google.apis:google-api-services-cloudresourcemanager:v1-rev502-$google_clients_version",
- google_api_services_dataflow :
"com.google.apis:google-api-services-dataflow:v1b3-rev266-$google_clients_version",
- google_api_services_pubsub :
"com.google.apis:google-api-services-pubsub:v1-rev399-$google_clients_version",
- google_api_services_storage :
"com.google.apis:google-api-services-storage:v1-rev136-$google_clients_version",
+ google_api_services_bigquery :
"com.google.apis:google-api-services-bigquery:v2-rev20181104-$google_clients_version",
+ google_api_services_clouddebugger :
"com.google.apis:google-api-services-clouddebugger:v2-rev20180801-$google_clients_version",
+ google_api_services_cloudresourcemanager :
"com.google.apis:google-api-services-cloudresourcemanager:v1-rev20181015-$google_clients_version",
+ google_api_services_dataflow :
"com.google.apis:google-api-services-dataflow:v1b3-rev20181107-$google_clients_version",
+ google_api_services_pubsub :
"com.google.apis:google-api-services-pubsub:v1-rev20181105-$google_clients_version",
+ google_api_services_storage :
"com.google.apis:google-api-services-storage:v1-rev20181013-$google_clients_version",
google_auth_library_credentials :
"com.google.auth:google-auth-library-credentials:$google_auth_version",
google_auth_library_oauth2_http :
"com.google.auth:google-auth-library-oauth2-http:$google_auth_version",
google_cloud_bigquery :
"com.google.cloud:google-cloud-bigquery:$google_clients_version",
diff --git
a/sdks/java/extensions/google-cloud-platform-core/src/test/java/org/apache/beam/sdk/util/RetryHttpRequestInitializerTest.java
b/sdks/java/extensions/google-cloud-platform-core/src/test/java/org/apache/beam/sdk/util/RetryHttpRequestInitializerTest.java
index b512d3d68c7..8f15a3decdb 100644
---
a/sdks/java/extensions/google-cloud-platform-core/src/test/java/org/apache/beam/sdk/util/RetryHttpRequestInitializerTest.java
+++
b/sdks/java/extensions/google-cloud-platform-core/src/test/java/org/apache/beam/sdk/util/RetryHttpRequestInitializerTest.java
@@ -136,6 +136,7 @@ public void testBasicOperation() throws IOException {
verify(mockHttpResponseInterceptor).interceptResponse(any(HttpResponse.class));
verify(mockLowLevelRequest, atLeastOnce()).addHeader(anyString(),
anyString());
verify(mockLowLevelRequest).setTimeout(anyInt(), anyInt());
+ verify(mockLowLevelRequest).setWriteTimeout(anyInt());
verify(mockLowLevelRequest).execute();
verify(mockLowLevelResponse).getStatusCode();
expectedLogs.verifyNotLogged("Request failed");
@@ -160,6 +161,7 @@ public void testErrorCodeForbidden() throws IOException {
verify(mockHttpResponseInterceptor).interceptResponse(any(HttpResponse.class));
verify(mockLowLevelRequest, atLeastOnce()).addHeader(anyString(),
anyString());
verify(mockLowLevelRequest).setTimeout(anyInt(), anyInt());
+ verify(mockLowLevelRequest).setWriteTimeout(anyInt());
verify(mockLowLevelRequest).execute();
verify(mockLowLevelResponse).getStatusCode();
expectedLogs.verifyWarn("Request failed with code 403");
@@ -184,6 +186,7 @@ public void testRetryableError() throws IOException {
verify(mockHttpResponseInterceptor).interceptResponse(any(HttpResponse.class));
verify(mockLowLevelRequest, atLeastOnce()).addHeader(anyString(),
anyString());
verify(mockLowLevelRequest, times(3)).setTimeout(anyInt(), anyInt());
+ verify(mockLowLevelRequest, times(3)).setWriteTimeout(anyInt());
verify(mockLowLevelRequest, times(3)).execute();
verify(mockLowLevelResponse, times(3)).getStatusCode();
expectedLogs.verifyDebug("Request failed with code 503");
@@ -204,6 +207,7 @@ public void testThrowIOException() throws IOException {
verify(mockHttpResponseInterceptor).interceptResponse(any(HttpResponse.class));
verify(mockLowLevelRequest, atLeastOnce()).addHeader(anyString(),
anyString());
verify(mockLowLevelRequest, times(2)).setTimeout(anyInt(), anyInt());
+ verify(mockLowLevelRequest, times(2)).setWriteTimeout(anyInt());
verify(mockLowLevelRequest, times(2)).execute();
verify(mockLowLevelResponse).getStatusCode();
expectedLogs.verifyDebug("Request failed with IOException");
@@ -235,6 +239,7 @@ public Integer answer(InvocationOnMock invocation) {
verify(mockHttpResponseInterceptor).interceptResponse(any(HttpResponse.class));
verify(mockLowLevelRequest, atLeastOnce()).addHeader(anyString(),
anyString());
verify(mockLowLevelRequest, times(retries + 1)).setTimeout(anyInt(),
anyInt());
+ verify(mockLowLevelRequest, times(retries + 1)).setWriteTimeout(anyInt());
verify(mockLowLevelRequest, times(retries + 1)).execute();
verify(mockLowLevelResponse, times(retries + 1)).getStatusCode();
expectedLogs.verifyWarn("performed 10 retries due to unsuccessful status
codes");
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
Issue Time Tracking
-------------------
Worklog Id: (was: 167508)
Time Spent: 1h (was: 50m)
> Update google-api-client libraries to 1.25
> ------------------------------------------
>
> Key: BEAM-5456
> URL: https://issues.apache.org/jira/browse/BEAM-5456
> Project: Beam
> Issue Type: Improvement
> Components: io-java-gcp
> Reporter: Chamikara Jayalath
> Assignee: Batkhuyag Batsaikhan
> Priority: Blocker
> Fix For: 2.9.0
>
> Time Spent: 1h
> Remaining Estimate: 0h
>
> This version updates authentication URLs
> ([https://github.com/googleapis/google-api-java-client/releases)] that is
> needed for certain features.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
