@awsless/awsless 0.0.270 → 0.0.272

package/dist/bin.js

@@ -45,6 +45,215 @@ var logo = () => {
   return `${color.primary`AWS`}${color.primary.dim`LESS`}`;
 };
 
+// src/util/aws.ts
+import { GetCallerIdentityCommand, STSClient } from "@aws-sdk/client-sts";
+import { fromIni } from "@aws-sdk/credential-providers";
+var getCredentials = (profile) => {
+  return fromIni({ profile });
+};
+var getAccountId = async (credentials, region) => {
+  const client = new STSClient({ credentials, region });
+  const result = await client.send(new GetCallerIdentityCommand({}));
+  return result.Account;
+};
+
+// src/cli/ui/complex/bootstrap-awsless.ts
+import {
+  BillingMode,
+  CreateTableCommand,
+  DescribeTableCommand,
+  DynamoDB,
+  KeyType,
+  ResourceNotFoundException,
+  ScalarAttributeType
+} from "@aws-sdk/client-dynamodb";
+import { CreateBucketCommand, HeadBucketCommand, S3Client, S3ServiceException } from "@aws-sdk/client-s3";
+import { confirm, log } from "@clack/prompts";
+
+// src/error.ts
+var ConfigError = class extends Error {
+  constructor(file, error, data) {
+    super(error.message);
+    this.file = file;
+    this.error = error;
+    this.data = data;
+  }
+};
+var FileError = class extends Error {
+  constructor(file, message) {
+    super(message);
+    this.file = file;
+  }
+};
+var Cancelled = class extends Error {
+  constructor() {
+    super("Cancelled");
+  }
+};
+
+// src/cli/ui/util.ts
+import wrapAnsi from "wrap-ansi";
+import Table from "cli-table3";
+import { capitalCase } from "change-case";
+import { spinner } from "@clack/prompts";
+var wrap = (lines, options) => {
+  return wrapAnsi(typeof lines === "string" ? lines : lines.join("\n"), process.stdout.columns - 8, options);
+};
+var padText = (texts) => {
+  const size = Math.max(...texts.map((text3) => text3.length));
+  return (text3, padding = 0, fill) => {
+    return text3.padEnd(size + padding, fill);
+  };
+};
+var task = async (message, cb) => {
+  let last = message;
+  const spin = spinner();
+  spin.start(last);
+  try {
+    const result = await cb((m) => {
+      spin.message(m);
+      last = m;
+    });
+    spin.stop(last);
+    return result;
+  } catch (error) {
+    spin.stop("Failed.", 2);
+    throw error;
+  }
+};
+var list = (data) => {
+  const padName = padText(Object.keys(data));
+  return Object.entries(data).map(([name, value]) => [color.label(padName(name + ":", 2)), value].join("")).join(char.br);
+};
+var table = (props) => {
+  console.log(color.line("\u2502"));
+  const table2 = new Table({
+    // wordWrap: true,
+    // wrapOnWordBoundary: false,
+    // truncate: '...',
+    // colWidths: props.colWidths,
+    // head: props.head.map(h => color.label(capitalCase(h))),
+    head: props.head.map((h) => "\n" + color.label(capitalCase(h))),
+    // colWidths: [100, 200],
+    style: {
+      "padding-left": 2,
+      "padding-right": 2
+    },
+    chars: {
+      "bottom-right": "\u256F",
+      "top-right": "\u256E",
+      "top-left": "\u251C",
+      "bottom-left": "\u251C"
+      // mid: '',
+      // 'mid-mid': '',
+      // 'left-mid': '',
+      // 'right-mid': '',
+    }
+  });
+  table2.push(
+    ...props.body.map(
+      (row) => row.map((v) => {
+        if (typeof v === "boolean") {
+          return v ? color.success("yes") : color.error("no");
+        }
+        return v;
+      })
+    )
+  );
+  return table2.toString();
+};
+
+// src/cli/ui/complex/bootstrap-awsless.ts
+var hasLockTable = async (client) => {
+  try {
+    const result = await client.send(
+      new DescribeTableCommand({
+        TableName: "awsless-locks"
+      })
+    );
+    return !!result.Table;
+  } catch (error) {
+    if (error instanceof ResourceNotFoundException) {
+      return false;
+    }
+    throw error;
+  }
+};
+var hasStateBucket = async (client, accountId) => {
+  try {
+    const result = await client.send(
+      new HeadBucketCommand({
+        Bucket: `awsless-state-${accountId}`
+      })
+    );
+    return !!result.BucketRegion;
+  } catch (error) {
+    console.log(error);
+    if (error instanceof S3ServiceException) {
+      return false;
+    }
+    throw error;
+  }
+};
+var createLockTable = (client) => {
+  return client.send(
+    new CreateTableCommand({
+      TableName: "awsless-locks",
+      BillingMode: BillingMode.PAY_PER_REQUEST,
+      KeySchema: [
+        {
+          AttributeName: "urn",
+          KeyType: KeyType.HASH
+        }
+      ],
+      AttributeDefinitions: [
+        {
+          AttributeName: "urn",
+          AttributeType: ScalarAttributeType.S
+        }
+      ]
+    })
+  );
+};
+var createStateBucket = (client) => {
+  return client.send(
+    new CreateBucketCommand({
+      Bucket: "awsless-state"
+    })
+  );
+};
+var bootstrapAwsless = async (props) => {
+  const dynamo = new DynamoDB(props);
+  const s3 = new S3Client(props);
+  const [table2, bucket] = await Promise.all([
+    //
+    hasLockTable(dynamo),
+    hasStateBucket(s3, props.accountId)
+  ]);
+  if (!table2 || !bucket) {
+    log.warn(`Your Awsless hasn't been bootstrapped yet.`);
+    if (!process.env.SKIP_PROMPT) {
+      const confirmed = await confirm({
+        message: "Would you like to bootstrap now?"
+      });
+      if (!confirmed) {
+        throw new Cancelled();
+      }
+    }
+    await task("Bootstrapping", async (update) => {
+      if (!table2) {
+        await createLockTable(dynamo);
+      }
+      if (!bucket) {
+        await createStateBucket(s3);
+      }
+      update("Done deploying the bootstrap stack");
+    });
+  } else {
+    log.step("Awsless has already been bootstrapped.");
+  }
+};
+
 // src/cli/ui/complex/layout.ts
 import { intro, outro } from "@clack/prompts";
 
