From 4f1d59bf3763bc9b84108cc4e5b2910a9b3ddc33 Mon Sep 17 00:00:00 2001 From: awstools Date: Wed, 28 Aug 2024 18:20:08 +0000 Subject: [PATCH] feat(client-ec2): Amazon VPC IP Address Manager (IPAM) now allows customers to provision IPv4 CIDR blocks and allocate Elastic IP Addresses directly from IPAM pools with public IPv4 space --- .../src/commands/AllocateAddressCommand.ts | 1 + .../commands/AllocateIpamPoolCidrCommand.ts | 2 +- ...GetIpamDiscoveredPublicAddressesCommand.ts | 2 +- .../commands/GetIpamPoolAllocationsCommand.ts | 2 +- .../src/commands/RegisterImageCommand.ts | 39 ++++++++----------- clients/client-ec2/src/models/models_0.ts | 7 ++++ clients/client-ec2/src/models/models_6.ts | 1 + clients/client-ec2/src/protocols/Aws_ec2.ts | 3 ++ codegen/sdk-codegen/aws-models/ec2.json | 20 +++++++++- 9 files changed, 51 insertions(+), 26 deletions(-) diff --git a/clients/client-ec2/src/commands/AllocateAddressCommand.ts b/clients/client-ec2/src/commands/AllocateAddressCommand.ts index 4d271bdcb7d3..bcb5858a1cee 100644 --- a/clients/client-ec2/src/commands/AllocateAddressCommand.ts +++ b/clients/client-ec2/src/commands/AllocateAddressCommand.ts @@ -64,6 +64,7 @@ export interface AllocateAddressCommandOutput extends AllocateAddressResult, __M * ], * }, * ], + * IpamPoolId: "STRING_VALUE", * }; * const command = new AllocateAddressCommand(input); * const response = await client.send(command); diff --git a/clients/client-ec2/src/commands/AllocateIpamPoolCidrCommand.ts b/clients/client-ec2/src/commands/AllocateIpamPoolCidrCommand.ts index 2c8c200d2837..43aa4b881df8 100644 --- a/clients/client-ec2/src/commands/AllocateIpamPoolCidrCommand.ts +++ b/clients/client-ec2/src/commands/AllocateIpamPoolCidrCommand.ts @@ -62,7 +62,7 @@ export interface AllocateIpamPoolCidrCommandOutput extends AllocateIpamPoolCidrR * // IpamPoolAllocationId: "STRING_VALUE", * // Description: "STRING_VALUE", * // ResourceId: "STRING_VALUE", - * // ResourceType: "ipam-pool" || "vpc" || "ec2-public-ipv4-pool" || "custom" || "subnet", + * // ResourceType: "ipam-pool" || "vpc" || "ec2-public-ipv4-pool" || "custom" || "subnet" || "eip", * // ResourceRegion: "STRING_VALUE", * // ResourceOwner: "STRING_VALUE", * // }, diff --git a/clients/client-ec2/src/commands/GetIpamDiscoveredPublicAddressesCommand.ts b/clients/client-ec2/src/commands/GetIpamDiscoveredPublicAddressesCommand.ts index 22d042b14088..8be34d5bf8c2 100644 --- a/clients/client-ec2/src/commands/GetIpamDiscoveredPublicAddressesCommand.ts +++ b/clients/client-ec2/src/commands/GetIpamDiscoveredPublicAddressesCommand.ts @@ -66,7 +66,7 @@ export interface GetIpamDiscoveredPublicAddressesCommandOutput * // AddressOwnerId: "STRING_VALUE", * // AddressAllocationId: "STRING_VALUE", * // AssociationStatus: "associated" || "disassociated", - * // AddressType: "service-managed-ip" || "service-managed-byoip" || "amazon-owned-eip" || "byoip" || "ec2-public-ip", + * // AddressType: "service-managed-ip" || "service-managed-byoip" || "amazon-owned-eip" || "amazon-owned-contig" || "byoip" || "ec2-public-ip", * // Service: "nat-gateway" || "database-migration-service" || "redshift" || "elastic-container-service" || "relational-database-service" || "site-to-site-vpn" || "load-balancer" || "global-accelerator" || "other", * // ServiceResource: "STRING_VALUE", * // VpcId: "STRING_VALUE", diff --git a/clients/client-ec2/src/commands/GetIpamPoolAllocationsCommand.ts b/clients/client-ec2/src/commands/GetIpamPoolAllocationsCommand.ts index 3dbad62dc6ef..0df5fe6de333 100644 --- a/clients/client-ec2/src/commands/GetIpamPoolAllocationsCommand.ts +++ b/clients/client-ec2/src/commands/GetIpamPoolAllocationsCommand.ts @@ -62,7 +62,7 @@ export interface GetIpamPoolAllocationsCommandOutput extends GetIpamPoolAllocati * // IpamPoolAllocationId: "STRING_VALUE", * // Description: "STRING_VALUE", * // ResourceId: "STRING_VALUE", - * // ResourceType: "ipam-pool" || "vpc" || "ec2-public-ipv4-pool" || "custom" || "subnet", + * // ResourceType: "ipam-pool" || "vpc" || "ec2-public-ipv4-pool" || "custom" || "subnet" || "eip", * // ResourceRegion: "STRING_VALUE", * // ResourceOwner: "STRING_VALUE", * // }, diff --git a/clients/client-ec2/src/commands/RegisterImageCommand.ts b/clients/client-ec2/src/commands/RegisterImageCommand.ts index 5b2544cd702a..c3e695cbf29c 100644 --- a/clients/client-ec2/src/commands/RegisterImageCommand.ts +++ b/clients/client-ec2/src/commands/RegisterImageCommand.ts @@ -30,16 +30,17 @@ export interface RegisterImageCommandOutput extends RegisterImageResult, __Metad /** *

