alchemy 0.67.0 → 0.69.0

package/src/aws/ec2/internet-gateway-attachment.ts

@@ -38,8 +38,7 @@ export interface InternetGatewayAttachmentProps extends AwsClientProps {
  * Output returned after Internet Gateway Attachment creation/update
  */
 export interface InternetGatewayAttachment
-  extends Resource<"aws::InternetGatewayAttachment">,
-    InternetGatewayAttachmentProps {
+  extends InternetGatewayAttachmentProps {
   /**
    * The ID of the Internet Gateway
    */
@@ -277,12 +276,12 @@ export const InternetGatewayAttachment = Resource(
       const attachment = igw?.Attachments?.find((att) => att.VpcId === vpcId);
 
       if (attachment) {
-        return this({
+        return {
           internetGatewayId,
           vpcId,
           state: "attached",
           ...props,
-        });
+        };
       }
     }
 
@@ -353,12 +352,12 @@ export const InternetGatewayAttachment = Resource(
       "to be attached",
     );
 
-    return this({
+    return {
       internetGatewayId,
       vpcId,
       state: "attached",
       ...props,
-    });
+    };
   },
 );
 

package/src/aws/ec2/internet-gateway.ts

@@ -31,9 +31,7 @@ export interface InternetGatewayProps extends AwsClientProps {
 /**
  * Output returned after Internet Gateway creation/update
  */
-export interface InternetGateway
-  extends Resource<"aws::InternetGateway">,
-    InternetGatewayProps {
+export interface InternetGateway extends InternetGatewayProps {
   /**
    * The ID of the Internet Gateway
    */
@@ -358,7 +356,7 @@ export const InternetGateway = Resource(
       );
     }
 
-    return this({
+    return {
       internetGatewayId: internetGateway.InternetGatewayId!,
       state: "available",
       attachments: internetGateway.Attachments?.map((att) => ({
@@ -367,7 +365,7 @@ export const InternetGateway = Resource(
       })),
       ownerId: internetGateway.OwnerId,
       ...props,
-    });
+    };
   },
 );
 

package/src/aws/ec2/nat-gateway.ts

@@ -48,9 +48,7 @@ export interface NatGatewayProps extends AwsClientProps {
 /**
  * Output returned after NAT Gateway creation/update
  */
-export interface NatGateway
-  extends Resource<"aws::NatGateway">,
-    NatGatewayProps {
+export interface NatGateway extends NatGatewayProps {
   /**
    * The ID of the NAT Gateway
    */
@@ -423,7 +421,7 @@ export const NatGateway = Resource(
       );
     }
 
-    const result = this({
+    const result = {
       natGatewayId: natGateway.NatGatewayId!,
       subnetId: natGateway.SubnetId!,
       vpcId: natGateway.VpcId!,
@@ -434,7 +432,7 @@ export const NatGateway = Resource(
       createdElasticIp,
       ...props,
       subnet: subnetId,
-    });
+    };
     return result;
   },
 );

package/src/aws/ec2/route-table-association.ts

@@ -44,9 +44,7 @@ export interface RouteTableAssociationProps {
 /**
  * Output returned after Route Table Association creation/update
  */
-export interface RouteTableAssociation
-  extends Resource<"aws::RouteTableAssociation">,
-    RouteTableAssociationProps {
+export interface RouteTableAssociation extends RouteTableAssociationProps {
   /**
    * The ID of the route table association
    */
@@ -418,7 +416,7 @@ export const RouteTableAssociation = Resource(
       }
     }
 
-    return this({
+    return {
       associationId,
       routeTableId,
       subnetId,
@@ -429,7 +427,7 @@ export const RouteTableAssociation = Resource(
       routeTable: routeTableId,
       subnet: subnetId,
       gateway: gatewayId,
-    });
+    };
   },
 );
 

package/src/aws/ec2/route-table.ts

@@ -37,9 +37,7 @@ export interface RouteTableProps extends AwsClientProps {
 /**
  * Output returned after Route Table creation/update
  */
-export interface RouteTable
-  extends Resource<"aws::RouteTable">,
-    RouteTableProps {
+export interface RouteTable extends RouteTableProps {
   /**
    * The ID of the route table
    */
@@ -272,12 +270,12 @@ export const RouteTable = Resource(
       logger.log(`  ✅ Route Table ${routeTable.RouteTableId} created`);
     }
 
-    return this({
+    return {
       routeTableId: routeTable.RouteTableId!,
       vpcId: routeTable.VpcId!,
       ...props,
       vpc: vpcId,
-    });
+    };
   },
 );
 

package/src/aws/ec2/route.ts

@@ -52,7 +52,7 @@ export interface RouteProps extends AwsClientProps {
 /**
  * Output returned after Route creation/update
  */
-export interface Route extends Resource<"aws::Route">, RouteProps {
+export interface Route extends RouteProps {
   /**
    * The ID of the route table
    */
@@ -333,7 +333,7 @@ export const Route = Resource(
       throw new Error("Failed to find created route");
     }
 
-    return this({
+    return {
       routeTableId,
       state: route.State as "active" | "blackhole",
       origin: route.Origin as
@@ -342,7 +342,7 @@ export const Route = Resource(
         | "EnableVgwRoutePropagation",
       ...props,
       routeTable: routeTableId,
-    });
+    };
   },
 );
 

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

@@ -56,9 +56,7 @@ export interface SecurityGroupRuleProps {
 /**
  * Output returned after Security Group Rule creation/update
  */
-export interface SecurityGroupRule
-  extends Resource<"aws::SecurityGroupRule">,
-    SecurityGroupRuleProps {
+export interface SecurityGroupRule extends SecurityGroupRuleProps {
   /**
    * A unique identifier for the rule resource.
    */
@@ -156,10 +154,10 @@ export const SecurityGroupRule = Resource(
       authorizeParams,
     );
 
-    return this({
+    return {
       ruleId,
       ...props,
-    });
+    };
   },
 );
 

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

@@ -56,9 +56,7 @@ export interface SecurityGroupProps extends AwsClientProps {
 /**
  * Output returned after Security Group creation/update
  */
-export interface SecurityGroup
-  extends Resource<"aws::SecurityGroup">,
-    SecurityGroupProps {
+export interface SecurityGroup extends SecurityGroupProps {
   /**
    * The ID of the security group.
    */
@@ -322,14 +320,14 @@ export const SecurityGroup = Resource(
       securityGroup = sgResponse.SecurityGroups[0];
     }
 
-    return this({
+    return {
       groupId: securityGroup.GroupId,
       groupName,
       vpcId: securityGroup.VpcId,
       ownerId: securityGroup.OwnerId,
       ...props,
       vpc: vpcId,
-    });
+    };
   },
 );
 

package/src/aws/ec2/subnet.ts

@@ -54,7 +54,7 @@ export interface SubnetProps extends AwsClientProps {
 /**
  * Output returned after Subnet creation/update
  */
-export interface Subnet extends Resource<"aws::Subnet">, SubnetProps {
+export interface Subnet extends SubnetProps {
   /**
    * The ID of the subnet
    */
@@ -407,7 +407,7 @@ export const Subnet = Resource(
       await waitForSubnetAvailable(client, subnet.SubnetId, timeoutConfig);
     }
 
-    return this({
+    return {
       subnetId: subnet.SubnetId,
       vpcId: subnet.VpcId,
       state: subnet.State as "pending" | "available",
@@ -415,7 +415,7 @@ export const Subnet = Resource(
       defaultForAz: subnet.DefaultForAz,
       ...props,
       vpc: vpcId,
-    });
+    };
   },
 );
 

package/src/aws/ec2/vpc.ts

@@ -80,7 +80,7 @@ export interface VpcProps extends AwsClientProps {
 /**
  * Output returned after VPC creation/update
  */
-export interface Vpc extends Resource<"aws::Vpc">, VpcProps {
+export interface Vpc extends VpcProps {
   /**
    * The ID of the VPC
    */
@@ -388,13 +388,13 @@ export const Vpc = Resource(
       }
     }
 
-    return this({
+    return {
       vpcId: vpc.VpcId!,
       state: vpc.State as "pending" | "available",
       isDefault: vpc.IsDefault || false,
       dhcpOptionsId: vpc.DhcpOptionsId!,
       ...props,
-    });
+    };
   },
 );
 

package/src/aws/function.ts

@@ -136,7 +136,7 @@ export interface FunctionProps {
 /**
  * Output returned after Lambda function creation/update
  */
-export interface Function extends Resource<"lambda::Function">, FunctionProps {
+export interface Function extends FunctionProps {
   /**
    * ARN of the Lambda function
    */
@@ -745,7 +745,7 @@ export const Function = Resource(
       }
     }
 
-    return this({
+    return {
       ...props,
       arn: config.FunctionArn!,
       functionName,
@@ -769,7 +769,7 @@ export const Function = Resource(
       signingProfileVersionArn: config.SigningProfileVersionArn,
       signingJobArn: config.SigningJobArn,
       functionUrl: functionUrl,
-    });
+    };
   },
 );
 

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

@@ -71,9 +71,7 @@ export interface OIDCProviderProps {
 /**
  * Output returned after OIDC provider configuration
  */
-export interface OIDCProvider
-  extends Resource<"aws::OIDCProvider">,
-    OIDCProviderProps {
+export interface OIDCProvider extends OIDCProviderProps {
   /**
    * The ARN of the OIDC provider
    * Format: arn:aws:iam::account-id:oidc-provider/token.actions.githubusercontent.com
@@ -280,11 +278,11 @@ export const OIDCProvider = Resource(
         }),
       );
 
-      return this({
+      return {
         ...props,
         providerArn,
         createdAt: Date.now(),
-      });
+      };
     } catch (error) {
       logger.error("Error configuring OIDC provider:", error);
       throw error;

package/src/aws/policy-attachment.ts

@@ -22,9 +22,7 @@ export interface PolicyAttachmentProps {
 /**
  * Output returned after policy attachment creation/update
  */
-export interface PolicyAttachment
-  extends Resource<"iam::PolicyAttachment">,
-    PolicyAttachmentProps {}
+export interface PolicyAttachment extends PolicyAttachmentProps {}
 
 /**
  * AWS IAM Policy Attachment Resource
@@ -97,6 +95,6 @@ export const PolicyAttachment = Resource(
       ),
     );
 
-    return this(props);
+    return props;
   },
 );

package/src/aws/policy.ts

@@ -108,7 +108,7 @@ export interface PolicyProps {
 /**
  * Output returned after IAM policy creation/update
  */
-export interface Policy extends Resource<"iam::Policy">, PolicyProps {
+export interface Policy extends PolicyProps {
   /**
    * ARN of the policy
    */
@@ -364,7 +364,7 @@ export const Policy = Resource(
         ),
       );
 
-      return this({
+      return {
         ...props,
         arn: policy.Policy!.Arn!,
         policyName,
@@ -373,7 +373,7 @@ export const Policy = Resource(
         createDate: policy.Policy!.CreateDate!,
         updateDate: policy.Policy!.UpdateDate!,
         isAttachable: policy.Policy!.IsAttachable!,
-      });
+      };
     } catch (error: any) {
       if (error.name === "NoSuchEntity") {
         // Create new policy
@@ -394,7 +394,7 @@ export const Policy = Resource(
           ),
         );
 
-        return this({
+        return {
           ...props,
           arn: newPolicy.Policy!.Arn!,
           policyName,
@@ -403,7 +403,7 @@ export const Policy = Resource(
           createDate: newPolicy.Policy!.CreateDate!,
           updateDate: newPolicy.Policy!.UpdateDate!,
           isAttachable: newPolicy.Policy!.IsAttachable!,
-        });
+        };
       }
       throw error;
     }

package/src/aws/queue.ts

@@ -79,7 +79,7 @@ export interface QueueProps {
 /**
  * Output returned after SQS queue creation/update
  */
-export interface Queue extends Resource<"sqs::Queue">, QueueProps {
+export interface Queue extends QueueProps {
   /**
    * ARN of the queue
    */
@@ -283,12 +283,12 @@ export const Queue = Resource(
         ),
       );
 
-      return this({
+      return {
         ...props,
         arn: attributesResponse.Attributes!.QueueArn!,
         queueName,
         url: createResponse.QueueUrl!,
-      });
+      };
     } catch (error: any) {
       if (isQueueDeletedRecently(error)) {
         logger.log(
@@ -324,12 +324,12 @@ export const Queue = Resource(
               ),
             );
 
-            return this({
+            return {
               ...props,
               arn: attributesResponse.Attributes!.QueueArn!,
               queueName,
               url: createResponse.QueueUrl!,
-            });
+            };
           } catch (retryError: any) {
             if (
               !isQueueDeletedRecently(retryError) ||

package/src/aws/role.ts

@@ -67,7 +67,7 @@ export interface RoleProps {
 /**
  * Output returned after IAM role creation/update
  */
-export interface Role extends Resource<"iam::Role">, RoleProps {
+export interface Role extends RoleProps {
   /**
    * ARN of the role
    */
@@ -535,13 +535,13 @@ export const Role = Resource(
       throw new Error(`Failed to create or update role ${props.roleName}`);
     }
 
-    return this({
+    return {
       ...props,
       arn: role.Role.Arn!,
       uniqueId: role.Role.RoleId!,
       roleId: role.Role.RoleId!,
       roleName,
       createDate: role.Role.CreateDate!,
-    });
+    };
   },
 );

package/src/aws/ses.ts

@@ -74,7 +74,7 @@ export interface SESProps {
 /**
  * Output returned after SES resource creation/update
  */
-export interface SES extends Resource<"aws::SES">, SESProps {
+export interface SES extends SESProps {
   /**
    * ARN of the configuration set if created
    * Format: arn:aws:ses:region:account-id:configuration-set/name
@@ -404,12 +404,12 @@ export const SES = Resource(
     }
 
     // Return the resource output
-    return this({
+    return {
       ...props,
       configurationSetArn,
       emailIdentityArn,
       emailIdentityVerificationStatus,
       dkimVerificationStatus,
-    });
+    };
   },
 );

package/src/aws/ssm-parameter.ts

@@ -89,7 +89,7 @@ export type SSMParameterProps =
 /**
  * Output returned after SSM Parameter creation/update
  */
-export type SSMParameter = Resource<"ssm::Parameter"> & {
+export type SSMParameter = {
   /**
    * ARN of the parameter
    */
@@ -316,7 +316,7 @@ export const SSMParameter = Resource(
         );
       }
 
-      return this({
+      return {
         ...props,
         arn: parameter.Parameter.ARN!,
         version: parameter.Parameter.Version!,
@@ -324,7 +324,7 @@ export const SSMParameter = Resource(
         name: parameter.Parameter.Name ?? parameterName,
         value: props.value,
         type: (parameter.Parameter.Type as any) ?? parameterType,
-      } as SSMParameter);
+      } as SSMParameter;
     } catch (error: any) {
       logger.error(
         `Error creating/updating parameter ${parameterName}:`,

package/src/aws/table.ts

@@ -77,7 +77,7 @@ export interface TableProps {
 /**
  * Output returned after DynamoDB table creation/update
  */
-export interface Table extends Resource<"dynamo::Table">, TableProps {
+export interface Table extends TableProps {
   /**
    * ARN of the table
    * Format: arn:aws:dynamodb:region:account-id:table/table-name
@@ -323,12 +323,12 @@ export const Table = Resource(
       );
     }
 
-    return this({
+    return {
       ...props,
       arn: tableDescription!.TableArn!,
       tableName,
       streamArn: tableDescription!.LatestStreamArn,
       tableId: tableDescription!.TableId!,
-    });
+    };
   },
 );

package/src/cloudflare/account-api-token.ts

@@ -140,8 +140,7 @@ interface CloudflareApiToken {
 /**
  * Output returned after Account API Token creation/update
  */
-export interface AccountApiToken
-  extends Resource<"cloudflare::AccountApiToken"> {
+export interface AccountApiToken {
   /**
    * The ID of the token
    *
@@ -385,7 +384,7 @@ export const AccountApiToken = Resource(
     }
 
     // Transform API response to our format
-    return this({
+    return {
       id: tokenData.id,
       name: tokenData.name,
       status: tokenData.status,
@@ -406,6 +405,6 @@ export const AccountApiToken = Resource(
       value: tokenValue,
       accessKeyId: alchemy.secret(tokenData.id),
       secretAccessKey: alchemy.secret(sha256(tokenValue.unencrypted)),
-    });
+    };
   },
 );

package/src/cloudflare/ai-gateway.ts

@@ -92,9 +92,7 @@ export interface AiGatewayProps extends CloudflareApiOptions {
  * Output returned after Cloudflare AI Gateway creation/update.
  * IMPORTANT: The interface name MUST match the exported resource name.
  */
-export interface AiGateway
-  extends Resource<"cloudflare::AiGateway">,
-    AiGatewayProps {
+export interface AiGateway extends AiGatewayProps {
   /**
    * The ID (name) of the gateway.
    */
@@ -248,7 +246,7 @@ export const AiGateway = Resource(
     }
 
     // Construct the output object from API response and merged props
-    return this({
+    return {
       ...mergedProps, // Start with the input props (including defaults)
       id: apiResource.id,
       gatewayName,
@@ -270,7 +268,7 @@ export const AiGateway = Resource(
       logpush: apiResource.logpush,
       logpushPublicKey: apiResource.logpush_public_key,
       type: "ai_gateway",
-    });
+    };
   },
 );
 

package/src/cloudflare/api-gateway-operation.ts

@@ -56,8 +56,7 @@ export interface APIGatewayOperationProps extends CloudflareApiOptions {
 /**
  * API Operation output
  */
-export interface APIGatewayOperation
-  extends Resource<"cloudflare::APIGatewayOperation"> {
+export interface APIGatewayOperation {
   /**
    * Zone ID
    */
@@ -202,7 +201,7 @@ export const APIGatewayOperation = Resource(
       }
     }
 
-    return this({
+    return {
       zoneId,
       zoneName,
       operationId,
@@ -210,7 +209,7 @@ export const APIGatewayOperation = Resource(
       host: props.host,
       method: props.method.toUpperCase(),
       action: props.mitigation ?? null,
-    });
+    };
   },
 );