@occam-scaly/scaly-cli 0.2.2 → 0.2.4

package/lib/scaly-api.js

@@ -232,11 +232,12 @@ const QUERIES = {
     }
   `,
   listAddOnsByName: `
-    query ListAddOnsByName($name: String!) {
+    query ListAddOnsByName($name: String!, $accountId: String!) {
       listAddOns(
         where: {
           AND: [
             { name: { equals: $name } }
+            { accountId: { equals: $accountId } }
             { isDeleted: { equals: false } }
           ]
         }
@@ -342,8 +343,11 @@ async function findAccountBySlug(slug) {
   }
 }
 
-async function findAddOnByName(name) {
-  const data = await graphqlRequest(QUERIES.listAddOnsByName, { name });
+async function findAddOnByName({ name, accountId }) {
+  const data = await graphqlRequest(QUERIES.listAddOnsByName, {
+    name,
+    accountId
+  });
   return data?.listAddOns || [];
 }
 

package/lib/scaly-plan.js

@@ -32,7 +32,15 @@ function mapAddOnType(type) {
   const t = String(type || '').toLowerCase();
   if (t === 'database') return 'DATABASE';
   if (t === 'storage' || t === 'storage_s3' || t === 's3') return 'STORAGE_S3';
-  if (t === 'cognito' || t === 'userpool' || t === 'user_pool')
+  if (
+    t === 'cognito' ||
+    t === 'userpool' ||
+    t === 'user_pool' ||
+    t === 'usergroups' ||
+    t === 'user_groups' ||
+    t === 'user-groups' ||
+    t === 'auth'
+  )
     return 'COGNITO';
   if (t === 'cname') return 'CNAME';
   return null;
@@ -266,7 +274,7 @@ async function buildPlan({ config, env, appName }) {
 
       let currentAddOn = null;
       try {
-        const list = await api.findAddOnByName(addOn.name);
+        const list = await api.findAddOnByName({ name: addOn.name, accountId });
         currentAddOn = list?.[0] || null;
         if (list.length > 1) {
           warnings.push(
@@ -275,8 +283,9 @@ async function buildPlan({ config, env, appName }) {
         }
       } catch (err) {
         addOnReadable = false;
+        const msg = String(err && err.message ? err.message : err);
         warnings.push(
-          'Unable to read add-ons from the API (auth/permissions). Add-on planning is skipped for now.'
+          `Unable to read add-ons from the API (auth/permissions): ${msg}`
         );
         break;
       }

package/package.json

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