@go-to-k/cdkd 0.263.2 → 0.264.1

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
-import { $ as rewriteTemplateAssetReferences, $t as StackHasActiveImportsError, A as disableInstanceApiTermination, At as uploadCfnTemplate, B as DiffCalculator, Bt as CdkdError, C as yellow, Ct as resolveStateBucketWithDefaultAndSource, D as findActionableSilentDrops, Dt as CFN_TEMPLATE_URL_LIMIT, E as ProviderRegistry, Et as CFN_TEMPLATE_BODY_LIMIT, F as WAFv2WebACLProvider, Ft as AwsClients, G as rebuildClientForBucketRegion, Gt as LocalStartServiceError, H as TemplateParser, I as normalizeAwsTagsToCfn, It as getAwsClients, J as stringifyValue, Jt as NestedStackChildDirectDestroyError, K as shouldRetainResource, L as resolveExplicitPhysicalId, Lt as resetAwsClients, M as IntrinsicFunctionResolver, Mt as AssemblyReader, N as cfnRefValueFromPhysicalId, O as CloudControlProvider, Ot as MIGRATE_TMP_PREFIX, P as refStateLookupFromResource, Pt as resolveBucketRegion, Q as loadPublishableAssetManifest, Qt as ResourceUpdateNotSupportedError, R as assertRegionMatch, Rt as setAwsClients, S as red, St as resolveStateBucketWithDefault, T as collectInlinePolicyNamesManagedBySiblings, Tt as warnDeprecatedNoPrefixCliFlag, U as LockManager, Ut as LocalInvokeBuildError$1, V as DagBuilder, W as S3StateBackend, Wt as LocalMigrateError, X as buildAssetRedirectMap, Xt as ProvisioningError, Y as WorkGraph, Yt as PartialFailureError, Z as createAssetRedirectResolver, Zt as ResourceTimeoutError, _ as formatResourceLine, _t as getLegacyStateBucketName, a as DeploymentEventsStore, an as normalizeAwsError, at as validateAssetBucketName, b as gray, bt as resolveCaptureObservedState, c as withResourceDeadline, ct as formatDockerLoginError, d as IMPLICIT_DELETE_DEPENDENCIES, dt as runDockerStreaming, en as StackTerminationProtectionError, et as AssetModeResolver, f as computeImplicitDeleteEdges, ft as AssetManifestLoader, g as renderStatefulReason, gt as getDefaultStateBucketName, h as isStatefulRecreateTargetSync, ht as synthesisStatusMessage, i as DeploymentEventsReader, it as parseBootstrapMarker, j as isTerminationProtectionPropagationError, jt as expectedOwnerParam, k as slowCcOperationTimeoutMs, kt as findLargeInlineResources, l as withRetry, lt as getDockerCmd, m as MULTI_REGION_RECREATE_BLOCKED_TYPES, mt as Synthesizer, n as DEFAULT_RESOURCE_WARN_AFTER_MS, nt as ensureAssetStorage, o as planRollback, on as withErrorHandling, ot as validateContainerRepoName, p as extractDeploymentEventError, pt as getDockerImageBySourceHash, q as AssetPublisher, qt as MissingCdkCliError, r as DeployEngine, rt as getBootstrapMarkerKey, s as replayRollback, st as buildDockerImage, t as DEFAULT_RESOURCE_TIMEOUT_MS, tt as BOOTSTRAP_MARKER_PREFIX, u as isRetryableTransientError, ut as runDockerForeground, v as bold, vt as resolveApp, w as IAMRoleProvider, wt as resolveUseCdkBootstrapAssets, x as green, xt as resolveSkipPrefix, y as cyan, yt as resolveAutoAssetStorage, z as applyRoleArnIfSet } from "./deploy-engine-j-e2Q0XH.js";
+import { $ as createAssetRedirectResolver, $t as ResourceTimeoutError, A as CloudControlProvider, At as MIGRATE_TMP_PREFIX, B as assertRegionMatch, Bt as setAwsClients, C as green, Ct as resolveSkipPrefix, D as collectInlinePolicyNamesManagedBySiblings, Dt as warnDeprecatedNoPrefixCliFlag, E as IAMRoleProvider, Et as resolveUseCdkBootstrapAssets, F as cfnRefValueFromPhysicalId, G as LockManager, Gt as LocalInvokeBuildError$1, H as DiffCalculator, Ht as CdkdError, I as refStateLookupFromResource, It as resolveBucketRegion, J as shouldRetainResource, K as S3StateBackend, Kt as LocalMigrateError, L as WAFv2WebACLProvider, Lt as AwsClients, M as disableInstanceApiTermination, Mt as uploadCfnTemplate, N as isTerminationProtectionPropagationError, Nt as expectedOwnerParam, O as ProviderRegistry, Ot as CFN_TEMPLATE_BODY_LIMIT, P as IntrinsicFunctionResolver, Pt as AssemblyReader, Q as buildAssetRedirectMap, Qt as ProvisioningError, R as normalizeAwsTagsToCfn, Rt as getAwsClients, S as gray, St as resolveCaptureObservedState, T as yellow, Tt as resolveStateBucketWithDefaultAndSource, U as DagBuilder, V as applyRoleArnIfSet, W as TemplateParser, X as stringifyValue, Xt as NestedStackChildDirectDestroyError, Y as AssetPublisher, Yt as MissingCdkCliError, Z as WorkGraph, Zt as PartialFailureError, _ as isStatefulRecreateTargetSync, _t as synthesisStatusMessage, a as DeploymentEventsStore, at as getBootstrapMarkerKey, b as bold, bt as resolveApp, c as replayFailedOperations, cn as withErrorHandling, ct as validateContainerRepoName, d as withRetry, dt as getDockerCmd, en as ResourceUpdateNotSupportedError, et as loadPublishableAssetManifest, f as isRetryableTransientError, ft as runDockerForeground, g as MULTI_REGION_RECREATE_BLOCKED_TYPES, gt as Synthesizer, h as extractDeploymentEventError, ht as getDockerImageBySourceHash, i as DeploymentEventsReader, it as ensureAssetStorage, j as slowCcOperationTimeoutMs, jt as findLargeInlineResources, k as findActionableSilentDrops, kt as CFN_TEMPLATE_URL_LIMIT, l as replayRollback, lt as buildDockerImage, m as computeImplicitDeleteEdges, mt as AssetManifestLoader, n as DEFAULT_RESOURCE_WARN_AFTER_MS, nn as StackTerminationProtectionError, nt as AssetModeResolver, o as planFailedOps, ot as parseBootstrapMarker, p as IMPLICIT_DELETE_DEPENDENCIES, pt as runDockerStreaming, q as rebuildClientForBucketRegion, qt as LocalStartServiceError, r as DeployEngine, rt as BOOTSTRAP_MARKER_PREFIX, s as planRollback, sn as normalizeAwsError, st as validateAssetBucketName, t as DEFAULT_RESOURCE_TIMEOUT_MS, tn as StackHasActiveImportsError, tt as rewriteTemplateAssetReferences, u as withResourceDeadline, ut as formatDockerLoginError, v as renderStatefulReason, vt as getDefaultStateBucketName, w as red, wt as resolveStateBucketWithDefault, x as cyan, xt as resolveAutoAssetStorage, y as formatResourceLine, yt as getLegacyStateBucketName, z as resolveExplicitPhysicalId, zt as resetAwsClients } from "./deploy-engine-DNLQYYBx.js";
 import { a as getLiveRenderer, c as PATTERN_B_RESOURCE_TYPES, d as generateResourceNameWithFallback, f as withSkipPrefix, i as runStackBuffered, n as getLogger, o as PATTERN_B_NAME_OPTIONS, p as withStackName, s as PATTERN_B_NAME_PROPERTIES, u as generateResourceName } from "./logger-BYMEE-BS.js";
