@mtndev/cli 2.0.0 → 2.0.1

package/esm/commands/aws/ec2/allow-ip/handler.js

@@ -1,12 +1,258 @@
-import {
-  allowIpCommand
-} from "../../../../__chunks/PNPPDYKC.js";
-import "../../../../__chunks/U7HAE2RF.js";
-import "../../../../__chunks/J34UVKLA.js";
-import "../../../../__chunks/FNXUONAV.js";
-import "../../../../__chunks/5GIUAFXL.js";
-import "../../../../__chunks/73BJG53F.js";
-import "../../../../__chunks/ZHKVJO2U.js";
-export {
-  allowIpCommand
-};
+import { promptChoice } from "../../utils/tty.js";
+import { AwsCliError, getCallerIdentity, requireCommands } from "../../utils/exec-aws.js";
+import { resolveProfile } from "../../utils/resolve-profile.js";
+import { DEFAULT_REGION, allowIpOptionsSchema } from "./schema.js";
+import { authorizeRule, describeSecurityGroups, extractRoamingFirstName, getCurrentPublicIp, getSecurityGroupDetails, instanceLabel, listEnabledRegions, listInstances, listSshIngressRules, printSshRules, resolveRoamingRule, revokeRule, roamingRuleDescription, ruleAlreadyAllowsIp, securityGroupLabel } from "./utils.js";
+import chalk from "chalk";
+import { ZodError } from "zod";
+//#region src/commands/aws/ec2/allow-ip/handler.js
+/**
+* Resolve which region to operate in: explicit, else default if it has instances,
+* else prompt from the enabled regions.
+* @param {{ profile?: string; region?: string; verbose: boolean }} params
+* @returns {Promise<string>}
+*/
+async function resolveRegion(params) {
+	const { profile, region, verbose } = params;
+	if (region) return region;
+	if (listInstances({
+		profile,
+		region: "us-east-1",
+		verbose
+	}).length > 0) return DEFAULT_REGION;
+	const regions = listEnabledRegions({
+		profile,
+		region: DEFAULT_REGION,
+		verbose
+	});
+	if (regions.length === 0) throw new Error("No enabled AWS regions found for this profile");
+	console.log(`No EC2 instances found in ${DEFAULT_REGION}.`);
+	const chosen = regions[await promptChoice({
+		message: "Choose a region:",
+		options: regions
+	})];
+	if (!chosen) throw new Error("No region selected");
+	return chosen;
+}
+/**
+* Handle errors from authorize/revoke with the same UX as the original script.
+* Returns when the situation is benign (duplicate); exits the process on a
+* permissions failure; rethrows anything else.
+* @param {AwsCliError} error
+* @param {{
+*   securityGroup: import("./utils.js").SecurityGroup;
+*   sshRules: import("./utils.js").SshIngressRule[];
+*   newCidr: string;
+*   ruleDescription: string;
+*   action: "create" | "update";
+* }} ctx
+*/
+function handleRuleChangeError(error, ctx) {
+	const { securityGroup, sshRules, newCidr, ruleDescription, action } = ctx;
+	if (error.code === "InvalidPermission.Duplicate") {
+		const matching = ruleAlreadyAllowsIp(sshRules, newCidr);
+		const label = matching ? matching.description : ruleDescription;
+		console.log(`Security group ${securityGroup.groupId} already allows SSH from ${newCidr} (${label}). Nothing to do.`);
+		return;
+	}
+	if (error.code === "UnauthorizedOperation") {
+		console.error(`Could not ${action} the SSH rule: your AWS profile does not have ec2:AuthorizeSecurityGroupIngress or ec2:RevokeSecurityGroupIngress on ${securityGroup.groupName} (${securityGroup.groupId}).`);
+		console.error("");
+		console.error("Current single-host SSH rules on port 22:");
+		printSshRules(sshRules, (message) => console.error(message));
+		if (action === "create" && sshRules.length > 0) {
+			console.error("");
+			console.error("A rule may already exist. Re-run to update your named roaming rule, or ask an admin to grant security group ingress permissions.");
+		}
+		process.exit(1);
+	}
+	throw error;
+}
+/**
+* `aws ec2 allow-ip` handler: update or create a named roaming SSH rule for the
+* caller's current public IP on a chosen EC2 instance's security group.
+* @param {unknown} options
+*/
+async function allowIpCommand(options) {
+	try {
+		const { profile: profileOption, region: regionOption, ruleName, verbose } = allowIpOptionsSchema.parse(options);
+		const profile = await resolveProfile({ profile: profileOption });
+		if (!profile) {
+			console.error(chalk.red("Error: pass --profile or set AWS_PROFILE."));
+			process.exit(1);
+		}
+		requireCommands(["aws"]);
+		const identity = getCallerIdentity({
+			profile,
+			region: DEFAULT_REGION,
+			verbose
+		});
+		const firstName = extractRoamingFirstName({
+			profile,
+			identity
+		});
+		const ruleDescription = ruleName ?? roamingRuleDescription(firstName);
+		console.log("Caller:");
+		console.log(`  Account: ${identity.Account}`);
+		console.log(`  Arn:     ${identity.Arn}`);
+		console.log(`  Roaming rule: ${ruleDescription}`);
+		console.log("");
+		const region = await resolveRegion({
+			profile,
+			region: regionOption,
+			verbose
+		});
+		console.log(`Region: ${region}`);
+		console.log("");
+		const instances = listInstances({
+			profile,
+			region,
+			verbose
+		});
+		if (instances.length === 0) {
+			console.log(`No EC2 instances found in ${region}.`);
+			process.exit(1);
+		}
+		const instance = instances[await promptChoice({
+			message: "Choose an EC2 instance:",
+			options: instances.map((instance) => instanceLabel(instance))
+		})];
+		if (!instance) throw new Error("No instance selected");
+		console.log("");
+		const securityGroups = describeSecurityGroups({
+			profile,
+			region,
+			groupIds: instance.securityGroupIds,
+			verbose
+		});
+		if (securityGroups.length === 0) {
+			console.log("No security groups found on the selected instance.");
+			process.exit(1);
+		}
+		let securityGroup;
+		if (securityGroups.length === 1) {
+			const onlyGroup = securityGroups[0];
+			if (!onlyGroup) throw new Error("No security group found on the selected instance");
+			securityGroup = onlyGroup;
+			console.log(`Security group: ${securityGroupLabel(securityGroup)}`);
+		} else securityGroup = securityGroups[await promptChoice({
+			message: "Choose a security group:",
+			options: securityGroups.map((group) => securityGroupLabel(group))
+		})];
+		if (!securityGroup) throw new Error("No security group selected");
+		console.log("");
+		const currentIp = await getCurrentPublicIp();
+		const newCidr = `${currentIp}/32`;
+		console.log(`Current public IP: ${currentIp}`);
+		console.log("");
+		const sgDetails = getSecurityGroupDetails({
+			profile,
+			region,
+			groupId: securityGroup.groupId,
+			verbose
+		});
+		if (!sgDetails) {
+			console.log("Could not load security group details.");
+			process.exit(1);
+		}
+		const sshRules = listSshIngressRules(sgDetails);
+		const roamingRule = resolveRoamingRule(sshRules, ruleDescription);
+		if (roamingRule && roamingRule.cidrIp === newCidr) {
+			console.log(`Security group ${securityGroup.groupId} already allows SSH from ${newCidr} (${ruleDescription}). Nothing to do.`);
+			return;
+		}
+		const otherRuleAtIp = ruleAlreadyAllowsIp(sshRules, newCidr);
+		if (otherRuleAtIp && (!roamingRule || otherRuleAtIp.cidrIp !== roamingRule.cidrIp)) {
+			const label = otherRuleAtIp.description || "(no description)";
+			console.log(`Security group ${securityGroup.groupId} already allows SSH from ${newCidr} (${label}). Nothing to do.`);
+			return;
+		}
+		if (roamingRule) {
+			console.log(`Updating SSH rule (${ruleDescription}): ${roamingRule.cidrIp} -> ${newCidr}`);
+			try {
+				revokeRule({
+					profile,
+					region,
+					groupId: securityGroup.groupId,
+					rule: roamingRule,
+					verbose
+				});
+				authorizeRule({
+					profile,
+					region,
+					groupId: securityGroup.groupId,
+					cidrIp: newCidr,
+					description: ruleDescription,
+					fromPort: roamingRule.fromPort,
+					toPort: roamingRule.toPort,
+					ipProtocol: roamingRule.ipProtocol,
+					verbose
+				});
+			} catch (error) {
+				if (error instanceof AwsCliError) {
+					handleRuleChangeError(error, {
+						securityGroup,
+						sshRules,
+						newCidr,
+						ruleDescription,
+						action: "update"
+					});
+					return;
+				}
+				throw error;
+			}
+		} else {
+			if (sshRules.length > 0) {
+				console.log("Existing single-host SSH rules (unchanged):");
+				printSshRules(sshRules);
+				console.log("");
+			}
+			console.log(`Creating new "${ruleDescription}" SSH rule for ${newCidr}`);
+			try {
+				authorizeRule({
+					profile,
+					region,
+					groupId: securityGroup.groupId,
+					cidrIp: newCidr,
+					description: ruleDescription,
+					verbose
+				});
+			} catch (error) {
+				if (error instanceof AwsCliError) {
+					handleRuleChangeError(error, {
+						securityGroup,
+						sshRules,
+						newCidr,
+						ruleDescription,
+						action: "create"
+					});
+					return;
+				}
+				throw error;
+			}
+		}
+		console.log("");
+		console.log(`Done. ${securityGroup.groupName} (${securityGroup.groupId}) now allows SSH from ${newCidr} (${ruleDescription}).`);
+	} catch (error) {
+		if (error instanceof ZodError) {
+			console.error(chalk.red("\n❌ Invalid command options:"));
+			error.errors.forEach((err) => {
+				console.error(chalk.red(`   ${err.path.join(".")}: ${err.message}`));
+			});
+			process.exit(1);
+		}
+		const verbose = options?.verbose || false;
+		console.error(chalk.red("\n❌ allow-ip failed:"));
+		if (error instanceof Error) {
+			console.error(chalk.red(`   ${error.message}`));
+			if (verbose && error.stack) {
+				console.error(chalk.gray("\nStack trace:"));
+				console.error(chalk.gray(error.stack));
+			}
+		} else console.error(chalk.red(`   ${String(error)}`));
+		console.error(chalk.yellow("\n💡 Use --verbose for detailed error information\n"));
+		process.exit(1);
+	}
+}
+//#endregion
+export { allowIpCommand };

