diff --git a/models/apis/ec2/2016-11-15/api-2.json b/models/apis/ec2/2016-11-15/api-2.json index e2797bac76..a030e62581 100755 --- a/models/apis/ec2/2016-11-15/api-2.json +++ b/models/apis/ec2/2016-11-15/api-2.json @@ -38974,6 +38974,7 @@ "gp2", "sc1", "st1", + "st2", "gp3" ] }, diff --git a/models/apis/ec2/2016-11-15/docs-2.json b/models/apis/ec2/2016-11-15/docs-2.json index 2ffddfeb6f..a207f726ab 100755 --- a/models/apis/ec2/2016-11-15/docs-2.json +++ b/models/apis/ec2/2016-11-15/docs-2.json @@ -7935,7 +7935,7 @@ "DescribeHostReservationsRequest$Filter": "

The filters.

", "DescribeHostsRequest$Filter": "

The filters.

", "DescribeIamInstanceProfileAssociationsRequest$Filters": "

The filters.

", - "DescribeImagesRequest$Filters": "

The filters.

", + "DescribeImagesRequest$Filters": "

The filters.

", "DescribeImportImageTasksRequest$Filters": "

Filter tasks using the task-state filter and one of the following values: active, completed, deleting, or deleted.

", "DescribeImportSnapshotTasksRequest$Filters": "

The filters.

", "DescribeInstanceCreditSpecificationsRequest$Filters": "

The filters.

", @@ -7984,7 +7984,7 @@ "DescribeSecurityGroupsRequest$Filters": "

The filters. If using multiple filters for rules, the results include security groups for which any combination of rules - not necessarily a single rule - match all filters.

", "DescribeSnapshotTierStatusRequest$Filters": "

The filters.

", "DescribeSnapshotsRequest$Filters": "

The filters.

", - "DescribeSpotInstanceRequestsRequest$Filters": "

One or more filters.

", + "DescribeSpotInstanceRequestsRequest$Filters": "

One or more filters.

", "DescribeSpotPriceHistoryRequest$Filters": "

One or more filters.

", "DescribeStoreImageTasksRequest$Filters": "

The filters.

", "DescribeSubnetsRequest$Filters": "

One or more filters.

", @@ -8002,8 +8002,8 @@ "DescribeTransitGatewaysRequest$Filters": "

One or more filters. The possible values are:

", "DescribeTrunkInterfaceAssociationsRequest$Filters": "

One or more filters.

", "DescribeVolumeStatusRequest$Filters": "

The filters.

", - "DescribeVolumesModificationsRequest$Filters": "

The filters.

", - "DescribeVolumesRequest$Filters": "

The filters.

", + "DescribeVolumesModificationsRequest$Filters": "

The filters.

", + "DescribeVolumesRequest$Filters": "

The filters.

", "DescribeVpcClassicLinkRequest$Filters": "

One or more filters.

", "DescribeVpcEndpointConnectionNotificationsRequest$Filters": "

One or more filters.

", "DescribeVpcEndpointConnectionsRequest$Filters": "

One or more filters.

", @@ -10279,8 +10279,8 @@ "CreateTrafficMirrorSessionRequest$PacketLength": "

The number of bytes in each packet to mirror. These are bytes after the VXLAN header. Do not specify this parameter when you want to mirror the entire packet. To mirror a subset of the packet, set this to the length (in bytes) that you want to mirror. For example, if you set this value to 100, then the first 100 bytes that meet the filter criteria are copied to the target.

If you do not want to mirror the entire packet, use the PacketLength parameter to specify the number of bytes in each packet to mirror.

", "CreateTrafficMirrorSessionRequest$SessionNumber": "

The session number determines the order in which sessions are evaluated when an interface is used by multiple sessions. The first session with a matching filter is the one that mirrors the packets.

Valid values are 1-32766.

", "CreateTrafficMirrorSessionRequest$VirtualNetworkId": "

