alchemy 0.62.3 → 0.63.0

package/src/apply.ts

@@ -13,7 +13,7 @@ import {
   type Resource,
   type ResourceProps,
 } from "./resource.ts";
-import { Scope, type PendingDeletions } from "./scope.ts";
+import type { PendingDeletions } from "./scope.ts";
 import { serialize } from "./serde.ts";
 import { formatFQN } from "./util/cli.ts";
 import { logger } from "./util/logger.ts";
@@ -22,7 +22,6 @@ import type { Telemetry } from "./util/telemetry/index.ts";
 export interface ApplyOptions {
   quiet?: boolean;
   alwaysUpdate?: boolean;
-  resolveInnerScope?: (scope: Scope) => void;
 }
 
 export function apply<Out extends Resource>(
@@ -63,12 +62,6 @@ async function _apply<Out extends Resource>(
           `Resource "${resource[ResourceFQN]}" not found and running in 'read' phase.`,
         );
       }
-      options?.resolveInnerScope?.(
-        new Scope({
-          parent: scope,
-          scopeName: resource[ResourceID],
-        }),
-      );
       scope.telemetryClient.record({
         event: "resource.read",
         resource: resource[ResourceKind],
@@ -115,11 +108,6 @@ async function _apply<Out extends Resource>(
         alwaysUpdate !== true &&
         !scope.force
       ) {
-        const innerScope = new Scope({
-          parent: scope,
-          scopeName: resource[ResourceID],
-        });
-        innerScope.skip();
         if (!quiet) {
           logger.task(resource[ResourceFQN], {
             prefix: "skipped",
@@ -129,7 +117,6 @@ async function _apply<Out extends Resource>(
             status: "success",
           });
         }
-        options?.resolveInnerScope?.(innerScope);
         scope.telemetryClient.record({
           event: "resource.skip",
           resource: resource[ResourceKind],
@@ -199,10 +186,8 @@ async function _apply<Out extends Resource>(
           parent: scope,
           destroyStrategy: provider.options?.destroyStrategy ?? "sequential",
         },
-        async (scope) => {
-          options?.resolveInnerScope?.(scope);
-          return provider.handler.bind(ctx)(resource[ResourceID], props);
-        },
+        async () =>
+          await provider.handler.bind(ctx)(resource[ResourceID], props),
       );
     } catch (error) {
       if (error instanceof ReplacedSignal) {
@@ -216,7 +201,9 @@ async function _apply<Out extends Resource>(
             },
           });
         } else {
-          if (scope.children.get(resource[ResourceID])?.children.size! > 0) {
+          if (
+            (scope.children.get(resource[ResourceID])?.children.size ?? 0) > 0
+          ) {
             throw new Error(
               `Resource ${resource[ResourceFQN]} has children and cannot be replaced.`,
             );

package/src/aws/account-id.ts

@@ -1,6 +1,4 @@
-import { GetCallerIdentityCommand, STSClient } from "@aws-sdk/client-sts";
-
-const sts = new STSClient({});
+import { importPeer } from "../util/peer.ts";
 
 export type AccountId = string & {
   readonly __brand: "AccountId";
@@ -10,6 +8,11 @@ export type AccountId = string & {
  * Helper to get the current AWS account ID
  */
 export async function AccountId(): Promise<AccountId> {
+  const { GetCallerIdentityCommand, STSClient } = await importPeer(
+    import("@aws-sdk/client-sts"),
+    "aws::AccountId",
+  );
+  const sts = new STSClient({});
   const identity = await sts.send(new GetCallerIdentityCommand({}));
   return identity.Account! as AccountId;
 }

package/src/aws/bucket.ts

@@ -1,18 +1,7 @@
-import {
-  CreateBucketCommand,
-  DeleteBucketCommand,
-  GetBucketAclCommand,
-  GetBucketLocationCommand,
-  GetBucketTaggingCommand,
-  GetBucketVersioningCommand,
-  HeadBucketCommand,
-  NoSuchBucket,
-  PutBucketTaggingCommand,
-  S3Client,
-} from "@aws-sdk/client-s3";
 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";
 
 /**
@@ -22,8 +11,10 @@ export interface BucketProps {
   /**
    * The name of the bucket. Must be globally unique across all AWS accounts.
    * Should be lowercase alphanumeric characters or hyphens.
+   *
+   * @default ${app}-${stage}-${id}
    */
-  bucketName: string;
+  bucketName?: string;
 
   /**
    * Optional tags to apply to the bucket for organization and cost tracking.
@@ -42,6 +33,11 @@ export interface Bucket extends Resource<"s3::Bucket">, BucketProps {
    */
   arn: string;
 
+  /**
+   * Name of the Bucket.
+   */
+  bucketName: string;
+
   /**
    * The global domain name for the bucket
    * Format: bucket-name.s3.amazonaws.com
@@ -129,15 +125,36 @@ export interface Bucket extends Resource<"s3::Bucket">, BucketProps {
  */
 export const Bucket = Resource(
   "s3::Bucket",
-  async function (this: Context<Bucket>, _id: string, props: BucketProps) {
+  async function (this: Context<Bucket>, id: string, props: BucketProps) {
+    const {
+      CreateBucketCommand,
+      DeleteBucketCommand,
+      GetBucketAclCommand,
+      GetBucketLocationCommand,
+      GetBucketTaggingCommand,
+      GetBucketVersioningCommand,
+      HeadBucketCommand,
+      NoSuchBucket,
+      PutBucketTaggingCommand,
+      S3Client,
+    } = await importPeer(import("@aws-sdk/client-s3"), "s3::Bucket");
     const client = new S3Client({});
 
+    const bucketName =
+      props.bucketName ??
+      this.output?.bucketName ??
+      this.scope.createPhysicalName(id);
+
+    if (this.phase === "update" && this.output.bucketName !== bucketName) {
+      this.replace();
+    }
+
     if (this.phase === "delete") {
       await ignore(NoSuchBucket.name, () =>
         retry(() =>
           client.send(
             new DeleteBucketCommand({
-              Bucket: props.bucketName,
+              Bucket: bucketName,
             }),
           ),
         ),
@@ -149,7 +166,7 @@ export const Bucket = Resource(
       await retry(() =>
         client.send(
           new HeadBucketCommand({
-            Bucket: props.bucketName,
+            Bucket: bucketName,
           }),
         ),
       );
@@ -159,7 +176,7 @@ export const Bucket = Resource(
         await retry(() =>
           client.send(
             new PutBucketTaggingCommand({
-              Bucket: props.bucketName,
+              Bucket: bucketName,
               Tagging: {
                 TagSet: Object.entries(props.tags!).map(([Key, Value]) => ({
                   Key,
@@ -176,7 +193,7 @@ export const Bucket = Resource(
         await retry(() =>
           client.send(
             new CreateBucketCommand({
-              Bucket: props.bucketName,
+              Bucket: bucketName,
               // Add tags during creation if specified
               ...(props.tags && {
                 Tagging: {
@@ -198,17 +215,13 @@ export const Bucket = Resource(
     const [locationResponse, versioningResponse, aclResponse] =
       await Promise.all([
         retry(() =>
-          client.send(
-            new GetBucketLocationCommand({ Bucket: props.bucketName }),
-          ),
+          client.send(new GetBucketLocationCommand({ Bucket: bucketName })),
         ),
         retry(() =>
-          client.send(
-            new GetBucketVersioningCommand({ Bucket: props.bucketName }),
-          ),
+          client.send(new GetBucketVersioningCommand({ Bucket: bucketName })),
         ),
         retry(() =>
-          client.send(new GetBucketAclCommand({ Bucket: props.bucketName })),
+          client.send(new GetBucketAclCommand({ Bucket: bucketName })),
         ),
       ]);
 
@@ -219,9 +232,7 @@ export const Bucket = Resource(
     if (!tags) {
       try {
         const taggingResponse = await retry(() =>
-          client.send(
-            new GetBucketTaggingCommand({ Bucket: props.bucketName }),
-          ),
+          client.send(new GetBucketTaggingCommand({ Bucket: bucketName })),
         );
         tags = Object.fromEntries(
           taggingResponse.TagSet?.map(({ Key, Value }) => [Key, Value]) || [],
@@ -234,10 +245,10 @@ export const Bucket = Resource(
     }
 
     return this({
-      bucketName: props.bucketName,
-      arn: `arn:aws:s3:::${props.bucketName}`,
-      bucketDomainName: `${props.bucketName}.s3.amazonaws.com`,
-      bucketRegionalDomainName: `${props.bucketName}.s3.${region}.amazonaws.com`,
+      bucketName: bucketName,
+      arn: `arn:aws:s3:::${bucketName}`,
+      bucketDomainName: `${bucketName}.s3.amazonaws.com`,
+      bucketRegionalDomainName: `${bucketName}.s3.${region}.amazonaws.com`,
       region,
       hostedZoneId: getHostedZoneId(region),
       versioningEnabled: versioningResponse.Status === "Enabled",

package/src/aws/ec2/security-group.ts

@@ -31,8 +31,10 @@ export interface SecurityGroupProps extends AwsClientProps {
 
   /**
    * The name of the security group.
+   *
+   * @default ${app}-${stage}-${id}
    */
-  groupName: string;
+  groupName?: string;
 
   /**
    * The description of the security group.
@@ -62,6 +64,11 @@ export interface SecurityGroup
    */
   groupId: string;
 
+  /**
+   * The name of the security group.
+   */
+  groupName: string;
+
   /**
    * The ID of the VPC the security group belongs to.
    */
@@ -200,7 +207,7 @@ export const SecurityGroup = Resource(
   "aws::SecurityGroup",
   async function (
     this: Context<SecurityGroup>,
-    _id: string,
+    id: string,
     props: SecurityGroupProps,
   ): Promise<SecurityGroup> {
     // Create EC2 client with credential resolution handled internally
@@ -210,6 +217,10 @@ export const SecurityGroup = Resource(
       SECURITY_GROUP_TIMEOUT,
       props.timeout,
     );
+    const groupName = props.groupName ?? this.scope.createPhysicalName(id);
+    if (this.phase === "update" && this.output.groupName !== groupName) {
+      this.replace();
+    }
 
     if (this.phase === "delete") {
       if (this.output?.groupId) {
@@ -259,7 +270,7 @@ export const SecurityGroup = Resource(
     } else {
       // Create new security group
       const createParams: CreateSecurityGroupParams = {
-        GroupName: props.groupName,
+        GroupName: groupName,
         GroupDescription: props.description,
         VpcId: vpcId,
       };
@@ -313,6 +324,7 @@ export const SecurityGroup = Resource(
 
     return this({
       groupId: securityGroup.GroupId,
+      groupName,
       vpcId: securityGroup.VpcId,
       ownerId: securityGroup.OwnerId,
       ...props,

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") {