Merge branch 'main' into conroy/gc-doc

packages/@aws-cdk-testing/cli-integ/lib/package-sources/release-source.ts

@@ -60,6 +60,10 @@ export class ReleasePackageSource implements IPackageSource {
     return this.version.split('.')[0] as string;
   }
 
+  public requestedCliVersion() {
+    return this.version;
+  }
+
   public requestedFrameworkVersion() {
     return process.env.FRAMEWORK_VERSION!;
   }

packages/@aws-cdk-testing/cli-integ/lib/package-sources/repo-source.ts

@@ -49,6 +49,10 @@ export class RepoPackageSource implements IPackageSource {
     return releaseJson.majorVersion;
   }
 
+  public requestedCliVersion(): string {
+    return '*';
+  }
+
   public requestedFrameworkVersion(): string {
     return '*';
   }

packages/@aws-cdk-testing/cli-integ/lib/package-sources/source.ts

@@ -14,6 +14,11 @@ export interface IPackageSource {
 
   initializeDotnetPackages(targetDir: string): Promise<void>;
 
+  /**
+   * CLI version
+   */
+  requestedCliVersion(): string;
+
   /**
    * Framework version if it's different than the CLI version
    *

packages/@aws-cdk-testing/cli-integ/tests/tool-integrations/amplify.integtest.ts

@@ -0,0 +1,27 @@
+import { promises as fs } from 'fs';
+import * as path from 'path';
+import { integTest, withTemporaryDirectory, ShellHelper, withPackages, TemporaryDirectoryContext } from '../../lib';
+
+const TIMEOUT = 1800_000;
+
+integTest('amplify integration', withTemporaryDirectory(withPackages(async (context) => {
+  const shell = ShellHelper.fromContext(context);
+
+  await shell.shell(['npm', 'create', '-y', 'amplify@latest']);
+  await shell.shell(['npx', 'ampx', 'configure', 'telemetry', 'disable']);
+
+  // This will create 'package.json' implicating a certain version of the CDK
+  await updateCdkDependency(context, context.packages.requestedCliVersion(), context.packages.requestedFrameworkVersion());
+  await shell.shell(['npm', 'install']);
+
+  await shell.shell(['npx', 'ampx', 'sandbox', '--once']);
+  await shell.shell(['npx', 'ampx', 'sandbox', 'delete', '--yes']);
+})), TIMEOUT);
+
+async function updateCdkDependency(context: TemporaryDirectoryContext, cliVersion: string, libVersion: string) {
+  const filename = path.join(context.integTestDir, 'package.json');
+  const pj = JSON.parse(await fs.readFile(filename, { encoding: 'utf-8' }));
+  pj.devDependencies['aws-cdk'] = cliVersion;
+  pj.devDependencies['aws-cdk-lib'] = libVersion;
+  await fs.writeFile(filename, JSON.stringify(pj, undefined, 2), { encoding: 'utf-8' });
+}

packages/@aws-cdk-testing/framework-integ/test/aws-s3-assets/test/integ.assets.file-bundling.lit.ts

@@ -26,6 +26,17 @@ class TestStack extends Stack {
 
     const user = new iam.User(this, 'MyUser');
     asset.grantRead(user);
+
+    new assets.Asset(this, 'BundledAssetWithoutExtension', {
+      path: path.join(__dirname, 'markdown-asset'),
+      bundling: {
+        image: DockerImage.fromBuild(path.join(__dirname, 'alpine-markdown')),
+        outputType: BundlingOutput.SINGLE_FILE,
+        command: [
+          'sh', '-c', 'echo 123 > /asset-output/main',
+        ],
+      },
+    });
   }
 }
 

packages/@aws-cdk/aws-ec2-alpha/README.md

@@ -37,8 +37,6 @@ new VpcV2(this, 'Vpc', {
 
 `VpcV2` does not automatically create subnets or allocate IP addresses, which is different from the `Vpc` construct.
 
-Importing existing VPC in an account into CDK as a `VpcV2` is not yet supported.
-
 ## SubnetV2
 
 `SubnetV2` is a re-write of the [`ec2.Subnet`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_ec2.Subnet.html) construct.
@@ -62,8 +60,6 @@ new SubnetV2(this, 'subnetA', {
 })
 ```
 
-Same as `VpcV2`, importing existing subnets is not yet supported.
-
 ## IP Addresses Management
 
 By default `VpcV2` uses `10.0.0.0/16` as the primary CIDR if none is defined. 
@@ -366,3 +362,135 @@ myVpc.addInternetGateway({
   ipv4Destination: '192.168.0.0/16',
 });
 ```
+
+## Importing an existing VPC
+
+You can import an existing VPC and its subnets using the `VpcV2.fromVpcV2Attributes()` method or an individual subnet using `SubnetV2.fromSubnetV2Attributes()` method.
+
+### Importing a VPC
+
+To import an existing VPC, use the `VpcV2.fromVpcV2Attributes()` method. You'll need to provide the VPC ID, primary CIDR block, and information about the subnets. You can import secondary address as well created through IPAM, BYOIP(IPv4) or enabled through Amazon Provided IPv6. You must provide VPC Id and its primary CIDR block for importing it.
+
+If you wish to add a new subnet to imported VPC, new subnet's IP range(IPv4) will be validated against provided secondary and primary address block to confirm that it is within the the range of VPC.
+
+Here's an example of importing a VPC with only the required parameters
+
+``` ts
+
+const stack = new Stack();
+
+const importedVpc = VpcV2.fromVpcV2Attributes(stack, 'ImportedVpc', {
+      vpcId: 'mockVpcID',
+      vpcCidrBlock: '10.0.0.0/16',
+});
+
+```
+
+In case of cross account or cross region VPC, its recommended to provide region and ownerAccountId so that these values for the VPC can be used to populate correct arn value for the VPC. If a VPC region and account ID is not provided, then region and account configured in the stack will be used. Furthermore, these fields will be referenced later while setting up VPC peering connection, so its necessary to set these fields to a correct value.
+
+Below is an example of importing a cross region and cross acount VPC, VPC arn for this case would be 'arn:aws:ec2:us-west-2:123456789012:vpc/mockVpcID'
+
+``` ts
+
+const stack = new Stack();
+
+//Importing a cross acount or cross region VPC
+const importedVpc = VpcV2.fromVpcV2Attributes(stack, 'ImportedVpc', {
+      vpcId: 'mockVpcID',
+      vpcCidrBlock: '10.0.0.0/16',
+      ownerAccountId: '123456789012',
+      region: 'us-west-2',
+});
+
+```
+
+Here's an example of how to import a VPC with multiple CIDR blocks, IPv6 support, and different subnet types:
+
+In this example, we're importing a VPC with:
+
+ - A primary CIDR block (10.1.0.0/16)
+ - One secondary IPv4 CIDR block (10.2.0.0/16)
+ - Two secondary address using IPAM pool (IPv4 and IPv6)
+ - VPC has Amazon-provided IPv6 CIDR enabled
+ - An isolated subnet in us-west-2a
+ - A public subnet in us-west-2b
+
+```ts
+
+const stack = new Stack();
+
+const importedVpc = VpcV2.fromVpcV2Attributes(this, 'ImportedVPC', {
+  vpcId: 'vpc-XXX',
+  vpcCidrBlock: '10.1.0.0/16',
+  secondaryCidrBlocks: [
+    {
+      cidrBlock: '10.2.0.0/16',
+      cidrBlockName: 'ImportedBlock1',
+    },
+    {
+      ipv6IpamPoolId: 'ipam-pool-XXX',
+      ipv6NetmaskLength: 52,
+      cidrBlockName: 'ImportedIpamIpv6',
+    },
+    {
+      ipv4IpamPoolId: 'ipam-pool-XXX',
+      ipv4IpamProvisionedCidrs: ['10.2.0.0/16'],
+      cidrBlockName: 'ImportedIpamIpv4',
+    },
+    {
+      amazonProvidedIpv6CidrBlock: true,
+    }
+  ],
+  subnets: [{
+    subnetName: 'IsolatedSubnet2',
+    subnetId: 'subnet-03cd773c0fe08ed26',
+    subnetType: SubnetType.PRIVATE_ISOLATED,
+    availabilityZone: 'us-west-2a',
+    ipv4CidrBlock: '10.2.0.0/24',
+    routeTableId: 'rtb-0871c310f98da2cbb',
+  },
+  {
+    subnetId: 'subnet-0fa477e01db27d820',
+    subnetType: SubnetType.PUBLIC,
+    availabilityZone: 'us-west-2b',
+    ipv4CidrBlock: '10.3.0.0/24',
+    routeTableId: 'rtb-014f3043098fe4b96',
+  }],
+});
+
+// You can now use the imported VPC in your stack
+
+// Adding a new subnet to the imported VPC
+const importedSubnet = new SubnetV2(this, 'NewSubnet', {
+  availabilityZone: 'us-west-2a',
+  ipv4CidrBlock: new IpCidr('10.2.2.0/24'),
+  vpc: importedVpc,
+  subnetType: SubnetType.PUBLIC,
+});
+
+// Adding gateways to the imported VPC
+importedVpc.addInternetGateway();
+importedVpc.addNatGateway({ subnet: importedSubnet });
+importedVpc.addEgressOnlyInternetGateway();
+```
+
+You can add more subnets as needed by including additional entries in the `isolatedSubnets`, `publicSubnets`, or other subnet type arrays (e.g., `privateSubnets`).
+
+### Importing Subnets
+
+You can also import individual subnets using the `SubnetV2.fromSubnetV2Attributes()` method. This is useful when you need to work with specific subnets independently of a VPC.
+
+Here's an example of how to import a subnet:
+
+```ts
+
+SubnetV2.fromSubnetV2Attributes(this, 'ImportedSubnet', {
+  subnetId: 'subnet-0123456789abcdef0',
+  availabilityZone: 'us-west-2a',
+  ipv4CidrBlock: '10.2.0.0/24',
+  routeTableId: 'rtb-0871c310f98da2cbb',
+  subnetType: SubnetType.PRIVATE_ISOLATED,
+});
+```
+
+By importing existing VPCs and subnets, you can easily integrate your existing AWS infrastructure with new resources created through CDK. This is particularly useful when you need to work with pre-existing network configurations or when you're migrating existing infrastructure to CDK.

packages/@aws-cdk/aws-ec2-alpha/awslint.json

@@ -1,8 +1,6 @@
 {
     "exclude": [
-      "from-method:@aws-cdk/aws-ec2-alpha.VpcV2",
       "attribute-tag:@aws-cdk/aws-ec2-alpha.RouteTable.routeTableId",
-      "from-method:@aws-cdk/aws-ec2-alpha.SubnetV2",
       "from-method:@aws-cdk/aws-ec2-alpha.Route"
     ]
 }