embulk-input-sftp 0.2.11 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 525f2176e7c9834fb4ed151c692f7f8f445a2e8f
-  data.tar.gz: ed2a712f5da1a3ad32427fb1663129b370f30228
+  metadata.gz: aee50a24af4aefe560e866185b937b75fd55c6de
+  data.tar.gz: 89a75e4a81249fb7b72a94843da40c3f46884dba
 SHA512:
-  metadata.gz: b143a20f5ab3bf1d9c2a5d8e33935b684c005d6785b84f1d7e8f95de562ba7f7e3904d52ac980dce21581bb502f710e023bc41db1b61487d997500c5a523bd36
-  data.tar.gz: ff8557ec6c892adc565ed7512661b3dadd29ab55ca3b3f51311baed04f760cea45973e9abac091144e7435ab35fb746d6dce3bbe691ae54b4a8a78793f0282b1
+  metadata.gz: 4d6ff3b1f944e43d293c1354b671f0b7e888a67c8b5375ba199ef717a5236cae3f192803f120ce267447fb10b1a11ade82cafee9b7b675f0bb5f440a3619df37
+  data.tar.gz: 33974b8d4d2746a0a731d0afaf72604a36ee6804fccda0ddfaea36bd79b0f1d0a44ca5e0f255b78c0ef693d9cb583d9acc7a9d028cd1f129515e6cd0f722cb8a

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.2.12 - 2018-10-05
+* [maintenance] Give up processing and throw ConfigException when "Auth fail" first appears [#33](https://github.com/embulk/embulk-input-sftp/pull/33)
+
 ## 0.2.11 - 2018-05-07
 * [maintenance] Use java.util.regex.Pattern for host name validation [#32](https://github.com/embulk/embulk-input-sftp/pull/32)
 

data/build.gradle

@@ -16,7 +16,7 @@ configurations {
 }
 
 group = "org.embulk.input.sftp"
-version = "0.2.11"
+version = "0.2.12"
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7

data/src/main/java/org/embulk/input/sftp/SftpFileInput.java

@@ -264,6 +264,12 @@ public class SftpFileInput
                         @Override
                         public boolean isRetryableException(Exception exception)
                         {
+                            if (exception.getCause() != null && exception.getCause().getCause() != null) {
+                                Throwable cause = exception.getCause().getCause();
+                                if (cause.getMessage() != null && cause.getMessage().contains("Auth fail")) {
+                                    throw new ConfigException(exception);
+                                }
+                            }
                             if (exception instanceof ConfigException) {
                                 return false;
                             }
@@ -288,14 +294,6 @@ public class SftpFileInput
                         public void onGiveup(Exception firstException, Exception lastException)
                                 throws RetryGiveupException
                         {
-                            // Generally, Auth fail should be caught and throw ConfigException when first retry. But this library is a bit unstable.
-                            // So we throw ConfigException after all retries are completed
-                            if (lastException.getCause() != null && lastException.getCause().getCause() != null) {
-                                Throwable cause = lastException.getCause().getCause();
-                                if (cause.getMessage().contains("Auth fail")) {
-                                    throw new ConfigException(lastException);
-                                }
-                            }
                         }
                     });
         }

data/src/test/java/org/embulk/input/sftp/TestSftpFileInputPlugin.java

@@ -56,6 +56,7 @@ import java.util.Collections;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 public class TestSftpFileInputPlugin
 {
@@ -248,6 +249,36 @@ public class TestSftpFileInputPlugin
         assertEquals(SftpFileInput.getRelativePath(task, Optional.of(expected.get(1).get(0))), configDiff.get(String.class, "last_path"));
     }
 
+    @Test
+    public void testListFilesAuthFail() throws Exception
+    {
+        uploadFile(Resources.getResource("sample_01.csv").getPath(), REMOTE_DIRECTORY + "sample_01.csv", true);
+        uploadFile(Resources.getResource("sample_02.csv").getPath(), REMOTE_DIRECTORY + "sample_02.csv", true);
+
+        PluginTask task = config.deepCopy().set("user", "wrong_user").loadConfig(PluginTask.class);
+
+        plugin.transaction(config, new FileInputPlugin.Control() {
+            @Override
+            public List<TaskReport> run(TaskSource taskSource, int taskCount)
+            {
+                assertEquals(2, taskCount);
+                return emptyTaskReports(taskCount);
+            }
+        });
+
+        Method listFilesByPrefix = SftpFileInput.class.getDeclaredMethod("listFilesByPrefix", PluginTask.class);
+        listFilesByPrefix.setAccessible(true);
+        try {
+            listFilesByPrefix.invoke(plugin, task);
+            fail();
+        }
+        catch (Exception ex) {
+            Throwable cause = ex.getCause();
+            assertEquals(cause.getClass(), ConfigException.class);
+            assertEquals(cause.getCause().getCause().getCause().getMessage(), "Auth fail");
+        }
+    }
+
     @Test
     public void testListFilesWithPathPrefixPointToFile() throws Exception
     {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-sftp
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
 platform: ruby
 authors:
 - Satoshi Akama
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-05-07 00:00:00.000000000 Z
+date: 2018-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -69,10 +69,10 @@ files:
 - src/test/resources/id_rsa.pub
 - src/test/resources/sample_01.csv
 - src/test/resources/sample_02.csv
-- classpath/commons-io-2.6.jar
 - classpath/commons-logging-1.2.jar
+- classpath/embulk-input-sftp-0.2.12.jar
 - classpath/commons-vfs2-2.2.jar
-- classpath/embulk-input-sftp-0.2.11.jar
+- classpath/commons-io-2.6.jar
 - classpath/jsch-0.1.54.jar
 homepage: https://github.com/embulk/embulk-input-sftp
 licenses: