@go-to-k/cdkd 0.238.5 → 0.238.6

package/dist/cli.js

@@ -1885,7 +1885,7 @@ const FLUSH_INTERVAL_MS = 2e3;
 const FLUSH_EVENT_THRESHOLD = 50;
 /** Build-time cdkd version, with a dev fallback for non-built contexts. */
 function getCdkdVersion() {
-	return "0.238.5";
+	return "0.238.6";
 }
 /**
 * Generate a time-sortable unique run id, e.g.
@@ -46316,12 +46316,18 @@ function formatBucketSource(source) {
 * not-yet-bootstrapped bucket. (Bucket existence is verified separately
 * via {@link setupStateBackend}, so getting here implies the bucket is
 * reachable; `GetBucketLocation` failing is most often a permissions gap.)
+*
+* Takes the (region-corrected) S3 client directly — see the issue #1054 note
+* in {@link stateInfoCommand}. Before that fix this call was made with the
+* ambient-region client, so a cross-region state bucket silently degraded to
+* `undefined` ("Region: unknown") here; with the corrected client it now
+* succeeds and reports the bucket's actual region.
 */
-async function detectBucketRegion(awsClients, bucket) {
+async function detectBucketRegion(s3, bucket) {
 	try {
-		const constraint = (await awsClients.s3.send(new GetBucketLocationCommand({
+		const constraint = (await s3.send(new GetBucketLocationCommand({
 			Bucket: bucket,
-			...await expectedOwnerParam(awsClients.s3)
+			...await expectedOwnerParam(s3)
 		}))).LocationConstraint;
 		if (!constraint) return "us-east-1";
 		if (constraint === "EU") return "eu-west-1";
@@ -46342,12 +46348,12 @@ async function detectBucketRegion(awsClients, bucket) {
 * Returns the full set of state-file keys; the count is the unique-stacks
 * tally we want for the `Stacks:` line.
 */
-async function listStateFileKeys(awsClients, bucket, prefix) {
+async function listStateFileKeys(s3, bucket, prefix) {
 	const keys = [];
 	let continuationToken;
 	const searchPrefix = `${prefix}/`;
 	do {
-		const resp = await awsClients.s3.send(new ListObjectsV2Command({
+		const resp = await s3.send(new ListObjectsV2Command({
 			Bucket: bucket,
 			Prefix: searchPrefix,
 			...continuationToken && { ContinuationToken: continuationToken }
@@ -46365,13 +46371,13 @@ async function listStateFileKeys(awsClients, bucket, prefix) {
 * Returns `'unknown'` when no state files exist or parsing fails — we don't
 * want a cosmetic command to crash on an unexpected payload.
 */
-async function readSchemaVersion(awsClients, bucket, keys) {
+async function readSchemaVersion(s3, bucket, keys) {
 	if (keys.length === 0) return "unknown";
 	try {
-		const resp = await awsClients.s3.send(new GetObjectCommand({
+		const resp = await s3.send(new GetObjectCommand({
 			Bucket: bucket,
 			Key: keys[0],
-			...await expectedOwnerParam(awsClients.s3)
+			...await expectedOwnerParam(s3)
 		}));
 		if (!resp.Body) return "unknown";
 		const body = await resp.Body.transformToString();
@@ -46387,13 +46393,13 @@ async function readSchemaVersion(awsClients, bucket, keys) {
 * cosmetic command and should not crash on an unexpected payload (deploy
 * hard-errors on the same marker instead).
 */
-async function listAssetStorageMarkers(awsClients, bucket) {
+async function listAssetStorageMarkers(s3, bucket) {
 	const logger = getLogger();
 	const entries = [];
 	let continuationToken;
 	const keys = [];
 	do {
-		const resp = await awsClients.s3.send(new ListObjectsV2Command({
+		const resp = await s3.send(new ListObjectsV2Command({
 			Bucket: bucket,
 			Prefix: BOOTSTRAP_MARKER_PREFIX,
 			...continuationToken && { ContinuationToken: continuationToken }
@@ -46404,10 +46410,10 @@ async function listAssetStorageMarkers(awsClients, bucket) {
 	for (const key of keys) {
 		const region = key.slice(BOOTSTRAP_MARKER_PREFIX.length, -5);
 		try {
-			const marker = parseBootstrapMarker(await (await awsClients.s3.send(new GetObjectCommand({
+			const marker = parseBootstrapMarker(await (await s3.send(new GetObjectCommand({
 				Bucket: bucket,
 				Key: key,
-				...await expectedOwnerParam(awsClients.s3)
+				...await expectedOwnerParam(s3)
 			}))).Body?.transformToString() ?? "", key);
 			entries.push({
 				region,
@@ -46451,6 +46457,7 @@ async function stateInfoCommand(options) {
 		...options.profile && { profile: options.profile }
 	});
 	setAwsClients(awsClients);
+	let regionCorrectedS3 = null;
 	try {
 		const region = options.region || process.env["AWS_REGION"] || "us-east-1";
 		const resolved = await resolveStateBucketWithDefaultAndSource(options.stateBucket, region);
@@ -46460,10 +46467,18 @@ async function stateInfoCommand(options) {
 			bucket,
 			prefix
 		}).verifyBucketExists();
-		const detectedRegion = await detectBucketRegion(awsClients, bucket);
-		const stateFileKeys = await listStateFileKeys(awsClients, bucket, prefix);
-		const schemaVersion = await readSchemaVersion(awsClients, bucket, stateFileKeys);
-		const assetStorage = await listAssetStorageMarkers(awsClients, bucket);
+		regionCorrectedS3 = await rebuildClientForBucketRegion(awsClients.s3, bucket, {
+			reuseClientCredentials: true,
+			tolerateNonStandardClient: true,
+			onRebuild: ({ bucketRegion, currentRegion }) => {
+				logger.debug(`State bucket '${bucket}' is in '${bucketRegion}' (state-info client was '${String(currentRegion)}'); building a region-corrected S3 client for info reads.`);
+			}
+		});
+		const infoS3 = regionCorrectedS3 ?? awsClients.s3;
+		const detectedRegion = await detectBucketRegion(infoS3, bucket);
+		const stateFileKeys = await listStateFileKeys(infoS3, bucket, prefix);
+		const schemaVersion = await readSchemaVersion(infoS3, bucket, stateFileKeys);
+		const assetStorage = await listAssetStorageMarkers(infoS3, bucket);
 		if (options.json) {
 			const json = {
 				bucket,
@@ -46491,6 +46506,7 @@ async function stateInfoCommand(options) {
 		}
 		process.stdout.write(`${lines.join("\n")}\n`);
 	} finally {
+		regionCorrectedS3?.destroy();
 		awsClients.destroy();
 	}
 }
@@ -57183,7 +57199,7 @@ function reorderArgs(argv) {
 async function main() {
 	installPipeCloseHandler();
 	const program = new Command();
-	program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.238.5");
+	program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.238.6");
 	program.addCommand(createBootstrapCommand());
 	program.addCommand(createSynthCommand());
 	program.addCommand(createListCommand());