The VXLAN ID for the Traffic Mirror session. For more information about the VXLAN protocol, see RFC 7348. If you do not specify a VirtualNetworkId, an account-wide unique id is chosen at random.

", - "CreateVolumeRequest$Iops": "

The number of I/O operations per second (IOPS). For gp3, io1, and io2 volumes, this represents the number of IOPS that are provisioned for the volume. For gp2 volumes, this represents the baseline performance of the volume and the rate at which the volume accumulates I/O credits for bursting.

The following are the supported values for each volume type:

io1 and io2 volumes support up to 64,000 IOPS only on Instances built on the Nitro System. Other instance families support performance up to 32,000 IOPS.

This parameter is required for io1 and io2 volumes. The default for gp3 volumes is 3,000 IOPS. This parameter is not supported for gp2, st1, sc1, or standard volumes.

", - "CreateVolumeRequest$Size": "

The size of the volume, in GiBs. You must specify either a snapshot ID or a volume size. If you specify a snapshot, the default is the snapshot size. You can specify a volume size that is equal to or larger than the snapshot size.

The following are the supported volumes sizes for each volume type:

", + "CreateVolumeRequest$Iops": "

The number of I/O operations per second (IOPS). For gp3, io1, and io2 volumes, this represents the number of IOPS that are provisioned for the volume. For gp2 volumes, this represents the baseline performance of the volume and the rate at which the volume accumulates I/O credits for bursting.

The following are the supported values for each volume type:

io1 and io2 volumes support up to 64,000 IOPS only on Instances built on the Nitro System. Other instance families support performance up to 32,000 IOPS.

This parameter is required for io1 and io2 volumes. The default for gp3 volumes is 3,000 IOPS. This parameter is not supported for gp2, st1, st2, sc1, or standard volumes.

", + "CreateVolumeRequest$Size": "

The size of the volume, in GiBs. You must specify either a snapshot ID or a volume size. If you specify a snapshot, the default is the snapshot size. You can specify a volume size that is equal to or larger than the snapshot size.

The following are the supported volumes sizes for each volume type:

", "CreateVolumeRequest$Throughput": "

The throughput to provision for a volume, with a maximum of 1,000 MiB/s.

This parameter is valid only for gp3 volumes.

Valid Range: Minimum value of 125. Maximum value of 1000.

", "DeleteNetworkAclEntryRequest$RuleNumber": "

The rule number of the entry to delete.

", "DescribeElasticGpusResult$MaxResults": "

The total number of items to return. If the total number of items available is more than the value specified in max-items then a Next-Token will be provided in the output that you can use to resume pagination.

", @@ -10319,8 +10319,8 @@ "DescribeVpcEndpointServicesRequest$MaxResults": "

The maximum number of items to return for this request. The request returns a token that you can specify in a subsequent call to get the next set of results.

Constraint: If the value is greater than 1,000, we return only 1,000 items.

", "DescribeVpcEndpointsRequest$MaxResults": "

The maximum number of items to return for this request. The request returns a token that you can specify in a subsequent call to get the next set of results.

Constraint: If the value is greater than 1,000, we return only 1,000 items.

", "DisableFastLaunchResult$MaxParallelLaunches": "

The maximum number of parallel instances to launch for creating resources.

", - "EbsBlockDevice$Iops": "

The number of I/O operations per second (IOPS). For gp3, io1, and io2 volumes, this represents the number of IOPS that are provisioned for the volume. For gp2 volumes, this represents the baseline performance of the volume and the rate at which the volume accumulates I/O credits for bursting.

The following are the supported values for each volume type:

For io1 and io2 volumes, we guarantee 64,000 IOPS only for Instances built on the Nitro System. Other instance families guarantee performance up to 32,000 IOPS.

This parameter is required for io1 and io2 volumes. The default for gp3 volumes is 3,000 IOPS. This parameter is not supported for gp2, st1, sc1, or standard volumes.

