embulk-output-sftp 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 240c94805c37b60dab3cbd3fa4f56e7f4425ccd5
-  data.tar.gz: e7c12ffd35503919c9cbe6ae5d94e0eb57e5dd29
+  metadata.gz: def79366c531079d576567b48397391ad61bf65f
+  data.tar.gz: 3a5e5e2fae4a711450ab485fba681fe39da7ddce
 SHA512:
-  metadata.gz: 9daa772b09637ce0054f1ec9637fdc8f6ea7f7d989968bbaee32616c80fc7e2d711598b6d27b02a7931ace5012e87b2b373cc4d9caeac2a00345a600925854ac
-  data.tar.gz: 9c4d21f588162ff7c9b3cf97acf8f83fae4ba373b1160aef490b9b6f8316984d18d9a9b831b101c276e41a25fa39b607a015cfe7786d9f73cb7ad363cea32d19
+  metadata.gz: f3985d0d51133dbe93a5a29c1a3b9c7757b2b9a0b8724a2cbd88b46bff6d4e91a6e1dc6eab86727397a772451c9f65146907da4da2239424e22028f4a5810eb6
+  data.tar.gz: 3894f07dbd4d056dd75bc0f9f4b95e000421ff1da5cc9733d1b6c563fffd355146b5d7f918ee454b7c7f4226de9dd8ce283313c5ea0f826477634c94caedbb68

data/.travis.yml

@@ -1,7 +1,6 @@
 dist: trusty
 language: java
 jdk:
-  - openjdk8
   - oraclejdk8
 script:
   - ./gradlew test

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+0.2.2 (2019-07-26)
+- Do not retry when "Connection refused" is returned and throw ConfigException
+  - https://github.com/embulk/embulk-output-sftp/pull/56
 0.2.1 (2018-10-23)
 - Improved logic that detects exception is retryable or not
   - https://github.com/embulk/embulk-output-sftp/pull/52

data/build.gradle

@@ -17,9 +17,9 @@ configurations {
 }
 
 group = "org.embulk.output.sftp"
