@brunwig/mup-aws-beanstalk 0.8.3 → 0.8.5

package/lib/utils.js

@@ -3,89 +3,70 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.logStep = logStep;
-exports.shouldRebuild = shouldRebuild;
-exports.tmpBuildPath = tmpBuildPath;
-exports.names = names;
-exports.createUniqueName = createUniqueName;
-exports.getLogs = getLogs;
-exports.getNodeVersion = getNodeVersion;
-exports.selectPlatformArn = selectPlatformArn;
 exports.attachPolicies = attachPolicies;
-exports.getAccountId = getAccountId;
-exports.ensureRoleExists = ensureRoleExists;
-exports.ensureInstanceProfileExists = ensureInstanceProfileExists;
-exports.ensureRoleAdded = ensureRoleAdded;
-exports.ensurePoliciesAttached = ensurePoliciesAttached;
-exports.ensureInlinePolicyAttached = ensureInlinePolicyAttached;
+exports.coloredStatusText = coloredStatusText;
+exports.connectToInstance = connectToInstance;
+exports.createUniqueName = createUniqueName;
+exports.createVersionDescription = createVersionDescription;
 exports.ensureBucketExists = ensureBucketExists;
-exports.findBucketWithPrefix = findBucketWithPrefix;
 exports.ensureBucketPolicyAttached = ensureBucketPolicyAttached;
 exports.ensureCloudWatchRule = ensureCloudWatchRule;
+exports.ensureInlinePolicyAttached = ensureInlinePolicyAttached;
+exports.ensureInstanceProfileExists = ensureInstanceProfileExists;
+exports.ensurePoliciesAttached = ensurePoliciesAttached;
+exports.ensureRoleAdded = ensureRoleAdded;
+exports.ensureRoleExists = ensureRoleExists;
 exports.ensureRuleTargetExists = ensureRuleTargetExists;
-exports.coloredStatusText = coloredStatusText;
-exports.createVersionDescription = createVersionDescription;
 exports.ensureSsmDocument = ensureSsmDocument;
-exports.pickInstance = pickInstance;
-exports.connectToInstance = connectToInstance;
 exports.executeSSHCommand = executeSSHCommand;
-
+exports.findBucketWithPrefix = findBucketWithPrefix;
+exports.getAccountId = getAccountId;
+exports.getLogs = getLogs;
+exports.getNodeVersion = getNodeVersion;
+exports.logStep = logStep;
+exports.names = names;
+exports.pickInstance = pickInstance;
+exports.selectPlatformArn = selectPlatformArn;
+exports.shouldRebuild = shouldRebuild;
+exports.tmpBuildPath = tmpBuildPath;
 var _axios = _interopRequireDefault(require("axios"));
-
 var _chalk = _interopRequireDefault(require("chalk"));
-
 var _fs = _interopRequireDefault(require("fs"));
-
 var _lodash = require("lodash");
-
 var _os = _interopRequireDefault(require("os"));
-
 var _randomSeed = _interopRequireDefault(require("random-seed"));
-
 var _uuid = _interopRequireDefault(require("uuid"));
-
 var _child_process = require("child_process");
-
 var _aws = require("./aws");
-
 var _recheck = require("./recheck");
-
 var _envReady = require("./env-ready");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+const pkg = require('../package.json'); // Adjust the path as needed
 
 function logStep(message) {
-  console.log(_chalk.default.blue(message));
+  console.log(`v${pkg?.version} ${_chalk.default.blue(message)}`);
 }
-
 function shouldRebuild(bundlePath, useCachedBuild) {
   if (_fs.default.existsSync(bundlePath) && useCachedBuild) {
     return false;
   }
-
   return true;
 }
-
 function tmpBuildPath(appPath, api) {
   const rand = _randomSeed.default.create(appPath);
-
   const uuidNumbers = [];
-
   for (let i = 0; i < 16; i++) {
     uuidNumbers.push(rand(255));
   }
-
   return api.resolvePath(_os.default.tmpdir(), `mup-meteor-${_uuid.default.v4({
     random: uuidNumbers
   })}`);
 }
