@awsless/awsless 0.0.268 → 0.0.270

package/dist/bin.js

@@ -493,6 +493,7 @@ var TypeSchema = z12.enum([
 var CommandSchema = z12.string().describe(`The script you want to execute when the instance starts up.`);
 var CodeSchema = LocalDirectorySchema.describe(`The code directory that will be deployed to your instance.`);
 var ConnectSchema = z12.boolean().describe("Allows you to connect to all instances with an Instance Connect Endpoint.");
+var EnvironmentSchema2 = z12.record(z12.string(), z12.string()).optional().describe("Environment variable key-value pairs.");
 var InstanceDefaultSchema = z12.object({
   connect: ConnectSchema.default(false)
 }).default({}).describe("Define the default settings for all instances in your stacks.");
@@ -502,7 +503,8 @@ var InstancesSchema = z12.record(
     image: ImageSchema,
     type: TypeSchema,
     code: CodeSchema,
-    command: CommandSchema.optional()
+    command: CommandSchema.optional(),
+    environment: EnvironmentSchema2.optional()
   })
 ).optional().describe("Define the instances in your stack.");
 
@@ -1718,8 +1720,8 @@ var bootstrapAwsless = async (props) => {
 };
 
 // src/util/aws.ts
+import { GetCallerIdentityCommand, STSClient } from "@aws-sdk/client-sts";
 import { fromIni } from "@aws-sdk/credential-providers";
-import { STSClient, GetCallerIdentityCommand } from "@aws-sdk/client-sts";
 var getCredentials = (profile) => {
   return fromIni({ profile });
 };
