@go-to-k/cdkd 0.106.0 → 0.107.0

package/dist/cli.js

@@ -35,7 +35,7 @@ import { Command, Option } from "commander";
 import { writeFileSync as writeFileSync$1 } from "fs";
 import { join as join$1 } from "path";
 import * as zlib from "node:zlib";
-import { ApplicationAutoScalingClient, DescribeScalingPoliciesCommand } from "@aws-sdk/client-application-auto-scaling";
+import { ApplicationAutoScalingClient, DescribeScalableTargetsCommand, DescribeScalingPoliciesCommand } from "@aws-sdk/client-application-auto-scaling";
 import { ApiGatewayV2Client, CreateApiCommand, CreateAuthorizerCommand as CreateAuthorizerCommand$1, CreateIntegrationCommand, CreateRouteCommand as CreateRouteCommand$1, CreateStageCommand as CreateStageCommand$1, DeleteApiCommand, DeleteAuthorizerCommand as DeleteAuthorizerCommand$1, DeleteIntegrationCommand, DeleteRouteCommand as DeleteRouteCommand$1, DeleteStageCommand as DeleteStageCommand$1, GetApiCommand, GetApisCommand, GetAuthorizerCommand as GetAuthorizerCommand$1, GetIntegrationCommand, GetRouteCommand, GetStageCommand as GetStageCommand$1, NotFoundException as NotFoundException$3, UpdateApiCommand, UpdateAuthorizerCommand as UpdateAuthorizerCommand$1, UpdateIntegrationCommand, UpdateRouteCommand, UpdateStageCommand as UpdateStageCommand$1 } from "@aws-sdk/client-apigatewayv2";
 import { CreateStateMachineCommand, DeleteStateMachineCommand, DescribeStateMachineCommand, ListStateMachinesCommand, ListTagsForResourceCommand as ListTagsForResourceCommand$9, SFNClient, StateMachineDoesNotExist, TagResourceCommand as TagResourceCommand$10, UntagResourceCommand as UntagResourceCommand$9, UpdateStateMachineCommand } from "@aws-sdk/client-sfn";
 import { CreateClusterCommand, CreateServiceCommand, DeleteClusterCommand, DeleteServiceCommand, DeregisterTaskDefinitionCommand, DescribeClustersCommand, DescribeServicesCommand, DescribeTaskDefinitionCommand, ECSClient, ListClustersCommand, ListServicesCommand, ListTagsForResourceCommand as ListTagsForResourceCommand$10, PutClusterCapacityProvidersCommand, RegisterTaskDefinitionCommand, TagResourceCommand as TagResourceCommand$11, UntagResourceCommand as UntagResourceCommand$10, UpdateClusterCommand, UpdateServiceCommand } from "@aws-sdk/client-ecs";
