alchemy 0.62.3 → 0.63.1

package/src/aws/function.ts

@@ -1,25 +1,14 @@
-import {
-  AddPermissionCommand,
+import type {
   Architecture,
-  CreateFunctionCommand,
-  CreateFunctionUrlConfigCommand,
-  DeleteFunctionCommand,
-  DeleteFunctionUrlConfigCommand,
-  GetFunctionCommand,
-  GetFunctionConfigurationCommand,
-  GetFunctionUrlConfigCommand,
   LambdaClient,
-  ResourceNotFoundException,
   Runtime,
-  UpdateFunctionCodeCommand,
-  UpdateFunctionConfigurationCommand,
-  UpdateFunctionUrlConfigCommand,
 } from "@aws-sdk/client-lambda";
 import type { Context } from "../context.ts";
 import type { Bundle } from "../esbuild/bundle.ts";
 import { Resource } from "../resource.ts";
 import { ignore } from "../util/ignore.ts";
 import { logger } from "../util/logger.ts";
+import { importPeer } from "../util/peer.ts";
 import { retry } from "./retry.ts";
 
 /**
@@ -28,8 +17,10 @@ import { retry } from "./retry.ts";
 export interface FunctionProps {
   /**
    * Name of the Lambda function
+   *
+   * @default ${app}-${stage}-${id}
    */
-  functionName: string;
+  functionName?: string;
 
   /**
    * Bundle for the function
@@ -151,6 +142,11 @@ export interface Function extends Resource<"lambda::Function">, FunctionProps {
    */
   arn: string;
 
+  /**
+   * Name of the Function
+   */
+  functionName: string;
+
   /**
    * Timestamp of the last function modification
    */
@@ -309,10 +305,36 @@ export interface Function extends Resource<"lambda::Function">, FunctionProps {
  */
 export const Function = Resource(
   "lambda::Function",
-  async function (this: Context<Function>, _id: string, props: FunctionProps) {
+  async function (this: Context<Function>, id: string, props: FunctionProps) {
+    const {
+      AddPermissionCommand,
+      Architecture,
+      CreateFunctionCommand,
+      CreateFunctionUrlConfigCommand,
+      DeleteFunctionCommand,
+      DeleteFunctionUrlConfigCommand,
+      GetFunctionCommand,
+      GetFunctionConfigurationCommand,
+      GetFunctionUrlConfigCommand,
+      LambdaClient,
+      ResourceNotFoundException,
+      Runtime,
+      UpdateFunctionCodeCommand,
+      UpdateFunctionConfigurationCommand,
+      UpdateFunctionUrlConfigCommand,
+    } = await importPeer(import("@aws-sdk/client-lambda"), "lambda::Function");
     const client = new LambdaClient({});
     const region = await resolveRegion(client);
 
+    const functionName =
+      props.functionName ??
+      this.output?.functionName ??
+      this.scope.createPhysicalName(id);
+
+    if (this.phase === "update" && this.output.functionName !== functionName) {
+      this.replace();
+    }
+
     if (this.phase === "delete") {
       // Delete function URL if it exists
       if (this.output?.url) {
@@ -320,7 +342,7 @@ export const Function = Resource(
           await retry(() =>
             client.send(
               new DeleteFunctionUrlConfigCommand({
-                FunctionName: props.functionName,
+                FunctionName: functionName,
               }),
             ),
           );
@@ -335,7 +357,7 @@ export const Function = Resource(
         retry(() =>
           client.send(
             new DeleteFunctionCommand({
-              FunctionName: props.functionName,
+              FunctionName: functionName,
             }),
           ),
         ),
@@ -352,33 +374,33 @@ export const Function = Resource(
       await retry(() =>
         client.send(
           new GetFunctionCommand({
-            FunctionName: props.functionName,
+            FunctionName: functionName,
           }),
         ),
       );
 
       if (this.phase === "update") {
         // Wait for function to stabilize
-        await waitForFunctionStabilization(client, props.functionName);
+        await waitForFunctionStabilization(client, functionName);
 
         // Update function code
         await retry(() =>
           client.send(
             new UpdateFunctionCodeCommand({
-              FunctionName: props.functionName,
+              FunctionName: functionName,
               ZipFile: code,
             }),
           ),
         );
 
         // Wait for code update to stabilize
-        await waitForFunctionStabilization(client, props.functionName);
+        await waitForFunctionStabilization(client, functionName);
 
         // Update function configuration
         await retry(() =>
           client.send(
             new UpdateFunctionConfigurationCommand({
-              FunctionName: props.functionName,
+              FunctionName: functionName,
               Handler: props.handler,
               Runtime: props.runtime,
               Role: props.roleArn,
@@ -394,7 +416,7 @@ export const Function = Resource(
         );
 
         // Wait for configuration update to stabilize
-        await waitForFunctionStabilization(client, props.functionName);
+        await waitForFunctionStabilization(client, functionName);
 
         // Handle URL configuration
         if (props.url) {
@@ -403,7 +425,7 @@ export const Function = Resource(
             const urlConfig = await retry(() =>
               client.send(
                 new GetFunctionUrlConfigCommand({
-                  FunctionName: props.functionName,
+                  FunctionName: functionName,
                 }),
               ),
             );
@@ -413,7 +435,7 @@ export const Function = Resource(
               const updateResult = await retry(() =>
                 client.send(
                   new UpdateFunctionUrlConfigCommand({
-                    FunctionName: props.functionName,
+                    FunctionName: functionName,
                     AuthType: props.url!.authType || "NONE",
                     InvokeMode: props.url!.invokeMode || "BUFFERED",
                     Cors: props.url!.cors
@@ -437,7 +459,7 @@ export const Function = Resource(
                   await retry(() =>
                     client.send(
                       new AddPermissionCommand({
-                        FunctionName: props.functionName,
+                        FunctionName: functionName,
                         StatementId: "FunctionURLAllowPublicAccess",
                         Action: "lambda:InvokeFunctionUrl",
                         Principal: "*",
@@ -456,7 +478,7 @@ export const Function = Resource(
               const createResult = await retry(() =>
                 client.send(
                   new CreateFunctionUrlConfigCommand({
-                    FunctionName: props.functionName,
+                    FunctionName: functionName,
                     AuthType: props.url!.authType || "NONE",
                     InvokeMode: props.url!.invokeMode || "BUFFERED",
                     Cors: props.url!.cors
@@ -480,7 +502,7 @@ export const Function = Resource(
                   await retry(() =>
                     client.send(
                       new AddPermissionCommand({
-                        FunctionName: props.functionName,
+                        FunctionName: functionName,
                         StatementId: "FunctionURLAllowPublicAccess",
                         Action: "lambda:InvokeFunctionUrl",
                         Principal: "*",
@@ -501,7 +523,7 @@ export const Function = Resource(
               const createResult = await retry(() =>
                 client.send(
                   new CreateFunctionUrlConfigCommand({
-                    FunctionName: props.functionName,
+                    FunctionName: functionName,
                     AuthType: props.url!.authType || "NONE",
                     InvokeMode: props.url!.invokeMode || "BUFFERED",
                     Cors: props.url!.cors
@@ -525,7 +547,7 @@ export const Function = Resource(
                   await retry(() =>
                     client.send(
                       new AddPermissionCommand({
-                        FunctionName: props.functionName,
+                        FunctionName: functionName,
                         StatementId: "FunctionURLAllowPublicAccess",
                         Action: "lambda:InvokeFunctionUrl",
                         Principal: "*",
@@ -549,7 +571,7 @@ export const Function = Resource(
             await retry(() =>
               client.send(
                 new DeleteFunctionUrlConfigCommand({
-                  FunctionName: props.functionName,
+                  FunctionName: functionName,
                 }),
               ),
             );
@@ -572,7 +594,7 @@ export const Function = Resource(
             await retry(() =>
               client.send(
                 new CreateFunctionCommand({
-                  FunctionName: props.functionName,
+                  FunctionName: functionName,
                   Code: { ZipFile: code },
                   Handler: props.handler || "index.handler",
                   Runtime: props.runtime || Runtime.nodejs20x,
@@ -617,7 +639,7 @@ export const Function = Resource(
           const config = await retry(() =>
             client.send(
               new GetFunctionConfigurationCommand({
-                FunctionName: props.functionName,
+                FunctionName: functionName,
               }),
             ),
           );
@@ -632,7 +654,7 @@ export const Function = Resource(
         await new Promise((resolve) => setTimeout(resolve, 2000));
 
         // Verify function is fully stable and role is usable
-        await waitForFunctionStabilization(client, props.functionName);
+        await waitForFunctionStabilization(client, functionName);
 
         // Create URL configuration if needed
         if (props.url) {
@@ -640,7 +662,7 @@ export const Function = Resource(
             const createResult = await retry(() =>
               client.send(
                 new CreateFunctionUrlConfigCommand({
-                  FunctionName: props.functionName,
+                  FunctionName: functionName,
                   AuthType: props.url!.authType || "NONE",
                   InvokeMode: props.url!.invokeMode || "BUFFERED",
                   Cors: props.url!.cors
@@ -664,7 +686,7 @@ export const Function = Resource(
                 await retry(() =>
                   client.send(
                     new AddPermissionCommand({
-                      FunctionName: props.functionName,
+                      FunctionName: functionName,
                       StatementId: "FunctionURLAllowPublicAccess",
                       Action: "lambda:InvokeFunctionUrl",
                       Principal: "*",
@@ -692,14 +714,14 @@ export const Function = Resource(
       retry(() =>
         client.send(
           new GetFunctionCommand({
-            FunctionName: props.functionName,
+            FunctionName: functionName,
           }),
         ),
       ),
       retry(() =>
         client.send(
           new GetFunctionConfigurationCommand({
-            FunctionName: props.functionName,
+            FunctionName: functionName,
           }),
         ),
       ),
@@ -711,7 +733,7 @@ export const Function = Resource(
         const urlConfig = await retry(() =>
           client.send(
             new GetFunctionUrlConfigCommand({
-              FunctionName: props.functionName,
+              FunctionName: functionName,
             }),
           ),
         );
@@ -726,6 +748,7 @@ export const Function = Resource(
     return this({
       ...props,
       arn: config.FunctionArn!,
+      functionName,
       lastModified: config.LastModified!,
       version: config.Version!,
       qualifiedArn: `${config.FunctionArn}:${config.Version}`,
@@ -755,6 +778,9 @@ async function waitForFunctionStabilization(
   client: LambdaClient,
   functionName: string,
 ) {
+  const { GetFunctionConfigurationCommand } = await import(
+    "@aws-sdk/client-lambda"
+  );
   while (true) {
     const config = await retry(() =>
       client.send(

package/src/aws/policy-attachment.ts

@@ -1,12 +1,7 @@
-import {
-  AttachRolePolicyCommand,
-  DetachRolePolicyCommand,
-  IAMClient,
-  NoSuchEntityException,
-} from "@aws-sdk/client-iam";
 import type { Context } from "../context.ts";
 import { Resource } from "../resource.ts";
 import { ignore } from "../util/ignore.ts";
+import { importPeer } from "../util/peer.ts";
 import { retry } from "./retry.ts";
 
 /**
@@ -69,6 +64,15 @@ export const PolicyAttachment = Resource(
     _id: string,
     props: PolicyAttachmentProps,
   ) {
+    const {
+      AttachRolePolicyCommand,
+      DetachRolePolicyCommand,
+      IAMClient,
+      NoSuchEntityException,
+    } = await importPeer(
+      import("@aws-sdk/client-iam"),
+      "iam::PolicyAttachment",
+    );
     const client = new IAMClient({});
 
     if (this.phase === "delete") {

package/src/aws/policy.ts

@@ -1,16 +1,6 @@
-import {
-  CreatePolicyCommand,
-  CreatePolicyVersionCommand,
-  DeletePolicyCommand,
-  DeletePolicyVersionCommand,
-  GetPolicyCommand,
-  GetPolicyVersionCommand,
-  IAMClient,
-  ListPolicyVersionsCommand,
-  NoSuchEntityException,
-} from "@aws-sdk/client-iam";
 import type { Context } from "../context.ts";
 import { Resource } from "../resource.ts";
+import { importPeer } from "../util/peer.ts";
 import { retry } from "./retry.ts";
 
 /**
@@ -89,8 +79,10 @@ export interface PolicyDocument {
 export interface PolicyProps {
   /**
    * Name of the policy
+   *
+   * @default ${app}-${stage}-${id}
    */
-  policyName: string;
+  policyName?: string;
 
   /**
    * Policy document defining the permissions
@@ -122,6 +114,11 @@ export interface Policy extends Resource<"iam::Policy">, PolicyProps {
    */
   arn: string;
 
+  /**
+   * Name of the Policy.
+   */
+  policyName: string;
+
   /**
    * ID of the default policy version
    */
@@ -230,11 +227,30 @@ export const Policy = Resource(
   "iam::Policy",
   async function (
     this: Context<Policy>,
-    _id: string,
+    id: string,
     props: PolicyProps,
   ): Promise<Policy> {
+    const {
+      CreatePolicyCommand,
+      CreatePolicyVersionCommand,
+      DeletePolicyCommand,
+      DeletePolicyVersionCommand,
+      GetPolicyCommand,
+      GetPolicyVersionCommand,
+      IAMClient,
+      ListPolicyVersionsCommand,
+      NoSuchEntityException,
+    } = await importPeer(import("@aws-sdk/client-iam"), "iam::Policy");
     const client = new IAMClient({});
-    const policyArn = `arn:aws:iam::${process.env.AWS_ACCOUNT_ID}:policy${props.path || "/"}${props.policyName}`;
+    const policyName =
+      props.policyName ??
+      this.output?.policyName ??
+      this.scope.createPhysicalName(id);
+    const policyArn = `arn:aws:iam::${process.env.AWS_ACCOUNT_ID}:policy${props.path || "/"}${policyName}`;
+
+    if (this.phase === "update" && this.output.policyName !== policyName) {
+      this.replace();
+    }
 
     if (this.phase === "delete") {
       try {
@@ -351,6 +367,7 @@ export const Policy = Resource(
       return this({
         ...props,
         arn: policy.Policy!.Arn!,
+        policyName,
         defaultVersionId: policy.Policy!.DefaultVersionId!,
         attachmentCount: policy.Policy!.AttachmentCount!,
         createDate: policy.Policy!.CreateDate!,
@@ -363,7 +380,7 @@ export const Policy = Resource(
         const newPolicy = await retry(() =>
           client.send(
             new CreatePolicyCommand({
-              PolicyName: props.policyName,
+              PolicyName: policyName,
               PolicyDocument: JSON.stringify(props.document),
               Description: props.description,
               Path: props.path,
@@ -380,6 +397,7 @@ export const Policy = Resource(
         return this({
           ...props,
           arn: newPolicy.Policy!.Arn!,
+          policyName,
           defaultVersionId: newPolicy.Policy!.DefaultVersionId!,
           attachmentCount: newPolicy.Policy!.AttachmentCount!,
           createDate: newPolicy.Policy!.CreateDate!,

package/src/aws/queue.ts

@@ -1,15 +1,7 @@
-import {
-  CreateQueueCommand,
-  DeleteQueueCommand,
-  GetQueueAttributesCommand,
-  GetQueueUrlCommand,
-  QueueDeletedRecently,
-  QueueDoesNotExist,
-  SQSClient,
-} from "@aws-sdk/client-sqs";
 import type { Context } from "../context.ts";
 import { Resource } from "../resource.ts";
 import { logger } from "../util/logger.ts";
+import { importPeer } from "../util/peer.ts";
 import { retry } from "./retry.ts";
 
 /**
@@ -19,8 +11,10 @@ export interface QueueProps {
   /**
    * Name of the queue
    * For FIFO queues, the name must end with the .fifo suffix
+   *
+   * @default ${app}-${stage}-${id}?.fifo
    */
-  queueName: string;
+  queueName?: string;
 
   /**
    * Whether this is a FIFO queue.
@@ -91,6 +85,11 @@ export interface Queue extends Resource<"sqs::Queue">, QueueProps {
    */
   arn: string;
 
+  /**
+   * Name of the Queue
+   */
+  queueName: string;
+
   /**
    * URL of the queue
    */
@@ -140,18 +139,34 @@ export const Queue = Resource(
   "sqs::Queue",
   async function (
     this: Context<Queue>,
-    _id: string,
+    id: string,
     props: QueueProps,
   ): Promise<Queue> {
+    const {
+      CreateQueueCommand,
+      DeleteQueueCommand,
+      GetQueueAttributesCommand,
+      GetQueueUrlCommand,
+      QueueDeletedRecently,
+      QueueDoesNotExist,
+      SQSClient,
+    } = await importPeer(import("@aws-sdk/client-sqs"), "sqs::Queue");
     const client = new SQSClient({});
     // Don't automatically add .fifo suffix - user must include it in queueName
-    const queueName = props.queueName;
+    const queueName =
+      props.queueName ??
+      this.output?.queueName ??
+      `${this.scope.createPhysicalName(id)}${props.fifo ? ".fifo" : ""}`;
 
-    // Validate that FIFO queues have .fifo suffix
     if (props.fifo && !queueName.endsWith(".fifo")) {
+      // Validate that FIFO queues have .fifo suffix
       throw new Error("FIFO queue names must end with .fifo suffix");
     }
 
+    if (this.phase === "update" && this.output.queueName !== queueName) {
+      this.replace();
+    }
+
     if (this.phase === "delete") {
       try {
         // Get queue URL first
@@ -271,6 +286,7 @@ export const Queue = Resource(
       return this({
         ...props,
         arn: attributesResponse.Attributes!.QueueArn!,
+        queueName,
         url: createResponse.QueueUrl!,
       });
     } catch (error: any) {
@@ -311,6 +327,7 @@ export const Queue = Resource(
             return this({
               ...props,
               arn: attributesResponse.Attributes!.QueueArn!,
+              queueName,
               url: createResponse.QueueUrl!,
             });
           } catch (retryError: any) {
@@ -326,21 +343,25 @@ export const Queue = Resource(
       }
       throw error;
     }
-  },
-);
 
-function isQueueDoesNotExist(error: any): error is QueueDoesNotExist {
-  return (
-    error.name === "QueueDoesNotExist" ||
-    error.Code === "AWS.SimpleQueueService.NonExistentQueue" ||
-    error instanceof QueueDoesNotExist
-  );
-}
+    function isQueueDoesNotExist(
+      error: any,
+    ): error is typeof QueueDoesNotExist {
+      return (
+        error.name === "QueueDoesNotExist" ||
+        error.Code === "AWS.SimpleQueueService.NonExistentQueue" ||
+        error instanceof QueueDoesNotExist
+      );
+    }
 
-function isQueueDeletedRecently(error: any): error is QueueDeletedRecently {
-  return (
-    error instanceof QueueDeletedRecently ||
-    error.Code === "AWS.SimpleQueueService.QueueDeletedRecently" ||
-    error.name === "QueueDeletedRecently"
-  );
-}
+    function isQueueDeletedRecently(
+      error: any,
+    ): error is typeof QueueDeletedRecently {
+      return (
+        error instanceof QueueDeletedRecently ||
+        error.Code === "AWS.SimpleQueueService.QueueDeletedRecently" ||
+        error.name === "QueueDeletedRecently"
+      );
+    }
+  },
+);

package/src/aws/role.ts

@@ -1,24 +1,9 @@
-import {
-  AttachRolePolicyCommand,
-  CreateRoleCommand,
-  DeleteRoleCommand,
-  DeleteRolePolicyCommand,
-  DetachRolePolicyCommand,
-  EntityAlreadyExistsException,
-  GetRoleCommand,
-  IAMClient,
-  ListAttachedRolePoliciesCommand,
-  NoSuchEntityException,
-  PutRolePolicyCommand,
-  type Tag,
-  TagRoleCommand,
-  UpdateAssumeRolePolicyCommand,
-  UpdateRoleCommand,
-} from "@aws-sdk/client-iam";
+import type { Tag } from "@aws-sdk/client-iam";
 import type { Context } from "../context.ts";
 import { Resource } from "../resource.ts";
 import { ignore } from "../util/ignore.ts";
 import { logger } from "../util/logger.ts";
+import { importPeer } from "../util/peer.ts";
 import type { PolicyDocument } from "./policy.ts";
 import { retry } from "./retry.ts";
 
@@ -28,8 +13,10 @@ import { retry } from "./retry.ts";
 export interface RoleProps {
   /**
    * Name of the IAM role
+   *
+   * @default ${app}-${stage}-${id}
    */
-  roleName: string;
+  roleName?: string;
 
   /**
    * Policy that defines which entities can assume this role
@@ -86,6 +73,11 @@ export interface Role extends Resource<"iam::Role">, RoleProps {
    */
   arn: string;
 
+  /**
+   * Name of the Role.
+   */
+  roleName: string;
+
   /**
    * Unique identifier for the role
    */
@@ -220,11 +212,36 @@ export const Role = Resource(
   "iam::Role",
   async function (
     this: Context<Role>,
-    _id: string,
+    id: string,
     props: RoleProps,
   ): Promise<Role> {
+    const {
+      AttachRolePolicyCommand,
+      CreateRoleCommand,
+      DeleteRoleCommand,
+      DeleteRolePolicyCommand,
+      DetachRolePolicyCommand,
+      EntityAlreadyExistsException,
+      GetRoleCommand,
+      IAMClient,
+      ListAttachedRolePoliciesCommand,
+      NoSuchEntityException,
+      PutRolePolicyCommand,
+      TagRoleCommand,
+      UpdateAssumeRolePolicyCommand,
+      UpdateRoleCommand,
+    } = await importPeer(import("@aws-sdk/client-iam"), "iam::Role");
     const client = new IAMClient({});
 
+    const roleName =
+      props.roleName ??
+      this.output?.roleName ??
+      this.scope.createPhysicalName(id);
+
+    if (this.phase === "update" && this.output.roleName !== roleName) {
+      this.replace();
+    }
+
     if (this.phase === "delete") {
       try {
         // Delete any inline policies first
@@ -523,7 +540,7 @@ export const Role = Resource(
       arn: role.Role.Arn!,
       uniqueId: role.Role.RoleId!,
       roleId: role.Role.RoleId!,
-      roleName: role.Role.RoleName ?? props.roleName,
+      roleName,
       createDate: role.Role.CreateDate!,
     });
   },