@awsless/awsless 0.0.454 → 0.0.456

package/dist/bin.js

@@ -38,6 +38,7 @@ import { confirm, isCancel, log } from "@clack/prompts";
 // src/util/workspace.ts
 import {
   DynamoLockBackend,
+  enableDebug,
   S3StateBackend,
   Terraform,
   WorkSpace
@@ -123,6 +124,9 @@ var createWorkSpace = async (props) => {
   const terraform = new Terraform({
     providerLocation: join2(homedir(), `.awsless/providers`)
   });
+  if (process.env.VERBOSE) {
+    enableDebug();
+  }
   const aws = await terraform.install("hashicorp", "aws", "5.94.1");
   const workspace = new WorkSpace({
     providers: [
@@ -992,35 +996,33 @@ var AppSchema = z19.object({
 import { z as z32 } from "zod";
 
 // src/feature/cache/schema.ts
+import { gibibytes as gibibytes2 } from "@awsless/size";
 import { z as z20 } from "zod";
-var TypeSchema = z20.enum([
-  "t4g.small",
-  "t4g.medium",
-  "r6g.large",
-  "r6g.xlarge",
-  "r6g.2xlarge",
-  "r6g.4xlarge",
-  "r6g.8xlarge",
-  "r6g.12xlarge",
-  "r6g.16xlarge",
-  "r6gd.xlarge",
-  "r6gd.2xlarge",
-  "r6gd.4xlarge",
-  "r6gd.8xlarge"
-]);
-var PortSchema = z20.number().int().min(1).max(5e4);
-var ShardsSchema = z20.number().int().min(0).max(100);
-var ReplicasPerShardSchema = z20.number().int().min(0).max(5);
-var EngineVersionSchema = z20.enum(["7.3", "7.2"]);
+var StorageSchema = SizeSchema.refine(sizeMin(gibibytes2(1)), "Minimum storage size is 1 GB").refine(
+  sizeMax(gibibytes2(5e3)),
+  "Maximum storage size is 5000 GB"
+);
+var MinimumStorageSchema = StorageSchema.describe(
+  "The lower limit for data storage the cache is set to use. You can specify a size value from 1 GB to 5000 GB."
+);
+var MaximumStorageSchema = StorageSchema.describe(
+  "The upper limit for data storage the cache is set to use. You can specify a size value from 1 GB to 5000 GB."
+);
+var EcpuSchema = z20.number().int().min(1e3).max(15e6);
+var MinimumEcpuSchema = EcpuSchema.describe(
+  "The minimum number of ECPUs the cache can consume per second. You can specify a integer from 1,000 to 15,000,000."
+);
+var MaximumEcpuSchema = EcpuSchema.describe(
+  "The maximum number of ECPUs the cache can consume per second. You can specify a integer from 1,000 to 15,000,000."
+);
 var CachesSchema = z20.record(
   ResourceIdSchema,
   z20.object({
-    type: TypeSchema.default("t4g.small"),
-    port: PortSchema.default(6379),
-    shards: ShardsSchema.default(1),
-    replicasPerShard: ReplicasPerShardSchema.default(1),
-    engineVersion: EngineVersionSchema.default("7.3"),
-    dataTiering: z20.boolean().default(false)
+    minStorage: MinimumStorageSchema.optional(),
+    maxStorage: MaximumStorageSchema.optional(),
+    minECPU: MinimumEcpuSchema.optional(),
+    maxECPU: MaximumEcpuSchema.optional(),
+    snapshotRetentionLimit: z20.number().int().positive().default(1)
   })
 ).optional().describe("Define the caches in your stack. For access to the cache put your functions inside the global VPC.");
 
@@ -1111,10 +1113,10 @@ var CronsSchema = z24.record(
 ).optional().describe(`Define the cron jobs in your stack.`);
 
 // src/feature/search/schema.ts
-import { gibibytes as gibibytes2 } from "@awsless/size";
+import { gibibytes as gibibytes3 } from "@awsless/size";
 import { z as z25 } from "zod";
 var VersionSchema = z25.enum(["2.13", "2.11", "2.9", "2.7", "2.5", "2.3", "1.3"]);
-var TypeSchema2 = z25.enum([
+var TypeSchema = z25.enum([
   "t3.small",
   "t3.medium",
   "m3.medium",
@@ -1188,11 +1190,11 @@ var TypeSchema2 = z25.enum([
   "r6gd.12xlarge",
   "r6gd.16xlarge"
 ]);
-var StorageSizeSchema = SizeSchema.refine(sizeMin(gibibytes2(10)), "Minimum storage size is 10 GB").refine(sizeMax(gibibytes2(100)), "Maximum storage size is 100 GB").describe("The size of the function's /tmp directory. You can specify a size value from 512 MB to 10 GiB.");
+var StorageSizeSchema = SizeSchema.refine(sizeMin(gibibytes3(10)), "Minimum storage size is 10 GB").refine(sizeMax(gibibytes3(100)), "Maximum storage size is 100 GB").describe("The size of the function's /tmp directory. You can specify a size value from 512 MB to 10 GiB.");
 var SearchsSchema = z25.record(
   ResourceIdSchema,
   z25.object({
-    type: TypeSchema2.default("t3.small"),
+    type: TypeSchema.default("t3.small"),
     count: z25.number().int().min(1).default(1),
     version: VersionSchema.default("2.13"),
     storage: StorageSizeSchema.default("10 GB")
@@ -1899,6 +1901,7 @@ var authFeature = defineFeature({
 // src/feature/cache/index.ts
 import { $ as $2, Group as Group2 } from "@awsless/formation";
 import { constantCase as constantCase3 } from "change-case";
+import { toGibibytes } from "@awsless/size";
 var typeGenCode = `
 import { Cluster, CommandOptions } from '@awsless/redis'
 
@@ -1936,72 +1939,84 @@ var cacheFeature = defineFeature({
         resourceName: id,
         seperator: "-"
       });
-      const subnetGroup = new $2.aws.memorydb.SubnetGroup(
-        group,
-        "subnets",
-        {
-          name,
-          subnetIds: ctx.shared.get("vpc", "private-subnets")
-        },
-        {
-          // retainOnDelete: retain,
-          // import: ctx.import ? name : undefined,
-        }
-      );
-      const securityGroup = new $2.aws.security.Group(
-        group,
-        "security",
-        {
-          name,
-          vpcId: ctx.shared.get("vpc", "id"),
-          description: name
-        },
-        {
-          // retainOnDelete: retain,
-          // import: ctx.import ? name : undefined,
-        }
-      );
-      new $2.aws.vpc.SecurityGroupIngressRule(group, "rule-ip-v4", {
+      const securityGroup = new $2.aws.security.Group(group, "security", {
+        name,
+        vpcId: ctx.shared.get("vpc", "id"),
+        description: name
+      });
+      const cache = new $2.aws.elasticache.ServerlessCache(group, "cache", {
+        name,
+        engine: "valkey",
+        dailySnapshotTime: "02:00",
+        majorEngineVersion: "8",
+        snapshotRetentionLimit: props.snapshotRetentionLimit,
+        securityGroupIds: [securityGroup.id],
+        subnetIds: ctx.shared.get("vpc", "private-subnets"),
+        cacheUsageLimits: [
+          {
+            dataStorage: props.minStorage || props.maxStorage ? [
+              {
+                minimum: props.minStorage && toGibibytes(props.minStorage),
+                maximum: props.maxStorage && toGibibytes(props.maxStorage),
+                unit: "GB"
+              }
+            ] : [],
+            ecpuPerSecond: props.minECPU || props.maxECPU ? [
+              {
+                minimum: props.minECPU,
+                maximum: props.maxECPU
+              }
+            ] : []
+          }
+        ]
+      });
+      const masterHost = cache.endpoint.pipe((v) => v.at(0).address);
+      const masterPort = cache.endpoint.pipe((v) => v.at(0).port);
+      new $2.aws.vpc.SecurityGroupIngressRule(group, "master-rule-ip-v4", {
         securityGroupId: securityGroup.id,
-        description: `Allow ipv4 on port: ${props.port}`,
+        description: masterPort.pipe((port) => `Allow ipv4 on port: ${port}`),
         ipProtocol: "tcp",
         cidrIpv4: "0.0.0.0/0",
-        fromPort: props.port,
-        toPort: props.port
+        fromPort: masterPort,
+        toPort: masterPort
       });
-      new $2.aws.vpc.SecurityGroupIngressRule(group, "rule-ip-v6", {
+      new $2.aws.vpc.SecurityGroupIngressRule(group, "master-rule-ip-v6", {
         securityGroupId: securityGroup.id,
-        description: `Allow ipv6 on port: ${props.port}`,
+        description: masterPort.pipe((port) => `Allow ipv6 on port: ${port}`),
         ipProtocol: "tcp",
         cidrIpv6: "::/0",
-        fromPort: props.port,
-        toPort: props.port
+        fromPort: masterPort,
+        toPort: masterPort
+      });
+      const slaveHost = cache.readerEndpoint.pipe((v) => v.at(0).address);
+      const slavePort = cache.readerEndpoint.pipe((v) => v.at(0).port);
+      new $2.aws.vpc.SecurityGroupIngressRule(group, "slave-rule-ip-v4", {
+        securityGroupId: securityGroup.id,
+        description: slavePort.pipe((port) => `Allow ipv4 on port: ${port}`),
+        ipProtocol: "tcp",
+        cidrIpv4: "0.0.0.0/0",
+        fromPort: slavePort,
+        toPort: slavePort
+      });
+      new $2.aws.vpc.SecurityGroupIngressRule(group, "slave-rule-ip-v6", {
+        securityGroupId: securityGroup.id,
+        description: slavePort.pipe((port) => `Allow ipv6 on port: ${port}`),
+        ipProtocol: "tcp",
+        cidrIpv6: "::/0",
+        fromPort: slavePort,
+        toPort: slavePort
       });
-      const cluster = new $2.aws.memorydb.Cluster(
-        group,
-        "cluster",
-        {
-          name,
-          aclName: "open-access",
-          nodeType: `db.${props.type}`,
-          engine: "valkey",
-          engineVersion: props.engineVersion,
-          port: props.port,
-          securityGroupIds: [securityGroup.id],
-          subnetGroupName: subnetGroup.name,
-          dataTiering: props.dataTiering,
-          numReplicasPerShard: props.replicasPerShard,
-          numShards: props.shards
-        },
-        {
-          // retainOnDelete: retain,
-          // import: ctx.import ? name : undefined,
-        }
-      );
       const prefix = `CACHE_${constantCase3(ctx.stack.name)}_${constantCase3(id)}`;
-      const host = cluster.clusterEndpoint.pipe((v) => v[0].address);
-      ctx.addEnv(`${prefix}_HOST`, host);
-      ctx.addEnv(`${prefix}_PORT`, props.port.toString());
+      ctx.addEnv(`${prefix}_HOST`, masterHost);
+      ctx.addEnv(
+        `${prefix}_PORT`,
+        masterPort.pipe((p2) => p2.toString())
+      );
+      ctx.addEnv(`${prefix}_SLAVE_HOST`, slaveHost);
+      ctx.addEnv(
+        `${prefix}_SLAVE_PORT`,
+        slavePort.pipe((p2) => p2.toString())
+      );
     }
   }
 });
@@ -2385,6 +2400,12 @@ import { days as days3, toDays as toDays3, toSeconds } from "@awsless/duration";
 import { toMebibytes } from "@awsless/size";
 import { pascalCase } from "change-case";
 
+// src/util/id.ts
+import { createHash as createHash2 } from "crypto";
+var shortId = (ns) => {
+  return createHash2("md5").update(ns).digest("hex").substring(0, 10);
+};
+
 // src/util/temp.ts
 import { mkdir as mkdir3, readdir, rm as rm2 } from "fs/promises";
 import { join as join7 } from "path";
@@ -2444,7 +2465,7 @@ var zipBundle = async ({ directory }) => {
 };
 
 // src/feature/function/build/bundle/cache.ts
-import { createHash as createHash2 } from "node:crypto";
+import { createHash as createHash3 } from "node:crypto";
 import { createReadStream as createReadStream3 } from "node:fs";
 import { lstat as lstat2, readdir as readdir3 } from "node:fs/promises";
 import { join as join9 } from "node:path";
@@ -2454,11 +2475,11 @@ var bundleCacheKey = async (props) => {
   for (const file of files) {
     hashes[file] = await createHashFromFile(file);
   }
-  return createHash2("md5").update(JSON.stringify(hashes)).digest("hex");
+  return createHash3("md5").update(JSON.stringify(hashes)).digest("hex");
 };
 var createHashFromFile = (file) => {
   return new Promise((resolve) => {
-    const hash = createHash2("md5");
+    const hash = createHash3("md5");
     const stream = createReadStream3(file);
     stream.on("data", (data) => hash.update(data));
     stream.on("end", () => resolve(hash.digest("hex")));
@@ -2496,8 +2517,7 @@ var createLambdaFunction = (group, ctx, ns, id, local) => {
       appName: ctx.app.name,
       stackName: ctx.stack.name,
       resourceType: ns,
-      resourceName: id,
-      postfix: ctx.appId
+      resourceName: shortId(`${id}:${ctx.appId}`)
     });
   } else {
     name = formatGlobalResourceName({
@@ -2508,8 +2528,7 @@ var createLambdaFunction = (group, ctx, ns, id, local) => {
     roleName = formatGlobalResourceName({
       appName: ctx.app.name,
       resourceType: ns,
-      resourceName: id,
-      postfix: ctx.appId
+      resourceName: shortId(`${id}:${ctx.appId}`)
     });
   }
   const props = deepmerge(ctx.appConfig.defaults.function, local);
@@ -2584,6 +2603,7 @@ var createLambdaFunction = (group, ctx, ns, id, local) => {
   }
   const role = new $3.aws.iam.Role(group, "role", {
     name: roleName,
+    description: name,
     assumeRolePolicy: JSON.stringify({
       Version: "2012-10-17",
       Statement: [
@@ -3460,14 +3480,6 @@ var queueFeature = defineFeature({
 // src/feature/rest/index.ts
 import { $ as $11, Group as Group11 } from "@awsless/formation";
 import { constantCase as constantCase7 } from "change-case";
-
-// src/util/id.ts
-import { createHash as createHash3 } from "crypto";
-var shortId = (ns) => {
-  return createHash3("md5").update(ns).digest("hex").substring(0, 10);
-};
-
-// src/feature/rest/index.ts
 var restFeature = defineFeature({
   name: "rest",
   onApp(ctx) {
@@ -3991,7 +4003,7 @@ var rpcFeature = defineFeature({
 import { Group as Group14 } from "@awsless/formation";
 import { constantCase as constantCase9 } from "change-case";
 import { $ as $14 } from "@awsless/formation";
-import { toGibibytes } from "@awsless/size";
+import { toGibibytes as toGibibytes2 } from "@awsless/size";
 var typeGenCode4 = `
 import { AnyStruct, Table } from '@awsless/open-search'
 
@@ -4033,7 +4045,7 @@ var searchFeature = defineFeature({
           },
           ebsOptions: {
             ebsEnabled: true,
-            volumeSize: toGibibytes(props.storage),
+            volumeSize: toGibibytes2(props.storage),
             volumeType: "gp2"
           },
           domainEndpointOptions: {
@@ -6049,7 +6061,7 @@ var del2 = (program2) => {
       });
       await task("Deleting the stacks to AWS", async (update) => {
         await workspace.delete(app, {
-          filters
+          filters: stackNames
         });
         await pullRemoteState(app, state2);
         update("Done deleting the stacks to AWS.");
@@ -6440,7 +6452,7 @@ var deploy = (program2) => {
       });
       await task("Deploying the stacks to AWS", async (update) => {
         await workspace.deploy(app, {
-          filters
+          filters: stackNames
         });
         await pullRemoteState(app, state2);
         update("Done deploying the stacks to AWS.");

package/dist/build-json-schema.js

@@ -583,35 +583,33 @@ var AppSchema = z19.object({
 import { z as z32 } from "zod";
 
 // src/feature/cache/schema.ts
+import { gibibytes as gibibytes2 } from "@awsless/size";
 import { z as z20 } from "zod";
-var TypeSchema = z20.enum([
-  "t4g.small",
-  "t4g.medium",
-  "r6g.large",
-  "r6g.xlarge",
-  "r6g.2xlarge",
-  "r6g.4xlarge",
-  "r6g.8xlarge",
-  "r6g.12xlarge",
-  "r6g.16xlarge",
-  "r6gd.xlarge",
-  "r6gd.2xlarge",
-  "r6gd.4xlarge",
-  "r6gd.8xlarge"
-]);
-var PortSchema = z20.number().int().min(1).max(5e4);
-var ShardsSchema = z20.number().int().min(0).max(100);
-var ReplicasPerShardSchema = z20.number().int().min(0).max(5);
-var EngineVersionSchema = z20.enum(["7.3", "7.2"]);
+var StorageSchema = SizeSchema.refine(sizeMin(gibibytes2(1)), "Minimum storage size is 1 GB").refine(
+  sizeMax(gibibytes2(5e3)),
+  "Maximum storage size is 5000 GB"
+);
+var MinimumStorageSchema = StorageSchema.describe(
+  "The lower limit for data storage the cache is set to use. You can specify a size value from 1 GB to 5000 GB."
+);
+var MaximumStorageSchema = StorageSchema.describe(
+  "The upper limit for data storage the cache is set to use. You can specify a size value from 1 GB to 5000 GB."
+);
+var EcpuSchema = z20.number().int().min(1e3).max(15e6);
+var MinimumEcpuSchema = EcpuSchema.describe(
+  "The minimum number of ECPUs the cache can consume per second. You can specify a integer from 1,000 to 15,000,000."
+);
+var MaximumEcpuSchema = EcpuSchema.describe(
+  "The maximum number of ECPUs the cache can consume per second. You can specify a integer from 1,000 to 15,000,000."
+);
 var CachesSchema = z20.record(
   ResourceIdSchema,
   z20.object({
-    type: TypeSchema.default("t4g.small"),
-    port: PortSchema.default(6379),
-    shards: ShardsSchema.default(1),
-    replicasPerShard: ReplicasPerShardSchema.default(1),
-    engineVersion: EngineVersionSchema.default("7.3"),
-    dataTiering: z20.boolean().default(false)
+    minStorage: MinimumStorageSchema.optional(),
+    maxStorage: MaximumStorageSchema.optional(),
+    minECPU: MinimumEcpuSchema.optional(),
+    maxECPU: MaximumEcpuSchema.optional(),
+    snapshotRetentionLimit: z20.number().int().positive().default(1)
   })
 ).optional().describe("Define the caches in your stack. For access to the cache put your functions inside the global VPC.");
 
@@ -702,10 +700,10 @@ var CronsSchema = z24.record(
 ).optional().describe(`Define the cron jobs in your stack.`);
 
 // src/feature/search/schema.ts
-import { gibibytes as gibibytes2 } from "@awsless/size";
+import { gibibytes as gibibytes3 } from "@awsless/size";
 import { z as z25 } from "zod";
 var VersionSchema = z25.enum(["2.13", "2.11", "2.9", "2.7", "2.5", "2.3", "1.3"]);
-var TypeSchema2 = z25.enum([
+var TypeSchema = z25.enum([
   "t3.small",
   "t3.medium",
   "m3.medium",
@@ -779,11 +777,11 @@ var TypeSchema2 = z25.enum([
   "r6gd.12xlarge",
   "r6gd.16xlarge"
 ]);
-var StorageSizeSchema = SizeSchema.refine(sizeMin(gibibytes2(10)), "Minimum storage size is 10 GB").refine(sizeMax(gibibytes2(100)), "Maximum storage size is 100 GB").describe("The size of the function's /tmp directory. You can specify a size value from 512 MB to 10 GiB.");
+var StorageSizeSchema = SizeSchema.refine(sizeMin(gibibytes3(10)), "Minimum storage size is 10 GB").refine(sizeMax(gibibytes3(100)), "Maximum storage size is 100 GB").describe("The size of the function's /tmp directory. You can specify a size value from 512 MB to 10 GiB.");
 var SearchsSchema = z25.record(
   ResourceIdSchema,
   z25.object({
-    type: TypeSchema2.default("t3.small"),
+    type: TypeSchema.default("t3.small"),
     count: z25.number().int().min(1).default(1),
     version: VersionSchema.default("2.13"),
     storage: StorageSizeSchema.default("10 GB")