@go-to-k/cdkd 0.109.0 → 0.110.0

package/dist/cli.js

@@ -30,7 +30,7 @@ import { CreateAliasCommand, CreateKeyCommand, DeleteAliasCommand, DescribeKeyCo
 import { promisify } from "node:util";
 import { CreateRepositoryCommand, DeleteLifecyclePolicyCommand, DeleteRepositoryCommand, DeleteRepositoryPolicyCommand, DescribeRepositoriesCommand, ECRClient, GetAuthorizationTokenCommand, GetLifecyclePolicyCommand, LifecyclePolicyNotFoundException, ListTagsForResourceCommand as ListTagsForResourceCommand$7, PutImageScanningConfigurationCommand, PutImageTagMutabilityCommand, PutLifecyclePolicyCommand, RepositoryNotFoundException, SetRepositoryPolicyCommand, TagResourceCommand as TagResourceCommand$9 } from "@aws-sdk/client-ecr";
 import graphlib from "graphlib";
-import { AddTagsToResourceCommand as AddTagsToResourceCommand$1, CreateDBClusterCommand, CreateDBInstanceCommand, CreateDBProxyCommand, CreateDBProxyEndpointCommand, CreateDBSubnetGroupCommand, DBProxyEndpointNotFoundFault, DBProxyNotFoundFault, DBProxyTargetGroupNotFoundFault, DBProxyTargetNotFoundFault, DeleteDBClusterCommand, DeleteDBInstanceCommand, DeleteDBProxyCommand, DeleteDBProxyEndpointCommand, DeleteDBSubnetGroupCommand, DeregisterDBProxyTargetsCommand, DescribeDBClustersCommand, DescribeDBInstancesCommand, DescribeDBProxiesCommand, DescribeDBProxyEndpointsCommand, DescribeDBProxyTargetGroupsCommand, DescribeDBSubnetGroupsCommand, ListTagsForResourceCommand as ListTagsForResourceCommand$8, ModifyDBClusterCommand, ModifyDBInstanceCommand, ModifyDBProxyCommand, ModifyDBProxyEndpointCommand, ModifyDBProxyTargetGroupCommand, ModifyDBSubnetGroupCommand, RDSClient, RegisterDBProxyTargetsCommand, RemoveTagsFromResourceCommand as RemoveTagsFromResourceCommand$1 } from "@aws-sdk/client-rds";
+import { AddTagsToResourceCommand as AddTagsToResourceCommand$1, CreateDBClusterCommand, CreateDBInstanceCommand, CreateDBProxyCommand, CreateDBProxyEndpointCommand, CreateDBSubnetGroupCommand, DBProxyEndpointNotFoundFault, DBProxyNotFoundFault, DBProxyTargetGroupNotFoundFault, DBProxyTargetNotFoundFault, DeleteDBClusterCommand, DeleteDBInstanceCommand, DeleteDBProxyCommand, DeleteDBProxyEndpointCommand, DeleteDBSubnetGroupCommand, DeregisterDBProxyTargetsCommand, DescribeDBClustersCommand, DescribeDBInstancesCommand, DescribeDBProxiesCommand, DescribeDBProxyEndpointsCommand, DescribeDBProxyTargetGroupsCommand, DescribeDBProxyTargetsCommand, DescribeDBSubnetGroupsCommand, ListTagsForResourceCommand as ListTagsForResourceCommand$8, ModifyDBClusterCommand, ModifyDBInstanceCommand, ModifyDBProxyCommand, ModifyDBProxyEndpointCommand, ModifyDBProxyTargetGroupCommand, ModifyDBSubnetGroupCommand, RDSClient, RegisterDBProxyTargetsCommand, RemoveTagsFromResourceCommand as RemoveTagsFromResourceCommand$1 } from "@aws-sdk/client-rds";
 import { Command, Option } from "commander";
 import { writeFileSync as writeFileSync$1 } from "fs";
 import { join as join$1 } from "path";
@@ -18557,7 +18557,7 @@ var RDSProvider = class {
 //#endregion
 //#region src/provisioning/providers/rds-dbproxy-provider.ts
 const POLL_INTERVAL_MS$1 = 5e3;
-const POLL_TIMEOUT_MS$1 = 900 * 1e3;
+const POLL_TIMEOUT_MS$1 = 1800 * 1e3;
 /**
 * AWS RDS DBProxy Provider
 *
@@ -18702,8 +18702,8 @@ var RDSDBProxyProvider = class {
 				throw this.wrapError(error, "UPDATE", resourceType, logicalId, physicalId);
 			}
 		}
-		await this.applyTagDiff(physicalId, previousProperties["Tags"], properties["Tags"], resourceType, logicalId);
 		this.invalidateAttributeCache(physicalId);
+		await this.applyTagDiff(physicalId, previousProperties["Tags"], properties["Tags"], resourceType, logicalId);
 		return {
 			physicalId,
 			wasReplaced: false
@@ -18825,6 +18825,9 @@ var RDSDBProxyProvider = class {
 		return result;
 	}
 	async applyTagDiff(physicalId, oldTags, newTags, resourceType, logicalId) {
+		const oldMap = this.toTagMap(oldTags);
+		const newMap = this.toTagMap(newTags);
+		if (oldMap.size === newMap.size && [...oldMap.keys()].every((k) => newMap.has(k)) && [...oldMap.entries()].every(([k, v]) => newMap.get(k) === v)) return;
 		const client = this.getClient();
 		const arnCacheKey = `${physicalId}:DBProxyArn`;
 		let arn = this.attributeCache.get(arnCacheKey);
@@ -18836,8 +18839,6 @@ var RDSDBProxyProvider = class {
 			return;
 		}
 		if (!arn) return;
-		const oldMap = this.toTagMap(oldTags);
-		const newMap = this.toTagMap(newTags);
 		const toRemove = [];
 		const toAdd = [];
 		for (const k of oldMap.keys()) if (!newMap.has(k)) toRemove.push(k);
@@ -18911,7 +18912,7 @@ var RDSDBProxyProvider = class {
 //#endregion
 //#region src/provisioning/providers/rds-dbproxy-endpoint-provider.ts
 const POLL_INTERVAL_MS = 5e3;
-const POLL_TIMEOUT_MS = 900 * 1e3;
+const POLL_TIMEOUT_MS = 1800 * 1e3;
 /**
 * AWS RDS DBProxyEndpoint Provider
 *
@@ -18993,11 +18994,9 @@ var RDSDBProxyEndpointProvider = class {
 		let status;
 		while (Date.now() < deadline) {
 			try {
-				const ep = (await client.send(new DescribeDBProxyEndpointsCommand({
-					DBProxyName: dbProxyName,
-					DBProxyEndpointName: dbProxyEndpointName
-				}))).DBProxyEndpoints?.[0];
+				const ep = (await client.send(new DescribeDBProxyEndpointsCommand({ DBProxyEndpointName: dbProxyEndpointName }))).DBProxyEndpoints?.[0];
 				status = ep?.Status;
+				this.logger.debug(`DBProxyEndpoint ${dbProxyEndpointName} poll: status=${status ?? "not-yet-visible"}`);
 				if (status === "available") {
 					endpoint = ep?.Endpoint;
 					arn = ep?.DBProxyEndpointArn;
@@ -19044,8 +19043,8 @@ var RDSDBProxyEndpointProvider = class {
 				throw this.wrapError(error, "UPDATE", resourceType, logicalId, physicalId);
 			}
 		}
-		await this.applyTagDiff(physicalId, previousProperties["Tags"], properties["Tags"], resourceType, logicalId);
 		this.invalidateAttributeCache(physicalId);
+		await this.applyTagDiff(physicalId, previousProperties["Tags"], properties["Tags"], resourceType, logicalId);
 		return {
 			physicalId,
 			wasReplaced: false
@@ -19473,6 +19472,66 @@ var RDSDBProxyTargetGroupProvider = class {
 		};
 		return null;
 	}
+	/**
+	* Read the AWS-current configuration as CFn property shape. Used by
+	* `cdkd drift` for the SDK-provider path (without it the comparator
+	* falls back to CC API, which is broken on this type — Issue #385 the
+	* SDK provider was added to fix in the first place).
+	*
+	* Maps:
+	* - `DescribeDBProxyTargetGroups` → `ConnectionPoolConfigurationInfo`
+	*   (the connection pool config CFn template carries).
+	* - `DescribeDBProxyTargets` → `DBClusterIdentifiers` /
+	*   `DBInstanceIdentifiers` reverse-mapped from the AWS-side target
+	*   list via `Type` discriminator. The full target list also carries
+	*   per-target Endpoint / Port / TargetHealth but those are read-only
+	*   AWS-managed fields, intentionally not surfaced.
+	*
+	* Best-effort: a missing parent DBProxyName (state corruption) or any
+	* AWS API failure surfaces as `undefined` (drift comparator skips the
+	* resource), not a crash.
+	*/
+	async readCurrentState(_physicalId, _logicalId, _resourceType, properties) {
+		const dbProxyName = properties["DBProxyName"];
+		const targetGroupName = properties["TargetGroupName"] ?? "default";
+		if (!dbProxyName) return;
+		const client = this.getClient();
+		let connectionPoolConfig;
+		try {
+			connectionPoolConfig = ((await client.send(new DescribeDBProxyTargetGroupsCommand({
+				DBProxyName: dbProxyName,
+				TargetGroupName: targetGroupName
+			}))).TargetGroups?.[0])?.ConnectionPoolConfig;
+		} catch (error) {
+			if (error instanceof DBProxyNotFoundFault || error instanceof DBProxyTargetGroupNotFoundFault) return;
+			throw error;
+		}
+		const dbClusterIdentifiers = [];
+		const dbInstanceIdentifiers = [];
+		try {
+			const targetsResp = await client.send(new DescribeDBProxyTargetsCommand({
+				DBProxyName: dbProxyName,
+				TargetGroupName: targetGroupName
+			}));
+			for (const target of targetsResp.Targets ?? []) {
+				const id = target.RdsResourceId;
+				if (!id) continue;
+				if (target.Type === "TRACKED_CLUSTER") dbClusterIdentifiers.push(id);
+				else if (target.Type === "RDS_INSTANCE") dbInstanceIdentifiers.push(id);
+			}
+		} catch (error) {
+			if (error instanceof DBProxyNotFoundFault || error instanceof DBProxyTargetGroupNotFoundFault || error instanceof DBProxyTargetNotFoundFault) return;
+			throw error;
+		}
+		const result = {
+			DBProxyName: dbProxyName,
+			TargetGroupName: targetGroupName,
+			DBClusterIdentifiers: dbClusterIdentifiers,
+			DBInstanceIdentifiers: dbInstanceIdentifiers
+		};
+		if (connectionPoolConfig !== void 0) result["ConnectionPoolConfigurationInfo"] = connectionPoolConfig;
+		return result;
+	}
 	wrapError(error, op, resourceType, logicalId, physicalId) {
 		const message = error instanceof Error ? error.message : String(error);
 		const cause = error instanceof Error ? error : void 0;
@@ -45187,7 +45246,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.109.0");
+	program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.110.0");
 	program.addCommand(createBootstrapCommand());
 	program.addCommand(createSynthCommand());
 	program.addCommand(createListCommand());