Dependencies updates, only import necessary Lodash functions and upda…

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mup-aws-beanstalk",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "Deploy apps to AWS Elastic Beanstalk using Meteor Up",
   "main": "index.js",
   "scripts": {
@@ -21,33 +21,35 @@
   "devDependencies": {
     "@babel/cli": "^7.15.7",
     "@babel/core": "^7.15.5",
+    "@babel/eslint-parser": "^7.15.8",
     "@babel/plugin-proposal-object-rest-spread": "^7.15.6",
     "@babel/plugin-transform-modules-commonjs": "^7.15.4",
-    "babel-eslint": "^10.1.0",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "chai": "^4.3.4",
     "eslint": "^7.32.0",
-    "eslint-config-airbnb": "^16.1.0",
+    "eslint-config-airbnb": "^18.2.1",
     "eslint-plugin-import": "^2.24.2",
     "eslint-plugin-jsx-a11y": "^6.4.1",
     "eslint-plugin-react": "^7.26.0",
     "gfm-code-blocks": "^1.0.0",
-    "mocha": "^8.0.1",
+    "mocha": "^9.1.3",
     "mup": "^1.5.4",
     "shelljs": "^0.8.4"
   },
   "dependencies": {
-    "@hapi/joi": "^15.1.1",
-    "archiver": "^4.0.2",
+    "archiver": "^5.3.0",
     "aws-sdk": "^2.991.0",
-    "axios": "^0.21.4",
+    "axios": "^0.23.0",
     "babel-polyfill": "^6.26.0",
-    "chalk": "^2.3.0",
-    "ejs": "^2.5.7",
-    "lodash": "^4.17.21",
+    "chalk": "^4.1.2",
+    "ejs": "^3.1.6",
+    "joi": "^17.4.2",
+    "lodash.difference": "^4.5.0",
+    "lodash.isequal": "^4.5.0",
+    "lodash.round": "^4.0.4",
     "random-seed": "^0.3.0",
     "shell-escape": "^0.2.0",
     "ssh2": "^1.4.0",
-    "uuid": "^3.1.0"
+    "uuid": "^8.3.2"
   }
 }

src/aws.js

@@ -24,7 +24,7 @@ export default function configure({ auth, name, region }) {
     region: region || 'us-east-1',
     maxRetries: 25,
     retryDelayOptions: {
-      customBackoff: retryCount => Math.min((2 ** retryCount * 1000), MAX_RETRY_DELAY)
+      customBackoff: (retryCount) => Math.min((2 ** retryCount * 1000), MAX_RETRY_DELAY)
     }
   };
 

src/command-handlers.js

@@ -56,7 +56,7 @@ import {
   oldVersions,
   oldEnvVersions
 } from './versions';
