@go-to-k/cdkd 0.102.4 → 0.102.5

package/dist/cli.js

@@ -9844,27 +9844,37 @@ var EC2Provider = class {
 				CidrBlock: cidrBlock,
 				InstanceTenancy: properties["InstanceTenancy"] ?? void 0
 			}))).Vpc.VpcId;
-			if (properties["EnableDnsHostnames"] === true || properties["EnableDnsHostnames"] === "true") await this.ec2Client.send(new ModifyVpcAttributeCommand({
-				VpcId: vpcId,
-				EnableDnsHostnames: { Value: true }
-			}));
-			if (properties["EnableDnsSupport"] === false || properties["EnableDnsSupport"] === "false") await this.ec2Client.send(new ModifyVpcAttributeCommand({
-				VpcId: vpcId,
-				EnableDnsSupport: { Value: false }
-			}));
-			await this.applyTags(vpcId, properties, logicalId);
-			await this.ec2Client.send(new DescribeVpcsCommand({ VpcIds: [vpcId] }));
 			let defaultSgId = "";
 			try {
-				defaultSgId = (await this.ec2Client.send(new DescribeSecurityGroupsCommand({ Filters: [{
-					Name: "vpc-id",
-					Values: [vpcId]
-				}, {
-					Name: "group-name",
-					Values: ["default"]
-				}] }))).SecurityGroups?.[0]?.GroupId || "";
-			} catch {
-				this.logger.debug(`Failed to get default SG for VPC ${vpcId}`);
+				if (properties["EnableDnsHostnames"] === true || properties["EnableDnsHostnames"] === "true") await this.ec2Client.send(new ModifyVpcAttributeCommand({
+					VpcId: vpcId,
+					EnableDnsHostnames: { Value: true }
+				}));
+				if (properties["EnableDnsSupport"] === false || properties["EnableDnsSupport"] === "false") await this.ec2Client.send(new ModifyVpcAttributeCommand({
+					VpcId: vpcId,
+					EnableDnsSupport: { Value: false }
+				}));
+				await this.applyTags(vpcId, properties, logicalId);
+				await this.ec2Client.send(new DescribeVpcsCommand({ VpcIds: [vpcId] }));
+				try {
+					defaultSgId = (await this.ec2Client.send(new DescribeSecurityGroupsCommand({ Filters: [{
+						Name: "vpc-id",
+						Values: [vpcId]
+					}, {
+						Name: "group-name",
+						Values: ["default"]
+					}] }))).SecurityGroups?.[0]?.GroupId || "";
+				} catch {
+					this.logger.debug(`Failed to get default SG for VPC ${vpcId}`);
+				}
+			} catch (innerError) {
+				try {
+					await this.ec2Client.send(new DeleteVpcCommand({ VpcId: vpcId }));
+					this.logger.debug(`Cleaned up partially-created VPC ${logicalId} (${vpcId}) after wiring failure`);
+				} catch (cleanupError) {
+					this.logger.warn(`Failed to clean up partially-created VPC ${logicalId} (${vpcId}): ${cleanupError instanceof Error ? cleanupError.message : String(cleanupError)}. Manual deletion may be required before the next deploy: aws ec2 delete-vpc --vpc-id ${vpcId}`);
+				}
+				throw innerError;
 			}
 			this.logger.debug(`Successfully created VPC ${logicalId}: ${vpcId}`);
 			return {
@@ -9995,12 +10005,22 @@ var EC2Provider = class {
 			}));
 			const subnetId = response.Subnet.SubnetId;
 			const availabilityZone = response.Subnet.AvailabilityZone;
