@go-to-k/cdkd 0.278.8 → 0.278.10

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
-import { $ as DagBuilder, A as red, At as resolveApp, B as isTerminationProtectionPropagationError, Bt as CFN_TEMPLATE_URL_LIMIT, C as isStatefulRecreateTargetSync, Ct as runDockerStreaming, D as cyan, Dt as synthesisStatusMessage, E as bold, Et as Synthesizer, F as ProviderRegistry, Ft as resolveStateBucketWithDefaultAndSource, G as normalizeAwsTagsToCfn, Gt as AssemblyReader, H as cfnRefValueFromPhysicalId, Ht as findLargeInlineResources, I as findActionableSilentDrops, It as resolveUseCdkBootstrapAssets, J as applyRoleArnIfSet, Jt as resolveBucketRegion, K as resolveExplicitPhysicalId, Kt as processStackMessages, L as CloudControlProvider, Lt as stateBucketExistenceConfirmed, M as IAMRoleProvider, Mt as resolveCaptureObservedState, N as collectInlinePolicyNamesManagedBySiblings, Nt as resolveSkipPrefix, O as gray, Ot as getDefaultStateBucketName, P as clearOnUpdateRemoval, Pt as resolveStateBucketWithDefault, Q as isRetryableTransientError, Qt as setAwsClients, R as slowCcOperationTimeoutMs, Rt as warnDeprecatedNoPrefixCliFlag, S as MULTI_REGION_RECREATE_BLOCKED_TYPES, St as runDockerForeground, T as formatResourceLine, Tt as getDockerImageBySourceHash, U as refStateLookupFromResource, Ut as uploadCfnTemplate, V as IntrinsicFunctionResolver, Vt as MIGRATE_TMP_PREFIX, W as WAFv2WebACLProvider, Wt as expectedOwnerParam, X as describeTypeWithThrottleRetry, Xt as getAwsClients, Y as DiffCalculator, Yt as AwsClients, Z as withRetry, Zt as resetAwsClients, _ as createPreDeleteFinalSnapshot, _t as validateAssetBucketName, a as DeploymentEventsStore, an as LocalMigrateError, at as AssetPublisher, b as unsupportedFinalSnapshotError, bn as normalizeAwsError, bt as formatDockerLoginError, c as replayFailedOperations, cn as MissingCdkCliError, ct as buildAssetRedirectMap, d as IMPLICIT_DELETE_DEPENDENCIES, dn as ProvisioningError, dt as rewriteTemplateAssetReferences, en as CdkdError, et as TemplateParser, f as computeImplicitDeleteEdges, fn as ResourceTimeoutError, ft as AssetModeResolver, g as ccRoutedFinalSnapshotError, gt as parseBootstrapMarker, h as buildFinalSnapshotIdentifier, hn as StackTerminationProtectionError, ht as getBootstrapMarkerKey, i as DeploymentEventsReader, in as LocalInvokeBuildError$1, it as shouldRetainResource, j as yellow, jt as resolveAutoAssetStorage, k as green, kt as getLegacyStateBucketName, l as replayRollback, ln as NestedStackChildDirectDestroyError, lt as createAssetRedirectResolver, m as PRE_DELETE_SNAPSHOT_TYPES, mn as StackHasActiveImportsError, mt as ensureAssetStorage, n as DEFAULT_RESOURCE_WARN_AFTER_MS, nt as S3StateBackend, o as planFailedOps, on as LocalStartServiceError, ot as stringifyValue, p as ATOMIC_FINAL_SNAPSHOT_TYPES, pn as ResourceUpdateNotSupportedError, pt as BOOTSTRAP_MARKER_PREFIX, q as assertRegionMatch, r as DeployEngine, rn as DeployCancelledError, rt as rebuildClientForBucketRegion, s as planRollback, st as WorkGraph, t as DEFAULT_RESOURCE_TIMEOUT_MS, tt as LockManager, u as withResourceDeadline, un as PartialFailureError, ut as loadPublishableAssetManifest, v as isFinalSnapshotError, vt as validateContainerRepoName, w as renderStatefulReason, wt as AssetManifestLoader, x as extractDeploymentEventError, xn as withErrorHandling, xt as getDockerCmd, y as refusesFinalSnapshot, yt as buildDockerImage, z as disableInstanceApiTermination, zt as CFN_TEMPLATE_BODY_LIMIT } from "./deploy-engine-HAlYSktR.js";
+import { $ as DagBuilder, A as red, At as resolveApp, B as isTerminationProtectionPropagationError, Bt as CFN_TEMPLATE_URL_LIMIT, C as isStatefulRecreateTargetSync, Ct as runDockerStreaming, D as cyan, Dt as synthesisStatusMessage, E as bold, Et as Synthesizer, F as ProviderRegistry, Ft as resolveStateBucketWithDefaultAndSource, G as normalizeAwsTagsToCfn, Gt as AssemblyReader, H as cfnRefValueFromPhysicalId, Ht as findLargeInlineResources, I as findActionableSilentDrops, It as resolveUseCdkBootstrapAssets, J as applyRoleArnIfSet, Jt as resolveBucketRegion, K as resolveExplicitPhysicalId, Kt as processStackMessages, L as CloudControlProvider, Lt as stateBucketExistenceConfirmed, M as IAMRoleProvider, Mt as resolveCaptureObservedState, N as collectInlinePolicyNamesManagedBySiblings, Nt as resolveSkipPrefix, O as gray, Ot as getDefaultStateBucketName, P as clearOnUpdateRemoval, Pt as resolveStateBucketWithDefault, Q as isRetryableTransientError, Qt as setAwsClients, R as slowCcOperationTimeoutMs, Rt as warnDeprecatedNoPrefixCliFlag, S as MULTI_REGION_RECREATE_BLOCKED_TYPES, St as runDockerForeground, T as formatResourceLine, Tt as getDockerImageBySourceHash, U as refStateLookupFromResource, Ut as uploadCfnTemplate, V as IntrinsicFunctionResolver, Vt as MIGRATE_TMP_PREFIX, W as WAFv2WebACLProvider, Wt as expectedOwnerParam, X as describeTypeWithThrottleRetry, Xt as getAwsClients, Y as DiffCalculator, Yt as AwsClients, Z as withRetry, Zt as resetAwsClients, _ as createPreDeleteFinalSnapshot, _t as validateAssetBucketName, a as DeploymentEventsStore, an as LocalMigrateError, at as AssetPublisher, b as unsupportedFinalSnapshotError, bn as normalizeAwsError, bt as formatDockerLoginError, c as replayFailedOperations, cn as MissingCdkCliError, ct as buildAssetRedirectMap, d as IMPLICIT_DELETE_DEPENDENCIES, dn as ProvisioningError, dt as rewriteTemplateAssetReferences, en as CdkdError, et as TemplateParser, f as computeImplicitDeleteEdges, fn as ResourceTimeoutError, ft as AssetModeResolver, g as ccRoutedFinalSnapshotError, gt as parseBootstrapMarker, h as buildFinalSnapshotIdentifier, hn as StackTerminationProtectionError, ht as getBootstrapMarkerKey, i as DeploymentEventsReader, in as LocalInvokeBuildError$1, it as shouldRetainResource, j as yellow, jt as resolveAutoAssetStorage, k as green, kt as getLegacyStateBucketName, l as replayRollback, ln as NestedStackChildDirectDestroyError, lt as createAssetRedirectResolver, m as PRE_DELETE_SNAPSHOT_TYPES, mn as StackHasActiveImportsError, mt as ensureAssetStorage, n as DEFAULT_RESOURCE_WARN_AFTER_MS, nt as S3StateBackend, o as planFailedOps, on as LocalStartServiceError, ot as stringifyValue, p as ATOMIC_FINAL_SNAPSHOT_TYPES, pn as ResourceUpdateNotSupportedError, pt as BOOTSTRAP_MARKER_PREFIX, q as assertRegionMatch, r as DeployEngine, rn as DeployCancelledError, rt as rebuildClientForBucketRegion, s as planRollback, st as WorkGraph, t as DEFAULT_RESOURCE_TIMEOUT_MS, tt as LockManager, u as withResourceDeadline, un as PartialFailureError, ut as loadPublishableAssetManifest, v as isFinalSnapshotError, vt as validateContainerRepoName, w as renderStatefulReason, wt as AssetManifestLoader, x as extractDeploymentEventError, xn as withErrorHandling, xt as getDockerCmd, y as refusesFinalSnapshot, yt as buildDockerImage, z as disableInstanceApiTermination, zt as CFN_TEMPLATE_BODY_LIMIT } from "./deploy-engine-BFUaBWTW.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-De5hpQWP.js";
+import { t as ASGProvider } from "./asg-provider-BlBwcSG-.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";
@@ -38577,7 +38577,7 @@ var EMRInstanceGroupConfigProvider = class {
 					...jobFlowId && { ClusterId: jobFlowId },
 					InstanceGroups: [{
 						InstanceGroupId: physicalId,
-						InstanceCount: toNumber$1(properties["InstanceCount"])
+						InstanceCount: toNumber$1(properties["InstanceCount"]) ?? 0
 					}]
 				}));
 				if (jobFlowId) await this.waitForGroupReady(jobFlowId, physicalId, logicalId, resourceType, toNumber$1(properties["InstanceCount"]) ?? 0, true);
