@awsless/awsless 0.0.441 → 0.0.443

package/dist/bin.js

@@ -10879,7 +10879,7 @@ var createLambdaFunction = (group, ctx, ns, id, local2) => {
     role: role.arn,
     code,
     runtime: props.runtime === "container" ? void 0 : props.runtime,
-    layers: (props.layers ?? []).map((id2) => ctx.shared.get(`layer-${id2}-arn`)),
+    layers: props.layers?.map((id2) => ctx.shared.get(`layer-${id2}-arn`)).filter((v) => !!v),
     // Remove conflicting props.
     vpc: void 0,
     log: props.log
@@ -13159,24 +13159,29 @@ var siteFeature = defineFeature({
         ctx.onBind((name2, value) => {
           lambda.addEnvironment(name2, value);
         });
-        new aws19.lambda.Permission(group, "permission", {
-          principal: "*",
-          // principal: 'cloudfront.amazonaws.com',
+        new aws19.lambda.Permission(group, "ssr-permission", {
+          principal: "cloudfront.amazonaws.com",
           action: "lambda:InvokeFunctionUrl",
           functionArn: lambda.arn,
-          urlAuthType: "none"
-          // urlAuthType: 'aws-iam',
-          // sourceArn: distribution.arn,
+          urlAuthType: "aws-iam",
+          sourceArn: `arn:aws:cloudfront::${ctx.accountId}:distribution/*`
         });
         const url = new aws19.lambda.Url(group, "url", {
           targetArn: lambda.arn,
-          authType: "none"
-          // authType: 'aws-iam',
+          authType: "aws-iam"
+        });
+        const ssrAccessControl = new aws19.cloudFront.OriginAccessControl(group, "ssr-access", {
+          name: `${name}-ssr`,
+          type: "lambda",
+          behavior: "always",
+          protocol: "sigv4"
         });
+        ssrAccessControl.deletionPolicy = "after-deployment";
         origins.push({
           id: "ssr",
           domainName: url.url.apply((url2) => url2.split("/")[2]),
-          protocol: "https-only"
+          protocol: "https-only",
+          originAccessControlId: ssrAccessControl.id
         });
       }
       if (props.static) {
@@ -13233,7 +13238,9 @@ var siteFeature = defineFeature({
         origins.push({
           id: "static",
           domainName: bucket.regionalDomainName,
-          originAccessControlId: accessControl.id
+          originAccessControlId: accessControl.id,
+          originAccessIdentityId: ""
+          // is required to have an value for s3 origins when using origin access control
         });
       }
       if (props.ssr && props.static) {
@@ -13935,6 +13942,22 @@ var alertFeature = defineFeature({
 
 // src/feature/layer/index.ts
 import { Asset as Asset7, aws as aws26, Node as Node26 } from "@awsless/formation";
+var stackSearch = (stack, key) => {
+  let found = [];
+  function search(obj) {
+    if (typeof obj !== "object" || obj === null) return;
+    if (obj[key]) {
+      found.push(obj[key]);
+    }
+    for (let k in obj) {
+      if (typeof obj[k] === "object") {
+        search(obj[k]);
+      }
+    }
+  }
+  search(stack);
+  return found;
+};
 var layerFeature = defineFeature({
   name: "layer",
   onBefore(ctx) {
@@ -13955,6 +13978,17 @@ var layerFeature = defineFeature({
     });
     ctx.shared.set("layer-bucket-name", bucket.name);
   },
+  onValidate(ctx) {
+    const layers = Object.keys(ctx.appConfig.defaults.layers ?? []);
+    for (const stack of ctx.stackConfigs) {
+      const stackLayers = stackSearch(stack, "layers").flat();
+      for (const layer of stackLayers) {
+        if (!layers.includes(layer)) {
+          throw new FileError(stack.file, `Layer "${layer}" is not defined in app.json`);
+        }
+      }
+    }
+  },
   onApp(ctx) {
     const layers = Object.entries(ctx.appConfig.defaults.layers ?? {});
     if (layers.length === 0) {
@@ -14582,6 +14616,7 @@ var buildAssets = async (builders, stackFilters, showResult = false) => {
         });
         results.push({ ...builder, result });
       } catch (error) {
+        console.log(error);
         logError(new Error(`Build failed for: ${builder.type} ${builder.name}`));
         throw error;
       }