-			await this.applyTags(subnetId, properties, logicalId);
-			const mapPublicIp = properties["MapPublicIpOnLaunch"];
-			if (mapPublicIp === true || mapPublicIp === "true") await this.ec2Client.send(new ModifySubnetAttributeCommand({
-				SubnetId: subnetId,
-				MapPublicIpOnLaunch: { Value: true }
-			}));
+			try {
+				await this.applyTags(subnetId, properties, logicalId);
+				const mapPublicIp = properties["MapPublicIpOnLaunch"];
+				if (mapPublicIp === true || mapPublicIp === "true") await this.ec2Client.send(new ModifySubnetAttributeCommand({
+					SubnetId: subnetId,
+					MapPublicIpOnLaunch: { Value: true }
+				}));
+			} catch (innerError) {
+				try {
+					await this.ec2Client.send(new DeleteSubnetCommand({ SubnetId: subnetId }));
+					this.logger.debug(`Cleaned up partially-created Subnet ${logicalId} (${subnetId}) after wiring failure`);
+				} catch (cleanupError) {
+					this.logger.warn(`Failed to clean up partially-created Subnet ${logicalId} (${subnetId}): ${cleanupError instanceof Error ? cleanupError.message : String(cleanupError)}. Manual deletion may be required before the next deploy: aws ec2 delete-subnet --subnet-id ${subnetId}`);
+				}
+				throw innerError;
+			}
 			this.logger.debug(`Successfully created Subnet ${logicalId}: ${subnetId}`);
 			return {
 				physicalId: subnetId,
@@ -10379,29 +10399,39 @@ var EC2Provider = class {
 				Description: groupDescription,
 				VpcId: properties["VpcId"] ?? void 0
 			}))).GroupId;