-import { t as ASGProvider } from "./asg-provider-CkNAViXd.js";
+import { t as ASGProvider } from "./asg-provider-ByH521ze.js";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { createHash, randomBytes, randomUUID } from "node:crypto";
 import { CopyObjectCommand, CreateBucketCommand, DeleteBucketAnalyticsConfigurationCommand, DeleteBucketCommand, DeleteBucketCorsCommand, DeleteBucketIntelligentTieringConfigurationCommand, DeleteBucketInventoryConfigurationCommand, DeleteBucketLifecycleCommand, DeleteBucketMetricsConfigurationCommand, DeleteBucketPolicyCommand, DeleteBucketReplicationCommand, DeleteBucketTaggingCommand, DeleteBucketWebsiteCommand, DeleteObjectsCommand, GetBucketAccelerateConfigurationCommand, GetBucketCorsCommand, GetBucketEncryptionCommand, GetBucketLifecycleConfigurationCommand, GetBucketLocationCommand, GetBucketLoggingCommand, GetBucketNotificationConfigurationCommand, GetBucketPolicyCommand, GetBucketReplicationCommand, GetBucketTaggingCommand, GetBucketVersioningCommand, GetBucketWebsiteCommand, GetObjectCommand, GetObjectLockConfigurationCommand, GetPublicAccessBlockCommand, HeadBucketCommand, ListBucketAnalyticsConfigurationsCommand, ListBucketIntelligentTieringConfigurationsCommand, ListBucketInventoryConfigurationsCommand, ListBucketMetricsConfigurationsCommand, ListObjectVersionsCommand, ListObjectsV2Command, NoSuchBucket, PutBucketAccelerateConfigurationCommand, PutBucketAnalyticsConfigurationCommand, PutBucketCorsCommand, PutBucketEncryptionCommand, PutBucketIntelligentTieringConfigurationCommand, PutBucketInventoryConfigurationCommand, PutBucketLifecycleConfigurationCommand, PutBucketLoggingCommand, PutBucketMetricsConfigurationCommand, PutBucketNotificationConfigurationCommand, PutBucketOwnershipControlsCommand, PutBucketPolicyCommand, PutBucketReplicationCommand, PutBucketTaggingCommand, PutBucketVersioningCommand, PutBucketWebsiteCommand, PutObjectCommand, PutObjectLockConfigurationCommand, PutPublicAccessBlockCommand, S3Client, S3ServiceException } from "@aws-sdk/client-s3";
