Merge pull request #66 from alekstr/feature/add-proxy-support-for-deploy

Added support for local(Linux) proxy from env https_proxy

Author: Tim-B

README.md

@@ -291,6 +291,11 @@ Default value: None - Required (if you havn't specified an ARN)
 
 *This option is deprecated, use arn instead*. The name of your target Lambda function, ie. the name of the function in the AWS console.
 
+##### Proxy
+On Linux based hosts you can set proxy server for deploy task by specifying standard environment variable - https_proxy.
+E.g: 
+env https_proxy=http://localhost:8080 grunt deploy
+
 ##### package
 Type: `String`
 Default value: Package name set by package task of same target - see below.

package.json

@@ -33,6 +33,7 @@
         "rimraf": "~2.2.8",
         "glob": "~4.3.0",
         "aws-sdk": "~2.2.32",
+	    "proxy-agent": "latest",
         "npm": "^2.10.0",
         "q": "^1.4.1"
     },

test/unit/deploy_task_test.js

@@ -40,7 +40,8 @@ var deployTaskTest = {};
 
 var awsSDKMock,
     lambdaAPIMock,
-    defaultGruntConfig;
+    defaultGruntConfig,
+    proxyAgentMock;
 
 deployTaskTest.setUp = function(done) {
     mockery.enable({
@@ -81,13 +82,17 @@ deployTaskTest.setUp = function(done) {
             return lambdaAPIMock;
         }
     };
+    
+    proxyAgentMock = sinon.spy();
 
     fsMock.reset();
     mockery.registerMock('fs', fsMock);
 
     fsMock.setFileContent('some-package.zip', 'abc123');
 
     mockery.registerMock('aws-sdk', awsSDKMock);
+    
+    mockery.registerMock('proxy-agent', proxyAgentMock);
 
     var dateFacadeMock = {
         getHumanReadableTimestamp: sinon.stub().returns('Sat Feb 13 2016 21:46:15 GMT-0800 (PST)')
@@ -132,6 +137,33 @@ deployTaskTest.testDeploySucceed = function(test) {
     gruntMock.execute(deployTask.getHandler, harnessParams);
 };
 
+deployTaskTest.testDeployUsingProxy = function(test) {
+    test.expect(6);
+
+    var deployTask = require('../../utils/deploy_task');
+    
+    
+    var proxy = 'http://localhost:8080';
+    process.env.https_proxy = proxy;
+
+    var harnessParams = {
+        options: {},
+        config: defaultGruntConfig,
+        callback: function(harness) {
+            test.equal(harness.status, true);
+            test.equal(harness.output.length, 3);
+            test.equal(harness.output[0], 'Uploading...');
+            test.equal(harness.output[1], 'Package deployed.');
+            test.equal(harness.output[2], 'No config updates to make.');
+
+            test.ok(proxyAgentMock.calledWith(proxy));
+            test.done();
+        }
+    };
+
+    gruntMock.execute(deployTask.getHandler, harnessParams);
+};
+
 deployTaskTest.testProfile = function(test) {
     test.expect(3);
 

utils/deploy_task.js

@@ -17,6 +17,8 @@ var dateFacade = require('./date_facade');
 
 var deployTask = {};
 
+var proxy = require('proxy-agent');
+
 deployTask.getHandler = function (grunt) {
 
     return function () {
@@ -39,12 +41,19 @@ deployTask.getHandler = function (grunt) {
             subnetIds: null,
             securityGroupIds: null
         });
-
+	
         if (options.profile !== null) {
             var credentials = new AWS.SharedIniFileCredentials({profile: options.profile});
             AWS.config.credentials = credentials;
         }
 
+        //Adding proxy if exists
+        if(process.env.https_proxy !== "") {
+            AWS.config.update({
+                httpOptions: { agent: proxy(process.env.https_proxy) }
+            });
+        }
+
         if (options.RoleArn !== null) {
             AWS.config.credentials = new AWS.EC2MetadataCredentials({
                 httpOptions: {timeout: 5000} // 5 second timeout