-
 function names(config) {
   const name = config.app.name.toLowerCase();
   return {
@@ -104,12 +85,10 @@ function names(config) {
     automationDocument: 'mup-graceful-shutdown'
   };
 }
-
 function createUniqueName(prefix = '') {
   const randomNumbers = Math.floor(Math.random() * 10000);
   return `${prefix}-${Date.now()}-${randomNumbers}`;
 }
-
 async function retrieveEnvironmentInfo(api, count) {
   const config = api.getConfig();
   const {
@@ -121,13 +100,11 @@ async function retrieveEnvironmentInfo(api, count) {
     EnvironmentName: environment,
     InfoType: 'tail'
   }).promise();
-
   if (EnvironmentInfo.length > 0) {
     return EnvironmentInfo;
   } else if (count > 5) {
     throw new Error('No logs');
   }
-
   return new Promise((resolve, reject) => {
     setTimeout(() => {
       // The logs aren't always available, so retry until they are
@@ -136,7 +113,6 @@ async function retrieveEnvironmentInfo(api, count) {
     }, (0, _recheck.getRecheckInterval)());
   });
 }
-
 async function getLogs(api, logNames) {
   const config = api.getConfig();
   const {
@@ -160,11 +136,9 @@ async function getLogs(api, logNames) {
     }) => {
       // The separator changed with Amazon Linux 2
       let parts = data.split('----------------------------------------\n/var/log/');
-
       if (parts.length === 1) {
         parts = data.split('-------------------------------------\n/var/log/');
       }
-
       data = logNames.map(name => parts.find(part => part.trim().startsWith(name)));
       resolve({
         data,
@@ -173,37 +147,30 @@ async function getLogs(api, logNames) {
     }).catch(reject);
   })));
 }
-
 function getNodeVersion(api, bundlePath) {
   let star = _fs.default.readFileSync(api.resolvePath(bundlePath, 'bundle/star.json')).toString();
-
   const nodeVersionTxt = _fs.default.readFileSync(api.resolvePath(bundlePath, 'bundle/.node_version.txt')).toString();
-
   star = JSON.parse(star);
-
   if (star.npmVersion) {
     return {
       nodeVersion: star.nodeVersion,
       npmVersion: star.npmVersion
     };
   }
-
   const nodeVersion = nodeVersionTxt.substr(1);
-
   if (nodeVersion.startsWith('4')) {
     return {
       nodeVersion,
       npmVersion: '4.6.1'
     };
   }
-
   return {
     nodeVersion,
     npmVersion: '3.10.5'
   };
 }
-
 async function selectPlatformArn(awsPlatformBranchName) {
+  console.log('----> Amazon BranchName:', awsPlatformBranchName);
   const {
     PlatformBranchSummaryList
   } = await _aws.beanstalk.listPlatformBranches({
@@ -221,11 +188,9 @@ async function selectPlatformArn(awsPlatformBranchName) {
       Values: [awsPlatformBranchName]
     }]
   }).promise();
-
   if (PlatformBranchSummaryList.length === 0) {
     throw new Error('Unable to find supported Node.js platform');
   }
-
   const branchName = PlatformBranchSummaryList[0].BranchName;
   console.log('----> Amazon Platform:', branchName);
   const {
@@ -245,7 +210,6 @@ async function selectPlatformArn(awsPlatformBranchName) {
   console.log('----> Amazon ARN:', arn);
   return arn;
 }
-
 async function attachPolicies(config, roleName, policies) {
   const promises = [];
   policies.forEach(policy => {
@@ -253,39 +217,33 @@ async function attachPolicies(config, roleName, policies) {
       RoleName: roleName,
       PolicyArn: policy
     }).promise();
-
     promises.push(promise);
   });
   await Promise.all(promises);
 }
-
 function getAccountId() {
   return _aws.sts.getCallerIdentity().promise().then(({
     Account
   }) => Account);
 }