@@ -42516,7 +42516,7 @@ async function deployCommand(stacks, options) {
 			const stackLockManager = new LockManager(stateS3Client.s3, stateConfig);
 			const stackProviderRegistry = new ProviderRegistry();
 			registerAllProviders(stackProviderRegistry);
-			stackProviderRegistry.setCustomResourceResponseBucket(stateBucket, baseRegion);
+			stackProviderRegistry.setCustomResourceResponseBucket(stateBucket);
 			if (options.allowUnsupportedTypes?.length) stackProviderRegistry.allowUnsupportedTypes(options.allowUnsupportedTypes);
 			if (options.allowUnsupportedProperties?.length) stackProviderRegistry.allowUnsupportedProperties(options.allowUnsupportedProperties);
 			const eventRecorder = startRunRecorder({
@@ -49508,12 +49508,25 @@ function actionLabel(item) {
 		case "orphan-retain": return `  - orphan   ${op.logicalId} (${op.resourceType}) [DeletionPolicy Retain/Snapshot — left in AWS]`;
 		case "orphan-flag": return `  - orphan   ${op.logicalId} (${op.resourceType}) [--orphan]`;
 		case "revert": return `  - revert   ${op.logicalId} (${op.resourceType})${rep}`;
+		case "reverse-replacement": return `  - reverse-replace ${op.logicalId} (${op.resourceType}) [re-create old resource, delete new]`;
+		case "reverse-replacement-readopt": return `  - reverse-replace ${op.logicalId} (${op.resourceType}) [delete new, re-adopt retained old resource]`;
 		case "unrecoverable-delete": return `  - (cannot restore) ${op.logicalId} (${op.resourceType}) — was DELETED, unrecoverable`;
 		case "skip-mismatch": return `  - skip     ${op.logicalId} (${op.resourceType}) — physical id changed, needs manual attention`;
 		case "skip-absent": return `  - skip     ${op.logicalId} (${op.resourceType}) — no longer in state`;
 		case "skip-already-done": return `  - skip     ${op.logicalId} (${op.resourceType}) — already reverted`;
 	}
 }
+/** Human label for a planned FAILED-op revert (issue #1198, --revert-failed). */
+function failedActionLabel(item) {
+	const { op, action } = item;
+	switch (action) {
+		case "revert-failed-update": return `  - revert   ${op.logicalId} (${op.resourceType}) [FAILED update — remote state unknown, force-applying previous properties]`;
+		case "delete-failed-create": return `  - delete   ${op.logicalId} (${op.resourceType}) [FAILED create]`;
+		case "skip-failed-unknown": return `  - skip     ${op.logicalId} (${op.resourceType}) — failed CREATE recorded no physical id`;
+		case "skip-failed-noop": return `  - skip     ${op.logicalId} (${op.resourceType}) — failed ${op.changeType} left nothing to revert`;
+		case "skip-failed-absent": return `  - skip     ${op.logicalId} (${op.resourceType}) — no previous state available`;
+	}
+}
 async function confirm(question) {
 	const rl = readline$1.createInterface({
 		input: process.stdin,
@@ -49578,6 +49591,11 @@ async function rollbackCommand(stackArg, options) {
 			for (let s = journal.segments.length - 1; s >= 0; s--) {
 				const segment = journal.segments[s];
 				logger.info(`\n  Segment ${s + 1}/${journal.segments.length} (${segment.reason}${segment.runId ? `, run ${segment.runId}` : ""}):`);
+				if (segment.failedOperations && segment.failedOperations.length > 0) if (options.revertFailed) {
+					const failedPlan = planFailedOps(segment.failedOperations, planStateView);
+					for (const item of failedPlan) logger.info(failedActionLabel(item));
+					applyFailedPlanToPreview(failedPlan, planStateView);
+				} else for (const fop of segment.failedOperations) logger.info(`  - (left as-is) ${fop.logicalId} (${fop.resourceType}) — its ${fop.changeType} FAILED mid-deploy; pass --revert-failed to attempt reverting it`);
 				const plan = planRollback(segment.operations, planStateView, orphanLogicalIds);
 				for (const item of plan) logger.info(actionLabel(item));
 				applyPlanToPreview(plan, planStateView);
@@ -49639,11 +49657,42 @@ async function rollbackCommand(stackArg, options) {
 						stateBucket: setup.bucket,
 						exportIndexStore: setup.exportIndexStore,
 						destroyOptions: { ...options.profile && { profile: options.profile } }
-					}, () => withStackName(stackName, () => replayRollback(segment.operations, stateResources, stackName, ctx, {
-						orphanLogicalIds,
-						afterOp: saveState,
-						isInterrupted: () => interrupted
-					})));
+					}, () => withStackName(stackName, async () => {
+						let failedOpFailures = 0;
+						let failedOpWarnings = 0;
+						if (options.revertFailed && segment.failedOperations && segment.failedOperations.length > 0) {
+							const failedResult = await replayFailedOperations(segment.failedOperations, stateResources, stackName, ctx, {
+								afterOp: saveState,
+								isInterrupted: () => interrupted,
+								emitEnvelope: segment.operations.length === 0
+							});
+							failedOpFailures = failedResult.failures;
+							failedOpWarnings = failedResult.warnings;
+							const remaining = failedResult.remainingFailedOps;
+							if (remaining.length !== segment.failedOperations.length) try {
+								await setup.stateBackend.setRollbackJournalFailedOperations(stackName, region, remaining);
+								if (remaining.length === 0) delete segment.failedOperations;
+								else segment.failedOperations = remaining;
+							} catch (stripError) {
+								logger.warn(`Failed to strip replayed failed-ops from the journal: ${stripError instanceof Error ? stripError.message : String(stripError)}`);
+							}
+							if (failedResult.interrupted) return {
+								failures: failedOpFailures,
+								warnings: failedOpWarnings,
+								interrupted: true
+							};
+						}
+						const replayResult = await replayRollback(segment.operations, stateResources, stackName, ctx, {
+							orphanLogicalIds,
+							afterOp: saveState,
+							isInterrupted: () => interrupted
+						});
+						return {
+							failures: replayResult.failures + failedOpFailures,
+							warnings: replayResult.warnings + failedOpWarnings,
+							interrupted: replayResult.interrupted
+						};
+					}));
 					totalFailures += result.failures;
 					totalWarnings += result.warnings;
 					if (result.interrupted) {
@@ -49690,6 +49739,26 @@ function applyPlanToPreview(plan, previewState) {
 				if (op.changeType === "CREATE") delete previewState[op.logicalId];
 				break;
 			case "revert":
+			case "reverse-replacement":
+			case "reverse-replacement-readopt":
+				if (op.previousState) previewState[op.logicalId] = op.previousState;
+				break;
+			default: break;
+		}
+	}
+}
+/**
+* Apply a planned FAILED-op revert's effect to the plan-preview state
+* (issue #1198). Mirrors `replayFailedOperations` without touching AWS.
+*/
+function applyFailedPlanToPreview(plan, previewState) {
+	for (const item of plan) {
+		const { op, action } = item;
+		switch (action) {
+			case "delete-failed-create":
+				delete previewState[op.logicalId];
+				break;
+			case "revert-failed-update":
 				if (op.previousState) previewState[op.logicalId] = op.previousState;
 				break;
 			default: break;
@@ -49697,13 +49766,14 @@ function applyPlanToPreview(plan, previewState) {
 	}
 }
 function createRollbackCommand() {
-	const cmd = new Command("rollback").description("Revert a stack to its pre-deploy state after a failed --no-rollback / interrupted deploy or a partially-failed automatic rollback (state-driven, no synth needed).").argument("[stack]", "Stack name to roll back (defaults to the single journaled stack)").addOption(new Option("--force", "Skip the confirmation prompt").default(false)).addOption(new Option("--orphan <logicalId>", "Skip the given resource during replay (repeatable). Mirrors cdk rollback --orphan.").argParser((value, previous) => [...previous ?? [], value])).addOption(stackRegionOption()).addHelpText("after", [
+	const cmd = new Command("rollback").description("Revert a stack to its pre-deploy state after a failed --no-rollback / interrupted deploy or a partially-failed automatic rollback (state-driven, no synth needed).").argument("[stack]", "Stack name to roll back (defaults to the single journaled stack)").addOption(new Option("--force", "Skip the confirmation prompt").default(false)).addOption(new Option("--orphan <logicalId>", "Skip the given resource during replay (repeatable). Mirrors cdk rollback --orphan.").argParser((value, previous) => [...previous ?? [], value])).addOption(new Option("--revert-failed", "Also attempt to revert the resource whose operation FAILED mid-deploy. Off by default: the remote state of the failed resource is unknown, so force-applying its previous state is opt-in.").default(false)).addOption(stackRegionOption()).addHelpText("after", [
 		"",
 		"Examples:",
 		"  cdkd rollback MyStack",
 		"  cdkd rollback                       # single journaled stack",
 		"  cdkd rollback MyStack --force",
 		"  cdkd rollback MyStack --orphan MyBucket --orphan MyTable",
+		"  cdkd rollback MyStack --revert-failed   # also revert the failed in-flight resource",
 		"  cdkd rollback MyStack --stack-region us-west-2",
 		"",
 		"Exit codes: 0 = clean, 2 = partial (journal kept for re-run), 1 = hard error."
@@ -61883,7 +61953,7 @@ function createMigrateCommand() {
 */
 function buildProgram() {
 	const program = new Command();
-	program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.263.2");
+	program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.264.1");
 	program.hook("preAction", (_thisCommand, actionCommand) => {
 		const { profile } = actionCommand.optsWithGlobals();
 		if (profile !== void 0) process.env["AWS_PROFILE"] = profile;