@@ -3453,7 +3455,6 @@ var instanceFeature = defineFeature({
     const group = new Node9(ctx.base, "instance", "asset");
     const bucket = new aws9.s3.Bucket(group, "bucket", {
       name: formatGlobalResourceName(ctx.appConfig.name, "instance", "assets"),
-      versioning: true,
       forceDelete: true
     });
     ctx.shared.set("instance-bucket-name", bucket.name);
@@ -3482,7 +3483,7 @@ var instanceFeature = defineFeature({
       const bucketName = ctx.shared.get("instance-bucket-name");
       const userData = new Output2([], (resolve) => {
         ctx.onReady(() => {
-          combine([bucketName, ...Object.values(env)]).apply(async ([bucketName2]) => {
+          combine([bucketName, ...Object.values(env)]).apply(([bucketName2]) => {
             const u = "ec2-user";
             const code2 = [
               `#!/bin/bash`,
@@ -3492,8 +3493,13 @@ var instanceFeature = defineFeature({
               `sudo -u ${u} unzip -o ${name} -d ./code`,
               `sudo -u ${u} rm ./${name}`,
               `cd ./code`,
+              // system environment vars
               ...Object.entries(env).map(([key, value]) => {
-                return `export ${key}="${unwrap(value)}"`;
+                return `echo export ${key}="${unwrap(value)}" >> /etc/profile`;
+              }),
+              // user environment vars
+              ...Object.entries(props.environment ?? {}).map(([key, value]) => {
+                return `echo export ${key}="${value}" >> /etc/profile`;
               }),
               props.command ? `sudo -u ${u} ${props.command}` : ""
             ].join("\n");
@@ -3525,8 +3531,6 @@ var instanceFeature = defineFeature({
         securityGroupIds: [ctx.shared.get("vpc-security-group-id")],
         monitoring: true,
         userData
-        // userData: userData.value.apply(Asset.fromString),
-        // userData: Asset.fromString('echo 1'),
       });
       const role = new aws9.iam.Role(group, "role", {
         name,
@@ -3537,16 +3541,8 @@ var instanceFeature = defineFeature({
         role: role.name
       });
       policy.addStatement({
-        actions: [
-          "s3:GetObject"
-          //
-          // 's3:*',
-        ],
-        resources: [
-          bucketName.apply((bucket) => `arn:aws:s3:::${bucket}/${name}`)
-          //
-          // '*',
-        ]
+        actions: ["s3:GetObject"],
+        resources: [bucketName.apply((bucket) => `arn:aws:s3:::${bucket}/${name}`)]
       });
       ctx.registerPolicy(policy);
       const profile = new aws9.iam.InstanceProfile(group, "profile", {
@@ -3558,7 +3554,6 @@ var instanceFeature = defineFeature({
         iamInstanceProfile: profile.arn,
         launchTemplate: template,
         subnetId: ctx.shared.get(`vpc-public-subnet-id-1`)
-        // keyName: props.ssh ? ctx.shared.get('instance-key-name') : undefined,
       });
       instance.dependsOn(code);
       const logGroup = new aws9.cloudWatch.LogGroup(group, "log", {
@@ -5318,71 +5313,142 @@ var deploy = (program2) => {
   });
 };
 
-// src/cli/command/diff.ts
-import { aws as aws23, WorkSpace as WorkSpace2 } from "@awsless/formation";
-import chalk7 from "chalk";
-var diff = (program2) => {
-  program2.command("diff").description("Diff your app with AWS").action(async (filters) => {
-    await layout("diff", async ({ appConfig, stackConfigs }) => {
+// src/cli/command/auth/user/create.ts
+import {
+  AdminCreateUserCommand,
+  AdminSetUserPasswordCommand,
+  CognitoIdentityProviderClient
+} from "@aws-sdk/client-cognito-identity-provider";
+import { unwrap as unwrap2 } from "@awsless/formation";
+import { password, select, text as text2 } from "@clack/prompts";
+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 }) => {
       const region = appConfig.region;
       const credentials = getCredentials(appConfig.profile);
       const accountId = await getAccountId(credentials, region);
-      await bootstrapAwsless({ credentials, region });
-      const { app, builders } = await createApp({ appConfig, stackConfigs, accountId }, filters);
-      await buildAssets(builders);
-      const workspace = new WorkSpace2({
-        stateProvider: new aws23.dynamodb.DynamoDBStateProvider({
-          credentials,
-          region,
-          tableName: "awsless-state"
-        }),
-        cloudProviders: aws23.createCloudProviders({
-          credentials,
-          region: appConfig.region
-        })
+      if (!name) {
+        name = await select({
+          message: "Select the auth userpool:",
+          options: Object.keys(appConfig.defaults.auth).map((name2) => ({
+            label: name2,
+            value: name2
+          }))
+        });
+      }
+      if (!(name in appConfig.defaults.auth)) {
+        throw new Error(`Provided auth name doesn't exist inside your app config.`);
+      }
+      const { shared, app } = createApp({ appConfig, stackConfigs, accountId });
+      const { workspace } = createWorkSpace({
+        credentials,
+        accountId,
+        region
       });
-      let total = 0;
-      const changes = [];
-      const formatResource = (stack, urn) => {
-        return urn.replace(stack.urn + ":", "").replace(/\{([a-z0-9\-]+)\}/gi, (_, v) => {
-          return `${color.dim("{")}${color.warning(v)}${color.dim("}")}`;
-        }).replaceAll(":", color.dim(":"));
-      };
-      await task("Find app differences", async () => {
-        for (const stack of app.stacks) {
-          const diff2 = await workspace.diffStack(stack);
-          total += diff2.creates.length;
-          total += diff2.updates.length;
-          total += diff2.deletes.length;
-          changes.push(
-            ...diff2.creates.map((v) => [
-              chalk7.magenta(stack.name),
-              color.success`create`,
-              formatResource(stack, v)
-            ]),
-            ...diff2.updates.map((v) => [
-              chalk7.magenta(stack.name),
-              color.warning`update`,
-              formatResource(stack, v)
-            ]),
-            ...diff2.deletes.map((v) => [
-              chalk7.magenta(stack.name),
-              color.error`delete`,
-              formatResource(stack, v)
-            ])
-          );
+      await workspace.hydrate(app);
+      let userPoolId;
+      try {
+        userPoolId = unwrap2(shared.get(`auth-${name}-user-pool-id`));
+      } catch (_) {
+        throw new Error(`The auth userpool hasn't been deployed yet.`);
+      }
+      const user2 = await text2({
+        message: "Username:",
+        validate(value) {
+          if (!value) {
+            return "Required";
+          }
+          return;
         }
-        return "Done finding app differences.";
       });
-      if (total > 0) {
-        console.log(
-          table({
-            head: ["stack", "operation", "resource"],
-            body: changes
-          })
-        );
+      const pass = await password({
+        message: "Password:",
+        mask: "*",
+        validate(value) {
+          if (!value) {
+            return "Required";
+          }
+          return;
+        }
+      });
+      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.";
+    });
+  });
+};
+
+// src/cli/command/auth/user/index.ts
+var commands2 = [create];
+var user = (program2) => {
+  const command = program2.command("user").description(`Manage auth users`);
+  commands2.forEach((cb) => cb(command));
+};
+
+// src/cli/command/auth/index.ts
+var commands3 = [user];
+var auth = (program2) => {
+  const command = program2.command("auth").description(`Manage auth`);
+  commands3.forEach((cb) => cb(command));
+};
+
+// src/cli/command/bind.ts
+import { unwrap as unwrap3 } from "@awsless/formation";
+import { note as note3 } from "@clack/prompts";
+import { spawn } from "child_process";
+var bind = (program2) => {
+  program2.command("bind").argument("<command...>", "The command to execute").description(`Bind your site environment variables to a command`).action(async (commands7) => {
+    await layout("bind", async ({ appConfig, stackConfigs }) => {
+      const region = appConfig.region;
+      const credentials = getCredentials(appConfig.profile);
+      const accountId = await getAccountId(credentials, region);
+      const { app, binds } = createApp({ appConfig, stackConfigs, accountId });
+      const { workspace } = createWorkSpace({
+        credentials,
+        accountId,
+        region
+      });
+      await workspace.hydrate(app);
+      const env = {};
+      for (const { name, value } of binds) {
+        env[name] = unwrap3(value);
       }
-      return `${color.warning(total)} resources have changed.`;
+      note3(wrap(list(env)), "Bind Env");
+      const command = commands7.join(" ");
+      spawn(command, {
+        env: {
+          // Pass the process env vars
+          ...process.env,
+          // Pass the site bind env vars
+          ...env,
+          // Basic info
+          AWS_REGION: appConfig.region,
+          AWS_ACCOUNT_ID: accountId
+          // Give AWS access
+          // AWS_ACCESS_KEY_ID: credentials.accessKeyId,
+          // AWS_SECRET_ACCESS_KEY: credentials.secretAccessKey,
+          // AWS_SESSION_TOKEN: credentials.sessionToken,
+        },
+        stdio: "inherit",
+        shell: true
+      });
     });
   });
 };
@@ -5425,75 +5491,6 @@ var buildTypes = async (props) => {
   log9.step("Done generating type definition files.");
 };
 
-// src/cli/command/types.ts
-var types = (program2) => {
-  program2.command("types").description("Generate type definition files").action(async () => {
-    await layout("types", async (props) => {
-      await buildTypes(props);
-      return `Ready to use the ${color.info("@awsless/awsless")} libary!`;
-    });
-  });
-};
-
-// src/cli/command/test.ts
-var test = (program2) => {
-  program2.command("test").argument("[stacks...]", "Optionally filter stacks to test").option("-f --filters <string...>", "Optionally filter test files").description("Test your app").action(async (stacks, options) => {
-    await layout("test", async (props) => {
-      const region = props.appConfig.region;
-      const credentials = getCredentials(props.appConfig.profile);
-      const accountId = await getAccountId(credentials, region);
-      const { tests } = createApp({ ...props, accountId }, stacks);
-      if (tests.length === 0) {
-        return "No tests found.";
-      }
-      await runTests(tests, options?.filters);
-      return "All tests finished.";
-    });
-  });
-};
-
-// src/cli/command/resource/list.ts
-import chalk8 from "chalk";
-var list3 = (program2) => {
-  program2.command("list").description(`List all defined resources`).action(async () => {
-    await layout("resource list", async ({ appConfig, stackConfigs }) => {
-      const region = appConfig.region;
-      const credentials = getCredentials(appConfig.profile);
-      const accountId = await getAccountId(credentials, region);
-      const { app } = createApp({ appConfig, stackConfigs, accountId });
-      const resources = [];
-      const formatResource = (stack, urn) => {
-        return urn.replace(stack.urn + ":", "").replace(/\{([a-z0-9\-\s\/\._]+)\}/gi, (_, v) => {
-          return `${color.dim("{")}${color.warning(v)}${color.dim("}")}`;
-        }).replaceAll(":", color.dim(":"));
-      };
-      for (const stack of app.stacks) {
-        for (const resource2 of stack.resources) {
-          resources.push([
-            chalk8.magenta(stack.name),
-            // resource.type,
-            formatResource(stack, resource2.urn)
-          ]);
-        }
-      }
-      console.log(
-        table({
-          // colWidths,
-          head: ["stack", "urn"],
-          body: resources
-        })
-      );
-    });
-  });
-};
-
-// src/cli/command/resource/index.ts
-var commands2 = [list3];
-var resource = (program2) => {
-  const command = program2.command("resource").description(`Manage app resources`);
-  commands2.forEach((cb) => cb(command));
-};
-
 // src/config/load/watch.ts
 import { watch } from "chokidar";
 var watchConfig = async (options, resolve, reject) => {
@@ -5541,6 +5538,48 @@ var dev = (program2) => {
   });
 };
 
+// src/cli/command/resource/list.ts
+import chalk7 from "chalk";
+var list3 = (program2) => {
+  program2.command("list").description(`List all defined resources`).action(async () => {
+    await layout("resource list", async ({ appConfig, stackConfigs }) => {
+      const region = appConfig.region;
+      const credentials = getCredentials(appConfig.profile);
+      const accountId = await getAccountId(credentials, region);
+      const { app } = createApp({ appConfig, stackConfigs, accountId });
+      const resources = [];
+      const formatResource = (stack, urn) => {
+        return urn.replace(stack.urn + ":", "").replace(/\{([a-z0-9\-\s\/\._]+)\}/gi, (_, v) => {
+          return `${color.dim("{")}${color.warning(v)}${color.dim("}")}`;
+        }).replaceAll(":", color.dim(":"));
+      };
+      for (const stack of app.stacks) {
+        for (const resource2 of stack.resources) {
+          resources.push([
+            chalk7.magenta(stack.name),
+            // resource.type,
+            formatResource(stack, resource2.urn)
+          ]);
+        }
+      }
+      console.log(
+        table({
+          // colWidths,
+          head: ["stack", "urn"],
+          body: resources
+        })
+      );
+    });
+  });
+};
+
+// src/cli/command/resource/index.ts
+var commands4 = [list3];
+var resource = (program2) => {
+  const command = program2.command("resource").description(`Manage app resources`);
+  commands4.forEach((cb) => cb(command));
+};
+
 // src/cli/command/state/pull.ts
 var pull = (program2) => {
   program2.command("pull").description("Pull the remote state and store it locally").action(async () => {
@@ -5579,149 +5618,63 @@ var push = (program2) => {
   });
 };
 
-// src/cli/command/state/index.ts
-var commands3 = [pull, push];
-var state = (program2) => {
-  const command = program2.command("state").description(`Manage app state`);
-  commands3.forEach((cb) => cb(command));
-};
-
-// src/cli/command/auth/user/create.ts
-import {
-  AdminCreateUserCommand,
-  AdminSetUserPasswordCommand,
-  CognitoIdentityProviderClient
-} from "@aws-sdk/client-cognito-identity-provider";
-import { unwrap as unwrap2 } from "@awsless/formation";
-import { password, select, text as text2 } from "@clack/prompts";
-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 }) => {
+// src/cli/command/state/unlock.ts
+import { confirm as confirm6 } from "@clack/prompts";
+var unlock = (program2) => {
+  program2.command("unlock").description("Release the lock that ensures sequential deployments").action(async () => {
+    await layout("state unlock", async ({ appConfig, stackConfigs }) => {
       const region = appConfig.region;
       const credentials = getCredentials(appConfig.profile);
       const accountId = await getAccountId(credentials, region);
-      if (!name) {
-        name = await select({
-          message: "Select the auth userpool:",
-          options: Object.keys(appConfig.defaults.auth).map((name2) => ({
-            label: name2,
-            value: name2
-          }))
-        });
-      }
-      if (!(name in appConfig.defaults.auth)) {
-        throw new Error(`Provided auth name doesn't exist inside your app config.`);
+      const { app } = createApp({ appConfig, stackConfigs, accountId });
+      const { lockProvider } = createWorkSpace({ credentials, region, accountId });
+      const isLocked = await lockProvider.locked(app.urn);
+      if (!isLocked) {
+        return "No lock is exists.";
       }
-      const { shared, app } = createApp({ appConfig, stackConfigs, accountId });
-      const { workspace } = createWorkSpace({
-        credentials,
-        accountId,
-        region
+      const ok = await confirm6({
+        message: "Releasing the lock that ensures sequential deployments might result in corrupt state if a deployment is still running. Are you sure?",
+        initialValue: false
       });
-      await workspace.hydrate(app);
-      let userPoolId;
-      try {
-        userPoolId = unwrap2(shared.get(`auth-${name}-user-pool-id`));
-      } catch (_) {
-        throw new Error(`The auth userpool hasn't been deployed yet.`);
+      if (!ok) {
+        throw new Cancelled();
       }
-      const user2 = await text2({
-        message: "Username:",
-        validate(value) {
-          if (!value) {
-            return "Required";
-          }
-          return;
-        }
-      });
-      const pass = await password({
-        message: "Password:",
-        mask: "*",
-        validate(value) {
-          if (!value) {
-            return "Required";
-          }
-          return;
-        }
-      });
-      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 lockProvider.insecureReleaseLock(app.urn);
+      return "The state lock was been successfully released.";
     });
   });
 };
 
-// src/cli/command/auth/user/index.ts
-var commands4 = [create];
-var user = (program2) => {
-  const command = program2.command("user").description(`Manage auth users`);
-  commands4.forEach((cb) => cb(command));
-};
-
-// src/cli/command/auth/index.ts
-var commands5 = [user];
-var auth = (program2) => {
-  const command = program2.command("auth").description(`Manage auth`);
+// src/cli/command/state/index.ts
+var commands5 = [pull, push, unlock];
+var state = (program2) => {
+  const command = program2.command("state").description(`Manage app state`);
   commands5.forEach((cb) => cb(command));
 };
 
-// src/cli/command/bind.ts
-import { unwrap as unwrap3 } from "@awsless/formation";
-import { note as note3 } from "@clack/prompts";
-import { spawn } from "child_process";
-var bind = (program2) => {
-  program2.command("bind").argument("<command...>", "The command to execute").description(`Bind your site environment variables to a command`).action(async (commands7) => {
-    await layout("bind", async ({ appConfig, stackConfigs }) => {
-      const region = appConfig.region;
-      const credentials = getCredentials(appConfig.profile);
+// src/cli/command/test.ts
+var test = (program2) => {
+  program2.command("test").argument("[stacks...]", "Optionally filter stacks to test").option("-f --filters <string...>", "Optionally filter test files").description("Test your app").action(async (stacks, options) => {
+    await layout("test", async (props) => {
+      const region = props.appConfig.region;
+      const credentials = getCredentials(props.appConfig.profile);
       const accountId = await getAccountId(credentials, region);
-      const { app, binds } = createApp({ appConfig, stackConfigs, accountId });
-      const { workspace } = createWorkSpace({
-        credentials,
-        accountId,
-        region
-      });
-      await workspace.hydrate(app);
-      const env = {};
-      for (const { name, value } of binds) {
-        env[name] = unwrap3(value);
+      const { tests } = createApp({ ...props, accountId }, stacks);
+      if (tests.length === 0) {
+        return "No tests found.";
       }
-      note3(wrap(list(env)), "Bind Env");
-      const command = commands7.join(" ");
-      spawn(command, {
-        env: {
-          // Pass the process env vars
-          ...process.env,
-          // Pass the site bind env vars
-          ...env,
-          // Basic info
-          AWS_REGION: appConfig.region,
-          AWS_ACCOUNT_ID: accountId
-          // Give AWS access
-          // AWS_ACCESS_KEY_ID: credentials.accessKeyId,
-          // AWS_SECRET_ACCESS_KEY: credentials.secretAccessKey,
-          // AWS_SESSION_TOKEN: credentials.sessionToken,
-        },
-        stdio: "inherit",
-        shell: true
-      });
+      await runTests(tests, options?.filters);
+      return "All tests finished.";
+    });
+  });
+};
+
+// src/cli/command/types.ts
+var types = (program2) => {
+  program2.command("types").description("Generate type definition files").action(async () => {
+    await layout("types", async (props) => {
+      await buildTypes(props);
+      return `Ready to use the ${color.info("@awsless/awsless")} libary!`;
     });
   });
 };
@@ -5732,7 +5685,7 @@ var commands6 = [
   types,
   build2,
   deploy,
-  diff,
+  // diff,
   del2,
   dev,
   bind,

package/dist/build-json-schema.js

@@ -473,6 +473,7 @@ var TypeSchema2 = z15.enum([
 var CommandSchema = z15.string().describe(`The script you want to execute when the instance starts up.`);
 var CodeSchema = LocalDirectorySchema.describe(`The code directory that will be deployed to your instance.`);
 var ConnectSchema = z15.boolean().describe("Allows you to connect to all instances with an Instance Connect Endpoint.");
+var EnvironmentSchema2 = z15.record(z15.string(), z15.string()).optional().describe("Environment variable key-value pairs.");
 var InstanceDefaultSchema = z15.object({
   connect: ConnectSchema.default(false)
 }).default({}).describe("Define the default settings for all instances in your stacks.");
@@ -482,7 +483,8 @@ var InstancesSchema = z15.record(
     image: ImageSchema,
     type: TypeSchema2,
     code: CodeSchema,
-    command: CommandSchema.optional()
+    command: CommandSchema.optional(),
+    environment: EnvironmentSchema2.optional()
   })
 ).optional().describe("Define the instances in your stack.");