From fce0b1886448d91be21aa64b778c98d95bb47b87 Mon Sep 17 00:00:00 2001
From: RT <hungcq1996@gmail.com>
Date: Tue, 30 Jun 2020 18:52:57 +0700
Subject: [PATCH] refactor: Replace `_.concat` with `array.concat` (#7851)

---
 lib/plugins/aws/invokeLocal/index.js          | 20 +++++++++++--------
 .../compile/events/alb/lib/validate.js        |  8 ++++----
 lib/plugins/invoke/invoke.js                  |  2 +-
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/lib/plugins/aws/invokeLocal/index.js b/lib/plugins/aws/invokeLocal/index.js
index f4b4376bb..abd6a2b98 100644
--- a/lib/plugins/aws/invokeLocal/index.js
+++ b/lib/plugins/aws/invokeLocal/index.js
@@ -405,7 +405,7 @@ class AwsInvokeLocal {
   getEnvVarsFromOptions() {
     const envVarsFromOptions = {};
     // Get the env vars from command line options in the form of --env KEY=value
-    _.concat(this.options.env || []).forEach(itm => {
+    [].concat(this.options.env || []).forEach(itm => {
       const splitItm = itm.split('=');
       envVarsFromOptions[splitItm[0]] = splitItm.slice(1, splitItm.length).join('=') || '';
     });
@@ -467,12 +467,16 @@ class AwsInvokeLocal {
           ]);
 
           const dockerArgsFromOptions = this.getDockerArgsFromOptions();
-          const dockerArgs = _.concat(
-            ['run', '--rm', '-v', `${artifactPath}:/var/task:ro,delegated`],
-            envVarsDockerArgs,
-            dockerArgsFromOptions,
-            [imageName, handler, JSON.stringify(this.options.data)]
-          );
+          const dockerArgs = [
+            'run',
+            '--rm',
+            '-v',
+            `${artifactPath}:/var/task:ro,delegated`,
+          ].concat(envVarsDockerArgs, dockerArgsFromOptions, [
+            imageName,
+            handler,
+            JSON.stringify(this.options.data),
+          ]);
 
           return spawnExt('docker', dockerArgs).then(
             ({ stdBuffer }) => {
@@ -494,7 +498,7 @@ class AwsInvokeLocal {
 
   getDockerArgsFromOptions() {
     const dockerArgOptions = this.options['docker-arg'];
-    const dockerArgsFromOptions = _.flatMap(_.concat(dockerArgOptions || []), dockerArgOption => {
+    const dockerArgsFromOptions = _.flatMap([].concat(dockerArgOptions || []), dockerArgOption => {
       const splitItems = dockerArgOption.split(' ');
       return [splitItems[0], splitItems.slice(1).join(' ')];
     });
diff --git a/lib/plugins/aws/package/compile/events/alb/lib/validate.js b/lib/plugins/aws/package/compile/events/alb/lib/validate.js
index f4ae2d568..d0b678901 100644
--- a/lib/plugins/aws/package/compile/events/alb/lib/validate.js
+++ b/lib/plugins/aws/package/compile/events/alb/lib/validate.js
@@ -47,16 +47,16 @@ module.exports = {
               priority: event.alb.priority,
               conditions: {
                 // concat usage allows the user to provide value as a string or an array
-                path: _.concat(event.alb.conditions.path),
+                path: [].concat(event.alb.conditions.path),
               },
               // the following is data which is not defined on the event-level
               functionName,
             };
             if (event.alb.conditions.host) {
-              albObj.conditions.host = _.concat(event.alb.conditions.host);
+              albObj.conditions.host = [].concat(event.alb.conditions.host);
             }
             if (event.alb.conditions.method) {
-              albObj.conditions.method = _.concat(event.alb.conditions.method);
+              albObj.conditions.method = [].concat(event.alb.conditions.method);
             }
             if (event.alb.conditions.header) {
               albObj.conditions.header = this.validateHeaderCondition(event, functionName);
@@ -142,7 +142,7 @@ module.exports = {
   },
 
   validateIpCondition(event, functionName) {
-    const cidrBlocks = _.concat(event.alb.conditions.ip);
+    const cidrBlocks = [].concat(event.alb.conditions.ip);
     const allValuesAreCidr = cidrBlocks.every(
       cidr => CIDR_IPV4_PATTERN.test(cidr) || CIDR_IPV6_PATTERN.test(cidr)
     );
diff --git a/lib/plugins/invoke/invoke.js b/lib/plugins/invoke/invoke.js
index 1b8123ae0..035b88ee2 100644
--- a/lib/plugins/invoke/invoke.js
+++ b/lib/plugins/invoke/invoke.js
@@ -121,7 +121,7 @@ class Invoke {
 
     // Turn zero or more --env options into an array
     //   ...then split --env NAME=value and put into process.env.
-    _.concat(this.options.env || []).forEach(itm => {
+    [].concat(this.options.env || []).forEach(itm => {
       const splitItm = itm.split('=');
       process.env[splitItm[0]] = splitItm[1] || '';
     });