@go-to-k/cdkd 0.16.0 → 0.16.1

package/dist/cli.js

@@ -1008,11 +1008,27 @@ async function resolveStateBucketWithDefaultAndSource(cliBucket, region) {
   const legacyName = getLegacyStateBucketName(accountId, region);
   const probe = new S3Client11({ region: "us-east-1" });
   try {
-    if (await bucketExists(probe, newName)) {
+    const newExists = await bucketExists(probe, newName);
+    const legacyExists = await bucketExists(probe, legacyName);
+    if (newExists && legacyExists) {
+      const newHasState = await bucketHasAnyState(probe, newName);
+      if (!newHasState) {
+        const legacyHasState = await bucketHasAnyState(probe, legacyName);
+        if (legacyHasState) {
+          logger.warn(
+            `Both '${newName}' (new default) and '${legacyName}' (legacy default) exist, but the new bucket is empty and the legacy one has state. Reading from legacy. Run \`cdkd state migrate --region ${region}\` to copy the state into the new bucket and stop seeing this warning.`
+          );
+          return { bucket: legacyName, source: "default-legacy" };
+        }
+      }
       logger.debug(`State bucket: ${newName}`);
       return { bucket: newName, source: "default" };
     }
-    if (await bucketExists(probe, legacyName)) {
+    if (newExists) {
+      logger.debug(`State bucket: ${newName}`);
+      return { bucket: newName, source: "default" };
+    }
+    if (legacyExists) {
       logger.warn(
         `Using legacy state bucket name '${legacyName}'. The default has changed to '${newName}'. To migrate, run:
 
@@ -1029,6 +1045,21 @@ async function resolveStateBucketWithDefaultAndSource(cliBucket, region) {
     probe.destroy();
   }
 }
+async function bucketHasAnyState(client, bucketName) {
+  const { ListObjectsV2Command: ListObjectsV2Command5 } = await import("@aws-sdk/client-s3");
+  try {
+    const resp = await client.send(
+      new ListObjectsV2Command5({
+        Bucket: bucketName,
+        Prefix: "cdkd/",
+        MaxKeys: 1
+      })
+    );
+    return (resp.KeyCount ?? 0) > 0;
+  } catch {
+    return true;
+  }
+}
 async function bucketExists(client, bucketName) {
   const { HeadBucketCommand: HeadBucketCommand5 } = await import("@aws-sdk/client-s3");
   try {
@@ -31630,7 +31661,7 @@ function reorderArgs(argv) {
 }
 async function main() {
   const program = new Command12();
-  program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.16.0");
+  program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.16.1");
   program.addCommand(createBootstrapCommand());
   program.addCommand(createSynthCommand());
   program.addCommand(createListCommand());