-
 async function ensureRoleExists(name, assumeRolePolicyDocument, ensureAssumeRolePolicy) {
   let exists = true;
   let updateAssumeRolePolicy = false;
-
   try {
     const {
       Role
     } = await _aws.iam.getRole({
       RoleName: name
     }).promise();
-    const currentAssumeRolePolicy = decodeURIComponent(Role.AssumeRolePolicyDocument); // Make the whitespace consistent with the current document
-
+    const currentAssumeRolePolicy = decodeURIComponent(Role.AssumeRolePolicyDocument);
+    // Make the whitespace consistent with the current document
     assumeRolePolicyDocument = JSON.stringify(JSON.parse(assumeRolePolicyDocument));
-
     if (currentAssumeRolePolicy !== assumeRolePolicyDocument && ensureAssumeRolePolicy) {
       updateAssumeRolePolicy = true;
     }
   } catch (e) {
     exists = false;
   }
-
   if (!exists) {
     await _aws.iam.createRole({
       RoleName: name,
@@ -298,10 +256,8 @@ async function ensureRoleExists(name, assumeRolePolicyDocument, ensureAssumeRole
     }).promise();
   }
 }
-
 async function ensureInstanceProfileExists(config, name) {
   let exists = true;
-
   try {
     await _aws.iam.getInstanceProfile({
       InstanceProfileName: name
@@ -309,14 +265,12 @@ async function ensureInstanceProfileExists(config, name) {
   } catch (e) {
     exists = false;
   }
-
   if (!exists) {
     await _aws.iam.createInstanceProfile({
       InstanceProfileName: name
     }).promise();
   }
 }
-
 async function ensureRoleAdded(config, instanceProfile, role) {
   let added = true;
   const {
@@ -324,11 +278,9 @@ async function ensureRoleAdded(config, instanceProfile, role) {
   } = await _aws.iam.getInstanceProfile({
     InstanceProfileName: instanceProfile
   }).promise();
-
   if (InstanceProfile.Roles.length === 0 || InstanceProfile.Roles[0].RoleName !== role) {
     added = false;
   }
-
   if (!added) {
     await _aws.iam.addRoleToInstanceProfile({
       InstanceProfileName: instanceProfile,
@@ -336,7 +288,6 @@ async function ensureRoleAdded(config, instanceProfile, role) {
     }).promise();
   }
 }
-
 async function ensurePoliciesAttached(config, role, policies) {
   let {
     AttachedPolicies
@@ -348,33 +299,27 @@ async function ensurePoliciesAttached(config, role, policies) {
     if (AttachedPolicies.indexOf(policy) === -1) {
       result.push(policy);
     }
-
     return result;
   }, []);
-
   if (unattachedPolicies.length > 0) {
     await attachPolicies(config, role, unattachedPolicies);
   }
 }
-
 async function ensureInlinePolicyAttached(role, policyName, policyDocument) {
   let exists = true;
   let needsUpdating = false;
-
   try {
     const result = await _aws.iam.getRolePolicy({
       RoleName: role,
       PolicyName: policyName
     }).promise();
     const currentPolicyDocument = decodeURIComponent(result.PolicyDocument);
-
     if (currentPolicyDocument !== policyDocument) {
       needsUpdating = true;
     }
   } catch (e) {
     exists = false;
   }
-
   if (!exists || needsUpdating) {
     await _aws.iam.putRolePolicy({
       RoleName: role,
@@ -383,7 +328,6 @@ async function ensureInlinePolicyAttached(role, policyName, policyDocument) {
     }).promise();
   }
 }
-
 async function ensureBucketExists(buckets, bucketName, region) {
   if (!buckets.find(bucket => bucket.Name === bucketName)) {
     await _aws.s3.createBucket(_objectSpread({
@@ -396,15 +340,12 @@ async function ensureBucketExists(buckets, bucketName, region) {
     return true;
   }
 }
-
 function findBucketWithPrefix(buckets, prefix) {
   return buckets.find(bucket => bucket.Name.indexOf(prefix) === 0);
 }
-
 async function ensureBucketPolicyAttached(bucketName, policy) {
   let error = false;
   let currentPolicy;
-
   try {
     const {
       Policy
@@ -415,7 +356,6 @@ async function ensureBucketPolicyAttached(bucketName, policy) {
   } catch (e) {
     error = true;
   }
-
   if (error || currentPolicy !== policy) {
     const params = {
       Bucket: bucketName,
@@ -424,10 +364,8 @@ async function ensureBucketPolicyAttached(bucketName, policy) {
     await _aws.s3.putBucketPolicy(params).promise();
   }
 }
-
 async function ensureCloudWatchRule(name, description, eventPattern) {
   let error = false;
-
   try {
     await _aws.cloudWatchEvents.describeRule({
       Name: name
@@ -435,7 +373,6 @@ async function ensureCloudWatchRule(name, description, eventPattern) {
   } catch (e) {
     error = true;
   }
-
   if (error) {
     await _aws.cloudWatchEvents.putRule({
       Name: name,
@@ -444,17 +381,14 @@ async function ensureCloudWatchRule(name, description, eventPattern) {
     }).promise();
     return true;
   }
-
   return false;
 }
-
 async function ensureRuleTargetExists(ruleName, target) {
   const {
     Targets
   } = await _aws.cloudWatchEvents.listTargetsByRule({
     Rule: ruleName
   }).promise();
-
   if (!Targets.find(_target => (0, _lodash.isEqual)(_target, target))) {
     const params = {
       Rule: ruleName,
@@ -464,7 +398,6 @@ async function ensureRuleTargetExists(ruleName, target) {
     return true;
   }
 }
-
 function coloredStatusText(envColor, text) {
   if (envColor === 'Green') {
     return _chalk.default.green(text);
@@ -473,14 +406,11 @@ function coloredStatusText(envColor, text) {
   } else if (envColor === 'Red') {
     return _chalk.default.red(text);
   }
-
   return text;
 }
-
 function createVersionDescription(api, appConfig) {
   const appPath = api.resolvePath(api.getBasePath(), appConfig.path);
   let description = '';
-
   try {
     description = (0, _child_process.execSync)('git log -1 --pretty=%B', {
       cwd: appPath,
@@ -489,30 +419,25 @@ function createVersionDescription(api, appConfig) {
   } catch (e) {
     description = `Deployed by Mup on ${new Date().toUTCString()}`;
   }
-
   return description.split('\n')[0].slice(0, 195);
 }
-
 async function ensureSsmDocument(name, content) {
   let exists = true;
   let needsUpdating = false;
-
   try {
     const result = await _aws.ssm.getDocument({
       Name: name,
       DocumentVersion: '$DEFAULT'
-    }).promise(); // If the document was created or edited on the AWS console, there is extra new
+    }).promise();
+    // If the document was created or edited on the AWS console, there is extra new
     // line characters and whitespace
-
     const currentContent = JSON.stringify(JSON.parse(result.Content.replace(/\r?\n|\r/g, '')));
-
     if (currentContent !== content) {
       needsUpdating = true;
     }
   } catch (e) {
     exists = false;
   }
-
   if (!exists) {
     await _aws.ssm.createDocument({
       Content: content,
@@ -535,7 +460,6 @@ async function ensureSsmDocument(name, content) {
         throw e;
       }
     }
-
     const result = await _aws.ssm.getDocument({
       Name: name,
       DocumentVersion: '$LATEST'
@@ -546,7 +470,6 @@ async function ensureSsmDocument(name, content) {
     }).promise();
   }
 }
-
 async function pickInstance(config, instance) {
   const {
     environment
@@ -565,18 +488,15 @@ async function pickInstance(config, instance) {
     description
   };
 }
-
 async function connectToInstance(api, instanceId, commandLabel) {
   const {
     sshKey
   } = api.getConfig().app;
-
   if (!sshKey) {
     const error = new Error('missing sshKey config');
     error.solution = 'Learn how to configure sshKey at https://github.com/zodern/mup-aws-beanstalk/blob/master/docs/index.md#meteor-shell-and-debug';
     throw error;
   }
-
   const {
     Reservations
   } = await _aws.ec2.describeInstances({
@@ -589,13 +509,10 @@ async function connectToInstance(api, instanceId, commandLabel) {
     data: ipAddress
   } = await _axios.default.get('https://ipv4.icanhazip.com');
   ipAddress = ipAddress.trim();
-
   if (securityGroups.length > 1) {
     console.warn('Instance has more than one security group. Please open a GitHub issue for mup-aws-beanstalk');
   }
-
   let ruleIds = [];
-
   try {
     const {
       SecurityGroupRules
@@ -613,14 +530,14 @@ async function connectToInstance(api, instanceId, commandLabel) {
     }).promise();
     ruleIds = SecurityGroupRules.map(rule => rule.SecurityGroupRuleId);
   } catch (e) {
-    if (e.code === 'InvalidPermission.Duplicate') {// This rule already exists
+    if (e.code === 'InvalidPermission.Duplicate') {
+      // This rule already exists
       // TODO: should we find the rule id so we can remove it, or leave it in
       // case the user had manually added this rule?
     } else {
       throw e;
     }
   }
-
   await _aws.ec2InstanceConnect.sendSSHPublicKey({
     InstanceId: instanceId,
     AvailabilityZone: availabilityZone,
@@ -635,22 +552,18 @@ async function connectToInstance(api, instanceId, commandLabel) {
   };
   return {
     sshOptions,
-
     removeSSHAccess() {
       if (ruleIds.length === 0) {
         return;
       }
-
       console.log('Removing temporary security group rule for SSH');
       return _aws.ec2.revokeSecurityGroupIngress({
         GroupId: securityGroups[0],
         SecurityGroupRuleIds: ruleIds
       }).promise();
     }
-
   };
 }
-
 async function executeSSHCommand(conn, command) {
   return new Promise((resolve, reject) => {
     conn.exec(command, (err, outputStream) => {
@@ -659,7 +572,6 @@ async function executeSSHCommand(conn, command) {
         reject(err);
         return;
       }
-
       let output = '';
       outputStream.on('data', data => {
         output += data;