", - "EbsBlockDevice$VolumeSize": "

The size of the volume, in GiBs. You must specify either a snapshot ID or a volume size. If you specify a snapshot, the default is the snapshot size. You can specify a volume size that is equal to or larger than the snapshot size.

The following are the supported volumes sizes for each volume type:

", + "EbsBlockDevice$Iops": "

The number of I/O operations per second (IOPS). For gp3, io1, and io2 volumes, this represents the number of IOPS that are provisioned for the volume. For gp2 volumes, this represents the baseline performance of the volume and the rate at which the volume accumulates I/O credits for bursting.

The following are the supported values for each volume type:

For io1 and io2 volumes, we guarantee 64,000 IOPS only for Instances built on the Nitro System. Other instance families guarantee performance up to 32,000 IOPS.

This parameter is required for io1 and io2 volumes. The default for gp3 volumes is 3,000 IOPS. This parameter is not supported for gp2, st1, st2, sc1, or standard volumes.

", + "EbsBlockDevice$VolumeSize": "

The size of the volume, in GiBs. You must specify either a snapshot ID or a volume size. If you specify a snapshot, the default is the snapshot size. You can specify a volume size that is equal to or larger than the snapshot size.

The following are the supported volumes sizes for each volume type:

", "EbsBlockDevice$Throughput": "

The throughput that the volume supports, in MiB/s.

This parameter is valid only for gp3 volumes.

Valid Range: Minimum value of 125. Maximum value of 1000.

", "EnableFastLaunchRequest$MaxParallelLaunches": "

The maximum number of parallel instances to launch for creating resources. Value must be 6 or greater.

", "EnableFastLaunchResult$MaxParallelLaunches": "

The maximum number of parallel instances to launch for creating resources.

", @@ -10373,8 +10373,8 @@ "LaunchTemplateEbsBlockDevice$Iops": "

The number of I/O operations per second (IOPS) that the volume supports.

", "LaunchTemplateEbsBlockDevice$VolumeSize": "

The size of the volume, in GiB.

", "LaunchTemplateEbsBlockDevice$Throughput": "

The throughput that the volume supports, in MiB/s.

", - "LaunchTemplateEbsBlockDeviceRequest$Iops": "

The number of I/O operations per second (IOPS). For gp3, io1, and io2 volumes, this represents the number of IOPS that are provisioned for the volume. For gp2 volumes, this represents the baseline performance of the volume and the rate at which the volume accumulates I/O credits for bursting.

The following are the supported values for each volume type:

For io1 and io2 volumes, we guarantee 64,000 IOPS only for Instances built on the Nitro System. Other instance families guarantee performance up to 32,000 IOPS.

This parameter is supported for io1, io2, and gp3 volumes only. This parameter is not supported for gp2, st1, sc1, or standard volumes.

", - "LaunchTemplateEbsBlockDeviceRequest$VolumeSize": "

The size of the volume, in GiBs. You must specify either a snapshot ID or a volume size. The following are the supported volumes sizes for each volume type:

", + "LaunchTemplateEbsBlockDeviceRequest$Iops": "

The number of I/O operations per second (IOPS). For gp3, io1, and io2 volumes, this represents the number of IOPS that are provisioned for the volume. For gp2 volumes, this represents the baseline performance of the volume and the rate at which the volume accumulates I/O credits for bursting.

The following are the supported values for each volume type:

For io1 and io2 volumes, we guarantee 64,000 IOPS only for Instances built on the Nitro System. Other instance families guarantee performance up to 32,000 IOPS.

This parameter is supported for io1, io2, and gp3 volumes only. This parameter is not supported for gp2, st1, st2, sc1, or standard volumes.

", + "LaunchTemplateEbsBlockDeviceRequest$VolumeSize": "

The size of the volume, in GiBs. You must specify either a snapshot ID or a volume size. The following are the supported volumes sizes for each volume type:

