Skip to content

Commit 326407e

Browse files
committed
Fix HttpProxy: not parse and create HttpProxy from environment variables.
1 parent d4bbee7 commit 326407e

File tree

1 file changed

+0
-11
lines changed

1 file changed

+0
-11
lines changed

embulk-input-s3/src/main/java/org/embulk/input/s3/AbstractS3FileInputPlugin.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,6 @@ public ConfigDiff transaction(ConfigSource config, FileInputPlugin.Control contr
9292
{
9393
PluginTask task = config.loadConfig(getTaskClass());
9494

95-
// configure http proxy
96-
task.setHttpProxy(createHttpProxyWithDefault(task));
97-
9895
// list files recursively
9996
task.setFiles(listFiles(task));
10097

@@ -160,14 +157,6 @@ protected ClientConfiguration getClientConfiguration(PluginTask task)
160157
return clientConfig;
161158
}
162159

163-
private Optional<HttpProxy> createHttpProxyWithDefault(PluginTask task)
164-
{
165-
// If users configure http proxy in in: section, the settings are used. If http proxy settings
166-
// don't exist in the config, it searches and extracts from environment variables: "HTTPS_PROXY",
167-
// "https_proxy", "HTTP_PROXY", "http_proxy".
168-
return task.getHttpProxy().or(HttpProxy.createHttpProxyFromEnv());
169-
}
170-
171160
private void setHttpProxyInAwsClient(ClientConfiguration clientConfig, HttpProxy httpProxy)
172161
{
173162
// host

0 commit comments

Comments
 (0)