Registers an AMI. When you're creating an instance-store backed AMI, registering the AMI * is the final step in the creation process. For more information about creating AMIs, see - * Create your - * own AMI in the Amazon Elastic Compute Cloud User Guide.

+ * Create an AMI from a snapshot and Create an instance-store + * backed AMI in the Amazon EC2 User Guide.

* *

For Amazon EBS-backed instances, CreateImage creates and registers the AMI * in a single request, so you don't have to register the AMI yourself. We recommend that you * always use CreateImage unless you have a specific reason to use * RegisterImage.

* - *

If needed, you can deregister an AMI at any time. Any modifications you make to an AMI backed by an instance store volume invalidates its registration. - * If you make changes to an image, deregister the previous image and register the new image.

+ *

If needed, you can deregister an AMI at any time. Any modifications you make to an AMI + * backed by an instance store volume invalidates its registration. If you make changes to an + * image, deregister the previous image and register the new image.

*

* Register a snapshot of a root device volume *

@@ -48,29 +49,23 @@ export interface RegisterImageCommandOutput extends RegisterImageResult, __Metad * You can't set the encryption state of the volume using the block device mapping. If the * snapshot is encrypted, or encryption by default is enabled, the root volume of an instance * launched from the AMI is encrypted.

- *

For more information, see Create a Linux AMI from a snapshot and Use encryption with Amazon EBS-backed AMIs - * in the Amazon Elastic Compute Cloud User Guide.

+ *

For more information, see Create an AMI from a snapshot and Use encryption with Amazon EBS-backed + * AMIs in the Amazon EC2 User Guide.

*

* Amazon Web Services Marketplace product codes *

*

If any snapshots have Amazon Web Services Marketplace product codes, they are copied to the new * AMI.

- *

Windows and some Linux distributions, such as Red Hat Enterprise Linux (RHEL) and SUSE - * Linux Enterprise Server (SLES), use the Amazon EC2 billing product code associated with an AMI to - * verify the subscription status for package updates. To create a new AMI for operating systems - * that require a billing product code, instead of registering the AMI, do the following to - * preserve the billing product code association:

- *
    - *
  1. - *

    Launch an instance from an existing AMI with that billing product code.

    - *
    2. - *
  2. - *

    Customize the instance.

    - *
    3. - *
  3. - *

    Create an AMI from the instance using CreateImage.

    - *
    4. - *
+ *

In most cases, AMIs for Windows, RedHat, SUSE, and SQL Server require correct licensing + * information to be present on the AMI. For more information, see Understand AMI billing + * information in the Amazon EC2 User Guide. When creating an AMI from + * a snapshot, the RegisterImage operation derives the correct billing information + * from the snapshot's metadata, but this requires the appropriate metadata to be present. To + * verify if the correct billing information was applied, check the PlatformDetails + * field on the new AMI. If the field is empty or doesn't match the expected operating system + * code (for example, Windows, RedHat, SUSE, or SQL), the AMI creation was unsuccessful, and you + * should discard the AMI and instead create the AMI from an instance using CreateImage. For more information, see Create an AMI + * from an instance in the Amazon EC2 User Guide.