package/esm/commands/aws/ec2/allow-ip/index.js

@@ -1,55 +1,4 @@
-import "../../../../__chunks/AEDEAYF5.js";
-import {
-  allowIpCommand
-} from "../../../../__chunks/PNPPDYKC.js";
-import {
-  authorizeRule,
-  describeSecurityGroups,
-  extractRoamingFirstName,
-  getCurrentPublicIp,
-  getSecurityGroupDetails,
-  instanceLabel,
-  listEnabledRegions,
-  listInstances,
-  listSshIngressRules,
-  printSshRules,
-  resolveRoamingRule,
-  revokeRule,
-  roamingRuleDescription,
-  ruleAlreadyAllowsIp,
-  securityGroupLabel,
-  sshRuleLabel
-} from "../../../../__chunks/U7HAE2RF.js";
-import {
-  DEFAULT_REGION,
-  DEFAULT_ROAMING_NAME,
-  SSH_PORT,
-  allowIpOptionsSchema
-} from "../../../../__chunks/J34UVKLA.js";
-import "../../../../__chunks/FNXUONAV.js";
-import "../../../../__chunks/5GIUAFXL.js";
-import "../../../../__chunks/73BJG53F.js";
-import "../../../../__chunks/ZHKVJO2U.js";
-export {
-  DEFAULT_REGION,
-  DEFAULT_ROAMING_NAME,
-  SSH_PORT,
-  allowIpCommand,
-  allowIpOptionsSchema,
-  authorizeRule,
-  describeSecurityGroups,
-  extractRoamingFirstName,
-  getCurrentPublicIp,
-  getSecurityGroupDetails,
-  instanceLabel,
-  listEnabledRegions,
-  listInstances,
-  listSshIngressRules,
-  printSshRules,
-  resolveRoamingRule,
-  revokeRule,
-  roamingRuleDescription,
-  ruleAlreadyAllowsIp,
-  securityGroupLabel,
-  sshRuleLabel
-};
+import { DEFAULT_REGION, DEFAULT_ROAMING_NAME, SSH_PORT, allowIpOptionsSchema } from "./schema.js";
+import { authorizeRule, describeSecurityGroups, extractRoamingFirstName, getCurrentPublicIp, getSecurityGroupDetails, instanceLabel, listEnabledRegions, listInstances, listSshIngressRules, printSshRules, resolveRoamingRule, revokeRule, roamingRuleDescription, ruleAlreadyAllowsIp, securityGroupLabel, sshRuleLabel } from "./utils.js";
+import { allowIpCommand } from "./handler.js";
+export { DEFAULT_REGION, DEFAULT_ROAMING_NAME, SSH_PORT, allowIpCommand, allowIpOptionsSchema, authorizeRule, describeSecurityGroups, extractRoamingFirstName, getCurrentPublicIp, getSecurityGroupDetails, instanceLabel, listEnabledRegions, listInstances, listSshIngressRules, printSshRules, resolveRoamingRule, revokeRule, roamingRuleDescription, ruleAlreadyAllowsIp, securityGroupLabel, sshRuleLabel };

