#5945: Invoke local docker to pass env vars to lambda container

lib/plugins/aws/invokeLocal/index.js

@@ -103,6 +103,12 @@ class AwsInvokeLocal {
     });
   }
 
+  getConfiguredEnvVars() {
+    const providerEnvVars = this.serverless.service.provider.environment || {};
+    const functionEnvVars = this.options.functionObj.environment || {};
+    return _.merge(providerEnvVars, functionEnvVars);
+  }
+
   loadEnvVars() {
     const lambdaName = this.options.functionObj.name;
     const memorySize = Number(this.options.functionObj.memorySize)
@@ -130,10 +136,9 @@ class AwsInvokeLocal {
       lambdaDefaultEnvVars.AWS_PROFILE = profileOverride;
     }
 
-    const providerEnvVars = this.serverless.service.provider.environment || {};
-    const functionEnvVars = this.options.functionObj.environment || {};
+    const configuredEnvVars = this.getConfiguredEnvVars();
 
-    _.merge(process.env, lambdaDefaultEnvVars, providerEnvVars, functionEnvVars);
+    _.merge(process.env, lambdaDefaultEnvVars, configuredEnvVars);
 
     return BbPromise.resolve();
   }
@@ -315,6 +320,16 @@ class AwsInvokeLocal {
         this.serverless.config.servicePath, '.serverless', 'invokeLocal', 'artifact'));
   }
 
+  getEnvVarsFromOptions() {
+    const envVarsFromOptions = {};
+    // Get the env vars from command line options in the form of --env KEY=value
+    _.concat(this.options.env || [])
+    .forEach(itm => {
+      const splitItm = _.split(itm, '=');
+      envVarsFromOptions[splitItm[0]] = splitItm.slice(1, splitItm.length).join('=') || '';
+    });
+    return envVarsFromOptions;
+  }
 
   invokeLocalDocker() {
     const handler = this.options.functionObj.handler;
@@ -329,10 +344,16 @@ class AwsInvokeLocal {
         .then((results) => new BbPromise((resolve, reject) => {
           const imageName = results[2];
           const artifactPath = results[3];
+          const configuredEnvVars = this.getConfiguredEnvVars();
+          const envVarsFromOptions = this.getEnvVarsFromOptions();
+          const envVars = _.merge(configuredEnvVars, envVarsFromOptions);
+          const envVarsDockerArgs = _.flatMap(envVars,
+            (value, key) => ['--env', `${key}=${value}`]
+          );
           const dockerArgsFromOptions = this.getDockerArgsFromOptions();
           const dockerArgs = _.concat([
             'run', '--rm', '-v', `${artifactPath}:/var/task`,
-          ], dockerArgsFromOptions, [
+          ], envVarsDockerArgs, dockerArgsFromOptions, [
             imageName, handler, JSON.stringify(this.options.data),
           ]);
           const docker = spawn('docker', dockerArgs);

lib/plugins/aws/invokeLocal/index.test.js

@@ -1153,6 +1153,9 @@ describe('AwsInvokeLocal', () => {
       serverless.setProvider('aws', new AwsProvider(serverless, options));
       awsInvokeLocalMocked = new AwsInvokeLocalMocked(serverless, options);
 
+      serverless.service.provider.environment = {
+        providerVar: 'providerValue',
+      };
       awsInvokeLocalMocked.options = {
         stage: 'dev',
         function: 'first',
@@ -1161,8 +1164,12 @@ describe('AwsInvokeLocal', () => {
           name: 'hello',
           timeout: 4,
           runtime: 'nodejs8.10',
+          environment: {
+            functionVar: 'functionValue',
+          },
         },
         data: {},
+        env: 'commandLineEnvVar=commandLineEnvVarValue',
         'docker-arg': '-p 9292:9292',
       };
 
@@ -1199,6 +1206,12 @@ describe('AwsInvokeLocal', () => {
           '--rm',
           '-v',
           'servicePath:/var/task',
+          '--env',
+          'providerVar=providerValue',
+          '--env',
+          'functionVar=functionValue',
+          '--env',
+          'commandLineEnvVar=commandLineEnvVarValue',
           '-p',
           '9292:9292',
           'sls-docker',
@@ -1209,6 +1222,48 @@ describe('AwsInvokeLocal', () => {
     );
   });
 
+  describe('#getEnvVarsFromOptions', () => {
+    it('returns empty object when env option is not set', () => {
+      delete awsInvokeLocal.options.env;
+
+      const envVarsFromOptions = awsInvokeLocal.getEnvVarsFromOptions();
+
+      expect(envVarsFromOptions).to.be.eql({});
+    });
+
+    it('returns empty object when env option empty', () => {
+      awsInvokeLocal.options.env = '';
+
+      const envVarsFromOptions = awsInvokeLocal.getEnvVarsFromOptions();
+
+      expect(envVarsFromOptions).to.be.eql({});
+    });
+
+    it('returns key value for option separated by =', () => {
+      awsInvokeLocal.options.env = 'SOME_ENV_VAR=some-value';
+
+      const envVarsFromOptions = awsInvokeLocal.getEnvVarsFromOptions();
+
+      expect(envVarsFromOptions).to.be.eql({ SOME_ENV_VAR: 'some-value' });
+    });
+
+    it('returns key with empty value for option without =', () => {
+      awsInvokeLocal.options.env = 'SOME_ENV_VAR';
+
+      const envVarsFromOptions = awsInvokeLocal.getEnvVarsFromOptions();
+
+      expect(envVarsFromOptions).to.be.eql({ SOME_ENV_VAR: '' });
+    });
+
+    it('returns key with single value for option multiple =s', () => {
+      awsInvokeLocal.options.env = 'SOME_ENV_VAR=value1=value2';
+
+      const envVarsFromOptions = awsInvokeLocal.getEnvVarsFromOptions();
+
+      expect(envVarsFromOptions).to.be.eql({ SOME_ENV_VAR: 'value1=value2' });
+    });
+  });
+
   describe('#getDockerArgsFromOptions', () => {
     it('returns empty list when docker-arg option is absent', () => {
       delete awsInvokeLocal.options['docker-arg'];