embulk-output-sftp 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3140b0cc46176332801c67fbf286548785e5c5a3
-  data.tar.gz: a4fa818bcc4970eaf17e6a8b255ff06e35d605de
+  metadata.gz: 240c94805c37b60dab3cbd3fa4f56e7f4425ccd5
+  data.tar.gz: e7c12ffd35503919c9cbe6ae5d94e0eb57e5dd29
 SHA512:
-  metadata.gz: e4a07a88cf20aebd20e14302d2f504809d509b630ed7c7dfc0e2de48d8d5f51d6b7172e8f9b86540a24dca1f1f2e4f32da92005b43f2a5fa88c3a5c55a390469
-  data.tar.gz: c71a56791aac8f6a68b6de286af446651e60719fe11996fa91d7a95ae356de87f1814dc068c84df7bb319d77262d6438f46d5e68163c1498a2c5dd62b7f461b8
+  metadata.gz: 9daa772b09637ce0054f1ec9637fdc8f6ea7f7d989968bbaee32616c80fc7e2d711598b6d27b02a7931ace5012e87b2b373cc4d9caeac2a00345a600925854ac
+  data.tar.gz: 9c4d21f588162ff7c9b3cf97acf8f83fae4ba373b1160aef490b9b6f8316984d18d9a9b831b101c276e41a25fa39b607a015cfe7786d9f73cb7ad363cea32d19

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+0.2.1 (2018-10-23)
+- Improved logic that detects exception is retryable or not
+  - https://github.com/embulk/embulk-output-sftp/pull/52
 0.2.0 (2018-08-29)
 - Fix bug of stalling when closing `remoteFile`, this version is recommended over 0.1.11
   - https://github.com/embulk/embulk-output-sftp/pull/51

data/build.gradle

@@ -17,7 +17,7 @@ configurations {
 }
 
 group = "org.embulk.output.sftp"
-version = "0.2.0"
+version = "0.2.1"
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 

data/src/main/java/org/embulk/output/sftp/utils/DefaultRetry.java

@@ -42,7 +42,7 @@ public abstract class DefaultRetry<T> implements RetryExecutor.Retryable<T>
 
     private static boolean isAuthFail(Throwable e)
     {
-        return e instanceof JSchException && "USERAUTH fail".equals(e.getMessage());
+        return e instanceof JSchException && (e.getMessage().contains("Auth fail") || e.getMessage().contains("USERAUTH fail"));
     }
 
     private static boolean hasRootCauseAuthFail(Throwable e)

data/src/test/java/org/embulk/output/sftp/TestSftpFileOutputPlugin.java

@@ -612,7 +612,7 @@ public class TestSftpFileOutputPlugin
         SftpUtils utils = Mockito.spy(new SftpUtils(task));
 
         // append throws exception
-        Mockito.doThrow(new IOException(new JSchException("USERAUTH fail")))
+        Mockito.doThrow(new IOException(new JSchException("Auth fail")))
                 .doCallRealMethod()
                 .when(utils)
                 .appendFile(Mockito.any(File.class), Mockito.any(FileObject.class), Mockito.any(BufferedOutputStream.class));
@@ -627,7 +627,7 @@ public class TestSftpFileOutputPlugin
             assertThat(e, CoreMatchers.<Exception>instanceOf(RuntimeException.class));
             assertThat(e.getCause(), CoreMatchers.<Throwable>instanceOf(IOException.class));
             assertThat(e.getCause().getCause(), CoreMatchers.<Throwable>instanceOf(JSchException.class));
-            assertEquals(e.getCause().getCause().getMessage(), "USERAUTH fail");
+            assertEquals(e.getCause().getCause().getMessage(), "Auth fail");
             // assert no retry
             Mockito.verify(utils, Mockito.times(1)).appendFile(Mockito.any(File.class), Mockito.any(FileObject.class), Mockito.any(BufferedOutputStream.class));
             assertEmptyUploadedFile(defaultPathPrefix);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-sftp
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Civitaspo
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-08-29 00:00:00.000000000 Z
+date: 2018-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -83,7 +83,7 @@ files:
 - src/test/resources/id_rsa.pub
 - classpath/commons-logging-1.2.jar
 - classpath/commons-vfs2-2.2.jar
-- classpath/embulk-output-sftp-0.2.0.jar
+- classpath/embulk-output-sftp-0.2.1.jar
 - classpath/commons-io-2.6.jar
 - classpath/jsch-0.1.54.jar
 homepage: https://github.com/embulk/embulk-output-sftp