@@ -1200,29 +1409,6 @@ import { basename, dirname, extname, join as join3 } from "path";
 import { readFile } from "fs/promises";
 import JSON5 from "json5";
 import merge from "deepmerge";
-
-// src/error.ts
-var ConfigError = class extends Error {
-  constructor(file, error, data) {
-    super(error.message);
-    this.file = file;
-    this.error = error;
-    this.data = data;
-  }
-};
-var FileError = class extends Error {
-  constructor(file, message) {
-    super(message);
-    this.file = file;
-  }
-};
-var Cancelled = class extends Error {
-  constructor() {
-    super("Cancelled");
-  }
-};
-
-// src/config/load/read.ts
 var readConfig = async (file) => {
   try {
     const json4 = await readFile(file, "utf8");
@@ -1305,80 +1491,6 @@ var loadStackConfigs = async (options) => {
 
 // src/cli/ui/app.ts
 import { note } from "@clack/prompts";
-
-// src/cli/ui/util.ts
-import wrapAnsi from "wrap-ansi";
-import Table from "cli-table3";
-import { capitalCase } from "change-case";
-import { spinner } from "@clack/prompts";
-var wrap = (lines, options) => {
-  return wrapAnsi(typeof lines === "string" ? lines : lines.join("\n"), process.stdout.columns - 8, options);
-};
-var padText = (texts) => {
-  const size = Math.max(...texts.map((text3) => text3.length));
-  return (text3, padding = 0, fill) => {
-    return text3.padEnd(size + padding, fill);
-  };
-};
-var task = async (message, cb) => {
-  let last = message;
-  const spin = spinner();
-  spin.start(last);
-  try {
-    const result = await cb((m) => {
-      spin.message(m);
-      last = m;
-    });
-    spin.stop(last);
-    return result;
-  } catch (error) {
-    spin.stop("Failed.", 2);
-    throw error;
-  }
-};
-var list = (data) => {
-  const padName = padText(Object.keys(data));
-  return Object.entries(data).map(([name, value]) => [color.label(padName(name + ":", 2)), value].join("")).join(char.br);
-};
-var table = (props) => {
-  console.log(color.line("\u2502"));
-  const table2 = new Table({
-    // wordWrap: true,
-    // wrapOnWordBoundary: false,
-    // truncate: '...',
-    // colWidths: props.colWidths,
-    // head: props.head.map(h => color.label(capitalCase(h))),
-    head: props.head.map((h) => "\n" + color.label(capitalCase(h))),
-    // colWidths: [100, 200],
-    style: {
-      "padding-left": 2,
-      "padding-right": 2
-    },
-    chars: {
-      "bottom-right": "\u256F",
-      "top-right": "\u256E",
-      "top-left": "\u251C",
-      "bottom-left": "\u251C"
-      // mid: '',
-      // 'mid-mid': '',
-      // 'left-mid': '',
-      // 'right-mid': '',
-    }
-  });
-  table2.push(
-    ...props.body.map(
-      (row) => row.map((v) => {
-        if (typeof v === "boolean") {
-          return v ? color.success("yes") : color.error("no");
-        }
-        return v;
-      })
-    )
-  );
-  return table2.toString();
-};
-
-// src/cli/ui/app.ts
 var logApp = (app) => {
   note(
     wrap(
@@ -1393,7 +1505,7 @@ var logApp = (app) => {
 };
 
 // src/cli/ui/error/error.ts
-import { log as log5 } from "@clack/prompts";
+import { log as log6 } from "@clack/prompts";
 
 // src/cli/ui/error/config-error.ts
 import * as p from "@clack/prompts";
@@ -1483,7 +1595,7 @@ import { AppError as AppError2, StackError as StackError3 } from "@awsless/forma
 
 // src/cli/ui/error/stack-error.ts
 import { ResourceError } from "@awsless/formation";
-import { log as log2 } from "@clack/prompts";
+import { log as log3 } from "@clack/prompts";
 import { capitalCase as capitalCase2 } from "change-case";
 var formatOperation = (operation) => {
   const value = ` ${capitalCase2(operation)} `;
@@ -1501,7 +1613,7 @@ var formatOperation = (operation) => {
   }
 };
 var logStackError = (error) => {
-  log2.message(
+  log3.message(
     wrap([color.error(error.message), `Stack: ${error.stack}`].join("\n"), {
       hard: true
     }),
@@ -1509,7 +1621,7 @@ var logStackError = (error) => {
   );
   for (const issue of error.issues) {
     if (issue instanceof ResourceError) {
-      log2.message(
+      log3.message(
         [
           formatOperation(issue.operation),
           "\n",
@@ -1523,7 +1635,7 @@ var logStackError = (error) => {
         { symbol: color.error(icon.error) }
       );
     } else if (issue instanceof Error) {
-      log2.message(wrap(color.error(issue.message), { hard: true }), {
+      log3.message(wrap(color.error(issue.message), { hard: true }), {
         symbol: color.error(icon.error)
       });
     }
@@ -1531,9 +1643,9 @@ var logStackError = (error) => {
 };
 
 // src/cli/ui/error/file-error.ts
-import { log as log3 } from "@clack/prompts";
+import { log as log4 } from "@clack/prompts";
 var logFileError = (error) => {
-  log3.message(
+  log4.message(
     wrap([color.error(error.message), color.dim(error.file)].join("\n"), {
       hard: true
     }),
@@ -1543,9 +1655,9 @@ var logFileError = (error) => {
 
 // src/cli/ui/error/app-error.ts
 import { StackError as StackError2 } from "@awsless/formation";
-import { log as log4 } from "@clack/prompts";
+import { log as log5 } from "@clack/prompts";
 var logAppError = (error) => {
-  log4.message(
+  log5.message(
     wrap([color.error(error.message), `App: ${error.app}`].join("\n"), {
       hard: true
     }),
@@ -1555,7 +1667,7 @@ var logAppError = (error) => {
     if (issue instanceof StackError2) {
       logStackError(issue);
     } else if (issue instanceof Error) {
-      log4.message(wrap(color.error(issue.message), { hard: true }), {
+      log5.message(wrap(color.error(issue.message), { hard: true }), {
         symbol: color.error(icon.error)
       });
     }
@@ -1567,7 +1679,7 @@ var logError = (error) => {
   if (error instanceof ConfigError) {
     logConfigError(error);
   } else if (error instanceof Cancelled) {
-    log5.message(color.error("Cancelled."), {
+    log6.message(color.error("Cancelled."), {
       symbol: color.error(icon.error)
     });
   } else if (error instanceof AppError2) {
@@ -1579,18 +1691,18 @@ var logError = (error) => {
   } else if (error instanceof Error) {
     const message = `${error.name}: ${error.message}`;
     const stack = error.stack ? color.dim(error.stack.replace(message, "")) : "";
-    log5.message(
+    log6.message(
       wrap([color.error(message), stack], {
         hard: true
       }),
       { symbol: color.error(icon.error) }
     );
   } else if (typeof error === "string") {
-    log5.message(wrap(color.error(error)), {
+    log6.message(wrap(color.error(error)), {
       symbol: color.error(icon.error)
     });
   } else {
-    log5.message(wrap(color.error("Unknown error!")), {
+    log6.message(wrap(color.error("Unknown error!")), {
       symbol: color.error(icon.error)
     });
   }
@@ -1617,128 +1729,16 @@ var layout = async (command, cb) => {
   }
 };
 
-// src/cli/ui/complex/bootstrap-awsless.ts
-import {
-  BillingMode,
-  CreateTableCommand,
-  DescribeTableCommand,
-  DynamoDB,
-  KeyType,
-  ResourceNotFoundException,
-  ScalarAttributeType
-} from "@aws-sdk/client-dynamodb";
-import { confirm, log as log6 } from "@clack/prompts";
-import { CreateBucketCommand, HeadBucketCommand, S3Client, S3ServiceException } from "@aws-sdk/client-s3";
-var hasLockTable = async (client) => {
-  try {
-    const result = await client.send(
-      new DescribeTableCommand({
-        TableName: "awsless-locks"
-      })
-    );
-    return !!result.Table;
-  } catch (error) {
-    if (error instanceof ResourceNotFoundException) {
-      return false;
-    }
-    throw error;
-  }
-};
-var hasStateBucket = async (client) => {
-  try {
-    const result = await client.send(
-      new HeadBucketCommand({
-        Bucket: "awsless-state"
-      })
-    );
-    return !!result.BucketRegion;
-  } catch (error) {
-    console.log(error);
-    if (error instanceof S3ServiceException) {
-      return false;
-    }
-    throw error;
-  }
-};
-var createLockTable = (client) => {
-  return client.send(
-    new CreateTableCommand({
-      TableName: "awsless-locks",
-      BillingMode: BillingMode.PAY_PER_REQUEST,
-      KeySchema: [
-        {
-          AttributeName: "urn",
-          KeyType: KeyType.HASH
-        }
-      ],
-      AttributeDefinitions: [
-        {
-          AttributeName: "urn",
-          AttributeType: ScalarAttributeType.S
-        }
-      ]
-    })
-  );
-};
-var createStateBucket = (client) => {
-  return client.send(
-    new CreateBucketCommand({
-      Bucket: "awsless-state"
-    })
-  );
-};
-var bootstrapAwsless = async (props) => {
-  const dynamo = new DynamoDB(props);
-  const s3 = new S3Client(props);
-  const [table2, bucket] = await Promise.all([
-    //
-    hasLockTable(dynamo),
-    hasStateBucket(s3)
-  ]);
-  if (!table2 || !bucket) {
-    log6.warn(`Your Awsless hasn't been bootstrapped yet.`);
-    if (!process.env.SKIP_PROMPT) {
-      const confirmed = await confirm({
-        message: "Would you like to bootstrap now?"
-      });
-      if (!confirmed) {
-        throw new Cancelled();
-      }
-    }
-    await task("Bootstrapping", async (update) => {
-      if (!table2) {
-        await createLockTable(dynamo);
-      }
-      if (!bucket) {
-        await createStateBucket(s3);
-      }
-      update("Done deploying the bootstrap stack");
-    });
-  } else {
-    log6.step("Awsless has already been bootstrapped.");
-  }
-};
-
-// src/util/aws.ts
-import { GetCallerIdentityCommand, STSClient } from "@aws-sdk/client-sts";
-import { fromIni } from "@aws-sdk/credential-providers";
-var getCredentials = (profile) => {
-  return fromIni({ profile });
-};
-var getAccountId = async (credentials, region) => {
-  const client = new STSClient({ credentials, region });
-  const result = await client.send(new GetCallerIdentityCommand({}));
-  return result.Account;
-};
-
 // src/cli/command/bootstrap.ts
 var bootstrap = (program2) => {
   program2.command("bootstrap").description("Create the awsless bootstrap stack").action(async () => {
     await layout("bootstrap", async ({ appConfig }) => {
       const credentials = getCredentials(appConfig.profile);
+      const accountId = await getAccountId(credentials, appConfig.region);
       await bootstrapAwsless({
         credentials,
-        region: appConfig.region
+        region: appConfig.region,
+        accountId
       });
       return "Ready to go!";
     });
@@ -4933,7 +4933,7 @@ var createWorkSpace = (props) => {
   });
   const stateProvider = new aws22.s3.StateProvider({
     ...props,
-    bucket: "awsless-state"
+    bucket: `awsless-state-${props.accountId}`
   });
   const cloudProviders = aws22.createCloudProviders({
     ...props,
@@ -5278,7 +5278,7 @@ var deploy = (program2) => {
       const region = appConfig.region;
       const credentials = getCredentials(appConfig.profile);
       const accountId = await getAccountId(credentials, region);
-      await bootstrapAwsless({ credentials, region });
+      await bootstrapAwsless({ credentials, region, accountId });
       const { app, tests, builders } = createApp({ appConfig, stackConfigs, accountId }, filters);
       const stackNames = [...app.stacks].map((stack) => stack.name);
       const formattedFilter = stackNames.map((i) => color.info(i)).join(color.dim(", "));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.270",
+  "version": "0.0.272",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -28,13 +28,13 @@
     }
   },
   "peerDependencies": {
-    "@awsless/lambda": "^0.0.19",
     "@awsless/open-search": "^0.0.12",
-    "@awsless/redis": "^0.0.12",
+    "@awsless/lambda": "^0.0.19",
     "@awsless/s3": "^0.0.15",
+    "@awsless/redis": "^0.0.12",
+    "@awsless/sqs": "^0.0.7",
     "@awsless/sns": "^0.0.7",
     "@awsless/ssm": "^0.0.7",
-    "@awsless/sqs": "^0.0.7",
     "@awsless/validate": "^0.0.14",
     "@awsless/weak-cache": "^0.0.1"
   },
@@ -102,11 +102,11 @@
     "zip-a-folder": "^3.1.6",
     "zod": "^3.21.4",
     "zod-to-json-schema": "^3.22.3",
-    "@awsless/duration": "^0.0.1",
-    "@awsless/formation": "^0.0.36",
     "@awsless/graphql": "^0.0.9",
     "@awsless/size": "^0.0.1",
+    "@awsless/formation": "^0.0.36",
     "@awsless/validate": "^0.0.14",
+    "@awsless/duration": "^0.0.1",
     "@awsless/code": "^0.0.10"
   },
   "scripts": {