@awsless/awsless 0.0.616 → 0.0.618

package/dist/bin.js

@@ -333,45 +333,70 @@ var createCloudFrontKvsProvider = ({ credentials, region }) => {
 };
 
 // src/formation/cloudfront.ts
-import { CloudFrontClient, CreateInvalidationCommand } from "@aws-sdk/client-cloudfront";
+import {
+  CloudFrontClient,
+  CreateInvalidationForDistributionTenantCommand,
+  ListDistributionTenantsCommand
+} from "@aws-sdk/client-cloudfront";
 import { createCustomProvider as createCustomProvider2, createCustomResourceClass as createCustomResourceClass2 } from "@terraforge/core";
+import { randomUUID } from "crypto";
 import { z as z2 } from "zod";
 var Invalidation = createCustomResourceClass2(
   "cloudfront",
   "invalidation"
 );
-var createCloudFrontProvider = ({ credentials, region }) => {
-  const cloudFront = new CloudFrontClient({ credentials, region });
+var createCloudFrontProvider = (props) => {
   return createCustomProvider2("cloudfront", {
     invalidation: {
-      async updateResource(props) {
+      async updateResource(input) {
         const state2 = z2.object({
           distributionId: z2.string(),
           paths: z2.string().array().min(1)
-        }).parse(props.proposedState);
-        console.log("");
-        console.log("state.distributionId", state2.distributionId);
-        console.log("");
-        const result = await cloudFront.send(
-          new CreateInvalidationCommand({
-            DistributionId: state2.distributionId,
-            InvalidationBatch: {
-              Paths: {
-                Quantity: state2.paths.length,
-                Items: state2.paths
-              },
-              CallerReference: props.idempotantToken
-            }
-          })
-        );
-        return {
-          ...state2,
-          id: result.Invalidation?.Id
-        };
+        }).parse(input.proposedState);
+        await createInvalidationForDistributionTenants({
+          ...props,
+          ...state2
+        });
+        return {};
       }
     }
   });
 };
+var createInvalidationForDistributionTenants = async ({
+  distributionId,
+  credentials,
+  region,
+  paths
+}) => {
+  const client = new CloudFrontClient({ credentials, region });
+  let cursor;
+  do {
+    const result = await client.send(
+      new ListDistributionTenantsCommand({
+        AssociationFilter: {
+          DistributionId: distributionId
+        },
+        MaxItems: 10,
+        Marker: cursor
+      })
+    );
+    cursor = result.NextMarker;
+    for (const tenant of result.DistributionTenantList ?? []) {
+      await client.send(
+        new CreateInvalidationForDistributionTenantCommand({
+          Id: tenant.Id,
+          InvalidationBatch: {
+            Paths: {
+              Quantity: paths.length,
+              Items: paths
+            },
+            CallerReference: randomUUID()
+          }
+        })
+      );
+    }
+  } while (cursor);
+};
 
 // src/formation/lambda.ts
 import { LambdaClient, UpdateFunctionCodeCommand } from "@aws-sdk/client-lambda";
@@ -3089,7 +3114,7 @@ import { aws as aws5 } from "@terraforge/aws";
 // src/feature/function/util.ts
 import { generateFileHash } from "@awsless/ts-file-cache";
 import { aws as aws4 } from "@terraforge/aws";
-import { findInputDeps, Group as Group3, Output as Output4, resolveInputs } from "@terraforge/core";
+import { findInputDeps, Group as Group3, Output as Output3, resolveInputs } from "@terraforge/core";
 import deepmerge from "deepmerge";
 import { basename as basename3 } from "path";
 
