@awsless/awsless 0.0.567 → 0.0.568

package/dist/bin.js

@@ -1078,7 +1078,7 @@ var QueueDefaultSchema = z19.object({
   maxBatchingWindow: MaxBatchingWindow.optional()
 }).default({});
 var QueueSchema = z19.object({
-  consumer: FunctionSchema.describe("The consuming lambda function properties."),
+  consumer: FunctionSchema.describe("The consuming lambda function properties.").optional(),
   retentionPeriod: RetentionPeriodSchema.optional(),
   visibilityTimeout: VisibilityTimeoutSchema.optional(),
   deliveryDelay: DeliveryDelaySchema.optional(),
@@ -1211,6 +1211,7 @@ var HealthCheckSchema = z23.object({
   )
 }).describe("The health check command and associated configuration parameters for the container.");
 var EnvironmentSchema2 = z23.record(z23.string(), z23.string()).optional().describe("Environment variable key-value pairs.");
+var ArchitectureSchema3 = z23.enum(["x86_64", "arm64"]).describe("The instruction set architecture that the instance supports.");
 var ActionSchema2 = z23.string();
 var ActionsSchema2 = z23.union([ActionSchema2.transform((v) => [v]), ActionSchema2.array()]);
 var ArnSchema2 = z23.string().startsWith("arn:");
@@ -1262,7 +1263,7 @@ var ISchema = z23.object({
   log: LogSchema2.optional(),
   cpu: CpuSchema.optional(),
   memorySize: MemorySizeSchema2.optional(),
-  // architecture: ArchitectureSchema.optional(),
+  architecture: ArchitectureSchema3.optional(),
   environment: EnvironmentSchema2.optional(),
   permissions: PermissionsSchema2.optional(),
   healthCheck: HealthCheckSchema.optional()
@@ -1276,10 +1277,10 @@ var InstanceSchema = z23.union([
 ]);
 var InstancesSchema = z23.record(ResourceIdSchema, InstanceSchema).optional().describe("Define the instances in your stack.");
 var InstanceDefaultSchema = z23.object({
-  image: ImageSchema.default("public.ecr.aws/aws-cli/aws-cli:amd64"),
+  image: ImageSchema.optional(),
   cpu: CpuSchema.default(0.25),
   memorySize: MemorySizeSchema2.default("512 MB"),
-  // architecture: ArchitectureSchema.default('arm64'),
+  architecture: ArchitectureSchema3.default("arm64"),
   environment: EnvironmentSchema2.optional(),
   permissions: PermissionsSchema2.optional(),
   healthCheck: HealthCheckSchema.optional(),
@@ -4163,7 +4164,7 @@ var queueFeature = defineFeature({
           resourceType: "queue",
           resourceName: name
         });
-        if ("file" in props.consumer.code) {
+        if (props.consumer && "file" in props.consumer.code) {
           const relFile = relative4(directories.types, props.consumer.code.file);
           gen.addImport(varName, relFile);
           mock.addType(name, `MockBuilder<typeof ${varName}>`);
@@ -4206,34 +4207,36 @@ var queueFeature = defineFeature({
           })
         )
       });
-      const result = createLambdaFunction(group, ctx, `queue`, id, local.consumer);
-      result.setEnvironment("LOG_VIEWABLE_ERROR", "1");
-      new $10.aws.lambda.EventSourceMapping(
-        group,
-        "event",
-        {
-          functionName: result.lambda.functionName,
-          eventSourceArn: queue2.arn,
-          batchSize: props.batchSize,
-          maximumBatchingWindowInSeconds: props.maxBatchingWindow && toSeconds3(props.maxBatchingWindow),
-          scalingConfig: {
-            maximumConcurrency: props.maxConcurrency
+      if (local.consumer) {
+        const lambdaConsumer = createLambdaFunction(group, ctx, `queue`, id, local.consumer);
+        lambdaConsumer.setEnvironment("LOG_VIEWABLE_ERROR", "1");
+        new $10.aws.lambda.EventSourceMapping(
+          group,
+          "event",
+          {
+            functionName: lambdaConsumer.lambda.functionName,
+            eventSourceArn: queue2.arn,
+            batchSize: props.batchSize,
+            maximumBatchingWindowInSeconds: props.maxBatchingWindow && toSeconds3(props.maxBatchingWindow),
+            scalingConfig: {
+              maximumConcurrency: props.maxConcurrency
+            }
+          },
+          {
+            dependsOn: [lambdaConsumer.policy]
           }
-        },
-        {
-          dependsOn: [result.policy]
-        }
-      );
-      result.addPermission({
-        actions: ["sqs:ReceiveMessage", "sqs:DeleteMessage", "sqs:GetQueueAttributes"],
-        resources: [queue2.arn]
-      });
+        );
+        lambdaConsumer.addPermission({
+          actions: ["sqs:ReceiveMessage", "sqs:DeleteMessage", "sqs:GetQueueAttributes"],
+          resources: [queue2.arn]
+        });
+      }
       ctx.addEnv(`QUEUE_${constantCase6(ctx.stack.name)}_${constantCase6(id)}_URL`, queue2.url);
       ctx.addStackPermission({
         actions: [
-          //
           "sqs:SendMessage",
           "sqs:ReceiveMessage",
+          "sqs:DeleteMessage",
           "sqs:GetQueueUrl",
           "sqs:GetQueueAttributes"
         ],
@@ -6928,7 +6931,7 @@ import { toDays as toDays8, toSeconds as toSeconds10 } from "@awsless/duration";
 import { $ as $25, Future as Future4, Group as Group25, resolveInputs as resolveInputs3 } from "@awsless/formation";
 import { toMebibytes as toMebibytes4 } from "@awsless/size";
 import { generateFileHash as generateFileHash2 } from "@awsless/ts-file-cache";
-import { pascalCase as pascalCase3 } from "change-case";
+import { constantCase as constantCase14, pascalCase as pascalCase3 } from "change-case";
 import deepmerge4 from "deepmerge";
 import { join as join16 } from "path";
 
@@ -6937,9 +6940,10 @@ import { createHash as createHash4 } from "crypto";
 import { readFile as readFile4 } from "fs/promises";
 import { join as join15 } from "path";
 import { exec as exec2 } from "promisify-child-process";
-var buildExecutable = async (input, outputPath) => {
+var buildExecutable = async (input, outputPath, architecture) => {
   const filePath = join15(outputPath, "program");
-  const args = ["build", input, "--compile", "--target", "bun-linux-x64-modern", "--outfile", filePath];
+  const target = architecture === "x86_64" ? "bun-linux-x64-modern" : "bun-linux-arm64-modern";
+  const args = ["build", input, "--compile", "--target", target, "--outfile", filePath];
   try {
     await exec2(`bun ${args.join(" ")}`);
   } catch (error) {
@@ -6963,11 +6967,12 @@ var createFargateTask = (parentGroup, ctx, ns, id, local) => {
   });
   const shortName = shortId(`${ctx.app.name}:${ctx.stack.name}:${ns}:${id}:${ctx.appId}`);
   const props = deepmerge4(ctx.appConfig.defaults.instance, local);
+  const image2 = props.image || (props.architecture === "arm64" ? "public.ecr.aws/aws-cli/aws-cli:arm64" : "public.ecr.aws/aws-cli/aws-cli:amd64");
   ctx.registerBuild("instance", name, async (build3, { workspace }) => {
     const fingerprint = await generateFileHash2(workspace, local.code.file);
     return build3(fingerprint, async (write) => {
       const temp = await createTempFolder(`instance--${name}`);
-      const executable = await buildExecutable(local.code.file, temp.path);
+      const executable = await buildExecutable(local.code.file, temp.path, props.architecture);
       await Promise.all([
         //
         write("HASH", executable.hash),
@@ -7086,7 +7091,6 @@ var createFargateTask = (parentGroup, ctx, ns, id, local) => {
     APP: ctx.appConfig.name,
     APP_ID: ctx.appId,
     STACK: ctx.stackConfig.name
-    // CODE_HASH: code.sourceHash.pipe<string>(v => v!),
   };
   const variables = {};
   const task2 = new $25.aws.ecs.TaskDefinition(
@@ -7101,7 +7105,7 @@ var createFargateTask = (parentGroup, ctx, ns, id, local) => {
       executionRoleArn: executionRole.arn,
       taskRoleArn: role.arn,
       runtimePlatform: {
-        cpuArchitecture: "X86_64",
+        cpuArchitecture: constantCase14(props.architecture),
         operatingSystemFamily: "LINUX"
       },
       trackLatest: true,
@@ -7116,7 +7120,7 @@ var createFargateTask = (parentGroup, ctx, ns, id, local) => {
             {
               name: `container-${id}`,
               essential: true,
-              image: props.image,
+              image: image2,
               protocol: "tcp",
               workingDirectory: "/usr/app",
               entryPoint: ["sh", "-c"],
@@ -7208,22 +7212,6 @@ var createFargateTask = (parentGroup, ctx, ns, id, local) => {
     cidrIpv4: "0.0.0.0/0",
     tags
   });
-  const discoveryService = new $25.aws.service.DiscoveryService(group, `service-discovery`, {
-    name: shortId(`${ctx.stack.name}:${id}`),
-    description: `Service discovery for the ${name} instance`,
-    dnsConfig: {
-      namespaceId: ctx.shared.get("instance", "namespace-id"),
-      routingPolicy: "MULTIVALUE",
-      dnsRecords: [
-        {
-          type: "A",
-          ttl: 300
-        }
-      ]
-    },
-    forceDestroy: true,
-    tags
-  });
   const service = new $25.aws.ecs.Service(group, "service", {
     name,
     cluster: ctx.shared.get("instance", "cluster-arn"),
@@ -7234,34 +7222,20 @@ var createFargateTask = (parentGroup, ctx, ns, id, local) => {
       subnets: ctx.shared.get("vpc", "public-subnets"),
       securityGroups: [securityGroup.id],
       assignPublicIp: true
+      // https://stackoverflow.com/questions/76398247/cannotpullcontainererror-pull-image-manifest-has-been-retried-5-times-failed
     },
     forceNewDeployment: true,
     forceDelete: true,
-    serviceRegistries: {
-      registryArn: discoveryService.arn
-    },
     // deploymentCircuitBreaker: {
     // 	enable: true,
     // 	rollback: true,
     // },
     // deploymentController: { type: 'ECS' },
     tags
-    // The internal url (dnsName) doesn't work for ldambda's
-    // https://github.com/aws/containers-roadmap/issues/1960
-    // serviceConnectConfiguration: {
-    // 	enabled: true,
-    // 	namespace: ctx.shared.get('instance', 'namespace'),
-    // 	service: [
-    // 		{
-    // 			clientAlias: {
-    // 				port: 80,
-    // 				dnsName: `${id}.${ctx.app.name}.internal`,
-    // 			},
-    // 			discoveryName: name,
-    // 			portName: 'http',
-    // 		},
-    // 	],
-    // },
+  });
+  ctx.onEnv((name2, value) => {
+    variables[name2] = value;
+    task2.$.attachDependencies(value);
   });
   variables.APP = ctx.appConfig.name;
   variables.APP_ID = ctx.appId;
@@ -7337,7 +7311,7 @@ var instanceFeature = defineFeature({
 
 // src/feature/metric/index.ts
 import { $ as $27, Group as Group27 } from "@awsless/formation";
-import { kebabCase as kebabCase8, constantCase as constantCase14 } from "change-case";
+import { kebabCase as kebabCase8, constantCase as constantCase15 } from "change-case";
 import { toSeconds as toSeconds11 } from "@awsless/duration";
 var typeGenCode9 = `
 import { type PutDataProps, putData, batchPutData } from '@awsless/cloudwatch'
@@ -7405,7 +7379,7 @@ var metricFeature = defineFeature({
     });
     for (const [id, props] of Object.entries(ctx.stackConfig.metrics ?? {})) {
       const group = new Group27(ctx.stack, "metric", id);
-      ctx.addEnv(`METRIC_${constantCase14(id)}`, props.type);
+      ctx.addEnv(`METRIC_${constantCase15(id)}`, props.type);
       for (const alarmId in props.alarms ?? []) {
         const alarmGroup = new Group27(group, "alarm", alarmId);
         const alarmName = kebabCase8(`${id}-${alarmId}`);
@@ -8922,7 +8896,7 @@ var auth = (program2) => {
 
 // src/cli/command/bind.ts
 import { log as log18 } from "@awsless/clui";
-import { constantCase as constantCase15 } from "change-case";
+import { constantCase as constantCase16 } from "change-case";
 import { spawn } from "child_process";
 var bind = (program2) => {
   program2.command("bind").argument("[command...]", "The command to execute").option("--config <string...>", "List of config values that will be accessable", (v) => v.split(",")).description(`Bind your site environment variables to a command`).action(async (commands9 = [], opts) => {
@@ -8951,10 +8925,10 @@ var bind = (program2) => {
       const configList = opts.config ?? [];
       const configs = {};
       for (const name of configList) {
-        configs[`CONFIG_${constantCase15(name)}`] = name;
+        configs[`CONFIG_${constantCase16(name)}`] = name;
       }
       if (configList.length ?? 0 > 0) {
-        log18.note("Bind Config", configList.map((v) => color.label(constantCase15(v))).join("\n"));
+        log18.note("Bind Config", configList.map((v) => color.label(constantCase16(v))).join("\n"));
       }
       if (commands9.length === 0) {
         return "No command to execute.";

package/dist/build-json-schema.js

@@ -470,7 +470,7 @@ var QueueDefaultSchema = z16.object({
   maxBatchingWindow: MaxBatchingWindow.optional()
 }).default({});
 var QueueSchema = z16.object({
-  consumer: FunctionSchema.describe("The consuming lambda function properties."),
+  consumer: FunctionSchema.describe("The consuming lambda function properties.").optional(),
   retentionPeriod: RetentionPeriodSchema.optional(),
   visibilityTimeout: VisibilityTimeoutSchema.optional(),
   deliveryDelay: DeliveryDelaySchema.optional(),
@@ -603,6 +603,7 @@ var HealthCheckSchema = z20.object({
   )
 }).describe("The health check command and associated configuration parameters for the container.");
 var EnvironmentSchema2 = z20.record(z20.string(), z20.string()).optional().describe("Environment variable key-value pairs.");
+var ArchitectureSchema3 = z20.enum(["x86_64", "arm64"]).describe("The instruction set architecture that the instance supports.");
 var ActionSchema2 = z20.string();
 var ActionsSchema2 = z20.union([ActionSchema2.transform((v) => [v]), ActionSchema2.array()]);
 var ArnSchema2 = z20.string().startsWith("arn:");
@@ -654,7 +655,7 @@ var ISchema = z20.object({
   log: LogSchema2.optional(),
   cpu: CpuSchema.optional(),
   memorySize: MemorySizeSchema2.optional(),
-  // architecture: ArchitectureSchema.optional(),
+  architecture: ArchitectureSchema3.optional(),
   environment: EnvironmentSchema2.optional(),
   permissions: PermissionsSchema2.optional(),
   healthCheck: HealthCheckSchema.optional()
@@ -668,10 +669,10 @@ var InstanceSchema = z20.union([
 ]);
 var InstancesSchema = z20.record(ResourceIdSchema, InstanceSchema).optional().describe("Define the instances in your stack.");
 var InstanceDefaultSchema = z20.object({
-  image: ImageSchema.default("public.ecr.aws/aws-cli/aws-cli:amd64"),
+  image: ImageSchema.optional(),
   cpu: CpuSchema.default(0.25),
   memorySize: MemorySizeSchema2.default("512 MB"),
-  // architecture: ArchitectureSchema.default('arm64'),
+  architecture: ArchitectureSchema3.default("arm64"),
   environment: EnvironmentSchema2.optional(),
   permissions: PermissionsSchema2.optional(),
   healthCheck: HealthCheckSchema.optional(),