@awsless/awsless 0.0.23 → 0.0.25

package/dist/bin.cjs

@@ -183,7 +183,9 @@ var getAtt = (logicalId, attr) => {
   return { "Fn::GetAtt": [logicalId, attr] };
 };
 var importValue = (name) => {
-  return { "Fn::ImportValue": name };
+  return new Lazy((stack) => ({
+    "Fn::ImportValue": `${stack.app.name}-${name}`
+  }));
 };
 var formatLogicalId = (id) => {
   return (0, import_change_case2.pascalCase)(id).replaceAll("_", "");
@@ -453,10 +455,18 @@ var Stack = class {
     this.name = name;
     this.region = region;
   }
+  parent;
   exports = /* @__PURE__ */ new Map();
   resources = /* @__PURE__ */ new Set();
   tags = /* @__PURE__ */ new Map();
   assets = /* @__PURE__ */ new Set();
+  get app() {
+    return this.parent;
+  }
+  setApp(app) {
+    this.parent = app;
+    return this;
+  }
   add(...resources) {
     for (const item of resources) {
       if (item instanceof Asset) {
@@ -530,7 +540,9 @@ var Stack = class {
     for (const [name, value] of this.exports.entries()) {
       Object.assign(outputs, {
         [formatLogicalId(name)]: {
-          Export: { Name: name },
+          Export: {
+            Name: `${this.app?.name || "default"}-${name}`
+          },
           Value: value
         }
       });
@@ -2275,6 +2287,9 @@ var Definition = class extends Asset {
     }));
     const defs = (0, import_merge.mergeTypeDefs)(schemas);
     const schema2 = (0, import_graphql.print)(defs);
+    if (schema2.length === 0) {
+      throw new Error(`Graphql schema definition can't be empty. [${this.id}]`);
+    }
     const size = Buffer.from(schema2, "utf8").byteLength;
     await write("schema.gql", schema2);
     this.schema = schema2;
@@ -2940,6 +2955,7 @@ var Vpc = class extends Resource {
   constructor(logicalId, props) {
     super("AWS::EC2::VPC", logicalId);
     this.props = props;
+    this.tag("Name", props.name);
   }
   get id() {
     return ref(this.logicalId);
@@ -3102,6 +3118,7 @@ var vpcPlugin = definePlugin({
   // }),
   onApp({ config, bootstrap: bootstrap2 }) {
     const vpc = new Vpc("main", {
+      name: config.name,
       cidrBlock: Peer.ipv4("10.0.0.0/16")
     });
     const privateRouteTable = new RouteTable("private", {
@@ -3831,7 +3848,10 @@ var App = class {
   }
   list = /* @__PURE__ */ new Map();
   add(...stacks) {
-    stacks.forEach((stack) => this.list.set(stack.name, stack));
+    stacks.forEach((stack) => {
+      this.list.set(stack.name, stack);
+      stack.setApp(this);
+    });
     return this;
   }
   find(resourceType) {
@@ -4619,6 +4639,7 @@ var Renderer = class {
         }
       }
     }
+    await this.setCursor(0, size - start);
     this.screen = screen;
     this.flushing = false;
   }
@@ -4803,20 +4824,26 @@ var assetBuilder = (app) => {
         ]);
         group.update((group2) => [...group2, line]);
         const timer = createTimer();
-        const data = await asset.build({
-          async write(file, data2) {
-            const fullpath = (0, import_path8.join)(directories.asset, asset.type, app.name, stack.name, asset.id, file);
-            const basepath = (0, import_path8.dirname)(fullpath);
-            await (0, import_promises6.mkdir)(basepath, { recursive: true });
-            await (0, import_promises6.writeFile)(fullpath, data2);
-          }
-        });
-        details.set({
-          ...data,
-          time: timer()
-        });
-        icon.set(style.success(symbol.success));
-        stop();
+        try {
+          const data = await asset.build({
+            async write(file, data2) {
+              const fullpath = (0, import_path8.join)(directories.asset, asset.type, app.name, stack.name, asset.id, file);
+              const basepath = (0, import_path8.dirname)(fullpath);
+              await (0, import_promises6.mkdir)(basepath, { recursive: true });
+              await (0, import_promises6.writeFile)(fullpath, data2);
+            }
+          });
+          details.set({
+            ...data,
+            time: timer()
+          });
+          icon.set(style.success(symbol.success));
+        } catch (error) {
+          icon.set(style.error(symbol.error));
+          throw error;
+        } finally {
+          stop();
+        }
       }));
     }));
     done("Done building stack assets");
@@ -4914,7 +4941,7 @@ var StackClient = class {
   maxWaitTime = 60 * 30;
   // 30 minutes
   maxDelay = 30;
-  // 30 seconds
+  // 10 seconds
   assetBucketName;
   getClient(region) {
     return new import_client_cloudformation.CloudFormationClient({
@@ -4961,7 +4988,7 @@ var StackClient = class {
   async create(stack, capabilities) {
     debug("Create the", style.info(stack.name), "stack");
     const client = this.getClient(stack.region);
-    await client.send(new import_client_cloudformation.CreateStackCommand({
+    const result = await client.send(new import_client_cloudformation.CreateStackCommand({
       StackName: this.stackName(stack.name),
       EnableTerminationProtection: false,
       OnFailure: import_client_cloudformation.OnFailure.DELETE,
@@ -4969,36 +4996,53 @@ var StackClient = class {
       Tags: this.tags(stack),
       ...this.templateProp(stack)
     }));
-    await (0, import_client_cloudformation.waitUntilStackCreateComplete)({
-      client,
-      maxWaitTime: this.maxWaitTime,
-      maxDelay: this.maxDelay
-    }, {
-      StackName: this.stackName(stack.name)
-    });
+    try {
+      await (0, import_client_cloudformation.waitUntilStackCreateComplete)({
+        client,
+        maxWaitTime: this.maxWaitTime,
+        maxDelay: this.maxDelay
+      }, {
+        StackName: result.StackId
+      });
+    } catch (_) {
+      const reason = await this.getFailureReason(
+        result.StackId,
+        stack.region
+      );
+      throw new Error(reason);
+    }
   }
   async update(stack, capabilities) {
     debug("Update the", style.info(stack.name), "stack");
     const client = this.getClient(stack.region);
+    let result;
     try {
-      await client.send(new import_client_cloudformation.UpdateStackCommand({
+      result = await client.send(new import_client_cloudformation.UpdateStackCommand({
         StackName: this.stackName(stack.name),
         Capabilities: capabilities,
         Tags: this.tags(stack),
         ...this.templateProp(stack)
       }));
+    } catch (error) {
+      if (error instanceof Error && error.name === "ValidationError" && error.message.toLowerCase().includes("no updates")) {
+        return;
+      }
+      throw error;
+    }
+    try {
       await (0, import_client_cloudformation.waitUntilStackUpdateComplete)({
         client,
         maxWaitTime: this.maxWaitTime,
         maxDelay: this.maxDelay
       }, {
-        StackName: this.stackName(stack.name)
+        StackName: result.StackId
       });
     } catch (error) {
-      if (error instanceof Error && error.name === "ValidationError" && error.message.toLowerCase().includes("no updates")) {
-        return;
-      }
-      throw error;
+      const reason = await this.getFailureReason(
+        result.StackId,
+        stack.region
+      );
+      throw new Error(reason);
     }
   }
   async validate(stack) {
@@ -5079,13 +5123,44 @@ var StackClient = class {
     await client.send(new import_client_cloudformation.DeleteStackCommand({
       StackName: this.stackName(name)
     }));
-    await (0, import_client_cloudformation.waitUntilStackDeleteComplete)({
-      client,
-      maxWaitTime: this.maxWaitTime,
-      maxDelay: this.maxDelay
-    }, {
-      StackName: this.stackName(name)
-    });
+    try {
+      await (0, import_client_cloudformation.waitUntilStackDeleteComplete)({
+        client,
+        maxWaitTime: this.maxWaitTime,
+        maxDelay: this.maxDelay
+      }, {
+        StackName: this.stackName(name)
+      });
+    } catch (_) {
+      const reason = await this.getFailureReason(name, region);
+      throw new Error(reason);
+    }
+  }
+  async getFailureReason(name, region) {
+    const client = this.getClient(region);
+    const result = await client.send(await new import_client_cloudformation.DescribeStackEventsCommand({
+      StackName: name
+    }));
+    const failureStatuses = [
+      "UPDATE_ROLLBACK_IN_PROGRESS",
+      "CREATE_FAILED",
+      "UPDATE_FAILED",
+      "DELETE_FAILED"
+    ];
+    let reason = "Unknown failure reason";
+    for (const event of result.StackEvents || []) {
+      if (event.ResourceStatusReason?.toLowerCase() === "user initiated") {
+        break;
+      }
+      if (failureStatuses.includes(event.ResourceStatus || "") && event.ResourceStatusReason) {
+        reason = [
+          `Logical ID: ${event.LogicalResourceId}`,
+          `Type: ${event.ResourceType}`,
+          `Reason: ${event.ResourceStatusReason}`
+        ].join("\n");
+      }
+    }
+    return reason;
   }
 };
 

package/dist/bin.js

@@ -163,7 +163,9 @@ var getAtt = (logicalId, attr) => {
   return { "Fn::GetAtt": [logicalId, attr] };
 };
 var importValue = (name) => {
-  return { "Fn::ImportValue": name };
+  return new Lazy((stack) => ({
+    "Fn::ImportValue": `${stack.app.name}-${name}`
+  }));
 };
 var formatLogicalId = (id) => {
   return pascalCase(id).replaceAll("_", "");
@@ -433,10 +435,18 @@ var Stack = class {
     this.name = name;
     this.region = region;
   }
+  parent;
   exports = /* @__PURE__ */ new Map();
   resources = /* @__PURE__ */ new Set();
   tags = /* @__PURE__ */ new Map();
   assets = /* @__PURE__ */ new Set();
+  get app() {
+    return this.parent;
+  }
+  setApp(app) {
+    this.parent = app;
+    return this;
+  }
   add(...resources) {
     for (const item of resources) {
       if (item instanceof Asset) {
@@ -510,7 +520,9 @@ var Stack = class {
     for (const [name, value] of this.exports.entries()) {
       Object.assign(outputs, {
         [formatLogicalId(name)]: {
-          Export: { Name: name },
+          Export: {
+            Name: `${this.app?.name || "default"}-${name}`
+          },
           Value: value
         }
       });
@@ -2252,6 +2264,9 @@ var Definition = class extends Asset {
     }));
     const defs = mergeTypeDefs(schemas);
     const schema2 = print(defs);
+    if (schema2.length === 0) {
+      throw new Error(`Graphql schema definition can't be empty. [${this.id}]`);
+    }
     const size = Buffer.from(schema2, "utf8").byteLength;
     await write("schema.gql", schema2);
     this.schema = schema2;
@@ -2917,6 +2932,7 @@ var Vpc = class extends Resource {
   constructor(logicalId, props) {
     super("AWS::EC2::VPC", logicalId);
     this.props = props;
+    this.tag("Name", props.name);
   }
   get id() {
     return ref(this.logicalId);
@@ -3079,6 +3095,7 @@ var vpcPlugin = definePlugin({
   // }),
   onApp({ config, bootstrap: bootstrap2 }) {
     const vpc = new Vpc("main", {
+      name: config.name,
       cidrBlock: Peer.ipv4("10.0.0.0/16")
     });
     const privateRouteTable = new RouteTable("private", {
@@ -3808,7 +3825,10 @@ var App = class {
   }
   list = /* @__PURE__ */ new Map();
   add(...stacks) {
-    stacks.forEach((stack) => this.list.set(stack.name, stack));
+    stacks.forEach((stack) => {
+      this.list.set(stack.name, stack);
+      stack.setApp(this);
+    });
     return this;
   }
   find(resourceType) {
@@ -4596,6 +4616,7 @@ var Renderer = class {
         }
       }
     }
+    await this.setCursor(0, size - start);
     this.screen = screen;
     this.flushing = false;
   }
@@ -4780,20 +4801,26 @@ var assetBuilder = (app) => {
         ]);
         group.update((group2) => [...group2, line]);
         const timer = createTimer();
-        const data = await asset.build({
-          async write(file, data2) {
-            const fullpath = join4(directories.asset, asset.type, app.name, stack.name, asset.id, file);
-            const basepath = dirname3(fullpath);
-            await mkdir2(basepath, { recursive: true });
-            await writeFile2(fullpath, data2);
-          }
-        });
-        details.set({
-          ...data,
-          time: timer()
-        });
-        icon.set(style.success(symbol.success));
-        stop();
+        try {
+          const data = await asset.build({
+            async write(file, data2) {
+              const fullpath = join4(directories.asset, asset.type, app.name, stack.name, asset.id, file);
+              const basepath = dirname3(fullpath);
+              await mkdir2(basepath, { recursive: true });
+              await writeFile2(fullpath, data2);
+            }
+          });
+          details.set({
+            ...data,
+            time: timer()
+          });
+          icon.set(style.success(symbol.success));
+        } catch (error) {
+          icon.set(style.error(symbol.error));
+          throw error;
+        } finally {
+          stop();
+        }
       }));
     }));
     done("Done building stack assets");
@@ -4877,7 +4904,7 @@ var shouldDeployBootstrap = async (client, stack) => {
 };
 
 // src/formation/client.ts
-import { CloudFormationClient, CreateStackCommand, DeleteStackCommand, DescribeStacksCommand, GetTemplateCommand, OnFailure, TemplateStage, UpdateStackCommand, ValidateTemplateCommand, waitUntilStackCreateComplete, waitUntilStackDeleteComplete, waitUntilStackUpdateComplete } from "@aws-sdk/client-cloudformation";
+import { CloudFormationClient, CreateStackCommand, DeleteStackCommand, DescribeStackEventsCommand, DescribeStacksCommand, GetTemplateCommand, OnFailure, TemplateStage, UpdateStackCommand, ValidateTemplateCommand, waitUntilStackCreateComplete, waitUntilStackDeleteComplete, waitUntilStackUpdateComplete } from "@aws-sdk/client-cloudformation";
 import { S3Client, PutObjectCommand, ObjectCannedACL, StorageClass } from "@aws-sdk/client-s3";
 import { paramCase as paramCase4 } from "change-case";
 var StackClient = class {
@@ -4891,7 +4918,7 @@ var StackClient = class {
   maxWaitTime = 60 * 30;
   // 30 minutes
   maxDelay = 30;
-  // 30 seconds
+  // 10 seconds
   assetBucketName;
   getClient(region) {
     return new CloudFormationClient({
@@ -4938,7 +4965,7 @@ var StackClient = class {
   async create(stack, capabilities) {
     debug("Create the", style.info(stack.name), "stack");
     const client = this.getClient(stack.region);
-    await client.send(new CreateStackCommand({
+    const result = await client.send(new CreateStackCommand({
       StackName: this.stackName(stack.name),
       EnableTerminationProtection: false,
       OnFailure: OnFailure.DELETE,
@@ -4946,36 +4973,53 @@ var StackClient = class {
       Tags: this.tags(stack),
       ...this.templateProp(stack)
     }));
-    await waitUntilStackCreateComplete({
-      client,
-      maxWaitTime: this.maxWaitTime,
-      maxDelay: this.maxDelay
-    }, {
-      StackName: this.stackName(stack.name)
-    });
+    try {
+      await waitUntilStackCreateComplete({
+        client,
+        maxWaitTime: this.maxWaitTime,
+        maxDelay: this.maxDelay
+      }, {
+        StackName: result.StackId
+      });
+    } catch (_) {
+      const reason = await this.getFailureReason(
+        result.StackId,
+        stack.region
+      );
+      throw new Error(reason);
+    }
   }
   async update(stack, capabilities) {
     debug("Update the", style.info(stack.name), "stack");
     const client = this.getClient(stack.region);
+    let result;
     try {
-      await client.send(new UpdateStackCommand({
+      result = await client.send(new UpdateStackCommand({
         StackName: this.stackName(stack.name),
         Capabilities: capabilities,
         Tags: this.tags(stack),
         ...this.templateProp(stack)
       }));
+    } catch (error) {
+      if (error instanceof Error && error.name === "ValidationError" && error.message.toLowerCase().includes("no updates")) {
+        return;
+      }
+      throw error;
+    }
+    try {
       await waitUntilStackUpdateComplete({
         client,
         maxWaitTime: this.maxWaitTime,
         maxDelay: this.maxDelay
       }, {
-        StackName: this.stackName(stack.name)
+        StackName: result.StackId
       });
     } catch (error) {
-      if (error instanceof Error && error.name === "ValidationError" && error.message.toLowerCase().includes("no updates")) {
-        return;
-      }
-      throw error;
+      const reason = await this.getFailureReason(
+        result.StackId,
+        stack.region
+      );
+      throw new Error(reason);
     }
   }
   async validate(stack) {
@@ -5056,13 +5100,44 @@ var StackClient = class {
     await client.send(new DeleteStackCommand({
       StackName: this.stackName(name)
     }));
-    await waitUntilStackDeleteComplete({
-      client,
-      maxWaitTime: this.maxWaitTime,
-      maxDelay: this.maxDelay
-    }, {
-      StackName: this.stackName(name)
-    });
+    try {
+      await waitUntilStackDeleteComplete({
+        client,
+        maxWaitTime: this.maxWaitTime,
+        maxDelay: this.maxDelay
+      }, {
+        StackName: this.stackName(name)
+      });
+    } catch (_) {
+      const reason = await this.getFailureReason(name, region);
+      throw new Error(reason);
+    }
+  }
+  async getFailureReason(name, region) {
+    const client = this.getClient(region);
+    const result = await client.send(await new DescribeStackEventsCommand({
+      StackName: name
+    }));
+    const failureStatuses = [
+      "UPDATE_ROLLBACK_IN_PROGRESS",
+      "CREATE_FAILED",
+      "UPDATE_FAILED",
+      "DELETE_FAILED"
+    ];
+    let reason = "Unknown failure reason";
+    for (const event of result.StackEvents || []) {
+      if (event.ResourceStatusReason?.toLowerCase() === "user initiated") {
+        break;
+      }
+      if (failureStatuses.includes(event.ResourceStatus || "") && event.ResourceStatusReason) {
+        reason = [
+          `Logical ID: ${event.LogicalResourceId}`,
+          `Type: ${event.ResourceType}`,
+          `Reason: ${event.ResourceStatusReason}`
+        ].join("\n");
+      }
+    }
+    return reason;
   }
 };
 

package/dist/index.d.ts

@@ -2320,11 +2320,14 @@ type ConstructorOf<C> = {
 declare class Stack {
     readonly name: string;
     readonly region: Region;
+    private parent?;
     readonly exports: Map<string, string>;
     readonly resources: Set<Resource>;
     readonly tags: Map<string, string>;
     readonly assets: Set<Asset>;
     constructor(name: string, region: Region);
+    get app(): App | undefined;
+    setApp(app: App): this;
     add(...resources: (Resource | Asset | Group)[]): this;
     export(name: string, value: string): this;
     get(name: string): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.23",
+  "version": "0.0.25",
   "license": "MIT",
   "type": "module",
   "repository": {