", "LaunchTemplateEbsBlockDeviceRequest$Throughput": "

The throughput to provision for a gp3 volume, with a maximum of 1,000 MiB/s.

Valid Range: Minimum value of 125. Maximum value of 1000.

", "LaunchTemplateElasticInferenceAcceleratorResponse$Count": "

The number of elastic inference accelerators to attach to the instance.

Default: 1

", "LaunchTemplateInstanceMetadataOptions$HttpPutResponseHopLimit": "

The desired HTTP PUT response hop limit for instance metadata requests. The larger the number, the further instance metadata requests can travel.

Default: 1

Possible values: Integers from 1 to 64

", @@ -10418,7 +10418,7 @@ "ModifyTrafficMirrorSessionRequest$PacketLength": "

The number of bytes in each packet to mirror. These are bytes after the VXLAN header. To mirror a subset, set this to the length (in bytes) to mirror. For example, if you set this value to 100, then the first 100 bytes that meet the filter criteria are copied to the target. Do not specify this parameter when you want to mirror the entire packet.

", "ModifyTrafficMirrorSessionRequest$SessionNumber": "

The session number determines the order in which sessions are evaluated when an interface is used by multiple sessions. The first session with a matching filter is the one that mirrors the packets.

Valid values are 1-32766.

", "ModifyTrafficMirrorSessionRequest$VirtualNetworkId": "

The virtual network ID of the Traffic Mirror session.

", - "ModifyVolumeRequest$Size": "

The target size of the volume, in GiB. The target volume size must be greater than or equal to the existing size of the volume.

The following are the supported volumes sizes for each volume type:

Default: The existing size is retained.

", + "ModifyVolumeRequest$Size": "

The target size of the volume, in GiB. The target volume size must be greater than or equal to the existing size of the volume.

The following are the supported volumes sizes for each volume type:

Default: The existing size is retained.

", "ModifyVolumeRequest$Iops": "

The target IOPS rate of the volume. This parameter is valid only for gp3, io1, and io2 volumes.

The following are the supported values for each volume type:

Default: The existing value is retained if you keep the same volume type. If you change the volume type to io1, io2, or gp3, the default is 3,000.

", "ModifyVolumeRequest$Throughput": "

The target throughput of the volume, in MiB/s. This parameter is valid only for gp3 volumes. The maximum value is 1,000.

Default: The existing value is retained if the source and target volume type is gp3. Otherwise, the default value is 125.

Valid Range: Minimum value of 125. Maximum value of 1000.

", "ModifyVpnTunnelOptionsSpecification$Phase1LifetimeSeconds": "

The lifetime for phase 1 of the IKE negotiation, in seconds.

Constraints: A value between 900 and 28,800.

Default: 28800

", @@ -17797,7 +17797,7 @@ "ScheduledInstancesBlockDeviceMapping$DeviceName": "

The device name (for example, /dev/sdh or xvdh).

", "ScheduledInstancesBlockDeviceMapping$NoDevice": "

To omit the device from the block device mapping, specify an empty string.

", "ScheduledInstancesBlockDeviceMapping$VirtualName": "

The virtual device name (ephemeralN). Instance store volumes are numbered starting from 0. An instance type with two available instance store volumes can specify mappings for ephemeral0 and ephemeral1. The number of available instance store volumes depends on the instance type. After you connect to the instance, you must mount the volume.

Constraints: For M3 instances, you must specify instance store volumes in the block device mapping for the instance. When you launch an M3 instance, we ignore any instance store volumes specified in the block device mapping for the AMI.

", - "ScheduledInstancesEbs$VolumeType": "

The volume type. gp2 for General Purpose SSD, io1 or io2 for Provisioned IOPS SSD, Throughput Optimized HDD for st1, Cold HDD for sc1, or standard for Magnetic.

Default: gp2

", + "ScheduledInstancesEbs$VolumeType": "

