@occam-scaly/scaly-cli 0.2.6 → 0.2.7

package/bin/scaly.js

@@ -2992,9 +2992,9 @@ async function runDiagnoseApp(rest) {
   }
   if (/User pool .* does not exist/i.test(text)) {
     findings.push({
-      code: 'COGNITO_POOL_MISSING',
+      code: 'USER_GROUPS_POOL_MISSING',
       severity: 'medium',
-      hint: 'Identity add-on misconfigured; verify user pool id/region.'
+      hint: "User Groups is misconfigured for this account; contact support to repair the account's identity resources."
     });
   }
   if (/ResourceAlreadyExistsException/i.test(text)) {

package/lib/scaly-plan.js

@@ -127,6 +127,11 @@ async function buildPlan({ config, env, appName }) {
     const pool = a && a.auth && a.auth.userPool;
     if (typeof pool === 'string' && pool.trim()) requestedAuthPools.add(pool);
   }
+  if (requestedAuthPools.size) {
+    warnings.push(
+      "app.auth.userPool is deprecated and ignored. Scaly uses the account's User Groups automatically; configure only app.auth.groups."
+    );
+  }
 
   let stackOpId = null;
   if (!currentStack) {
@@ -297,9 +302,11 @@ async function buildPlan({ config, env, appName }) {
             Array.isArray(existingUserPools) &&
             existingUserPools.length > 1
           ) {
-            warnings.push(
-              `Multiple user groups add-ons exist in this account (${existingUserPools.length}). Scaly typically expects one user pool per account.`
+            const e = new Error(
+              `Multiple User Groups pools exist in this account (${existingUserPools.length}). Scaly supports exactly one user pool per account; contact support to repair this account before continuing.`
             );
+            e.code = 'USER_GROUPS_POOL_DUPLICATE';
+            throw e;
           }
         }
 
@@ -321,26 +328,16 @@ async function buildPlan({ config, env, appName }) {
 
       if (!currentAddOn) {
         if (apiType === 'COGNITO') {
-          const allowMultiple =
-            addOn.allow_multiple_user_pools === true ||
-            addOn.allowMultipleUserPools === true ||
-            config?.account?.allow_multiple_user_pools === true ||
-            config?.account?.allowMultipleUserPools === true;
-
           const existing =
             Array.isArray(existingUserPools) && existingUserPools.length
-              ? existingUserPools[0]
+              ? existingUserPools.find((p) => p && p.name === 'users') ||
+                existingUserPools[0]
               : null;
 
-          if (existing && !allowMultiple) {
+          if (existing) {
             warnings.push(
-              `User groups add-on '${addOn.name}' would create a new user pool, but this account already has '${existing.name}'. Reusing the existing pool is recommended to avoid "missing users" surprises. To create multiple pools, set addons[].allow_multiple_user_pools: true.`
+              `User Groups is provisioned automatically per account. Ignoring configured user_groups add-on '${addOn.name}' and using existing '${existing.name}'.`
             );
-            if (requestedAuthPools.has(addOn.name)) {
-              warnings.push(
-                `app.auth.userPool is set to '${addOn.name}'. Consider changing it to '${existing.name}' to keep existing users.`
-              );
-            }
             ops.push({
               id: `op_addon_noop_${existing.name}`,
               kind: 'addon',
@@ -356,6 +353,12 @@ async function buildPlan({ config, env, appName }) {
             });
             continue;
           }
+
+          const e = new Error(
+            'User Groups pool is missing for this account. Scaly provisions it automatically at account creation; contact support to repair this account.'
+          );
+          e.code = 'USER_GROUPS_POOL_MISSING';
+          throw e;
         }
 
         const desired = { name: addOn.name, type: apiType, accountId };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@occam-scaly/scaly-cli",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "description": "Scaly CLI (auth + project config helpers)",
   "bin": {
     "scaly": "./bin/scaly.js"