@awsless/awsless 0.0.166 → 0.0.168

package/dist/bin.js

@@ -244,7 +244,7 @@ var sizeMax = (max) => {
 // src/feature/function/schema.ts
 import { days, minutes, seconds } from "@awsless/duration";
 import { gibibytes, mebibytes } from "@awsless/size";
-var MemorySizeSchema = SizeSchema.refine(sizeMin(mebibytes(128)), "Minimum memory size is 128 MB").refine(sizeMax(gibibytes(10)), "Minimum memory size is 10 GB").describe(
+var MemorySizeSchema = SizeSchema.refine(sizeMin(mebibytes(128)), "Minimum memory size is 128 MB").refine(sizeMax(gibibytes(10)), "Maximum memory size is 10 GB").describe(
   "The amount of memory available to the function at runtime. Increasing the function memory also increases its CPU allocation. The value can be any multiple of 1 MB. You can specify a size value from 128 MB to 10 GB."
 );
 var TimeoutSchema = DurationSchema.refine(durationMin(seconds(10)), "Minimum timeout duration is 10 seconds").refine(durationMax(minutes(15)), "Maximum timeout duration is 15 minutes").describe(
@@ -263,12 +263,16 @@ var RetryAttemptsSchema = z7.number().int().min(0).max(2).describe(
   "The maximum number of times to retry when the function returns an error. You can specify a number from 0 to 2."
 );
 var RuntimeSchema = z7.enum(["nodejs18.x", "nodejs20.x"]).describe("The identifier of the function's runtime.");
+var ActionSchema = z7.string();
+var ActionsSchema = z7.union([ActionSchema.transform((v) => [v]), ActionSchema.array()]);
+var ResourceSchema = z7.string().startsWith("arn:").transform((v) => v);
+var ResourcesSchema = z7.union([ResourceSchema.transform((v) => [v]), ResourceSchema.array()]);
 var PermissionSchema = z7.object({
   effect: z7.enum(["allow", "deny"]).default("allow"),
-  actions: z7.string().array(),
-  resources: z7.string().startsWith("arn:").transform((v) => v).array()
+  actions: ActionsSchema,
+  resources: ResourcesSchema
 });
-var PermissionsSchema = PermissionSchema.array().describe("Add IAM permissions to your function.");
+var PermissionsSchema = z7.union([PermissionSchema.transform((v) => [v]), PermissionSchema.array()]).describe("Add IAM permissions to your function.");
 var WarmSchema = z7.number().int().min(0).max(10).describe(
   "Specify how many functions you want to warm up each 5 minutes. You can specify a number from 0 to 10."
 );
@@ -771,7 +775,126 @@ var CachesSchema = z23.record(
 
 // src/feature/search/schema.ts
 import { z as z24 } from "zod";
-var SearchsSchema = z24.array(ResourceIdSchema).optional();
+import { gibibytes as gibibytes2 } from "@awsless/size";
+var VersionSchema = z24.enum([
+  "OpenSearch_2.11",
+  "OpenSearch_2.9",
+  "OpenSearch_2.7",
+  "OpenSearch_2.5",
+  "OpenSearch_2.3",
+  "OpenSearch_1.3"
+]);
+var TypeSchema2 = z24.enum([
+  "t3.small.search",
+  "t3.medium.search",
+  "t3.large.search",
+  "t3.xlarge.search",
+  "t3.2xlarge.search",
+  "t4g.small.search",
+  "t4g.medium.search",
+  "m3.medium.search",
+  "m3.large.search",
+  "m3.xlarge.search",
+  "m3.2xlarge.search",
+  "m4.large.search",
+  "m4.xlarge.search",
+  "m4.2xlarge.search",
+  "m4.4xlarge.search",
+  "m4.10xlarge.search",
+  "m5.large.search",
+  "m5.xlarge.search",
+  "m5.2xlarge.search",
+  "m5.4xlarge.search",
+  "m5.12xlarge.search",
+  "m5.24xlarge.search",
+  "r5.large.search",
+  "r5.xlarge.search",
+  "r5.2xlarge.search",
+  "r5.4xlarge.search",
+  "r5.12xlarge.search",
+  "r5.24xlarge.search",
+  "c5.large.search",
+  "c5.xlarge.search",
+  "c5.2xlarge.search",
+  "c5.4xlarge.search",
+  "c5.9xlarge.search",
+  "c5.18xlarge.search",
+  "or1.medium.search",
+  "or1.large.search",
+  "or1.xlarge.search",
+  "or1.2xlarge.search",
+  "or1.4xlarge.search",
+  "or1.8xlarge.search",
+  "or1.12xlarge.search",
+  "or1.16xlarge.search",
+  "ultrawarm1.medium.search",
+  "ultrawarm1.large.search",
+  "ultrawarm1.xlarge.search",
+  "r3.large.search",
+  "r3.xlarge.search",
+  "r3.2xlarge.search",
+  "r3.4xlarge.search",
+  "r3.8xlarge.search",
+  "i2.xlarge.search",
+  "i2.2xlarge.search",
+  "d2.xlarge.search",
+  "d2.2xlarge.search",
+  "d2.4xlarge.search",
+  "d2.8xlarge.search",
+  "c4.large.search",
+  "c4.xlarge.search",
+  "c4.2xlarge.search",
+  "c4.4xlarge.search",
+  "c4.8xlarge.search",
+  "r4.large.search",
+  "r4.xlarge.search",
+  "r4.2xlarge.search",
+  "r4.4xlarge.search",
+  "r4.8xlarge.search",
+  "r4.16xlarge.search",
+  "i3.large.search",
+  "i3.xlarge.search",
+  "i3.2xlarge.search",
+  "i3.4xlarge.search",
+  "i3.8xlarge.search",
+  "i3.16xlarge.search",
+  "r6g.large.search",
+  "r6g.xlarge.search",
+  "r6g.2xlarge.search",
+  "r6g.4xlarge.search",
+  "r6g.8xlarge.search",
+  "r6g.12xlarge.search",
+  "m6g.large.search",
+  "m6g.xlarge.search",
+  "m6g.2xlarge.search",
+  "m6g.4xlarge.search",
+  "m6g.8xlarge.search",
+  "m6g.12xlarge.search",
+  "c6g.large.search",
+  "c6g.xlarge.search",
+  "c6g.2xlarge.search",
+  "c6g.4xlarge.search",
+  "c6g.8xlarge.search",
+  "c6g.12xlarge.search",
+  "r6gd.large.search",
+  "r6gd.xlarge.search",
+  "r6gd.2xlarge.search",
+  "r6gd.4xlarge.search",
+  "r6gd.8xlarge.search",
+  "r6gd.12xlarge.search",
+  "r6gd.16xlarge.search"
+]);
+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 SearchsSchema = z24.record(
+  ResourceIdSchema,
+  z24.object({
+    type: TypeSchema2.default("t3.small.search"),
+    count: z24.number().int().min(1).default(1),
+    version: VersionSchema.default("OpenSearch_2.11"),
+    storage: StorageSizeSchema.default("10 GB"),
+    vpc: z24.boolean().default(false)
+  })
+).optional().describe("Define the searches in your stack.");
 
 // src/feature/site/schema.ts
 import { z as z25 } from "zod";
@@ -3051,7 +3174,7 @@ var authFeature = defineFeature({
   },
   onStack(ctx) {
     for (const [id, props] of Object.entries(ctx.stackConfig.auth ?? {})) {
-      const group = new Node14(this.name, `id`);
+      const group = new Node14(this.name, id);
       ctx.base.add(group);
       const userPoolId = ctx.app.import("base", `auth-${id}-user-pool-id`);
       const userPoolArn = ctx.app.import("base", `auth-${id}-user-pool-arn`);
@@ -3095,9 +3218,10 @@ var authFeature = defineFeature({
           actions: ["cognito:*"],
           resources: [
             // Not yet known if this is correct way to grant access to all resources
-            userPoolId.apply(
-              (id2) => `arn:aws:cognito-idp:${ctx.appConfig.region}:${ctx.accountId}:userpool/${id2}`
-            )
+            userPoolArn
+            // userPoolId.apply<aws.ARN>(
+            // 	id => `arn:aws:cognito-idp:${ctx.appConfig.region}:${ctx.accountId}:userpool/${id}`
+            // ),
             // userPoolId.apply<aws.ARN>(
             // 	id => `arn:aws:cognito-idp:${ctx.appConfig.region}:${ctx.accountId}:userpool/${id}*`
             // ),
@@ -3107,11 +3231,9 @@ var authFeature = defineFeature({
     }
   },
   onApp(ctx) {
-    const main = new Node14(this.name, "main");
-    ctx.base.add(main);
     for (const [id, props] of Object.entries(ctx.appConfig.defaults.auth ?? {})) {
       const group = new Node14(this.name, id);
-      main.add(group);
+      ctx.base.add(group);
       let emailConfig;
       if (props.messaging) {
         const [_, domainName] = props.messaging.fromEmail.split("@");
@@ -3126,7 +3248,7 @@ var authFeature = defineFeature({
       const name = formatGlobalResourceName(ctx.appConfig.name, this.name, id);
       const userPool = new aws14.cognito.UserPool("user-pool", {
         name,
-        deletionProtection: true,
+        // deletionProtection: true,
         allowUserRegistration: props.allowUserRegistration,
         username: props.username,
         password: props.password,
@@ -3341,7 +3463,7 @@ var searchFeature = defineFeature({
     const resources = new TypeObject(1);
     for (const stack of ctx.stackConfigs) {
       const list4 = new TypeObject(2);
-      for (const id of stack.searchs || []) {
+      for (const id of Object.keys(stack.searchs ?? {})) {
         const name = formatLocalResourceName(ctx.appConfig.name, stack.name, "search", id);
         list4.addType(name, `{ readonly name: '${name}' }`);
       }
@@ -3351,32 +3473,19 @@ var searchFeature = defineFeature({
     await ctx.write("search.d.ts", gen, true);
   },
   onStack(ctx) {
-    for (const id of ctx.stackConfig.searchs ?? []) {
+    for (const [id, props] of Object.entries(ctx.stackConfig.searchs ?? {})) {
       const group = new Node16("search", id);
       ctx.stack.add(group);
-      const name = formatLocalResourceName(ctx.app.name, ctx.stack.name, "search", id);
-      const policy = new aws16.openSearchServerless.SecurityPolicy("security", {
-        name,
-        type: "encryption",
-        policy: JSON.stringify({
-          AWSOwnedKey: true,
-          Rules: [
-            {
-              ResourceType: "collection",
-              Resource: [`collection/${name}`]
-            }
-          ]
-        })
-      });
-      group.add(policy);
-      const collection = new aws16.openSearchServerless.Collection("collection", {
-        name: formatLocalResourceName(ctx.app.name, ctx.stack.name, "search", id),
-        type: "search"
-      }).dependsOn(policy);
-      group.add(collection);
-      ctx.onFunction(({ policy: policy2 }) => {
-        policy2.addStatement(collection.permissions);
+      const domain = new aws16.openSearch.Domain("domain", {
+        // name: formatLocalResourceName(ctx.app.name, ctx.stack.name, 'search', id),
+        version: props.version,
+        storageSize: props.storage,
+        instance: {
+          type: props.type,
+          count: props.count
+        }
       });
+      group.add(domain);
     }
   }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.166",
+  "version": "0.0.168",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -29,12 +29,12 @@
   },
   "peerDependencies": {
     "@awsless/lambda": "^0.0.18",
-    "@awsless/sqs": "^0.0.7",
-    "@awsless/s3": "^0.0.10",
     "@awsless/redis": "^0.0.12",
     "@awsless/sns": "^0.0.7",
-    "@awsless/validate": "^0.0.13",
+    "@awsless/sqs": "^0.0.7",
+    "@awsless/s3": "^0.0.10",
     "@awsless/ssm": "^0.0.7",
+    "@awsless/validate": "^0.0.13",
     "@awsless/weak-cache": "^0.0.1"
   },
   "dependencies": {
@@ -97,11 +97,11 @@
     "zod": "^3.21.4",
     "zod-to-json-schema": "^3.22.3",
     "@awsless/duration": "^0.0.1",
-    "@awsless/formation": "^0.0.1",
     "@awsless/graphql": "^0.0.9",
-    "@awsless/validate": "^0.0.13",
     "@awsless/size": "^0.0.1",
-    "@awsless/code": "^0.0.10"
+    "@awsless/validate": "^0.0.13",
+    "@awsless/code": "^0.0.10",
+    "@awsless/formation": "^0.0.3"
   },
   "scripts": {
     "test": "pnpm code test",