@go-to-k/cdkd 0.102.5 → 0.102.7

package/dist/cli.js

@@ -5017,42 +5017,52 @@ var SNSTopicProvider = class {
 			};
 			const topicArn = (await this.snsClient.send(new CreateTopicCommand(createParams))).TopicArn;
 			if (!topicArn) throw new Error("CreateTopic did not return TopicArn");
-			if (properties["ArchivePolicy"]) {
-				const archivePolicy = typeof properties["ArchivePolicy"] === "string" ? properties["ArchivePolicy"] : JSON.stringify(properties["ArchivePolicy"]);
-				await this.snsClient.send(new SetTopicAttributesCommand({
-					TopicArn: topicArn,
-					AttributeName: "ArchivePolicy",
-					AttributeValue: archivePolicy
-				}));
-			}
-			if (properties["DataProtectionPolicy"]) {
-				const dataProtectionPolicy = typeof properties["DataProtectionPolicy"] === "string" ? properties["DataProtectionPolicy"] : JSON.stringify(properties["DataProtectionPolicy"]);
-				await this.snsClient.send(new SetTopicAttributesCommand({
-					TopicArn: topicArn,
-					AttributeName: "DataProtectionPolicy",
-					AttributeValue: dataProtectionPolicy
-				}));
-			}
-			if (properties["DeliveryStatusLogging"]) {
-				const loggingConfigs = properties["DeliveryStatusLogging"];
-				for (const config of loggingConfigs) {
-					const protocol = normalizeDeliveryStatusProtocolOrThrow(config["Protocol"], logicalId);
-					if (config["SuccessFeedbackRoleArn"]) await this.snsClient.send(new SetTopicAttributesCommand({
-						TopicArn: topicArn,
-						AttributeName: `${protocol}SuccessFeedbackRoleArn`,
-						AttributeValue: config["SuccessFeedbackRoleArn"]
-					}));
-					if (config["SuccessFeedbackSampleRate"]) await this.snsClient.send(new SetTopicAttributesCommand({
+			try {
+				if (properties["ArchivePolicy"]) {
+					const archivePolicy = typeof properties["ArchivePolicy"] === "string" ? properties["ArchivePolicy"] : JSON.stringify(properties["ArchivePolicy"]);
+					await this.snsClient.send(new SetTopicAttributesCommand({
 						TopicArn: topicArn,
-						AttributeName: `${protocol}SuccessFeedbackSampleRate`,
-						AttributeValue: stringifyValue(config["SuccessFeedbackSampleRate"])
+						AttributeName: "ArchivePolicy",
+						AttributeValue: archivePolicy
 					}));
-					if (config["FailureFeedbackRoleArn"]) await this.snsClient.send(new SetTopicAttributesCommand({
+				}
+				if (properties["DataProtectionPolicy"]) {
+					const dataProtectionPolicy = typeof properties["DataProtectionPolicy"] === "string" ? properties["DataProtectionPolicy"] : JSON.stringify(properties["DataProtectionPolicy"]);
+					await this.snsClient.send(new SetTopicAttributesCommand({
 						TopicArn: topicArn,
-						AttributeName: `${protocol}FailureFeedbackRoleArn`,
-						AttributeValue: config["FailureFeedbackRoleArn"]
+						AttributeName: "DataProtectionPolicy",
+						AttributeValue: dataProtectionPolicy
 					}));
 				}
+				if (properties["DeliveryStatusLogging"]) {
+					const loggingConfigs = properties["DeliveryStatusLogging"];
+					for (const config of loggingConfigs) {
+						const protocol = normalizeDeliveryStatusProtocolOrThrow(config["Protocol"], logicalId);
+						if (config["SuccessFeedbackRoleArn"]) await this.snsClient.send(new SetTopicAttributesCommand({
+							TopicArn: topicArn,
+							AttributeName: `${protocol}SuccessFeedbackRoleArn`,
+							AttributeValue: config["SuccessFeedbackRoleArn"]
+						}));
+						if (config["SuccessFeedbackSampleRate"]) await this.snsClient.send(new SetTopicAttributesCommand({
+							TopicArn: topicArn,
+							AttributeName: `${protocol}SuccessFeedbackSampleRate`,
+							AttributeValue: stringifyValue(config["SuccessFeedbackSampleRate"])
+						}));
+						if (config["FailureFeedbackRoleArn"]) await this.snsClient.send(new SetTopicAttributesCommand({
+							TopicArn: topicArn,
+							AttributeName: `${protocol}FailureFeedbackRoleArn`,
+							AttributeValue: config["FailureFeedbackRoleArn"]
+						}));
+					}
+				}
+			} catch (innerError) {
+				try {
+					await this.snsClient.send(new DeleteTopicCommand({ TopicArn: topicArn }));
+					this.logger.debug(`Cleaned up partially-created SNS topic ${logicalId} (${topicArn}) after wiring failure`);
+				} catch (cleanupError) {
+					this.logger.warn(`Failed to clean up partially-created SNS topic ${logicalId} (${topicArn}): ${cleanupError instanceof Error ? cleanupError.message : String(cleanupError)}. Manual deletion may be required before the next deploy: aws sns delete-topic --topic-arn ${topicArn}`);
+				}
+				throw innerError;
 			}
 			this.logger.debug(`Successfully created SNS topic ${logicalId}: ${topicArn}`);
 			return {
@@ -9118,13 +9128,36 @@ var EventBridgeRuleProvider = class {
 			if (properties["Tags"]) putRuleParams["Tags"] = properties["Tags"];
 			const ruleArn = (await this.eventBridgeClient.send(new PutRuleCommand(putRuleParams))).RuleArn;
 			this.logger.debug(`Created EventBridge rule: ${ruleName} (${ruleArn})`);
-			if (targets && targets.length > 0) {
-				await this.eventBridgeClient.send(new PutTargetsCommand({
-					Rule: ruleName,
-					EventBusName: properties["EventBusName"],
-					Targets: targets
-				}));
-				this.logger.debug(`Added ${targets.length} targets to rule ${ruleName}`);
+			const eventBusName = properties["EventBusName"];
+			try {
+				if (targets && targets.length > 0) {
+					await this.eventBridgeClient.send(new PutTargetsCommand({
+						Rule: ruleName,
+						EventBusName: eventBusName,
+						Targets: targets
+					}));
+					this.logger.debug(`Added ${targets.length} targets to rule ${ruleName}`);
+				}
+			} catch (innerError) {
+				try {
+					const targetIds = ((await this.eventBridgeClient.send(new ListTargetsByRuleCommand({
+						Rule: ruleName,
+						EventBusName: eventBusName
+					}))).Targets || []).map((t) => t.Id).filter((id) => id !== void 0);
+					if (targetIds.length > 0) await this.eventBridgeClient.send(new RemoveTargetsCommand({
+						Rule: ruleName,
+						EventBusName: eventBusName,
+						Ids: targetIds
+					}));
+					await this.eventBridgeClient.send(new DeleteRuleCommand({
+						Name: ruleName,
+						EventBusName: eventBusName
+					}));
+					this.logger.debug(`Cleaned up partially-created EventBridge rule ${logicalId} (${ruleName}) after wiring failure`);
+				} catch (cleanupError) {
+					this.logger.warn(`Failed to clean up partially-created EventBridge rule ${logicalId} (${ruleName}): ${cleanupError instanceof Error ? cleanupError.message : String(cleanupError)}. Manual deletion may be required before the next deploy: aws events list-targets-by-rule --rule ${ruleName}${eventBusName ? ` --event-bus-name ${eventBusName}` : ""} | jq -r '.Targets[].Id' | xargs aws events remove-targets --rule ${ruleName}${eventBusName ? ` --event-bus-name ${eventBusName}` : ""} --ids; aws events delete-rule --name ${ruleName}${eventBusName ? ` --event-bus-name ${eventBusName}` : ""}`);
+				}
+				throw innerError;
 			}
 			return {
 				physicalId: ruleArn,
@@ -15916,25 +15949,36 @@ var ELBv2Provider = class {
 				...tags.length > 0 && { Tags: tags }
 			}))).LoadBalancers?.[0];
 			if (!lb || !lb.LoadBalancerArn) throw new Error("CreateLoadBalancer did not return LoadBalancer ARN");
-			this.logger.debug(`Successfully created LoadBalancer ${logicalId}: ${lb.LoadBalancerArn}`);
-			const lbAttributes = properties["LoadBalancerAttributes"];
-			if (lbAttributes && lbAttributes.length > 0) {
-				await this.getClient().send(new ModifyLoadBalancerAttributesCommand({
-					LoadBalancerArn: lb.LoadBalancerArn,
-					Attributes: lbAttributes.map((attr) => ({
-						Key: attr.Key,
-						Value: attr.Value
-					}))
-				}));
-				this.logger.debug(`Applied ${lbAttributes.length} LoadBalancer attributes for ${logicalId}`);
+			const lbArn = lb.LoadBalancerArn;
+			this.logger.debug(`Successfully created LoadBalancer ${logicalId}: ${lbArn}`);
+			try {
+				const lbAttributes = properties["LoadBalancerAttributes"];
+				if (lbAttributes && lbAttributes.length > 0) {
+					await this.getClient().send(new ModifyLoadBalancerAttributesCommand({
+						LoadBalancerArn: lbArn,
+						Attributes: lbAttributes.map((attr) => ({
+							Key: attr.Key,
+							Value: attr.Value
+						}))
+					}));
+					this.logger.debug(`Applied ${lbAttributes.length} LoadBalancer attributes for ${logicalId}`);
+				}
+			} catch (innerError) {
+				try {
+					await this.getClient().send(new DeleteLoadBalancerCommand({ LoadBalancerArn: lbArn }));
+					this.logger.debug(`Cleaned up partially-created LoadBalancer ${logicalId} (${lbArn}) after wiring failure`);
+				} catch (cleanupError) {
+					this.logger.warn(`Failed to clean up partially-created LoadBalancer ${logicalId} (${lbArn}): ${cleanupError instanceof Error ? cleanupError.message : String(cleanupError)}. Manual deletion may be required before the next deploy: aws elbv2 delete-load-balancer --load-balancer-arn ${lbArn}`);
+				}
+				throw innerError;
 			}
 			return {
-				physicalId: lb.LoadBalancerArn,
+				physicalId: lbArn,
 				attributes: {
 					DNSName: lb.DNSName,
 					CanonicalHostedZoneID: lb.CanonicalHostedZoneId,
-					LoadBalancerArn: lb.LoadBalancerArn,
-					LoadBalancerFullName: lb.LoadBalancerArn?.split("/").slice(1).join("/"),
+					LoadBalancerArn: lbArn,
+					LoadBalancerFullName: lbArn.split("/").slice(1).join("/"),
 					LoadBalancerName: lb.LoadBalancerName
 				}
 			};
@@ -16654,18 +16698,41 @@ var RDSProvider = class {
 				...tags.length > 0 && { Tags: tags }
 			}))).DBCluster) throw new Error("CreateDBCluster did not return DBCluster");
 			this.logger.debug(`Successfully created DBCluster ${logicalId}: ${dbClusterIdentifier}`);
-			if (process.env["CDKD_NO_WAIT"] !== "true") await this.waitForClusterAvailable(dbClusterIdentifier);
-			const described = await this.describeDBCluster(dbClusterIdentifier);
-			return {
-				physicalId: dbClusterIdentifier,
-				attributes: {
-					"Endpoint.Address": described?.Endpoint ?? "",
-					"Endpoint.Port": String(described?.Port ?? ""),
-					"ReadEndpoint.Address": described?.ReaderEndpoint ?? "",
-					Arn: described?.DBClusterArn ?? "",
-					DBClusterResourceId: described?.DbClusterResourceId ?? ""
+			const wantsDeletionProtection = properties["DeletionProtection"] === true;
+			try {
+				if (process.env["CDKD_NO_WAIT"] !== "true") await this.waitForClusterAvailable(dbClusterIdentifier);
+				const described = await this.describeDBCluster(dbClusterIdentifier);
+				return {
+					physicalId: dbClusterIdentifier,
+					attributes: {
+						"Endpoint.Address": described?.Endpoint ?? "",
+						"Endpoint.Port": String(described?.Port ?? ""),
+						"ReadEndpoint.Address": described?.ReaderEndpoint ?? "",
+						Arn: described?.DBClusterArn ?? "",
+						DBClusterResourceId: described?.DbClusterResourceId ?? ""
+					}
+				};
+			} catch (innerError) {
+				try {
+					if (wantsDeletionProtection) try {
+						await this.getClient().send(new ModifyDBClusterCommand({
+							DBClusterIdentifier: dbClusterIdentifier,
+							DeletionProtection: false,
+							ApplyImmediately: true
+						}));
+					} catch (disableError) {
+						this.logger.debug(`Could not disable DeletionProtection on partially-created DBCluster ${dbClusterIdentifier}: ${disableError instanceof Error ? disableError.message : String(disableError)} (proceeding with DeleteDBCluster anyway)`);
+					}
+					await this.getClient().send(new DeleteDBClusterCommand({
+						DBClusterIdentifier: dbClusterIdentifier,
+						SkipFinalSnapshot: true
+					}));
+					this.logger.debug(`Delete requested for partially-created DBCluster ${logicalId} (${dbClusterIdentifier}) after wiring failure (not waiting for deleted state)`);
+				} catch (cleanupError) {
+					this.logger.warn(`Failed to delete partially-created DBCluster ${logicalId} (${dbClusterIdentifier}): ${cleanupError instanceof Error ? cleanupError.message : String(cleanupError)}. THE CLUSTER IS STILL RUNNING AND BILLING. Manual cleanup required: ${wantsDeletionProtection ? `aws rds modify-db-cluster --db-cluster-identifier ${dbClusterIdentifier} --no-deletion-protection --apply-immediately; ` : ""}aws rds delete-db-cluster --db-cluster-identifier ${dbClusterIdentifier} --skip-final-snapshot`);
 				}
-			};
+				throw innerError;
+			}
 		} catch (error) {
 			if (error instanceof ProvisioningError) throw error;
 			const cause = error instanceof Error ? error : void 0;
@@ -42865,7 +42932,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.5");
+	program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.102.7");
 	program.addCommand(createBootstrapCommand());
 	program.addCommand(createSynthCommand());
 	program.addCommand(createListCommand());