@@ -38837,7 +38837,10 @@ var EMRInstanceFleetConfigProvider = class {
 				InstanceFleet: fleet
 			}))).InstanceFleetId;
 			if (!fleetId) throw new ProvisioningError(`EMR AddInstanceFleet for ${logicalId} returned no instance fleet id`, resourceType, logicalId);
-			await this.waitForFleetReady(clusterId, fleetId, logicalId, resourceType, this.targetCapacity(properties), true);
+			await this.waitForFleetReady(clusterId, fleetId, logicalId, resourceType, this.targetCapacities(properties), {
+				onDemand: 0,
+				spot: 0
+			});
 			this.logger.debug(`Successfully added EMR instance fleet ${logicalId}: ${fleetId}`);
 			return {
 				physicalId: fleetId,
@@ -38888,8 +38891,8 @@ var EMRInstanceFleetConfigProvider = class {
 		try {
 			const modify = {
 				InstanceFleetId: physicalId,
-				TargetOnDemandCapacity: toNumber(properties["TargetOnDemandCapacity"]),
-				TargetSpotCapacity: toNumber(properties["TargetSpotCapacity"]),
+				TargetOnDemandCapacity: toNumber(properties["TargetOnDemandCapacity"]) ?? 0,
+				TargetSpotCapacity: toNumber(properties["TargetSpotCapacity"]) ?? 0,
 				ResizeSpecifications: properties["ResizeSpecifications"],
 				InstanceTypeConfigs: toSdkInstanceTypeConfigs(properties["InstanceTypeConfigs"])
 			};
@@ -38897,9 +38900,7 @@ var EMRInstanceFleetConfigProvider = class {
 				ClusterId: clusterId,
 				InstanceFleet: modify
 			}));
-			const newTarget = this.targetCapacity(properties);
-			const prevTarget = this.targetCapacity(previousProperties);
-			await this.waitForFleetReady(clusterId, physicalId, logicalId, resourceType, newTarget, newTarget >= prevTarget, true);
+			await this.waitForFleetReady(clusterId, physicalId, logicalId, resourceType, this.targetCapacities(properties), this.targetCapacities(previousProperties), true);
 			this.logger.debug(`Successfully updated EMR instance fleet ${logicalId}`);
 			return {
 				physicalId,
@@ -38939,9 +38940,21 @@ var EMRInstanceFleetConfigProvider = class {
 	async getAttribute(physicalId, _resourceType, attributeName) {
 		if (attributeName === "Id") return physicalId;
 	}
-	/** Total target capacity (On-Demand + Spot) requested for the fleet. */
-	targetCapacity(properties) {
-		return (toNumber(properties["TargetOnDemandCapacity"]) ?? 0) + (toNumber(properties["TargetSpotCapacity"]) ?? 0);
+	/**
+	* Per-dimension target capacities.
+	*
+	* Deliberately NOT summed into a single total: the settle check must compare
+	* EACH dimension against its own provisioned counterpart. A template that
+	* swaps 2 Spot units for 2 On-Demand units leaves the TOTAL unchanged, so a
+	* summed comparison is satisfied by the stale pre-resize reading on the very
+	* first poll and the deploy reports success while EMR is still swapping
+	* instances.
+	*/
+	targetCapacities(properties) {
+		return {
+			onDemand: toNumber(properties["TargetOnDemandCapacity"]) ?? 0,
+			spot: toNumber(properties["TargetSpotCapacity"]) ?? 0
+		};
 	}
 	/**
 	* Poll until the fleet is `RUNNING` AND its provisioned capacity
@@ -38950,15 +38963,26 @@ var EMRInstanceFleetConfigProvider = class {
 	* still in the PRE-resize `RUNNING` state, so a State-only wait would return
 	* before the resize even starts.
 	*
-	* `atLeast` selects the settle direction:
-	*  - `true` (create / scale-UP): ready when `provisioned >= targetCapacity`
-	*    (`>=`, not `==`, because a weighted-capacity allocation may overshoot).
-	*  - `false` (scale-DOWN): ready when `provisioned <= targetCapacity` — the
-	*    stale pre-resize provisioned capacity is ABOVE the new lower target, so
-	*    an `>=` check would return instantly before instances drain.
-	*
-	* A `targetCapacity` of 0 on the up path (never valid for a real create —
-	* at least one target must be > 0) degrades to a State-only wait.
+	* Both dimensions are compared SEPARATELY against their own provisioned
+	* counterpart, with their own direction derived from `previous` -> `target`:
+	*  - scale-UP (`target >= previous`, and every create, whose `previous` is
+	*    `{0, 0}`): ready when `provisioned >= target` (`>=`, not `==`, because a
+	*    weighted-capacity allocation may overshoot).
+	*  - scale-DOWN: ready when `provisioned <= target` — the stale pre-resize
+	*    provisioned capacity is ABOVE the new lower target, so a `>=` check
+	*    would return instantly before instances drain.
+	*
+	* Summing the two dimensions instead would make the check vacuous whenever a
+	* template swaps capacity between them at a constant total (`{Spot: 2}` ->
+	* `{OnDemand: 2}`): the summed target equals the summed previous, so the
+	* direction reads as UP and the stale pre-resize sum satisfies it on the very
+	* first poll, reporting success while EMR is still swapping instances. That
+	* shape only became reachable once `update()` started sending both members
+	* (it previously died at `ModifyInstanceFleet`), so the per-dimension
+	* comparison ships with it.
+	*
+	* A target of 0 on the up path (never valid for a real create — at least one
+	* target must be > 0) is trivially satisfied, degrading to a State-only wait.
 	*
 	* `toleratesStaleFailedState` MUST be true on the resize path and false on
 	* create. It exists for the RECOVERY case: `SUSPENDED` (a resize that could
@@ -38980,16 +39004,19 @@ var EMRInstanceFleetConfigProvider = class {
 	* pre-resize `RUNNING` is harmless because the capacity check keeps the loop
 	* polling. A stale `SUSPENDED` is terminal.
 	*/
-	async waitForFleetReady(clusterId, fleetId, logicalId, resourceType, targetCapacity, atLeast, toleratesStaleFailedState = false) {
+	async waitForFleetReady(clusterId, fleetId, logicalId, resourceType, target, previous, toleratesStaleFailedState = false) {
 		const startTime = Date.now();
 		const transientState = { count: 0 };
 		let initialState;
 		let hasLeftInitialState = false;
+		const settled = (provisioned, want, had) => want >= had ? provisioned >= want : provisioned <= want;
 		while (Date.now() - startTime < this.maxWaitMs) {
 			const fleet = await this.findFleetForPoll(clusterId, fleetId, transientState);
 			const state = fleet?.Status?.State;
-			const provisioned = (fleet?.ProvisionedOnDemandCapacity ?? 0) + (fleet?.ProvisionedSpotCapacity ?? 0);
-			const capacityReady = atLeast ? provisioned >= targetCapacity : provisioned <= targetCapacity;
+			const onDemand = fleet?.ProvisionedOnDemandCapacity ?? 0;
+			const spot = fleet?.ProvisionedSpotCapacity ?? 0;
+			const provisioned = onDemand + spot;
+			const capacityReady = settled(onDemand, target.onDemand, previous.onDemand) && settled(spot, target.spot, previous.spot);
 			if (state) {
 				if (initialState === void 0) initialState = state;
 				else if (state !== initialState) hasLeftInitialState = true;
@@ -38998,10 +39025,10 @@ var EMRInstanceFleetConfigProvider = class {
 			const enforceFailedStates = !toleratesStaleFailedState || hasLeftInitialState;
 			if (state && enforceFailedStates && FAILED_STATES.has(state)) throw new ProvisioningError(`EMR instance fleet ${fleetId} entered failed state ${state}: ${fleet?.Status?.StateChangeReason?.Message ?? "no state-change reason reported"}`, resourceType, logicalId, fleetId);
 			if (state && !enforceFailedStates && FAILED_STATES.has(state)) this.logger.debug(`EMR instance fleet ${fleetId} still reads ${state} from before the resize; waiting for it to leave that state before treating it as failed`);
-			this.logger.debug(`EMR instance fleet ${fleetId} state: ${state ?? "unknown"}, provisioned ${provisioned}/${targetCapacity}, waiting...`);
+			this.logger.debug(`EMR instance fleet ${fleetId} state: ${state ?? "unknown"}, provisioned ${onDemand}/${target.onDemand} on-demand + ${spot}/${target.spot} spot (${provisioned} total), waiting...`);
 			await new Promise((resolve) => setTimeout(resolve, this.pollIntervalMs));
 		}
-		throw new ProvisioningError(`Timed out waiting for EMR instance fleet ${fleetId} to reach RUNNING with capacity ${targetCapacity} (${Math.round(this.maxWaitMs / 6e4)} min)`, resourceType, logicalId, fleetId);
+		throw new ProvisioningError(`Timed out waiting for EMR instance fleet ${fleetId} to reach RUNNING with capacity ${target.onDemand} on-demand / ${target.spot} spot (${Math.round(this.maxWaitMs / 6e4)} min)`, resourceType, logicalId, fleetId);
 	}
 	/**
 	* `ListInstanceFleets` (paginated) for the cluster, returning the single
@@ -64569,7 +64596,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.278.8");
+	program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.278.10");
 	program.hook("preAction", (_thisCommand, actionCommand) => {
 		const { profile } = actionCommand.optsWithGlobals();
 		if (profile !== void 0) process.env["AWS_PROFILE"] = profile;