@go-to-k/cdkd 0.281.6 → 0.281.7

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
-import { $ as requireConfigArray, $t as expectedOwnerParam, A as green, An as withErrorHandling, At as getDockerCmd, B as slowCcOperationTimeoutMs, Bt as resolveAutoAssetStorage, C as MULTI_REGION_RECREATE_BLOCKED_TYPES, Cn as StackHasActiveImportsError, Ct as ensureAssetStorage, D as bold, Dt as validateContainerRepoName, E as formatResourceLine, Et as validateAssetBucketName, F as clearOnUpdateRemoval, Ft as Synthesizer, G as refStateLookupFromResource, Gt as resolveUseCdkBootstrapAssets, H as isTerminationProtectionPropagationError, Ht as resolveSkipPrefix, I as ProviderRegistry, It as synthesisStatusMessage, J as resolveExplicitPhysicalId, Jt as CFN_TEMPLATE_BODY_LIMIT, K as WAFv2WebACLProvider, Kt as stateBucketExistenceConfirmed, L as findActionableSilentDrops, Lt as getDefaultStateBucketName, M as yellow, Mt as runDockerStreaming, N as IAMRoleProvider, Nt as AssetManifestLoader, O as cyan, Ot as buildDockerImage, P as collectInlinePolicyNamesManagedBySiblings, Pt as getDockerImageBySourceHash, Q as replayWarn, Qt as uploadCfnTemplate, R as findSilentDropProperties, Rt as getLegacyStateBucketName, S as extractDeploymentEventError, Sn as ResourceUpdateNotSupportedError, St as BOOTSTRAP_MARKER_PREFIX, T as renderStatefulReason, Tt as parseBootstrapMarker, U as IntrinsicFunctionResolver, Ut as resolveStateBucketWithDefault, V as disableInstanceApiTermination, Vt as resolveCaptureObservedState, W as cfnRefValueFromPhysicalId, Wt as resolveStateBucketWithDefaultAndSource, X as configStringRefusal, Xt as MIGRATE_TMP_PREFIX, Y as assertRegionMatch, Yt as CFN_TEMPLATE_URL_LIMIT, Z as readConfigString, Zt as findLargeInlineResources, _ as createPreDeleteFinalSnapshot, _n as MissingCdkCliError, _t as buildAssetRedirectMap, a as DeploymentEventsStore, an as getAwsClients, at as withRetry, b as unsupportedFinalSnapshotError, bn as ProvisioningError, bt as rewriteTemplateAssetReferences, c as replayFailedOperations, ct as DagBuilder, d as IMPLICIT_DELETE_DEPENDENCIES, dt as S3StateBackend, en as AssemblyReader, et as requireConfigObject, f as computeImplicitDeleteEdges, fn as DeployCancelledError, ft as rebuildClientForBucketRegion, g as ccRoutedFinalSnapshotError, gt as WorkGraph, h as buildFinalSnapshotIdentifier, hn as LocalStartServiceError, ht as stringifyValue, i as DeploymentEventsReader, in as AwsClients, it as describeTypeWithThrottleRetry, j as red, jt as runDockerForeground, k as gray, kn as normalizeAwsError, kt as formatDockerLoginError, l as replayRollback, ln as CdkdError, lt as TemplateParser, m as PRE_DELETE_SNAPSHOT_TYPES, mn as LocalMigrateError, mt as AssetPublisher, n as DEFAULT_RESOURCE_WARN_AFTER_MS, nt as applyRoleArnIfSet, o as planFailedOps, on as resetAwsClients, ot as isRetryableTransientError, p as ATOMIC_FINAL_SNAPSHOT_TYPES, pn as LocalInvokeBuildError$1, pt as shouldRetainResource, q as normalizeAwsTagsToCfn, qt as warnDeprecatedNoPrefixCliFlag, r as DeployEngine, rn as resolveBucketRegion, rt as DiffCalculator, s as planRollback, sn as setAwsClients, st as isThrottlingError, t as DEFAULT_RESOURCE_TIMEOUT_MS, tn as processStackMessages, tt as requireConfigString, u as withResourceDeadline, ut as LockManager, v as isFinalSnapshotError, vn as NestedStackChildDirectDestroyError, vt as createAssetRedirectResolver, w as isStatefulRecreateTargetSync, wn as StackTerminationProtectionError, wt as getBootstrapMarkerKey, x as makeCanonicalizePropertiesFn, xn as ResourceTimeoutError, xt as AssetModeResolver, y as refusesFinalSnapshot, yn as PartialFailureError, yt as loadPublishableAssetManifest, z as CloudControlProvider, zt as resolveApp } from "./deploy-engine-BadwP9FL.js";
+import { $ as requireConfigArray, $t as expectedOwnerParam, A as green, An as withErrorHandling, At as getDockerCmd, B as slowCcOperationTimeoutMs, Bt as resolveAutoAssetStorage, C as MULTI_REGION_RECREATE_BLOCKED_TYPES, Cn as StackHasActiveImportsError, Ct as ensureAssetStorage, D as bold, Dt as validateContainerRepoName, E as formatResourceLine, Et as validateAssetBucketName, F as clearOnUpdateRemoval, Ft as Synthesizer, G as refStateLookupFromResource, Gt as resolveUseCdkBootstrapAssets, H as isTerminationProtectionPropagationError, Ht as resolveSkipPrefix, I as ProviderRegistry, It as synthesisStatusMessage, J as resolveExplicitPhysicalId, Jt as CFN_TEMPLATE_BODY_LIMIT, K as WAFv2WebACLProvider, Kt as stateBucketExistenceConfirmed, L as findActionableSilentDrops, Lt as getDefaultStateBucketName, M as yellow, Mt as runDockerStreaming, N as IAMRoleProvider, Nt as AssetManifestLoader, O as cyan, Ot as buildDockerImage, P as collectInlinePolicyNamesManagedBySiblings, Pt as getDockerImageBySourceHash, Q as replayWarn, Qt as uploadCfnTemplate, R as findSilentDropProperties, Rt as getLegacyStateBucketName, S as extractDeploymentEventError, Sn as ResourceUpdateNotSupportedError, St as BOOTSTRAP_MARKER_PREFIX, T as renderStatefulReason, Tt as parseBootstrapMarker, U as IntrinsicFunctionResolver, Ut as resolveStateBucketWithDefault, V as disableInstanceApiTermination, Vt as resolveCaptureObservedState, W as cfnRefValueFromPhysicalId, Wt as resolveStateBucketWithDefaultAndSource, X as configStringRefusal, Xt as MIGRATE_TMP_PREFIX, Y as assertRegionMatch, Yt as CFN_TEMPLATE_URL_LIMIT, Z as readConfigString, Zt as findLargeInlineResources, _ as createPreDeleteFinalSnapshot, _n as MissingCdkCliError, _t as buildAssetRedirectMap, a as DeploymentEventsStore, an as getAwsClients, at as withRetry, b as unsupportedFinalSnapshotError, bn as ProvisioningError, bt as rewriteTemplateAssetReferences, c as replayFailedOperations, ct as DagBuilder, d as IMPLICIT_DELETE_DEPENDENCIES, dt as S3StateBackend, en as AssemblyReader, et as requireConfigObject, f as computeImplicitDeleteEdges, fn as DeployCancelledError, ft as rebuildClientForBucketRegion, g as ccRoutedFinalSnapshotError, gt as WorkGraph, h as buildFinalSnapshotIdentifier, hn as LocalStartServiceError, ht as stringifyValue, i as DeploymentEventsReader, in as AwsClients, it as describeTypeWithThrottleRetry, j as red, jt as runDockerForeground, k as gray, kn as normalizeAwsError, kt as formatDockerLoginError, l as replayRollback, ln as CdkdError, lt as TemplateParser, m as PRE_DELETE_SNAPSHOT_TYPES, mn as LocalMigrateError, mt as AssetPublisher, n as DEFAULT_RESOURCE_WARN_AFTER_MS, nt as applyRoleArnIfSet, o as planFailedOps, on as resetAwsClients, ot as isRetryableTransientError, p as ATOMIC_FINAL_SNAPSHOT_TYPES, pn as LocalInvokeBuildError$1, pt as shouldRetainResource, q as normalizeAwsTagsToCfn, qt as warnDeprecatedNoPrefixCliFlag, r as DeployEngine, rn as resolveBucketRegion, rt as DiffCalculator, s as planRollback, sn as setAwsClients, st as isThrottlingError, t as DEFAULT_RESOURCE_TIMEOUT_MS, tn as processStackMessages, tt as requireConfigString, u as withResourceDeadline, ut as LockManager, v as isFinalSnapshotError, vn as NestedStackChildDirectDestroyError, vt as createAssetRedirectResolver, w as isStatefulRecreateTargetSync, wn as StackTerminationProtectionError, wt as getBootstrapMarkerKey, x as makeCanonicalizePropertiesFn, xn as ResourceTimeoutError, xt as AssetModeResolver, y as refusesFinalSnapshot, yn as PartialFailureError, yt as loadPublishableAssetManifest, z as CloudControlProvider, zt as resolveApp } from "./deploy-engine-B8Qo1vPU.js";
 import { a as getLiveRenderer, c as PATTERN_B_RESOURCE_TYPES, d as generateResourceNameWithFallback, h as withStackName, i as runStackBuffered, m as withSkipPrefix, n as getLogger, o as PATTERN_B_NAME_OPTIONS, s as PATTERN_B_NAME_PROPERTIES, u as generateResourceName } from "./logger-zRrlbaQt.js";