-			await this.applyTags(groupId, properties, logicalId);
-			const ingressRules = properties["SecurityGroupIngress"];
-			if (ingressRules && Array.isArray(ingressRules)) for (const rule of ingressRules) await this.ec2Client.send(new AuthorizeSecurityGroupIngressCommand({
-				GroupId: groupId,
-				IpPermissions: [this.buildIpPermission(rule)]
-			}));
-			const egressRules = properties["SecurityGroupEgress"];
-			if (egressRules && Array.isArray(egressRules)) {
-				try {
-					await this.ec2Client.send(new RevokeSecurityGroupEgressCommand({
+			try {
+				await this.applyTags(groupId, properties, logicalId);
+				const ingressRules = properties["SecurityGroupIngress"];
+				if (ingressRules && Array.isArray(ingressRules)) for (const rule of ingressRules) await this.ec2Client.send(new AuthorizeSecurityGroupIngressCommand({
+					GroupId: groupId,
+					IpPermissions: [this.buildIpPermission(rule)]
+				}));
+				const egressRules = properties["SecurityGroupEgress"];
+				if (egressRules && Array.isArray(egressRules)) {
+					try {
+						await this.ec2Client.send(new RevokeSecurityGroupEgressCommand({
+							GroupId: groupId,
+							IpPermissions: [{
+								IpProtocol: "-1",
+								IpRanges: [{ CidrIp: "0.0.0.0/0" }]
+							}]
+						}));
+					} catch (error) {
+						if (!this.isNotFoundError(error)) throw error;
+					}
+					for (const rule of egressRules) await this.ec2Client.send(new AuthorizeSecurityGroupEgressCommand({
 						GroupId: groupId,
-						IpPermissions: [{
-							IpProtocol: "-1",
-							IpRanges: [{ CidrIp: "0.0.0.0/0" }]
-						}]
+						IpPermissions: [this.buildIpPermission(rule, "egress")]
 					}));
-				} catch (error) {
-					if (!this.isNotFoundError(error)) throw error;
 				}
-				for (const rule of egressRules) await this.ec2Client.send(new AuthorizeSecurityGroupEgressCommand({
-					GroupId: groupId,
-					IpPermissions: [this.buildIpPermission(rule, "egress")]
-				}));
+			} catch (innerError) {
+				try {
+					await this.ec2Client.send(new DeleteSecurityGroupCommand({ GroupId: groupId }));
+					this.logger.debug(`Cleaned up partially-created SecurityGroup ${logicalId} (${groupId}) after wiring failure`);
+				} catch (cleanupError) {
+					this.logger.warn(`Failed to clean up partially-created SecurityGroup ${logicalId} (${groupId}): ${cleanupError instanceof Error ? cleanupError.message : String(cleanupError)}. Manual deletion may be required before the next deploy: aws ec2 delete-security-group --group-id ${groupId}`);
+				}
+				throw innerError;
 			}
 			this.logger.debug(`Successfully created SecurityGroup ${logicalId}: ${groupId}`);
 			return {
@@ -10606,26 +10636,36 @@ var EC2Provider = class {
 			}))).Instances?.[0];
 			if (!instance?.InstanceId) throw new Error("No instance ID returned from RunInstances");
 			const instanceId = instance.InstanceId;
-			await this.applyTags(instanceId, properties, logicalId);
-			this.logger.debug(`Waiting for instance ${instanceId} to be running...`);
-			await waitUntilInstanceRunning({
-				client: this.ec2Client,
-				maxWaitTime: 300
-			}, { InstanceIds: [instanceId] });
-			const runningInstance = (await this.ec2Client.send(new DescribeInstancesCommand({ InstanceIds: [instanceId] }))).Reservations?.[0]?.Instances?.[0];
-			const attributes = {
-				InstanceId: instanceId,
-				PrivateIp: runningInstance?.PrivateIpAddress ?? "",
-				PublicIp: runningInstance?.PublicIpAddress ?? "",
-				PrivateDnsName: runningInstance?.PrivateDnsName ?? "",
-				PublicDnsName: runningInstance?.PublicDnsName ?? "",
-				AvailabilityZone: runningInstance?.Placement?.AvailabilityZone ?? ""
-			};
-			this.logger.debug(`Successfully created EC2 Instance ${logicalId}: ${instanceId}`);
-			return {
-				physicalId: instanceId,
-				attributes
-			};
+			try {
+				await this.applyTags(instanceId, properties, logicalId);
+				this.logger.debug(`Waiting for instance ${instanceId} to be running...`);
+				await waitUntilInstanceRunning({
+					client: this.ec2Client,
+					maxWaitTime: 300
+				}, { InstanceIds: [instanceId] });
+				const runningInstance = (await this.ec2Client.send(new DescribeInstancesCommand({ InstanceIds: [instanceId] }))).Reservations?.[0]?.Instances?.[0];
+				const attributes = {
+					InstanceId: instanceId,
+					PrivateIp: runningInstance?.PrivateIpAddress ?? "",
+					PublicIp: runningInstance?.PublicIpAddress ?? "",
+					PrivateDnsName: runningInstance?.PrivateDnsName ?? "",
+					PublicDnsName: runningInstance?.PublicDnsName ?? "",
+					AvailabilityZone: runningInstance?.Placement?.AvailabilityZone ?? ""
+				};
+				this.logger.debug(`Successfully created EC2 Instance ${logicalId}: ${instanceId}`);
+				return {
+					physicalId: instanceId,
+					attributes
+				};
+			} catch (innerError) {
+				try {
+					await this.ec2Client.send(new TerminateInstancesCommand({ InstanceIds: [instanceId] }));
+					this.logger.debug(`Terminate requested for partially-created EC2 Instance ${logicalId} (${instanceId}) after wiring failure (not waiting for terminated state)`);
+				} catch (cleanupError) {
+					this.logger.warn(`Failed to terminate partially-created EC2 Instance ${logicalId} (${instanceId}): ${cleanupError instanceof Error ? cleanupError.message : String(cleanupError)}. THE INSTANCE IS STILL RUNNING AND BILLING. Manual termination required: aws ec2 terminate-instances --instance-ids ${instanceId}`);
+				}
+				throw innerError;
+			}
 		} catch (error) {
 			if (error instanceof ProvisioningError) throw error;
 			const cause = error instanceof Error ? error : void 0;
@@ -42825,7 +42865,7 @@ function reorderArgs(argv) {
 */
 async function main() {
 	const program = new Command();
-	program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.102.4");
+	program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.102.5");
 	program.addCommand(createBootstrapCommand());
 	program.addCommand(createSynthCommand());
 	program.addCommand(createListCommand());