alchemy 0.1.17 → 0.2.0

package/lib/aws/oidc/oidc-provider.js

@@ -9,13 +9,13 @@ const TRUST_POLICY_SID = "GitHubOIDCTrust";
 /**
  * Resource for configuring AWS OIDC provider for GitHub Actions
  */
-export class OIDCProvider extends Resource("aws::OIDCProvider", async (ctx, props) => {
+export const OIDCProvider = Resource("aws::OIDCProvider", async function (id, props) {
     // Initialize AWS SDK client
     const client = new IAMClient({
         region: props.region,
     });
-    if (ctx.event === "delete") {
-        if (ctx.output?.providerArn) {
+    if (this.phase === "delete") {
+        if (this.output?.providerArn) {
             try {
                 // First, remove our trust policy statement from the role
                 const getRole = await client.send(new GetRoleCommand({
@@ -32,12 +32,12 @@ export class OIDCProvider extends Resource("aws::OIDCProvider", async (ctx, prop
                 }
                 // Then delete the OIDC provider if we're the last user
                 const provider = await client.send(new GetOpenIDConnectProviderCommand({
-                    OpenIDConnectProviderArn: ctx.output.providerArn,
+                    OpenIDConnectProviderArn: this.output.providerArn,
                 }));
                 // Only delete the provider if it exists and has no other tags
                 if (provider && (!provider.Tags || provider.Tags.length === 0)) {
                     await client.send(new DeleteOpenIDConnectProviderCommand({
-                        OpenIDConnectProviderArn: ctx.output.providerArn,
+                        OpenIDConnectProviderArn: this.output.providerArn,
                     }));
                 }
             }
@@ -46,7 +46,7 @@ export class OIDCProvider extends Resource("aws::OIDCProvider", async (ctx, prop
                 console.error("Error during cleanup:", error);
             }
         }
-        return;
+        return this.destroy();
     }
     try {
         const url = "https://token.actions.githubusercontent.com";
@@ -125,16 +125,14 @@ export class OIDCProvider extends Resource("aws::OIDCProvider", async (ctx, prop
             RoleName: props.roleArn.split("/").pop(),
             PolicyDocument: JSON.stringify(policy),
         }));
-        return {
+        return this({
             ...props,
             providerArn,
             createdAt: Date.now(),
-        };
+        });
     }
     catch (error) {
         console.error("Error configuring OIDC provider:", error);
         throw error;
     }
-}) {
-}
-//# sourceMappingURL=oidc-provider.js.map
+});

package/lib/aws/policy-attachment.d.ts

@@ -0,0 +1,9 @@
+import type { Context } from "../context";
+import { Resource } from "../resource";
+export interface PolicyAttachmentProps {
+    policyArn: string;
+    roleName: string;
+}
+export interface PolicyAttachment extends Resource<"iam::PolicyAttachment">, PolicyAttachmentProps {
+}
+export declare const PolicyAttachment: ((this: Context<PolicyAttachment>, id: string, props: PolicyAttachmentProps) => Promise<PolicyAttachment>) | (((this: any, id: string, props: PolicyAttachmentProps) => never) & (new (_: never) => never));

package/lib/aws/policy-attachment.js

@@ -0,0 +1,20 @@
+import { AttachRolePolicyCommand, DetachRolePolicyCommand, IAMClient, NoSuchEntityException, } from "@aws-sdk/client-iam";
+import { Resource } from "../resource";
+import { ignore } from "../util/ignore";
+export const PolicyAttachment = Resource("iam::PolicyAttachment", async function (id, props) {
+    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/lib/aws/policy.d.ts

@@ -1,3 +1,5 @@
+import type { Context } from "../context";
+import { Resource } from "../resource";
 export type Effect = "Allow" | "Deny";
 export interface PolicyStatement {
     Sid?: string;
@@ -21,8 +23,7 @@ export interface PolicyProps {
     path?: string;
     tags?: Record<string, string>;
 }
-export interface PolicyOutput extends PolicyProps {
-    id: string;
+export interface Policy extends Resource<"iam::Policy">, PolicyProps {
     arn: string;
     defaultVersionId: string;
     attachmentCount: number;
@@ -30,17 +31,4 @@ export interface PolicyOutput extends PolicyProps {
     updateDate: Date;
     isAttachable: boolean;
 }
-declare const Policy_base: import("../resource").Provider<"iam::Policy", [props: PolicyProps], PolicyOutput>;
-export declare class Policy extends Policy_base {
-}
-export interface PolicyAttachmentProps {
-    policyArn: string;
-    roleName: string;
-}
-export interface PolicyAttachmentOutput extends PolicyAttachmentProps {
-}
-declare const PolicyAttachment_base: import("../resource").Provider<"iam::PolicyAttachment", [props: PolicyAttachmentProps], PolicyAttachmentProps>;
-export declare class PolicyAttachment extends PolicyAttachment_base {
-}
-export {};
-//# sourceMappingURL=policy.d.ts.map
+export declare const Policy: ((this: Context<Policy>, id: string, props: PolicyProps) => Promise<Policy>) | (((this: any, id: string, props: PolicyProps) => never) & (new (_: never) => never));

package/lib/aws/policy.js

@@ -1,10 +1,9 @@
-import { AttachRolePolicyCommand, CreatePolicyCommand, CreatePolicyVersionCommand, DeletePolicyCommand, DeletePolicyVersionCommand, DetachRolePolicyCommand, GetPolicyCommand, GetPolicyVersionCommand, IAMClient, ListPolicyVersionsCommand, NoSuchEntityException, } from "@aws-sdk/client-iam";
-import { ignore } from "../error";
+import { CreatePolicyCommand, CreatePolicyVersionCommand, DeletePolicyCommand, DeletePolicyVersionCommand, GetPolicyCommand, GetPolicyVersionCommand, IAMClient, ListPolicyVersionsCommand, NoSuchEntityException, } from "@aws-sdk/client-iam";
 import { Resource } from "../resource";
-export class Policy extends Resource("iam::Policy", async (ctx, props) => {
+export const Policy = Resource("iam::Policy", async function (id, props) {
     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(new ListPolicyVersionsCommand({
@@ -28,16 +27,7 @@ export class Policy extends Resource("iam::Policy", async (ctx, props) => {
                 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 {
@@ -77,16 +67,15 @@ export class Policy extends Resource("iam::Policy", async (ctx, props) => {
             const policy = await client.send(new GetPolicyCommand({
                 PolicyArn: policyArn,
             }));
-            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) {
             if (error.name === "NoSuchEntity") {
@@ -103,37 +92,17 @@ export class Policy extends Resource("iam::Policy", async (ctx, props) => {
                         }))
                         : undefined,
                 }));
-                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;
         }
     }
-}) {
-}
-export class PolicyAttachment extends Resource("iam::PolicyAttachment", async (ctx, props) => {
-    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;
-}) {
-}
-//# sourceMappingURL=policy.js.map
+});

package/lib/aws/queue.d.ts

@@ -1,3 +1,5 @@
+import type { Context } from "../context";
+import { Resource } from "../resource";
 export interface QueueProps {
     /**
      * Name of the queue
@@ -23,40 +25,8 @@ export interface QueueProps {
     fifoThroughputLimit?: "perQueue" | "perMessageGroupId";
     tags?: Record<string, string>;
 }
-export interface QueueOutput extends QueueProps {
-    id: string;
+export interface Queue extends Resource<"sqs::Queue">, QueueProps {
     arn: string;
     url: string;
 }
-declare const Queue_base: import("../resource").Provider<"sqs::Queue", [props: QueueProps], {
-    id: string;
-    arn: string;
-    url: string;
-    /**
-     * Name of the queue
-     * For FIFO queues, the name must end with the .fifo suffix
-     */
-    queueName: string;
-    /**
-     * Whether this is a FIFO queue.
-     * If true, the queueName must end with .fifo suffix
-     */
-    fifo?: boolean;
-    visibilityTimeout?: number;
-    messageRetentionPeriod?: number;
-    maximumMessageSize?: number;
-    delaySeconds?: number;
-    receiveMessageWaitTimeSeconds?: number;
-    /**
-     * Enables content-based deduplication for FIFO queues.
-     * Only applicable when fifo is true.
-     */
-    contentBasedDeduplication?: boolean;
-    deduplicationScope?: "messageGroup" | "queue";
-    fifoThroughputLimit?: "perQueue" | "perMessageGroupId";
-    tags?: Record<string, string>;
-}>;
-export declare class Queue extends Queue_base {
-}
-export {};
-//# sourceMappingURL=queue.d.ts.map
+export declare const Queue: ((this: Context<Queue>, id: string, props: QueueProps) => Promise<Queue>) | (((this: any, id: string, props: QueueProps) => never) & (new (_: never) => never));

package/lib/aws/queue.js

@@ -1,6 +1,6 @@
 import { CreateQueueCommand, DeleteQueueCommand, GetQueueAttributesCommand, GetQueueUrlCommand, SQSClient, } from "@aws-sdk/client-sqs";
 import { Resource } from "../resource";
-export class Queue extends Resource("sqs::Queue", async (ctx, props) => {
+export const Queue = Resource("sqs::Queue", async function (id, props) {
     const client = new SQSClient({});
     // Don't automatically add .fifo suffix - user must include it in queueName
     const queueName = props.queueName;
@@ -8,7 +8,7 @@ export class Queue extends Resource("sqs::Queue", async (ctx, props) => {
     if (props.fifo && !queueName.endsWith(".fifo")) {
         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(new GetQueueUrlCommand({
@@ -43,12 +43,7 @@ export class Queue extends Resource("sqs::Queue", async (ctx, props) => {
                 throw error;
             }
         }
-        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
@@ -99,12 +94,11 @@ export class Queue extends Resource("sqs::Queue", async (ctx, props) => {
                 QueueUrl: createResponse.QueueUrl,
                 AttributeNames: ["QueueArn"],
             }));
-            return {
+            return this({
                 ...props,
-                id: props.queueName,
                 arn: attributesResponse.Attributes.QueueArn,
                 url: createResponse.QueueUrl,
-            };
+            });
         }
         catch (error) {
             if (error.name === "QueueAlreadyExists") {
@@ -117,12 +111,11 @@ export class Queue extends Resource("sqs::Queue", async (ctx, props) => {
                     QueueUrl: urlResponse.QueueUrl,
                     AttributeNames: ["QueueArn"],
                 }));
-                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
@@ -143,12 +136,11 @@ export class Queue extends Resource("sqs::Queue", async (ctx, props) => {
                             QueueUrl: createResponse.QueueUrl,
                             AttributeNames: ["QueueArn"],
                         }));
-                        return {
+                        return this({
                             ...props,
-                            id: props.queueName,
                             arn: attributesResponse.Attributes.QueueArn,
                             url: createResponse.QueueUrl,
-                        };
+                        });
                     }
                     catch (retryError) {
                         if (retryError.name !== "QueueDeletedRecently" ||
@@ -162,6 +154,4 @@ export class Queue extends Resource("sqs::Queue", async (ctx, props) => {
             throw error;
         }
     }
-}) {
-}
-//# sourceMappingURL=queue.js.map
+});

package/lib/aws/role.d.ts

@@ -1,3 +1,5 @@
+import type { Context } from "../context";
+import { Resource } from "../resource";
 import type { PolicyDocument } from "./policy";
 export interface RoleProps {
     roleName: string;
@@ -13,15 +15,10 @@ export interface RoleProps {
     managedPolicyArns?: string[];
     tags?: Record<string, string>;
 }
-export interface RoleOutput extends RoleProps {
-    id: string;
+export interface Role extends Resource<"iam::Role">, RoleProps {
     arn: string;
     uniqueId: string;
     roleId: string;
     createDate: Date;
 }
-declare const Role_base: import("../resource").Provider<"iam::Role", [props: RoleProps], RoleOutput>;
-export declare class Role extends Role_base {
-}
-export {};
-//# sourceMappingURL=role.d.ts.map
+export declare const Role: ((this: Context<Role>, id: string, props: RoleProps) => Promise<Role>) | (((this: any, id: string, props: RoleProps) => never) & (new (_: never) => never));

package/lib/aws/role.js

@@ -1,9 +1,9 @@
 import { AttachRolePolicyCommand, CreateRoleCommand, DeleteRoleCommand, DeleteRolePolicyCommand, DetachRolePolicyCommand, EntityAlreadyExistsException, GetRoleCommand, IAMClient, ListAttachedRolePoliciesCommand, NoSuchEntityException, PutRolePolicyCommand, TagRoleCommand, UpdateAssumeRolePolicyCommand, UpdateRoleCommand, } from "@aws-sdk/client-iam";
-import { ignore } from "../error";
 import { Resource } from "../resource";
-export class Role extends Resource("iam::Role", async (ctx, props) => {
+import { ignore } from "../util/ignore";
+export const Role = Resource("iam::Role", async function (id, props) {
     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) {
@@ -36,19 +36,12 @@ export class Role extends Resource("iam::Role", async (ctx, props) => {
         await ignore(NoSuchEntityException.name, () => client.send(new DeleteRoleCommand({
             RoleName: props.roleName,
         })));
-        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({
                 RoleName: props.roleName,
@@ -64,11 +57,11 @@ export class Role extends Resource("iam::Role", async (ctx, props) => {
                     })),
                     {
                         Key: "alchemy_stage",
-                        Value: ctx.stage,
+                        Value: this.stage,
                     },
                     {
                         Key: "alchemy_resource",
-                        Value: ctx.resourceID,
+                        Value: this.id,
                     },
                 ],
             }));
@@ -76,7 +69,7 @@ export class Role extends Resource("iam::Role", async (ctx, props) => {
     }
     catch (error) {
         if (error instanceof EntityAlreadyExistsException &&
-            ctx.event === "create") {
+            this.phase === "create") {
             // Check if we were the ones who created it
             const existingRole = await client.send(new GetRoleCommand({
                 RoleName: props.roleName,
@@ -85,8 +78,8 @@ export class Role extends Resource("iam::Role", async (ctx, props) => {
                 acc[tag.Key] = tag.Value;
                 return acc;
             }, {}) || {};
-            if (roleTags.alchemy_stage !== ctx.stage ||
-                roleTags.alchemy_resource !== ctx.resourceID) {
+            if (roleTags.alchemy_stage !== this.stage ||
+                roleTags.alchemy_resource !== this.id) {
                 throw error;
             }
         }
@@ -117,8 +110,8 @@ export class Role extends Resource("iam::Role", async (ctx, props) => {
     // Update tags
     const newTags = {
         ...props.tags,
-        alchemy_stage: ctx.stage,
-        alchemy_resource: ctx.resourceID,
+        alchemy_stage: this.stage,
+        alchemy_resource: this.id,
     };
     const tags = Object.entries(newTags).map(([Key, Value]) => ({
         Key,
@@ -129,7 +122,7 @@ export class Role extends Resource("iam::Role", async (ctx, props) => {
         Tags: tags,
     }));
     // Handle policy changes
-    const previousPolicies = ctx.event === "update" ? ctx.output.policies || [] : [];
+    const previousPolicies = this.phase === "update" ? this.output.policies || [] : [];
     const currentPolicies = props.policies || [];
     // Delete policies that were removed
     for (const oldPolicy of previousPolicies) {
@@ -184,14 +177,12 @@ export class Role extends Resource("iam::Role", async (ctx, props) => {
     if (!role?.Role) {
         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,
-    };
-}) {
-}
-//# sourceMappingURL=role.js.map
+    });
+});

package/lib/aws/ses.d.ts

@@ -1,4 +1,6 @@
 import { type DeliveryOptions, type ReputationOptions, type SendingOptions, type SuppressionOptions, type TrackingOptions } from "@aws-sdk/client-sesv2";
+import type { Context } from "../context";
+import { Resource } from "../resource";
 /**
  * Properties for configuring AWS SES resources
  */
@@ -43,11 +45,7 @@ export interface SESProps {
 /**
  * Output returned after SES resource creation/update
  */
-export interface SESOutput extends SESProps {
-    /**
-     * Resource ID
-     */
-    id: string;
+export interface SES extends Resource<"aws::SES">, SESProps {
     /**
      * ARN of the configuration set if created
      */
@@ -65,11 +63,7 @@ export interface SESOutput extends SESProps {
      */
     emailIdentityArn?: string;
 }
-declare const SES_base: import("../resource").Provider<"aws::SES", [props: SESProps], SESOutput>;
 /**
  * AWS SES resource for creating and configuring Simple Email Service
  */
-export declare class SES extends SES_base {
-}
-export {};
-//# sourceMappingURL=ses.d.ts.map
+export declare const SES: ((this: Context<SES>, id: string, props: SESProps) => Promise<SES>) | (((this: any, id: string, props: SESProps) => never) & (new (_: never) => never));