-import { createEnvFile } from './env-settings';
+import createEnvFile from './env-settings';
 import {
   createDesiredConfig,
   prepareUpdateEnvironment,
@@ -136,7 +136,7 @@ export async function setup(api) {
     Applications
   } = await beanstalk.describeApplications().promise();
 
-  if (!Applications.find(app => app.ApplicationName === appName)) {
+  if (!Applications.find((app) => app.ApplicationName === appName)) {
     const params = {
       ApplicationName: appName,
       Description: `App "${appConfig.name}" managed by Meteor Up`
@@ -150,9 +150,9 @@ export async function setup(api) {
     logStep('=> Ensuring Graceful Shutdown is setup');
 
     const existingBucket = findBucketWithPrefix(Buckets, trailBucketPrefix);
-    const trailBucketName = existingBucket ?
-      existingBucket.Name :
-      createUniqueName(trailBucketPrefix);
+    const trailBucketName = existingBucket
+      ? existingBucket.Name
+      : createUniqueName(trailBucketPrefix);
     const region = appConfig.region || 'us-east-1';
     const accountId = await getAccountId();
     const policy = trailBucketPolicy(accountId, trailBucketName);
@@ -219,13 +219,12 @@ export async function deploy(api) {
     environment
   } = names(config);
 
-
   const version = await largestVersion(api);
   const nextVersion = version + 1;
 
   // Mutates the config, so the meteor.build command will have the correct build location
-  config.app.buildOptions.buildLocation = config.app.buildOptions.buildLocation ||
-    tmpBuildPath(config.app.path, api);
+  config.app.buildOptions.buildLocation = config.app.buildOptions.buildLocation
+    || tmpBuildPath(config.app.path, api);
 
   const bundlePath = api.resolvePath(config.app.buildOptions.buildLocation, 'bundle.zip');
   const willBuild = shouldRebuild(bundlePath, api.getOptions()['cached-build']);
@@ -461,7 +460,7 @@ export async function reconfig(api) {
     environment,
     bucket
   } = names(config);
-  const deploying = !!api.commandHistory.find(entry => entry.name === 'beanstalk.deploy');
+  const deploying = !!api.commandHistory.find((entry) => entry.name === 'beanstalk.deploy');
 
   logStep('=> Configuring Beanstalk environment');
 
@@ -473,7 +472,7 @@ export async function reconfig(api) {
     EnvironmentNames: [environment]
   }).promise();
 
-  if (!Environments.find(env => env.Status !== 'Terminated')) {
+  if (!Environments.find((env) => env.Status !== 'Terminated')) {
     const desiredEbConfig = createDesiredConfig(
       api.getConfig(),
       api.getSettings(),
@@ -556,7 +555,7 @@ export async function events(api) {
     EnvironmentName: environment
   }).promise();
 
-  console.log(envEvents.map(ev => `${ev.EventDate}: ${ev.Message}`).join('\n'));
+  console.log(envEvents.map((ev) => `${ev.EventDate}: ${ev.Message}`).join('\n'));
 }
 
 export async function status(api) {
@@ -602,7 +601,7 @@ export async function status(api) {
   console.log(`Health Status: ${coloredStatusText(result.Color, result.HealthStatus)}`);
   if (result.Causes.length > 0) {
     console.log('Causes: ');
-    result.Causes.forEach(cause => console.log(`  ${cause}`));
+    result.Causes.forEach((cause) => console.log(`  ${cause}`));
   }
   console.log('');
   console.log(`=== Metrics For Last ${Duration || 'Unknown'} Minutes ===`);

src/commands.js

@@ -61,7 +61,6 @@ export const logsEb = {
   handler: prepare(commandHandlers.logsEb)
 };
 
-
 export const start = {
   description: 'Start app',
   handler: prepare(commandHandlers.start)

src/eb-config.js

@@ -1,7 +1,7 @@
-import { difference } from 'lodash';
+import difference from 'lodash.difference';
 import { beanstalk } from './aws';
 import downloadEnvFile from './download';
-import { createEnvFile } from './env-settings';
+import createEnvFile from './env-settings';
 import { uploadEnvFile } from './upload';
 import { names } from './utils';
 import { largestEnvVersion } from './versions';
@@ -123,7 +123,7 @@ export function createDesiredConfig(mupConfig, settings, longEnvVarsVersion) {
     });
   }
 
-  const customOptions = customBeanstalkConfig.map(option => ({
+  const customOptions = customBeanstalkConfig.map((option) => ({
     Namespace: option.namespace,
     OptionName: option.option,
     Value: option.value
@@ -153,8 +153,8 @@ export function scalingConfigChanged(currentConfig, mupConfig) {
     }
   });
 
-  return currentMinInstances !== minInstances.toString() ||
-    currentMaxInstances !== maxInstances.toString();
+  return currentMinInstances !== minInstances.toString()
+    || currentMaxInstances !== maxInstances.toString();
 }
 
 export function scalingConfig({ minInstances, maxInstances }) {
@@ -196,7 +196,7 @@ export function diffConfig(current, desired) {
   desired = desired.reduce(convertToObject, {});
 
   const toRemove = difference(Object.keys(current), Object.keys(desired))
-    .filter(key => key.indexOf('aws:elasticbeanstalk:application:environment-') === 0)
+    .filter((key) => key.indexOf('aws:elasticbeanstalk:application:environment-') === 0)
     .map((key) => {
       const option = current[key];
       return {
@@ -211,7 +211,7 @@ export function diffConfig(current, desired) {
     }
 
     return true;
-  }).map(key => desired[key]);
+  }).map((key) => desired[key]);
 
   return {
     toRemove,

src/env-settings.js

@@ -1,6 +1,6 @@
 import shellEscape from 'shell-escape';
 
-export function createEnvFile(env, settings) {
+export default function createEnvFile(env, settings) {
   let content = '';
   const settingsString = encodeURIComponent(JSON.stringify(settings));
 
@@ -10,5 +10,5 @@ export function createEnvFile(env, settings) {
   });
 
   content += `export METEOR_SETTINGS_ENCODED=${shellEscape([settingsString])}`;
-  return content
+  return content;
 }

src/index.js

@@ -7,7 +7,7 @@ export const commands = _commands;
 
 export const validate = {
   app(config, utils) {
-    if (config.app && config.app.type === 'aws-beanstalk') {
+    if (config.app?.type === 'aws-beanstalk') {
       return validator(config, utils);
     }
 
@@ -45,7 +45,7 @@ export function prepareConfig(config) {
 function isBeanstalkApp(api) {
   const config = api.getConfig();
 
-  if (config.app && config.app.type === 'aws-beanstalk') {
+  if (config.app?.type === 'aws-beanstalk') {
     return true;
   }
 

src/prepare-bundle.js

@@ -1,7 +1,7 @@
 import archiver from 'archiver';
 import fs from 'fs';
 import ejs from 'ejs';
-import { round } from 'lodash';
+import round from 'lodash.round';
 import { getNodeVersion, logStep, names } from './utils';
 
 function copy(source, destination, vars = {}) {
@@ -13,7 +13,7 @@ function copy(source, destination, vars = {}) {
       ...vars,
       padScript(content, spaces) {
         const padding = ''.padStart(spaces, ' ');
-        return content.split('\n').map(line => padding + line).join('\n');
+        return content.split('\n').map((line) => padding + line).join('\n');
       }
     },
     {
@@ -30,7 +30,7 @@ export function injectFiles(api, name, version, appConfig) {
     forceSSL,
     gracefulShutdown,
     buildOptions,
-    longEnvVars,
+    // longEnvVars,
     path
   } = appConfig;
   const bundlePath = buildOptions.buildLocation;
@@ -70,7 +70,6 @@ export function injectFiles(api, name, version, appConfig) {
     }
   });
 
-
   // For some resources we make two copies of scripts:
   // 1) In .platform/hooks. These are used in AWS Linux 2
   // 2) as part of a config file in .ebextensions for older platforms

src/upload.js

@@ -1,5 +1,5 @@
 import fs from 'fs';
-import shellEscape from 'shell-escape';
+// import shellEscape from 'shell-escape';
 import { s3 } from './aws';
 
 export default function upload(appConfig, bucket, key, bundlePath) {