*

If you purchase a Reserved Instance to apply to an On-Demand Instance that was launched * from an AMI with a billing product code, make sure that the Reserved Instance has the matching * billing product code. If you purchase a Reserved Instance without the matching billing product diff --git a/clients/client-ec2/src/models/models_0.ts b/clients/client-ec2/src/models/models_0.ts index 0be9dc8b6213..39e88b15f973 100644 --- a/clients/client-ec2/src/models/models_0.ts +++ b/clients/client-ec2/src/models/models_0.ts @@ -3239,6 +3239,12 @@ export interface AllocateAddressRequest { * @public */ TagSpecifications?: TagSpecification[]; + + /** + *

The ID of an IPAM pool.

+ * @public + */ + IpamPoolId?: string; } /** @@ -3553,6 +3559,7 @@ export interface AllocateIpamPoolCidrRequest { export const IpamPoolAllocationResourceType = { custom: "custom", ec2_public_ipv4_pool: "ec2-public-ipv4-pool", + eip: "eip", ipam_pool: "ipam-pool", subnet: "subnet", vpc: "vpc", diff --git a/clients/client-ec2/src/models/models_6.ts b/clients/client-ec2/src/models/models_6.ts index caf775fbf0fe..91100c2d4a14 100644 --- a/clients/client-ec2/src/models/models_6.ts +++ b/clients/client-ec2/src/models/models_6.ts @@ -817,6 +817,7 @@ export interface GetIpamDiscoveredPublicAddressesRequest { * @enum */ export const IpamPublicAddressType = { + AMAZON_OWNED_CONTIG: "amazon-owned-contig", AMAZON_OWNED_EIP: "amazon-owned-eip", BYOIP: "byoip", EC2_PUBLIC_IP: "ec2-public-ip", diff --git a/clients/client-ec2/src/protocols/Aws_ec2.ts b/clients/client-ec2/src/protocols/Aws_ec2.ts index 885aded6d4e1..3ad1f1740442 100644 --- a/clients/client-ec2/src/protocols/Aws_ec2.ts +++ b/clients/client-ec2/src/protocols/Aws_ec2.ts @@ -27609,6 +27609,9 @@ const se_AllocateAddressRequest = (input: AllocateAddressRequest, context: __Ser entries[loc] = value; }); } + if (input[_IPI] != null) { + entries[_IPI] = input[_IPI]; + } return entries; }; diff --git a/codegen/sdk-codegen/aws-models/ec2.json b/codegen/sdk-codegen/aws-models/ec2.json index aef92e749cbb..e9f73d0d88e3 100644 --- a/codegen/sdk-codegen/aws-models/ec2.json +++ b/codegen/sdk-codegen/aws-models/ec2.json @@ -1601,6 +1601,12 @@ "smithy.api#documentation": "

The tags to assign to the Elastic IP address.

", "smithy.api#xmlName": "TagSpecification" } + }, + "IpamPoolId": { + "target": "com.amazonaws.ec2#IpamPoolId", + "traits": { + "smithy.api#documentation": "

The ID of an IPAM pool.

" + } } }, "traits": { @@ -68635,6 +68641,12 @@ "traits": { "smithy.api#enumValue": "subnet" } + }, + "eip": { + "target": "smithy.api#Unit", + "traits": { + "smithy.api#enumValue": "eip" + } } } }, @@ -69180,6 +69192,12 @@ "smithy.api#enumValue": "amazon-owned-eip" } }, + "AMAZON_OWNED_CONTIG": { + "target": "smithy.api#Unit", + "traits": { + "smithy.api#enumValue": "amazon-owned-contig" + } + }, "BYOIP": { "target": "smithy.api#Unit", "traits": { @@ -86828,7 +86846,7 @@ "target": "com.amazonaws.ec2#RegisterImageResult" }, "traits": { - "smithy.api#documentation": "

Registers an AMI. When you're creating an instance-store backed AMI, registering the AMI\n is the final step in the creation process. For more information about creating AMIs, see\n Create your\n own AMI in the Amazon Elastic Compute Cloud User Guide.

\n \n

For Amazon EBS-backed instances, CreateImage creates and registers the AMI\n in a single request, so you don't have to register the AMI yourself. We recommend that you\n always use CreateImage unless you have a specific reason to use\n RegisterImage.

\n \n

If needed, you can deregister an AMI at any time. Any modifications you make to an AMI backed by an instance store volume invalidates its registration. \n If you make changes to an image, deregister the previous image and register the new image.

