alchemy 0.12.21 → 0.14.0

package/src/aws/oidc/github-oidc-provider.ts

@@ -99,7 +99,7 @@ export type GitHubOIDCProvider = ReturnType<typeof GitHubOIDCProvider>;
  */
 export const GitHubOIDCProvider = async (
   id: string,
-  props: GitHubOIDCProviderProps
+  props: GitHubOIDCProviderProps,
 ) => {
   return OIDCProvider(id, {
     owner: props.owner,

package/src/aws/oidc/oidc-provider.ts

@@ -121,7 +121,7 @@ export const OIDCProvider = Resource(
   async function (
     this: Context<OIDCProvider>,
     id: string,
-    props: OIDCProviderProps
+    props: OIDCProviderProps,
   ) {
     // Initialize AWS SDK client
     const client = new IAMClient({
@@ -135,24 +135,24 @@ export const OIDCProvider = Resource(
           const getRole = await client.send(
             new GetRoleCommand({
               RoleName: props.roleArn.split("/").pop(),
-            })
+            }),
           );
 
           if (getRole.Role?.AssumeRolePolicyDocument) {
             const policy = JSON.parse(
-              decodeURIComponent(getRole.Role.AssumeRolePolicyDocument)
+              decodeURIComponent(getRole.Role.AssumeRolePolicyDocument),
             );
 
             // Remove our specific statement while preserving others
             policy.Statement = policy.Statement.filter(
-              (stmt: any) => stmt.Sid !== TRUST_POLICY_SID
+              (stmt: any) => stmt.Sid !== TRUST_POLICY_SID,
             );
 
             await client.send(
               new UpdateAssumeRolePolicyCommand({
                 RoleName: props.roleArn.split("/").pop(),
                 PolicyDocument: JSON.stringify(policy),
-              })
+              }),
             );
           }
 
@@ -160,7 +160,7 @@ export const OIDCProvider = Resource(
           const provider = await client.send(
             new GetOpenIDConnectProviderCommand({
               OpenIDConnectProviderArn: this.output.providerArn,
-            })
+            }),
           );
 
           // Only delete the provider if it exists and has no other tags
@@ -168,7 +168,7 @@ export const OIDCProvider = Resource(
             await client.send(
               new DeleteOpenIDConnectProviderCommand({
                 OpenIDConnectProviderArn: this.output.providerArn,
-              })
+              }),
             );
           }
         } catch (error) {
@@ -197,7 +197,7 @@ export const OIDCProvider = Resource(
                 Value: "alchemy",
               },
             ] as Tag[],
-          })
+          }),
         );
         providerArn = createProvider.OpenIDConnectProviderArn!;
       } catch (error: any) {
@@ -213,13 +213,13 @@ export const OIDCProvider = Resource(
       const getRole = await client.send(
         new GetRoleCommand({
           RoleName: props.roleArn.split("/").pop(),
-        })
+        }),
       );
 
       let policy: any;
       if (getRole.Role?.AssumeRolePolicyDocument) {
         policy = JSON.parse(
-          decodeURIComponent(getRole.Role.AssumeRolePolicyDocument)
+          decodeURIComponent(getRole.Role.AssumeRolePolicyDocument),
         );
       } else {
         policy = {
@@ -240,7 +240,7 @@ export const OIDCProvider = Resource(
         conditions.StringEquals["token.actions.githubusercontent.com:sub"] =
           props.branches.map(
             (branch) =>
-              `repo:${props.owner}/${props.repository}:ref:refs/heads/${branch}`
+              `repo:${props.owner}/${props.repository}:ref:refs/heads/${branch}`,
           );
       }
 
@@ -248,7 +248,7 @@ export const OIDCProvider = Resource(
         conditions.StringEquals["token.actions.githubusercontent.com:sub"] =
           props.environments.map(
             (env) =>
-              `repo:${props.owner}/${props.repository}:environment:${env}`
+              `repo:${props.owner}/${props.repository}:environment:${env}`,
           );
       }
 
@@ -266,7 +266,7 @@ export const OIDCProvider = Resource(
       // Remove any existing statement with our SID and add the new one
       policy.Statement = [
         ...policy.Statement.filter(
-          (stmt: any) => stmt.Sid !== TRUST_POLICY_SID
+          (stmt: any) => stmt.Sid !== TRUST_POLICY_SID,
         ),
         ourStatement,
       ];
@@ -276,7 +276,7 @@ export const OIDCProvider = Resource(
         new UpdateAssumeRolePolicyCommand({
           RoleName: props.roleArn.split("/").pop(),
           PolicyDocument: JSON.stringify(policy),
-        })
+        }),
       );
 
       return this({
@@ -288,5 +288,5 @@ export const OIDCProvider = Resource(
       console.error("Error configuring OIDC provider:", error);
       throw error;
     }
-  }
+  },
 );

