alchemy 0.1.17 → 0.2.0

package/src/aws/policy-attachment.ts

@@ -0,0 +1,51 @@
+import {
+  AttachRolePolicyCommand,
+  DetachRolePolicyCommand,
+  IAMClient,
+  NoSuchEntityException,
+} from "@aws-sdk/client-iam";
+import type { Context } from "../context";
+import { Resource } from "../resource";
+import { ignore } from "../util/ignore";
+
+// PolicyAttachment resource
+export interface PolicyAttachmentProps {
+  policyArn: string;
+  roleName: string;
+}
+
+export interface PolicyAttachment
+  extends Resource<"iam::PolicyAttachment">,
+    PolicyAttachmentProps {}
+
+export const PolicyAttachment = Resource(
+  "iam::PolicyAttachment",
+  async function (
+    this: Context<PolicyAttachment>,
+    id: string,
+    props: PolicyAttachmentProps,
+  ) {
+    const client = new IAMClient({});
+
+    if (this.phase === "delete") {
+      await ignore(NoSuchEntityException.name, () =>
+        client.send(
+          new DetachRolePolicyCommand({
+            PolicyArn: props.policyArn,
+            RoleName: props.roleName,
+          }),
+        ),
+      );
+      return this.destroy();
+    } else {
+      await client.send(
+        new AttachRolePolicyCommand({
+          PolicyArn: props.policyArn,
+          RoleName: props.roleName,
+        }),
+      );
+    }
+
+    return this(props);
+  },
+);

package/src/aws/policy.ts

@@ -1,17 +1,15 @@
 import {
-  AttachRolePolicyCommand,
   CreatePolicyCommand,
   CreatePolicyVersionCommand,
   DeletePolicyCommand,
   DeletePolicyVersionCommand,
-  DetachRolePolicyCommand,
   GetPolicyCommand,
   GetPolicyVersionCommand,
   IAMClient,
   ListPolicyVersionsCommand,
   NoSuchEntityException,
 } from "@aws-sdk/client-iam";
-import { ignore } from "../error";
+import type { Context } from "../context";
 import { Resource } from "../resource";
 
 // Type-safe policy document types
@@ -43,8 +41,7 @@ export interface PolicyProps {
   tags?: Record<string, string>;
 }
 
