@go-to-k/cdkd 0.115.3 → 0.115.4

package/dist/cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { a as setAwsClients, i as resetAwsClients, r as getAwsClients, t as AwsClients } from "./aws-clients-CuHRHcyW.js";
-import { $ as StackHasActiveImportsError, A as Synthesizer, C as AssetPublisher, D as formatDockerLoginError, E as buildDockerImage, F as resolveSkipPrefix, I as resolveStateBucketWithDefault, J as PartialFailureError, K as LocalInvokeBuildError, L as resolveStateBucketWithDefaultAndSource, M as getLegacyStateBucketName, N as resolveApp, O as getDockerCmd, P as resolveCaptureObservedState, Q as RouteDiscoveryError, R as warnDeprecatedNoPrefixCliFlag, S as shouldRetainResource, T as WorkGraph, U as CdkdError, V as resolveBucketRegion, X as ResourceTimeoutError, Y as ProvisioningError, Z as ResourceUpdateNotSupportedError, _ as DiffCalculator, _t as withStackName, a as withRetry, at as normalizeAwsError, b as LockManager, c as collectInlinePolicyNamesManagedBySiblings, ct as getLogger, d as normalizeAwsTagsToCfn, dt as getLiveRenderer, et as StackTerminationProtectionError, f as resolveExplicitPhysicalId, ft as PATTERN_B_NAME_PROPERTIES, g as IntrinsicFunctionResolver, gt as withSkipPrefix, h as assertRegionMatch, ht as generateResourceNameWithFallback, i as withResourceDeadline, j as getDefaultStateBucketName, k as runDockerStreaming, l as CDK_PATH_TAG, m as CloudControlProvider, mt as generateResourceName, n as DEFAULT_RESOURCE_WARN_AFTER_MS, o as IMPLICIT_DELETE_DEPENDENCIES, ot as withErrorHandling, p as ProviderRegistry, pt as PATTERN_B_RESOURCE_TYPES, r as DeployEngine, s as IAMRoleProvider, t as DEFAULT_RESOURCE_TIMEOUT_MS, u as matchesCdkPath, ut as runStackBuffered, v as DagBuilder, w as stringifyValue, x as S3StateBackend, y as TemplateParser, z as AssemblyReader } from "./deploy-engine-VFIYh_NY.js";
+import { $ as RouteDiscoveryError, A as runDockerStreaming, B as AssemblyReader, C as AssetPublisher, D as formatDockerLoginError, E as buildDockerImage, F as resolveCaptureObservedState, H as resolveBucketRegion, I as resolveSkipPrefix, L as resolveStateBucketWithDefault, M as getDefaultStateBucketName, N as getLegacyStateBucketName, O as getDockerCmd, P as resolveApp, Q as ResourceUpdateNotSupportedError, R as resolveStateBucketWithDefaultAndSource, S as shouldRetainResource, T as WorkGraph, W as CdkdError, X as ProvisioningError, Y as PartialFailureError, Z as ResourceTimeoutError, _ as DiffCalculator, _t as withSkipPrefix, a as withRetry, b as LockManager, c as collectInlinePolicyNamesManagedBySiblings, d as normalizeAwsTagsToCfn, dt as runStackBuffered, et as StackHasActiveImportsError, f as resolveExplicitPhysicalId, ft as getLiveRenderer, g as IntrinsicFunctionResolver, gt as generateResourceNameWithFallback, h as assertRegionMatch, ht as generateResourceName, i as withResourceDeadline, j as Synthesizer, k as runDockerForeground, l as CDK_PATH_TAG, lt as getLogger, m as CloudControlProvider, mt as PATTERN_B_RESOURCE_TYPES, n as DEFAULT_RESOURCE_WARN_AFTER_MS, o as IMPLICIT_DELETE_DEPENDENCIES, ot as normalizeAwsError, p as ProviderRegistry, pt as PATTERN_B_NAME_PROPERTIES, q as LocalInvokeBuildError, r as DeployEngine, s as IAMRoleProvider, st as withErrorHandling, t as DEFAULT_RESOURCE_TIMEOUT_MS, tt as StackTerminationProtectionError, u as matchesCdkPath, v as DagBuilder, vt as withStackName, w as stringifyValue, x as S3StateBackend, y as TemplateParser, z as warnDeprecatedNoPrefixCliFlag } from "./deploy-engine-Chzg_hDE.js";
 import { createHash, createPublicKey, createVerify, randomBytes, randomUUID } from "node:crypto";
 import { CopyObjectCommand, CreateBucketCommand, DeleteBucketAnalyticsConfigurationCommand, DeleteBucketCommand, DeleteBucketCorsCommand, DeleteBucketIntelligentTieringConfigurationCommand, DeleteBucketInventoryConfigurationCommand, DeleteBucketLifecycleCommand, DeleteBucketMetricsConfigurationCommand, DeleteBucketPolicyCommand, DeleteBucketReplicationCommand, DeleteBucketTaggingCommand, DeleteBucketWebsiteCommand, DeleteObjectCommand, DeleteObjectsCommand, GetBucketAccelerateConfigurationCommand, GetBucketCorsCommand, GetBucketEncryptionCommand, GetBucketLifecycleConfigurationCommand, GetBucketLocationCommand, GetBucketLoggingCommand, GetBucketNotificationConfigurationCommand, GetBucketPolicyCommand, GetBucketReplicationCommand, GetBucketTaggingCommand, GetBucketVersioningCommand, GetBucketWebsiteCommand, GetObjectCommand, GetObjectLockConfigurationCommand, GetPublicAccessBlockCommand, HeadBucketCommand, ListBucketAnalyticsConfigurationsCommand, ListBucketIntelligentTieringConfigurationsCommand, ListBucketInventoryConfigurationsCommand, ListBucketMetricsConfigurationsCommand, ListBucketsCommand, ListDirectoryBucketsCommand, 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";
 import { AddRoleToInstanceProfileCommand, AddUserToGroupCommand, AttachGroupPolicyCommand, AttachUserPolicyCommand, CreateGroupCommand, CreateInstanceProfileCommand, CreateLoginProfileCommand, CreateUserCommand, DeleteAccessKeyCommand, DeleteGroupCommand, DeleteGroupPolicyCommand, DeleteInstanceProfileCommand, DeleteLoginProfileCommand, DeleteRolePolicyCommand, DeleteUserCommand, DeleteUserPermissionsBoundaryCommand, DeleteUserPolicyCommand, DetachGroupPolicyCommand, DetachUserPolicyCommand, GetGroupCommand, GetGroupPolicyCommand, GetInstanceProfileCommand, GetRolePolicyCommand, GetUserCommand, GetUserPolicyCommand, IAMClient, ListAccessKeysCommand, ListAttachedGroupPoliciesCommand, ListAttachedUserPoliciesCommand, ListGroupPoliciesCommand, ListGroupsForUserCommand, ListInstanceProfilesCommand, ListUserPoliciesCommand, ListUserTagsCommand, ListUsersCommand, NoSuchEntityException, PutGroupPolicyCommand, PutRolePolicyCommand, PutUserPermissionsBoundaryCommand, PutUserPolicyCommand, RemoveRoleFromInstanceProfileCommand, RemoveUserFromGroupCommand, TagUserCommand, UntagUserCommand, UpdateLoginProfileCommand } from "@aws-sdk/client-iam";
@@ -37366,43 +37366,22 @@ async function pullImage(image, skipPull) {
 	}
 	if (getLogger().getLevel() === "debug") {
 		logger.info(`Pulling ${image}...`);
-		await runForeground$1(getDockerCmd(), ["pull", image]);
+		try {
+			await runDockerForeground(["pull", image]);
+		} catch (err) {
+			throw new DockerRunnerError(`docker pull ${image} failed: ${err.message}`);
+		}
 		return;
 	}
 	logger.debug(`Pulling ${image} (silent — pass --verbose to stream progress)`);
-	await runCaptured(getDockerCmd(), ["pull", image], image);
-}
-/**
-* Run a child process with stdout / stderr captured (not inherited).
-* On success: discard the captured output (silent). On failure: fold
-* the captured stderr (or stdout as a fallback) into the rejection so
-* the error message names what actually went wrong instead of a bare
-* "exit code N".
-*/
-function runCaptured(cmd, args, image) {
-	return new Promise((resolveProc, rejectProc) => {
-		const proc = spawn(cmd, args, { stdio: [
-			"ignore",
-			"pipe",
-			"pipe"
-		] });
-		let stdout = "";
-		let stderr = "";
-		proc.stdout?.on("data", (chunk) => {
-			stdout += chunk.toString("utf-8");
-		});
-		proc.stderr?.on("data", (chunk) => {
-			stderr += chunk.toString("utf-8");
-		});
-		proc.on("error", (err) => rejectProc(new DockerRunnerError(`${cmd} pull ${image} failed: ${err.message}`)));
-		proc.on("close", (code) => {
-			if (code === 0) {
-				resolveProc();
-				return;
-			}
-			rejectProc(new DockerRunnerError(`docker pull ${image} exited with code ${code}: ${stderr.trim() || stdout.trim() || "(no output)"}`));
-		});
-	});
+	try {
+		await runDockerStreaming(["pull", image], { streamLive: false });
+	} catch (err) {
+		const e = err;
+		if (e.exitCode === void 0 || e.exitCode === null) throw new DockerRunnerError(`docker pull ${image} failed: ${e.message ?? String(err)}`);
+		const detail = e.stderr?.trim() || e.stdout?.trim() || "(no output)";
+		throw new DockerRunnerError(`docker pull ${image} exited with code ${e.exitCode}: ${detail}`);
+	}
 }
 /**
 * Run the container detached. Returns the container ID.
@@ -37576,21 +37555,6 @@ function redactAwsCredentialsInArgs(args) {
 	}
 	return out;
 }
-/**
-* Run a child process attached to the parent's stdio (so users see
-* progress lines as they happen). Resolves on exit code 0; rejects with
-* the captured stderr otherwise. Used for `docker pull`.
-*/
-function runForeground$1(cmd, args) {
-	return new Promise((resolveProc, rejectProc) => {
-		const proc = spawn(cmd, args, { stdio: "inherit" });
-		proc.on("error", (err) => rejectProc(new DockerRunnerError(`${cmd} failed: ${err.message}`)));
-		proc.on("close", (code) => {
-			if (code === 0) resolveProc();
-			else rejectProc(new DockerRunnerError(`${cmd} exited with code ${code}`));
-		});
-	});
-}
 
 //#endregion
 //#region src/local/ecr-puller.ts