package/src/aws/policy-attachment.ts

@@ -66,7 +66,7 @@ export const PolicyAttachment = Resource(
   async function (
     this: Context<PolicyAttachment>,
     id: string,
-    props: PolicyAttachmentProps
+    props: PolicyAttachmentProps,
   ) {
     const client = new IAMClient({});
 
@@ -76,19 +76,18 @@ export const PolicyAttachment = Resource(
           new DetachRolePolicyCommand({
             PolicyArn: props.policyArn,
             RoleName: props.roleName,
-          })
-        )
+          }),
+        ),
       );
       return this.destroy();
-    } else {
-      await client.send(
-        new AttachRolePolicyCommand({
-          PolicyArn: props.policyArn,
-          RoleName: props.roleName,
-        })
-      );
     }
+    await client.send(
+      new AttachRolePolicyCommand({
+        PolicyArn: props.policyArn,
+        RoleName: props.roleName,
+      }),
+    );
 
     return this(props);
-  }
+  },
 );

package/src/aws/policy.ts

@@ -230,7 +230,7 @@ export const Policy = Resource(
   async function (
     this: Context<Policy>,
     id: string,
-    props: PolicyProps
+    props: PolicyProps,
   ): Promise<Policy> {
     const client = new IAMClient({});
     const policyArn = `arn:aws:iam::${process.env.AWS_ACCOUNT_ID}:policy${props.path || "/"}${props.policyName}`;
@@ -241,7 +241,7 @@ export const Policy = Resource(
         const versions = await client.send(
           new ListPolicyVersionsCommand({
             PolicyArn: policyArn,
-          })
+          }),
         );
 
         for (const version of versions.Versions || []) {
@@ -250,7 +250,7 @@ export const Policy = Resource(
               new DeletePolicyVersionCommand({
                 PolicyArn: policyArn,
                 VersionId: version.VersionId,
-              })
+              }),
             );
           }
         }
