@go-to-k/cdkd 0.219.1 → 0.219.2

package/dist/cli.js

@@ -33718,6 +33718,7 @@ var ECRProvider = class {
 */
 var ASGProvider = class ASGProvider {
 	asgClient;
+	ec2Client;
 	providerRegion = process.env["AWS_REGION"];
 	logger = getLogger().child("ASGProvider");
 	handledProperties = new Map([["AWS::AutoScaling::AutoScalingGroup", new Set([
@@ -33760,6 +33761,10 @@ var ASGProvider = class ASGProvider {
 		if (!this.asgClient) this.asgClient = new AutoScalingClient(this.providerRegion ? { region: this.providerRegion } : {});
 		return this.asgClient;
 	}
+	getEc2Client() {
+		if (!this.ec2Client) this.ec2Client = new EC2Client(this.providerRegion ? { region: this.providerRegion } : {});
+		return this.ec2Client;
+	}
 	async create(logicalId, resourceType, properties) {
 		if (resourceType !== "AWS::AutoScaling::AutoScalingGroup") throw new ProvisioningError(`Unsupported resource type: ${resourceType}`, resourceType, logicalId);
 		const groupName = properties["AutoScalingGroupName"] || generateResourceName(logicalId, { maxLength: 255 });
@@ -33878,14 +33883,17 @@ var ASGProvider = class ASGProvider {
 	}
 	async delete(logicalId, physicalId, resourceType, _properties, context) {
 		this.logger.debug(`Deleting AutoScalingGroup ${logicalId}: ${physicalId}`);
-		if (context?.removeProtection === true) try {
-			await this.getClient().send(new UpdateAutoScalingGroupCommand({
-				AutoScalingGroupName: physicalId,
-				DeletionProtection: "none"
-			}));
-			this.logger.debug(`Disabled DeletionProtection on AutoScalingGroup ${logicalId} before delete`);
-		} catch (flipError) {
-			this.logger.debug(`Could not disable DeletionProtection on ${physicalId}: ${flipError instanceof Error ? flipError.message : String(flipError)}`);
+		if (context?.removeProtection === true) {
+			try {
+				await this.getClient().send(new UpdateAutoScalingGroupCommand({
+					AutoScalingGroupName: physicalId,
+					DeletionProtection: "none"
+				}));
+				this.logger.debug(`Disabled DeletionProtection on AutoScalingGroup ${logicalId} before delete`);
+			} catch (flipError) {
+				this.logger.debug(`Could not disable DeletionProtection on ${physicalId}: ${flipError instanceof Error ? flipError.message : String(flipError)}`);
+			}
+			await this.removeInstanceTerminationProtection(physicalId, logicalId);
 		}
 		try {
 			await this.getClient().send(new DeleteAutoScalingGroupCommand({
@@ -34059,6 +34067,29 @@ var ASGProvider = class ASGProvider {
 	async describeGroup(groupName) {
 		return (await this.getClient().send(new DescribeAutoScalingGroupsCommand({ AutoScalingGroupNames: [groupName] }))).AutoScalingGroups?.[0];
 	}
+	/**
+	* Flip EC2-level termination protection (`DisableApiTermination`) off on
+	* every instance currently launched by the group, so the subsequent
+	* `DeleteAutoScalingGroup(ForceDelete: true)` can actually terminate them
+	* instead of orphaning the protected instances (issue #796). Best-effort:
+	* a Describe failure or a per-instance flip failure is logged at debug and
+	* does not block the delete (the modify WRITE lags the terminate READ, so
+	* the shared helper swallows propagation errors the same way the EC2 path
+	* does — the orphan, if any, surfaces as a leftover instance the caller
+	* can clean up rather than a hard delete failure).
+	*/
+	async removeInstanceTerminationProtection(groupName, logicalId) {
+		let instanceIds;
+		try {
+			instanceIds = ((await this.describeGroup(groupName))?.Instances ?? []).map((i) => i.InstanceId).filter((id) => typeof id === "string" && id.length > 0);
+		} catch (describeError) {
+			this.logger.debug(`Could not enumerate instances of AutoScalingGroup ${logicalId} for termination-protection removal: ${describeError instanceof Error ? describeError.message : String(describeError)}`);
+			return;
+		}
+		if (instanceIds.length === 0) return;
+		this.logger.debug(`Disabling EC2 termination protection on ${instanceIds.length} instance(s) of AutoScalingGroup ${logicalId} before force delete`);
+		for (const instanceId of instanceIds) await disableInstanceApiTermination(this.getEc2Client(), instanceId, this.logger);
+	}
 	async fetchArn(groupName) {
 		try {
 			return (await this.describeGroup(groupName))?.AutoScalingGroupARN;
@@ -53522,7 +53553,7 @@ function reorderArgs(argv) {
 async function main() {
 	installPipeCloseHandler();
 	const program = new Command();
-	program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.219.1");
+	program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.219.2");
 	program.addCommand(createBootstrapCommand());
 	program.addCommand(createSynthCommand());
 	program.addCommand(createListCommand());