@awsless/awsless 0.0.442 → 0.0.443

package/dist/bin.js

@@ -10803,7 +10803,7 @@ var createLambdaFunction = (group, ctx, ns, id, local2) => {
           file: fileCode.file,
           external: [
             ...fileCode.external ?? [],
-            ...props.layers?.flatMap((id2) => ctx.shared.get(`layer-${id2}-packages`))
+            ...(props.layers ?? []).flatMap((id2) => ctx.shared.get(`layer-${id2}-packages`))
           ],
           minify: fileCode.minify,
           nativeDir: temp.path
@@ -13159,23 +13159,23 @@ var siteFeature = defineFeature({
         ctx.onBind((name2, value) => {
           lambda.addEnvironment(name2, value);
         });
+        new aws19.lambda.Permission(group, "ssr-permission", {
+          principal: "cloudfront.amazonaws.com",
+          action: "lambda:InvokeFunctionUrl",
+          functionArn: lambda.arn,
+          urlAuthType: "aws-iam",
+          sourceArn: `arn:aws:cloudfront::${ctx.accountId}:distribution/*`
+        });
         const url = new aws19.lambda.Url(group, "url", {
           targetArn: lambda.arn,
           authType: "aws-iam"
         });
-        const ssrAccessControl = new aws19.cloudFront.OriginAccessControl(group, `ssr-access`, {
-          name,
+        const ssrAccessControl = new aws19.cloudFront.OriginAccessControl(group, "ssr-access", {
+          name: `${name}-ssr`,
           type: "lambda",
           behavior: "always",
           protocol: "sigv4"
         });
-        new aws19.lambda.Permission(group, "ssr-permission", {
-          principal: "cloudfront.amazonaws.com",
-          action: "lambda:InvokeFunctionUrl",
-          functionArn: lambda.arn,
-          urlAuthType: "aws-iam",
-          sourceArn: `arn:aws:cloudfront::${ctx.accountId}:distribution/*`
-        });
         ssrAccessControl.deletionPolicy = "after-deployment";
         origins.push({
           id: "ssr",
@@ -13211,13 +13211,13 @@ var siteFeature = defineFeature({
           policy.addStatement(bucket.permissions);
         });
         bucket.deletionPolicy = "after-deployment";
-        const s3AccessControl = new aws19.cloudFront.OriginAccessControl(group, `s3-access`, {
+        const accessControl = new aws19.cloudFront.OriginAccessControl(group, `access`, {
           name,
           type: "s3",
           behavior: "always",
           protocol: "sigv4"
         });
-        s3AccessControl.deletionPolicy = "after-deployment";
+        accessControl.deletionPolicy = "after-deployment";
         if (typeof props.static === "string") {
           const files = glob2.sync("**", {
             cwd: props.static,
@@ -13238,7 +13238,9 @@ var siteFeature = defineFeature({
         origins.push({
           id: "static",
           domainName: bucket.regionalDomainName,
-          originAccessControlId: s3AccessControl.id
+          originAccessControlId: accessControl.id,
+          originAccessIdentityId: ""
+          // is required to have an value for s3 origins when using origin access control
         });
       }
       if (props.ssr && props.static) {
@@ -14614,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;
       }