backward compatibility

Author: giwa

README.md

@@ -25,8 +25,62 @@
 - **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 )
+- [Deprecated] **proxy_host**: proxy host to use when accessing AWS S3 via proxy. (string, default: null )
+- [Deprecated] **proxy_port**: proxy port to use when accessing AWS S3 via proxy. (string, default: null )
+- **http_proxy** http proxy configuration to use when accessing AWS S3 via http proxy. (optional)
+  - **host** proxy host (string, required)
+  - **port** proxy port (int, optional)
+  - **https** use https or not (boolean, default true)
+  - **user** proxy user (string, optional)
+  - **password** proxy password (string, optional)
+
+- **auth_method**: name of mechanism to authenticate requests (basic, env, instance, profile, properties, anonymous, or session. default: basic)
+
+    - "basic": uses access_key_id and secret_access_key to authenticate.
+
+        - **access_key_id**: AWS access key ID (string, required)
+
+        - **secret_access_key**: AWS secret access key (string, required)
+
+    - "env": uses AWS_ACCESS_KEY_ID (or AWS_ACCESS_KEY) and AWS_SECRET_KEY (or AWS_SECRET_ACCESS_KEY) environment variables.
+
+    - "instance": uses EC2 instance profile.
+
+    - "profile": uses credentials written in a file. Format of the file is as following, where `[...]` is a name of profile.
+
+        - **profile_file**: path to a profiles file. (string, default: given by AWS_CREDENTIAL_PROFILES_FILE environment varialbe, or ~/.aws/credentials).
+
+        - **profile_name**: name of a profile. (string, default: `"default"`)
+
+      ```
+      [default]
+      aws_access_key_id=YOUR_ACCESS_KEY_ID
+      aws_secret_access_key=YOUR_SECRET_ACCESS_KEY
+  
+      [profile2]
+      ...
+      ```
+
+    - "properties": uses aws.accessKeyId and aws.secretKey Java system properties.
+
+    - "anonymous": uses anonymous access. This auth method can access only public files.
+
+    - "session": uses temporary-generated access_key_id, secret_access_key and session_token.
+
+        - **access_key_id**: AWS access key ID (string, required)
+
+        - **secret_access_key**: AWS secret access key (string, required)
+
+        - **session_token**: session token (string, required)
+
+    - "default": uses AWS SDK's default strategy to look up available credentials from runtime environment. This method behaves like the combination of the following methods.
+
+        1. "env"
+        1. "properties"
+        1. "profile"
+        1. "instance"
+
+
 
 ### CannedAccessControlList
 you can choose one of the below list.

src/main/java/org/embulk/output/s3/HttpProxy.java

@@ -18,10 +18,12 @@ public interface HttpProxy
 {
     @Config("host")
     String getHost();
+    void setHost(String host);
 
     @Config("port")
     @ConfigDefault("null")
     Optional<Integer> getPort();
+    void setPort(Optional<Integer> host);
 
     @Config("https")
     @ConfigDefault("true")

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

@@ -191,14 +191,41 @@ private ClientConfiguration getClientConfiguration(PluginTask task)
             clientConfig.setMaxConnections(50); // SDK default: 50
             clientConfig.setSocketTimeout(8 * 60 * 1000); // SDK default: 50*1000
             clientConfig.setRetryPolicy(PredefinedRetryPolicies.NO_RETRY_POLICY);
+
             // set http proxy
+            // backward compatibility
+            if (task.getProxyHost().isPresent() || task.getProxyPort().isPresent()){
+                if (!task.getHttpProxy().isPresent()){
+                    TaskMapper taskMapper = CONFIG_MAPPER_FACTORY.createTaskMapper();
+                    HttpProxy httpProxy = taskMapper.map(CONFIG_MAPPER_FACTORY.newTaskSource(), HttpProxy.class);
+                    task.setHttpProxy(Optional.of(httpProxy));
+                }
+            }
+
+            if (task.getProxyHost().isPresent()){
+                HttpProxy httpProxy = task.getHttpProxy().get();
+                if (httpProxy.getHost().isEmpty()){
+                    httpProxy.setHost(task.getProxyHost().get());
+                    task.setHttpProxy(Optional.of(httpProxy));
+                }
+            }
+
+            if (task.getProxyPort().isPresent()){
+                HttpProxy httpProxy = task.getHttpProxy().get();
+                if (!httpProxy.getPort().isPresent()){
+                    httpProxy.setPort(task.getProxyPort());
+                    task.setHttpProxy(Optional.of(httpProxy));
+                }
+            }
+
             if (task.getHttpProxy().isPresent()) {
                 setHttpProxyInAwsClient(clientConfig, task.getHttpProxy().get());
             }
 
             return clientConfig;
         }
 
+
         private void setHttpProxyInAwsClient(ClientConfiguration clientConfig, HttpProxy httpProxy)
         {
             // host