alchemy-effect 0.2.0 → 0.4.0

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,EAGN,KAAK,WAAW,EACjB,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 {
+        stables: ["subnetId", "subnetArn", "ownerId", "vpcId"],
+        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({
+                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

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

@@ -0,0 +1 @@
+{"version":3,"file":"subnet.provider.js","sourceRoot":"","sources":["../../../src/aws/ec2/subnet.provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAC;AAK5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAEtD,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EACL,MAAM,GAIP,MAAM,aAAa,CAAC;AAErB,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,EAAE,CACjC,MAAM,CAAC,QAAQ,CAAC,MAAM,CACpB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,SAAS,CAAC;IAC7B,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,YAAY,EAAE,CAAC;IAErC,OAAO;QACL,OAAO,EAAE,CAAC,UAAU,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,CAAC;QACtD,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;YACvC,IACE,qBAAqB,CAAC,IAAI,EAAE,IAAI,EAAE;gBAChC,OAAO;gBACP,WAAW;gBACX,kBAAkB;gBAClB,oBAAoB;gBACpB,eAAe;gBACf,gBAAgB;gBAChB,gBAAgB;aACjB,CAAC,EACF,CAAC;gBACD,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;YAC/B,CAAC;QACH,CAAC,CAAC;QAEF,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE;YAChD,sCAAsC;YACtC,sFAAsF;YACtF,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;YAEzB,kBAAkB;YAClB,MAAM,WAAW,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC;YAC/B,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;YACjC,MAAM,OAAO,GAAG,EAAE,GAAG,WAAW,EAAE,GAAG,QAAQ,EAAE,CAAC;YAEhD,uBAAuB;YACvB,MAAM,YAAY,GAAG,KAAK,CAAC,CAAC,GAAG;iBAC5B,YAAY,CAAC;gBACZ,KAAK,EAAE,KAAK;gBACZ,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,aAAa,EAAE,IAAI,CAAC,aAAa;gBACjC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;gBACvC,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;gBAC3C,cAAc,EAAE,IAAI,CAAC,cAAc;gBACnC,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;gBACzC,cAAc,EAAE,IAAI,CAAC,cAAc;gBACnC,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;gBACzC,UAAU,EAAE,KAAK,EAAE,kCAAkC;gBACrD,iBAAiB,EAAE;oBACjB;wBACE,YAAY,EAAE,QAAQ;wBACtB,IAAI,EAAE,cAAc,CAAC,OAAO,CAAC;qBAC9B;iBACF;gBACD,MAAM,EAAE,KAAK;aACd,CAAC;iBACD,IAAI,CACH,MAAM,CAAC,KAAK,CAAC;gBACX,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,uBAAuB;gBAChD,QAAQ,EAAE,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC;aACpC,CAAC,CACH,CAAC;YAEJ,MAAM,QAAQ,GAAG,YAAY,CAAC,MAAO,CAAC,QAAqB,CAAC;YAC5D,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,mBAAmB,QAAQ,EAAE,CAAC,CAAC;YAEnD,2CAA2C;YAC3C,IAAI,IAAI,CAAC,mBAAmB,KAAK,SAAS,EAAE,CAAC;gBAC3C,KAAK,CAAC,CAAC,GAAG,CAAC,qBAAqB,CAAC;oBAC/B,QAAQ,EAAE,QAAQ;oBAClB,mBAAmB,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,mBAAmB,EAAE;iBACzD,CAAC,CAAC;YACL,CAAC;YAED,IAAI,IAAI,CAAC,2BAA2B,KAAK,SAAS,EAAE,CAAC;gBACnD,KAAK,CAAC,CAAC,GAAG,CAAC,qBAAqB,CAAC;oBAC/B,QAAQ,EAAE,QAAQ;oBAClB,2BAA2B,EAAE;wBAC3B,KAAK,EAAE,IAAI,CAAC,2BAA2B;qBACxC;iBACF,CAAC,CAAC;YACL,CAAC;YAED,IAAI,IAAI,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;gBACnC,KAAK,CAAC,CAAC,GAAG,CAAC,qBAAqB,CAAC;oBAC/B,QAAQ,EAAE,QAAQ;oBAClB,WAAW,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE;iBACzC,CAAC,CAAC;YACL,CAAC;YAED,IACE,IAAI,CAAC,oCAAoC,KAAK,SAAS;gBACvD,IAAI,CAAC,uCAAuC,KAAK,SAAS;gBAC1D,IAAI,CAAC,YAAY,KAAK,SAAS,EAC/B,CAAC;gBACD,KAAK,CAAC,CAAC,GAAG,CAAC,qBAAqB,CAAC;oBAC/B,QAAQ,EAAE,QAAQ;oBAClB,8BAA8B,EAAE,IAAI,CAAC,YAAY;oBACjD,oCAAoC,EAClC,IAAI,CAAC,oCAAoC,KAAK,SAAS;wBACrD,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,oCAAoC,EAAE;wBACtD,CAAC,CAAC,SAAS;oBACf,uCAAuC,EACrC,IAAI,CAAC,uCAAuC,KAAK,SAAS;wBACxD,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,uCAAuC,EAAE;wBACzD,CAAC,CAAC,SAAS;iBAChB,CAAC,CAAC;YACL,CAAC;YAED,qCAAqC;YACrC,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,sBAAsB,CAAC,GAAG,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;YAErE,uBAAuB;YACvB,OAAO;gBACL,QAAQ;gBACR,SAAS,EACP,MAAM,CAAC,SAAmD;gBAC5D,SAAS,EAAE,MAAM,CAAC,SAAU;gBAC5B,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,gBAAgB,EAAE,MAAM,CAAC,gBAAiB;gBAC1C,kBAAkB,EAAE,MAAM,CAAC,kBAAkB;gBAC7C,KAAK,EAAE,MAAM,CAAC,KAAM;gBACpB,uBAAuB,EAAE,MAAM,CAAC,uBAAuB,IAAI,CAAC;gBAC5D,mBAAmB,EAAE,MAAM,CAAC,mBAAmB,IAAI,KAAK;gBACxD,2BAA2B,EACzB,MAAM,CAAC,2BAA2B,IAAI,KAAK;gBAC7C,YAAY,EAAE,MAAM,CAAC,YAAY,IAAI,KAAK;gBAC1C,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,2BAA2B,EACzB,MAAM,CAAC,2BAA2B,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;oBAClD,aAAa,EAAE,KAAK,CAAC,aAAc;oBACnC,aAAa,EAAE,KAAK,CAAC,aAAc;oBACnC,kBAAkB,EAAE;wBAClB,KAAK,EAAE,KAAK,CAAC,kBAAmB,CAAC,KAAM;wBACvC,aAAa,EAAE,KAAK,CAAC,kBAAmB,CAAC,aAAa;qBACvD;iBACF,CAAC,CAAC;gBACL,WAAW,EAAE,MAAM,CAAC,WAAW;gBAC/B,UAAU,EAAE,MAAM,CAAC,UAAU;gBAC7B,6BAA6B,EAAE,MAAM,CAAC,6BAA6B;oBACjE,CAAC,CAAC;wBACE,YAAY,EACV,MAAM,CAAC,6BAA6B,CAAC,YAAY;wBACnD,4BAA4B,EAC1B,MAAM,CAAC,6BAA6B;6BACjC,4BAA4B;wBACjC,+BAA+B,EAC7B,MAAM,CAAC,6BAA6B;6BACjC,+BAA+B;qBACrC;oBACH,CAAC,CAAC,SAAS;aACqB,CAAC;QACvC,CAAC,CAAC;QAEF,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE;YAC1D,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;YAEjC,wCAAwC;YACxC,IAAI,IAAI,CAAC,mBAAmB,KAAK,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBAC1D,KAAK,CAAC,CAAC,GAAG,CAAC,qBAAqB,CAAC;oBAC/B,QAAQ,EAAE,QAAQ;oBAClB,mBAAmB,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,mBAAmB,IAAI,KAAK,EAAE;iBAClE,CAAC,CAAC;gBACH,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;YACzD,CAAC;YAED,gDAAgD;YAChD,IACE,IAAI,CAAC,2BAA2B;gBAChC,IAAI,CAAC,2BAA2B,EAChC,CAAC;gBACD,KAAK,CAAC,CAAC,GAAG,CAAC,qBAAqB,CAAC;oBAC/B,QAAQ,EAAE,QAAQ;oBAClB,2BAA2B,EAAE;wBAC3B,KAAK,EAAE,IAAI,CAAC,2BAA2B,IAAI,KAAK;qBACjD;iBACF,CAAC,CAAC;gBACH,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC;YACjE,CAAC;YAED,gCAAgC;YAChC,IAAI,IAAI,CAAC,WAAW,KAAK,IAAI,CAAC,WAAW,EAAE,CAAC;gBAC1C,KAAK,CAAC,CAAC,GAAG,CAAC,qBAAqB,CAAC;oBAC/B,QAAQ,EAAE,QAAQ;oBAClB,WAAW,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,WAAW,IAAI,KAAK,EAAE;iBAClD,CAAC,CAAC;gBACH,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;YAC/C,CAAC;YAED,kDAAkD;YAClD,IACE,IAAI,CAAC,oCAAoC;gBACvC,IAAI,CAAC,oCAAoC;gBAC3C,IAAI,CAAC,uCAAuC;oBAC1C,IAAI,CAAC,uCAAuC;gBAC9C,IAAI,CAAC,YAAY,KAAK,IAAI,CAAC,YAAY,EACvC,CAAC;gBACD,KAAK,CAAC,CAAC,GAAG,CAAC,qBAAqB,CAAC;oBAC/B,QAAQ,EAAE,QAAQ;oBAClB,8BAA8B,EAAE,IAAI,CAAC,YAAY;oBACjD,oCAAoC,EAClC,IAAI,CAAC,oCAAoC,KAAK,SAAS;wBACrD,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,oCAAoC,EAAE;wBACtD,CAAC,CAAC,SAAS;oBACf,uCAAuC,EACrC,IAAI,CAAC,uCAAuC,KAAK,SAAS;wBACxD,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,uCAAuC,EAAE;wBACzD,CAAC,CAAC,SAAS;iBAChB,CAAC,CAAC;gBACH,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;YAC/D,CAAC;YAED,iEAAiE;YAEjE,OAAO,MAAM,CAAC,CAAC,oDAAoD;QACrE,CAAC,CAAC;QAEF,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE;YAC9C,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;YAEjC,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,oBAAoB,QAAQ,EAAE,CAAC,CAAC;YAEpD,8BAA8B;YAC9B,KAAK,CAAC,CAAC,GAAG;iBACP,YAAY,CAAC;gBACZ,QAAQ,EAAE,QAAQ;gBAClB,MAAM,EAAE,KAAK;aACd,CAAC;iBACD,IAAI,CACH,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAChC,MAAM,CAAC,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC;YAC9D,iEAAiE;YACjE,MAAM,CAAC,KAAK,CAAC;gBACX,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE;oBACX,gEAAgE;oBAChE,mEAAmE;oBACnE,OAAO,CACL,CAAC,CAAC,IAAI,KAAK,iBAAiB;wBAC5B,CAAC,CAAC,OAAO,EAAE,QAAQ,CAAC,qBAAqB,CAAC,CAC3C,CAAC;gBACJ,CAAC;gBACD,QAAQ,EAAE,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,IAAI,CAC5C,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,qBAAqB;gBAC9D,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,CACjC,OAAO,CAAC,IAAI,CACV,iDAAiD,OAAO,GAAG,CAAC,GAAG,CAChE,CACF,CACF;aACF,CAAC,CACH,CAAC;YAEJ,yCAAyC;YACzC,KAAK,CAAC,CAAC,oBAAoB,CAAC,GAAG,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;YAEpD,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,QAAQ,uBAAuB,CAAC,CAAC;QACjE,CAAC,CAAC;KAC+B,CAAC;AACtC,CAAC,CAAC,CACH,CAAC;AAEJ;;GAEG;AACH,MAAM,sBAAsB,GAAG,CAC7B,GAAQ,EACR,QAAgB,EAChB,OAAiC,EACjC,EAAE,CACF,MAAM,CAAC,KAAK,CACV,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,GAAG;SACtB,eAAe,CAAC,EAAE,SAAS,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC;SAC1C,IAAI,CACH,MAAM,CAAC,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE,CAC/C,MAAM,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAChC,CACF,CAAC;IACJ,MAAM,MAAM,GAAG,MAAM,CAAC,OAAQ,CAAC,CAAC,CAAC,CAAC;IAElC,IAAI,MAAM,CAAC,KAAK,KAAK,WAAW,EAAE,CAAC;QACjC,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,uCAAuC;IACvC,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC,CAAC;AACnE,CAAC,CAAC,EACF;IACE,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI;IACjC,wBAAwB;IACxB,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,iBAAiB;IAC1D,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,CACjC,OAAO;QACL,CAAC,CAAC,OAAO,CAAC,IAAI,CACV,0CAA0C,CAAC,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAChE;QACH,CAAC,CAAC,MAAM,CAAC,IAAI,CAChB,CACF;CACF,CACF,CAAC;AAEJ;;GAEG;AACH,MAAM,oBAAoB,GAAG,CAC3B,GAAQ,EACR,QAAgB,EAChB,OAAgC,EAChC,EAAE,CACF,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CACjB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,GAAG;aACtB,eAAe,CAAC,EAAE,SAAS,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC;aAC1C,IAAI,CACH,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAChC,MAAM,CAAC,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE,CAC/C,MAAM,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAChC,CACF,CAAC;QAEJ,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnD,OAAO,CAAC,uBAAuB;QACjC,CAAC;QAED,sCAAsC;QACtC,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAC9D,CAAC,CAAC,EACF;QACE,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI;QACjC,wBAAwB;QACxB,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,iBAAiB;QAC1D,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,CACjC,OAAO,CAAC,IAAI,CACV,mCAAmC,CAAC,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CACzD,CACF,CACF;KACF,CACF,CAAC;AACJ,CAAC,CAAC,CAAC"}

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

@@ -1,4 +1,5 @@
 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";
@@ -7,13 +8,16 @@ export declare const Vpc: (<const ID extends string, const Props extends VpcProp
         parent: Vpc<string, VpcProps>;
     };
     type: "AWS.EC2.VPC";
+    parent: Vpc<string, VpcProps>;
     provider: import("../../resource.ts").ResourceTags<Vpc<string, VpcProps>>;
 } & {
     type: "AWS.EC2.VPC";
     provider: import("../../resource.ts").ResourceTags<Vpc<string, VpcProps>>;
 };
-export interface Vpc<ID extends string = string, Props extends VpcProps = VpcProps> extends Resource<"AWS.EC2.VPC", ID, Props, VpcAttrs<Props>> {
+export interface Vpc<ID extends string = string, Props extends VpcProps = VpcProps> extends Resource<"AWS.EC2.VPC", ID, Props, VpcAttrs<Input.Resolve<Props>>, Vpc> {
 }
+export type VpcId = `vpc-${string}`;
+export declare const VpcId: <const S extends string>(value: S) => S & VpcId;
 export interface VpcProps {
     /**
      * The IPv4 network range for the VPC, in CIDR notation.
@@ -24,7 +28,7 @@ export interface VpcProps {
     /**
      * The ID of an IPv4 IPAM pool you want to use for allocating this VPC's CIDR.
      */
-    ipv4IpamPoolId?: string;
+    ipv4IpamPoolId?: Input<string>;
     /**
      * The netmask length of the IPv4 CIDR you want to allocate to this VPC from an IPAM pool.
      */
@@ -32,7 +36,7 @@ export interface VpcProps {
     /**
      * The ID of an IPv6 IPAM pool which will be used to allocate this VPC an IPv6 CIDR.
      */
-    ipv6IpamPoolId?: string;
+    ipv6IpamPoolId?: Input<string>;
     /**
      * The netmask length of the IPv6 CIDR you want to allocate to this VPC from an IPAM pool.
      */
@@ -44,11 +48,11 @@ export interface VpcProps {
     /**
      * The ID of an IPv6 address pool from which to allocate the IPv6 CIDR block.
      */
-    ipv6Pool?: string;
+    ipv6Pool?: Input<string>;
     /**
      * The Availability Zone or Local Zone Group name for the IPv6 CIDR block.
      */
-    ipv6CidrBlockNetworkBorderGroup?: string;
+    ipv6CidrBlockNetworkBorderGroup?: Input<string>;
     /**
      * The tenancy options for instances launched into the VPC.
      * @default "default"
@@ -72,13 +76,13 @@ export interface VpcProps {
      * Tags to assign to the VPC.
      * These will be merged with alchemy auto-tags (alchemy::app, alchemy::stage, alchemy::id).
      */
-    tags?: Record<string, string>;
+    tags?: Record<string, Input<string>>;
 }
-export interface VpcAttrs<Props extends VpcProps> {
+export interface VpcAttrs<_Props extends VpcProps = VpcProps> {
     /**
      * The ID of the VPC.
      */
-    vpcId: string;
+    vpcId: VpcId;
     /**
      * The Amazon Resource Name (ARN) of the VPC.
      */
@@ -127,5 +131,6 @@ export interface VpcAttrs<Props extends VpcProps> {
         networkBorderGroup?: string;
         ipv6Pool?: string;
     }>;
+    tags?: Record<string, string>;
 }
 //# sourceMappingURL=vpc.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"vpc.d.ts","sourceRoot":"","sources":["../../../src/aws/ec2/vpc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAE7C,eAAO,MAAM,GAAG,UACP,EAAE,SAAS,MAAM,QAAQ,KAAK,SAAS,QAAQ,MAChD,EAAE,SACC,KAAK,KACX,GAAG,CAAC,EAAE,EAAE,KAAK,CAAC;;;;;;;;;CACF,CAAC;AAElB,MAAM,WAAW,GAAG,CAClB,EAAE,SAAS,MAAM,GAAG,MAAM,EAC1B,KAAK,SAAS,QAAQ,GAAG,QAAQ,CACjC,SAAQ,QAAQ,CAAC,aAAa,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;CAAG;AAEhE,MAAM,WAAW,QAAQ;IACvB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;OAEG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;OAEG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,+BAA+B,CAAC,EAAE,MAAM,CAAC;IAEzC;;;OAGG;IACH,eAAe,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC;IAE9B;;;OAGG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B;;;OAGG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAE7B;;OAEG;IACH,2BAA2B,CAAC,EAAE,OAAO,CAAC;IAEtC;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC/B;AAED,MAAM,WAAW,QAAQ,CAAC,KAAK,SAAS,QAAQ;IAC9C;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,MAAM,EAAE,eAAe,QAAQ,IAAI,SAAS,QAAQ,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;IAEpE;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,aAAa,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,KAAK,EAAE,GAAG,CAAC,QAAQ,CAAC;IAEpB;;OAEG;IACH,SAAS,EAAE,OAAO,CAAC;IAEnB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,uBAAuB,CAAC,EAAE,KAAK,CAAC;QAC9B,aAAa,EAAE,MAAM,CAAC;QACtB,SAAS,EAAE,MAAM,CAAC;QAClB,cAAc,EAAE;YACd,KAAK,EAAE,GAAG,CAAC,qBAAqB,CAAC;YACjC,aAAa,CAAC,EAAE,MAAM,CAAC;SACxB,CAAC;KACH,CAAC,CAAC;IAEH;;OAEG;IACH,2BAA2B,CAAC,EAAE,KAAK,CAAC;QAClC,aAAa,EAAE,MAAM,CAAC;QACtB,aAAa,EAAE,MAAM,CAAC;QACtB,kBAAkB,EAAE;YAClB,KAAK,EAAE,GAAG,CAAC,qBAAqB,CAAC;YACjC,aAAa,CAAC,EAAE,MAAM,CAAC;SACxB,CAAC;QACF,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,CAAC,CAAC;CACJ"}
+{"version":3,"file":"vpc.d.ts","sourceRoot":"","sources":["../../../src/aws/ec2/vpc.ts"],"names":[],"mappings":"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"}

package/lib/aws/ec2/vpc.js

@@ -1,3 +1,4 @@
 import { Resource } from "../../resource.js";
 export const Vpc = Resource("AWS.EC2.VPC");
+export const VpcId = (value) => value;
 //# sourceMappingURL=vpc.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"vpc.js","sourceRoot":"","sources":["../../../src/aws/ec2/vpc.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAI7C,MAAM,CAAC,MAAM,GAAG,GAAG,QAAQ,CAKxB,aAAa,CAAC,CAAC"}
+{"version":3,"file":"vpc.js","sourceRoot":"","sources":["../../../src/aws/ec2/vpc.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAI7C,MAAM,CAAC,MAAM,GAAG,GAAG,QAAQ,CAKxB,aAAa,CAAC,CAAC;AAclB,MAAM,CAAC,MAAM,KAAK,GAAG,CAAyB,KAAQ,EAAa,EAAE,CACnE,KAAkB,CAAC"}

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

@@ -1,7 +1,6 @@
-import { App } from "alchemy-effect";
 import { Account } from "../account.ts";
 import { Region } from "../region.ts";
 import { EC2Client } from "./client.ts";
 import { Vpc, type VpcProps } from "./vpc.ts";
-export declare const vpcProvider: () => import("effect/Layer").Layer<import("alchemy-effect").Provider<Vpc<string, VpcProps>>, never, App | Region | Account | EC2Client>;
+export declare const vpcProvider: () => import("effect/Layer").Layer<import("../../provider.ts").Provider<Vpc<string, VpcProps>>, never, import("../../app.ts").App | Region | Account | EC2Client>;
 //# sourceMappingURL=vpc.provider.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"vpc.provider.d.ts","sourceRoot":"","sources":["../../../src/aws/ec2/vpc.provider.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,GAAG,EAAwB,MAAM,gBAAgB,CAAC;AAG3D,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,GAAG,EAAiB,KAAK,QAAQ,EAAE,MAAM,UAAU,CAAC;AAI7D,eAAO,MAAM,WAAW,yIAiMrB,CAAC"}
+{"version":3,"file":"vpc.provider.d.ts","sourceRoot":"","sources":["../../../src/aws/ec2/vpc.provider.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,GAAG,EAAiB,KAAK,QAAQ,EAAE,MAAM,UAAU,CAAC;AAE7D,eAAO,MAAM,WAAW,mKAuMrB,CAAC"}