@awsless/awsless 0.0.511 → 0.0.513

package/dist/bin.js

@@ -1688,8 +1688,8 @@ var IconsSchema = z34.record(
       })
     ]).describe(
       "Image transformation will be applied from a base image. Base images orginates from a local directory that will be uploaded to S3 or from a lambda function."
-    ),
-    version: z34.number().int().min(1).optional().describe("Version of the icon configuration.")
+    )
+    // version: z.number().int().min(1).optional().describe('Version of the icon configuration.'),
   })
 ).optional().describe("Define an icon proxy in your stack. Store, optimize, and deliver icons at scale.");
 
@@ -6048,8 +6048,7 @@ var imageFeature = defineFeature({
             appName: ctx.app.name,
             stackName: ctx.stack.name,
             resourceType: "image",
-            resourceName: id,
-            postfix: ctx.appId
+            resourceName: shortId(`${id}-${ctx.appId}`)
           }),
           forceDestroy: true
         });
@@ -6059,9 +6058,11 @@ var imageFeature = defineFeature({
           appName: ctx.app.name,
           stackName: ctx.stack.name,
           resourceType: "image",
-          resourceName: `cache-${id}`
-          // postfix: ctx.appId,
+          resourceName: shortId(`cache-${id}-${ctx.appId}`)
         }),
+        tags: {
+          cache: "true"
+        },
         forceDestroy: true
       });
       const sharpLayerId = formatGlobalResourceName({
@@ -6299,8 +6300,7 @@ var iconFeature = defineFeature({
             appName: ctx.app.name,
             stackName: ctx.stack.name,
             resourceType: "icon",
-            resourceName: id,
-            postfix: ctx.appId
+            resourceName: shortId(`${id}-${ctx.appId}`)
           }),
           forceDestroy: true
         });
@@ -6310,9 +6310,11 @@ var iconFeature = defineFeature({
           appName: ctx.app.name,
           stackName: ctx.stack.name,
           resourceType: "icon",
-          resourceName: `cache-${id}`
-          // postfix: ctx.appId,
+          resourceName: shortId(`cache-${id}-${ctx.appId}`)
         }),
