@go-to-k/cdkd 0.10.0 → 0.11.0

package/README.md

@@ -95,7 +95,7 @@ Reproduce with `./tests/benchmark/run-benchmark.sh all`. See [tests/benchmark/RE
 ```
 1. CLI Layer
    ├── Resolve --app (CLI > CDKD_APP env > cdk.json "app")
-   ├── Resolve --state-bucket (CLI > env > cdk.json > auto: cdkd-state-{accountId}-{region})
+   ├── Resolve --state-bucket (CLI > env > cdk.json > auto: cdkd-state-{accountId}, with legacy fallback to cdkd-state-{accountId}-{region})
    └── Initialize AWS clients
 
 2. Synthesis (self-implemented, no CDK CLI dependency)
@@ -355,7 +355,7 @@ cdkd diff
 cdkd destroy
 ```
 
-That's it. cdkd reads `--app` from `cdk.json` and auto-resolves the state bucket from your AWS account ID (`cdkd-state-{accountId}-{region}`).
+That's it. cdkd reads `--app` from `cdk.json` and auto-resolves the state bucket from your AWS account ID (`cdkd-state-{accountId}`). If you bootstrapped under a previous cdkd version, the legacy region-suffixed name (`cdkd-state-{accountId}-{region}`) is still picked up automatically with a deprecation warning.
 
 ## Usage
 
@@ -547,7 +547,7 @@ s3://{state-bucket}/
 
 | Setting | CLI | cdk.json | Env var | Default |
 |---------|-----|----------|---------|---------|
-| Bucket | `--state-bucket` | `context.cdkd.stateBucket` | `CDKD_STATE_BUCKET` | `cdkd-state-{accountId}-{region}` |
+| Bucket | `--state-bucket` | `context.cdkd.stateBucket` | `CDKD_STATE_BUCKET` | `cdkd-state-{accountId}` (legacy `cdkd-state-{accountId}-{region}` is still read with a deprecation warning) |
 | Prefix | `--state-prefix` | - | - | `cdkd` |
 
 ### Multi-app isolation

package/dist/cli.js

@@ -971,7 +971,10 @@ function resolveStateBucket(cliBucket) {
   const bucket = cdkdContext?.["stateBucket"];
   return typeof bucket === "string" ? bucket : void 0;
 }
-function getDefaultStateBucketName(accountId, region) {
+function getDefaultStateBucketName(accountId) {
+  return `cdkd-state-${accountId}`;
+}
+function getLegacyStateBucketName(accountId, region) {
   return `cdkd-state-${accountId}-${region}`;
 }
 async function resolveStateBucketWithDefault(cliBucket, region) {
@@ -981,13 +984,48 @@ async function resolveStateBucketWithDefault(cliBucket, region) {
   const logger = getLogger();
   logger.debug("No state bucket specified, resolving default from account...");
   const { GetCallerIdentityCommand: GetCallerIdentityCommand8 } = await import("@aws-sdk/client-sts");
+  const { S3Client: S3Client10 } = await import("@aws-sdk/client-s3");
   const { getAwsClients: getAwsClients2 } = await Promise.resolve().then(() => (init_aws_clients(), aws_clients_exports));
   const awsClients = getAwsClients2();
   const identity = await awsClients.sts.send(new GetCallerIdentityCommand8({}));
   const accountId = identity.Account;
-  const bucketName = getDefaultStateBucketName(accountId, region);
-  logger.info(`State bucket: ${bucketName}`);
-  return bucketName;
+  const newName = getDefaultStateBucketName(accountId);
+  const legacyName = getLegacyStateBucketName(accountId, region);
+  const probe = new S3Client10({ region: "us-east-1" });
+  try {
+    if (await bucketExists(probe, newName)) {
+      logger.info(`State bucket: ${newName}`);
+      return newName;
+    }
+    if (await bucketExists(probe, legacyName)) {
+      logger.warn(
+        `Using legacy state bucket name '${legacyName}'. The default has changed to '${newName}'. Future cdkd versions will drop legacy support; consider migrating with cdkd state migrate-bucket (coming in a future release).`
+      );
+      return legacyName;
+    }
+    throw new Error(
+      `No cdkd state bucket found for account ${accountId}. Looked for '${newName}' (current default) and '${legacyName}' (legacy default). Run 'cdkd bootstrap' to create '${newName}'.`
+    );
+  } finally {
+    probe.destroy();
+  }
+}
+async function bucketExists(client, bucketName) {
+  const { HeadBucketCommand: HeadBucketCommand3 } = await import("@aws-sdk/client-s3");
+  try {
+    await client.send(new HeadBucketCommand3({ Bucket: bucketName }));
+    return true;
+  } catch (error) {
+    const err = error;
+    const status = err.$metadata?.httpStatusCode;
+    if (err.name === "NotFound" || err.name === "NoSuchBucket" || status === 404) {
+      return false;
+    }
+    if (status === 301 || status === 403) {
+      return true;
+    }
+    throw error;
+  }
 }
 
 // src/cli/commands/bootstrap.ts
@@ -1015,14 +1053,14 @@ async function bootstrapCommand(options) {
     logger.info("No --state-bucket specified, resolving default bucket name...");
     const identity = await awsClients.sts.send(new GetCallerIdentityCommand({}));
     accountId = identity.Account;
-    bucketName = getDefaultStateBucketName(accountId, region);
+    bucketName = getDefaultStateBucketName(accountId);
     logger.info(`Using default state bucket: ${bucketName}`);
   }
   try {
-    let bucketExists = false;
+    let bucketExists2 = false;
     try {
       await s3Client.send(new HeadBucketCommand({ Bucket: bucketName }));
-      bucketExists = true;
+      bucketExists2 = true;
       logger.info(`Bucket ${bucketName} already exists`);
     } catch (error) {
       const err = error;
@@ -1032,7 +1070,7 @@ async function bootstrapCommand(options) {
         throw normalizeAwsError(error, { bucket: bucketName, operation: "HeadBucket" });
       }
     }
-    if (bucketExists) {
+    if (bucketExists2) {
       if (!options.force) {
         logger.warn(
           `Bucket ${bucketName} already exists. Use --force to reconfigure (this will not delete existing state)`
@@ -1119,7 +1157,7 @@ State bucket: ${bucketName}`);
 function createBootstrapCommand() {
   const cmd = new Command("bootstrap").description("Bootstrap cdkd by creating required S3 bucket for state management").option(
     "--state-bucket <bucket>",
-    "Name of S3 bucket to create for state storage (default: cdkd-state-{accountId}-{region})"
+    "Name of S3 bucket to create for state storage (default: cdkd-state-{accountId})"
   ).option("--force", "Force reconfiguration of existing bucket", false).action(withErrorHandling(bootstrapCommand));
   commonOptions.forEach((opt) => cmd.addOption(opt));
   return cmd;
@@ -29898,7 +29936,7 @@ function reorderArgs(argv) {
 }
 async function main() {
   const program = new Command10();
-  program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.10.0");
+  program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.11.0");
   program.addCommand(createBootstrapCommand());
   program.addCommand(createSynthCommand());
   program.addCommand(createListCommand());