-import { t as ASGProvider } from "./asg-provider-bIEhcjVs.js";
+import { t as ASGProvider } from "./asg-provider-Lj_P_wtb.js";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { createHash, randomBytes, randomUUID } from "node:crypto";
 import { CopyObjectCommand, CreateBucketCommand, DeleteBucketAnalyticsConfigurationCommand, DeleteBucketCommand, DeleteBucketCorsCommand, DeleteBucketEncryptionCommand, DeleteBucketIntelligentTieringConfigurationCommand, DeleteBucketInventoryConfigurationCommand, DeleteBucketLifecycleCommand, DeleteBucketMetricsConfigurationCommand, DeleteBucketOwnershipControlsCommand, DeleteBucketPolicyCommand, DeleteBucketReplicationCommand, DeleteBucketTaggingCommand, DeleteBucketWebsiteCommand, DeleteObjectsCommand, GetBucketAccelerateConfigurationCommand, GetBucketCorsCommand, GetBucketEncryptionCommand, GetBucketLifecycleConfigurationCommand, GetBucketLocationCommand, GetBucketLoggingCommand, GetBucketNotificationConfigurationCommand, GetBucketOwnershipControlsCommand, 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";
@@ -57068,14 +57068,49 @@ const COMPOSITE_ID_SPLITTERS = {
 			propertiesOverlay: { RestApiId: restApiId }
 		};
 	},
