@awsless/awsless 0.0.599 → 0.0.600

package/dist/bin.js

@@ -826,6 +826,7 @@ var AuthDefaultSchema = z9.record(
     // 	.optional()
     // 	.describe('The email configuration for sending messages.'),
     // secret: z.boolean().default(false).describe('Specifies whether you want to generate a client secret.'),
+    groups: z9.string().array().default([]).describe("Specifies a list of groups that a user can belong to."),
     username: z9.object({
       // emailAlias: z.boolean().default(true).describe('Allow the user email to be used as username.'),
       caseSensitive: z9.boolean().default(false).describe(
@@ -1084,11 +1085,11 @@ var FunctionDefaultSchema = z15.object({
   // container
   warm: WarmSchema.default(0),
   vpc: VPCSchema.default(false),
-  log: LogSchema.default(true).transform((log27) => ({
-    retention: log27.retention ?? days(7),
-    level: "level" in log27 ? log27.level : "error",
-    system: "system" in log27 ? log27.system : "warn",
-    format: "format" in log27 ? log27.format : "json"
+  log: LogSchema.default(true).transform((log28) => ({
+    retention: log28.retention ?? days(7),
+    level: "level" in log28 ? log28.level : "error",
+    system: "system" in log28 ? log28.system : "warn",
+    format: "format" in log28 ? log28.format : "json"
   })),
   timeout: TimeoutSchema.default("10 seconds"),
   memorySize: MemorySizeSchema.default("128 MB"),
@@ -1616,8 +1617,8 @@ var InstanceDefaultSchema = z25.object({
   permissions: PermissionsSchema2.optional(),
   healthCheck: HealthCheckSchema.optional(),
   // restartPolicy: RestartPolicySchema.default({ enabled: true }),
-  log: LogSchema2.default(true).transform((log27) => ({
-    retention: log27.retention ?? days4(7)
+  log: LogSchema2.default(true).transform((log28) => ({
+    retention: log28.retention ?? days4(7)
   }))
 }).default({});
 
@@ -2738,6 +2739,12 @@ var authFeature = defineFeature({
         explicitAuthFlows: ["ALLOW_USER_SRP_AUTH", "ALLOW_REFRESH_TOKEN_AUTH"],
         preventUserExistenceErrors: "ENABLED"
       });
+      for (const name2 of props.groups) {
+        new aws2.cognito.UserGroup(group, name2, {
+          name: name2,
+          userPoolId: userPool.id
+        });
+      }
       ctx.bind(`AUTH_${constantCase2(id)}_USER_POOL_ID`, userPool.id);
       ctx.bind(`AUTH_${constantCase2(id)}_CLIENT_ID`, client.id);
       ctx.shared.add("auth", "user-pool-arn", id, userPool.arn);
@@ -6528,7 +6535,7 @@ var buildExecutable = async (input, outputPath, architecture) => {
   }
   if (!result.success) {
     throw new ExpectedError(`Executable build failed:
-${result.logs?.map((log27) => log27.message).join("\n")}`);
+${result.logs?.map((log28) => log28.message).join("\n")}`);
   }
   const file = await readFile4(filePath);
   return {
@@ -8821,10 +8828,10 @@ var startTest = async (props) => {
       tests.push(entry);
       if ("task" in test2) {
         const task2 = test2.task;
-        for (const log27 of task2.logs ?? []) {
+        for (const log28 of task2.logs ?? []) {
           entry.logs.push({
-            time: log27.time,
-            text: log27.content
+            time: log28.time,
+            text: log28.content
           });
         }
       }
@@ -8892,7 +8899,7 @@ var logTestLogs = (event) => {
         ].join(" "),
         color.line(icon.dot)
       );
-      log16.message(test2.logs.map((log27) => log27.text).join("\n"));
+      log16.message(test2.logs.map((log28) => log28.text).join("\n"));
     }
   }
 };
@@ -9109,11 +9116,13 @@ var deploy = (program2) => {
 
 // src/cli/command/auth/user/create.ts
 import {
+  AdminAddUserToGroupCommand,
   AdminCreateUserCommand,
   AdminSetUserPasswordCommand,
-  CognitoIdentityProviderClient
+  CognitoIdentityProviderClient,
+  UsernameExistsException
 } from "@aws-sdk/client-cognito-identity-provider";
-import { prompt as prompt8 } from "@awsless/clui";
+import { log as log19, prompt as prompt8 } from "@awsless/clui";
 var create = (program2) => {
   program2.command("create").argument("[name]", "The name of the auth instance").description("Create an user for your userpool").action(async (name) => {
     await layout("auth user create", async ({ appConfig, stackConfigs }) => {
@@ -9134,24 +9143,31 @@ var create = (program2) => {
           }))
         });
       }
-      if (!(name in appConfig.defaults.auth)) {
+      const props = appConfig.defaults.auth[name];
+      if (!props) {
         throw new ExpectedError(`Provided auth name doesn't exist inside your app config.`);
       }
-      const { shared, app } = createApp({ appConfig, stackConfigs, accountId });
-      const { workspace } = await createWorkSpace({
-        credentials,
-        accountId,
-        profile,
-        region
+      const userPoolId = await log19.task({
+        initialMessage: "Loading auth userpool...",
+        successMessage: "Done loading auth userpool.",
+        errorMessage: "Failed loading auth userpool.",
+        async task() {
+          const { shared, app } = createApp({ appConfig, stackConfigs, accountId });
+          const { workspace } = await createWorkSpace({
+            credentials,
+            accountId,
+            profile,
+            region
+          });
+          await workspace.hydrate(app);
+          try {
+            return await shared.entry("auth", `user-pool-id`, name);
+          } catch (_) {
+            throw new ExpectedError(`The auth userpool hasn't been deployed yet.`);
+          }
+        }
       });
-      await workspace.hydrate(app);
-      let userPoolId;
-      try {
-        userPoolId = await shared.entry("auth", `user-pool-id`, name);
-      } catch (_) {
-        throw new ExpectedError(`The auth userpool hasn't been deployed yet.`);
-      }
-      const user2 = await prompt8.text({
+      const username = await prompt8.text({
         message: "Username:",
         validate(value) {
           if (!value) {
@@ -9160,35 +9176,84 @@ var create = (program2) => {
           return;
         }
       });
-      const pass = await prompt8.password({
+      const password = await prompt8.password({
         message: "Password:",
         validate(value) {
           if (!value) {
             return "Required";
           }
+          if (value.length < props.password.minLength) {
+            return `Min length is ${props.password.minLength}`;
+          }
+          if (props.password.lowercase && value.toUpperCase() === value) {
+            return `Should include lowercase characters`;
+          }
+          if (props.password.uppercase && value.toLowerCase() === value) {
+            return `Should include uppercase characters`;
+          }
+          if (props.password.numbers && !/\d/.test(value)) {
+            return `Should include numbers`;
+          }
+          if (props.password.symbols && !/[ `!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?~]/.test(value)) {
+            return `Should include symbols`;
+          }
           return;
         }
       });
+      let groups = [];
+      if (props.groups.length > 0) {
+        groups = await prompt8.multiSelect({
+          message: "Groups:",
+          required: false,
+          options: props.groups.map((g) => ({
+            value: g
+          }))
+        });
+      }
       const client = new CognitoIdentityProviderClient({
         region,
         credentials
       });
-      await client.send(
-        new AdminCreateUserCommand({
-          UserPoolId: userPoolId,
-          Username: user2.toString(),
-          TemporaryPassword: pass.toString()
-        })
-      );
-      await client.send(
-        new AdminSetUserPasswordCommand({
-          UserPoolId: userPoolId,
-          Username: user2.toString(),
-          Password: pass.toString(),
-          Permanent: true
-        })
-      );
-      return "User created.";
+      await log19.task({
+        initialMessage: "Creating user...",
+        successMessage: "User created.",
+        errorMessage: "Failed creating user.",
+        async task() {
+          try {
+            await client.send(
+              new AdminCreateUserCommand({
+                UserPoolId: userPoolId,
+                Username: username,
+                TemporaryPassword: password
+              })
+            );
+          } catch (error) {
+            if (error instanceof UsernameExistsException) {
+              throw new ExpectedError("User already exists");
+            }
+            throw error;
+          }
+          await client.send(
+            new AdminSetUserPasswordCommand({
+              UserPoolId: userPoolId,
+              Username: username,
+              Password: password,
+              Permanent: true
+            })
+          );
+          if (groups.length > 0) {
+            for (const group of groups) {
+              await client.send(
+                new AdminAddUserToGroupCommand({
+                  UserPoolId: userPoolId,
+                  Username: username,
+                  GroupName: group
+                })
+              );
+            }
+          }
+        }
+      });
     });
   });
 };
@@ -9208,7 +9273,7 @@ var auth = (program2) => {
 };
 
 // src/cli/command/bind.ts
-import { log as log19 } from "@awsless/clui";
+import { log as log20 } from "@awsless/clui";
 import { constantCase as constantCase15 } from "change-case";
 import { spawn } from "child_process";
 var bind = (program2) => {
@@ -9231,9 +9296,9 @@ var bind = (program2) => {
         env[name] = await value;
       }
       if (Object.keys(env).length > 0) {
-        log19.list("Bind Env", env);
+        log20.list("Bind Env", env);
       } else {
-        log19.warning("No bindings available.");
+        log20.warning("No bindings available.");
       }
       const configList = opts.config ?? [];
       const configs = {};
@@ -9241,7 +9306,7 @@ var bind = (program2) => {
         configs[`CONFIG_${constantCase15(name)}`] = name;
       }
       if (configList.length ?? 0 > 0) {
-        log19.note("Bind Config", configList.map((v) => color.label(constantCase15(v))).join("\n"));
+        log20.note("Bind Config", configList.map((v) => color.label(constantCase15(v))).join("\n"));
       }
       if (commands9.length === 0) {
         return "No command to execute.";
@@ -9300,7 +9365,7 @@ var watchConfig = async (options, resolve, reject) => {
 };
 
 // src/cli/ui/complex/build-types.ts
-import { log as log20 } from "@awsless/clui";
+import { log as log21 } from "@awsless/clui";
 
 // src/type-gen/generate.ts
 import { mkdir as mkdir5, writeFile as writeFile4 } from "fs/promises";
@@ -9334,7 +9399,7 @@ var generateTypes = async (props) => {
 // src/cli/ui/complex/build-types.ts
 var buildTypes = async (props) => {
   await generateTypes(props);
-  log20.step("Done generating type definition files.");
+  log21.step("Done generating type definition files.");
 };
 
 // src/cli/command/dev.ts
@@ -9358,7 +9423,7 @@ var dev = (program2) => {
 };
 
 // src/cli/command/resources.ts
-import { log as log21 } from "@awsless/clui";
+import { log as log22 } from "@awsless/clui";
 import chalk4 from "chalk";
 import wildstring5 from "wildstring";
 var resources = (program2) => {
@@ -9401,9 +9466,9 @@ var resources = (program2) => {
             continue;
           }
         }
-        log21.step(chalk4.magenta(stack.name));
+        log22.step(chalk4.magenta(stack.name));
         if (stack.resources.length) {
-          log21.message(
+          log22.message(
             stack.resources.map((r) => {
               return [
                 //
@@ -9414,7 +9479,7 @@ var resources = (program2) => {
             }).join("\n")
           );
         } else {
-          log21.message(color.line(`(empty)`));
+          log22.message(color.line(`(empty)`));
         }
       }
     });
@@ -9585,7 +9650,7 @@ var types = (program2) => {
 };
 
 // src/cli/command/domain/list.ts
-import { log as log22 } from "@awsless/clui";
+import { log as log23 } from "@awsless/clui";
 var list2 = (program2) => {
   program2.command("list").description("List all domains").action(async () => {
     await layout("domain list", async ({ appConfig, stackConfigs }) => {
@@ -9607,7 +9672,7 @@ var list2 = (program2) => {
       });
       await workspace.hydrate(app);
       for (const zone of domainZones) {
-        log22.step(
+        log23.step(
           [
             //
             color.label.green(await zone.name),
@@ -9615,14 +9680,14 @@ var list2 = (program2) => {
             color.dim(await zone.id)
           ].join(" ")
         );
-        log22.message((await zone.nameServers).join("\n"));
+        log23.message((await zone.nameServers).join("\n"));
       }
     });
   });
 };
 
 // src/cli/command/domain/deploy.ts
-import { log as log23 } from "@awsless/clui";
+import { log as log24 } from "@awsless/clui";
 var deploy2 = (program2) => {
   program2.command("deploy").description("Deploy the domain zones to AWS").action(async () => {
     await layout("domain deploy", async ({ appConfig, stackConfigs }) => {
@@ -9642,7 +9707,7 @@ var deploy2 = (program2) => {
         profile,
         region
       });
-      await log23.task({
+      await log24.task({
         initialMessage: "Deploying the domain zones to AWS...",
         successMessage: "Done deploying the domain zones to AWS.",
         errorMessage: "Failed deploying the domain zones to AWS.",
@@ -9651,7 +9716,7 @@ var deploy2 = (program2) => {
         }
       });
       for (const zone of domainZones) {
-        log23.step(
+        log24.step(
           [
             //
             color.label.green(await zone.name),
@@ -9659,7 +9724,7 @@ var deploy2 = (program2) => {
             color.dim(await zone.id)
           ].join(" ")
         );
-        log23.message((await zone.nameServers).join("\n"));
+        log24.message((await zone.nameServers).join("\n"));
       }
     });
   });
@@ -9678,7 +9743,7 @@ var domain = (program2) => {
 
 // src/cli/command/logs.ts
 import { CloudWatchLogsClient, StartLiveTailCommand } from "@aws-sdk/client-cloudwatch-logs";
-import { log as log24 } from "@awsless/clui";
+import { log as log25 } from "@awsless/clui";
 import { aws as aws30 } from "@terraforge/aws";
 import chalk5 from "chalk";
 import chunk2 from "chunk";
@@ -9720,7 +9785,7 @@ var logs = (program2) => {
       process.once("SIGINT", () => {
         abort.abort();
       });
-      const streams = await log24.task({
+      const streams = await log25.task({
         initialMessage: "Connecting to the log stream...",
         errorMessage: "Failed to connect to the log stream.",
         async task(ctx) {
@@ -9777,7 +9842,7 @@ var formatLog = (level, date, group, message) => {
     SYSTEM: chalk5.blue
   };
   const levelColor = levels[level] ?? chalk5.cyan;
-  log24.message(
+  log25.message(
     [
       [
         //
@@ -9819,7 +9884,7 @@ var parseJsonLog = (message) => {
 // src/cli/command/image/clear-cache.ts
 import { CloudFrontClient as CloudFrontClient2, CreateInvalidationCommand as CreateInvalidationCommand2 } from "@aws-sdk/client-cloudfront";
 import { DeleteObjectsCommand, ListObjectsV2Command, S3Client as S3Client3 } from "@aws-sdk/client-s3";
-import { Cancelled as Cancelled2, log as log25, prompt as prompt12 } from "@awsless/clui";
+import { Cancelled as Cancelled2, log as log26, prompt as prompt12 } from "@awsless/clui";
 import { randomUUID } from "crypto";
 var clearCache = (program2) => {
   program2.command("clear-cache").argument("[stack]", "The stack name of the image proxy").argument("[name]", "The name of the image proxy").description("Clears the cache of the image proxy").action(async (stack, name) => {
@@ -9891,7 +9956,7 @@ var clearCache = (program2) => {
         region: "us-east-1"
       });
       let totalDeleted = 0;
-      await log25.task({
+      await log26.task({
         initialMessage: "Clearing cache...",
         successMessage: "Cache successfully cleared.",
         task: async () => {
@@ -9953,7 +10018,7 @@ var image = (program2) => {
 // src/cli/command/icon/clear-cache.ts
 import { CloudFrontClient as CloudFrontClient3, CreateInvalidationCommand as CreateInvalidationCommand3 } from "@aws-sdk/client-cloudfront";
 import { DeleteObjectsCommand as DeleteObjectsCommand2, ListObjectsV2Command as ListObjectsV2Command2, S3Client as S3Client4 } from "@aws-sdk/client-s3";
-import { Cancelled as Cancelled3, log as log26, prompt as prompt13 } from "@awsless/clui";
+import { Cancelled as Cancelled3, log as log27, prompt as prompt13 } from "@awsless/clui";
 import { randomUUID as randomUUID2 } from "crypto";
 var clearCache2 = (program2) => {
   program2.command("clear-cache").argument("[stack]", "The stack name of the icon proxy").argument("[name]", "The name of the icon proxy").description("Clears the cache of the icon proxy").action(async (stack, name) => {
@@ -10025,7 +10090,7 @@ var clearCache2 = (program2) => {
         region: "us-east-1"
       });
       let totalDeleted = 0;
-      await log26.task({
+      await log27.task({
         initialMessage: "Clearing cache...",
         successMessage: "Cache successfully cleared.",
         task: async () => {

package/dist/build-json-schema.js

@@ -64,6 +64,7 @@ var AuthDefaultSchema = z5.record(
     // 	.optional()
     // 	.describe('The email configuration for sending messages.'),
     // secret: z.boolean().default(false).describe('Specifies whether you want to generate a client secret.'),
+    groups: z5.string().array().default([]).describe("Specifies a list of groups that a user can belong to."),
     username: z5.object({
       // emailAlias: z.boolean().default(true).describe('Allow the user email to be used as username.'),
       caseSensitive: z5.boolean().default(false).describe(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.599",
+  "version": "0.0.600",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -35,20 +35,20 @@
   "peerDependencies": {
     "@awsless/big-float": "^0.1.5",
     "@awsless/cloudwatch": "^0.0.1",
-    "@awsless/duration": "^0.0.4",
     "@awsless/clui": "^0.0.8",
-    "@awsless/iot": "^0.0.3",
     "@awsless/dynamodb": "^0.3.8",
-    "@awsless/lambda": "^0.0.35",
+    "@awsless/duration": "^0.0.4",
     "@awsless/json": "^0.0.10",
+    "@awsless/iot": "^0.0.3",
+    "@awsless/open-search": "^0.0.21",
+    "@awsless/lambda": "^0.0.35",
     "@awsless/redis": "^0.0.14",
+    "@awsless/s3": "^0.0.21",
     "@awsless/sns": "^0.0.10",
     "@awsless/sqs": "^0.0.16",
-    "@awsless/validate": "^0.1.3",
-    "@awsless/open-search": "^0.0.21",
     "@awsless/ssm": "^0.0.7",
-    "@awsless/s3": "^0.0.21",
     "@awsless/weak-cache": "^0.0.1",
+    "@awsless/validate": "^0.1.3",
     "@awsless/mqtt": "^0.0.2"
   },
   "dependencies": {
@@ -142,12 +142,12 @@
     "@awsless/big-float": "^0.1.5",
     "@awsless/cloudwatch": "^0.0.1",
     "@awsless/duration": "^0.0.4",
+    "@awsless/graphql": "^0.0.9",
     "@awsless/json": "^0.0.10",
-    "@awsless/scheduler": "^0.0.4",
     "@awsless/size": "^0.0.2",
     "@awsless/validate": "^0.1.3",
+    "@awsless/scheduler": "^0.0.4",
     "@awsless/clui": "^0.0.8",
-    "@awsless/graphql": "^0.0.9",
     "@awsless/ts-file-cache": "^0.0.12"
   },
   "devDependencies": {