Merge branch 'release/2.1.0'

Author: jacob-meacham

.github/workflows/ci.yml

@@ -0,0 +1,26 @@
+name: Node.js CI
+
+on:
+  push:
+    branches:
+      - '*'
+  pull_request:
+    branches:
+      - '*'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: '16.x'
+      - run: npm ci
+      - run: npm run build
+      - run: npm run ci:coverage
+      - name: Coveralls
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,70 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ develop, master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ develop ]
+  schedule:
+    - cron: '15 15 * * 2'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

README.md

@@ -1,7 +1,7 @@
 # serverless-plugin-deploy-environment
 [![serverless](http://public.serverless.com/badges/v3.svg)](http://www.serverless.com)
 [![Coverage Status](https://coveralls.io/repos/github/DopplerLabs/serverless-plugin-deploy-environment/badge.svg?branch=develop)](https://coveralls.io/github/DopplerLabs/serverless-plugin-deploy-environment?branch=develop)
-[![Build Status](https://travis-ci.org/DopplerLabs/serverless-plugin-deploy-environment.svg?branch=develop)](https://travis-ci.org/DopplerLabs/serverless-plugin-deploy-environment)
+![Build Status](https://github.com/jacob-meacham/serverless-plugin-deploy-environment/actions/workflows/ci.yml/badge.svg)
 
 This plugin exposes per-stage deployment variables and deployment environment, and allows users to run commands with the environment of a given stage. The defined deployment environment is automatically merged with the serverless provider environment. It also optionally resolves [credstash](https://github.com/fugue/credstash) variables. The benefit of this is that its simpler to manage different variables for each environment, and makes the addition of default environment variables simple.
 
@@ -83,6 +83,8 @@ custom:
 Please note that because these are resolved at build time, the plain-text passwords WILL be viewable in Cloudformation and on the Lambda dashboard.
 
 # Version History
+* 2.1.0
+  - Fix merge mutation issue (Thanks @onhate!)
 * 2.0.2
   - Fix CLI warning (Thanks @onhate!)
 * 2.0.1

lib/index.js

@@ -43,15 +43,18 @@ class ServerlessDeployEnvironment {
         options: {
           command: {
             usage: 'The command to run',
-            shortcut: 'c'
+            shortcut: 'c',
+            type: 'string'
           },
           stage: {
             usage: 'The stage to use for stage-specific variables',
-            shortcut: 's'
+            shortcut: 's',
+            type: 'string'
           },
           args: {
             usage: 'Extra arguments to pass through to the subprocess',
-            shortcut: 'a'
+            shortcut: 'a',
+            type: 'multiple'
           }
         }
       }
@@ -125,11 +128,11 @@ class ServerlessDeployEnvironment {
     serverless.variables.loadVariableSyntax(); // Explicitly resolve these here, so that we can apply any transformations that we want
 
     const vars = (0, _deasyncPromise.default)(serverless.variables.populateProperty(deployVariables, false));
-    serverless.service.deployVariables = _lodash.default.merge(vars.default || {}, vars[stage]); // eslint-disable-line
+    serverless.service.deployVariables = _lodash.default.merge({}, vars.default || {}, vars[stage]); // eslint-disable-line
 
     const envs = (0, _deasyncPromise.default)(serverless.variables.populateProperty(deployEnvironment, false)); // eslint-disable-line
 
-    serverless.service.deployEnvironment = _lodash.default.merge(envs.default || {}, envs[stage]); // eslint-disable-line
+    serverless.service.deployEnvironment = _lodash.default.merge({}, envs.default || {}, envs[stage]); // eslint-disable-line
   }
 
   async _resolveDeployEnvironment() {
@@ -145,9 +148,8 @@ class ServerlessDeployEnvironment {
 
   async _runWithEnvironment() {
     const deployEnv = await this._resolveDeployEnvironment();
-    const env = {};
 
-    _lodash.default.merge(env, process.env, deployEnv); // Merge the current environment, overridden with the deploy environment
+    const env = _lodash.default.merge({}, process.env, deployEnv); // Merge the current environment, overridden with the deploy environment
 
 
     const args = this.options.args || '';