@go-to-k/cdkd 0.268.4 → 0.269.0

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
-import { $ as WorkGraph, A as slowCcOperationTimeoutMs, At as warnDeprecatedNoPrefixCliFlag, B as applyRoleArnIfSet, Bt as resolveBucketRegion, C as yellow, Ct as resolveAutoAssetStorage, D as ProviderRegistry, Dt as resolveStateBucketWithDefaultAndSource, E as clearOnUpdateRemoval, Et as resolveStateBucketWithDefault, F as refStateLookupFromResource, Ft as uploadCfnTemplate, G as DagBuilder, H as describeTypeWithThrottleRetry, Ht as getAwsClients, I as WAFv2WebACLProvider, It as expectedOwnerParam, J as S3StateBackend, K as TemplateParser, Kt as CdkdError, L as normalizeAwsTagsToCfn, Lt as AssemblyReader, M as isTerminationProtectionPropagationError, Mt as CFN_TEMPLATE_URL_LIMIT, N as IntrinsicFunctionResolver, Nt as MIGRATE_TMP_PREFIX, O as findActionableSilentDrops, Ot as resolveUseCdkBootstrapAssets, P as cfnRefValueFromPhysicalId, Pt as findLargeInlineResources, Q as stringifyValue, Qt as LocalStartServiceError, R as resolveExplicitPhysicalId, Rt as processStackMessages, S as red, St as resolveApp, T as collectInlinePolicyNamesManagedBySiblings, Tt as resolveSkipPrefix, U as withRetry, Ut as resetAwsClients, V as DiffCalculator, Vt as AwsClients, W as isRetryableTransientError, Wt as setAwsClients, X as shouldRetainResource, Xt as LocalInvokeBuildError$1, Y as rebuildClientForBucketRegion, Yt as DeployCancelledError, Z as AssetPublisher, Zt as LocalMigrateError, _ as formatResourceLine, _t as getDockerImageBySourceHash, a as DeploymentEventsStore, an as ResourceUpdateNotSupportedError, at as BOOTSTRAP_MARKER_PREFIX, b as gray, bt as getDefaultStateBucketName, c as replayFailedOperations, ct as parseBootstrapMarker, d as IMPLICIT_DELETE_DEPENDENCIES, dt as buildDockerImage, en as MissingCdkCliError, et as buildAssetRedirectMap, f as computeImplicitDeleteEdges, fn as normalizeAwsError, ft as formatDockerLoginError, g as renderStatefulReason, gt as AssetManifestLoader, h as isStatefulRecreateTargetSync, ht as runDockerStreaming, i as DeploymentEventsReader, in as ResourceTimeoutError, it as AssetModeResolver, j as disableInstanceApiTermination, jt as CFN_TEMPLATE_BODY_LIMIT, k as CloudControlProvider, kt as stateBucketExistenceConfirmed, l as replayRollback, lt as validateAssetBucketName, m as MULTI_REGION_RECREATE_BLOCKED_TYPES, mt as runDockerForeground, n as DEFAULT_RESOURCE_WARN_AFTER_MS, nn as PartialFailureError, nt as loadPublishableAssetManifest, o as planFailedOps, on as StackHasActiveImportsError, ot as ensureAssetStorage, p as extractDeploymentEventError, pn as withErrorHandling, pt as getDockerCmd, q as LockManager, r as DeployEngine, rn as ProvisioningError, rt as rewriteTemplateAssetReferences, s as planRollback, sn as StackTerminationProtectionError, st as getBootstrapMarkerKey, t as DEFAULT_RESOURCE_TIMEOUT_MS, tn as NestedStackChildDirectDestroyError, tt as createAssetRedirectResolver, u as withResourceDeadline, ut as validateContainerRepoName, v as bold, vt as Synthesizer, w as IAMRoleProvider, wt as resolveCaptureObservedState, x as green, xt as getLegacyStateBucketName, y as cyan, yt as synthesisStatusMessage, z as assertRegionMatch } from "./deploy-engine--qUEKkTR.js";
+import { $ as WorkGraph, A as slowCcOperationTimeoutMs, At as warnDeprecatedNoPrefixCliFlag, B as applyRoleArnIfSet, Bt as resolveBucketRegion, C as yellow, Ct as resolveAutoAssetStorage, D as ProviderRegistry, Dt as resolveStateBucketWithDefaultAndSource, E as clearOnUpdateRemoval, Et as resolveStateBucketWithDefault, F as refStateLookupFromResource, Ft as uploadCfnTemplate, G as DagBuilder, H as describeTypeWithThrottleRetry, Ht as getAwsClients, I as WAFv2WebACLProvider, It as expectedOwnerParam, J as S3StateBackend, K as TemplateParser, Kt as CdkdError, L as normalizeAwsTagsToCfn, Lt as AssemblyReader, M as isTerminationProtectionPropagationError, Mt as CFN_TEMPLATE_URL_LIMIT, N as IntrinsicFunctionResolver, Nt as MIGRATE_TMP_PREFIX, O as findActionableSilentDrops, Ot as resolveUseCdkBootstrapAssets, P as cfnRefValueFromPhysicalId, Pt as findLargeInlineResources, Q as stringifyValue, Qt as LocalStartServiceError, R as resolveExplicitPhysicalId, Rt as processStackMessages, S as red, St as resolveApp, T as collectInlinePolicyNamesManagedBySiblings, Tt as resolveSkipPrefix, U as withRetry, Ut as resetAwsClients, V as DiffCalculator, Vt as AwsClients, W as isRetryableTransientError, Wt as setAwsClients, X as shouldRetainResource, Xt as LocalInvokeBuildError$1, Y as rebuildClientForBucketRegion, Yt as DeployCancelledError, Z as AssetPublisher, Zt as LocalMigrateError, _ as formatResourceLine, _t as getDockerImageBySourceHash, a as DeploymentEventsStore, an as ResourceUpdateNotSupportedError, at as BOOTSTRAP_MARKER_PREFIX, b as gray, bt as getDefaultStateBucketName, c as replayFailedOperations, ct as parseBootstrapMarker, d as IMPLICIT_DELETE_DEPENDENCIES, dt as buildDockerImage, en as MissingCdkCliError, et as buildAssetRedirectMap, f as computeImplicitDeleteEdges, fn as normalizeAwsError, ft as formatDockerLoginError, g as renderStatefulReason, gt as AssetManifestLoader, h as isStatefulRecreateTargetSync, ht as runDockerStreaming, i as DeploymentEventsReader, in as ResourceTimeoutError, it as AssetModeResolver, j as disableInstanceApiTermination, jt as CFN_TEMPLATE_BODY_LIMIT, k as CloudControlProvider, kt as stateBucketExistenceConfirmed, l as replayRollback, lt as validateAssetBucketName, m as MULTI_REGION_RECREATE_BLOCKED_TYPES, mt as runDockerForeground, n as DEFAULT_RESOURCE_WARN_AFTER_MS, nn as PartialFailureError, nt as loadPublishableAssetManifest, o as planFailedOps, on as StackHasActiveImportsError, ot as ensureAssetStorage, p as extractDeploymentEventError, pn as withErrorHandling, pt as getDockerCmd, q as LockManager, r as DeployEngine, rn as ProvisioningError, rt as rewriteTemplateAssetReferences, s as planRollback, sn as StackTerminationProtectionError, st as getBootstrapMarkerKey, t as DEFAULT_RESOURCE_TIMEOUT_MS, tn as NestedStackChildDirectDestroyError, tt as createAssetRedirectResolver, u as withResourceDeadline, ut as validateContainerRepoName, v as bold, vt as Synthesizer, w as IAMRoleProvider, wt as resolveCaptureObservedState, x as green, xt as getLegacyStateBucketName, y as cyan, yt as synthesisStatusMessage, z as assertRegionMatch } from "./deploy-engine-BdvgoV-R.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-iWNOeyib.js";
+import { t as ASGProvider } from "./asg-provider-ew8lVaY6.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";
@@ -14845,6 +14845,7 @@ var EC2Provider = class {
 			"BlockDeviceMappings",
 			"Tags",
 			"AvailabilityZone",
+			"NetworkInterfaces",
 			"DisableApiTermination",
 			"MetadataOptions",
 			"Monitoring",
@@ -15917,10 +15918,12 @@ var EC2Provider = class {
 			const securityGroupIds = properties["SecurityGroupIds"];
 			const securityGroups = properties["SecurityGroups"];
 			const iamInstanceProfile = this.normalizeIamInstanceProfile(properties["IamInstanceProfile"]);
+			const networkInterfaces = this.buildNetworkInterfaces(properties);
 			const instance = (await this.ec2Client.send(new RunInstancesCommand({
 				ImageId: imageId,
 				InstanceType: instanceType,
 				KeyName: properties["KeyName"] ?? void 0,
+				NetworkInterfaces: networkInterfaces,
 				SecurityGroupIds: securityGroupIds ?? void 0,
 				SecurityGroups: securityGroups ?? void 0,
 				SubnetId: properties["SubnetId"] ?? void 0,
@@ -16317,6 +16320,48 @@ var EC2Provider = class {
 		return { AvailabilityZone: az };
 	}
 	/**
+	* Map the CFn `AWS::EC2::Instance.NetworkInterfaces` list onto
+	* RunInstances' `NetworkInterfaces` input (issue #1281). Every CFn
+	* sub-field is mapped (dropping a sub-field silently would be the #1225
+	* bug class one level down): the two casing/shape divergences are
+	* `GroupSet` -> `Groups` and CFn's stringly-typed numerics
+	* (`DeviceIndex`, `Ipv6AddressCount`, `SecondaryPrivateIpAddressCount`
+	* arrive as strings from CDK) -> numbers.
+	*/
+	buildNetworkInterfaces(properties) {
+		const raw = properties["NetworkInterfaces"];
+		if (!Array.isArray(raw) || raw.length === 0) return void 0;
+		return raw.map((entry) => {
+			const ni = entry ?? {};
+			return {
+				DeviceIndex: this.coerceNumber(ni["DeviceIndex"]),
+				SubnetId: ni["SubnetId"] ?? void 0,
+				Groups: ni["GroupSet"] ?? void 0,
+				AssociatePublicIpAddress: this.coerceBool(ni["AssociatePublicIpAddress"]),
+				AssociateCarrierIpAddress: this.coerceBool(ni["AssociateCarrierIpAddress"]),
+				DeleteOnTermination: this.coerceBool(ni["DeleteOnTermination"]),
+				Description: ni["Description"] ?? void 0,
+				NetworkInterfaceId: ni["NetworkInterfaceId"] ?? void 0,
+				PrivateIpAddress: ni["PrivateIpAddress"] ?? void 0,
+				Ipv6AddressCount: this.coerceNumber(ni["Ipv6AddressCount"]),
+				Ipv6Addresses: Array.isArray(ni["Ipv6Addresses"]) ? ni["Ipv6Addresses"].map((a) => ({ Ipv6Address: a?.["Ipv6Address"] ?? void 0 })) : void 0,
+				PrivateIpAddresses: Array.isArray(ni["PrivateIpAddresses"]) ? ni["PrivateIpAddresses"].map((a) => ({
+					Primary: this.coerceBool(a?.["Primary"]),
+					PrivateIpAddress: a?.["PrivateIpAddress"] ?? void 0
+				})) : void 0,
+				SecondaryPrivateIpAddressCount: this.coerceNumber(ni["SecondaryPrivateIpAddressCount"])
+			};
+		});
+	}
+	/**
+	* CFn numerics are stringly typed on the wire ("0", not 0); RunInstances
+	* wants numbers. Tolerate both, return undefined for anything else.
+	*/
+	coerceNumber(value) {
+		if (typeof value === "number" && Number.isFinite(value)) return value;
+		if (typeof value === "string" && value.trim() !== "" && Number.isFinite(Number(value))) return Number(value);
+	}
+	/**
 	* Build the RunInstances `CreditSpecification` shape from the CFn
 	* `CreditSpecification` object. CFn uses `CPUCredits` (capital CPU, the
 	* canonical CDK `CfnInstance` emission); accept the SDK-style `CpuCredits`
@@ -16894,6 +16939,7 @@ var EC2Provider = class {
 	*/
 	getDriftUnknownPaths(resourceType) {
 		switch (resourceType) {
+			case "AWS::EC2::Instance": return ["NetworkInterfaces"];
 			case "AWS::EC2::Route":
 			case "AWS::EC2::VPCGatewayAttachment":
 			case "AWS::EC2::SubnetRouteTableAssociation":
@@ -22171,6 +22217,32 @@ function wasMeaningfullyConfigured(value, discriminatorKey) {
 	return value[discriminatorKey] !== void 0;
 }
 
+//#endregion
+//#region src/provisioning/resource-timeout-registry.ts
+let resolved;
+/**
+* Seed the registry with the validated `--resource-timeout` input. Call once
+* per CLI invocation, right after `validateResourceTimeouts`. Passing
+* `undefined` (flag not supplied) clears the registry, so consumers fall back
+* to their own compile-time floors.
+*/
+function setResolvedResourceTimeouts(opt) {
+	resolved = opt;
+}
+/**
+* The user's resolved timeout for `resourceType` in milliseconds, or
+* `undefined` when the user supplied nothing applicable. Resolution matches
+* the outer-deadline sites: per-type override wins, else the explicit global
+* value. The compile-time default (`DEFAULT_RESOURCE_TIMEOUT_MS`) is
+* deliberately NOT applied here — an inner waiter's own floor (e.g. ECS 600s)
+* must only be raised by an EXPLICIT user value, never by the generic 30m
+* default silently multiplying every `--full-wait` failure by 3x.
+*/
+function resolvedResourceTimeoutMs(resourceType) {
+	if (!resolved) return void 0;
+	return resolved.perTypeMs?.[resourceType] ?? resolved.globalMs;
+}
+
 //#endregion
 //#region src/provisioning/providers/ecs-provider.ts
 /**
@@ -22553,9 +22625,10 @@ var ECSProvider = class {
 	async settleService(logicalId, serviceRef, cluster) {
 		if (process.env["CDKD_FULL_WAIT"] === "true") {
 			this.logger.debug(`Waiting for ECS service ${logicalId} to reach steady state...`);
+			const maxWaitTime = Math.max(600, (resolvedResourceTimeoutMs("AWS::ECS::Service") ?? 0) / 1e3);
 			await waitUntilServicesStable({
 				client: this.getClient(),
-				maxWaitTime: 600,
+				maxWaitTime,
 				minDelay: 5,
 				maxDelay: 10
 			}, {
@@ -43113,6 +43186,7 @@ async function deployCommand(stacks, options) {
 	}
 	warnIfDeprecatedRegion(options);
 	validateResourceTimeouts(options);
+	setResolvedResourceTimeouts(options.resourceTimeout);
 	applyWaitFlagEnv(options);
 	await applyRoleArnIfSet({
 		roleArn: options.roleArn,
@@ -46095,6 +46169,7 @@ async function destroyCommand(stackArgs, options) {
 	}
 	warnIfDeprecatedRegion(options);
 	validateResourceTimeouts(options);
+	setResolvedResourceTimeouts(options.resourceTimeout);
 	await applyRoleArnIfSet({
 		roleArn: options.roleArn,
 		region: options.region
@@ -49672,6 +49747,7 @@ async function stateDestroyCommand(stackArgs, options) {
 		process.env["CDKD_NO_LIVE"] = "1";
 	}
 	validateResourceTimeouts(options);
+	setResolvedResourceTimeouts(options.resourceTimeout);
 	if (!options.all && stackArgs.length === 0) throw new Error("Stack name is required. Usage: cdkd state destroy <stack> [<stack>...] | --all");
 	const setup = await setupStateBackend(options);
 	const providerRegistry = new ProviderRegistry();
@@ -62771,7 +62847,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.268.4");
+	program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.269.0");
 	program.hook("preAction", (_thisCommand, actionCommand) => {
 		const { profile } = actionCommand.optsWithGlobals();
 		if (profile !== void 0) process.env["AWS_PROFILE"] = profile;