+        tags: {
+          cache: "true"
+        },
         forceDestroy: true
       });
       const serverLambda = createPrebuildLambdaFunction(group, ctx, "icon", id, {
@@ -6362,8 +6364,7 @@ var iconFeature = defineFeature({
         "ICON_CONFIG",
         JSON.stringify({
           preserveId: props.preserveId,
-          symbols: props.symbols,
-          version: props.version
+          symbols: props.symbols
         })
       );
       serverLambda.setEnvironment("ICON_CACHE_BUCKET", cacheBucket.bucket);
@@ -8483,6 +8484,7 @@ var parseJsonLog = (message) => {
 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 Cancelled2, log as log23, prompt as prompt10 } from "@awsless/clui";
+import { randomUUID } from "crypto";
 var clearCache = (program2) => {
   program2.command("cache-clear").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 cache-clear", async ({ appConfig, stackConfigs }) => {
@@ -8498,7 +8500,7 @@ var clearCache = (program2) => {
           return;
         });
         stack = await prompt10.select({
-          message: "Select the image proxy:",
+          message: "Select the stack:",
           options: imageStacks.map((stack2) => ({
             label: stack2.name,
             value: stack2.name
@@ -8512,10 +8514,10 @@ var clearCache = (program2) => {
         }
         const names = Object.keys(stackConfig.images ?? {});
         if (!names) {
-          throw new ExpectedError(`No images are defined in stack "${stack}".`);
+          throw new ExpectedError(`No image resources are defined in stack "${stack}".`);
         }
         name = await prompt10.select({
-          message: "Select the image:",
+          message: "Select the image resource:",
           options: names.map((name2) => ({
             label: name2,
             value: name2
@@ -8542,59 +8544,65 @@ var clearCache = (program2) => {
         distributionId = await shared.entry("image", "distribution-id", name);
         cacheBucket = await shared.entry("image", "cache-bucket", name);
       } catch (_) {
-        throw new ExpectedError(`The image proxy hasn't been deployed yet.`);
+        throw new ExpectedError(`The image resource hasn't been deployed yet.`);
       }
       const s3Client2 = new S3Client3({
         credentials,
         region
       });
-      let continuationToken;
-      let totalDeleted = 0;
-      let hasMore = true;
-      while (hasMore) {
-        const result = await s3Client2.send(
-          new ListObjectsV2Command({
-            Bucket: cacheBucket,
-            ContinuationToken: continuationToken,
-            MaxKeys: 1e3
-            // Maximum allowed per request
-          })
-        );
-        if (result.Contents && result.Contents.length > 0) {
-          await s3Client2.send(
-            new DeleteObjectsCommand({
-              Bucket: cacheBucket,
-              Delete: {
-                Objects: result.Contents.map((obj) => ({
-                  Key: obj.Key
-                })),
-                Quiet: true
-              }
-            })
-          );
-          totalDeleted += result.Contents.length;
-          log23.info(`${result.Contents.length} objects deleted from cache.`);
-        }
-        continuationToken = result.NextContinuationToken;
-        hasMore = !!continuationToken;
-      }
       const cloudFrontClient = new CloudFrontClient2({
         credentials,
         region: "us-east-1"
       });
-      await cloudFrontClient.send(
-        new CreateInvalidationCommand2({
-          DistributionId: distributionId,
-          InvalidationBatch: {
-            CallerReference: `image-cache-clear-${Date.now()}`,
-            Paths: {
-              Quantity: 1,
-              Items: ["/*"]
+      let totalDeleted = 0;
+      await log23.task({
+        initialMessage: "Clearing cache...",
+        successMessage: "Cache successfully cleared.",
+        task: async () => {
+          let continuationToken;
+          while (true) {
+            const result = await s3Client2.send(
+              new ListObjectsV2Command({
+                Bucket: cacheBucket,
+                ContinuationToken: continuationToken,
+                MaxKeys: 1e3
+                // Maximum allowed per request
+              })
+            );
+            if (result.Contents && result.Contents.length > 0) {
+              await s3Client2.send(
+                new DeleteObjectsCommand({
+                  Bucket: cacheBucket,
+                  Delete: {
+                    Objects: result.Contents.map((obj) => ({
+                      Key: obj.Key
+                    })),
+                    Quiet: true
+                  }
+                })
+              );
+              totalDeleted += result.Contents.length;
+            }
+            continuationToken = result.NextContinuationToken;
+            if (!continuationToken) {
+              break;
             }
           }
-        })
-      );
-      return "Cache has been cleared";
+          await cloudFrontClient.send(
+            new CreateInvalidationCommand2({
+              DistributionId: distributionId,
+              InvalidationBatch: {
+                CallerReference: randomUUID(),
+                Paths: {
+                  Quantity: 1,
+                  Items: ["/*"]
+                }
+              }
+            })
+          );
+        }
+      });
+      return `${totalDeleted} objects deleted from cache.`;
     });
   });
 };
@@ -8610,6 +8618,7 @@ var image = (program2) => {
 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 Cancelled3, log as log24, prompt as prompt11 } from "@awsless/clui";
+import { randomUUID as randomUUID2 } from "crypto";
 var clearCache2 = (program2) => {
   program2.command("cache-clear").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 cache-clear", async ({ appConfig, stackConfigs }) => {
@@ -8625,7 +8634,7 @@ var clearCache2 = (program2) => {
           return;
         });
         stack = await prompt11.select({
-          message: "Select the icon proxy:",
+          message: "Select the stack:",
           options: iconStacks.map((stack2) => ({
             label: stack2.name,
             value: stack2.name
@@ -8639,10 +8648,10 @@ var clearCache2 = (program2) => {
         }
         const names = Object.keys(stackConfig.icons ?? {});
         if (!names) {
-          throw new ExpectedError(`No icons are defined in stack "${stack}".`);
+          throw new ExpectedError(`No icon resources are defined in stack "${stack}".`);
         }
         name = await prompt11.select({
-          message: "Select the icon:",
+          message: "Select the icon resource:",
           options: names.map((name2) => ({
             label: name2,
             value: name2
@@ -8669,59 +8678,65 @@ var clearCache2 = (program2) => {
         distributionId = await shared.entry("icon", "distribution-id", name);
         cacheBucket = await shared.entry("icon", "cache-bucket", name);
       } catch (_) {
-        throw new ExpectedError(`The icon proxy hasn't been deployed yet.`);
+        throw new ExpectedError(`The icon resource hasn't been deployed yet.`);
       }
       const s3Client2 = new S3Client4({
         credentials,
         region
       });
-      let continuationToken;
-      let totalDeleted = 0;
-      let hasMore = true;
-      while (hasMore) {
-        const result = await s3Client2.send(
-          new ListObjectsV2Command2({
-            Bucket: cacheBucket,
-            ContinuationToken: continuationToken,
-            MaxKeys: 1e3
-            // Maximum allowed per request
-          })
-        );
-        if (result.Contents && result.Contents.length > 0) {
-          await s3Client2.send(
-            new DeleteObjectsCommand2({
-              Bucket: cacheBucket,
-              Delete: {
-                Objects: result.Contents.map((obj) => ({
-                  Key: obj.Key
-                })),
-                Quiet: true
-              }
-            })
-          );
-          totalDeleted += result.Contents.length;
-          log24.info(`${result.Contents.length} objects deleted from cache.`);
-        }
-        continuationToken = result.NextContinuationToken;
-        hasMore = !!continuationToken;
-      }
       const cloudFrontClient = new CloudFrontClient3({
         credentials,
         region: "us-east-1"
       });
-      await cloudFrontClient.send(
-        new CreateInvalidationCommand3({
-          DistributionId: distributionId,
-          InvalidationBatch: {
-            CallerReference: `icon-cache-clear-${Date.now()}`,
-            Paths: {
-              Quantity: 1,
-              Items: ["/*"]
+      let totalDeleted = 0;
+      await log24.task({
+        initialMessage: "Clearing cache...",
+        successMessage: "Cache successfully cleared.",
+        task: async () => {
+          let continuationToken;
+          while (true) {
+            const result = await s3Client2.send(
+              new ListObjectsV2Command2({
+                Bucket: cacheBucket,
+                ContinuationToken: continuationToken,
+                MaxKeys: 1e3
+                // Maximum allowed per request
+              })
+            );
+            if (result.Contents && result.Contents.length > 0) {
+              await s3Client2.send(
+                new DeleteObjectsCommand2({
+                  Bucket: cacheBucket,
+                  Delete: {
+                    Objects: result.Contents.map((obj) => ({
+                      Key: obj.Key
+                    })),
+                    Quiet: true
+                  }
+                })
+              );
+              totalDeleted += result.Contents.length;
+            }
+            continuationToken = result.NextContinuationToken;
+            if (!continuationToken) {
+              break;
             }
           }
-        })
-      );
-      return "Cache has been cleared";
+          await cloudFrontClient.send(
+            new CreateInvalidationCommand3({
+              DistributionId: distributionId,
+              InvalidationBatch: {
+                CallerReference: randomUUID2(),
+                Paths: {
+                  Quantity: 1,
+                  Items: ["/*"]
+                }
+              }
+            })
+          );
+        }
+      });
+      return `${totalDeleted} objects deleted from cache.`;
     });
   });
 };

package/dist/build-json-schema.js

@@ -1090,8 +1090,8 @@ var IconsSchema = z31.record(
       })
     ]).describe(
       "Image transformation will be applied from a base image. Base images orginates from a local directory that will be uploaded to S3 or from a lambda function."
-    ),
-    version: z31.number().int().min(1).optional().describe("Version of the icon configuration.")
+    )
+    // version: z.number().int().min(1).optional().describe('Version of the icon configuration.'),
   })
 ).optional().describe("Define an icon proxy in your stack. Store, optimize, and deliver icons at scale.");
 

package/dist/prebuild/icon/HASH

@@ -1 +1 @@
-e657f7b86864d8615a7f7439663a94419d048c1f
+335545401eb807d040031352ed637833c4aba83e