@occam-scaly/scaly-cli 0.2.1 → 0.2.3

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 } }
           ]
         }
@@ -248,7 +249,7 @@ const QUERIES = {
         accountId
         status
         addOnDatabase { size type }
-        addOnCognito { userPoolName userPoolId }
+        addOnCognito { userPoolName }
         addOnStorageS3 { bucket }
       }
     }
@@ -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

@@ -266,7 +266,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 +275,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.1",
+  "version": "0.2.3",
   "description": "Scaly CLI (auth + project config helpers)",
   "bin": {
     "scaly": "./bin/scaly.js"