embulk-output-s3 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f60fa827c7b7dabc3d3e80a7408b00169ee4547
-  data.tar.gz: 028916eda060b243fa22bce5608e48049fb2edb6
+  metadata.gz: 00334de8a039abe0bdb057ddad0b98961fd4ad58
+  data.tar.gz: 6077938b5cb562c6c006986623cbd0b4428fe11f
 SHA512:
-  metadata.gz: 1d1883290af301a74de2944ab006cdb75c6381007b2825b06693d9c8f0152e062044e37f97aea6a0553b8eba69785c518352fb13ba48fd76a894e7471eb7fa63
-  data.tar.gz: 2ff3773d9dff06db9e1f06da57279737373cfe2bc442e365d046705d79c12f63eec7c2501a998d0b5a3ebf7caa9adee3c4eb683604b9964bd851075666735629
+  metadata.gz: b230018fc21488af215c1d819659e75e09c934e2f34a078dea81c3daf5fba46a1620fa2124550a317ca3e083fd43b52c8acdaf411f463753f0dec94dd9dac7db
+  data.tar.gz: 1f3ee354c87960fd5f79b757add1c6424250c0a338529a76c4397b8d2d5f2e11ba0c60190253a1380448eb0c5d68114b815f17b62a930b365d775408b713eccd

data/README.md

@@ -22,8 +22,11 @@
 - **endpoint**: S3 endpoint login user name (string, optional)
 - **access_key_id**: AWS access key id. This parameter is required when your agent is not running on EC2 instance with an IAM Role. (string, defualt: null)
 - **secret_access_key**: AWS secret key. This parameter is required when your agent is not running on EC2 instance with an IAM Role. (string, defualt: null)
+- **tmp_path**: temporary file directory. If null, it is associated with the default FileSystem. (string, default: null)
 - **tmp_path_prefix**: prefix of temporary files (string, default: 'embulk-output-s3-')
 - **canned_acl**: canned access control list for created objects ([enum](#cannedaccesscontrollist), default: null)
+- **proxy_host**: proxy host to use when accessing AWS S3 via proxy. (string, default: null )
+- **proxy_port**: proxy port to use when accessing AWS S3 via proxy. (string, default: null )
 
 ### CannedAccessControlList
 you can choose one of the below list.

data/build.gradle

@@ -13,7 +13,7 @@ configurations {
     provided
 }
 
-version = "1.3.0"
+version = "1.4.0"
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7

data/src/main/java/org/embulk/output/S3FileOutputPlugin.java

@@ -4,6 +4,7 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.IllegalFormatException;
 import java.util.List;
 import java.util.Locale;
@@ -61,6 +62,18 @@ public class S3FileOutputPlugin
         @ConfigDefault("null")
         Optional<String> getSecretAccessKey();
 
+        @Config("proxy_host")
+        @ConfigDefault("null")
+        Optional<String> getProxyHost();
+
+        @Config("proxy_port")
+        @ConfigDefault("null")
+        Optional<Integer> getProxyPort();
+
+        @Config("tmp_path")
+        @ConfigDefault("null")
+        Optional<String> getTempPath();
+
         @Config("tmp_path_prefix")
         @ConfigDefault("\"embulk-output-s3-\"")
         String getTempPathPrefix();
@@ -88,6 +101,7 @@ public class S3FileOutputPlugin
         private AmazonS3Client client;
         private OutputStream current;
         private Path tempFilePath;
+        private String tempPath = null;
 
         private static AmazonS3Client newS3Client(PluginTask task)
         {
@@ -96,6 +110,14 @@ public class S3FileOutputPlugin
             // TODO: Support more configurations.
             ClientConfiguration config = new ClientConfiguration();
 
+            if (task.getProxyHost().isPresent()) {
+                config.setProxyHost(task.getProxyHost().get());
+            }
+
+            if (task.getProxyPort().isPresent()) {
+                config.setProxyPort(task.getProxyPort().get());
+            }
+
             if (task.getAccessKeyId().isPresent()) {
                 BasicAWSCredentials basicAWSCredentials = new BasicAWSCredentials(
                         task.getAccessKeyId().get(), task.getSecretAccessKey().get());
@@ -123,13 +145,20 @@ public class S3FileOutputPlugin
             this.sequenceFormat = task.getSequenceFormat();
             this.fileNameExtension = task.getFileNameExtension();
             this.tempPathPrefix = task.getTempPathPrefix();
+            if (task.getTempPath().isPresent()) {
+                this.tempPath = task.getTempPath().get();
+            }
             this.cannedAccessControlListOptional = task.getCannedAccessControlList();
         }
 
-        private static Path newTempFile(String prefix)
+        private static Path newTempFile(String tmpDir, String prefix)
                 throws IOException
         {
-            return Files.createTempFile(prefix, null);
+            if (tmpDir == null) {
+                return Files.createTempFile(prefix, null);
+            } else {
+                return Files.createTempFile(Paths.get(tmpDir), prefix, null);
+            }
         }
 
         private void deleteTempFile()
@@ -193,7 +222,7 @@ public class S3FileOutputPlugin
             closeCurrent();
 
             try {
-                tempFilePath = newTempFile(tempPathPrefix);
+                tempFilePath = newTempFile(tempPath, tempPathPrefix);
 
                 log.info("Writing S3 file '{}'", buildCurrentKey());
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-s3
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Manabu Takayama
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-12 00:00:00.000000000 Z
+date: 2016-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -59,14 +59,14 @@ files:
 - settings.gradle
 - src/main/java/org/embulk/output/S3FileOutputPlugin.java
 - src/test/java/org/embulk/output/TestS3FileOutputPlugin.java
-- classpath/embulk-output-s3-1.3.0.jar
-- classpath/aws-java-sdk-s3-1.10.26.jar
+- classpath/aws-java-sdk-core-1.10.26.jar
 - classpath/aws-java-sdk-kms-1.10.26.jar
+- classpath/aws-java-sdk-s3-1.10.26.jar
 - classpath/commons-codec-1.6.jar
-- classpath/httpcore-4.3.3.jar
-- classpath/httpclient-4.3.6.jar
-- classpath/aws-java-sdk-core-1.10.26.jar
 - classpath/commons-logging-1.1.3.jar
+- classpath/embulk-output-s3-1.4.0.jar
+- classpath/httpclient-4.3.6.jar
+- classpath/httpcore-4.3.3.jar
 homepage: https://github.com/llibra/embulk-output-s3
 licenses:
 - MIT