-	"AWS::EC2::VPCGatewayAttachment": (id) => {
-		const parts = id.split("|");
-		if (parts.length !== 2) throw new Error(`expected 2 parts (IGW|VpcId), got ${parts.length}: '${id}'`);
-		return { resourceIdentifier: {
-			VpcId: parts[1],
-			InternetGatewayId: parts[0]
-		} };
+	"AWS::EC2::VPCGatewayAttachment": (physicalId, properties) => {
+		const parts = physicalId.split("|");
+		if (parts.length !== 2) throw new Error(`expected 2 parts ('<gatewayId>|<vpcId>' or '<AttachmentType>|<vpcId>'), got ${parts.length}: '${physicalId}'`);
+		const [first, vpcId] = parts;
+		if (!first || !vpcId) throw new Error(`empty part in composite physical id: '${physicalId}'`);
+		return {
+			resourceIdentifier: {
+				AttachmentType: resolveGatewayAttachmentType(first, properties),
+				VpcId: vpcId
+			},
+			propertiesOverlay: { VpcId: vpcId }
+		};
 	},
+	"AWS::ApiGateway::Deployment": restApiChildSplitter({
+		resourceType: "AWS::ApiGateway::Deployment",
+		childField: "DeploymentId",
+		childFirstInCompositeId: true,
+		narrowOverlayToRestApiId: true
+	}),
+	"AWS::ApiGateway::Stage": restApiChildSplitter({
+		resourceType: "AWS::ApiGateway::Stage",
+		childField: "StageName",
+		childFirstInCompositeId: false,
+		narrowOverlayToRestApiId: false
+	}),
+	"AWS::ApiGateway::Authorizer": restApiChildSplitter({
+		resourceType: "AWS::ApiGateway::Authorizer",
+		childField: "AuthorizerId",
+		childFirstInCompositeId: false,
+		narrowOverlayToRestApiId: true
+	}),
+	"AWS::ApiGateway::Model": restApiChildSplitter({
+		resourceType: "AWS::ApiGateway::Model",
+		childField: "Name",
+		childFirstInCompositeId: false,
+		narrowOverlayToRestApiId: false
+	}),
+	"AWS::ApiGateway::RequestValidator": restApiChildSplitter({
+		resourceType: "AWS::ApiGateway::RequestValidator",
+		childField: "RequestValidatorId",
+		childFirstInCompositeId: false,
+		narrowOverlayToRestApiId: true
+	}),
 	"AWS::ApiGatewayV2::Integration": (physicalId, properties) => {
 		const apiId = readStringProperty(properties, "ApiId", "AWS::ApiGatewayV2::Integration");
 		return {
@@ -57107,6 +57142,74 @@ const COMPOSITE_ID_SPLITTERS = {
 		};
 	}
 };
+/**
+* The two values CFn's `AWS::EC2::VPCGatewayAttachment.AttachmentType` takes.
+* The field is `readOnlyProperties`, so cdkd never sends it — it only has to
+* be reproduced for the IMPORT identifier map.
+*/
+const GATEWAY_ATTACHMENT_TYPES = ["InternetGateway", "VPN"];
+/**
+* Resolve `AttachmentType` for an `AWS::EC2::VPCGatewayAttachment` from the
+* first segment of cdkd's composite physicalId plus the recorded properties.
+*
+* The Cloud-Control-written shape already carries the attachment type verbatim
+* (it is the CFn primaryIdentifier's first field). The SDK-written shape
+* carries the gateway id instead, so the type is derived from WHICH gateway
+* property cdkd recorded — never hardcoded to `InternetGateway`, which would
+* ship a wrong identifier for a VPN attachment and make CFn's identifier-match
+* reject the import.
+*/
+function resolveGatewayAttachmentType(firstSegment, properties) {
+	if (GATEWAY_ATTACHMENT_TYPES.includes(firstSegment)) return firstSegment;
+	if (typeof properties["InternetGatewayId"] === "string" && properties["InternetGatewayId"]) return "InternetGateway";
+	if (typeof properties["VpnGatewayId"] === "string" && properties["VpnGatewayId"]) return "VPN";
+	if (firstSegment.startsWith("igw-")) return "InternetGateway";
+	if (firstSegment.startsWith("vgw-")) return "VPN";
+	throw new Error(`cannot determine AttachmentType for AWS::EC2::VPCGatewayAttachment: cdkd state's properties carry neither 'InternetGatewayId' nor 'VpnGatewayId', and the physical id segment '${firstSegment}' is not a recognized gateway id. State entry may be corrupt or written by an older cdkd binary; re-deploy the resource to refresh state.`);
+}
+/**
+* Build a splitter for an `AWS::ApiGateway::*` child type whose CFn primary
+* identifier is the parent `RestApiId` plus one child field.
+*
+* Two stored shapes are accepted, because both exist in state in the wild:
+* the SDK providers store the BARE child value and read the parent from the
+* recorded properties, while a type routed through Cloud Control by the #614
+* silent-drop rule stores CC's `|`-joined composite — in CFn
+* primaryIdentifier order, which is why `childFirstInCompositeId` exists
+* (`AWS::ApiGateway::Deployment` declares `[DeploymentId, RestApiId]`, every
+* other member of the family declares `RestApiId` first).
+*
+* `narrowOverlayToRestApiId` is set for the types whose child field is
+* `readOnlyProperties` — writing one into the synth template's `Properties`
+* is rejected by CFn at changeset-create.
+*/
+function restApiChildSplitter(options) {
+	const { resourceType, childField, childFirstInCompositeId, narrowOverlayToRestApiId } = options;
+	const compositeShape = childFirstInCompositeId ? `<${childField}>|<restApiId>` : `<restApiId>|<${childField}>`;
+	return (physicalId, properties) => {
+		if (!physicalId.trim()) throw new Error(`empty physical id for ${resourceType} (expected a ${childField})`);
+		const parts = physicalId.split("|");
+		if (parts.length > 2) throw new Error(`expected a bare ${childField} or '${compositeShape}', got ${parts.length} parts: '${physicalId}'`);
+		let restApiId;
+		let childValue;
+		if (parts.length === 2) {
+			const [a, b] = parts;
+			if (!a || !b) throw new Error(`empty part in '${compositeShape}': '${physicalId}'`);
+			[restApiId, childValue] = childFirstInCompositeId ? [b, a] : [a, b];
+		} else {
+			restApiId = readStringProperty(properties, "RestApiId", resourceType);
+			childValue = physicalId;
+		}
+		const resourceIdentifier = {
+			RestApiId: restApiId,
+			[childField]: childValue
+		};
+		return narrowOverlayToRestApiId ? {
+			resourceIdentifier,
+			propertiesOverlay: { RestApiId: restApiId }
+		} : { resourceIdentifier };
+	};
+}
 function readStringProperty(properties, key, resourceType) {
 	const v = properties[key];
 	if (typeof v !== "string" || !v) throw new Error(`cdkd state's properties for ${resourceType} is missing '${key}' (the parent identifier required to build the CFn ResourceIdentifier map). State entry may be corrupt or written by an older cdkd binary; re-deploy the resource to refresh state.`);
@@ -73104,7 +73207,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.281.6");
+	program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.281.7");
 	program.hook("preAction", (_thisCommand, actionCommand) => {
 		const { profile } = actionCommand.optsWithGlobals();
 		if (profile !== void 0) process.env["AWS_PROFILE"] = profile;