@@ -7899,6 +7899,18 @@ var DynamoDBGlobalTableProvider = class {
 	*/
 	regionalClientCache = /* @__PURE__ */ new Map();
 	/**
+	* Caches per-region `ApplicationAutoScalingClient` instances for
+	* per-replica `ReadCapacityAutoScalingSettings` reverse-mapping in
+	* `readCurrentState`. Same lifetime / shape as `regionalClientCache`
+	* — one per region for the duration of the provider instance.
+	*
+	* Issue #395: per-replica read capacity autoscaling lives in the
+	* replica's region (each replica has its own scaling target +
+	* policy registered against `application-autoscaling` in that
+	* region), so we cannot reuse the local-region client.
+	*/
+	regionalAutoScalingClientCache = /* @__PURE__ */ new Map();
+	/**
 	* Caches `getAttribute(physicalId, attribute)` results for the lifetime
 	* of this provider instance (one deploy run). Safe under the current
 	* `update()` contract because `update()` cannot mid-deploy mutate
@@ -7954,6 +7966,24 @@ var DynamoDBGlobalTableProvider = class {
 		return client;
 	}
 	/**
+	* Return an `ApplicationAutoScalingClient` pinned to the given region,
+	* caching per region for the lifetime of this provider instance. Mirrors
+	* `getRegionalClient` but for the application-autoscaling service.
+	*
+	* Used by `readAutoScalingSettings` (Issue #395) to recover per-replica
+	* `ReadCapacityAutoScalingSettings` shapes — each cross-region replica's
+	* scaling target + policy are registered with the autoscaling control
+	* plane in the replica's region, so cross-region drift reads need a
+	* region-scoped client.
+	*/
+	getRegionalAutoScalingClient(region) {
+		const cached = this.regionalAutoScalingClientCache.get(region);
+		if (cached) return cached;
+		const client = new ApplicationAutoScalingClient({ region });
+		this.regionalAutoScalingClientCache.set(region, client);
+		return client;
+	}
+	/**
 	* Construct the regional table ARN for a cross-region replica of a
 	* GlobalTable. AWS replicates the same `TableName` across every
 	* replica region, with each replica's ARN differing only in the
@@ -8493,13 +8523,17 @@ var DynamoDBGlobalTableProvider = class {
 	*  - StreamSpecification / SSESpecification follow the existing
 	*    DynamoDB::Table provider's Class 1 guard: only surfaced when AWS
 	*    reports the feature actually enabled.
-	*  - `ProvisionedThroughput`-bearing fields are declared in
-	*    `getDriftUnknownPaths` and intentionally not emitted in v1 — the
-	*    reverse-mapping from AWS's `ProvisionedThroughput` shape into
-	*    CFn's `WriteProvisionedThroughputSettings` /
-	*    `ReadProvisionedThroughputSettings` wrappers (which carry
-	*    `WriteCapacityAutoScalingSettings` etc.) needs more work to round
-	*    -trip cleanly.
+	*  - `WriteProvisionedThroughputSettings` reverse-maps both shapes:
+	*    flat `{WriteCapacityUnits}` (no autoscaling) and full
+	*    `{WriteCapacityAutoScalingSettings}` (Issue #395; recovered from
+	*    application-autoscaling's `DescribeScalableTargets` +
+	*    `DescribeScalingPolicies` for the
+	*    `dynamodb:table:WriteCapacityUnits` dimension).
+	*  - Per-replica `ReadProvisionedThroughputSettings` reverse-maps the
+	*    `{ReadCapacityAutoScalingSettings}` shape only — there is no
+	*    per-replica flat read capacity in `DescribeTable`'s response
+	*    (the local `ProvisionedThroughput` block is table-level, not
+	*    replica-level), so non-autoscaled replicas omit the key.
 	*
 	* Per-replica sub-specifications (`ContributorInsightsSpecification` /
 	* `PointInTimeRecoverySpecification` / `KinesisStreamSpecification`)
@@ -8555,15 +8589,23 @@ var DynamoDBGlobalTableProvider = class {
 					}
 				}
 				else entry["Tags"] = [];
+				if (billingMode === "PROVISIONED") {
+					const replicaAutoScalingClient = isLocal ? void 0 : this.getRegionalAutoScalingClient(regionLabel);
+					const readAutoScaling = await this.readAutoScalingSettings(tableNameForSubs, "dynamodb:table:ReadCapacityUnits", replicaAutoScalingClient);
+					if (readAutoScaling) entry["ReadProvisionedThroughputSettings"] = { ReadCapacityAutoScalingSettings: readAutoScaling };
+				}
 				return entry;
 			}));
 			if (table.OnDemandThroughput?.MaxWriteRequestUnits !== void 0) result["WriteOnDemandThroughputSettings"] = { MaxWriteRequestUnits: table.OnDemandThroughput.MaxWriteRequestUnits };
 			else result["WriteOnDemandThroughputSettings"] = {};
 			if (billingMode === "PROVISIONED") {
-				const writeCapacity = table.ProvisionedThroughput?.WriteCapacityUnits;
-				if (writeCapacity !== void 0) if (!await this.hasWriteAutoScalingPolicy(tableNameForSubs)) result["WriteProvisionedThroughputSettings"] = { WriteCapacityUnits: writeCapacity };
-				else result["WriteProvisionedThroughputSettings"] = {};
-				else result["WriteProvisionedThroughputSettings"] = {};
+				const autoScaling = await this.readAutoScalingSettings(tableNameForSubs, "dynamodb:table:WriteCapacityUnits");
+				if (autoScaling) result["WriteProvisionedThroughputSettings"] = { WriteCapacityAutoScalingSettings: autoScaling };
+				else {
+					const writeCapacity = table.ProvisionedThroughput?.WriteCapacityUnits;
+					if (writeCapacity !== void 0) result["WriteProvisionedThroughputSettings"] = { WriteCapacityUnits: writeCapacity };
+					else result["WriteProvisionedThroughputSettings"] = {};
+				}
 			} else result["WriteProvisionedThroughputSettings"] = {};
 			try {
 				const ttlDesc = (await this.dynamoDBClient.send(new DescribeTimeToLiveCommand({ TableName: tableNameForSubs }))).TimeToLiveDescription;
@@ -8629,29 +8671,90 @@ var DynamoDBGlobalTableProvider = class {
 		return out;
 	}
 	/**
-	* Detect whether application-autoscaling has a scaling policy on this
-	* table's WriteCapacityUnits dimension. Used to decide whether the
-	* `WriteProvisionedThroughputSettings.WriteCapacityUnits` flat-value
-	* surface in `readCurrentState` is safe to emit (auto-scaling
-	* dynamically mutates capacity, so a flat snapshot would fire false
-	* drift on every scale event — when an autoscaling policy is in play
-	* we omit the flat surface so a follow-up PR can reverse-map the
-	* full `WriteCapacityAutoScalingSettings` shape).
-	*
-	* Best-effort: errors return `false` (no autoscaling detected) so a
-	* permissions gap on `application-autoscaling:DescribeScalingPolicies`
-	* does not abort drift reads. Logged at debug.
-	*/
-	async hasWriteAutoScalingPolicy(tableName) {
-		try {
-			return ((await new ApplicationAutoScalingClient({ region: await this.dynamoDBClient.config.region() ?? "" }).send(new DescribeScalingPoliciesCommand({
+	* Reverse-map application-autoscaling state for the given DynamoDB table
+	* dimension into the CFn `*CapacityAutoScalingSettings` shape (Issue
+	* #395). Used for BOTH the table-level write dimension
+	* (`dynamodb:table:WriteCapacityUnits`) and the per-replica read
+	* dimension (`dynamodb:table:ReadCapacityUnits`); the CFn shape is
+	* symmetric.
+	*
+	* Returns shape (CFn-canonical PascalCase keys, verified via `cdk synth`
+	* on a real `TableV2` with `Capacity.autoscaled(...)` on 2026-05-16 —
+	* see PR notes for the probe transcript):
+	*
+	* ```
+	* {
+	*   MinCapacity: number;
+	*   MaxCapacity: number;
+	*   TargetTrackingScalingPolicyConfiguration: {
+	*     TargetValue: number;
+	*     DisableScaleIn?: boolean;
+	*     ScaleInCooldown?: number;
+	*     ScaleOutCooldown?: number;
+	*   };
+	* }
+	* ```
+	*
+	* `SeedCapacity` is intentionally NOT round-tripped — it is a CFn
+	* create-only field with no corresponding application-autoscaling
+	* surface (AWS does not retain the initial seed value once the
+	* scaling target is registered).
+	*
+	* Resolution order:
+	*  1. `DescribeScalableTargets` → recover `MinCapacity` / `MaxCapacity`
+	*     for the matching `ScalableDimension`. Returns `null` when no
+	*     target is registered (= no autoscaling in play for this
+	*     dimension — caller falls back to the flat capacity surface).
+	*  2. `DescribeScalingPolicies` → find the `TargetTrackingScaling`
+	*     policy (filter out `StepScaling` / `PredictiveScaling` — CFn's
+	*     shape only carries the target-tracking variant). Returns `null`
+	*     when no `TargetTrackingScaling` policy is present (a scaling
+	*     target without a target-tracking policy is not cdkd-managed
+	*     drift territory; surface the flat capacity instead).
+	*
+	* Best-effort: any error (permissions gap, throttle, network) returns
+	* `null` and the caller falls back to the flat-capacity branch. Logged
+	* at debug so a real permissions misconfiguration is still visible
+	* under `--verbose`.
+	*
+	* @param tableName DynamoDB table name (the `physicalId`).
+	* @param scalableDimension `'dynamodb:table:WriteCapacityUnits'` or
+	*   `'dynamodb:table:ReadCapacityUnits'`.
+	* @param client Pre-built region-scoped autoscaling client. Defaults to
+	*   a fresh client in the local region — pass an explicit client when
+	*   reading from a cross-region replica.
+	*/
+	async readAutoScalingSettings(tableName, scalableDimension, client) {
+		try {
+			const asClient = client ?? new ApplicationAutoScalingClient({ region: await this.dynamoDBClient.config.region() ?? "" });
+			const targets = (await asClient.send(new DescribeScalableTargetsCommand({
+				ServiceNamespace: "dynamodb",
+				ResourceIds: [`table/${tableName}`],
+				ScalableDimension: scalableDimension
+			}))).ScalableTargets ?? [];
+			if (targets.length === 0) return null;
+			const target = targets[0];
+			if (target.MinCapacity === void 0 || target.MaxCapacity === void 0) return null;
+			const targetTracking = ((await asClient.send(new DescribeScalingPoliciesCommand({
 				ServiceNamespace: "dynamodb",
 				ResourceId: `table/${tableName}`,
-				ScalableDimension: "dynamodb:table:WriteCapacityUnits"
-			}))).ScalingPolicies ?? []).length > 0;
+				ScalableDimension: scalableDimension
+			}))).ScalingPolicies ?? []).find((p) => p.PolicyType === "TargetTrackingScaling");
+			if (!targetTracking) return null;
+			const cfg = targetTracking.TargetTrackingScalingPolicyConfiguration;
+			if (!cfg || cfg.TargetValue === void 0) return null;
+			const tttConfig = { TargetValue: cfg.TargetValue };
+			if (cfg.DisableScaleIn !== void 0) tttConfig["DisableScaleIn"] = cfg.DisableScaleIn;
+			if (cfg.ScaleInCooldown !== void 0) tttConfig["ScaleInCooldown"] = cfg.ScaleInCooldown;
+			if (cfg.ScaleOutCooldown !== void 0) tttConfig["ScaleOutCooldown"] = cfg.ScaleOutCooldown;
+			return {
+				MinCapacity: target.MinCapacity,
+				MaxCapacity: target.MaxCapacity,
+				TargetTrackingScalingPolicyConfiguration: tttConfig
+			};
 		} catch (err) {
-			this.logger.debug(`Could not query application-autoscaling for ${tableName}: ${err instanceof Error ? err.message : String(err)}`);
-			return false;
+			this.logger.debug(`Could not read application-autoscaling settings for ${tableName} (${scalableDimension}): ${err instanceof Error ? err.message : String(err)}`);
+			return null;
 		}
 	}
 	/**
@@ -8659,13 +8762,17 @@ var DynamoDBGlobalTableProvider = class {
 	* reverse-map. The drift comparator skips these so a templated value
 	* doesn't fire guaranteed false drift on every clean run.
 	*
-	* Issue #389 emptied this list:
-	*  - `WriteProvisionedThroughputSettings` (flat-WriteCapacityUnits
-	*    subset) is now reverse-mapped from `Table.ProvisionedThroughput`
-	*    when BillingMode is PROVISIONED AND application-autoscaling has
-	*    no policy on the WriteCapacityUnits dimension. Auto-scaling
-	*    cases emit an empty `{}` placeholder so the comparator does NOT
-	*    fire false drift on the literal `WriteCapacityUnits` subtree.
+	* Issue #389 + #395 emptied this list:
+	*  - `WriteProvisionedThroughputSettings` reverse-maps both the flat
+	*    `{WriteCapacityUnits}` shape (no autoscaling) AND the full
+	*    `{WriteCapacityAutoScalingSettings}` shape (autoscaling-managed;
+	*    recovered from `DescribeScalableTargets` +
+	*    `DescribeScalingPolicies`). PAY_PER_REQUEST tables emit `{}`.
+	*  - Per-replica `ReadProvisionedThroughputSettings.ReadCapacityAutoScalingSettings`
+	*    reverse-maps from a region-scoped application-autoscaling client
+	*    for the `dynamodb:table:ReadCapacityUnits` dimension. Non-
+	*    autoscaled replicas omit the key (no per-replica flat read
+	*    capacity available in `DescribeTable`).
 	*  - `WriteOnDemandThroughputSettings` is reverse-mapped from
 	*    `Table.OnDemandThroughput.MaxWriteRequestUnits`. Always-emit
 	*    `{}` placeholder when AWS reports no override.
@@ -44576,7 +44683,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.106.0");
+	program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.107.0");
 	program.addCommand(createBootstrapCommand());
 	program.addCommand(createSynthCommand());
 	program.addCommand(createListCommand());