From 56c7e443a0350027cd5ccf5d4c94dc06f353306f Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 24 Sep 2020 17:17:39 +0200
Subject: [PATCH] refactor: Replace `_.forOwn` with `Object.entries().forEach`
 (#8284)

---
 lib/classes/PluginManager.js            | 52 ++++++++++++++-----------
 lib/plugins/aws/utils/findReferences.js | 36 +++++++++--------
 2 files changed, 48 insertions(+), 40 deletions(-)

diff --git a/lib/classes/PluginManager.js b/lib/classes/PluginManager.js
index b1f469e783d..0277ddc9545 100644
--- a/lib/classes/PluginManager.js
+++ b/lib/classes/PluginManager.js
@@ -362,17 +362,21 @@ class PluginManager {
       const currentCommands = stack.pop();
       const commands = currentCommands.commands;
       const target = currentCommands.target;
-      _.forOwn(commands, (command, name) => {
-        if (command.type !== 'entrypoint') {
-          _.set(target, name, _.omit(command, 'commands'));
-          if (
-            Object.values(command.commands).some(childCommand => childCommand.type !== 'entrypoint')
-          ) {
-            target[name].commands = {};
-            stack.push({ commands: command.commands, target: target[name].commands });
+      if (commands) {
+        Object.entries(commands).forEach(([name, command]) => {
+          if (command.type !== 'entrypoint') {
+            _.set(target, name, _.omit(command, 'commands'));
+            if (
+              Object.values(command.commands).some(
+                childCommand => childCommand.type !== 'entrypoint'
+              )
+            ) {
+              target[name].commands = {};
+              stack.push({ commands: command.commands, target: target[name].commands });
+            }
           }
-        }
-      });
+        });
+      }
     }
     // Iterate through the existing aliases and add them as commands
     _.remove(stack);
@@ -381,19 +385,21 @@ class PluginManager {
       const currentAlias = stack.pop();
       const aliases = currentAlias.aliases;
       const target = currentAlias.target;
-      _.forOwn(aliases, (alias, name) => {
-        if (name === 'command') {
-          return;
-        }
-        if (alias.command) {
-          const commandPath = alias.command.split(':').join('.commands.');
-          _.set(target, name, _.get(this.commands, commandPath));
-        } else {
-          target[name] = target[name] || {};
-          target[name].commands = target[name].commands || {};
-        }
-        stack.push({ aliases: alias, target: target[name].commands });
-      });
+      if (aliases) {
+        Object.entries(aliases).forEach(([name, alias]) => {
+          if (name === 'command') {
+            return;
+          }
+          if (alias.command) {
+            const commandPath = alias.command.split(':').join('.commands.');
+            _.set(target, name, _.get(this.commands, commandPath));
+          } else {
+            target[name] = target[name] || {};
+            target[name].commands = target[name].commands || {};
+          }
+          stack.push({ aliases: alias, target: target[name].commands });
+        });
+      }
     }
     return result;
   }
diff --git a/lib/plugins/aws/utils/findReferences.js b/lib/plugins/aws/utils/findReferences.js
index 89cf1240a33..56ad4c409f0 100644
--- a/lib/plugins/aws/utils/findReferences.js
+++ b/lib/plugins/aws/utils/findReferences.js
@@ -18,24 +18,26 @@ function findReferences(root, value) {
   while (stack.length) {
     const property = stack.pop();
 
-    _.forOwn(property.propValue, (propValue, key) => {
-      let propKey;
-      if (Array.isArray(property.propValue)) {
-        propKey = `[${key}]`;
-      } else {
-        propKey = !property.path ? `${key}` : `.${key}`;
-      }
-      if (propValue === value) {
-        resourcePaths.push(`${property.path}${propKey}`);
-      } else if (_.isObject(propValue)) {
-        // Prevent circular references
-        if (visitedObjects.includes(propValue)) {
-          return;
+    if (property.propValue) {
+      Object.entries(property.propValue).forEach(([key, propValue]) => {
+        let propKey;
+        if (Array.isArray(property.propValue)) {
+          propKey = `[${key}]`;
+        } else {
+          propKey = !property.path ? `${key}` : `.${key}`;
         }
-        visitedObjects.push(propValue);
-        stack.push({ propValue, path: `${property.path}${propKey}` });
-      }
-    });
+        if (propValue === value) {
+          resourcePaths.push(`${property.path}${propKey}`);
+        } else if (_.isObject(propValue)) {
+          // Prevent circular references
+          if (visitedObjects.includes(propValue)) {
+            return;
+          }
+          visitedObjects.push(propValue);
+          stack.push({ propValue, path: `${property.path}${propKey}` });
+        }
+      });
+    }
   }
 
   return resourcePaths;