The volume type. gp2 for General Purpose SSD, io1 or io2 for Provisioned IOPS SSD, Throughput Optimized HDD for st1, st2, Cold HDD for sc1, or standard for Magnetic.

Default: gp2

", "ScheduledInstancesIamInstanceProfile$Arn": "

The Amazon Resource Name (ARN).

", "ScheduledInstancesIamInstanceProfile$Name": "

The name.

", "ScheduledInstancesLaunchSpecification$InstanceType": "

The instance type.

", @@ -20112,7 +20112,7 @@ "VolumeType": { "base": null, "refs": { - "CreateVolumeRequest$VolumeType": "

The volume type. This parameter can be one of the following values:

For more information, see Amazon EBS volume types in the Amazon Elastic Compute Cloud User Guide.

Default: gp2

", + "CreateVolumeRequest$VolumeType": "

The volume type. This parameter can be one of the following values:

For more information, see Amazon EBS volume types in the Amazon Elastic Compute Cloud User Guide.

Default: gp2

", "EbsBlockDevice$VolumeType": "

The volume type. For more information, see Amazon EBS volume types in the Amazon EC2 User Guide. If the volume type is io1 or io2, you must specify the IOPS that the volume supports.

", "LaunchTemplateEbsBlockDevice$VolumeType": "

The volume type.

", "LaunchTemplateEbsBlockDeviceRequest$VolumeType": "

The volume type. For more information, see Amazon EBS volume types in the Amazon Elastic Compute Cloud User Guide.