@@ -259,7 +259,7 @@ export const Policy = Resource(
         await client.send(
           new DeletePolicyCommand({
             PolicyArn: policyArn,
-          })
+          }),
         );
       } catch (error: any) {
         if (error.name !== NoSuchEntityException.name) {
@@ -267,109 +267,106 @@ export const Policy = Resource(
         }
       }
       return this.destroy();
-    } else {
-      try {
-        // Check if policy exists
-        const existingPolicy = await client.send(
-          new GetPolicyCommand({
-            PolicyArn: policyArn,
-          })
-        );
-
-        // Get current policy version
-        const currentVersion = await client.send(
-          new GetPolicyVersionCommand({
+    }
+    try {
+      // Check if policy exists
+      const existingPolicy = await client.send(
+        new GetPolicyCommand({
+          PolicyArn: policyArn,
+        }),
+      );
+
+      // Get current policy version
+      const currentVersion = await client.send(
+        new GetPolicyVersionCommand({
+          PolicyArn: policyArn,
+          VersionId: existingPolicy.Policy!.DefaultVersionId!,
+        }),
+      );
+
+      const currentDocument = JSON.parse(
+        decodeURIComponent(currentVersion.PolicyVersion!.Document!),
+      );
+
+      // If policy document changed, create new version
+      if (JSON.stringify(currentDocument) !== JSON.stringify(props.document)) {
+        // List versions to check if we need to delete old ones
+        const versions = await client.send(
+          new ListPolicyVersionsCommand({
             PolicyArn: policyArn,
-            VersionId: existingPolicy.Policy!.DefaultVersionId!,
-          })
+          }),
         );
 
-        const currentDocument = JSON.parse(
-          decodeURIComponent(currentVersion.PolicyVersion!.Document!)
-        );
+        // Delete oldest version if we have 5 versions (maximum allowed)
+        if (versions.Versions?.length === 5) {
+          const oldestVersion = versions.Versions.sort(
+            (a, b) => a.CreateDate!.getTime() - b.CreateDate!.getTime(),
+          )[0];
 
-        // If policy document changed, create new version
-        if (
-          JSON.stringify(currentDocument) !== JSON.stringify(props.document)
-        ) {
-          // List versions to check if we need to delete old ones
-          const versions = await client.send(
-            new ListPolicyVersionsCommand({
-              PolicyArn: policyArn,
-            })
-          );
-
-          // Delete oldest version if we have 5 versions (maximum allowed)
-          if (versions.Versions?.length === 5) {
-            const oldestVersion = versions.Versions.sort(
-              (a, b) => a.CreateDate!.getTime() - b.CreateDate!.getTime()
-            )[0];
-
-            if (!oldestVersion.IsDefaultVersion) {
-              await client.send(
-                new DeletePolicyVersionCommand({
-                  PolicyArn: policyArn,
-                  VersionId: oldestVersion.VersionId!,
-                })
-              );
-            }
+          if (!oldestVersion.IsDefaultVersion) {
+            await client.send(
+              new DeletePolicyVersionCommand({
+                PolicyArn: policyArn,
+                VersionId: oldestVersion.VersionId!,
+              }),
+            );
           }
-
-          // Create new version
-          await client.send(
-            new CreatePolicyVersionCommand({
-              PolicyArn: policyArn,
-              PolicyDocument: JSON.stringify(props.document),
-              SetAsDefault: true,
-            })
-          );
         }
 
-        const policy = await client.send(
-          new GetPolicyCommand({
+        // Create new version
+        await client.send(
+          new CreatePolicyVersionCommand({
             PolicyArn: policyArn,
-          })
+            PolicyDocument: JSON.stringify(props.document),
+            SetAsDefault: true,
+          }),
+        );
+      }
+
+      const policy = await client.send(
+        new GetPolicyCommand({
+          PolicyArn: policyArn,
+        }),
+      );
+
+      return this({
+        ...props,
+        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
+        const newPolicy = await client.send(
+          new CreatePolicyCommand({
+            PolicyName: props.policyName,
+            PolicyDocument: JSON.stringify(props.document),
+            Description: props.description,
+            Path: props.path,
+            Tags: props.tags
+              ? Object.entries(props.tags).map(([Key, Value]) => ({
+                  Key,
+                  Value,
+                }))
+              : undefined,
+          }),
         );
 
         return this({
           ...props,
-          arn: policy.Policy!.Arn!,
-          defaultVersionId: policy.Policy!.DefaultVersionId!,
-          attachmentCount: policy.Policy!.AttachmentCount!,
-          createDate: policy.Policy!.CreateDate!,
-          updateDate: policy.Policy!.UpdateDate!,
-          isAttachable: policy.Policy!.IsAttachable!,
+          arn: newPolicy.Policy!.Arn!,
+          defaultVersionId: newPolicy.Policy!.DefaultVersionId!,
+          attachmentCount: newPolicy.Policy!.AttachmentCount!,
+          createDate: newPolicy.Policy!.CreateDate!,
+          updateDate: newPolicy.Policy!.UpdateDate!,
+          isAttachable: newPolicy.Policy!.IsAttachable!,
         });
-      } catch (error: any) {
-        if (error.name === "NoSuchEntity") {
-          // Create new policy
-          const newPolicy = await client.send(
-            new CreatePolicyCommand({
-              PolicyName: props.policyName,
-              PolicyDocument: JSON.stringify(props.document),
-              Description: props.description,
-              Path: props.path,
-              Tags: props.tags
-                ? Object.entries(props.tags).map(([Key, Value]) => ({
-                    Key,
-                    Value,
-                  }))
-                : undefined,
-            })
-          );
-
-          return this({
-            ...props,
-            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;
       }
+      throw error;
     }
-  }
+  },
 );

package/src/aws/queue.ts

@@ -137,7 +137,7 @@ export const Queue = Resource(
   async function (
     this: Context<Queue>,
     id: string,
-    props: QueueProps
+    props: QueueProps,
   ): Promise<Queue> {
     const client = new SQSClient({});
     // Don't automatically add .fifo suffix - user must include it in queueName
@@ -154,14 +154,14 @@ export const Queue = Resource(
         const urlResponse = await client.send(
           new GetQueueUrlCommand({
             QueueName: queueName,
-          })
+          }),
         );
 
         // Delete the queue
         await client.send(
           new DeleteQueueCommand({
             QueueUrl: urlResponse.QueueUrl,
-          })
+          }),
         );
 
         // Wait for queue to be deleted
@@ -171,7 +171,7 @@ export const Queue = Resource(
             await client.send(
               new GetQueueUrlCommand({
                 QueueName: queueName,
-              })
+              }),
             );
             // If we get here, queue still exists
             await new Promise((resolve) => setTimeout(resolve, 1000));
@@ -190,140 +190,140 @@ export const Queue = Resource(
       }
 
       return this.destroy();
-    } else {
-      // Create queue with attributes
-      const attributes: Record<string, string> = {};
+    }
+    // Create queue with attributes
+    const attributes: Record<string, string> = {};
 
-      if (props.visibilityTimeout !== undefined) {
-        attributes["VisibilityTimeout"] = props.visibilityTimeout.toString();
-      }
-      if (props.messageRetentionPeriod !== undefined) {
-        attributes["MessageRetentionPeriod"] =
-          props.messageRetentionPeriod.toString();
-      }
-      if (props.maximumMessageSize !== undefined) {
-        attributes["MaximumMessageSize"] = props.maximumMessageSize.toString();
+    if (props.visibilityTimeout !== undefined) {
+      attributes.VisibilityTimeout = props.visibilityTimeout.toString();
+    }
+    if (props.messageRetentionPeriod !== undefined) {
+      attributes.MessageRetentionPeriod =
+        props.messageRetentionPeriod.toString();
+    }
+    if (props.maximumMessageSize !== undefined) {
+      attributes.MaximumMessageSize = props.maximumMessageSize.toString();
+    }
+    if (props.delaySeconds !== undefined) {
+      attributes.DelaySeconds = props.delaySeconds.toString();
+    }
+    if (props.receiveMessageWaitTimeSeconds !== undefined) {
+      attributes.ReceiveMessageWaitTimeSeconds =
+        props.receiveMessageWaitTimeSeconds.toString();
+    }
+
+    // FIFO specific attributes
+    if (props.fifo) {
+      attributes.FifoQueue = "true";
+      if (props.contentBasedDeduplication) {
+        attributes.ContentBasedDeduplication = "true";
       }
-      if (props.delaySeconds !== undefined) {
-        attributes["DelaySeconds"] = props.delaySeconds.toString();
+      if (props.deduplicationScope) {
+        attributes.DeduplicationScope = props.deduplicationScope;
       }
-      if (props.receiveMessageWaitTimeSeconds !== undefined) {
-        attributes["ReceiveMessageWaitTimeSeconds"] =
-          props.receiveMessageWaitTimeSeconds.toString();
+      if (props.fifoThroughputLimit) {
+        attributes.FifoThroughputLimit = props.fifoThroughputLimit;
       }
+    }
 
-      // FIFO specific attributes
-      if (props.fifo) {
-        attributes["FifoQueue"] = "true";
-        if (props.contentBasedDeduplication) {
-          attributes["ContentBasedDeduplication"] = "true";
-        }
-        if (props.deduplicationScope) {
-          attributes["DeduplicationScope"] = props.deduplicationScope;
-        }
-        if (props.fifoThroughputLimit) {
-          attributes["FifoThroughputLimit"] = props.fifoThroughputLimit;
-        }
-      }
+    // Convert tags to AWS format
+    const tags = props.tags
+      ? Object.entries(props.tags).reduce(
+          (acc, [key, value]) => ({ ...acc, [key]: value }),
+          {},
+        )
+      : undefined;
 
-      // Convert tags to AWS format
-      const tags = props.tags
-        ? Object.entries(props.tags).reduce(
-            (acc, [key, value]) => ({ ...acc, [key]: value }),
-            {}
-          )
-        : undefined;
+    try {
+      // Create the queue
+      const createResponse = await client.send(
+        new CreateQueueCommand({
+          QueueName: queueName,
+          Attributes: attributes,
+          tags,
+        }),
+      );
 
-      try {
-        // Create the queue
-        const createResponse = await client.send(
-          new CreateQueueCommand({
+      // Get queue attributes
+      const attributesResponse = await client.send(
+        new GetQueueAttributesCommand({
+          QueueUrl: createResponse.QueueUrl,
+          AttributeNames: ["QueueArn"],
+        }),
+      );
+
+      return this({
+        ...props,
+        arn: attributesResponse.Attributes!.QueueArn!,
+        url: createResponse.QueueUrl!,
+      });
+    } catch (error: any) {
+      if (error.name === "QueueAlreadyExists") {
+        // Get existing queue URL
+        const urlResponse = await client.send(
+          new GetQueueUrlCommand({
             QueueName: queueName,
-            Attributes: attributes,
-            tags,
-          })
+          }),
         );
 
         // Get queue attributes
         const attributesResponse = await client.send(
           new GetQueueAttributesCommand({
-            QueueUrl: createResponse.QueueUrl,
+            QueueUrl: urlResponse.QueueUrl,
             AttributeNames: ["QueueArn"],
-          })
+          }),
         );
 
         return this({
           ...props,
           arn: attributesResponse.Attributes!.QueueArn!,
-          url: createResponse.QueueUrl!,
+          url: urlResponse.QueueUrl!,
         });
-      } catch (error: any) {
-        if (error.name === "QueueAlreadyExists") {
-          // Get existing queue URL
-          const urlResponse = await client.send(
-            new GetQueueUrlCommand({
-              QueueName: queueName,
-            })
-          );
-
-          // Get queue attributes
-          const attributesResponse = await client.send(
-            new GetQueueAttributesCommand({
-              QueueUrl: urlResponse.QueueUrl,
-              AttributeNames: ["QueueArn"],
-            })
-          );
-
-          return this({
-            ...props,
-            arn: attributesResponse.Attributes!.QueueArn!,
-            url: urlResponse.QueueUrl!,
-          });
-        } else if (error.name === "QueueDeletedRecently") {
-          // Queue was recently deleted, wait and retry
-          const maxRetries = 3;
-          let retryCount = 0;
+      }
+      if (error.name === "QueueDeletedRecently") {
+        // Queue was recently deleted, wait and retry
+        const maxRetries = 3;
+        let retryCount = 0;
 
-          while (retryCount < maxRetries) {
-            try {
-              // Wait for 60 seconds before retrying
-              await new Promise((resolve) => setTimeout(resolve, 61000));
+        while (retryCount < maxRetries) {
+          try {
+            // Wait for 60 seconds before retrying
+            await new Promise((resolve) => setTimeout(resolve, 61000));
 
-              // Retry creating the queue
-              const createResponse = await client.send(
-                new CreateQueueCommand({
-                  QueueName: queueName,
-                  Attributes: attributes,
-                  tags,
-                })
-              );
+            // Retry creating the queue
+            const createResponse = await client.send(
+              new CreateQueueCommand({
+                QueueName: queueName,
+                Attributes: attributes,
+                tags,
+              }),
+            );
 
-              // Get queue attributes
-              const attributesResponse = await client.send(
-                new GetQueueAttributesCommand({
-                  QueueUrl: createResponse.QueueUrl,
-                  AttributeNames: ["QueueArn"],
-                })
-              );
+            // Get queue attributes
+            const attributesResponse = await client.send(
+              new GetQueueAttributesCommand({
+                QueueUrl: createResponse.QueueUrl,
+                AttributeNames: ["QueueArn"],
+              }),
+            );
 
-              return this({
-                ...props,
-                arn: attributesResponse.Attributes!.QueueArn!,
-                url: createResponse.QueueUrl!,
-              });
-            } catch (retryError: any) {
-              if (
-                retryError.name !== "QueueDeletedRecently" ||
-                retryCount === maxRetries - 1
-              ) {
-                throw retryError;
-              }
-              retryCount++;
+            return this({
+              ...props,
+              arn: attributesResponse.Attributes!.QueueArn!,
+              url: createResponse.QueueUrl!,
+            });
+          } catch (retryError: any) {
+            if (
+              retryError.name !== "QueueDeletedRecently" ||
+              retryCount === maxRetries - 1
+            ) {
+              throw retryError;
             }
+            retryCount++;
           }
         }
-        throw error;
       }
+      throw error;
     }
-  }
+  },
 );