embulk-input-gcs 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c7a8f8dcd33afc9c58b25bc3604dae90a407fb4
-  data.tar.gz: bd5afe31028d098c805e7096a6939e877bc2633e
+  metadata.gz: a5659bab7542e13aad7999cf6f389a65583b4e98
+  data.tar.gz: dd924ef90a423c1144d41a3807529ca06573aef5
 SHA512:
-  metadata.gz: 9e761bc69cbb53342b4f7cc943bff476e8678a6dc4f22306039d2269fd91d4651c797d51d6891580af148d53d4cc54fb3a7a45710c9cada571dd59db88b12842
-  data.tar.gz: 2e03a2ca66c9daae76190f70c5dda99c437cf783e77ff5dd6ed1fe15dbe6633e4644350f53d303eb7e0aa06af84540d4bd6d5f6ffb65299819e508a397b5f9d6
+  metadata.gz: e9bd79f9ee60895f4af84dcf72422f13659f074fbb97ddaf07a900daf7d184283eee91e3a51c2edc21774715eba0b83357fe1dc4e6993eaaf67f512ebd2efa45
+  data.tar.gz: a5bba84dab3456e94048f9e8416b881e6323a22fdd64af7a5cd8f78ffbd2c345be2b79d00834bf112396dfe2dbdeb7c58afcdc3a315f91b182711e082263182a

data/.travis.yml

@@ -1,10 +1,7 @@
-dist: precise
 language: java
 
 jdk:
   - oraclejdk8
-  - oraclejdk7
-  - openjdk7
 
 before_install:
   - openssl aes-256-cbc -K $encrypted_79f1af2a2546_key -iv $encrypted_79f1af2a2546_iv
@@ -22,7 +19,3 @@ env:
 script:
   - ./gradlew gem
   - ./gradlew --info check jacocoTestReport
-addons:
-  hosts:
-    - example.com
-  hostname: example.com

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.2.8 - 2018-06-29
+* [maintenance] Improve retry logic to retry "400 Bad Request" "Invalid JWT: No valid verifier found for issuer" [#34](https://github.com/embulk/embulk-input-gcs/pull/34)
+
 ## 0.2.7 - 2018-03-22
 * [maintenance] Fix retry logic to avoid IOException happens while IOUtils.copy() [#33](https://github.com/embulk/embulk-input-gcs/pull/33)
 

data/build.gradle

@@ -14,10 +14,10 @@ configurations {
     provided
 }
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
-version = "0.2.7"
+version = "0.2.8"
 
 dependencies {
     compile  "org.embulk:embulk-core:0.8.2"

data/src/main/java/org/embulk/input/gcs/GcsAuthentication.java

@@ -130,25 +130,33 @@ public class GcsAuthentication
                         @Override
                         public boolean isRetryableException(Exception exception)
                         {
-                            if (exception instanceof GoogleJsonResponseException || exception instanceof TokenResponseException) {
-                                int statusCode;
-                                if (exception instanceof GoogleJsonResponseException) {
-                                    if (((GoogleJsonResponseException) exception).getDetails() == null) {
-                                        String content = "";
-                                        if (((GoogleJsonResponseException) exception).getContent() != null) {
-                                            content = ((GoogleJsonResponseException) exception).getContent();
-                                        }
+                            if (exception instanceof GoogleJsonResponseException) {
+                                if (((GoogleJsonResponseException) exception).getDetails() == null) {
+                                    if (((GoogleJsonResponseException) exception).getContent() != null) {
+                                        String content = ((GoogleJsonResponseException) exception).getContent();
                                         log.warn("Invalid response was returned : {}", content);
                                         return true;
                                     }
-                                    statusCode = ((GoogleJsonResponseException) exception).getDetails().getCode();
                                 }
-                                else {
-                                    statusCode = ((TokenResponseException) exception).getStatusCode();
-                                }
-                                if (statusCode / 100 == 4) {
-                                    return false;
+                                int statusCode = ((GoogleJsonResponseException) exception).getDetails().getCode();
+                                return !(statusCode / 100 == 4);
+                            }
+                            else if (exception instanceof TokenResponseException) {
+                                TokenResponseException ex = (TokenResponseException) exception;
+                                if (ex.getDetails() != null && ex.getDetails().getErrorDescription() != null) {
+                                    String errorDescription = ex.getDetails().getErrorDescription();
+                                    // Retry: 400 BadRequest "Invalid JWT..."
+                                    // Caused by: com.google.api.client.auth.oauth2.TokenResponseException: 400 Bad Request
+                                    // {
+                                    //   "error" : "invalid_grant",
+                                    //   "error_description" : "Invalid JWT: No valid verifier found for issuer."
+                                    // }
+                                    if (errorDescription.contains("Invalid JWT")) {
+                                        log.warn("Invalid response was returned : {}", errorDescription);
+                                        return true;
+                                    }
                                 }
+                                return !(ex.getStatusCode() / 100 == 4);
                             }
                             return true;
                         }

data/src/main/java/org/embulk/input/gcs/GcsFileInputPlugin.java

@@ -71,7 +71,7 @@ public class GcsFileInputPlugin
                 throw new ConfigException("No file is found. Confirm paths option isn't empty");
             }
             FileList.Builder builder = new FileList.Builder(config);
-            for (String file: task.getPathFiles()) {
+            for (String file : task.getPathFiles()) {
                 builder.add(file, 1);
             }
             task.setFiles(builder.build());

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-gcs
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Satoshi Akama
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-22 00:00:00.000000000 Z
+date: 2018-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -69,17 +69,17 @@ files:
 - src/test/resources/sample_01.csv
 - src/test/resources/sample_02.csv
 - src/test/resources/secretkeys.tar.enc
-- classpath/commons-codec-1.3.jar
-- classpath/commons-logging-1.1.1.jar
-- classpath/embulk-input-gcs-0.2.7.jar
 - classpath/google-api-client-1.21.0.jar
+- classpath/httpclient-4.0.1.jar
+- classpath/jsr305-1.3.9.jar
+- classpath/commons-logging-1.1.1.jar
 - classpath/google-api-services-storage-v1-rev59-1.21.0.jar
 - classpath/google-http-client-1.21.0.jar
-- classpath/google-http-client-jackson2-1.21.0.jar
+- classpath/embulk-input-gcs-0.2.8.jar
 - classpath/google-oauth-client-1.21.0.jar
-- classpath/httpclient-4.0.1.jar
+- classpath/commons-codec-1.3.jar
+- classpath/google-http-client-jackson2-1.21.0.jar
 - classpath/httpcore-4.0.1.jar
-- classpath/jsr305-1.3.9.jar
 homepage: https://github.com/embulk/embulk-input-gcs
 licenses:
 - Apache-2.0