", diff --git a/service/ec2/api.go b/service/ec2/api.go index d0abc72583..3f17e358e7 100644 --- a/service/ec2/api.go +++ b/service/ec2/api.go @@ -69102,8 +69102,8 @@ type CreateVolumeInput struct { // Other instance families support performance up to 32,000 IOPS. // // This parameter is required for io1 and io2 volumes. The default for gp3 volumes - // is 3,000 IOPS. This parameter is not supported for gp2, st1, sc1, or standard - // volumes. + // is 3,000 IOPS. This parameter is not supported for gp2, st1, st2, sc1, or + // standard volumes. Iops *int64 `type:"integer"` // The identifier of the Key Management Service (KMS) KMS key to use for Amazon @@ -69149,6 +69149,8 @@ type CreateVolumeInput struct { // // * st1 and sc1: 125-16,384 // + // * st2: 32-4,096 + // // * standard: 1-1,024 Size *int64 `type:"integer"` @@ -69174,6 +69176,8 @@ type CreateVolumeInput struct { // // * Throughput Optimized HDD: st1 // + // * st2 + // // * Cold HDD: sc1 // // * Magnetic: standard @@ -82624,7 +82628,7 @@ type DescribeImagesInput struct { // volume, in GiB. // // * block-device-mapping.volume-type - The volume type of the Amazon EBS - // volume (io1 | io2 | gp2 | gp3 | sc1 | st1 | standard). + // volume (io1 | io2 | gp2 | gp3 | sc1 | st1 | st2 | standard). // // * block-device-mapping.encrypted - A Boolean that indicates whether the // Amazon EBS volume is encrypted. @@ -91426,7 +91430,7 @@ type DescribeSpotInstanceRequestsInput struct { // // * launch.block-device-mapping.volume-type - The type of EBS volume: gp2 // for General Purpose SSD, io1 or io2 for Provisioned IOPS SSD, st1 for - // Throughput Optimized HDD, sc1for Cold HDD, or standard for Magnetic. + // Throughput Optimized HDD, st2, sc1for Cold HDD, or standard for Magnetic. // // * launch.group-id - The ID of the security group for the instance. // @@ -94342,7 +94346,7 @@ type DescribeVolumesInput struct { // * volume-id - The volume ID. // // * volume-type - The Amazon EBS volume type (gp2 | gp3 | io1 | io2 | st1 - // | sc1| standard) + // | st2 | sc1| standard) Filters []*Filter `locationName:"Filter" locationNameList:"Filter" type:"list"` // The maximum number of volume results returned by DescribeVolumes in paginated @@ -94433,7 +94437,7 @@ type DescribeVolumesModificationsInput struct { // * original-size - The original size of the volume, in GiB. // // * original-volume-type - The original volume type of the volume (standard - // | io1 | io2 | gp2 | sc1 | st1). + // | io1 | io2 | gp2 | sc1 | st1 | st2). // // * originalMultiAttachEnabled - Indicates whether Multi-Attach support // was enabled (true | false). @@ -94445,7 +94449,7 @@ type DescribeVolumesModificationsInput struct { // * target-size - The target size of the volume, in GiB. // // * target-volume-type - The target volume type of the volume (standard - // | io1 | io2 | gp2 | sc1 | st1). + // | io1 | io2 | gp2 | sc1 | st1 | st2). // // * targetMultiAttachEnabled - Indicates whether Multi-Attach support is // to be enabled (true | false). @@ -99716,8 +99720,8 @@ type EbsBlockDevice struct { // Other instance families guarantee performance up to 32,000 IOPS. // // This parameter is required for io1 and io2 volumes. The default for gp3 volumes - // is 3,000 IOPS. This parameter is not supported for gp2, st1, sc1, or standard - // volumes. + // is 3,000 IOPS. This parameter is not supported for gp2, st1, st2, sc1, or + // standard volumes. Iops *int64 `locationName:"iops" type:"integer"` // Identifier (key ID, key alias, ID ARN, or alias ARN) for a customer managed @@ -99758,6 +99762,8 @@ type EbsBlockDevice struct { // // * st1 and sc1: 125-16,384 // + // * st2: 32-4,096 + // // * standard: 1-1,024 VolumeSize *int64 `locationName:"volumeSize" type:"integer"` @@ -120455,7 +120461,7 @@ type LaunchTemplateEbsBlockDeviceRequest struct { // Other instance families guarantee performance up to 32,000 IOPS. // // This parameter is supported for io1, io2, and gp3 volumes only. This parameter - // is not supported for gp2, st1, sc1, or standard volumes. + // is not supported for gp2, st1, st2, sc1, or standard volumes. Iops *int64 `type:"integer"` // The ARN of the symmetric Key Management Service (KMS) CMK used for encryption. @@ -120479,6 +120485,8 @@ type LaunchTemplateEbsBlockDeviceRequest struct { // // * st1 and sc1: 125-16,384 // + // * st2: 32-4,096 + // // * standard: 1-1,024 VolumeSize *int64 `type:"integer"` @@ -129800,6 +129808,8 @@ type ModifyVolumeInput struct { // // * st1 and sc1: 125-16,384 // + // * st2: 32-4,096 + // // * standard: 1-1,024 // // Default: The existing size is retained. @@ -146336,7 +146346,7 @@ type ScheduledInstancesEbs struct { VolumeSize *int64 `type:"integer"` // The volume type. gp2 for General Purpose SSD, io1 or io2 for Provisioned - // IOPS SSD, Throughput Optimized HDD for st1, Cold HDD for sc1, or standard + // IOPS SSD, Throughput Optimized HDD for st1, st2, Cold HDD for sc1, or standard // for Magnetic. // // Default: gp2 @@ -168546,6 +168556,9 @@ const ( // VolumeTypeSt1 is a VolumeType enum value VolumeTypeSt1 = "st1" + // VolumeTypeSt2 is a VolumeType enum value + VolumeTypeSt2 = "st2" + // VolumeTypeGp3 is a VolumeType enum value VolumeTypeGp3 = "gp3" ) @@ -168559,6 +168572,7 @@ func VolumeType_Values() []string { VolumeTypeGp2, VolumeTypeSc1, VolumeTypeSt1, + VolumeTypeSt2, VolumeTypeGp3, } }