@@ -37665,7 +37629,11 @@ async function pullEcrImage(imageUri, options) {
 		ecr.destroy();
 	}
 	logger.info(`Pulling ${imageUri}...`);
-	await runForeground(getDockerCmd(), ["pull", imageUri]);
+	try {
+		await runDockerForeground(["pull", imageUri]);
+	} catch (err) {
+		throw new LocalInvokeBuildError(`docker pull ${imageUri} failed: ${err.message}`);
+	}
 	return imageUri;
 }
 /**
@@ -37729,22 +37697,6 @@ async function isImageInLocalCache(imageRef) {
 		return false;
 	}
 }
-/**
-* `docker pull` plumbed to the parent's stdio so the user sees layer
-* pull progress. Mirrors the runtime image's `pullImage` plumbing in
-* `docker-runner.ts` but local to this module to avoid a circular
-* dependency.
-*/
-function runForeground(cmd, args) {
-	return new Promise((resolve, reject) => {
-		const proc = spawn(cmd, args, { stdio: "inherit" });
-		proc.on("error", (err) => reject(new LocalInvokeBuildError(`${cmd} failed: ${err.message}`)));
-		proc.on("close", (code) => {
-			if (code === 0) resolve();
-			else reject(new LocalInvokeBuildError(`${cmd} exited with code ${code}`));
-		});
-	});
-}
 
 //#endregion
 //#region src/local/docker-image-builder.ts