package/esm/commands/aws/ec2/allow-ip/schema.js

@@ -1,13 +1,29 @@
-import {
-  DEFAULT_REGION,
-  DEFAULT_ROAMING_NAME,
-  SSH_PORT,
-  allowIpOptionsSchema
-} from "../../../../__chunks/J34UVKLA.js";
-import "../../../../__chunks/73BJG53F.js";
-export {
-  DEFAULT_REGION,
-  DEFAULT_ROAMING_NAME,
-  SSH_PORT,
-  allowIpOptionsSchema
-};
+import { profileField, regionField, verboseField } from "../../schema.js";
+import { z } from "zod";
+//#region src/commands/aws/ec2/allow-ip/schema.js
+/**
+* Default region checked first before prompting.
+*/
+const DEFAULT_REGION = "us-east-1";
+/**
+* SSH port managed by this command.
+*/
+const SSH_PORT = 22;
+/**
+* Fallback first name when one cannot be derived from the profile/IAM user.
+*/
+const DEFAULT_ROAMING_NAME = "Declan";
+/**
+* Zod schema for `aws ec2 allow-ip` options.
+*/
+const allowIpOptionsSchema = z.object({
+	profile: profileField,
+	region: regionField,
+	ruleName: z.string().optional().describe("SSH rule description to update or create (default: \"{FirstName} Roaming\" derived from the profile/IAM user)"),
+	verbose: verboseField
+});
+/**
+* @typedef {z.infer<typeof allowIpOptionsSchema>} AllowIpOptions
+*/
+//#endregion
+export { DEFAULT_REGION, DEFAULT_ROAMING_NAME, SSH_PORT, allowIpOptionsSchema };