@go-to-k/cdkd 0.141.0 → 0.142.0

package/dist/cli.js

@@ -27395,6 +27395,16 @@ var EFSProvider = class {
 //#endregion
 //#region src/provisioning/providers/firehose-provider.ts
 /**
+* CFn destination property names that this provider can apply
+* in-place via UpdateDestinationCommand. Other destination types
+* still hard-reject in update() with a tightened error pointing at
+* the per-shape reverse-mapper follow-up issue (#549).
+*
+* Membership grows as each follow-up PR lands. Keep alphabetical
+* to minimize merge conflicts when multiple follow-ups race.
+*/
+const SUPPORTED_UPDATE_DESTINATIONS = new Set(["ExtendedS3DestinationConfiguration", "RedshiftDestinationConfiguration"]);
+/**
 * SDK Provider for AWS Kinesis Firehose resources
 *
 * Supports:
@@ -27586,16 +27596,29 @@ var FirehoseProvider = class {
 	*     `DescribeDeliveryStream` call, then applies the diff. Only fires
 	*     when the destination shape actually differs.
 	*
+	*   - `RedshiftDestinationConfiguration` (#549) — same flow as
+	*     ExtendedS3: `DescribeDeliveryStream` recovers VersionId +
+	*     DestinationId, then `UpdateDestinationCommand` issues the
+	*     diff with a `RedshiftDestinationUpdate` payload produced by
+	*     {@link mapRedshiftConfigToUpdate}. Handles `CopyCommand`,
+	*     `RetryOptions`, `S3Configuration` → `S3Update`,
+	*     `S3BackupConfiguration` → `S3BackupUpdate`,
+	*     `ProcessingConfiguration`, `S3BackupMode`,
+	*     `CloudWatchLoggingOptions`, `Username` / `Password` /
+	*     `RoleARN` / `ClusterJDBCURL`.
+	*
 	* Other destination types (`S3DestinationConfiguration`,
-	* `HttpEndpointDestinationConfiguration`, `RedshiftDestinationConfiguration`,
+	* `HttpEndpointDestinationConfiguration`,
 	* `ElasticsearchDestinationConfiguration`,
 	* `AmazonopensearchserviceDestinationConfiguration`,
 	* `SplunkDestinationConfiguration`,
-	* `AmazonOpenSearchServerlessDestinationConfiguration`) stay rejected
-	* with a tightened error message naming the AWS API. Each one is a
-	* follow-up to (#477) — AWS provides `UpdateDestination` for them too,
-	* but the per-shape reverse-mappers are deep and each warrants its own
-	* focused PR. Re-deploy with `cdkd deploy --replace` until they land.
+	* `AmazonOpenSearchServerlessDestinationConfiguration`,
+	* `IcebergDestinationConfiguration`,
+	* `SnowflakeDestinationConfiguration`) stay rejected with a tightened
+	* error message naming the AWS API. Each one is a follow-up to (#549)
+	* — AWS provides `UpdateDestination` for them too, but the per-shape
+	* reverse-mappers are deep and each warrants its own focused PR.
+	* Re-deploy with `cdkd deploy --replace` until they land.
 	*
 	* Destination-type SWITCHES (e.g. ExtendedS3 → Redshift) are immutable
 	* on AWS; cdkd surfaces `ResourceUpdateNotSupportedError` so the caller
@@ -27607,10 +27630,10 @@ var FirehoseProvider = class {
 		const prevDestKey = this.findDestinationKey(previousProperties);
 		if (destKey && prevDestKey && destKey !== prevDestKey) throw new ResourceUpdateNotSupportedError(resourceType, logicalId, `Switching Firehose destination type from '${prevDestKey}' to '${destKey}' is not supported in-place — AWS UpdateDestination requires the same destination type as the original CreateDeliveryStream. Re-deploy with cdkd deploy --replace.`);
 		const activeDest = destKey ?? prevDestKey;
-		if (activeDest && activeDest !== "ExtendedS3DestinationConfiguration") {
+		if (activeDest && !SUPPORTED_UPDATE_DESTINATIONS.has(activeDest)) {
 			const nextDest = properties[activeDest] ?? {};
 			const prevDest = previousProperties[activeDest] ?? {};
-			if (JSON.stringify(nextDest) !== JSON.stringify(prevDest)) throw new ResourceUpdateNotSupportedError(resourceType, logicalId, `In-place update for '${activeDest}' on AWS::KinesisFirehose::DeliveryStream is not yet implemented in cdkd (AWS exposes UpdateDestination for it; the per-shape reverse-mapper is a follow-up to #477). Re-deploy with cdkd deploy --replace.`);
+			if (JSON.stringify(nextDest) !== JSON.stringify(prevDest)) throw new ResourceUpdateNotSupportedError(resourceType, logicalId, `In-place update for '${activeDest}' on AWS::KinesisFirehose::DeliveryStream is not yet implemented in cdkd (AWS exposes UpdateDestination for it; the per-shape reverse-mapper is a follow-up to #549). Re-deploy with cdkd deploy --replace.`);
 		}
 		await this.applyTagsDiff(physicalId, properties["Tags"], previousProperties["Tags"]);
 		if (activeDest === "ExtendedS3DestinationConfiguration") {
@@ -27618,6 +27641,11 @@ var FirehoseProvider = class {
 			const prevDest = previousProperties[activeDest] ?? {};
 			if (JSON.stringify(nextDest) !== JSON.stringify(prevDest)) await this.applyExtendedS3DestinationUpdate(physicalId, nextDest);
 		}
+		if (activeDest === "RedshiftDestinationConfiguration") {
+			const nextDest = properties[activeDest] ?? {};
+			const prevDest = previousProperties[activeDest] ?? {};
+			if (JSON.stringify(nextDest) !== JSON.stringify(prevDest)) await this.applyRedshiftDestinationUpdate(physicalId, nextDest);
+		}
 		const desc = (await this.getClient().send(new DescribeDeliveryStreamCommand({ DeliveryStreamName: physicalId }))).DeliveryStreamDescription;
 		return {
 			physicalId,
@@ -27811,6 +27839,54 @@ var FirehoseProvider = class {
 		return result;
 	}
 	/**
+	* Recover `CurrentDeliveryStreamVersionId` + `DestinationId` from
+	* `DescribeDeliveryStream` and issue `UpdateDestination` with the new
+	* Redshift shape. The reverse-mapper at
+	* {@link mapRedshiftConfigToUpdate} produces the
+	* `RedshiftDestinationUpdate` payload — only fields present in the
+	* input are forwarded so omitted CFn keys don't clobber AWS-side
+	* state. Mirrors {@link applyExtendedS3DestinationUpdate} (#549).
+	*/
+	async applyRedshiftDestinationUpdate(physicalId, nextConfig) {
+		const desc = (await this.getClient().send(new DescribeDeliveryStreamCommand({ DeliveryStreamName: physicalId }))).DeliveryStreamDescription;
+		const currentVersionId = desc?.VersionId;
+		const destinationId = (desc?.Destinations?.[0])?.DestinationId;
+		if (!currentVersionId || !destinationId) throw new ProvisioningError(`DescribeDeliveryStream for ${physicalId} did not return VersionId or DestinationId; UpdateDestination cannot proceed.`, "AWS::KinesisFirehose::DeliveryStream", physicalId);
+		await this.getClient().send(new UpdateDestinationCommand({
+			DeliveryStreamName: physicalId,
+			CurrentDeliveryStreamVersionId: currentVersionId,
+			DestinationId: destinationId,
+			RedshiftDestinationUpdate: this.mapRedshiftConfigToUpdate(nextConfig)
+		}));
+	}
+	/**
+	* Map CFn `RedshiftDestinationConfiguration` to the
+	* `RedshiftDestinationUpdate` shape used by AWS
+	* `UpdateDestinationCommand` (#549). Every field is `!== undefined`
+	* gated so omitted CFn keys do not clobber AWS-side state. The CFn
+	* `S3Configuration` field is mapped through
+	* {@link mapS3ConfigToUpdate} into the SDK-side `S3Update` slot;
+	* `S3BackupConfiguration` likewise into `S3BackupUpdate`.
+	*/
+	mapRedshiftConfigToUpdate(config) {
+		const result = {};
+		const roleArn = config["RoleArn"] ?? config["RoleARN"];
+		if (roleArn !== void 0) result.RoleARN = roleArn;
+		const clusterJdbcUrl = config["ClusterJDBCURL"] ?? config["ClusterJdbcUrl"];
+		if (clusterJdbcUrl !== void 0) result.ClusterJDBCURL = clusterJdbcUrl;
+		if (config["CopyCommand"] !== void 0) result.CopyCommand = config["CopyCommand"];
+		if (config["Username"] !== void 0) result.Username = config["Username"];
+		if (config["Password"] !== void 0) result.Password = config["Password"];
+		if (config["RetryOptions"] !== void 0) result.RetryOptions = config["RetryOptions"];
+		if (config["S3Configuration"] !== void 0) result.S3Update = this.mapS3ConfigToUpdate(config["S3Configuration"]);
+		if (config["ProcessingConfiguration"] !== void 0) result.ProcessingConfiguration = config["ProcessingConfiguration"];
+		if (config["S3BackupMode"] !== void 0) result.S3BackupMode = config["S3BackupMode"];
+		if (config["S3BackupConfiguration"] !== void 0) result.S3BackupUpdate = this.mapS3ConfigToUpdate(config["S3BackupConfiguration"]);
+		if (config["CloudWatchLoggingOptions"] !== void 0) result.CloudWatchLoggingOptions = config["CloudWatchLoggingOptions"];
+		if (config["SecretsManagerConfiguration"] !== void 0) result.SecretsManagerConfiguration = config["SecretsManagerConfiguration"];
+		return result;
+	}
+	/**
 	* Map CFn `S3DestinationConfiguration` to the `S3DestinationUpdate`
 	* shape used by AWS `UpdateDestinationCommand` (#477; consumed by
 	* {@link mapExtendedS3ConfigToUpdate} for the `S3BackupUpdate` field).
@@ -30170,7 +30246,7 @@ var ECRProvider = class {
 *
 * Each helper is a no-op when the before/after JSON is identical.
 */
-var ASGProvider = class {
+var ASGProvider = class ASGProvider {
 	asgClient;
 	providerRegion = process.env["AWS_REGION"];
 	logger = getLogger().child("ASGProvider");
@@ -30459,7 +30535,11 @@ var ASGProvider = class {
 		result["Tags"] = normalizeAwsTagsToCfn(group.Tags);
 		result["MetricsCollection"] = mapEnabledMetricsToCfn(group.EnabledMetrics);
 		result["LifecycleHookSpecificationList"] = mapLifecycleHooksToCfn(lifecycleHooks);
-		result["TrafficSources"] = mapTrafficSourcesToCfn(trafficSources);
+		result["TrafficSources"] = mapTrafficSourcesToCfn(trafficSources.filter((t) => {
+			if (t.Identifier === void 0) return false;
+			if (t.Type === "elbv2" || t.Type === "elb") return false;
+			return true;
+		}));
 		result["NotificationConfigurations"] = mapNotificationsToCfn(notifications);
 		return result;
 	}
@@ -30468,7 +30548,7 @@ var ASGProvider = class {
 		if (!lt) return void 0;
 		const out = {};
 		if (lt.LaunchTemplateId !== void 0) out.LaunchTemplateId = lt.LaunchTemplateId;
-		if (lt.LaunchTemplateName !== void 0) out.LaunchTemplateName = lt.LaunchTemplateName;
+		else if (lt.LaunchTemplateName !== void 0) out.LaunchTemplateName = lt.LaunchTemplateName;
 		if (lt.Version !== void 0) out.Version = String(lt.Version);
 		if (out.LaunchTemplateId === void 0 && out.LaunchTemplateName === void 0) return;
 		return out;
@@ -30630,6 +30710,27 @@ var ASGProvider = class {
 			AutoScalingGroupName: physicalId,
 			TargetGroupARNs: toAttach
 		}));
+		if (toDetach.length > 0 || toAttach.length > 0) await this.waitForTargetGroupArnsConvergence(physicalId, new Set(nextArns));
+	}
+	static TG_CONVERGENCE_TIMEOUT_MS = 3e4;
+	static TG_CONVERGENCE_POLL_INTERVAL_MS = 1e3;
+	async waitForTargetGroupArnsConvergence(physicalId, expected) {
+		const deadlineMs = Date.now() + ASGProvider.TG_CONVERGENCE_TIMEOUT_MS;
+		let lastObserved = /* @__PURE__ */ new Set();
+		while (Date.now() < deadlineMs) {
+			let resp;
+			try {
+				resp = await this.getClient().send(new DescribeAutoScalingGroupsCommand({ AutoScalingGroupNames: [physicalId] }));
+			} catch (err) {
+				this.logger.debug(`applyTargetGroupArnsDiff convergence poll: transient error, retrying — ${err instanceof Error ? err.message : String(err)}`);
+				await new Promise((r) => setTimeout(r, ASGProvider.TG_CONVERGENCE_POLL_INTERVAL_MS));
+				continue;
+			}
+			lastObserved = new Set(resp.AutoScalingGroups?.[0]?.TargetGroupARNs ?? []);
+			if (lastObserved.size === expected.size && [...expected].every((a) => lastObserved.has(a))) return;
+			await new Promise((r) => setTimeout(r, ASGProvider.TG_CONVERGENCE_POLL_INTERVAL_MS));
+		}
+		this.logger.warn(`applyTargetGroupArnsDiff: TG set did not converge within ${ASGProvider.TG_CONVERGENCE_TIMEOUT_MS}ms for ASG ${physicalId}. expected=${JSON.stringify([...expected])} observed=${JSON.stringify([...lastObserved])}`);
 	}
 	async applyMetricsCollectionDiff(physicalId, next, prev) {
 		if (JSON.stringify(next ?? []) === JSON.stringify(prev ?? [])) return;
@@ -55134,7 +55235,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.141.0");
+	program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.142.0");
 	program.addCommand(createBootstrapCommand());
 	program.addCommand(createSynthCommand());
 	program.addCommand(createListCommand());