Skip to content

Fix to use Proxy #324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DeviaVir merged 16 commits into from
Jun 16, 2017
Merged

Fix to use Proxy #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
32b8db9
Replace async with Promise
abetomo Jun 9, 2017
9964180
Modify to arrow function
abetomo Jun 9, 2017
bdacf97
Modify from var to const
abetomo Jun 9, 2017
c13e995
Merge remote-tracking branch 'upstream/master'
abetomo Jun 9, 2017
03ac5e1
Merge branch 'master' of github.com:abetomo/node-lambda
abetomo Jun 9, 2017
d444d2e
Merge remote-tracking branch 'upstream/master'
abetomo Jun 12, 2017
60b3558
Merge branch 'master' of github.com:abetomo/node-lambda
abetomo Jun 12, 2017
b2ba79e
Merge branch 'master' of github.com:abetomo/node-lambda
abetomo Jun 14, 2017
c6617b1
Merge remote-tracking branch 'upstream/master'
abetomo Jun 16, 2017
d63e87c
Add proxy-agent
abetomo Jun 16, 2017
1abc2a1
Fix to use Proxy
abetomo Jun 16, 2017
542ec28
Modify text (Because Proxy needs to write from 'http')
abetomo Jun 16, 2017
9fb3486
Merge remote-tracking branch 'upstream/master'
abetomo Jun 16, 2017
87e7888
Merge branch 'master' into fix_to_make_proxy_available
DeviaVir Jun 16, 2017
b5e0138
Merge branch 'master' into fix_to_make_proxy_available
abetomo Jun 16, 2017
613013a
Merge branch 'fix_to_make_proxy_available' of github.com:abetomo/node…
abetomo Jun 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions bin/node-lambda
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ const AWS_DLQ_TARGET_ARN = (function () {
}
return undefined
})()
const PROXY = process.env.PROXY || process.env.http_proxy || ''

program
.command('deploy')
Expand Down Expand Up @@ -123,6 +124,7 @@ program
.option('-D, --prebuiltDirectory [' + PREBUILT_DIRECTORY + ']', 'Prebuilt directory', PREBUILT_DIRECTORY)
.option('-T, --deployTimeout [' + DEPLOY_TIMEOUT + ']', 'Deploy Timeout', DEPLOY_TIMEOUT)
.option('-z, --deployZipfile [' + DEPLOY_ZIPFILE + ']', 'Deploy zipfile', DEPLOY_ZIPFILE)
.option('-y, --proxy [' + PROXY + ']', 'Proxy server', PROXY)
.action(function (prg) {
lambda.deploy(prg)
})
Expand Down
5 changes: 5 additions & 0 deletions lib/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ const packageJson = require(path.join(__dirname, '..', 'package.json'))
const minimatch = require('minimatch')
const zip = new (require('node-zip'))()
const dotenv = require('dotenv')
const proxy = require('proxy-agent')
const ScheduleEvents = require(path.join(__dirname, 'schedule_events'))

const maxBufferSize = 50 * 1024 * 1024
Expand Down Expand Up @@ -792,6 +793,10 @@ Lambda.prototype._deployToRegion = function (program, params, region) {
aws.config.httpOptions.timeout = parseInt(program.deployTimeout)
}

if (program.proxy) {
aws.config.httpOptions.agent = proxy(program.proxy)
}

aws.config.update(awsSecurity)

const lambda = new aws.Lambda({ apiVersion: '2015-03-31' })
Expand Down
Loading