-version = "0.2.1"
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+version = "0.2.2"
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 dependencies {
     compile  "org.embulk:embulk-core:0.9.7"
@@ -27,7 +27,7 @@ dependencies {
     // compile "YOUR_JAR_DEPENDENCY_GROUP:YOUR_JAR_DEPENDENCY_MODULE:YOUR_JAR_DEPENDENCY_VERSION"
     compile "org.apache.commons:commons-vfs2:2.2"
     compile "commons-io:commons-io:2.6"
-    compile "com.jcraft:jsch:0.1.54"
+    compile "com.jcraft:jsch:0.1.55"
     testCompile "junit:junit:4.+"
     testCompile "org.embulk:embulk-core:0.9.7:tests"
     testCompile "org.embulk:embulk-standards:0.9.7"

data/src/main/java/org/embulk/output/sftp/ProxyTask.java

@@ -2,7 +2,6 @@ package org.embulk.output.sftp;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.google.common.base.Optional;
 import org.apache.commons.vfs2.FileSystemOptions;
 import org.apache.commons.vfs2.provider.sftp.SftpFileSystemConfigBuilder;
 import org.embulk.config.Config;
@@ -11,33 +10,34 @@ import org.embulk.config.ConfigException;
 import org.embulk.config.Task;
 
 import java.util.Locale;
+import java.util.Optional;
 
 interface ProxyTask
         extends Task
 {
     @Config("type")
-    public ProxyType getType();
+    ProxyType getType();
 
     @Config("host")
-    public Optional<String> getHost();
+    Optional<String> getHost();
 
     @Config("user")
     @ConfigDefault("null")
-    public Optional<String> getUser();
+    Optional<String> getUser();
 
     @Config("password")
     @ConfigDefault("null")
-    public Optional<String> getPassword();
+    Optional<String> getPassword();
 
     @Config("port")
     @ConfigDefault("22")
-    public int getPort();
+    int getPort();
 
     @Config("command")
     @ConfigDefault("null")
-    public Optional<String> getCommand();
+    Optional<String> getCommand();
 
-    public enum ProxyType
+    enum ProxyType
     {
         HTTP,
         SOCKS,

data/src/main/java/org/embulk/output/sftp/SftpFileOutputPlugin.java

@@ -1,6 +1,5 @@
 package org.embulk.output.sftp;
 
-import com.google.common.base.Optional;
 import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
 import org.embulk.config.ConfigDiff;
@@ -18,6 +17,7 @@ import javax.validation.constraints.Min;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 public class SftpFileOutputPlugin
         implements FileOutputPlugin
@@ -26,68 +26,68 @@ public class SftpFileOutputPlugin
             extends Task
     {
         @Config("host")
-        public String getHost();
+        String getHost();
 
         @Config("port")
         @ConfigDefault("22")
-        public int getPort();
+        int getPort();
 
         @Config("user")
-        public String getUser();
+        String getUser();
 
         @Config("password")
         @ConfigDefault("null")
-        public Optional<String> getPassword();
+        Optional<String> getPassword();
 
         @Config("secret_key_file")
         @ConfigDefault("null")
-        public Optional<LocalFile> getSecretKeyFilePath();
-        public void setSecretKeyFilePath(Optional<LocalFile> secretKeyFilePath);
+        Optional<LocalFile> getSecretKeyFilePath();
+        void setSecretKeyFilePath(Optional<LocalFile> secretKeyFilePath);
 
         @Config("secret_key_passphrase")
         @ConfigDefault("\"\"")
-        public String getSecretKeyPassphrase();
+        String getSecretKeyPassphrase();
 
         @Config("user_directory_is_root")
         @ConfigDefault("true")
-        public boolean getUserDirIsRoot();
+        boolean getUserDirIsRoot();
 
         @Config("timeout")
         @ConfigDefault("600") // 10 minutes
-        public int getSftpConnectionTimeout();
+        int getSftpConnectionTimeout();
 
         @Config("max_connection_retry")
         @ConfigDefault("5") // 5 times retry to connect sftp server if failed.
-        public int getMaxConnectionRetry();
+        int getMaxConnectionRetry();
 
         @Config("path_prefix")
-        public String getPathPrefix();
+        String getPathPrefix();
 
         @Config("file_ext")
-        public String getFileNameExtension();
+        String getFileNameExtension();
 
         @Config("sequence_format")
         @ConfigDefault("\"%03d.%02d.\"")
-        public String getSequenceFormat();
+        String getSequenceFormat();
 
         @Config("proxy")
         @ConfigDefault("null")
-        public Optional<ProxyTask> getProxy();
+        Optional<ProxyTask> getProxy();
 
         @Config("rename_file_after_upload")
         @ConfigDefault("false")
-        public boolean getRenameFileAfterUpload();
+        boolean getRenameFileAfterUpload();
 
         // if `false`, plugin will use remote file as buffer
         @Config("local_buffering")
         @ConfigDefault("true")
-        public boolean getLocalBuffering();
+        boolean getLocalBuffering();
 
         @Min(50L * 1024 * 1024) // 50MiB
         @Max(10L * 1024 * 1024 * 1024) // 10GiB
         @Config("temp_file_threshold")
         @ConfigDefault("5368709120") // 5GiB
-        public long getTempFileThreshold();
+        long getTempFileThreshold();
     }
 
     @Override

data/src/main/java/org/embulk/output/sftp/SftpUtils.java

@@ -1,7 +1,6 @@
 package org.embulk.output.sftp;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Function;
 import com.google.common.base.Throwables;
 import org.apache.commons.vfs2.FileObject;
 import org.apache.commons.vfs2.FileSystemException;
@@ -20,7 +19,6 @@ import org.embulk.spi.util.RetryExecutor.Retryable;
 import org.slf4j.Logger;
 
 import java.io.BufferedOutputStream;
-import java.io.Closeable;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -29,6 +27,7 @@ import java.io.OutputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
 import java.util.regex.Pattern;
 
 import static org.embulk.output.sftp.SftpFileOutputPlugin.PluginTask;
@@ -96,7 +95,7 @@ public class SftpUtils
             builder.setStrictHostKeyChecking(fsOptions, "no");
             if (task.getSecretKeyFilePath().isPresent()) {
                 IdentityInfo identityInfo = new IdentityInfo(
-                        new File((task.getSecretKeyFilePath().transform(localFileToPathString()).get())),
+                        new File((task.getSecretKeyFilePath().map(localFileToPathString()).get())),
                         task.getSecretKeyPassphrase().getBytes()
                 );
                 builder.setIdentityInfo(fsOptions, identityInfo);

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

@@ -1,6 +1,7 @@
 package org.embulk.output.sftp.utils;
 
 import com.jcraft.jsch.JSchException;
+import org.embulk.config.ConfigException;
 import org.embulk.spi.Exec;
 import org.embulk.spi.util.RetryExecutor;
 import org.slf4j.Logger;
@@ -19,7 +20,7 @@ public abstract class DefaultRetry<T> implements RetryExecutor.Retryable<T>
     @Override
     public boolean isRetryableException(Exception exception)
     {
-        return !hasRootCauseAuthFail(exception);
+        return !hasRootCauseUserProblem(exception);
     }
 
     @Override
@@ -38,6 +39,9 @@ public abstract class DefaultRetry<T> implements RetryExecutor.Retryable<T>
     @Override
     public void onGiveup(Exception firstException, Exception lastException)
     {
+        if (hasRootCauseUserProblem(lastException)) {
+            throw new ConfigException(lastException);
+        }
     }
 
     private static boolean isAuthFail(Throwable e)
@@ -45,9 +49,14 @@ public abstract class DefaultRetry<T> implements RetryExecutor.Retryable<T>
         return e instanceof JSchException && (e.getMessage().contains("Auth fail") || e.getMessage().contains("USERAUTH fail"));
     }
 
-    private static boolean hasRootCauseAuthFail(Throwable e)
+    private static boolean isConnectionProblem(Throwable e)
+    {
+        return e instanceof JSchException && (e.getMessage().contains("Connection refused"));
+    }
+
+    private static boolean hasRootCauseUserProblem(Throwable e)
     {
-        while (e != null && !isAuthFail(e)) {
+        while (e != null && !isAuthFail(e) && !isConnectionProblem(e)) {
             e = e.getCause();
         }
         return e != null;

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

@@ -1,7 +1,6 @@
 package org.embulk.output.sftp;
 
 import com.google.common.base.Charsets;
-import com.google.common.base.Optional;
 import com.google.common.collect.Lists;
 import com.google.common.io.Resources;
 import com.jcraft.jsch.JSchException;
@@ -62,6 +61,7 @@ import java.security.PublicKey;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 import java.util.Random;
 import java.util.concurrent.TimeoutException;
 
@@ -331,8 +331,8 @@ public class TestSftpFileOutputPlugin
         assertEquals(HOST, task.getHost());
         assertEquals(22, task.getPort());
         assertEquals(USERNAME, task.getUser());
-        assertEquals(Optional.absent(), task.getPassword());
-        assertEquals(Optional.absent(), task.getSecretKeyFilePath());
+        assertEquals(Optional.empty(), task.getPassword());
+        assertEquals(Optional.empty(), task.getSecretKeyFilePath());
         assertEquals("", task.getSecretKeyPassphrase());
         assertEquals(true, task.getUserDirIsRoot());
         assertEquals(600, task.getSftpConnectionTimeout());
@@ -340,7 +340,7 @@ public class TestSftpFileOutputPlugin
         assertEquals(pathPrefix, task.getPathPrefix());
         assertEquals("txt", task.getFileNameExtension());
         assertEquals("%03d.%02d.", task.getSequenceFormat());
-        assertEquals(Optional.absent(), task.getProxy());
+        assertEquals(Optional.empty(), task.getProxy());
     }
 
     @Test

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-sftp
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Civitaspo
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-10-23 00:00:00.000000000 Z
+date: 2019-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -83,9 +83,9 @@ 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.1.jar
+- classpath/embulk-output-sftp-0.2.2.jar
 - classpath/commons-io-2.6.jar
-- classpath/jsch-0.1.54.jar
+- classpath/jsch-0.1.55.jar
 homepage: https://github.com/embulk/embulk-output-sftp
 licenses:
 - MIT