\n

\n Register a snapshot of a root device volume\n

\n

You can use RegisterImage to create an Amazon EBS-backed Linux AMI from\n a snapshot of a root device volume. You specify the snapshot using a block device mapping.\n You can't set the encryption state of the volume using the block device mapping. If the \n snapshot is encrypted, or encryption by default is enabled, the root volume of an instance \n launched from the AMI is encrypted.

\n

For more information, see Create a Linux AMI from a snapshot and Use encryption with Amazon EBS-backed AMIs\n in the Amazon Elastic Compute Cloud User Guide.

\n

\n Amazon Web Services Marketplace product codes\n

\n

If any snapshots have Amazon Web Services Marketplace product codes, they are copied to the new\n AMI.

\n

Windows and some Linux distributions, such as Red Hat Enterprise Linux (RHEL) and SUSE\n Linux Enterprise Server (SLES), use the Amazon EC2 billing product code associated with an AMI to\n verify the subscription status for package updates. To create a new AMI for operating systems\n that require a billing product code, instead of registering the AMI, do the following to\n preserve the billing product code association:

\n
    \n
  1. \n

    Launch an instance from an existing AMI with that billing product code.

    \n
    2. \n
  2. \n

    Customize the instance.

    \n
    3. \n
  3. \n

    Create an AMI from the instance using CreateImage.

    \n
    4. \n
\n

If you purchase a Reserved Instance to apply to an On-Demand Instance that was launched\n from an AMI with a billing product code, make sure that the Reserved Instance has the matching\n billing product code. If you purchase a Reserved Instance without the matching billing product\n code, the Reserved Instance will not be applied to the On-Demand Instance. For information\n about how to obtain the platform details and billing information of an AMI, see Understand AMI\n billing information in the Amazon EC2 User Guide.

" + "smithy.api#documentation": "

Registers an AMI. When you're creating an instance-store backed AMI, registering the AMI\n is the final step in the creation process. For more information about creating AMIs, see\n Create an AMI from a snapshot and Create an instance-store\n backed AMI in the Amazon EC2 User Guide.

\n \n

For Amazon EBS-backed instances, CreateImage creates and registers the AMI\n in a single request, so you don't have to register the AMI yourself. We recommend that you\n always use CreateImage unless you have a specific reason to use\n RegisterImage.

\n \n

If needed, you can deregister an AMI at any time. Any modifications you make to an AMI\n backed by an instance store volume invalidates its registration. If you make changes to an\n image, deregister the previous image and register the new image.

\n

\n Register a snapshot of a root device volume\n

\n

You can use RegisterImage to create an Amazon EBS-backed Linux AMI from\n a snapshot of a root device volume. You specify the snapshot using a block device mapping.\n You can't set the encryption state of the volume using the block device mapping. If the \n snapshot is encrypted, or encryption by default is enabled, the root volume of an instance \n launched from the AMI is encrypted.

\n

For more information, see Create an AMI from a snapshot and Use encryption with Amazon EBS-backed\n AMIs in the Amazon EC2 User Guide.

\n

\n Amazon Web Services Marketplace product codes\n

\n

If any snapshots have Amazon Web Services Marketplace product codes, they are copied to the new\n AMI.

\n

In most cases, AMIs for Windows, RedHat, SUSE, and SQL Server require correct licensing\n information to be present on the AMI. For more information, see Understand AMI billing\n information in the Amazon EC2 User Guide. When creating an AMI from\n a snapshot, the RegisterImage operation derives the correct billing information\n from the snapshot's metadata, but this requires the appropriate metadata to be present. To\n verify if the correct billing information was applied, check the PlatformDetails\n field on the new AMI. If the field is empty or doesn't match the expected operating system\n code (for example, Windows, RedHat, SUSE, or SQL), the AMI creation was unsuccessful, and you\n should discard the AMI and instead create the AMI from an instance using CreateImage. For more information, see Create an AMI\n from an instance in the Amazon EC2 User Guide.

\n

If you purchase a Reserved Instance to apply to an On-Demand Instance that was launched\n from an AMI with a billing product code, make sure that the Reserved Instance has the matching\n billing product code. If you purchase a Reserved Instance without the matching billing product\n code, the Reserved Instance will not be applied to the On-Demand Instance. For information\n about how to obtain the platform details and billing information of an AMI, see Understand AMI\n billing information in the Amazon EC2 User Guide.

" } }, "com.amazonaws.ec2#RegisterImageRequest": {