-export interface PolicyOutput extends PolicyProps {
-  id: string; // Same as policyName
+export interface Policy extends Resource<"iam::Policy">, PolicyProps {
   arn: string;
   defaultVersionId: string;
   attachmentCount: number;
@@ -53,13 +50,17 @@ export interface PolicyOutput extends PolicyProps {
   isAttachable: boolean;
 }
 
-export class Policy extends Resource(
+export const Policy = Resource(
   "iam::Policy",
-  async (ctx, props: PolicyProps): Promise<PolicyOutput> => {
+  async function (
+    this: Context<Policy>,
+    id: string,
+    props: PolicyProps,
+  ): Promise<Policy> {
     const client = new IAMClient({});
     const policyArn = `arn:aws:iam::${process.env.AWS_ACCOUNT_ID}:policy${props.path || "/"}${props.policyName}`;
 
-    if (ctx.event === "delete") {
+    if (this.phase === "delete") {
       try {
         // List and delete all non-default versions first
         const versions = await client.send(
@@ -90,16 +91,7 @@ export class Policy extends Resource(
           throw error;
         }
       }
-      return {
-        ...props,
-        id: props.policyName,
-        arn: policyArn,
-        defaultVersionId: "v1",
-        attachmentCount: 0,
-        createDate: new Date(),
-        updateDate: new Date(),
-        isAttachable: true,
-      };
+      return this.destroy();
     } else {
       try {
         // Check if policy exists
@@ -164,16 +156,15 @@ export class Policy extends Resource(
           }),
         );
 
-        return {
+        return this({
           ...props,
-          id: props.policyName,
           arn: policy.Policy!.Arn!,
           defaultVersionId: policy.Policy!.DefaultVersionId!,
           attachmentCount: policy.Policy!.AttachmentCount!,
           createDate: policy.Policy!.CreateDate!,
           updateDate: policy.Policy!.UpdateDate!,
           isAttachable: policy.Policy!.IsAttachable!,
-        };
+        });
       } catch (error: any) {
         if (error.name === "NoSuchEntity") {
           // Create new policy
@@ -192,54 +183,18 @@ export class Policy extends Resource(
             }),
           );
 
-          return {
+          return this({
             ...props,
-            id: props.policyName,
             arn: newPolicy.Policy!.Arn!,
             defaultVersionId: newPolicy.Policy!.DefaultVersionId!,
             attachmentCount: newPolicy.Policy!.AttachmentCount!,
             createDate: newPolicy.Policy!.CreateDate!,
             updateDate: newPolicy.Policy!.UpdateDate!,
             isAttachable: newPolicy.Policy!.IsAttachable!,
-          };
+          });
         }
         throw error;
       }
     }
   },
-) {}
-
-// PolicyAttachment resource
-export interface PolicyAttachmentProps {
-  policyArn: string;
-  roleName: string;
-}
-
-export interface PolicyAttachmentOutput extends PolicyAttachmentProps {}
-
-export class PolicyAttachment extends Resource(
-  "iam::PolicyAttachment",
-  async (ctx, props: PolicyAttachmentProps) => {
-    const client = new IAMClient({});
-
-    if (ctx.event === "delete") {
-      await ignore(NoSuchEntityException.name, () =>
-        client.send(
-          new DetachRolePolicyCommand({
-            PolicyArn: props.policyArn,
-            RoleName: props.roleName,
-          }),
-        ),
-      );
-    } else {
-      await client.send(
-        new AttachRolePolicyCommand({
-          PolicyArn: props.policyArn,
-          RoleName: props.roleName,
-        }),
-      );
-    }
-
-    return props;
-  },
-) {}
+);

package/src/aws/queue.ts

@@ -5,6 +5,7 @@ import {
   GetQueueUrlCommand,
   SQSClient,
 } from "@aws-sdk/client-sqs";
+import type { Context } from "../context";
 import { Resource } from "../resource";
 
 export interface QueueProps {
@@ -37,15 +38,18 @@ export interface QueueProps {
   tags?: Record<string, string>;
 }
 
-export interface QueueOutput extends QueueProps {
-  id: string; // Same as queueName
+export interface Queue extends Resource<"sqs::Queue">, QueueProps {
   arn: string;
   url: string;
 }
 
-export class Queue extends Resource(
+export const Queue = Resource(
   "sqs::Queue",
-  async (ctx, props: QueueProps) => {
+  async function (
+    this: Context<Queue>,
+    id: string,
+    props: QueueProps,
+  ): Promise<Queue> {
     const client = new SQSClient({});
     // Don't automatically add .fifo suffix - user must include it in queueName
     const queueName = props.queueName;
@@ -55,7 +59,7 @@ export class Queue extends Resource(
       throw new Error("FIFO queue names must end with .fifo suffix");
     }
 
-    if (ctx.event === "delete") {
+    if (this.phase === "delete") {
       try {
         // Get queue URL first
         const urlResponse = await client.send(
@@ -96,12 +100,7 @@ export class Queue extends Resource(
         }
       }
 
-      return {
-        ...props,
-        id: props.queueName,
-        arn: `arn:aws:sqs:${client.config.region}:${process.env.AWS_ACCOUNT_ID}:${queueName}`,
-        url: "",
-      };
+      return this.destroy();
     } else {
       // Create queue with attributes
       const attributes: Record<string, string> = {};
@@ -164,12 +163,11 @@ export class Queue extends Resource(
           }),
         );
 
-        return {
+        return this({
           ...props,
-          id: props.queueName,
           arn: attributesResponse.Attributes!.QueueArn!,
           url: createResponse.QueueUrl!,
-        };
+        });
       } catch (error: any) {
         if (error.name === "QueueAlreadyExists") {
           // Get existing queue URL
@@ -187,12 +185,11 @@ export class Queue extends Resource(
             }),
           );
 
-          return {
+          return this({
             ...props,
-            id: props.queueName,
             arn: attributesResponse.Attributes!.QueueArn!,
             url: urlResponse.QueueUrl!,
-          };
+          });
         } else if (error.name === "QueueDeletedRecently") {
           // Queue was recently deleted, wait and retry
           const maxRetries = 3;
@@ -220,12 +217,11 @@ export class Queue extends Resource(
                 }),
               );
 
-              return {
+              return this({
                 ...props,
-                id: props.queueName,
                 arn: attributesResponse.Attributes!.QueueArn!,
                 url: createResponse.QueueUrl!,
-              };
+              });
             } catch (retryError: any) {
               if (
                 retryError.name !== "QueueDeletedRecently" ||
@@ -241,4 +237,4 @@ export class Queue extends Resource(
       }
     }
   },
-) {}
+);

package/src/aws/role.ts

@@ -15,8 +15,9 @@ import {
   UpdateAssumeRolePolicyCommand,
   UpdateRoleCommand,
 } from "@aws-sdk/client-iam";
-import { ignore } from "../error";
-import { type Context, Resource } from "../resource";
+import type { Context } from "../context";
+import { Resource } from "../resource";
+import { ignore } from "../util/ignore";
 import type { PolicyDocument } from "./policy";
 
 export interface RoleProps {
@@ -34,20 +35,23 @@ export interface RoleProps {
   tags?: Record<string, string>;
 }
 
-export interface RoleOutput extends RoleProps {
-  id: string; // Same as roleName
+export interface Role extends Resource<"iam::Role">, RoleProps {
   arn: string;
   uniqueId: string; // Unique identifier for the role
   roleId: string; // The stable and unique string identifying the role
   createDate: Date;
 }
 
-export class Role extends Resource(
+export const Role = Resource(
   "iam::Role",
-  async (ctx: Context<RoleOutput>, props: RoleProps): Promise<RoleOutput> => {
+  async function (
+    this: Context<Role>,
+    id: string,
+    props: RoleProps,
+  ): Promise<Role> {
     const client = new IAMClient({});
 
-    if (ctx.event === "delete") {
+    if (this.phase === "delete") {
       // Delete any inline policies first
       if (props.policies) {
         for (const policy of props.policies) {
@@ -95,21 +99,14 @@ export class Role extends Resource(
           }),
         ),
       );
-      return {
-        ...props,
-        id: props.roleName,
-        arn: `arn:aws:iam::${process.env.AWS_ACCOUNT_ID}:role/${props.roleName}`,
-        uniqueId: "",
-        roleId: "",
-        createDate: new Date(),
-      };
+      return this.destroy();
     }
 
     const assumeRolePolicyDocument = JSON.stringify(props.assumeRolePolicy);
     let role;
 
     try {
-      if (ctx.event === "create") {
+      if (this.phase === "create") {
         // Try to create the role
         await client.send(
           new CreateRoleCommand({
@@ -126,11 +123,11 @@ export class Role extends Resource(
               })),
               {
                 Key: "alchemy_stage",
-                Value: ctx.stage,
+                Value: this.stage,
               },
               {
                 Key: "alchemy_resource",
-                Value: ctx.resourceID,
+                Value: this.id,
               },
             ],
           }),
@@ -139,7 +136,7 @@ export class Role extends Resource(
     } catch (error: any) {
       if (
         error instanceof EntityAlreadyExistsException &&
-        ctx.event === "create"
+        this.phase === "create"
       ) {
         // Check if we were the ones who created it
         const existingRole = await client.send(
@@ -157,8 +154,8 @@ export class Role extends Resource(
           ) || {};
 
         if (
-          roleTags.alchemy_stage !== ctx.stage ||
-          roleTags.alchemy_resource !== ctx.resourceID
+          roleTags.alchemy_stage !== this.stage ||
+          roleTags.alchemy_resource !== this.id
         ) {
           throw error;
         }
@@ -201,8 +198,8 @@ export class Role extends Resource(
     // Update tags
     const newTags = {
       ...props.tags,
-      alchemy_stage: ctx.stage,
-      alchemy_resource: ctx.resourceID,
+      alchemy_stage: this.stage,
+      alchemy_resource: this.id,
     };
     const tags: Tag[] = Object.entries(newTags).map(([Key, Value]) => ({
       Key,
@@ -217,7 +214,7 @@ export class Role extends Resource(
 
     // Handle policy changes
     const previousPolicies =
-      ctx.event === "update" ? ctx.output.policies || [] : [];
+      this.phase === "update" ? this.output!.policies || [] : [];
     const currentPolicies = props.policies || [];
 
     // Delete policies that were removed
@@ -302,13 +299,13 @@ export class Role extends Resource(
       throw new Error(`Failed to create or update role ${props.roleName}`);
     }
 
-    return {
+    return this({
       ...props,
-      id: props.roleName,
       arn: role.Role.Arn!,
       uniqueId: role.Role.RoleId!,
       roleId: role.Role.RoleId!,
+      roleName: role.Role.RoleName ?? props.roleName,
       createDate: role.Role.CreateDate!,
-    };
+    });
   },
-) {}
+);