diff --git a/CHANGELOG.md b/CHANGELOG.md index 8479183a234..aa1e1020a06 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ Unreleased Changes ------------------ +* Feature - Aws::EC2 - Added support for new spot fleet launch specification features. + * Feature - Aws::Glacier - Added support for vault locks. * Feature - Aws::ElasticMapReduce - Adds support for Amazon EMR release 4.0.0, which diff --git a/aws-sdk-core/apis/ec2/2015-04-15/api-2.json b/aws-sdk-core/apis/ec2/2015-04-15/api-2.json index bc3276bedd0..11eca829dd4 100644 --- a/aws-sdk-core/apis/ec2/2015-04-15/api-2.json +++ b/aws-sdk-core/apis/ec2/2015-04-15/api-2.json @@ -3154,10 +3154,6 @@ "VpcPeeringConnectionId":{ "shape":"String", "locationName":"vpcPeeringConnectionId" - }, - "ClientToken":{ - "shape":"String", - "locationName":"clientToken" } } }, @@ -3167,10 +3163,6 @@ "Return":{ "shape":"Boolean", "locationName":"return" - }, - "ClientToken":{ - "shape":"String", - "locationName":"clientToken" } } }, @@ -7933,7 +7925,7 @@ "LaunchSpecsList":{ "type":"list", "member":{ - "shape":"LaunchSpecification", + "shape":"SpotFleetLaunchSpecification", "locationName":"item" }, "min":1 @@ -8108,10 +8100,6 @@ } } }, - "ModifySnapshotAttributeName":{ - "type":"string", - "enum":["createVolumePermission"] - }, "ModifySnapshotAttributeRequest":{ "type":"structure", "required":["SnapshotId"], @@ -8121,7 +8109,7 @@ "locationName":"dryRun" }, "SnapshotId":{"shape":"String"}, - "Attribute":{"shape":"ModifySnapshotAttributeName"}, + "Attribute":{"shape":"SnapshotAttributeName"}, "OperationType":{"shape":"String"}, "UserIds":{ "shape":"UserIdStringList", @@ -9823,7 +9811,7 @@ "locationName":"dryRun" }, "SnapshotId":{"shape":"String"}, - "Attribute":{"shape":"ModifySnapshotAttributeName"} + "Attribute":{"shape":"SnapshotAttributeName"} } }, "ResourceIdList":{ @@ -10452,6 +10440,80 @@ } } }, + "SpotFleetLaunchSpecification":{ + "type":"structure", + "members":{ + "ImageId":{ + "shape":"String", + "locationName":"imageId" + }, + "KeyName":{ + "shape":"String", + "locationName":"keyName" + }, + "SecurityGroups":{ + "shape":"GroupIdentifierList", + "locationName":"groupSet" + }, + "UserData":{ + "shape":"String", + "locationName":"userData" + }, + "AddressingType":{ + "shape":"String", + "locationName":"addressingType" + }, + "InstanceType":{ + "shape":"InstanceType", + "locationName":"instanceType" + }, + "Placement":{ + "shape":"SpotPlacement", + "locationName":"placement" + }, + "KernelId":{ + "shape":"String", + "locationName":"kernelId" + }, + "RamdiskId":{ + "shape":"String", + "locationName":"ramdiskId" + }, + "BlockDeviceMappings":{ + "shape":"BlockDeviceMappingList", + "locationName":"blockDeviceMapping" + }, + "Monitoring":{ + "shape":"SpotFleetMonitoring", + "locationName":"monitoring" + }, + "SubnetId":{ + "shape":"String", + "locationName":"subnetId" + }, + "NetworkInterfaces":{ + "shape":"InstanceNetworkInterfaceSpecificationList", + "locationName":"networkInterfaceSet" + }, + "IamInstanceProfile":{ + "shape":"IamInstanceProfileSpecification", + "locationName":"iamInstanceProfile" + }, + "EbsOptimized":{ + "shape":"Boolean", + "locationName":"ebsOptimized" + } + } + }, + "SpotFleetMonitoring":{ + "type":"structure", + "members":{ + "Enabled":{ + "shape":"Boolean", + "locationName":"enabled" + } + } + }, "SpotFleetRequestConfig":{ "type":"structure", "required":[ diff --git a/aws-sdk-core/apis/ec2/2015-04-15/docs-2.json b/aws-sdk-core/apis/ec2/2015-04-15/docs-2.json index 5ea3476f272..8756399472b 100644 --- a/aws-sdk-core/apis/ec2/2015-04-15/docs-2.json +++ b/aws-sdk-core/apis/ec2/2015-04-15/docs-2.json @@ -24,7 +24,7 @@ "CancelSpotInstanceRequests": "

Cancels one or more Spot Instance requests. Spot Instances are instances that Amazon EC2 starts on your behalf when the bid price that you specify exceeds the current Spot Price. Amazon EC2 periodically sets the Spot Price based on available Spot Instance capacity and current Spot Instance requests. For more information, see Spot Instance Requests in the Amazon Elastic Compute Cloud User Guide.

Canceling a Spot Instance request does not terminate running Spot Instances associated with the request.

", "ConfirmProductInstance": "

Determines whether a product code is associated with an instance. This action can only be used by the owner of the product code. It is useful when a product code owner needs to verify whether another user's instance is eligible for support.

", "CopyImage": "

Initiates the copy of an AMI from the specified source region to the current region. You specify the destination region by using its endpoint when making the request. AMIs that use encrypted EBS snapshots cannot be copied with this method.

For more information, see Copying AMIs in the Amazon Elastic Compute Cloud User Guide.

", - "CopySnapshot": "

Copies a point-in-time snapshot of an EBS volume and stores it in Amazon S3. You can copy the snapshot within the same region or from one region to another. You can use the snapshot to create EBS volumes or Amazon Machine Images (AMIs). The snapshot is copied to the regional endpoint that you send the HTTP request to.

Copies of encrypted EBS snapshots remain encrypted. Copies of unencrypted snapshots remain unencrypted, unless the Encrypted flag is specified during the snapshot copy operation. By default, encrypted snapshot copies use the default AWS Key Management Service (KMS) Customer Master Key (CMK); however, you can specify a non-default CMK with the KmsKeyId parameter.

For more information, see Copying an Amazon EBS Snapshot in the Amazon Elastic Compute Cloud User Guide.

", + "CopySnapshot": "

Copies a point-in-time snapshot of an EBS volume and stores it in Amazon S3. You can copy the snapshot within the same region or from one region to another. You can use the snapshot to create EBS volumes or Amazon Machine Images (AMIs). The snapshot is copied to the regional endpoint that you send the HTTP request to.

Copies of encrypted EBS snapshots remain encrypted. Copies of unencrypted snapshots remain unencrypted, unless the Encrypted flag is specified during the snapshot copy operation. By default, encrypted snapshot copies use the default AWS Key Management Service (AWS KMS) customer master key (CMK); however, you can specify a non-default CMK with the KmsKeyId parameter.

For more information, see Copying an Amazon EBS Snapshot in the Amazon Elastic Compute Cloud User Guide.

", "CreateCustomerGateway": "

Provides information to AWS about your VPN customer gateway device. The customer gateway is the appliance at your end of the VPN connection. (The device on the AWS side of the VPN connection is the virtual private gateway.) You must provide the Internet-routable IP address of the customer gateway's external interface. The IP address must be static and can't be behind a device performing network address translation (NAT).

For devices that use Border Gateway Protocol (BGP), you can also provide the device's BGP Autonomous System Number (ASN). You can use an existing ASN assigned to your network. If you don't have an ASN already, you can use a private ASN (in the 64512 - 65534 range).

Amazon EC2 supports all 2-byte ASN numbers in the range of 1 - 65534, with the exception of 7224, which is reserved in the us-east-1 region, and 9059, which is reserved in the eu-west-1 region.

For more information about VPN customer gateways, see Adding a Hardware Virtual Private Gateway to Your VPC in the Amazon Virtual Private Cloud User Guide.

You cannot create more than one customer gateway with the same VPN type, IP address, and BGP ASN parameter values. If you run an identical request more than one time, the first request creates the customer gateway, and subsequent requests return information about the existing customer gateway. The subsequent requests do not create new customer gateway resources.

", "CreateDhcpOptions": "

Creates a set of DHCP options for your VPC. After creating the set, you must associate it with the VPC, causing all existing and new instances that you launch in the VPC to use this set of DHCP options. The following are the individual DHCP options you can specify. For more information about the options, see RFC 2132.

Your VPC automatically starts out with a set of DHCP options that includes only a DNS server that we provide (AmazonProvidedDNS). If you create a set of options, and if your VPC has an Internet gateway, make sure to set the domain-name-servers option either to AmazonProvidedDNS or to a domain name server of your choice. For more information about DHCP options, see DHCP Options Sets in the Amazon Virtual Private Cloud User Guide.

", "CreateFlowLogs": "

Creates one or more flow logs to capture IP traffic for a specific network interface, subnet, or VPC. Flow logs are delivered to a specified log group in Amazon CloudWatch Logs. If you specify a VPC or subnet in the request, a log stream is created in CloudWatch Logs for each network interface in the subnet or VPC. Log streams can include information about accepted and rejected traffic to a network interface. You can view the data in your log streams using Amazon CloudWatch Logs.

In your request, you must also specify an IAM role that has permission to publish logs to CloudWatch Logs.

", @@ -160,7 +160,7 @@ "MoveAddressToVpc": "

Moves an Elastic IP address from the EC2-Classic platform to the EC2-VPC platform. The Elastic IP address must be allocated to your account, and it must not be associated with an instance. After the Elastic IP address is moved, it is no longer available for use in the EC2-Classic platform, unless you move it back using the RestoreAddressToClassic request. You cannot move an Elastic IP address that's allocated for use in the EC2-VPC platform to the EC2-Classic platform.

", "PurchaseReservedInstancesOffering": "

Purchases a Reserved Instance for use with your account. With Amazon EC2 Reserved Instances, you obtain a capacity reservation for a certain instance configuration over a specified period of time and pay a lower hourly rate compared to on-Demand Instance pricing.

Use DescribeReservedInstancesOfferings to get a list of Reserved Instance offerings that match your specifications. After you've purchased a Reserved Instance, you can check for your new Reserved Instance with DescribeReservedInstances.

For more information, see Reserved Instances and Reserved Instance Marketplace in the Amazon Elastic Compute Cloud User Guide.

", "RebootInstances": "

Requests a reboot of one or more instances. This operation is asynchronous; it only queues a request to reboot the specified instances. The operation succeeds if the instances are valid and belong to you. Requests to reboot terminated instances are ignored.

If a Linux/Unix instance does not cleanly shut down within four minutes, Amazon EC2 performs a hard reboot.

For more information about troubleshooting, see Getting Console Output and Rebooting Instances in the Amazon Elastic Compute Cloud User Guide.

", - "RegisterImage": "

Registers an AMI. When you're creating an AMI, this is the final step you must complete before you can launch an instance from the AMI. For more information about creating AMIs, see Creating Your Own AMIs in the Amazon Elastic Compute Cloud 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.

You can also use RegisterImage to create an Amazon EBS-backed AMI from a snapshot of a root device volume. For more information, see Launching an Instance from a Snapshot in the Amazon Elastic Compute Cloud User Guide.

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.

You can't register an image where a secondary (non-root) snapshot has AWS Marketplace product codes.

", + "RegisterImage": "

Registers an AMI. When you're creating an AMI, this is the final step you must complete before you can launch an instance from the AMI. This step is required if you're creating an instance store-backed Linux or Windows AMI. For more information, see Creating an Instance Store-Backed Linux AMI and Creating an Instance Store-Backed Windows AMI in the Amazon Elastic Compute Cloud 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.

You can also use RegisterImage to create an Amazon EBS-backed AMI from a snapshot of a root device volume. For more information, see Launching an Instance from a Backup in the Amazon Elastic Compute Cloud User Guide. Note that although you can create a Windows AMI from a snapshot, you can't launch an instance from the AMI - use the CreateImage command instead.

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.

You can't register an image where a secondary (non-root) snapshot has AWS Marketplace product codes.

", "RejectVpcPeeringConnection": "

Rejects a VPC peering connection request. The VPC peering connection must be in the pending-acceptance state. Use the DescribeVpcPeeringConnections request to view your outstanding VPC peering connection requests. To delete an active VPC peering connection, or to delete a VPC peering connection request that you initiated, use DeleteVpcPeeringConnection.

", "ReleaseAddress": "

Releases the specified Elastic IP address.

After releasing an Elastic IP address, it is released to the IP address pool and might be unavailable to you. Be sure to update your DNS records and any servers or devices that communicate with the address. If you attempt to release an Elastic IP address that you already released, you'll get an AuthFailure error if the address is already allocated to another AWS account.

[EC2-Classic, default VPC] Releasing an Elastic IP address automatically disassociates it from any instance that it's associated with. To disassociate an Elastic IP address without releasing it, use DisassociateAddress.

[Nondefault VPC] You must use DisassociateAddress to disassociate the Elastic IP address before you try to release it. Otherwise, Amazon EC2 returns an error (InvalidIPAddress.InUse).

", "ReplaceNetworkAclAssociation": "

Changes which network ACL a subnet is associated with. By default when you create a subnet, it's automatically associated with the default network ACL. For more information about network ACLs, see Network ACLs in the Amazon Virtual Private Cloud User Guide.

", @@ -467,6 +467,7 @@ "Image$BlockDeviceMappings": "

Any block device mapping entries.

", "ImageAttribute$BlockDeviceMappings": "

One or more block device mapping entries.

", "LaunchSpecification$BlockDeviceMappings": "

One or more block device mapping entries.

", + "SpotFleetLaunchSpecification$BlockDeviceMappings": "

One or more block device mapping entries.

", "RequestSpotLaunchSpecification$BlockDeviceMappings": "

One or more block device mapping entries.

" } }, @@ -508,7 +509,7 @@ "ConfirmProductInstanceResult$Return": "

The return value of the request. Returns true if the specified product code is owned by the requester and associated with the specified instance.

", "CopyImageRequest$DryRun": "

Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is DryRunOperation. Otherwise, it is UnauthorizedOperation.

", "CopySnapshotRequest$DryRun": "

Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is DryRunOperation. Otherwise, it is UnauthorizedOperation.

", - "CopySnapshotRequest$Encrypted": "

Specifies whether the destination snapshot should be encrypted. There is no way to create an unencrypted snapshot copy from an encrypted snapshot; however, you can encrypt a copy of an unencrypted snapshot with this flag. The default CMK for EBS is used unless a non-default AWS Key Management Service (KMS) CMK is specified with KmsKeyId. For more information, see Amazon EBS Encryption in the Amazon Elastic Compute Cloud User Guide.

", + "CopySnapshotRequest$Encrypted": "

Specifies whether the destination snapshot should be encrypted. There is no way to create an unencrypted snapshot copy from an encrypted snapshot; however, you can encrypt a copy of an unencrypted snapshot with this flag. The default CMK for EBS is used unless a non-default AWS Key Management Service (AWS KMS) CMK is specified with KmsKeyId. For more information, see Amazon EBS Encryption in the Amazon Elastic Compute Cloud User Guide.

", "CreateCustomerGatewayRequest$DryRun": "

Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is DryRunOperation. Otherwise, it is UnauthorizedOperation.

", "CreateDhcpOptionsRequest$DryRun": "

Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is DryRunOperation. Otherwise, it is UnauthorizedOperation.

", "CreateImageRequest$DryRun": "

Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is DryRunOperation. Otherwise, it is UnauthorizedOperation.

", @@ -693,6 +694,8 @@ "RunInstancesRequest$DisableApiTermination": "

If you set this parameter to true, you can't terminate the instance using the Amazon EC2 console, CLI, or API; otherwise, you can. If you set this parameter to true and then later want to be able to terminate the instance, you must first change the value of the disableApiTermination attribute to false using ModifyInstanceAttribute. Alternatively, if you set InstanceInitiatedShutdownBehavior to terminate, you can terminate the instance by running the shutdown command from the instance.

Default: false

", "RunInstancesRequest$EbsOptimized": "

Indicates whether the instance is optimized for EBS I/O. This optimization provides dedicated throughput to Amazon EBS and an optimized configuration stack to provide optimal EBS I/O performance. This optimization isn't available with all instance types. Additional usage charges apply when using an EBS-optimized instance.

Default: false

", "Snapshot$Encrypted": "

Indicates whether the snapshot is encrypted.

", + "SpotFleetLaunchSpecification$EbsOptimized": "

Indicates whether the instance is optimized for EBS I/O. This optimization provides dedicated throughput to Amazon EBS and an optimized configuration stack to provide optimal EBS I/O performance. This optimization isn't available with all instance types. Additional usage charges apply when using an EBS Optimized instance.

Default: false

", + "SpotFleetMonitoring$Enabled": "

Enables monitoring for the instance.

Default: false

", "SpotFleetRequestConfigData$TerminateInstancesWithExpiration": "

Indicates whether running instances should be terminated when the Spot fleet request expires.

", "StartInstancesRequest$DryRun": "

Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is DryRunOperation. Otherwise, it is UnauthorizedOperation.

", "StopInstancesRequest$DryRun": "

Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is DryRunOperation. Otherwise, it is UnauthorizedOperation.

", @@ -2328,7 +2331,8 @@ "InstanceNetworkInterface$Groups": "

One or more security groups.

", "LaunchSpecification$SecurityGroups": "

One or more security groups. To request an instance in a nondefault VPC, you must specify the ID of the security group. To request an instance in EC2-Classic or a default VPC, you can specify the name or the ID of the security group.

", "NetworkInterface$Groups": "

Any security groups for the network interface.

", - "Reservation$Groups": "

One or more security groups.

" + "Reservation$Groups": "

One or more security groups.

", + "SpotFleetLaunchSpecification$SecurityGroups": "

One or more security groups. To request an instance in a nondefault VPC, you must specify the ID of the security group. To request an instance in EC2-Classic or a default VPC, you can specify the name or the ID of the security group.

" } }, "GroupNameStringList": { @@ -2368,6 +2372,7 @@ "refs": { "LaunchSpecification$IamInstanceProfile": "

The IAM instance profile.

", "RunInstancesRequest$IamInstanceProfile": "

The IAM instance profile.

", + "SpotFleetLaunchSpecification$IamInstanceProfile": null, "RequestSpotLaunchSpecification$IamInstanceProfile": "

The IAM instance profile.

" } }, @@ -2681,6 +2686,7 @@ "refs": { "LaunchSpecification$NetworkInterfaces": "

One or more network interfaces.

", "RunInstancesRequest$NetworkInterfaces": "

One or more network interfaces.

", + "SpotFleetLaunchSpecification$NetworkInterfaces": "

One or more network interfaces.

", "RequestSpotLaunchSpecification$NetworkInterfaces": "

One or more network interfaces.

" } }, @@ -2780,6 +2786,7 @@ "ReservedInstancesConfiguration$InstanceType": "

The instance type for the modified Reserved Instances.

", "ReservedInstancesOffering$InstanceType": "

The instance type on which the Reserved Instance can be used.

", "RunInstancesRequest$InstanceType": "

The instance type. For more information, see Instance Types in the Amazon Elastic Compute Cloud User Guide.

Default: m1.small

", + "SpotFleetLaunchSpecification$InstanceType": "

The instance type.

", "SpotPrice$InstanceType": "

The instance type.

", "RequestSpotLaunchSpecification$InstanceType": "

The instance type.

" } @@ -2962,7 +2969,6 @@ "LaunchSpecification": { "base": "

Describes the launch specification for an instance.

", "refs": { - "LaunchSpecsList$member": null, "SpotInstanceRequest$LaunchSpecification": "

Additional information for launching instances.

" } }, @@ -3026,13 +3032,6 @@ "refs": { } }, - "ModifySnapshotAttributeName": { - "base": null, - "refs": { - "ModifySnapshotAttributeRequest$Attribute": "

The snapshot attribute to modify.

", - "ResetSnapshotAttributeRequest$Attribute": "

The attribute to reset. Currently, only the attribute for permission to create volumes can be reset.

" - } - }, "ModifySnapshotAttributeRequest": { "base": null, "refs": { @@ -3903,7 +3902,9 @@ "SnapshotAttributeName": { "base": null, "refs": { - "DescribeSnapshotAttributeRequest$Attribute": "

The snapshot attribute you would like to view.

" + "DescribeSnapshotAttributeRequest$Attribute": "

The snapshot attribute you would like to view.

", + "ModifySnapshotAttributeRequest$Attribute": "

The snapshot attribute to modify.

Only volume creation permissions may be modified at the customer level.

", + "ResetSnapshotAttributeRequest$Attribute": "

The attribute to reset. Currently, only the attribute for permission to create volumes can be reset.

" } }, "SnapshotDetail": { @@ -3957,6 +3958,18 @@ "DescribeSpotDatafeedSubscriptionResult$SpotDatafeedSubscription": "

The Spot Instance data feed subscription.

" } }, + "SpotFleetLaunchSpecification": { + "base": "

Describes the launch specification for an instance.

", + "refs": { + "LaunchSpecsList$member": null + } + }, + "SpotFleetMonitoring": { + "base": "

Describes whether monitoring is enabled.

", + "refs": { + "SpotFleetLaunchSpecification$Monitoring": "

Enable or disable monitoring for the instance.

" + } + }, "SpotFleetRequestConfig": { "base": "

Describes a Spot fleet request.

", "refs": { @@ -4026,6 +4039,7 @@ "base": "

Describes Spot Instance placement.

", "refs": { "LaunchSpecification$Placement": "

The placement information for the instance.

", + "SpotFleetLaunchSpecification$Placement": null, "RequestSpotLaunchSpecification$Placement": "

The placement information for the instance.

" } }, @@ -4145,14 +4159,14 @@ "AttachVpnGatewayRequest$VpcId": "

The ID of the VPC.

", "AttributeValue$Value": "

Valid values are case-sensitive and vary by action.

", "AuthorizeSecurityGroupEgressRequest$GroupId": "

The ID of the security group.

", - "AuthorizeSecurityGroupEgressRequest$SourceSecurityGroupName": "

[EC2-Classic, default VPC] The name of the destination security group. You can't specify a destination security group and a CIDR IP address range.

", - "AuthorizeSecurityGroupEgressRequest$SourceSecurityGroupOwnerId": "

The ID of the destination security group. You can't specify a destination security group and a CIDR IP address range.

", + "AuthorizeSecurityGroupEgressRequest$SourceSecurityGroupName": "

The name of a destination security group. To authorize outbound access to a destination security group, we recommend that you use a set of IP permissions instead.

", + "AuthorizeSecurityGroupEgressRequest$SourceSecurityGroupOwnerId": "

The AWS account number for a destination security group. To authorize outbound access to a destination security group, we recommend that you use a set of IP permissions instead.

", "AuthorizeSecurityGroupEgressRequest$IpProtocol": "

The IP protocol name (tcp, udp, icmp) or number (see Protocol Numbers). Use -1 to specify all.

", "AuthorizeSecurityGroupEgressRequest$CidrIp": "

The CIDR IP address range. You can't specify this parameter when specifying a source security group.

", "AuthorizeSecurityGroupIngressRequest$GroupName": "

[EC2-Classic, default VPC] The name of the security group.

", "AuthorizeSecurityGroupIngressRequest$GroupId": "

The ID of the security group. Required for a nondefault VPC.

", - "AuthorizeSecurityGroupIngressRequest$SourceSecurityGroupName": "

[EC2-Classic, default VPC] The name of the source security group. You can't specify this parameter in combination with the following parameters: the CIDR IP address range, the start of the port range, and the end of the port range.

", - "AuthorizeSecurityGroupIngressRequest$SourceSecurityGroupOwnerId": "

The ID of the source security group. You can't specify this parameter in combination with the following parameters: the CIDR IP address range, the start of the port range, and the end of the port range.

", + "AuthorizeSecurityGroupIngressRequest$SourceSecurityGroupName": "

[EC2-Classic, default VPC] The name of the source security group. You can't specify this parameter in combination with the following parameters: the CIDR IP address range, the start of the port range, the IP protocol, and the end of the port range. For EC2-VPC, the source security group must be in the same VPC.

", + "AuthorizeSecurityGroupIngressRequest$SourceSecurityGroupOwnerId": "

[EC2-Classic, default VPC] The AWS account number for the source security group. For EC2-VPC, the source security group must be in the same VPC. You can't specify this parameter in combination with the following parameters: the CIDR IP address range, the IP protocol, the start of the port range, and the end of the port range. Creates rules that grant full ICMP, UDP, and TCP access. To create a rule with a specific IP protocol and port range, use a set of IP permissions instead.

", "AuthorizeSecurityGroupIngressRequest$IpProtocol": "

The IP protocol name (tcp, udp, icmp) or number (see Protocol Numbers). (VPC only) Use -1 to specify all.

", "AuthorizeSecurityGroupIngressRequest$CidrIp": "

The CIDR IP address range. You can't specify this parameter when specifying a source security group.

", "AvailabilityZone$ZoneName": "

The name of the Availability Zone.

", @@ -4203,7 +4217,7 @@ "CopySnapshotRequest$Description": "

A description for the EBS snapshot.

", "CopySnapshotRequest$DestinationRegion": "

The destination region to use in the PresignedUrl parameter of a snapshot copy operation. This parameter is only valid for specifying the destination region in a PresignedUrl parameter, where it is required.

CopySnapshot sends the snapshot copy to the regional endpoint that you send the HTTP request to, such as ec2.us-east-1.amazonaws.com (in the AWS CLI, this is specified with the --region parameter or the default region in your AWS configuration file).

", "CopySnapshotRequest$PresignedUrl": "

The pre-signed URL that facilitates copying an encrypted snapshot. This parameter is only required when copying an encrypted snapshot with the Amazon EC2 Query API; it is available as an optional parameter in all other cases. The PresignedUrl should use the snapshot source endpoint, the CopySnapshot action, and include the SourceRegion, SourceSnapshotId, and DestinationRegion parameters. The PresignedUrl must be signed using AWS Signature Version 4. Because EBS snapshots are stored in Amazon S3, the signing algorithm for this parameter uses the same logic that is described in Authenticating Requests by Using Query Parameters (AWS Signature Version 4) in the Amazon Simple Storage Service API Reference. An invalid or improperly signed PresignedUrl will cause the copy operation to fail asynchronously, and the snapshot will move to an error state.

", - "CopySnapshotRequest$KmsKeyId": "

The full ARN of the AWS Key Management Service (KMS) CMK to use when creating the snapshot copy. This parameter is only required if you want to use a non-default CMK; if this parameter is not specified, the default CMK for EBS is used. The ARN contains the arn:aws:kms namespace, followed by the region of the CMK, the AWS account ID of the CMK owner, the key namespace, and then the CMK ID. For example, arn:aws:kms:us-east-1:012345678910:key/abcd1234-a123-456a-a12b-a123b4cd56ef. The specified CMK must exist in the region that the snapshot is being copied to. If a KmsKeyId is specified, the Encrypted flag must also be set.

", + "CopySnapshotRequest$KmsKeyId": "

The full ARN of the AWS Key Management Service (AWS KMS) CMK to use when creating the snapshot copy. This parameter is only required if you want to use a non-default CMK; if this parameter is not specified, the default CMK for EBS is used. The ARN contains the arn:aws:kms namespace, followed by the region of the CMK, the AWS account ID of the CMK owner, the key namespace, and then the CMK ID. For example, arn:aws:kms:us-east-1:012345678910:key/abcd1234-a123-456a-a12b-a123b4cd56ef. The specified CMK must exist in the region that the snapshot is being copied to. If a KmsKeyId is specified, the Encrypted flag must also be set.

", "CopySnapshotResult$SnapshotId": "

The ID of the new snapshot.

", "CreateCustomerGatewayRequest$PublicIp": "

The Internet-routable IP address for the customer gateway's outside interface. The address must be static.

", "CreateFlowLogsRequest$LogGroupName": "

The name of the CloudWatch log group.

", @@ -4233,8 +4247,6 @@ "CreateRouteRequest$InstanceId": "

The ID of a NAT instance in your VPC. The operation fails if you specify an instance ID unless exactly one network interface is attached.

", "CreateRouteRequest$NetworkInterfaceId": "

The ID of a network interface.

", "CreateRouteRequest$VpcPeeringConnectionId": "

The ID of a VPC peering connection.

", - "CreateRouteRequest$ClientToken": "

Unique, case-sensitive identifier you provide to ensure the idempotency of the request. For more information, see How to Ensure Idempotency.

", - "CreateRouteResult$ClientToken": "

Unique, case-sensitive identifier you provide to ensure the idempotency of the request.

", "CreateRouteTableRequest$VpcId": "

The ID of the VPC.

", "CreateSecurityGroupRequest$GroupName": "

The name of the security group.

Constraints: Up to 255 characters in length

Constraints for EC2-Classic: ASCII characters

Constraints for EC2-VPC: a-z, A-Z, 0-9, spaces, and ._-:/()#,@[]+=&;{}!$*

", "CreateSecurityGroupRequest$Description": "

A description for the security group. This is informational only.

Constraints: Up to 255 characters in length

Constraints for EC2-Classic: ASCII characters

Constraints for EC2-VPC: a-z, A-Z, 0-9, spaces, and ._-:/()#,@[]+=&;{}!$*

", @@ -4250,9 +4262,9 @@ "CreateVolumePermission$UserId": "

The specific AWS account ID that is to be added or removed from a volume's list of create volume permissions.

", "CreateVolumeRequest$SnapshotId": "

The snapshot from which to create the volume.

", "CreateVolumeRequest$AvailabilityZone": "

The Availability Zone in which to create the volume. Use DescribeAvailabilityZones to list the Availability Zones that are currently available to you.

", - "CreateVolumeRequest$KmsKeyId": "

The full ARN of the AWS Key Management Service (KMS) Customer Master Key (CMK) to use when creating the encrypted volume. This parameter is only required if you want to use a non-default CMK; if this parameter is not specified, the default CMK for EBS is used. The ARN contains the arn:aws:kms namespace, followed by the region of the CMK, the AWS account ID of the CMK owner, the key namespace, and then the CMK ID. For example, arn:aws:kms:us-east-1:012345678910:key/abcd1234-a123-456a-a12b-a123b4cd56ef. If a KmsKeyId is specified, the Encrypted flag must also be set.

", + "CreateVolumeRequest$KmsKeyId": "

The full ARN of the AWS Key Management Service (AWS KMS) customer master key (CMK) to use when creating the encrypted volume. This parameter is only required if you want to use a non-default CMK; if this parameter is not specified, the default CMK for EBS is used. The ARN contains the arn:aws:kms namespace, followed by the region of the CMK, the AWS account ID of the CMK owner, the key namespace, and then the CMK ID. For example, arn:aws:kms:us-east-1:012345678910:key/abcd1234-a123-456a-a12b-a123b4cd56ef. If a KmsKeyId is specified, the Encrypted flag must also be set.

", "CreateVpcEndpointRequest$VpcId": "

The ID of the VPC in which the endpoint will be used.

", - "CreateVpcEndpointRequest$ServiceName": "The AWS service name, in the form com.amazonaws.<region>.<service>. To get a list of available services, use the DescribeVpcEndpointServices request.", + "CreateVpcEndpointRequest$ServiceName": "

The AWS service name, in the form com.amazonaws.region.service. To get a list of available services, use the DescribeVpcEndpointServices request.

", "CreateVpcEndpointRequest$PolicyDocument": "

A policy to attach to the endpoint that controls access to the service. The policy must be in valid JSON format. If this parameter is not specified, we attach a default policy that allows full access to the service.

", "CreateVpcEndpointRequest$ClientToken": "

Unique, case-sensitive identifier you provide to ensure the idempotency of the request. For more information, see How to Ensure Idempotency.

", "CreateVpcEndpointResult$ClientToken": "

Unique, case-sensitive identifier you provide to ensure the idempotency of the request.

", @@ -4385,7 +4397,7 @@ "EnableVolumeIORequest$VolumeId": "

The ID of the volume.

", "EnableVpcClassicLinkRequest$VpcId": "

The ID of the VPC.

", "EventInformation$InstanceId": "

The ID of the instance. This information is available only for instanceChange events.

", - "EventInformation$EventSubType": "

The event.

The following are the error events.

The following are the fleetRequestChange events.

The following are the instanceChange events.

", + "EventInformation$EventSubType": "

The event.

The following are the error events.

The following are the fleetRequestChange events.

The following are the instanceChange events.

", "EventInformation$EventDescription": "

The description of the event.

", "ExecutableByStringList$member": null, "ExportTask$ExportTaskId": "

The ID of the export task.

", @@ -4685,14 +4697,14 @@ "RestoreAddressToClassicRequest$PublicIp": "

The Elastic IP address.

", "RestoreAddressToClassicResult$PublicIp": "

The Elastic IP address.

", "RevokeSecurityGroupEgressRequest$GroupId": "

The ID of the security group.

", - "RevokeSecurityGroupEgressRequest$SourceSecurityGroupName": "

[EC2-Classic, default VPC] The name of the destination security group. You can't specify a destination security group and a CIDR IP address range.

", - "RevokeSecurityGroupEgressRequest$SourceSecurityGroupOwnerId": "

The ID of the destination security group. You can't specify a destination security group and a CIDR IP address range.

", + "RevokeSecurityGroupEgressRequest$SourceSecurityGroupName": "

The name of a destination security group. To revoke outbound access to a destination security group, we recommend that you use a set of IP permissions instead.

", + "RevokeSecurityGroupEgressRequest$SourceSecurityGroupOwnerId": "

The AWS account number for a destination security group. To revoke outbound access to a destination security group, we recommend that you use a set of IP permissions instead.

", "RevokeSecurityGroupEgressRequest$IpProtocol": "

The IP protocol name (tcp, udp, icmp) or number (see Protocol Numbers). Use -1 to specify all.

", "RevokeSecurityGroupEgressRequest$CidrIp": "

The CIDR IP address range. You can't specify this parameter when specifying a source security group.

", "RevokeSecurityGroupIngressRequest$GroupName": "

[EC2-Classic, default VPC] The name of the security group.

", - "RevokeSecurityGroupIngressRequest$GroupId": "

The ID of the security group.

", - "RevokeSecurityGroupIngressRequest$SourceSecurityGroupName": "

[EC2-Classic, default VPC] The name of the source security group. You can't specify this parameter in combination with the following parameters: the CIDR IP address range, the start of the port range, and the end of the port range.

", - "RevokeSecurityGroupIngressRequest$SourceSecurityGroupOwnerId": "

The ID of the source security group. You can't specify this parameter in combination with the following parameters: the CIDR IP address range, the start of the port range, and the end of the port range.

", + "RevokeSecurityGroupIngressRequest$GroupId": "

The ID of the security group. Required for a security group in a nondefault VPC.

", + "RevokeSecurityGroupIngressRequest$SourceSecurityGroupName": "

[EC2-Classic, default VPC] The name of the source security group. You can't specify this parameter in combination with the following parameters: the CIDR IP address range, the start of the port range, the IP protocol, and the end of the port range. For EC2-VPC, the source security group must be in the same VPC.

", + "RevokeSecurityGroupIngressRequest$SourceSecurityGroupOwnerId": "

[EC2-Classic, default VPC] The AWS account ID of the source security group. For EC2-VPC, the source security group must be in the same VPC. You can't specify this parameter in combination with the following parameters: the CIDR IP address range, the IP protocol, the start of the port range, and the end of the port range. To revoke a specific rule for an IP protocol and port range, use a set of IP permissions instead.

", "RevokeSecurityGroupIngressRequest$IpProtocol": "

The IP protocol name (tcp, udp, icmp) or number (see Protocol Numbers). Use -1 to specify all.

", "RevokeSecurityGroupIngressRequest$CidrIp": "

The CIDR IP address range. You can't specify this parameter when specifying a source security group.

", "Route$DestinationCidrBlock": "

The CIDR block used for the destination match.

", @@ -4733,7 +4745,7 @@ "Snapshot$OwnerId": "

The AWS account ID of the EBS snapshot owner.

", "Snapshot$Description": "

The description for the snapshot.

", "Snapshot$OwnerAlias": "

The AWS account alias (for example, amazon, self) or AWS account ID that owns the snapshot.

", - "Snapshot$KmsKeyId": "

The full ARN of the AWS Key Management Service (KMS) Customer Master Key (CMK) that was used to protect the volume encryption key for the parent volume.

", + "Snapshot$KmsKeyId": "

The full ARN of the AWS Key Management Service (AWS KMS) customer master key (CMK) that was used to protect the volume encryption key for the parent volume.

", "SnapshotDetail$Description": "

A description for the snapshot.

", "SnapshotDetail$Format": "

The format of the disk image from which the snapshot is created.

", "SnapshotDetail$Url": "

The URL used to access the disk image.

", @@ -4756,6 +4768,13 @@ "SpotDatafeedSubscription$OwnerId": "

The AWS account ID of the account.

", "SpotDatafeedSubscription$Bucket": "

The Amazon S3 bucket where the Spot Instance data feed is located.

", "SpotDatafeedSubscription$Prefix": "

The prefix that is prepended to data feed files.

", + "SpotFleetLaunchSpecification$ImageId": "

The ID of the AMI.

", + "SpotFleetLaunchSpecification$KeyName": "

The name of the key pair.

", + "SpotFleetLaunchSpecification$UserData": "

The Base64-encoded MIME user data to make available to the instances.

", + "SpotFleetLaunchSpecification$AddressingType": "

Deprecated.

", + "SpotFleetLaunchSpecification$KernelId": "

The ID of the kernel.

", + "SpotFleetLaunchSpecification$RamdiskId": "

The ID of the RAM disk.

", + "SpotFleetLaunchSpecification$SubnetId": "

The ID of the subnet in which to launch the instance.

", "SpotFleetRequestConfig$SpotFleetRequestId": "

The ID of the Spot fleet request.

", "SpotFleetRequestConfigData$ClientToken": "

A unique, case-sensitive identifier you provide to ensure idempotency of your listings. This helps avoid duplicate listings. For more information, see Ensuring Idempotency.

", "SpotFleetRequestConfigData$SpotPrice": "

The maximum hourly price (bid) for any Spot Instance launched to fulfill the request.

", @@ -4808,7 +4827,7 @@ "Volume$VolumeId": "

The ID of the volume.

", "Volume$SnapshotId": "

The snapshot from which the volume was created, if applicable.

", "Volume$AvailabilityZone": "

The Availability Zone for the volume.

", - "Volume$KmsKeyId": "

The full ARN of the AWS Key Management Service (KMS) Customer Master Key (CMK) that was used to protect the volume encryption key for the volume.

", + "Volume$KmsKeyId": "

The full ARN of the AWS Key Management Service (AWS KMS) customer master key (CMK) that was used to protect the volume encryption key for the volume.

", "VolumeAttachment$VolumeId": "

The ID of the volume.

", "VolumeAttachment$InstanceId": "

The ID of the instance.

", "VolumeAttachment$Device": "

The device name.

",