@@ -38731,6 +38683,13 @@ function resolveLambdaArnOutcome(value) {
 	return resolveLambdaArnIntrinsic(value);
 }
 /**
+* Marker prefix the HTTP API v2 Route `Target` field always starts with —
+* AWS documents this as `integrations/<IntegrationId>`. Load-bearing
+* signal that an `Fn::Sub` shape on this field is actually pointing at
+* a same-template Integration rather than something unrelated.
+*/
+const TARGET_INTEGRATIONS_PREFIX = "integrations/";
+/**
 * Parse an HTTP API Route's `Target` into the integration's logical ID.
 *
 * CDK emits one of:
@@ -38739,9 +38698,14 @@ function resolveLambdaArnOutcome(value) {
 *     (the shape `aws-cdk-lib/aws-apigatewayv2`'s `HttpApi.addRoutes`
 *     actually emits — empty separator + `'integrations/'` literal
 *     prefix in front of the Ref).
+*   - `Fn::Sub: 'integrations/${MyIntegration}'` (1-arg form — AWS-docs
+*     canonical; emitted by hand-rolled `CfnRoute` constructs).
+*   - `Fn::Sub: ['integrations/${IntId}', { IntId: <Ref|GetAtt> }]`
+*     (2-arg form — what `cdk.Fn.sub(template, vars)` synthesizes
+*     when users build `target` programmatically).
 *   - `'integrations/abc123'` (literal — rare).
 *
-* All three forms are accepted; anything else throws.
+* All five forms are accepted; anything else throws.
 */
 function parseHttpApiTargetIntegration(target, location) {
 	if (typeof target === "string") {
@@ -38750,7 +38714,8 @@ function parseHttpApiTargetIntegration(target, location) {
 		throw new Error(`${location}: literal Target '${target}' must start with 'integrations/'`);
 	}
 	if (target && typeof target === "object" && !Array.isArray(target)) {
-		const join = target["Fn::Join"];
+		const obj = target;
+		const join = obj["Fn::Join"];
 		if (Array.isArray(join) && join.length === 2 && Array.isArray(join[1])) {
 			const sep = join[0];
 			const parts = join[1];
@@ -38763,8 +38728,30 @@ function parseHttpApiTargetIntegration(target, location) {
 				if (ref) return ref;
 			}
 		}
+		if ("Fn::Sub" in obj) {
+			const sub = obj["Fn::Sub"];
+			if (typeof sub === "string") {
+				const m = new RegExp(`^${TARGET_INTEGRATIONS_PREFIX}\\$\\{([^}]+)\\}$`).exec(sub);
+				if (m) {
+					const placeholder = m[1];
+					if (!placeholder.includes(".")) return placeholder;
+				}
+			}
+			if (Array.isArray(sub) && sub.length === 2 && typeof sub[0] === "string" && sub[1] !== null && typeof sub[1] === "object" && !Array.isArray(sub[1])) {
+				const template = sub[0];
+				const bindings = sub[1];
+				const m = new RegExp(`^${TARGET_INTEGRATIONS_PREFIX}\\$\\{([^}]+)\\}$`).exec(template);
+				if (m) {
+					const bound = bindings[m[1]];
+					if (bound !== void 0) {
+						const ref = pickRefLogicalId$2(bound);
+						if (ref) return ref;
+					}
+				}
+			}
+		}
 	}
-	throw new Error(`${location}: Target must be 'integrations/<id>' or Fn::Join with one of the documented shapes (got ${shortJson$1(target)}).`);
+	throw new Error(`${location}: Target must be 'integrations/<id>', Fn::Join with one of the documented shapes, or Fn::Sub with an 'integrations/\${...}' template (got ${shortJson$1(target)}).`);
 }
 /**
 * Parse an HTTP API RouteKey (`'<METHOD> <path>'` or `'$default'`) into
@@ -45594,7 +45581,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.115.3");
+	program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.115.4");
 	program.addCommand(createBootstrapCommand());
 	program.addCommand(createSynthCommand());
 	program.addCommand(createListCommand());