@@ -3483,7 +3508,7 @@ var createLambdaFunction = (parentGroup, ctx, ns, id, local) => {
   const policy = new aws4.iam.RolePolicy(group, "policy", {
     role: role.name,
     name: "lambda-policy",
-    policy: new Output4(statementDeps, async (resolve) => {
+    policy: new Output3(statementDeps, async (resolve) => {
       const list3 = await resolveInputs(statements);
       resolve(
         JSON.stringify({
@@ -4570,7 +4595,7 @@ import { fileURLToPath } from "node:url";
 import { days as days6, seconds as seconds6, toDays as toDays5, toSeconds as toSeconds5 } from "@awsless/duration";
 import { mebibytes as mebibytes2, toMebibytes as toMebibytes3 } from "@awsless/size";
 import { aws as aws13 } from "@terraforge/aws";
-import { Output as Output5, findInputDeps as findInputDeps2, resolveInputs as resolveInputs2 } from "@terraforge/core";
+import { Output as Output4, findInputDeps as findInputDeps2, resolveInputs as resolveInputs2 } from "@terraforge/core";
 import { pascalCase as pascalCase2 } from "change-case";
 var createPrebuildLambdaFunction = (group, ctx, ns, id, props) => {
   let name;
@@ -4638,7 +4663,7 @@ var createPrebuildLambdaFunction = (group, ctx, ns, id, props) => {
   const policy = new aws13.iam.RolePolicy(group, "policy", {
     role: role.name,
     name: "lambda-policy",
-    policy: new Output5(statementDeps, async (resolve) => {
+    policy: new Output4(statementDeps, async (resolve) => {
       const list3 = await resolveInputs2(statements);
       resolve(
         JSON.stringify({
@@ -5148,9 +5173,9 @@ var siteFeature = defineFeature({
             }
             const instance = Bun.spawn(buildProps.command.split(" "), {
               cwd,
-              env,
-              stdout: "inherit",
-              stderr: "inherit"
+              env
+              // stdout: 'inherit',
+              // stderr: 'inherit',
             });
             await instance.exited;
             if (instance.exitCode !== null && instance.exitCode > 0) {
@@ -6520,7 +6545,7 @@ import { toDays as toDays8, toSeconds as toSeconds8 } from "@awsless/duration";
 import { toMebibytes as toMebibytes4 } from "@awsless/size";
 import { generateFileHash as generateFileHash2 } from "@awsless/ts-file-cache";
 import { aws as aws26 } from "@terraforge/aws";
-import { Group as Group25, Output as Output7, findInputDeps as findInputDeps3, resolveInputs as resolveInputs3 } from "@terraforge/core";
+import { Group as Group25, Output as Output6, findInputDeps as findInputDeps3, resolveInputs as resolveInputs3 } from "@terraforge/core";
 import { constantCase as constantCase12, pascalCase as pascalCase3 } from "change-case";
 import deepmerge4 from "deepmerge";
 import { join as join16 } from "path";
@@ -6654,7 +6679,7 @@ var createFargateTask = (parentGroup, ctx, ns, id, local) => {
   const policy = new aws26.iam.RolePolicy(group, "policy", {
     role: role.name,
     name: "task-policy",
-    policy: new Output7(statementDeps, async (resolve) => {
+    policy: new Output6(statementDeps, async (resolve) => {
       const list3 = await resolveInputs3(statements);
       resolve(
         JSON.stringify({
@@ -6718,7 +6743,7 @@ var createFargateTask = (parentGroup, ctx, ns, id, local) => {
         operatingSystemFamily: "LINUX"
       },
       trackLatest: true,
-      containerDefinitions: new Output7(variableDeps, async (resolve) => {
+      containerDefinitions: new Output6(variableDeps, async (resolve) => {
         const data = await resolveInputs3(variables);
         const { s3Bucket, s3Key } = await resolveInputs3({
           s3Bucket: code.bucket,
@@ -10093,10 +10118,8 @@ var parseJsonLog = (message) => {
 };
 
 // src/cli/command/image/clear-cache.ts
-import { CloudFrontClient as CloudFrontClient2, CreateInvalidationCommand as CreateInvalidationCommand2 } from "@aws-sdk/client-cloudfront";
 import { DeleteObjectsCommand, ListObjectsV2Command, S3Client as S3Client3 } from "@aws-sdk/client-s3";
 import { Cancelled as Cancelled3, log as log28, prompt as prompt14 } from "@awsless/clui";
-import { randomUUID } from "crypto";
 var clearCache = (program2) => {
   program2.command("clear-cache").argument("[stack]", "The stack name of the image proxy").argument("[name]", "The name of the image proxy").description("Clears the cache of the image proxy").action(async (stack, name) => {
     await layout("image clear-cache", async ({ appConfig, stackConfigs }) => {
@@ -10161,10 +10184,6 @@ var clearCache = (program2) => {
         credentials,
         region
       });
-      const cloudFrontClient = new CloudFrontClient2({
-        credentials,
-        region: "us-east-1"
-      });
       let totalDeleted = 0;
       await log28.task({
         initialMessage: "Clearing cache...",
@@ -10199,18 +10218,12 @@ var clearCache = (program2) => {
               break;
             }
           }
-          await cloudFrontClient.send(
-            new CreateInvalidationCommand2({
-              DistributionId: distributionId,
-              InvalidationBatch: {
-                CallerReference: randomUUID(),
-                Paths: {
-                  Quantity: 1,
-                  Items: [shared.entry("image", "path", name)]
-                }
-              }
-            })
-          );
+          await createInvalidationForDistributionTenants({
+            credentials,
+            region,
+            distributionId,
+            paths: [shared.entry("image", "path", name)]
+          });
         }
       });
       return `${totalDeleted} objects deleted from cache.`;
@@ -10226,10 +10239,8 @@ var image = (program2) => {
 };
 
 // src/cli/command/icon/clear-cache.ts
-import { CloudFrontClient as CloudFrontClient3, CreateInvalidationCommand as CreateInvalidationCommand3 } from "@aws-sdk/client-cloudfront";
 import { DeleteObjectsCommand as DeleteObjectsCommand2, ListObjectsV2Command as ListObjectsV2Command2, S3Client as S3Client4 } from "@aws-sdk/client-s3";
 import { Cancelled as Cancelled4, log as log29, prompt as prompt15 } from "@awsless/clui";
-import { randomUUID as randomUUID2 } from "crypto";
 var clearCache2 = (program2) => {
   program2.command("clear-cache").argument("[stack]", "The stack name of the icon proxy").argument("[name]", "The name of the icon proxy").description("Clears the cache of the icon proxy").action(async (stack, name) => {
     await layout("icon clear-cache", async ({ appConfig, stackConfigs }) => {
@@ -10294,10 +10305,6 @@ var clearCache2 = (program2) => {
         credentials,
         region
       });
-      const cloudFrontClient = new CloudFrontClient3({
-        credentials,
-        region: "us-east-1"
-      });
       let totalDeleted = 0;
       await log29.task({
         initialMessage: "Clearing cache...",
@@ -10332,18 +10339,12 @@ var clearCache2 = (program2) => {
               break;
             }
           }
-          await cloudFrontClient.send(
-            new CreateInvalidationCommand3({
-              DistributionId: distributionId,
-              InvalidationBatch: {
-                CallerReference: randomUUID2(),
-                Paths: {
-                  Quantity: 1,
-                  Items: [shared.entry("icon", "path", name)]
-                }
-              }
-            })
-          );
+          await createInvalidationForDistributionTenants({
+            credentials,
+            region,
+            distributionId,
+            paths: [shared.entry("icon", "path", name)]
+          });
         }
       });
       return `${totalDeleted} objects deleted from cache.`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.616",
+  "version": "0.0.618",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -34,28 +34,28 @@
   },
   "peerDependencies": {
     "@awsless/big-float": "^0.1.5",
-    "@awsless/clui": "^0.0.8",
     "@awsless/cloudwatch": "^0.0.1",
+    "@awsless/clui": "^0.0.8",
     "@awsless/duration": "^0.0.4",
     "@awsless/dynamodb": "^0.3.8",
-    "@awsless/json": "^0.0.10",
     "@awsless/iot": "^0.0.3",
-    "@awsless/lambda": "^0.0.35",
-    "@awsless/mqtt": "^0.0.2",
+    "@awsless/json": "^0.0.10",
     "@awsless/open-search": "^0.0.21",
+    "@awsless/mqtt": "^0.0.2",
     "@awsless/redis": "^0.0.14",
-    "@awsless/s3": "^0.0.21",
+    "@awsless/lambda": "^0.0.35",
     "@awsless/sns": "^0.0.10",
-    "@awsless/validate": "^0.1.3",
-    "@awsless/ssm": "^0.0.7",
+    "@awsless/s3": "^0.0.21",
     "@awsless/sqs": "^0.0.16",
-    "@awsless/weak-cache": "^0.0.1"
+    "@awsless/weak-cache": "^0.0.1",
+    "@awsless/validate": "^0.1.3",
+    "@awsless/ssm": "^0.0.7"
   },
   "dependencies": {
     "@arcanyx/cidr-slicer": "^0.3.0",
     "@aws-appsync/utils": "^1.5.0",
     "@aws-sdk/client-cloudformation": "^3.369.0",
-    "@aws-sdk/client-cloudfront": "^3.425.0",
+    "@aws-sdk/client-cloudfront": "^3.991.0",
     "@aws-sdk/client-cloudfront-keyvaluestore": "^3.817.0",
     "@aws-sdk/client-cloudwatch-logs": "^3.806.0",
     "@aws-sdk/client-cognito-identity-provider": "^3.840.0",
@@ -140,14 +140,14 @@
     "zod": "^3.24.2",
     "zod-to-json-schema": "^3.24.3",
     "@awsless/big-float": "^0.1.5",
+    "@awsless/clui": "^0.0.8",
+    "@awsless/duration": "^0.0.4",
+    "@awsless/graphql": "^0.0.9",
     "@awsless/cloudwatch": "^0.0.1",
-    "@awsless/json": "^0.0.10",
     "@awsless/scheduler": "^0.0.4",
-    "@awsless/duration": "^0.0.4",
-    "@awsless/size": "^0.0.2",
+    "@awsless/json": "^0.0.10",
     "@awsless/validate": "^0.1.3",
-    "@awsless/graphql": "^0.0.9",
-    "@awsless/clui": "^0.0.8",
+    "@awsless/size": "^0.0.2",
     "@awsless/ts-file-cache": "^0.0.12"
   },
   "devDependencies": {