alchemy-effect 0.2.0 → 0.3.0

package/lib/aws/dynamodb/table.provider.js

@@ -1,22 +1,15 @@
-import * as Data from "effect/Data";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Schedule from "effect/Schedule";
-import { App } from "alchemy-effect";
+import { App } from "../../app.js";
 import { createTagger, hasTags } from "../../tags.js";
-import { Account } from "../account.js";
-import { Region } from "../region.js";
 import { isScalarAttributeType, toAttributeType } from "./attribute-value.js";
 import { DynamoDBClient } from "./client.js";
 import { Table, } from "./table.js";
 // we add an explict type to simplify the Layer type errors because the Table interface has a lot of type args
-export const tableProvider = () => Table.provider.effect(
-// @ts-expect-error
-Effect.gen(function* () {
+export const tableProvider = () => Table.provider.effect(Effect.gen(function* () {
     const dynamodb = yield* DynamoDBClient;
     const app = yield* App;
-    const region = yield* Region;
-    const accountId = yield* Account;
     const createTableName = (id, props) => props.tableName ?? `${app.name}-${id}-${app.stage}`;
     const tagged = yield* createTagger();
     const toKeySchema = (props) => [
@@ -33,7 +26,7 @@ Effect.gen(function* () {
             ]
             : []),
     ];
-    const toAttributeDefinitions = (props) => Object.entries(props.attributes)
+    const toAttributeDefinitions = (attributes) => Object.entries(attributes)
         .flatMap(([name, schema]) => {
         const type = toAttributeType(schema);
         if (isScalarAttributeType(type)) {
@@ -50,12 +43,13 @@ Effect.gen(function* () {
         }
     })
         .sort((a, b) => a.AttributeName.localeCompare(b.AttributeName));
-    const toAttributeDefinitionsMap = (props) => Object.fromEntries(toAttributeDefinitions(props).map((def) => [def.AttributeName, def.AttributeType]));
+    const toAttributeDefinitionsMap = (attributes) => Object.fromEntries(toAttributeDefinitions(attributes).map((def) => [def.AttributeName, def.AttributeType]));
     const resolveTableIfOwned = (id, tableName) => 
     // if it already exists, let's see if it contains tags indicating we (this app+stage) owns it
     // that would indicate we are in a partial state and can safely take control
     dynamodb.describeTable({ TableName: tableName }).pipe(Effect.flatMap((r) => dynamodb
         .listTagsOfResource({
+        // oxlint-disable-next-line no-non-null-asserted-optional-chain
         ResourceArn: r.Table?.TableArn,
     })
         .pipe(Effect.map((tags) => [r, tags.Tags]), Effect.flatMap(([r, tags]) => {
@@ -74,29 +68,25 @@ Effect.gen(function* () {
         schedule: Schedule.exponential(100),
     }));
     return {
-        diff: Effect.fn(function* ({ id, news, olds }) {
-            const oldTableName = createTableName(id, olds);
-            const newTableName = createTableName(id, news);
-            if (oldTableName !== newTableName) {
-                // TODO(sam): if the name is hard-coded, REPLACE is impossible - we need a suffix
-                return { action: "replace" };
-            }
-            if (olds.partitionKey !== news.partitionKey ||
+        diff: Effect.fn(function* ({ news, olds }) {
+            if (
+            // TODO(sam): if the name is hard-coded, REPLACE is impossible - we need a suffix
+            news.tableName !== olds.tableName ||
+                olds.partitionKey !== news.partitionKey ||
                 olds.sortKey !== news.sortKey) {
                 return { action: "replace" };
             }
-            const oldAttributeDefinitions = toAttributeDefinitionsMap(olds);
-            const newAttributeDefinitions = toAttributeDefinitionsMap(news);
-            for (const [name, type] of Object.entries(oldAttributeDefinitions)) {
+            const oldAttrs = toAttributeDefinitionsMap(olds.attributes);
+            const newAttrs = toAttributeDefinitionsMap(news.attributes);
+            for (const [name, type] of Object.entries(oldAttrs)) {
                 // CloudFormation requires that editing an existing AttributeDefinition is a replace
-                if (newAttributeDefinitions[name] !== type) {
+                if (newAttrs[name] !== type) {
                     return { action: "replace" };
                 }
             }
             // TODO(sam):
             // Replacements:
             // 1. if you change ImportSourceSpecification
-            return { action: "noop" };
         }),
         create: Effect.fn(function* ({ id, news, session }) {
             const tableName = createTableName(id, news);
@@ -105,7 +95,7 @@ Effect.gen(function* () {
                 TableName: tableName,
                 TableClass: news.tableClass,
                 KeySchema: toKeySchema(news),
-                AttributeDefinitions: toAttributeDefinitions(news),
+                AttributeDefinitions: toAttributeDefinitions(news.attributes),
                 BillingMode: news.billingMode ?? "PAY_PER_REQUEST",
                 SSESpecification: news.sseSpecification,
                 WarmThroughput: news.warmThroughput,
@@ -143,7 +133,7 @@ Effect.gen(function* () {
             yield* dynamodb.updateTable({
                 TableName: output.tableName,
                 TableClass: news.tableClass,
-                AttributeDefinitions: toAttributeDefinitions(news),
+                AttributeDefinitions: toAttributeDefinitions(news.attributes),
                 BillingMode: news.billingMode ?? "PAY_PER_REQUEST",
                 SSESpecification: news.sseSpecification,
                 WarmThroughput: news.warmThroughput,
@@ -179,10 +169,8 @@ Effect.gen(function* () {
                 while: (e) => e._tag === "ResourceInUseException" ||
                     e._tag === "InternalServerError" ||
                     e._tag === "TimeoutException",
-                schedule: Schedule.fixed(100),
+                schedule: Schedule.exponential(100),
             }));
-            class TableStillExists extends Data.TaggedError("TableStillExists") {
-            }
             while (true) {
                 const table = yield* dynamodb
                     .describeTable({

package/lib/aws/dynamodb/table.provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"table.provider.js","sourceRoot":"","sources":["../../../src/aws/dynamodb/table.provider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"table.provider.js","sourceRoot":"","sources":["../../../src/aws/dynamodb/table.provider.ts"],"names":[],"mappings":"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"}

package/lib/aws/ec2/client.d.ts

@@ -7,6 +7,6 @@ declare const EC2Client_base: Context.TagClass<EC2Client, "AWS.EC2.Client", EC2>
 export declare class EC2Client extends EC2Client_base {
 }
 export declare const client: () => Layer.Layer<EC2Client, never, Credentials.Credentials | Region.Region>;
-export declare const clientFromEnv: () => Layer.Layer<EC2Client, Region.EnvironmentVariableNotSet, never>;
+export declare const clientFromEnv: () => Layer.Layer<EC2Client, Region.EnvironmentVariableNotSet | import("effect/ConfigError").ConfigError, never>;
 export {};
 //# sourceMappingURL=client.d.ts.map

package/lib/aws/ec2/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/aws/ec2/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAEtC,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAEnC,OAAO,KAAK,WAAW,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,MAAM,MAAM,cAAc,CAAC;;AAEvC,qBAAa,SAAU,SAAQ,cAG5B;CAAG;AAEN,eAAO,MAAM,MAAM,8EAGlB,CAAC;AAEF,eAAO,MAAM,aAAa,uEACqD,CAAC"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/aws/ec2/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAEtC,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAEnC,OAAO,KAAK,WAAW,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,MAAM,MAAM,cAAc,CAAC;;AAEvC,qBAAa,SAAU,SAAQ,cAG5B;CAAG;AAEN,eAAO,MAAM,MAAM,8EAGlB,CAAC;AAEF,eAAO,MAAM,aAAa,kHACqD,CAAC"}

package/lib/aws/ec2/index.d.ts

@@ -1,4 +1,7 @@
 export * from "./client.ts";
+export * from "./subnet.provider.ts";
+export * from "./subnet.ts";
 export * from "./vpc.provider.ts";
 export * from "./vpc.ts";
+import "../config.ts";
 //# sourceMappingURL=index.d.ts.map

package/lib/aws/ec2/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/aws/ec2/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/aws/ec2/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC;AACrC,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,UAAU,CAAC;AAEzB,OAAO,cAAc,CAAC"}

package/lib/aws/ec2/index.js

@@ -1,4 +1,7 @@
 export * from "./client.js";
+export * from "./subnet.provider.js";
+export * from "./subnet.js";
 export * from "./vpc.provider.js";
 export * from "./vpc.js";
+import "../config.js";
 //# sourceMappingURL=index.js.map

package/lib/aws/ec2/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/aws/ec2/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,UAAU,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/aws/ec2/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC;AACrC,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,UAAU,CAAC;AAEzB,OAAO,cAAc,CAAC"}

package/lib/aws/ec2/subnet.d.ts

@@ -0,0 +1,175 @@
+import type * as EC2 from "itty-aws/ec2";
+import type { Input } from "../../input.ts";
+import { Resource } from "../../resource.ts";
+import type { AccountID } from "../account.ts";
+import type { RegionID } from "../region.ts";
+import type { VpcId } from "./vpc.ts";
+export declare const Subnet: (<const ID extends string, const Props extends SubnetProps>(id: ID, props: Props) => Subnet<ID, Props>) & {
+    new (): Subnet<string, SubnetProps> & {
+        parent: Subnet<string, SubnetProps>;
+    };
+    type: "AWS.EC2.Subnet";
+    parent: Subnet<string, SubnetProps>;
+    provider: import("../../resource.ts").ResourceTags<Subnet<string, SubnetProps>>;
+} & {
+    type: "AWS.EC2.Subnet";
+    provider: import("../../resource.ts").ResourceTags<Subnet<string, SubnetProps>>;
+};
+export interface Subnet<ID extends string = string, Props extends SubnetProps = SubnetProps> extends Resource<"AWS.EC2.Subnet", ID, Props, SubnetAttrs<Input.Resolve<Props>>, Subnet> {
+}
+export interface SubnetProps {
+    /**
+     * The VPC to create the subnet in.
+     */
+    vpcId: Input<VpcId>;
+    /**
+     * The IPv4 network range for the subnet, in CIDR notation.
+     * Required unless using IPAM.
+     * @example "10.0.1.0/24"
+     */
+    cidrBlock?: string;
+    /**
+     * The IPv6 network range for the subnet, in CIDR notation.
+     */
+    ipv6CidrBlock?: string;
+    /**
+     * The Availability Zone for the subnet.
+     * @example "us-east-1a"
+     */
+    availabilityZone?: string;
+    /**
+     * The ID of the Availability Zone for the subnet.
+     */
+    availabilityZoneId?: string;
+    /**
+     * The ID of an IPv4 IPAM pool you want to use for allocating this subnet's CIDR.
+     */
+    ipv4IpamPoolId?: string;
+    /**
+     * The netmask length of the IPv4 CIDR you want to allocate to this subnet from an IPAM pool.
+     */
+    ipv4NetmaskLength?: number;
+    /**
+     * The ID of an IPv6 IPAM pool which will be used to allocate this subnet an IPv6 CIDR.
+     */
+    ipv6IpamPoolId?: Input<string>;
+    /**
+     * The netmask length of the IPv6 CIDR you want to allocate to this subnet from an IPAM pool.
+     */
+    ipv6NetmaskLength?: number;
+    /**
+     * Whether instances launched in the subnet get public IPv4 addresses.
+     * @default false
+     */
+    mapPublicIpOnLaunch?: boolean;
+    /**
+     * Whether instances launched in the subnet get IPv6 addresses.
+     * @default false
+     */
+    assignIpv6AddressOnCreation?: boolean;
+    /**
+     * Whether DNS queries made to the Amazon-provided DNS Resolver in this subnet should return
+     * synthetic IPv6 addresses for IPv4-only destinations.
+     * @default false
+     */
+    enableDns64?: boolean;
+    /**
+     * Whether to enable resource name DNS A record on launch.
+     * @default false
+     */
+    enableResourceNameDnsARecordOnLaunch?: boolean;
+    /**
+     * Whether to enable resource name DNS AAAA record on launch.
+     * @default false
+     */
+    enableResourceNameDnsAAAARecordOnLaunch?: boolean;
+    /**
+     * The hostname type for EC2 instances launched into this subnet.
+     */
+    hostnameType?: EC2.HostnameType;
+    /**
+     * Tags to assign to the subnet.
+     * These will be merged with alchemy auto-tags (alchemy::app, alchemy::stage, alchemy::id).
+     */
+    tags?: Record<string, Input<string>>;
+}
+export type SubnetId<ID extends string = string> = `subnet-${ID}`;
+export declare const SubnetId: <ID extends string>(id: ID) => ID & SubnetId<ID>;
+export interface SubnetAttrs<Props extends SubnetProps> {
+    /**
+     * The ID of the VPC the subnet is in.
+     */
+    vpcId: Props["vpcId"];
+    /**
+     * The ID of the subnet.
+     */
+    subnetId: SubnetId;
+    /**
+     * The Amazon Resource Name (ARN) of the subnet.
+     */
+    subnetArn: `arn:aws:ec2:${RegionID}:${AccountID}:subnet/${this["subnetId"]}`;
+    /**
+     * The IPv4 CIDR block for the subnet.
+     */
+    cidrBlock: string;
+    /**
+     * The Availability Zone of the subnet.
+     */
+    availabilityZone: string;
+    /**
+     * The ID of the Availability Zone of the subnet.
+     */
+    availabilityZoneId?: string;
+    /**
+     * The current state of the subnet.
+     */
+    state: EC2.SubnetState;
+    /**
+     * The number of available IPv4 addresses in the subnet.
+     */
+    availableIpAddressCount: number;
+    /**
+     * Whether instances launched in the subnet get public IPv4 addresses.
+     */
+    mapPublicIpOnLaunch: boolean;
+    /**
+     * Whether instances launched in the subnet get IPv6 addresses.
+     */
+    assignIpv6AddressOnCreation: Props["assignIpv6AddressOnCreation"];
+    /**
+     * Whether the subnet is the default subnet for the Availability Zone.
+     */
+    defaultForAz: boolean;
+    /**
+     * The ID of the AWS account that owns the subnet.
+     */
+    ownerId?: string;
+    /**
+     * Information about the IPv6 CIDR blocks associated with the subnet.
+     */
+    ipv6CidrBlockAssociationSet?: Array<{
+        associationId: string;
+        ipv6CidrBlock: string;
+        ipv6CidrBlockState: {
+            state: EC2.SubnetCidrBlockStateCode;
+            statusMessage?: string;
+        };
+    }>;
+    /**
+     * Whether DNS64 is enabled for the subnet.
+     */
+    enableDns64?: boolean;
+    /**
+     * Whether this is an IPv6-only subnet.
+     */
+    ipv6Native?: boolean;
+    /**
+     * The private DNS name options on launch.
+     */
+    privateDnsNameOptionsOnLaunch?: {
+        hostnameType?: EC2.HostnameType;
+        enableResourceNameDnsARecord?: boolean;
+        enableResourceNameDnsAAAARecord?: boolean;
+    };
+}
+//# sourceMappingURL=subnet.d.ts.map

package/lib/aws/ec2/subnet.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"subnet.d.ts","sourceRoot":"","sources":["../../../src/aws/ec2/subnet.ts"],"names":[],"mappings":"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"}

package/lib/aws/ec2/subnet.js

@@ -0,0 +1,4 @@
+import { Resource } from "../../resource.js";
+export const Subnet = Resource("AWS.EC2.Subnet");
+export const SubnetId = (id) => `subnet-${id}`;
+//# sourceMappingURL=subnet.js.map

package/lib/aws/ec2/subnet.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"subnet.js","sourceRoot":"","sources":["../../../src/aws/ec2/subnet.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAK7C,MAAM,CAAC,MAAM,MAAM,GAAG,QAAQ,CAK3B,gBAAgB,CAAC,CAAC;AA0GrB,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAoB,EAAM,EAAqB,EAAE,CACvE,UAAU,EAAE,EAAuB,CAAC"}

package/lib/aws/ec2/subnet.provider.d.ts

@@ -0,0 +1,4 @@
+import { EC2Client } from "./client.ts";
+import { Subnet, type SubnetProps } from "./subnet.ts";
+export declare const subnetProvider: () => import("effect/Layer").Layer<import("../../provider.ts").Provider<Subnet<string, SubnetProps>>, never, import("../../app.ts").App | EC2Client>;
+//# sourceMappingURL=subnet.provider.d.ts.map

package/lib/aws/ec2/subnet.provider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"subnet.provider.d.ts","sourceRoot":"","sources":["../../../src/aws/ec2/subnet.provider.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EACL,MAAM,EAEN,KAAK,WAAW,EAEjB,MAAM,aAAa,CAAC;AAErB,eAAO,MAAM,cAAc,sJAkQxB,CAAC"}

package/lib/aws/ec2/subnet.provider.js

@@ -0,0 +1,250 @@
+import * as Effect from "effect/Effect";
+import * as Schedule from "effect/Schedule";
+import { somePropsAreDifferent } from "../../diff.js";
+import { createTagger, createTagsList } from "../../tags.js";
+import { EC2Client } from "./client.js";
+import { Subnet, } from "./subnet.js";
+export const subnetProvider = () => Subnet.provider.effect(Effect.gen(function* () {
+    const ec2 = yield* EC2Client;
+    const tagged = yield* createTagger();
+    return {
+        diff: Effect.fn(function* ({ news, olds }) {
+            if (somePropsAreDifferent(olds, news, [
+                "vpcId",
+                "cidrBlock",
+                "availabilityZone",
+                "availabilityZoneId",
+                "ipv6CidrBlock",
+                "ipv4IpamPoolId",
+                "ipv6IpamPoolId",
+            ])) {
+                return { action: "replace" };
+            }
+        }),
+        create: Effect.fn(function* ({ id, news, session }) {
+            // 1. Get VPC ID from the VPC resource
+            // TODO(sam): i need to make it possible to pass Resources as input Props to Resources
+            const vpcId = news.vpcId;
+            // 2. Prepare tags
+            const alchemyTags = tagged(id);
+            const userTags = news.tags ?? {};
+            const allTags = { ...alchemyTags, ...userTags };
+            // 3. Call CreateSubnet
+            const createResult = yield* ec2
+                .createSubnet({
+                VpcId: vpcId,
+                CidrBlock: news.cidrBlock,
+                Ipv6CidrBlock: news.ipv6CidrBlock,
+                AvailabilityZone: news.availabilityZone,
+                AvailabilityZoneId: news.availabilityZoneId,
+                Ipv4IpamPoolId: news.ipv4IpamPoolId,
+                Ipv4NetmaskLength: news.ipv4NetmaskLength,
+                Ipv6IpamPoolId: news.ipv6IpamPoolId,
+                Ipv6NetmaskLength: news.ipv6NetmaskLength,
+                Ipv6Native: false, // Explicitly set to false for now
+                TagSpecifications: [
+                    {
+                        ResourceType: "subnet",
+                        Tags: createTagsList(allTags),
+                    },
+                ],
+                DryRun: false,
+            })
+                .pipe(Effect.retry({
+                // @ts-expect-error - this is unknown to itty-aws
+                while: (e) => e._tag === "InvalidVpcID.NotFound",
+                schedule: Schedule.exponential(100),
+            }));
+            const subnetId = createResult.Subnet.SubnetId;
+            yield* session.note(`Subnet created: ${subnetId}`);
+            // 4. Modify subnet attributes if specified
+            if (news.mapPublicIpOnLaunch !== undefined) {
+                yield* ec2.modifySubnetAttribute({
+                    SubnetId: subnetId,
+                    MapPublicIpOnLaunch: { Value: news.mapPublicIpOnLaunch },
+                });
+            }
+            if (news.assignIpv6AddressOnCreation !== undefined) {
+                yield* ec2.modifySubnetAttribute({
+                    SubnetId: subnetId,
+                    AssignIpv6AddressOnCreation: {
+                        Value: news.assignIpv6AddressOnCreation,
+                    },
+                });
+            }
+            if (news.enableDns64 !== undefined) {
+                yield* ec2.modifySubnetAttribute({
+                    SubnetId: subnetId,
+                    EnableDns64: { Value: news.enableDns64 },
+                });
+            }
+            if (news.enableResourceNameDnsARecordOnLaunch !== undefined ||
+                news.enableResourceNameDnsAAAARecordOnLaunch !== undefined ||
+                news.hostnameType !== undefined) {
+                yield* ec2.modifySubnetAttribute({
+                    SubnetId: subnetId,
+                    PrivateDnsHostnameTypeOnLaunch: news.hostnameType,
+                    EnableResourceNameDnsARecordOnLaunch: news.enableResourceNameDnsARecordOnLaunch !== undefined
+                        ? { Value: news.enableResourceNameDnsARecordOnLaunch }
+                        : undefined,
+                    EnableResourceNameDnsAAAARecordOnLaunch: news.enableResourceNameDnsAAAARecordOnLaunch !== undefined
+                        ? { Value: news.enableResourceNameDnsAAAARecordOnLaunch }
+                        : undefined,
+                });
+            }
+            // 5. Wait for subnet to be available
+            const subnet = yield* waitForSubnetAvailable(ec2, subnetId, session);
+            // 6. Return attributes
+            return {
+                subnetId,
+                subnetArn: subnet.SubnetArn,
+                cidrBlock: subnet.CidrBlock,
+                vpcId: news.vpcId,
+                availabilityZone: subnet.AvailabilityZone,
+                availabilityZoneId: subnet.AvailabilityZoneId,
+                state: subnet.State,
+                availableIpAddressCount: subnet.AvailableIpAddressCount ?? 0,
+                mapPublicIpOnLaunch: subnet.MapPublicIpOnLaunch ?? false,
+                assignIpv6AddressOnCreation: subnet.AssignIpv6AddressOnCreation ?? false,
+                defaultForAz: subnet.DefaultForAz ?? false,
+                ownerId: subnet.OwnerId,
+                ipv6CidrBlockAssociationSet: subnet.Ipv6CidrBlockAssociationSet?.map((assoc) => ({
+                    associationId: assoc.AssociationId,
+                    ipv6CidrBlock: assoc.Ipv6CidrBlock,
+                    ipv6CidrBlockState: {
+                        state: assoc.Ipv6CidrBlockState.State,
+                        statusMessage: assoc.Ipv6CidrBlockState.StatusMessage,
+                    },
+                })),
+                enableDns64: subnet.EnableDns64,
+                ipv6Native: subnet.Ipv6Native,
+                privateDnsNameOptionsOnLaunch: subnet.PrivateDnsNameOptionsOnLaunch
+                    ? {
+                        hostnameType: subnet.PrivateDnsNameOptionsOnLaunch.HostnameType,
+                        enableResourceNameDnsARecord: subnet.PrivateDnsNameOptionsOnLaunch
+                            .EnableResourceNameDnsARecord,
+                        enableResourceNameDnsAAAARecord: subnet.PrivateDnsNameOptionsOnLaunch
+                            .EnableResourceNameDnsAAAARecord,
+                    }
+                    : undefined,
+            };
+        }),
+        update: Effect.fn(function* ({ news, olds, output, session }) {
+            const subnetId = output.subnetId;
+            // Update MapPublicIpOnLaunch if changed
+            if (news.mapPublicIpOnLaunch !== olds.mapPublicIpOnLaunch) {
+                yield* ec2.modifySubnetAttribute({
+                    SubnetId: subnetId,
+                    MapPublicIpOnLaunch: { Value: news.mapPublicIpOnLaunch ?? false },
+                });
+                yield* session.note("Updated map public IP on launch");
+            }
+            // Update AssignIpv6AddressOnCreation if changed
+            if (news.assignIpv6AddressOnCreation !==
+                olds.assignIpv6AddressOnCreation) {
+                yield* ec2.modifySubnetAttribute({
+                    SubnetId: subnetId,
+                    AssignIpv6AddressOnCreation: {
+                        Value: news.assignIpv6AddressOnCreation ?? false,
+                    },
+                });
+                yield* session.note("Updated assign IPv6 address on creation");
+            }
+            // Update EnableDns64 if changed
+            if (news.enableDns64 !== olds.enableDns64) {
+                yield* ec2.modifySubnetAttribute({
+                    SubnetId: subnetId,
+                    EnableDns64: { Value: news.enableDns64 ?? false },
+                });
+                yield* session.note("Updated DNS64 setting");
+            }
+            // Update private DNS hostname settings if changed
+            if (news.enableResourceNameDnsARecordOnLaunch !==
+                olds.enableResourceNameDnsARecordOnLaunch ||
+                news.enableResourceNameDnsAAAARecordOnLaunch !==
+                    olds.enableResourceNameDnsAAAARecordOnLaunch ||
+                news.hostnameType !== olds.hostnameType) {
+                yield* ec2.modifySubnetAttribute({
+                    SubnetId: subnetId,
+                    PrivateDnsHostnameTypeOnLaunch: news.hostnameType,
+                    EnableResourceNameDnsARecordOnLaunch: news.enableResourceNameDnsARecordOnLaunch !== undefined
+                        ? { Value: news.enableResourceNameDnsARecordOnLaunch }
+                        : undefined,
+                    EnableResourceNameDnsAAAARecordOnLaunch: news.enableResourceNameDnsAAAARecordOnLaunch !== undefined
+                        ? { Value: news.enableResourceNameDnsAAAARecordOnLaunch }
+                        : undefined,
+                });
+                yield* session.note("Updated private DNS hostname settings");
+            }
+            // Note: Tag updates would go here if we support user tag changes
+            return output; // Subnet attributes don't change from these updates
+        }),
+        delete: Effect.fn(function* ({ output, session }) {
+            const subnetId = output.subnetId;
+            yield* session.note(`Deleting subnet: ${subnetId}`);
+            // 1. Attempt to delete subnet
+            yield* ec2
+                .deleteSubnet({
+                SubnetId: subnetId,
+                DryRun: false,
+            })
+                .pipe(Effect.tapError(Effect.logDebug), Effect.catchTag("InvalidSubnetID.NotFound", () => Effect.void), 
+            // Retry on dependency violations (resources still being deleted)
+            Effect.retry({
+                while: (e) => {
+                    // DependencyViolation means there are still dependent resources
+                    // This can happen if ENIs/instances are being deleted concurrently
+                    return (e._tag === "ValidationError" &&
+                        e.message?.includes("DependencyViolation"));
+                },
+                schedule: Schedule.exponential(1000, 1.5).pipe(Schedule.intersect(Schedule.recurs(10)), // Try up to 10 times
+                Schedule.tapOutput(([, attempt]) => session.note(`Waiting for dependencies to clear... (attempt ${attempt + 1})`))),
+            }));
+            // 2. Wait for subnet to be fully deleted
+            yield* waitForSubnetDeleted(ec2, subnetId, session);
+            yield* session.note(`Subnet ${subnetId} deleted successfully`);
+        }),
+    };
+}));
+/**
+ * Wait for subnet to be in available state
+ */
+const waitForSubnetAvailable = (ec2, subnetId, session) => Effect.retry(Effect.gen(function* () {
+    const result = yield* ec2
+        .describeSubnets({ SubnetIds: [subnetId] })
+        .pipe(Effect.catchTag("InvalidSubnetID.NotFound", () => Effect.succeed({ Subnets: [] })));
+    const subnet = result.Subnets[0];
+    if (subnet.State === "available") {
+        return subnet;
+    }
+    // Still pending, fail to trigger retry
+    return yield* Effect.fail(new Error("Subnet not yet available"));
+}), {
+    schedule: Schedule.fixed(2000).pipe(
+    // Check every 2 seconds
+    Schedule.intersect(Schedule.recurs(30)), // Max 60 seconds
+    Schedule.tapOutput(([, attempt]) => session
+        ? session.note(`Waiting for subnet to be available... (${(attempt + 1) * 2}s)`)
+        : Effect.void)),
+});
+/**
+ * Wait for subnet to be deleted
+ */
+const waitForSubnetDeleted = (ec2, subnetId, session) => Effect.gen(function* () {
+    yield* Effect.retry(Effect.gen(function* () {
+        const result = yield* ec2
+            .describeSubnets({ SubnetIds: [subnetId] })
+            .pipe(Effect.tapError(Effect.logDebug), Effect.catchTag("InvalidSubnetID.NotFound", () => Effect.succeed({ Subnets: [] })));
+        if (!result.Subnets || result.Subnets.length === 0) {
+            return; // Successfully deleted
+        }
+        // Still exists, fail to trigger retry
+        return yield* Effect.fail(new Error("Subnet still exists"));
+    }), {
+        schedule: Schedule.fixed(2000).pipe(
+        // Check every 2 seconds
+        Schedule.intersect(Schedule.recurs(15)), // Max 30 seconds
+        Schedule.tapOutput(([, attempt]) => session.note(`Waiting for subnet deletion... (${(attempt + 1) * 2}s)`))),
+    });
+});
+//# sourceMappingURL=subnet.provider.js.map