@awsless/cli 0.0.14 → 0.0.16

package/dist/bin.js

@@ -5,7 +5,7 @@ import { Command } from "commander";
 
 // src/util/aws.ts
 import { GetCallerIdentityCommand, STSClient } from "@aws-sdk/client-sts";
-import { createCredentialChain } from "@aws-sdk/credential-providers";
+import { createCredentialChain, fromNodeProviderChain } from "@aws-sdk/credential-providers";
 
 // src/cli/ui/complex/fetch-credentials.ts
 import { log, prompt } from "@awsless/clui";
@@ -138,7 +138,11 @@ var validateSecretAccessKey = (value) => {
 };
 
 // src/util/aws.ts
+var hasAmbientAwsCredentials = () => !!(process.env.AWS_CONTAINER_CREDENTIALS_RELATIVE_URI || process.env.AWS_CONTAINER_CREDENTIALS_FULL_URI || process.env.AWS_ACCESS_KEY_ID || process.env.AWS_WEB_IDENTITY_TOKEN_FILE);
 var getCredentials = async (profile) => {
+  if (hasAmbientAwsCredentials()) {
+    return fromNodeProviderChain();
+  }
   const credentials = await fetchCredentials(profile);
   return createCredentialChain(async () => {
     return credentials;
@@ -1175,7 +1179,7 @@ var LogRetentionSchema = DurationSchema.refine(
   (duration) => {
     return validLogRetentionDays.includes(toDays(duration));
   },
-  `Invalid log retention. Valid days are: ${validLogRetentionDays.map((days10) => `${days10}`).join(", ")}`
+  `Invalid log retention. Valid days are: ${validLogRetentionDays.map((days11) => `${days11}`).join(", ")}`
 ).describe("The log retention duration.");
 var LogSchema = z15.union([
   z15.boolean().transform((enabled) => ({ retention: enabled ? days(7) : days(0) })),
@@ -1788,7 +1792,7 @@ var LogRetentionSchema2 = DurationSchema.refine(
   (duration) => {
     return validLogRetentionDays2.includes(toDays2(duration));
   },
-  `Invalid log retention. Valid days are: ${validLogRetentionDays2.map((days10) => `${days10}`).join(", ")}`
+  `Invalid log retention. Valid days are: ${validLogRetentionDays2.map((days11) => `${days11}`).join(", ")}`
 ).describe("The log retention duration.");
 var LogSchema2 = z26.union([
   z26.boolean().transform((enabled) => ({ retention: enabled ? days4(7) : days4(0) })),
@@ -1929,7 +1933,7 @@ var LogRetentionSchema3 = DurationSchema.refine(
   (duration) => {
     return validLogRetentionDays3.includes(toDays3(duration));
   },
-  `Invalid log retention. Valid days are: ${validLogRetentionDays3.map((days10) => `${days10}`).join(", ")}`
+  `Invalid log retention. Valid days are: ${validLogRetentionDays3.map((days11) => `${days11}`).join(", ")}`
 ).describe("The log retention duration.");
 var LogSchema3 = z27.union([
   z27.boolean().transform((enabled) => ({ retention: enabled ? days5(7) : days5(0) })),
@@ -2337,7 +2341,14 @@ var SitesSchema = z38.record(
 ).optional().describe("Define the sites in your stack.");
 
 // src/feature/store/schema.ts
+import { days as days6 } from "@awsless/duration";
 import { z as z39 } from "zod";
+var LifecycleRuleSchema = z39.object({
+  prefix: z39.string().optional().describe("Object-key prefix this rule applies to. Omit to apply bucket-wide."),
+  expiration: DurationSchema.refine(durationMin(days6(1)), "Minimum expiration is 1 day").describe(
+    "How long objects matching this rule live before S3 deletes them."
+  )
+});
 var StoresSchema = z39.union([
   z39.array(ResourceIdSchema).transform((list3) => {
     const stores = {};
@@ -2351,6 +2362,7 @@ var StoresSchema = z39.union([
     z39.object({
       static: LocalDirectorySchema.optional().describe("Specifies the path to the static files directory."),
       versioning: z39.boolean().default(false).describe("Enable versioning of your store."),
+      lifecycle: z39.array(LifecycleRuleSchema).optional().describe("S3 lifecycle rules for this store. Each rule expires objects matching an optional prefix."),
       events: z39.object({
         // create
         "created:*": TaskSchema.optional().describe(
@@ -4574,7 +4586,7 @@ var functionFeature = defineFeature({
 });
 
 // src/feature/function/prebuild.ts
-import { days as days6, seconds as seconds5, toDays as toDays6, toSeconds as toSeconds3 } from "@awsless/duration";
+import { days as days7, seconds as seconds5, toDays as toDays6, toSeconds as toSeconds3 } from "@awsless/duration";
 import { mebibytes as mebibytes2, toMebibytes as toMebibytes4 } from "@awsless/size";
 import { aws as aws8 } from "@terraforge/aws";
 import { Output as Output4, findInputDeps as findInputDeps2, resolveInputs as resolveInputs2 } from "@terraforge/core";
@@ -4706,7 +4718,7 @@ var createPrebuildLambdaFunction = (group, ctx, ns, id, props) => {
   if (props.log?.retention && props.log?.retention?.value > 0n) {
     const logGroup = new aws8.cloudwatch.LogGroup(group, "log", {
       name: `/aws/lambda/${name}`,
-      retentionInDays: toDays6(props.log.retention ?? days6(7))
+      retentionInDays: toDays6(props.log.retention ?? days7(7))
     });
     addPermission({
       actions: ["logs:PutLogEvents", "logs:CreateLogStream"],
@@ -4763,7 +4775,7 @@ import { Group as Group8 } from "@terraforge/core";
 import { aws as aws9 } from "@terraforge/aws";
 import { join as join10 } from "path";
 import { mebibytes as mebibytes3 } from "@awsless/size";
-import { days as days7, seconds as seconds6 } from "@awsless/duration";
+import { days as days8, seconds as seconds6 } from "@awsless/duration";
 var onErrorLogFeature = defineFeature({
   name: "on-error-log",
   onApp(ctx) {
@@ -4778,7 +4790,7 @@ var onErrorLogFeature = defineFeature({
       log: {
         format: "json",
         level: "warn",
-        retention: days7(3),
+        retention: days8(3),
         system: "warn"
       }
     });
@@ -4835,7 +4847,7 @@ import { Group as Group9 } from "@terraforge/core";
 import { aws as aws10 } from "@terraforge/aws";
 import { join as join11 } from "path";
 import { mebibytes as mebibytes4 } from "@awsless/size";
-import { days as days8, toSeconds as toSeconds4 } from "@awsless/duration";
+import { days as days9, toSeconds as toSeconds4 } from "@awsless/duration";
 var onFailureFeature = defineFeature({
   name: "on-failure",
   onApp(ctx) {
@@ -4846,7 +4858,7 @@ var onFailureFeature = defineFeature({
         resourceType: "on-failure",
         resourceName: "deadletter"
       }),
-      messageRetentionSeconds: toSeconds4(days8(14))
+      messageRetentionSeconds: toSeconds4(days9(14))
     });
     const queue2 = new aws10.sqs.Queue(group, "on-failure", {
       name: formatGlobalResourceName({
@@ -4994,7 +5006,7 @@ var onFailureFeature = defineFeature({
         log: {
           format: "json",
           level: "warn",
-          retention: days8(3),
+          retention: days9(3),
           system: "warn"
         }
       });
@@ -5986,6 +5998,7 @@ var siteFeature = defineFeature({
 
 // src/feature/store/index.ts
 import { Group as Group16 } from "@terraforge/core";
+import { toDays as toDays7 } from "@awsless/duration";
 import { kebabCase as kebabCase7 } from "change-case";
 import { aws as aws17 } from "@terraforge/aws";
 import { glob as glob3 } from "glob";
@@ -6087,6 +6100,12 @@ var storeFeature = defineFeature({
         resourceName: id,
         postfix: ctx.appId
       });
+      const lifecycleRule = props.lifecycle?.map((rule, index) => ({
+        id: rule.prefix ? `expire-${kebabCase7(rule.prefix)}` : `expire-rule-${index}`,
+        enabled: true,
+        ...rule.prefix ? { prefix: rule.prefix } : {},
+        expiration: { days: toDays7(rule.expiration) }
+      }));
       const bucket = new aws17.s3.Bucket(
         group,
         "store",
@@ -6104,7 +6123,8 @@ var storeFeature = defineFeature({
               allowedOrigins: ["*"],
               allowedMethods: ["POST"]
             }
-          ]
+          ],
+          ...lifecycleRule?.length ? { lifecycleRule } : {}
         },
         {
           retainOnDelete: ctx.appConfig.removal === "retain",
@@ -6893,7 +6913,7 @@ import { Group as Group23 } from "@terraforge/core";
 import { aws as aws24 } from "@terraforge/aws";
 import { join as join15, dirname as dirname7 } from "path";
 import { mebibytes as mebibytes6 } from "@awsless/size";
-import { seconds as seconds8, toDays as toDays7 } from "@awsless/duration";
+import { seconds as seconds8, toDays as toDays8 } from "@awsless/duration";
 import { fileURLToPath as fileURLToPath2 } from "url";
 import { glob as glob4 } from "glob";
 var __dirname3 = dirname7(fileURLToPath2(import.meta.url));
@@ -6984,7 +7004,7 @@ var imageFeature = defineFeature({
               enabled: true,
               id: "image-cache-duration",
               expiration: {
-                days: toDays7(props.cacheDuration)
+                days: toDays8(props.cacheDuration)
               }
             }
           ]
@@ -7090,7 +7110,7 @@ import { Group as Group24 } from "@terraforge/core";
 import { aws as aws25 } from "@terraforge/aws";
 import { join as join16, dirname as dirname8 } from "path";
 import { mebibytes as mebibytes7 } from "@awsless/size";
-import { seconds as seconds9, toDays as toDays8 } from "@awsless/duration";
+import { seconds as seconds9, toDays as toDays9 } from "@awsless/duration";
 import { fileURLToPath as fileURLToPath3 } from "url";
 import { glob as glob5 } from "glob";
 var __dirname4 = dirname8(fileURLToPath3(import.meta.url));
@@ -7135,7 +7155,7 @@ var iconFeature = defineFeature({
               enabled: true,
               id: "icon-cache-duration",
               expiration: {
-                days: toDays8(props.cacheDuration)
+                days: toDays9(props.cacheDuration)
               }
             }
           ]
@@ -7242,7 +7262,7 @@ import { relative as relative8 } from "path";
 
 // src/feature/job/util.ts
 import { createHash as createHash4 } from "crypto";
-import { toDays as toDays9, toSeconds as toSeconds9 } from "@awsless/duration";
+import { toDays as toDays10, toSeconds as toSeconds9 } from "@awsless/duration";
 import { stringify } from "@awsless/json";
 import { toMebibytes as toMebibytes5 } from "@awsless/size";
 import { generateFileHash as generateFileHash2 } from "@awsless/ts-file-cache";
@@ -7442,7 +7462,7 @@ var createFargateJob = (parentGroup, ctx, ns, id, local) => {
   if (props.log.retention && props.log.retention.value > 0n) {
     logGroup = new aws26.cloudwatch.LogGroup(group, "log", {
       name: `/aws/ecs/${name}`,
-      retentionInDays: toDays9(props.log.retention)
+      retentionInDays: toDays10(props.log.retention)
     });
     if (ctx.shared.has("on-error-log", "subscriber-arn")) {
       new aws26.cloudwatch.LogSubscriptionFilter(group, "on-error-log", {
@@ -7818,7 +7838,7 @@ import { Group as Group28 } from "@terraforge/core";
 import { aws as aws29 } from "@terraforge/aws";
 
 // src/feature/instance/util.ts
-import { toDays as toDays10, toSeconds as toSeconds10 } from "@awsless/duration";
+import { toDays as toDays11, toSeconds as toSeconds10 } from "@awsless/duration";
 import { stringify as stringify2 } from "@awsless/json";
 import { toMebibytes as toMebibytes6 } from "@awsless/size";
 import { generateFileHash as generateFileHash3 } from "@awsless/ts-file-cache";
@@ -8003,7 +8023,7 @@ var createFargateTask = (parentGroup, ctx, ns, id, local) => {
     logGroup = new aws28.cloudwatch.LogGroup(group, "log", {
       name: `/aws/ecs/${name}`,
       // name: `/aws/lambda/${name}`,
-      retentionInDays: toDays10(props.log.retention)
+      retentionInDays: toDays11(props.log.retention)
     });
     if (ctx.shared.has("on-error-log", "subscriber-arn")) {
       new aws28.cloudwatch.LogSubscriptionFilter(group, "on-error-log", {
@@ -8390,7 +8410,7 @@ var metricFeature = defineFeature({
 });
 
 // src/feature/router/index.ts
-import { days as days9, seconds as seconds10, toSeconds as toSeconds12, years } from "@awsless/duration";
+import { days as days10, seconds as seconds10, toSeconds as toSeconds12, years } from "@awsless/duration";
 import { Future, Group as Group30 } from "@terraforge/core";
 import { aws as aws31 } from "@terraforge/aws";
 import { camelCase as camelCase9, constantCase as constantCase15 } from "change-case";
@@ -8685,8 +8705,8 @@ var routerFeature = defineFeature({
       const cache = new aws31.cloudfront.CachePolicy(group, "cache", {
         name,
         minTtl: toSeconds12(seconds10(0)),
-        maxTtl: toSeconds12(days9(365)),
-        defaultTtl: toSeconds12(days9(0)),
+        maxTtl: toSeconds12(days10(365)),
+        defaultTtl: toSeconds12(days10(0)),
         parametersInCacheKeyAndForwardedToOrigin: {
           enableAcceptEncodingBrotli: true,
           enableAcceptEncodingGzip: true,

package/dist/build-json-schema.js

@@ -233,7 +233,7 @@ var LogRetentionSchema = DurationSchema.refine(
   (duration) => {
     return validLogRetentionDays.includes(toDays(duration));
   },
-  `Invalid log retention. Valid days are: ${validLogRetentionDays.map((days6) => `${days6}`).join(", ")}`
+  `Invalid log retention. Valid days are: ${validLogRetentionDays.map((days7) => `${days7}`).join(", ")}`
 ).describe("The log retention duration.");
 var LogSchema = z11.union([
   z11.boolean().transform((enabled) => ({ retention: enabled ? days(7) : days(0) })),
@@ -846,7 +846,7 @@ var LogRetentionSchema2 = DurationSchema.refine(
   (duration) => {
     return validLogRetentionDays2.includes(toDays2(duration));
   },
-  `Invalid log retention. Valid days are: ${validLogRetentionDays2.map((days6) => `${days6}`).join(", ")}`
+  `Invalid log retention. Valid days are: ${validLogRetentionDays2.map((days7) => `${days7}`).join(", ")}`
 ).describe("The log retention duration.");
 var LogSchema2 = z22.union([
   z22.boolean().transform((enabled) => ({ retention: enabled ? days4(7) : days4(0) })),
@@ -987,7 +987,7 @@ var LogRetentionSchema3 = DurationSchema.refine(
   (duration) => {
     return validLogRetentionDays3.includes(toDays3(duration));
   },
-  `Invalid log retention. Valid days are: ${validLogRetentionDays3.map((days6) => `${days6}`).join(", ")}`
+  `Invalid log retention. Valid days are: ${validLogRetentionDays3.map((days7) => `${days7}`).join(", ")}`
 ).describe("The log retention duration.");
 var LogSchema3 = z23.union([
   z23.boolean().transform((enabled) => ({ retention: enabled ? days5(7) : days5(0) })),
@@ -1395,7 +1395,14 @@ var SitesSchema = z34.record(
 ).optional().describe("Define the sites in your stack.");
 
 // src/feature/store/schema.ts
+import { days as days6 } from "@awsless/duration";
 import { z as z35 } from "zod";
+var LifecycleRuleSchema = z35.object({
+  prefix: z35.string().optional().describe("Object-key prefix this rule applies to. Omit to apply bucket-wide."),
+  expiration: DurationSchema.refine(durationMin(days6(1)), "Minimum expiration is 1 day").describe(
+    "How long objects matching this rule live before S3 deletes them."
+  )
+});
 var StoresSchema = z35.union([
   z35.array(ResourceIdSchema).transform((list) => {
     const stores = {};
@@ -1409,6 +1416,7 @@ var StoresSchema = z35.union([
     z35.object({
       static: LocalDirectorySchema.optional().describe("Specifies the path to the static files directory."),
       versioning: z35.boolean().default(false).describe("Enable versioning of your store."),
+      lifecycle: z35.array(LifecycleRuleSchema).optional().describe("S3 lifecycle rules for this store. Each rule expires objects matching an optional prefix."),
       events: z35.object({
         // create
         "created:*": TaskSchema.optional().describe(