Set to true to disable rollback of the stack if stack creation failed. You can specify either DisableRollback or OnFailure, but not both.
Default: false
Preserves the state of previously provisioned resources when an operation fails.
Default: True
Preserves the state of previously provisioned resources when an operation fails. This parameter can't be specified when the OnStackFailure parameter to the CreateChangeSet API operation was specified.
True - if the stack creation fails, do nothing. This is equivalent to specifying DO_NOTHING for the OnStackFailure parameter to the CreateChangeSet API operation.
False - if the stack creation fails, roll back the stack. This is equivalent to specifying ROLLBACK for the OnStackFailure parameter to the CreateChangeSet API operation.
Default: True
Boolean to enable or disable rollback on stack creation failures:
true: disable rollback.
false: enable rollback.
Preserve the state of previously provisioned resources when an operation fails.
Default: False
Determines what action will be taken if stack creation fails. This must be one of: DO_NOTHING, ROLLBACK, or DELETE. You can specify either OnFailure or DisableRollback, but not both.
Default: ROLLBACK
Determines what action will be taken if stack creation fails. If this parameter is specified, the DisableRollback parameter to the ExecuteChangeSet API operation must not be specified. This must be one of these values:
DELETE - Deletes the change set if the stack creation fails. This is only valid when the ChangeSetType parameter is set to CREATE. If the deletion of the stack fails, the status of the stack is DELETE_FAILED.
DO_NOTHING - if the stack creation fails, do nothing. This is equivalent to specifying true for the DisableRollback parameter to the ExecuteChangeSet API operation.
ROLLBACK - if the stack creation fails, roll back the stack. This is equivalent to specifying false for the DisableRollback parameter to the ExecuteChangeSet API operation.
For nested stacks, when the OnStackFailure parameter is set to DELETE for the change set for the parent stack, any failure in a child stack will cause the parent stack creation to fail and all stacks to be deleted.
Determines what action will be taken if stack creation fails. When this parameter is specified, the DisableRollback parameter to the ExecuteChangeSet API operation must not be specified. This must be one of these values:
DELETE - Deletes the change set if the stack creation fails. This is only valid when the ChangeSetType parameter is set to CREATE. If the deletion of the stack fails, the status of the stack is DELETE_FAILED.
DO_NOTHING - if the stack creation fails, do nothing. This is equivalent to specifying true for the DisableRollback parameter to the ExecuteChangeSet API operation.
ROLLBACK - if the stack creation fails, roll back the stack. This is equivalent to specifying false for the DisableRollback parameter to the ExecuteChangeSet API operation.
The specified operation ID already exists.
", "refs": { diff --git a/models/apis/ec2/2016-11-15/api-2.json b/models/apis/ec2/2016-11-15/api-2.json index 85aa50d62b4..c128541d072 100755 --- a/models/apis/ec2/2016-11-15/api-2.json +++ b/models/apis/ec2/2016-11-15/api-2.json @@ -7592,6 +7592,7 @@ } } }, + "AvailabilityZoneId":{"type":"string"}, "AvailabilityZoneList":{ "type":"list", "member":{ @@ -9786,8 +9787,8 @@ "ClientToken":{"shape":"String"}, "InstanceType":{"shape":"String"}, "InstancePlatform":{"shape":"CapacityReservationInstancePlatform"}, - "AvailabilityZone":{"shape":"String"}, - "AvailabilityZoneId":{"shape":"String"}, + "AvailabilityZone":{"shape":"AvailabilityZoneName"}, + "AvailabilityZoneId":{"shape":"AvailabilityZoneId"}, "Tenancy":{"shape":"CapacityReservationTenancy"}, "InstanceCount":{"shape":"Integer"}, "EbsOptimized":{"shape":"Boolean"}, @@ -43447,7 +43448,9 @@ "members":{ "S3":{"shape":"VerifiedAccessLogS3DestinationOptions"}, "CloudWatchLogs":{"shape":"VerifiedAccessLogCloudWatchLogsDestinationOptions"}, - "KinesisDataFirehose":{"shape":"VerifiedAccessLogKinesisDataFirehoseDestinationOptions"} + "KinesisDataFirehose":{"shape":"VerifiedAccessLogKinesisDataFirehoseDestinationOptions"}, + "LogVersion":{"shape":"String"}, + "IncludeTrustContext":{"shape":"Boolean"} } }, "VerifiedAccessLogS3Destination":{ @@ -43499,6 +43502,14 @@ "KinesisDataFirehose":{ "shape":"VerifiedAccessLogKinesisDataFirehoseDestination", "locationName":"kinesisDataFirehose" + }, + "LogVersion":{ + "shape":"String", + "locationName":"logVersion" + }, + "IncludeTrustContext":{ + "shape":"Boolean", + "locationName":"includeTrustContext" } } }, diff --git a/models/apis/ec2/2016-11-15/docs-2.json b/models/apis/ec2/2016-11-15/docs-2.json index cfaa5fae72d..82a1c236932 100755 --- a/models/apis/ec2/2016-11-15/docs-2.json +++ b/models/apis/ec2/2016-11-15/docs-2.json @@ -219,7 +219,7 @@ "DeregisterInstanceEventNotificationAttributes": "Deregisters tag keys to prevent tags that have the specified tag keys from being included in scheduled event notifications for resources in the Region.
", "DeregisterTransitGatewayMulticastGroupMembers": "Deregisters the specified members (network interfaces) from the transit gateway multicast group.
", "DeregisterTransitGatewayMulticastGroupSources": "Deregisters the specified sources (network interfaces) from the transit gateway multicast group.
", - "DescribeAccountAttributes": "Describes attributes of your Amazon Web Services account. The following are the supported account attributes:
supported-platforms: Indicates whether your account can launch instances into EC2-Classic and EC2-VPC, or only into EC2-VPC.
default-vpc: The ID of the default VPC for your account, or none.
max-instances: This attribute is no longer supported. The returned value does not reflect your actual vCPU limit for running On-Demand Instances. For more information, see On-Demand Instance Limits in the Amazon Elastic Compute Cloud User Guide.
vpc-max-security-groups-per-interface: The maximum number of security groups that you can assign to a network interface.
max-elastic-ips: The maximum number of Elastic IP addresses that you can allocate for use with EC2-Classic.
vpc-max-elastic-ips: The maximum number of Elastic IP addresses that you can allocate for use with EC2-VPC.
We are retiring EC2-Classic on August 15, 2022. We recommend that you migrate from EC2-Classic to a VPC. For more information, see Migrate from EC2-Classic to a VPC in the Amazon EC2 User Guide.
Describes attributes of your Amazon Web Services account. The following are the supported account attributes:
default-vpc: The ID of the default VPC for your account, or none.
max-instances: This attribute is no longer supported. The returned value does not reflect your actual vCPU limit for running On-Demand Instances. For more information, see On-Demand Instance Limits in the Amazon Elastic Compute Cloud User Guide.
max-elastic-ips: The maximum number of Elastic IP addresses that you can allocate.
supported-platforms: This attribute is deprecated.
vpc-max-elastic-ips: The maximum number of Elastic IP addresses that you can allocate.
vpc-max-security-groups-per-interface: The maximum number of security groups that you can assign to a network interface.
Describes an Elastic IP address transfer. For more information, see Transfer Elastic IP addresses in the Amazon Virtual Private Cloud User Guide.
When you transfer an Elastic IP address, there is a two-step handshake between the source and transfer Amazon Web Services accounts. When the source account starts the transfer, the transfer account has seven days to accept the Elastic IP address transfer. During those seven days, the source account can view the pending transfer by using this action. After seven days, the transfer expires and ownership of the Elastic IP address returns to the source account. Accepted transfers are visible to the source account for three days after the transfers have been accepted.
", "DescribeAddresses": "Describes the specified Elastic IP addresses or all of your Elastic IP addresses.
", "DescribeAddressesAttribute": "Describes the attributes of the specified Elastic IP addresses. For requirements, see Using reverse DNS for email applications.
", @@ -1703,6 +1703,12 @@ "AvailabilityZoneList$member": null } }, + "AvailabilityZoneId": { + "base": null, + "refs": { + "CreateCapacityReservationRequest$AvailabilityZoneId": "The ID of the Availability Zone in which to create the Capacity Reservation.
" + } + }, "AvailabilityZoneList": { "base": null, "refs": { @@ -1724,6 +1730,7 @@ "AvailabilityZoneName": { "base": null, "refs": { + "CreateCapacityReservationRequest$AvailabilityZone": "The Availability Zone in which to create the Capacity Reservation.
", "CreateVolumeRequest$AvailabilityZone": "The Availability Zone in which to create the volume.
" } }, @@ -2737,8 +2744,10 @@ "VerifiedAccessLogCloudWatchLogsDestinationOptions$Enabled": "Indicates whether logging is enabled.
", "VerifiedAccessLogKinesisDataFirehoseDestination$Enabled": "Indicates whether logging is enabled.
", "VerifiedAccessLogKinesisDataFirehoseDestinationOptions$Enabled": "Indicates whether logging is enabled.
", + "VerifiedAccessLogOptions$IncludeTrustContext": "Include trust data sent by trust providers into the logs.
", "VerifiedAccessLogS3Destination$Enabled": "Indicates whether logging is enabled.
", "VerifiedAccessLogS3DestinationOptions$Enabled": "Indicates whether logging is enabled.
", + "VerifiedAccessLogs$IncludeTrustContext": "Describes current setting for including trust data into the logs.
", "Volume$Encrypted": "Indicates whether the volume is encrypted.
", "Volume$FastRestored": "Indicates whether the volume was created using fast snapshot restore.
", "Volume$MultiAttachEnabled": "Indicates whether Amazon EBS Multi-Attach is enabled.
", @@ -18487,8 +18496,6 @@ "CreateCapacityReservationFleetResult$AllocationStrategy": "The allocation strategy used by the Capacity Reservation Fleet.
", "CreateCapacityReservationRequest$ClientToken": "Unique, case-sensitive identifier that you provide to ensure the idempotency of the request. For more information, see Ensure Idempotency.
", "CreateCapacityReservationRequest$InstanceType": "The instance type for which to reserve capacity. For more information, see Instance types in the Amazon EC2 User Guide.
", - "CreateCapacityReservationRequest$AvailabilityZone": "The Availability Zone in which to create the Capacity Reservation.
", - "CreateCapacityReservationRequest$AvailabilityZoneId": "The ID of the Availability Zone in which to create the Capacity Reservation.
", "CreateCarrierGatewayRequest$ClientToken": "Unique, case-sensitive identifier that you provide to ensure the idempotency of the request. For more information, see How to ensure idempotency.
", "CreateClientVpnEndpointRequest$ClientCidrBlock": "The IPv4 address range, in CIDR notation, from which to assign client IP addresses. The address range cannot overlap with the local CIDR of the VPC in which the associated subnet is located, or the routes that you add manually. The address range cannot be changed after the Client VPN endpoint has been created. Client CIDR range must have a size of at least /22 and must not be greater than /12.
", "CreateClientVpnEndpointRequest$ServerCertificateArn": "The ARN of the server certificate. For more information, see the Certificate Manager User Guide.
", @@ -20151,12 +20158,14 @@ "VerifiedAccessLogDeliveryStatus$Message": "The status message.
", "VerifiedAccessLogKinesisDataFirehoseDestination$DeliveryStream": "The ID of the delivery stream.
", "VerifiedAccessLogKinesisDataFirehoseDestinationOptions$DeliveryStream": "The ID of the delivery stream.
", + "VerifiedAccessLogOptions$LogVersion": "The logging version to use.
Valid values: ocsf-0.1 | ocsf-1.0.0-rc.2
The bucket name.
", "VerifiedAccessLogS3Destination$Prefix": "The bucket prefix.
", "VerifiedAccessLogS3Destination$BucketOwner": "The Amazon Web Services account number that owns the bucket.
", "VerifiedAccessLogS3DestinationOptions$BucketName": "The bucket name.
", "VerifiedAccessLogS3DestinationOptions$Prefix": "The bucket prefix.
", "VerifiedAccessLogS3DestinationOptions$BucketOwner": "The ID of the Amazon Web Services account that owns the Amazon S3 bucket.
", + "VerifiedAccessLogs$LogVersion": "Describes current setting for the logging version.
", "VerifiedAccessTrustProvider$VerifiedAccessTrustProviderId": "The ID of the Amazon Web Services Verified Access trust provider.
", "VerifiedAccessTrustProvider$Description": "A description for the Amazon Web Services Verified Access trust provider.
", "VerifiedAccessTrustProvider$PolicyReferenceName": "The identifier to be used when working with policy rules.
", @@ -22463,7 +22472,7 @@ } }, "VerifiedAccessLogOptions": { - "base": "Describes the destinations for Verified Access logs.
", + "base": "Options for Verified Access logs.
", "refs": { "ModifyVerifiedAccessInstanceLoggingConfigurationRequest$AccessLogs": "The configuration options for Verified Access instances.
" } @@ -22481,7 +22490,7 @@ } }, "VerifiedAccessLogs": { - "base": "Describes the destinations for Verified Access logs.
", + "base": "Describes the options for Verified Access logs.
", "refs": { "VerifiedAccessInstanceLoggingConfiguration$AccessLogs": "Details about the logging options.
" } diff --git a/models/apis/ec2/2016-11-15/examples-1.json b/models/apis/ec2/2016-11-15/examples-1.json index 93b4bf8835c..9b2d9f0b51e 100755 --- a/models/apis/ec2/2016-11-15/examples-1.json +++ b/models/apis/ec2/2016-11-15/examples-1.json @@ -3,13 +3,12 @@ "examples": { "AllocateAddress": [ { - "input": { - "Domain": "vpc" - }, "output": { "AllocationId": "eipalloc-64d5890a", "Domain": "vpc", - "PublicIp": "203.0.113.0" + "NetworkBorderGroup": "us-east-1", + "PublicIp": "203.0.113.0", + "PublicIpv4Pool": "amazon" }, "comments": { "input": { @@ -17,24 +16,9 @@ "output": { } }, - "description": "This example allocates an Elastic IP address to use with an instance in a VPC.", + "description": "This example allocates an Elastic IP address.", "id": "ec2-allocate-address-1", - "title": "To allocate an Elastic IP address for EC2-VPC" - }, - { - "output": { - "Domain": "standard", - "PublicIp": "198.51.100.0" - }, - "comments": { - "input": { - }, - "output": { - } - }, - "description": "This example allocates an Elastic IP address to use with an instance in EC2-Classic.", - "id": "ec2-allocate-address-2", - "title": "To allocate an Elastic IP address for EC2-Classic" + "title": "To allocate an Elastic IP address" } ], "AssignPrivateIpAddresses": [ @@ -86,9 +70,9 @@ "output": { } }, - "description": "This example associates the specified Elastic IP address with the specified instance in a VPC.", + "description": "This example associates the specified Elastic IP address with the specified instance.", "id": "ec2-associate-address-1", - "title": "To associate an Elastic IP address in EC2-VPC" + "title": "To associate an Elastic IP address" }, { "input": { @@ -107,21 +91,6 @@ "description": "This example associates the specified Elastic IP address with the specified network interface.", "id": "ec2-associate-address-2", "title": "To associate an Elastic IP address with a network interface" - }, - { - "input": { - "InstanceId": "i-07ffe74c7330ebf53", - "PublicIp": "198.51.100.0" - }, - "comments": { - "input": { - }, - "output": { - } - }, - "description": "This example associates an Elastic IP address with an instance in EC2-Classic.", - "id": "ec2-associate-address-3", - "title": "To associate an Elastic IP address in EC2-Classic" } ], "AssociateDhcpOptions": [ @@ -1734,71 +1703,6 @@ "description": "This example describes your Elastic IP addresses.", "id": "ec2-describe-addresses-1", "title": "To describe your Elastic IP addresses" - }, - { - "input": { - "Filters": [ - { - "Name": "domain", - "Values": [ - "vpc" - ] - } - ] - }, - "output": { - "Addresses": [ - { - "AllocationId": "eipalloc-12345678", - "AssociationId": "eipassoc-12345678", - "Domain": "vpc", - "InstanceId": "i-1234567890abcdef0", - "NetworkInterfaceId": "eni-12345678", - "NetworkInterfaceOwnerId": "123456789012", - "PrivateIpAddress": "10.0.1.241", - "PublicIp": "203.0.113.0" - } - ] - }, - "comments": { - "input": { - }, - "output": { - } - }, - "description": "This example describes your Elastic IP addresses for use with instances in a VPC.", - "id": "ec2-describe-addresses-2", - "title": "To describe your Elastic IP addresses for EC2-VPC" - }, - { - "input": { - "Filters": [ - { - "Name": "domain", - "Values": [ - "standard" - ] - } - ] - }, - "output": { - "Addresses": [ - { - "Domain": "standard", - "InstanceId": "i-1234567890abcdef0", - "PublicIp": "198.51.100.0" - } - ] - }, - "comments": { - "input": { - }, - "output": { - } - }, - "description": "This example describes your Elastic IP addresses for use with instances in EC2-Classic.", - "id": "ec2-describe-addresses-3", - "title": "To describe your Elastic IP addresses for EC2-Classic" } ], "DescribeAvailabilityZones": [ @@ -2235,7 +2139,7 @@ { "Attachments": [ { - "State": "available", + "State": "attached", "VpcId": "vpc-a01106c2" } ], @@ -2385,7 +2289,7 @@ "output": { "MovingAddressStatuses": [ { - "MoveStatus": "MovingToVpc", + "MoveStatus": "movingToVpc", "PublicIp": "198.51.100.0" } ] @@ -2771,104 +2675,6 @@ "title": "To describe a route table" } ], - "DescribeScheduledInstanceAvailability": [ - { - "input": { - "FirstSlotStartTimeRange": { - "EarliestTime": "2016-01-31T00:00:00Z", - "LatestTime": "2016-01-31T04:00:00Z" - }, - "Recurrence": { - "Frequency": "Weekly", - "Interval": 1, - "OccurrenceDays": [ - 1 - ] - } - }, - "output": { - "ScheduledInstanceAvailabilitySet": [ - { - "AvailabilityZone": "us-west-2b", - "AvailableInstanceCount": 20, - "FirstSlotStartTime": "2016-01-31T00:00:00Z", - "HourlyPrice": "0.095", - "InstanceType": "c4.large", - "MaxTermDurationInDays": 366, - "MinTermDurationInDays": 366, - "NetworkPlatform": "EC2-VPC", - "Platform": "Linux/UNIX", - "PurchaseToken": "eyJ2IjoiMSIsInMiOjEsImMiOi...", - "Recurrence": { - "Frequency": "Weekly", - "Interval": 1, - "OccurrenceDaySet": [ - 1 - ], - "OccurrenceRelativeToEnd": false - }, - "SlotDurationInHours": 23, - "TotalScheduledInstanceHours": 1219 - } - ] - }, - "comments": { - "input": { - }, - "output": { - } - }, - "description": "This example describes a schedule that occurs every week on Sunday, starting on the specified date. Note that the output contains a single schedule as an example.", - "id": "ec2-describe-scheduled-instance-availability-1", - "title": "To describe an available schedule" - } - ], - "DescribeScheduledInstances": [ - { - "input": { - "ScheduledInstanceIds": [ - "sci-1234-1234-1234-1234-123456789012" - ] - }, - "output": { - "ScheduledInstanceSet": [ - { - "AvailabilityZone": "us-west-2b", - "CreateDate": "2016-01-25T21:43:38.612Z", - "HourlyPrice": "0.095", - "InstanceCount": 1, - "InstanceType": "c4.large", - "NetworkPlatform": "EC2-VPC", - "NextSlotStartTime": "2016-01-31T09:00:00Z", - "Platform": "Linux/UNIX", - "Recurrence": { - "Frequency": "Weekly", - "Interval": 1, - "OccurrenceDaySet": [ - 1 - ], - "OccurrenceRelativeToEnd": false, - "OccurrenceUnit": "" - }, - "ScheduledInstanceId": "sci-1234-1234-1234-1234-123456789012", - "SlotDurationInHours": 32, - "TermEndDate": "2017-01-31T09:00:00Z", - "TermStartDate": "2016-01-31T09:00:00Z", - "TotalScheduledInstanceHours": 1696 - } - ] - }, - "comments": { - "input": { - }, - "output": { - } - }, - "description": "This example describes the specified Scheduled Instance.", - "id": "ec2-describe-scheduled-instances-1", - "title": "To describe your Scheduled Instances" - } - ], "DescribeSecurityGroupReferences": [ { "input": { @@ -3258,14 +3064,14 @@ "DescribeSpotPriceHistory": [ { "input": { - "EndTime": "2014-01-06T08:09:10", + "EndTime": "2014-01-06T08:09:10.05Z", "InstanceTypes": [ "m1.xlarge" ], "ProductDescriptions": [ "Linux/UNIX (Amazon VPC)" ], - "StartTime": "2014-01-06T07:08:09" + "StartTime": "2014-01-06T07:08:09.05Z" }, "output": { "SpotPriceHistory": [ @@ -3719,23 +3525,9 @@ "output": { } }, - "description": "This example disassociates an Elastic IP address from an instance in a VPC.", + "description": "This example disassociates an Elastic IP address from an instance.", "id": "ec2-disassociate-address-1", - "title": "To disassociate an Elastic IP address in EC2-VPC" - }, - { - "input": { - "PublicIp": "198.51.100.0" - }, - "comments": { - "input": { - }, - "output": { - } - }, - "description": "This example disassociates an Elastic IP address from an instance in EC2-Classic.", - "id": "ec2-disassociate-address-2", - "title": "To disassociate an Elastic IP addresses in EC2-Classic" + "title": "To disassociate an Elastic IP address" } ], "DisassociateIamInstanceProfile": [ @@ -4269,55 +4061,6 @@ "title": "To move an address to EC2-VPC" } ], - "PurchaseScheduledInstances": [ - { - "input": { - "PurchaseRequests": [ - { - "InstanceCount": 1, - "PurchaseToken": "eyJ2IjoiMSIsInMiOjEsImMiOi..." - } - ] - }, - "output": { - "ScheduledInstanceSet": [ - { - "AvailabilityZone": "us-west-2b", - "CreateDate": "2016-01-25T21:43:38.612Z", - "HourlyPrice": "0.095", - "InstanceCount": 1, - "InstanceType": "c4.large", - "NetworkPlatform": "EC2-VPC", - "NextSlotStartTime": "2016-01-31T09:00:00Z", - "Platform": "Linux/UNIX", - "Recurrence": { - "Frequency": "Weekly", - "Interval": 1, - "OccurrenceDaySet": [ - 1 - ], - "OccurrenceRelativeToEnd": false, - "OccurrenceUnit": "" - }, - "ScheduledInstanceId": "sci-1234-1234-1234-1234-123456789012", - "SlotDurationInHours": 32, - "TermEndDate": "2017-01-31T09:00:00Z", - "TermStartDate": "2016-01-31T09:00:00Z", - "TotalScheduledInstanceHours": 1696 - } - ] - }, - "comments": { - "input": { - }, - "output": { - } - }, - "description": "This example purchases a Scheduled Instance.", - "id": "ec2-purchase-scheduled-instances-1", - "title": "To purchase a Scheduled Instance" - } - ], "RebootInstances": [ { "input": { @@ -4349,23 +4092,9 @@ "output": { } }, - "description": "This example releases an Elastic IP address for use with instances in a VPC.", + "description": "This example releases the specified Elastic IP address.", "id": "ec2-release-address-1", - "title": "To release an Elastic IP address for EC2-VPC" - }, - { - "input": { - "PublicIp": "198.51.100.0" - }, - "comments": { - "input": { - }, - "output": { - } - }, - "description": "This example releases an Elastic IP address for use with instances in EC2-Classic.", - "id": "ec2-release-address-2", - "title": "To release an Elastic IP addresses for EC2-Classic" + "title": "To release an Elastic IP address" } ], "ReplaceNetworkAclAssociation": [ @@ -4524,7 +4253,7 @@ "output": { } }, - "description": "This example creates a Spot fleet request with two launch specifications that differ only by Availability Zone. The Spot fleet launches the instances in the specified Availability Zone with the lowest price. If your account supports EC2-VPC only, Amazon EC2 launches the Spot instances in the default subnet of the Availability Zone. If your account supports EC2-Classic, Amazon EC2 launches the instances in EC2-Classic in the Availability Zone.", + "description": "This example creates a Spot fleet request with two launch specifications that differ only by Availability Zone. The Spot fleet launches the instances in the specified Availability Zone with the lowest price. If your account supports EC2-VPC only, Amazon EC2 launches the Spot instances in the default subnet of the Availability Zone.", "id": "ec2-request-spot-fleet-2", "title": "To request a Spot fleet in the Availability Zone with the lowest price" }, @@ -4636,7 +4365,7 @@ "output": { } }, - "description": "This example creates a one-time Spot Instance request for five instances in the specified Availability Zone. If your account supports EC2-VPC only, Amazon EC2 launches the instances in the default subnet of the specified Availability Zone. If your account supports EC2-Classic, Amazon EC2 launches the instances in EC2-Classic in the specified Availability Zone.", + "description": "This example creates a one-time Spot Instance request for five instances in the specified Availability Zone. If your account supports EC2-VPC only, Amazon EC2 launches the instances in the default subnet of the specified Availability Zone.", "id": "ec2-request-spot-instances-1", "title": "To create a one-time Spot Instance request" }, @@ -4725,26 +4454,6 @@ "title": "To reset a snapshot attribute" } ], - "RestoreAddressToClassic": [ - { - "input": { - "PublicIp": "198.51.100.0" - }, - "output": { - "PublicIp": "198.51.100.0", - "Status": "MoveInProgress" - }, - "comments": { - "input": { - }, - "output": { - } - }, - "description": "This example restores the specified Elastic IP address to the EC2-Classic platform.", - "id": "ec2-restore-address-to-classic-1", - "title": "To restore an address to EC2-Classic" - } - ], "RunInstances": [ { "input": { @@ -4790,80 +4499,6 @@ "title": "To launch an instance" } ], - "RunScheduledInstances": [ - { - "input": { - "InstanceCount": 1, - "LaunchSpecification": { - "IamInstanceProfile": { - "Name": "my-iam-role" - }, - "ImageId": "ami-12345678", - "InstanceType": "c4.large", - "KeyName": "my-key-pair", - "NetworkInterfaces": [ - { - "AssociatePublicIpAddress": true, - "DeviceIndex": 0, - "Groups": [ - "sg-12345678" - ], - "SubnetId": "subnet-12345678" - } - ] - }, - "ScheduledInstanceId": "sci-1234-1234-1234-1234-123456789012" - }, - "output": { - "InstanceIdSet": [ - "i-1234567890abcdef0" - ] - }, - "comments": { - "input": { - }, - "output": { - } - }, - "description": "This example launches the specified Scheduled Instance in a VPC.", - "id": "ec2-run-scheduled-instances-1", - "title": "To launch a Scheduled Instance in a VPC" - }, - { - "input": { - "InstanceCount": 1, - "LaunchSpecification": { - "IamInstanceProfile": { - "Name": "my-iam-role" - }, - "ImageId": "ami-12345678", - "InstanceType": "c4.large", - "KeyName": "my-key-pair", - "Placement": { - "AvailabilityZone": "us-west-2b" - }, - "SecurityGroupIds": [ - "sg-12345678" - ] - }, - "ScheduledInstanceId": "sci-1234-1234-1234-1234-123456789012" - }, - "output": { - "InstanceIdSet": [ - "i-1234567890abcdef0" - ] - }, - "comments": { - "input": { - }, - "output": { - } - }, - "description": "This example launches the specified Scheduled Instance in EC2-Classic.", - "id": "ec2-run-scheduled-instances-2", - "title": "To launch a Scheduled Instance in EC2-Classic" - } - ], "StartInstances": [ { "input": { diff --git a/models/apis/ecs/2014-11-13/docs-2.json b/models/apis/ecs/2014-11-13/docs-2.json index ed8819ac8aa..0d0064d8b6f 100644 --- a/models/apis/ecs/2014-11-13/docs-2.json +++ b/models/apis/ecs/2014-11-13/docs-2.json @@ -11,7 +11,7 @@ "DeleteCapacityProvider": "Deletes the specified capacity provider.
The FARGATE and FARGATE_SPOT capacity providers are reserved and can't be deleted. You can disassociate them from a cluster using either the PutClusterCapacityProviders API or by deleting the cluster.
Prior to a capacity provider being deleted, the capacity provider must be removed from the capacity provider strategy from all services. The UpdateService API can be used to remove a capacity provider from a service's capacity provider strategy. When updating a service, the forceNewDeployment option can be used to ensure that any tasks using the Amazon EC2 instance capacity provided by the capacity provider are transitioned to use the capacity from the remaining capacity providers. Only capacity providers that aren't associated with a cluster can be deleted. To remove a capacity provider from a cluster, you can either use PutClusterCapacityProviders or delete the cluster.
Deletes the specified cluster. The cluster transitions to the INACTIVE state. Clusters with an INACTIVE status might remain discoverable in your account for a period of time. However, this behavior is subject to change in the future. We don't recommend that you rely on INACTIVE clusters persisting.
You must deregister all container instances from this cluster before you may delete it. You can list the container instances in a cluster with ListContainerInstances and deregister them with DeregisterContainerInstance.
", "DeleteService": "Deletes a specified service within a cluster. You can delete a service if you have no running tasks in it and the desired task count is zero. If the service is actively maintaining tasks, you can't delete it, and you must update the service to a desired task count of zero. For more information, see UpdateService.
When you delete a service, if there are still running tasks that require cleanup, the service status moves from ACTIVE to DRAINING, and the service is no longer visible in the console or in the ListServices API operation. After all tasks have transitioned to either STOPPING or STOPPED status, the service status moves from DRAINING to INACTIVE. Services in the DRAINING or INACTIVE status can still be viewed with the DescribeServices API operation. However, in the future, INACTIVE services may be cleaned up and purged from Amazon ECS record keeping, and DescribeServices calls on those services return a ServiceNotFoundException error.
If you attempt to create a new service with the same name as an existing service in either ACTIVE or DRAINING status, you receive an error.
Deletes one or more task definitions.
You must deregister a task definition revision before you delete it. For more information, see DeregisterTaskDefinition.
When you delete a task definition revision, it is immediately transitions from the INACTIVE to DELETE_IN_PROGRESS. Existing tasks and services that reference a DELETE_IN_PROGRESS task definition revision continue to run without disruption. Existing services that reference a DELETE_IN_PROGRESS task definition revision can still scale up or down by modifying the service's desired count.
You can't use a DELETE_IN_PROGRESS task definition revision to run new tasks or create new services. You also can't update an existing service to reference a DELETE_IN_PROGRESS task definition revision.
A task definition revision will stay in DELETE_IN_PROGRESS status until all the associated tasks and services have been terminated.
Deletes one or more task definitions.
You must deregister a task definition revision before you delete it. For more information, see DeregisterTaskDefinition.
When you delete a task definition revision, it is immediately transitions from the INACTIVE to DELETE_IN_PROGRESS. Existing tasks and services that reference a DELETE_IN_PROGRESS task definition revision continue to run without disruption. Existing services that reference a DELETE_IN_PROGRESS task definition revision can still scale up or down by modifying the service's desired count.
You can't use a DELETE_IN_PROGRESS task definition revision to run new tasks or create new services. You also can't update an existing service to reference a DELETE_IN_PROGRESS task definition revision.
A task definition revision will stay in DELETE_IN_PROGRESS status until all the associated tasks and services have been terminated.
When you delete all INACTIVE task definition revisions, the task definition name is not displayed in the console and not returned in the API. If a task definition revisions are in the DELETE_IN_PROGRESS state, the task definition name is displayed in the console and returned in the API. The task definition name is retained by Amazon ECS and the revision is incremented the next time you create a task definition with that name.
Deletes a specified task set within a service. This is used when a service uses the EXTERNAL deployment controller type. For more information, see Amazon ECS deployment types in the Amazon Elastic Container Service Developer Guide.
Deregisters an Amazon ECS container instance from the specified cluster. This instance is no longer available to run tasks.
If you intend to use the container instance for some other purpose after deregistration, we recommend that you stop all of the tasks running on the container instance before deregistration. That prevents any orphaned tasks from consuming resources.
Deregistering a container instance removes the instance from a cluster, but it doesn't terminate the EC2 instance. If you are finished using the instance, be sure to terminate it in the Amazon EC2 console to stop billing.
If you terminate a running container instance, Amazon ECS automatically deregisters the instance from your cluster (stopped container instances or instances with disconnected agents aren't automatically deregistered when terminated).
Deregisters the specified task definition by family and revision. Upon deregistration, the task definition is marked as INACTIVE. Existing tasks and services that reference an INACTIVE task definition continue to run without disruption. Existing services that reference an INACTIVE task definition can still scale up or down by modifying the service's desired count. If you want to delete a task definition revision, you must first deregister the task definition revision.
You can't use an INACTIVE task definition to run new tasks or create new services, and you can't update an existing service to reference an INACTIVE task definition. However, there may be up to a 10-minute window following deregistration where these restrictions have not yet taken effect.
At this time, INACTIVE task definitions remain discoverable in your account indefinitely. However, this behavior is subject to change in the future. We don't recommend that you rely on INACTIVE task definitions persisting beyond the lifecycle of any associated tasks and services.
You must deregister a task definition revision before you delete it. For more information, see DeleteTaskDefinitions.
", @@ -169,7 +169,7 @@ "base": null, "refs": { "ContainerInstance$agentConnected": "This parameter returns true if the agent is connected to Amazon ECS. An instance with an agent that may be unhealthy or stopped return false. Only instances connected to an agent can accept task placement requests.
Specifies whether to turn on Amazon ECS managed tags for the tasks within the service. For more information, see Tagging your Amazon ECS resources in the Amazon Elastic Container Service Developer Guide.
", + "CreateServiceRequest$enableECSManagedTags": "Specifies whether to turn on Amazon ECS managed tags for the tasks within the service. For more information, see Tagging your Amazon ECS resources in the Amazon Elastic Container Service Developer Guide.
When you use Amazon ECS managed tags, you need to set the propagateTags request parameter.
Determines whether the execute command functionality is turned on for the service. If true, this enables execute command functionality on all containers in the service tasks.
Determines whether to use the CloudWatch alarm option in the service deployment process.
", "DeploymentAlarms$rollback": "Determines whether to configure Amazon ECS to roll back the service if a service deployment fails. If rollback is used, when a service deployment fails, the service is rolled back to the last deployment that completed successfully.
", @@ -1583,7 +1583,7 @@ "PropagateTags": { "base": null, "refs": { - "CreateServiceRequest$propagateTags": "Specifies whether to propagate the tags from the task definition to the task. If no value is specified, the tags aren't propagated. Tags can only be propagated to the task during task creation. To add tags to a task after task creation, use the TagResource API action.
", + "CreateServiceRequest$propagateTags": "Specifies whether to propagate the tags from the task definition to the task. If no value is specified, the tags aren't propagated. Tags can only be propagated to the task during task creation. To add tags to a task after task creation, use the TagResource API action.
The default is NONE.
Specifies whether to propagate the tags from the task definition to the task. If no value is specified, the tags aren't propagated. Tags can only be propagated to the task during task creation. To add tags to a task after task creation, use the TagResource API action.
An error will be received if you specify the SERVICE option when running a task.
Determines whether to propagate the tags from the task definition or the service to the task. If no value is specified, the tags aren't propagated.
", "StartTaskRequest$propagateTags": "Specifies whether to propagate the tags from the task definition or the service to the task. If no value is specified, the tags aren't propagated.
", diff --git a/models/apis/glue/2017-03-31/api-2.json b/models/apis/glue/2017-03-31/api-2.json index b4c7472f50b..2069d663d9e 100644 --- a/models/apis/glue/2017-03-31/api-2.json +++ b/models/apis/glue/2017-03-31/api-2.json @@ -5745,7 +5745,8 @@ "type":"structure", "members":{ "CatalogId":{"shape":"CatalogIdString"}, - "DatabaseName":{"shape":"NameString"} + "DatabaseName":{"shape":"NameString"}, + "Region":{"shape":"NameString"} } }, "DatabaseInput":{ @@ -11501,7 +11502,8 @@ "members":{ "CatalogId":{"shape":"CatalogIdString"}, "DatabaseName":{"shape":"NameString"}, - "Name":{"shape":"NameString"} + "Name":{"shape":"NameString"}, + "Region":{"shape":"NameString"} } }, "TableInput":{ diff --git a/models/apis/glue/2017-03-31/docs-2.json b/models/apis/glue/2017-03-31/docs-2.json index da00b9b1332..e5bea6093b9 100644 --- a/models/apis/glue/2017-03-31/docs-2.json +++ b/models/apis/glue/2017-03-31/docs-2.json @@ -5347,6 +5347,7 @@ "DataSourceMap$key": null, "Database$Name": "The name of the database. For Hive compatibility, this is folded to lowercase when it is stored.
", "DatabaseIdentifier$DatabaseName": "The name of the catalog database.
", + "DatabaseIdentifier$Region": "Region of the target database.
", "DatabaseInput$Name": "The name of the database. For Hive compatibility, this is folded to lowercase when it is stored.
", "DeleteBlueprintRequest$Name": "The name of the blueprint to delete.
", "DeleteBlueprintResponse$Name": "Returns the name of the blueprint that was deleted.
", @@ -5518,6 +5519,7 @@ "TableError$TableName": "The name of the table. For Hive compatibility, this must be entirely lowercase.
", "TableIdentifier$DatabaseName": "The name of the catalog database that contains the target table.
", "TableIdentifier$Name": "The name of the target table.
", + "TableIdentifier$Region": "Region of the target table.
", "TableInput$Name": "The table name. For Hive compatibility, this is folded to lowercase when it is stored.
", "TableInput$Owner": "The table owner. Included for Apache Hive compatibility. Not used in the normal course of Glue operations.
", "TableVersionError$TableName": "The name of the table in question.
", diff --git a/models/apis/pricing/2017-10-15/api-2.json b/models/apis/pricing/2017-10-15/api-2.json index 83d8d735c43..3f1032f32d2 100644 --- a/models/apis/pricing/2017-10-15/api-2.json +++ b/models/apis/pricing/2017-10-15/api-2.json @@ -23,10 +23,10 @@ "input":{"shape":"DescribeServicesRequest"}, "output":{"shape":"DescribeServicesResponse"}, "errors":[ - {"shape":"InternalErrorException"}, {"shape":"InvalidParameterException"}, - {"shape":"NotFoundException"}, {"shape":"InvalidNextTokenException"}, + {"shape":"NotFoundException"}, + {"shape":"InternalErrorException"}, {"shape":"ExpiredNextTokenException"} ] }, @@ -39,10 +39,10 @@ "input":{"shape":"GetAttributeValuesRequest"}, "output":{"shape":"GetAttributeValuesResponse"}, "errors":[ - {"shape":"InternalErrorException"}, {"shape":"InvalidParameterException"}, - {"shape":"NotFoundException"}, {"shape":"InvalidNextTokenException"}, + {"shape":"NotFoundException"}, + {"shape":"InternalErrorException"}, {"shape":"ExpiredNextTokenException"} ] }, @@ -55,10 +55,10 @@ "input":{"shape":"GetPriceListFileUrlRequest"}, "output":{"shape":"GetPriceListFileUrlResponse"}, "errors":[ - {"shape":"InternalErrorException"}, {"shape":"InvalidParameterException"}, {"shape":"NotFoundException"}, - {"shape":"AccessDeniedException"} + {"shape":"AccessDeniedException"}, + {"shape":"InternalErrorException"} ] }, "GetProducts":{ @@ -70,10 +70,10 @@ "input":{"shape":"GetProductsRequest"}, "output":{"shape":"GetProductsResponse"}, "errors":[ - {"shape":"InternalErrorException"}, {"shape":"InvalidParameterException"}, - {"shape":"NotFoundException"}, {"shape":"InvalidNextTokenException"}, + {"shape":"NotFoundException"}, + {"shape":"InternalErrorException"}, {"shape":"ExpiredNextTokenException"} ] }, @@ -86,12 +86,12 @@ "input":{"shape":"ListPriceListsRequest"}, "output":{"shape":"ListPriceListsResponse"}, "errors":[ - {"shape":"InternalErrorException"}, {"shape":"InvalidParameterException"}, - {"shape":"NotFoundException"}, {"shape":"InvalidNextTokenException"}, - {"shape":"ExpiredNextTokenException"}, - {"shape":"AccessDeniedException"} + {"shape":"NotFoundException"}, + {"shape":"AccessDeniedException"}, + {"shape":"InternalErrorException"}, + {"shape":"ExpiredNextTokenException"} ] } }, @@ -119,12 +119,13 @@ }, "BoxedInteger":{ "type":"integer", + "box":true, "max":100, "min":1 }, "CurrencyCode":{ "type":"string", - "pattern":"^[A-Z]{3}$" + "pattern":"[A-Z]{3}" }, "DescribeServicesRequest":{ "type":"structure", @@ -132,10 +133,7 @@ "ServiceCode":{"shape":"String"}, "FormatVersion":{"shape":"String"}, "NextToken":{"shape":"String"}, - "MaxResults":{ - "shape":"BoxedInteger", - "box":true - } + "MaxResults":{"shape":"BoxedInteger"} } }, "DescribeServicesResponse":{ @@ -194,10 +192,7 @@ "ServiceCode":{"shape":"String"}, "AttributeName":{"shape":"String"}, "NextToken":{"shape":"String"}, - "MaxResults":{ - "shape":"BoxedInteger", - "box":true - } + "MaxResults":{"shape":"BoxedInteger"} } }, "GetAttributeValuesResponse":{ @@ -232,10 +227,7 @@ "Filters":{"shape":"Filters"}, "FormatVersion":{"shape":"String"}, "NextToken":{"shape":"String"}, - "MaxResults":{ - "shape":"BoxedInteger", - "box":true - } + "MaxResults":{"shape":"BoxedInteger"} } }, "GetProductsResponse":{ @@ -251,7 +243,8 @@ "members":{ "Message":{"shape":"errorMessage"} }, - "exception":true + "exception":true, + "fault":true }, "InvalidNextTokenException":{ "type":"structure", @@ -292,6 +285,7 @@ }, "MaxResults":{ "type":"integer", + "box":true, "max":100, "min":1 }, @@ -315,13 +309,12 @@ "type":"string", "max":2048, "min":18, - "pattern":"^arn:.+:pricing::.*:price-list/.{1,255}/.{1,32}/[A-Z]{3}/[0-9]{14}/[^/]*$" + "pattern":"arn:[A-Za-z0-9][-.A-Za-z0-9]{0,62}:pricing:::price-list/[A-Za-z0-9_/.-]{1,1023}" }, - "PriceListJsonItem":{"type":"string"}, "PriceListJsonItems":{ "type":"list", "member":{ - "shape":"PriceListJsonItem", + "shape":"SynthesizedJsonPriceListJsonItem", "jsonvalue":true } }, @@ -352,6 +345,7 @@ "member":{"shape":"Service"} }, "String":{"type":"string"}, + "SynthesizedJsonPriceListJsonItem":{"type":"string"}, "errorMessage":{"type":"string"} } } diff --git a/models/apis/pricing/2017-10-15/docs-2.json b/models/apis/pricing/2017-10-15/docs-2.json index ff5c9236871..4b2862d7e46 100644 --- a/models/apis/pricing/2017-10-15/docs-2.json +++ b/models/apis/pricing/2017-10-15/docs-2.json @@ -1,6 +1,6 @@ { "version": "2.0", - "service": "Amazon Web Services Price List API is a centralized and convenient way to programmatically query Amazon Web Services for services, products, and pricing information. The Amazon Web Services Price List uses standardized product attributes such as Location, Storage Class, and Operating System, and provides prices at the SKU level. You can use the Amazon Web Services Price List to build cost control and scenario planning tools, reconcile billing data, forecast future spend for budgeting purposes, and provide cost benefit analysis that compare your internal workloads with Amazon Web Services.
Use GetServices without a service code to retrieve the service codes for all AWS services, then GetServices with a service code to retrieve the attribute names for that service. After you have the service code and attribute names, you can use GetAttributeValues to see what values are available for an attribute. With the service code and an attribute name and value, you can use GetProducts to find specific products that you're interested in, such as an AmazonEC2 instance, with a Provisioned IOPS volumeType.
Service Endpoint
Amazon Web Services Price List service API provides the following two endpoints:
https://api.pricing.us-east-1.amazonaws.com
https://api.pricing.ap-south-1.amazonaws.com
The Amazon Web Services Price List API is a centralized and convenient way to programmatically query Amazon Web Services for services, products, and pricing information. The Amazon Web Services Price List uses standardized product attributes such as Location, Storage Class, and Operating System, and provides prices at the SKU level. You can use the Amazon Web Services Price List to do the following:
Build cost control and scenario planning tools
Reconcile billing data
Forecast future spend for budgeting purposes
Provide cost benefit analysis that compare your internal workloads with Amazon Web Services
Use GetServices without a service code to retrieve the service codes for all Amazon Web Services, then GetServices with a service code to retrieve the attribute names for that service. After you have the service code and attribute names, you can use GetAttributeValues to see what values are available for an attribute. With the service code and an attribute name and value, you can use GetProducts to find specific products that you're interested in, such as an AmazonEC2 instance, with a Provisioned IOPS volumeType.
You can use the following endpoints for the Amazon Web Services Price List API:
https://api.pricing.us-east-1.amazonaws.com
https://api.pricing.ap-south-1.amazonaws.com
Returns the metadata for one service or a list of the metadata for all services. Use this without a service code to get the service codes for all services. Use it with a service code, such as AmazonEC2, to get information specific to that service, such as the attribute names available for that service. For example, some of the attribute names available for EC2 are volumeType, maxIopsVolume, operation, locationType, and instanceCapacity10xlarge.
Returns a list of attribute values. Attributes are similar to the details in a Price List API offer file. For a list of available attributes, see Offer File Definitions in the Billing and Cost Management User Guide.
", @@ -178,12 +178,6 @@ "PriceList$PriceListArn": "The unique identifier that maps to where your Price List files are located. PriceListArn can be obtained from the ListPriceList response.
The code for the Amazon Web Services service.
" } }, + "SynthesizedJsonPriceListJsonItem": { + "base": null, + "refs": { + "PriceListJsonItems$member": null + } + }, "errorMessage": { "base": null, "refs": { diff --git a/models/apis/pricing/2017-10-15/endpoint-tests-1.json b/models/apis/pricing/2017-10-15/endpoint-tests-1.json index 6d77c402ab9..db676384e56 100644 --- a/models/apis/pricing/2017-10-15/endpoint-tests-1.json +++ b/models/apis/pricing/2017-10-15/endpoint-tests-1.json @@ -8,9 +8,9 @@ } }, "params": { + "Region": "ap-south-1", "UseFIPS": false, - "UseDualStack": false, - "Region": "ap-south-1" + "UseDualStack": false } }, { @@ -21,9 +21,9 @@ } }, "params": { + "Region": "us-east-1", "UseFIPS": false, - "UseDualStack": false, - "Region": "us-east-1" + "UseDualStack": false } }, { @@ -34,9 +34,9 @@ } }, "params": { + "Region": "us-east-1", "UseFIPS": true, - "UseDualStack": true, - "Region": "us-east-1" + "UseDualStack": true } }, { @@ -47,9 +47,9 @@ } }, "params": { + "Region": "us-east-1", "UseFIPS": true, - "UseDualStack": false, - "Region": "us-east-1" + "UseDualStack": false } }, { @@ -60,9 +60,9 @@ } }, "params": { + "Region": "us-east-1", "UseFIPS": false, - "UseDualStack": true, - "Region": "us-east-1" + "UseDualStack": true } }, { @@ -73,9 +73,9 @@ } }, "params": { + "Region": "cn-north-1", "UseFIPS": true, - "UseDualStack": true, - "Region": "cn-north-1" + "UseDualStack": true } }, { @@ -86,9 +86,9 @@ } }, "params": { + "Region": "cn-north-1", "UseFIPS": true, - "UseDualStack": false, - "Region": "cn-north-1" + "UseDualStack": false } }, { @@ -99,9 +99,9 @@ } }, "params": { + "Region": "cn-north-1", "UseFIPS": false, - "UseDualStack": true, - "Region": "cn-north-1" + "UseDualStack": true } }, { @@ -112,9 +112,9 @@ } }, "params": { + "Region": "cn-north-1", "UseFIPS": false, - "UseDualStack": false, - "Region": "cn-north-1" + "UseDualStack": false } }, { @@ -125,9 +125,9 @@ } }, "params": { + "Region": "us-gov-east-1", "UseFIPS": true, - "UseDualStack": true, - "Region": "us-gov-east-1" + "UseDualStack": true } }, { @@ -138,9 +138,9 @@ } }, "params": { + "Region": "us-gov-east-1", "UseFIPS": true, - "UseDualStack": false, - "Region": "us-gov-east-1" + "UseDualStack": false } }, { @@ -151,9 +151,9 @@ } }, "params": { + "Region": "us-gov-east-1", "UseFIPS": false, - "UseDualStack": true, - "Region": "us-gov-east-1" + "UseDualStack": true } }, { @@ -164,9 +164,20 @@ } }, "params": { + "Region": "us-gov-east-1", "UseFIPS": false, - "UseDualStack": false, - "Region": "us-gov-east-1" + "UseDualStack": false + } + }, + { + "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "error": "FIPS and DualStack are enabled, but this partition does not support one or both" + }, + "params": { + "Region": "us-iso-east-1", + "UseFIPS": true, + "UseDualStack": true } }, { @@ -177,9 +188,20 @@ } }, "params": { + "Region": "us-iso-east-1", "UseFIPS": true, - "UseDualStack": false, - "Region": "us-iso-east-1" + "UseDualStack": false + } + }, + { + "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "error": "DualStack is enabled but this partition does not support DualStack" + }, + "params": { + "Region": "us-iso-east-1", + "UseFIPS": false, + "UseDualStack": true } }, { @@ -190,9 +212,20 @@ } }, "params": { + "Region": "us-iso-east-1", "UseFIPS": false, - "UseDualStack": false, - "Region": "us-iso-east-1" + "UseDualStack": false + } + }, + { + "documentation": "For region us-isob-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "error": "FIPS and DualStack are enabled, but this partition does not support one or both" + }, + "params": { + "Region": "us-isob-east-1", + "UseFIPS": true, + "UseDualStack": true } }, { @@ -203,9 +236,20 @@ } }, "params": { + "Region": "us-isob-east-1", "UseFIPS": true, - "UseDualStack": false, - "Region": "us-isob-east-1" + "UseDualStack": false + } + }, + { + "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "error": "DualStack is enabled but this partition does not support DualStack" + }, + "params": { + "Region": "us-isob-east-1", + "UseFIPS": false, + "UseDualStack": true } }, { @@ -216,9 +260,9 @@ } }, "params": { + "Region": "us-isob-east-1", "UseFIPS": false, - "UseDualStack": false, - "Region": "us-isob-east-1" + "UseDualStack": false } }, { @@ -229,9 +273,9 @@ } }, "params": { + "Region": "us-east-1", "UseFIPS": false, "UseDualStack": false, - "Region": "us-east-1", "Endpoint": "https://example.com" } }, @@ -254,9 +298,9 @@ "error": "Invalid Configuration: FIPS and custom endpoint are not supported" }, "params": { + "Region": "us-east-1", "UseFIPS": true, "UseDualStack": false, - "Region": "us-east-1", "Endpoint": "https://example.com" } }, @@ -266,11 +310,17 @@ "error": "Invalid Configuration: Dualstack and custom endpoint are not supported" }, "params": { + "Region": "us-east-1", "UseFIPS": false, "UseDualStack": true, - "Region": "us-east-1", "Endpoint": "https://example.com" } + }, + { + "documentation": "Missing region", + "expect": { + "error": "Invalid Configuration: Missing Region" + } } ], "version": "1.0" diff --git a/models/apis/pricing/2017-10-15/examples-1.json b/models/apis/pricing/2017-10-15/examples-1.json index 2a1be6c9153..0ea7e3b0bbe 100644 --- a/models/apis/pricing/2017-10-15/examples-1.json +++ b/models/apis/pricing/2017-10-15/examples-1.json @@ -1,68 +1,5 @@ { "version": "1.0", "examples": { - "DescribeServices": [ - { - "input": { - "FormatVersion": "aws_v1", - "MaxResults": 1, - "ServiceCode": "AmazonEC2" - }, - "output": { - "FormatVersion": "aws_v1", - "NextToken": "abcdefg123", - "Services": [ - { - "AttributeNames": [ - "volumeType", - "maxIopsvolume", - "instanceCapacity10xlarge", - "locationType", - "operation" - ], - "ServiceCode": "AmazonEC2" - } - ] - }, - "comments": { - "input": { - }, - "output": { - } - }, - "description": "Retrieves the service for the given Service Code.", - "id": "to-retrieve-service-metadata", - "title": "To retrieve a list of services and service codes" - } - ], - "GetAttributeValues": [ - { - "input": { - "AttributeName": "volumeType", - "MaxResults": 2, - "ServiceCode": "AmazonEC2" - }, - "output": { - "AttributeValues": [ - { - "Value": "Throughput Optimized HDD" - }, - { - "Value": "Provisioned IOPS" - } - ], - "NextToken": "GpgauEXAMPLEezucl5LV0w==:7GzYJ0nw0DBTJ2J66EoTIIynE6O1uXwQtTRqioJzQadBnDVgHPzI1en4BUQnPCLpzeBk9RQQAWaFieA4+DapFAGLgk+Z/9/cTw9GldnPOHN98+FdmJP7wKU3QQpQ8MQr5KOeBkIsAqvAQYdL0DkL7tHwPtE5iCEByAmg9gcC/yBU1vAOsf7R3VaNN4M5jMDv3woSWqASSIlBVB6tgW78YL22KhssoItM/jWW+aP6Jqtq4mldxp/ct6DWAl+xLFwHU/CbketimPPXyqHF3/UXDw==" - }, - "comments": { - "input": { - }, - "output": { - } - }, - "description": "This operation returns a list of values available for the given attribute.", - "id": "to-retreive-attribute-values", - "title": "To retrieve a list of attribute values" - } - ] } } diff --git a/models/apis/pricing/2017-10-15/smoke.json b/models/apis/pricing/2017-10-15/smoke.json new file mode 100644 index 00000000000..a9756813e4a --- /dev/null +++ b/models/apis/pricing/2017-10-15/smoke.json @@ -0,0 +1,6 @@ +{ + "version": 1, + "defaultRegion": "us-west-2", + "testCases": [ + ] +} diff --git a/models/apis/pricing/2017-10-15/waiters-2.json b/models/apis/pricing/2017-10-15/waiters-2.json new file mode 100644 index 00000000000..13f60ee66be --- /dev/null +++ b/models/apis/pricing/2017-10-15/waiters-2.json @@ -0,0 +1,5 @@ +{ + "version": 2, + "waiters": { + } +} diff --git a/models/apis/route53domains/2014-05-15/api-2.json b/models/apis/route53domains/2014-05-15/api-2.json index 4a45fb97234..abdac264ad4 100644 --- a/models/apis/route53domains/2014-05-15/api-2.json +++ b/models/apis/route53domains/2014-05-15/api-2.json @@ -1387,12 +1387,16 @@ "type":"string", "enum":["SubmittedDate"] }, + "ListPricesPageMaxItems":{ + "type":"integer", + "max":1000 + }, "ListPricesRequest":{ "type":"structure", "members":{ "Tld":{"shape":"TldName"}, "Marker":{"shape":"PageMarker"}, - "MaxItems":{"shape":"PageMaxItems"} + "MaxItems":{"shape":"ListPricesPageMaxItems"} } }, "ListPricesResponse":{ diff --git a/models/apis/route53domains/2014-05-15/docs-2.json b/models/apis/route53domains/2014-05-15/docs-2.json index aaf62911803..ab7806f0b58 100644 --- a/models/apis/route53domains/2014-05-15/docs-2.json +++ b/models/apis/route53domains/2014-05-15/docs-2.json @@ -23,16 +23,16 @@ "ListPrices": "Lists the following prices for either all the TLDs supported by Route 53, or the specified TLD:
Registration
Transfer
Owner change
Domain renewal
Domain restoration
This operation returns all of the tags that are associated with the specified domain.
All tag operations are eventually consistent; subsequent operations might not immediately represent all issued operations.
", "PushDomain": "Moves a domain from Amazon Web Services to another registrar.
Supported actions:
Changes the IPS tags of a .uk domain, and pushes it to transit. Transit means that the domain is ready to be transferred to another registrar.
This operation registers a domain. Domains are registered either by Amazon Registrar (for .com, .net, and .org domains) or by our registrar associate, Gandi (for all other domains). For some top-level domains (TLDs), this operation requires extra parameters.
When you register a domain, Amazon Route 53 does the following:
Creates a Route 53 hosted zone that has the same name as the domain. Route 53 assigns four name servers to your hosted zone and automatically updates your domain registration with the names of these name servers.
Enables auto renew, so your domain registration will renew automatically each year. We'll notify you in advance of the renewal date so you can choose whether to renew the registration.
Optionally enables privacy protection, so WHOIS queries return contact information either for Amazon Registrar (for .com, .net, and .org domains) or for our registrar associate, Gandi (for all other TLDs). If you don't enable privacy protection, WHOIS queries return the information that you entered for the administrative, registrant, and technical contacts.
You must specify the same privacy setting for the administrative, registrant, and technical contacts.
If registration is successful, returns an operation ID that you can use to track the progress and completion of the action. If the request is not completed successfully, the domain registrant is notified by email.
Charges your Amazon Web Services account an amount based on the top-level domain. For more information, see Amazon Route 53 Pricing.
This operation registers a domain. For some top-level domains (TLDs), this operation requires extra parameters.
When you register a domain, Amazon Route 53 does the following:
Creates a Route 53 hosted zone that has the same name as the domain. Route 53 assigns four name servers to your hosted zone and automatically updates your domain registration with the names of these name servers.
Enables auto renew, so your domain registration will renew automatically each year. We'll notify you in advance of the renewal date so you can choose whether to renew the registration.
Optionally enables privacy protection, so WHOIS queries return contact for the registrar or the phrase \"REDACTED FOR PRIVACY\", or \"On behalf of <domain name> owner.\" If you don't enable privacy protection, WHOIS queries return the information that you entered for the administrative, registrant, and technical contacts.
While some domains may allow different privacy settings per contact, we recommend specifying the same privacy setting for all contacts.
If registration is successful, returns an operation ID that you can use to track the progress and completion of the action. If the request is not completed successfully, the domain registrant is notified by email.
Charges your Amazon Web Services account an amount based on the top-level domain. For more information, see Amazon Route 53 Pricing.
Rejects the transfer of a domain from another Amazon Web Services account to the current Amazon Web Services account. You initiate a transfer betweenAmazon Web Services accounts using TransferDomainToAnotherAwsAccount.
Use either ListOperations or GetOperationDetail to determine whether the operation succeeded. GetOperationDetail provides additional information, for example, Domain Transfer from Aws Account 111122223333 has been cancelled.
This operation renews a domain for the specified number of years. The cost of renewing your domain is billed to your Amazon Web Services account.
We recommend that you renew your domain several weeks before the expiration date. Some TLD registries delete domains before the expiration date if you haven't renewed far enough in advance. For more information about renewing domain registration, see Renewing Registration for a Domain in the Amazon Route 53 Developer Guide.
", "ResendContactReachabilityEmail": "For operations that require confirmation that the email address for the registrant contact is valid, such as registering a new domain, this operation resends the confirmation email to the current email address for the registrant contact.
", "ResendOperationAuthorization": "Resend the form of authorization email for this operation.
", "RetrieveDomainAuthCode": "This operation returns the authorization code for the domain. To transfer a domain to another registrar, you provide this value to the new registrar.
", - "TransferDomain": "Transfers a domain from another registrar to Amazon Route 53. When the transfer is complete, the domain is registered either with Amazon Registrar (for .com, .net, and .org domains) or with our registrar associate, Gandi (for all other TLDs).
For more information about transferring domains, see the following topics:
For transfer requirements, a detailed procedure, and information about viewing the status of a domain that you're transferring to Route 53, see Transferring Registration for a Domain to Amazon Route 53 in the Amazon Route 53 Developer Guide.
For information about how to transfer a domain from one Amazon Web Services account to another, see TransferDomainToAnotherAwsAccount.
For information about how to transfer a domain to another domain registrar, see Transferring a Domain from Amazon Route 53 to Another Registrar in the Amazon Route 53 Developer Guide.
If the registrar for your domain is also the DNS service provider for the domain, we highly recommend that you transfer your DNS service to Route 53 or to another DNS service provider before you transfer your registration. Some registrars provide free DNS service when you purchase a domain registration. When you transfer the registration, the previous registrar will not renew your domain registration and could end your DNS service at any time.
If the registrar for your domain is also the DNS service provider for the domain and you don't transfer DNS service to another provider, your website, email, and the web applications associated with the domain might become unavailable.
If the transfer is successful, this method returns an operation ID that you can use to track the progress and completion of the action. If the transfer doesn't complete successfully, the domain registrant will be notified by email.
", + "TransferDomain": "Transfers a domain from another registrar to Amazon Route 53.
For more information about transferring domains, see the following topics:
For transfer requirements, a detailed procedure, and information about viewing the status of a domain that you're transferring to Route 53, see Transferring Registration for a Domain to Amazon Route 53 in the Amazon Route 53 Developer Guide.
For information about how to transfer a domain from one Amazon Web Services account to another, see TransferDomainToAnotherAwsAccount.
For information about how to transfer a domain to another domain registrar, see Transferring a Domain from Amazon Route 53 to Another Registrar in the Amazon Route 53 Developer Guide.
If the registrar for your domain is also the DNS service provider for the domain, we highly recommend that you transfer your DNS service to Route 53 or to another DNS service provider before you transfer your registration. Some registrars provide free DNS service when you purchase a domain registration. When you transfer the registration, the previous registrar will not renew your domain registration and could end your DNS service at any time.
If the registrar for your domain is also the DNS service provider for the domain and you don't transfer DNS service to another provider, your website, email, and the web applications associated with the domain might become unavailable.
If the transfer is successful, this method returns an operation ID that you can use to track the progress and completion of the action. If the transfer doesn't complete successfully, the domain registrant will be notified by email.
", "TransferDomainToAnotherAwsAccount": "Transfers a domain from the current Amazon Web Services account to another Amazon Web Services account. Note the following:
The Amazon Web Services account that you're transferring the domain to must accept the transfer. If the other account doesn't accept the transfer within 3 days, we cancel the transfer. See AcceptDomainTransferFromAnotherAwsAccount.
You can cancel the transfer before the other account accepts it. See CancelDomainTransferToAnotherAwsAccount.
The other account can reject the transfer. See RejectDomainTransferFromAnotherAwsAccount.
When you transfer a domain from one Amazon Web Services account to another, Route 53 doesn't transfer the hosted zone that is associated with the domain. DNS resolution isn't affected if the domain and the hosted zone are owned by separate accounts, so transferring the hosted zone is optional. For information about transferring the hosted zone to another Amazon Web Services account, see Migrating a Hosted Zone to a Different Amazon Web Services Account in the Amazon Route 53 Developer Guide.
Use either ListOperations or GetOperationDetail to determine whether the operation succeeded. GetOperationDetail provides additional information, for example, Domain Transfer from Aws Account 111122223333 has been cancelled.
This operation updates the contact information for a particular domain. You must specify information for at least one contact: registrant, administrator, or technical.
If the update is successful, this method returns an operation ID that you can use to track the progress and completion of the operation. If the request is not completed successfully, the domain registrant will be notified by email.
", - "UpdateDomainContactPrivacy": "This operation updates the specified domain contact's privacy setting. When privacy protection is enabled, contact information such as email address is replaced either with contact information for Amazon Registrar (for .com, .net, and .org domains) or with contact information for our registrar associate, Gandi.
You must specify the same privacy setting for the administrative, registrant, and technical contacts.
This operation affects only the contact information for the specified contact type (administrative, registrant, or technical). If the request succeeds, Amazon Route 53 returns an operation ID that you can use with GetOperationDetail to track the progress and completion of the action. If the request doesn't complete successfully, the domain registrant will be notified by email.
By disabling the privacy service via API, you consent to the publication of the contact information provided for this domain via the public WHOIS database. You certify that you are the registrant of this domain name and have the authority to make this decision. You may withdraw your consent at any time by enabling privacy protection using either UpdateDomainContactPrivacy or the Route 53 console. Enabling privacy protection removes the contact information provided for this domain from the WHOIS database. For more information on our privacy practices, see https://aws.amazon.com/privacy/.
This operation updates the specified domain contact's privacy setting. When privacy protection is enabled, your contact information is replaced with contact information for the registrar or with the phrase \"REDACTED FOR PRIVACY\", or \"On behalf of <domain name> owner.\"
While some domains may allow different privacy settings per contact, we recommend specifying the same privacy setting for all contacts.
This operation affects only the contact information for the specified contact type (administrative, registrant, or technical). If the request succeeds, Amazon Route 53 returns an operation ID that you can use with GetOperationDetail to track the progress and completion of the action. If the request doesn't complete successfully, the domain registrant will be notified by email.
By disabling the privacy service via API, you consent to the publication of the contact information provided for this domain via the public WHOIS database. You certify that you are the registrant of this domain name and have the authority to make this decision. You may withdraw your consent at any time by enabling privacy protection using either UpdateDomainContactPrivacy or the Route 53 console. Enabling privacy protection removes the contact information provided for this domain from the WHOIS database. For more information on our privacy practices, see https://aws.amazon.com/privacy/.
This operation replaces the current set of name servers for the domain with the specified set of name servers. If you use Amazon Route 53 as your DNS service, specify the four name servers in the delegation set for the hosted zone for the domain.
If successful, this operation returns an operation ID that you can use to track the progress and completion of the action. If the request is not completed successfully, the domain registrant will be notified by email.
", "UpdateTagsForDomain": "This operation adds or updates tags for a specified domain.
All tag operations are eventually consistent; subsequent operations might not immediately represent all issued operations.
", "ViewBilling": "Returns all the domain-related billing records for the current Amazon Web Services account for a specified period
" @@ -99,7 +99,7 @@ "RegisterDomainRequest$PrivacyProtectTechContact": "Whether you want to conceal contact information from WHOIS queries. If you specify true, WHOIS (\"who is\") queries return contact information either for Amazon Registrar (for .com, .net, and .org domains) or for our registrar associate, Gandi (for all other TLDs). If you specify false, WHOIS queries return the information that you entered for the technical contact.
You must specify the same privacy setting for the administrative, registrant, and technical contacts.
Default: true
True if the email address for the registrant contact has already been verified, and false otherwise. If the email address has already been verified, we don't send another confirmation email.
Indicates whether the domain will be automatically renewed (true) or not (false). Auto renewal only takes effect after the account is charged.
Default: true
", - "TransferDomainRequest$PrivacyProtectAdminContact": "Whether you want to conceal contact information from WHOIS queries. If you specify true, WHOIS (\"who is\") queries return contact information either for Amazon Registrar (for .com, .net, and .org domains) or for our registrar associate, Gandi (for all other TLDs). If you specify false, WHOIS queries return the information that you entered for the admin contact.
You must specify the same privacy setting for the administrative, registrant, and technical contacts.
Default: true
Whether you want to conceal contact information from WHOIS queries. If you specify true, WHOIS (\"who is\") queries return contact information for the registrar, the phrase \"REDACTED FOR PRIVACY\", or \"On behalf of <domain name> owner.\".
While some domains may allow different privacy settings per contact, we recommend specifying the same privacy setting for all contacts.
Default: true
Whether you want to conceal contact information from WHOIS queries. If you specify true, WHOIS (\"who is\") queries return contact information either for Amazon Registrar (for .com, .net, and .org domains) or for our registrar associate, Gandi (for all other TLDs). If you specify false, WHOIS queries return the information that you entered for the registrant contact (domain owner).
You must specify the same privacy setting for the administrative, registrant, and technical contacts.
Default: true
Whether you want to conceal contact information from WHOIS queries. If you specify true, WHOIS (\"who is\") queries return contact information either for Amazon Registrar (for .com, .net, and .org domains) or for our registrar associate, Gandi (for all other TLDs). If you specify false, WHOIS queries return the information that you entered for the technical contact.
You must specify the same privacy setting for the administrative, registrant, and technical contacts.
Default: true
Whether you want to conceal contact information from WHOIS queries. If you specify true, WHOIS (\"who is\") queries return contact information either for Amazon Registrar (for .com, .net, and .org domains) or for our registrar associate, Gandi (for all other TLDs). If you specify false, WHOIS queries return the information that you entered for the admin contact.
You must specify the same privacy setting for the administrative, registrant, and technical contacts.
Customer's consent for the owner change request.
", "refs": { - "UpdateDomainContactRequest$Consent": "Customer's consent for the owner change request.
" + "UpdateDomainContactRequest$Consent": "Customer's consent for the owner change request. Required if the domain is not free (consent price is more than $0.00).
" } }, "ContactDetail": { @@ -483,7 +483,7 @@ "ExtraParamName": { "base": null, "refs": { - "ExtraParam$Name": "The name of an additional parameter that is required by a top-level domain. Here are the top-level domains that require additional parameters and the names of the parameters that they require:
AU_ID_NUMBER
AU_ID_TYPE
Valid values include the following:
ABN (Australian business number)
ACN (Australian company number)
TM (Trademark number)
BRAND_NUMBER
CA_BUSINESS_ENTITY_TYPE
Valid values include the following:
BANK (Bank)
COMMERCIAL_COMPANY (Commercial company)
COMPANY (Company)
COOPERATION (Cooperation)
COOPERATIVE (Cooperative)
COOPRIX (Cooprix)
CORP (Corporation)
CREDIT_UNION (Credit union)
FOMIA (Federation of mutual insurance associations)
INC (Incorporated)
LTD (Limited)
LTEE (Limitée)
LLC (Limited liability corporation)
LLP (Limited liability partnership)
LTE (Lte.)
MBA (Mutual benefit association)
MIC (Mutual insurance company)
NFP (Not-for-profit corporation)
SA (S.A.)
SAVINGS_COMPANY (Savings company)
SAVINGS_UNION (Savings union)
SARL (Société à responsabilité limitée)
TRUST (Trust)
ULC (Unlimited liability corporation)
CA_LEGAL_TYPE
When ContactType is PERSON, valid values include the following:
ABO (Aboriginal Peoples indigenous to Canada)
CCT (Canadian citizen)
LGR (Legal Representative of a Canadian Citizen or Permanent Resident)
RES (Permanent resident of Canada)
When ContactType is a value other than PERSON, valid values include the following:
ASS (Canadian unincorporated association)
CCO (Canadian corporation)
EDU (Canadian educational institution)
GOV (Government or government entity in Canada)
HOP (Canadian Hospital)
INB (Indian Band recognized by the Indian Act of Canada)
LAM (Canadian Library, Archive, or Museum)
MAJ (Her/His Majesty the Queen/King)
OMK (Official mark registered in Canada)
PLT (Canadian Political Party)
PRT (Partnership Registered in Canada)
TDM (Trademark registered in Canada)
TRD (Canadian Trade Union)
TRS (Trust established in Canada)
ES_IDENTIFICATION
The value of ES_IDENTIFICATION depends on the following values:
The value of ES_LEGAL_FORM
The value of ES_IDENTIFICATION_TYPE
If ES_LEGAL_FORM is any value other than INDIVIDUAL:
Specify 1 letter + 8 numbers (CIF [Certificado de Identificación Fiscal])
Example: B12345678
If ES_LEGAL_FORM is INDIVIDUAL, the value that you specify for ES_IDENTIFICATION depends on the value of ES_IDENTIFICATION_TYPE:
If ES_IDENTIFICATION_TYPE is DNI_AND_NIF (for Spanish contacts):
Specify 8 numbers + 1 letter (DNI [Documento Nacional de Identidad], NIF [Número de Identificación Fiscal])
Example: 12345678M
If ES_IDENTIFICATION_TYPE is NIE (for foreigners with legal residence):
Specify 1 letter + 7 numbers + 1 letter ( NIE [Número de Identidad de Extranjero])
Example: Y1234567X
If ES_IDENTIFICATION_TYPE is OTHER (for contacts outside of Spain):
Specify a passport number, drivers license number, or national identity card number
ES_IDENTIFICATION_TYPE
Valid values include the following:
DNI_AND_NIF (For Spanish contacts)
NIE (For foreigners with legal residence)
OTHER (For contacts outside of Spain)
ES_LEGAL_FORM
Valid values include the following:
ASSOCIATION
CENTRAL_GOVERNMENT_BODY
CIVIL_SOCIETY
COMMUNITY_OF_OWNERS
COMMUNITY_PROPERTY
CONSULATE
COOPERATIVE
DESIGNATION_OF_ORIGIN_SUPERVISORY_COUNCIL
ECONOMIC_INTEREST_GROUP
EMBASSY
ENTITY_MANAGING_NATURAL_AREAS
FARM_PARTNERSHIP
FOUNDATION
GENERAL_AND_LIMITED_PARTNERSHIP
GENERAL_PARTNERSHIP
INDIVIDUAL
LIMITED_COMPANY
LOCAL_AUTHORITY
LOCAL_PUBLIC_ENTITY
MUTUAL_INSURANCE_COMPANY
NATIONAL_PUBLIC_ENTITY
ORDER_OR_RELIGIOUS_INSTITUTION
OTHERS (Only for contacts outside of Spain)
POLITICAL_PARTY
PROFESSIONAL_ASSOCIATION
PUBLIC_LAW_ASSOCIATION
PUBLIC_LIMITED_COMPANY
REGIONAL_GOVERNMENT_BODY
REGIONAL_PUBLIC_ENTITY
SAVINGS_BANK
SPANISH_OFFICE
SPORTS_ASSOCIATION
SPORTS_FEDERATION
SPORTS_LIMITED_COMPANY
TEMPORARY_ALLIANCE_OF_ENTERPRISES
TRADE_UNION
WORKER_OWNED_COMPANY
WORKER_OWNED_LIMITED_COMPANY
EU_COUNTRY_OF_CITIZENSHIP
BIRTH_DATE_IN_YYYY_MM_DD
FI_BUSINESS_NUMBER
FI_ID_NUMBER
FI_NATIONALITY
Valid values include the following:
FINNISH
NOT_FINNISH
FI_ORGANIZATION_TYPE
Valid values include the following:
COMPANY
CORPORATION
GOVERNMENT
INSTITUTION
POLITICAL_PARTY
PUBLIC_COMMUNITY
TOWNSHIP
BIRTH_CITY
BIRTH_COUNTRY
BIRTH_DATE_IN_YYYY_MM_DD
BIRTH_DEPARTMENT: Specify the INSEE code that corresponds with the department where the contact was born. If the contact was born somewhere other than France or its overseas departments, specify 99. For more information, including a list of departments and the corresponding INSEE numbers, see the Wikipedia entry Departments of France.
BRAND_NUMBER
IT_NATIONALITY
IT_PIN
IT_REGISTRANT_ENTITY_TYPE
Valid values include the following:
FOREIGNERS
FREELANCE_WORKERS (Freelance workers and professionals)
ITALIAN_COMPANIES (Italian companies and one-person companies)
NON_PROFIT_ORGANIZATIONS
OTHER_SUBJECTS
PUBLIC_ORGANIZATIONS
BIRTH_DATE_IN_YYYY_MM_DD
RU_PASSPORT_DATA
BIRTH_COUNTRY
SE_ID_NUMBER
SG_ID_NUMBER
UK_CONTACT_TYPE
Valid values include the following:
CRC (UK Corporation by Royal Charter)
FCORP (Non-UK Corporation)
FIND (Non-UK Individual, representing self)
FOTHER (Non-UK Entity that does not fit into any other category)
GOV (UK Government Body)
IND (UK Individual (representing self))
IP (UK Industrial/Provident Registered Company)
LLP (UK Limited Liability Partnership)
LTD (UK Limited Company)
OTHER (UK Entity that does not fit into any other category)
PLC (UK Public Limited Company)
PTNR (UK Partnership)
RCHAR (UK Registered Charity)
SCH (UK School)
STAT (UK Statutory Body)
STRA (UK Sole Trader)
UK_COMPANY_NUMBER
In addition, many TLDs require a VAT_NUMBER.
The name of an additional parameter that is required by a top-level domain. Here are the top-level domains that require additional parameters and the names of the parameters that they require:
AU_ID_NUMBER
AU_ID_TYPE
Valid values include the following:
ABN (Australian business number)
ACN (Australian company number)
TM (Trademark number)
BRAND_NUMBER
CA_BUSINESS_ENTITY_TYPE
Valid values include the following:
BANK (Bank)
COMMERCIAL_COMPANY (Commercial company)
COMPANY (Company)
COOPERATION (Cooperation)
COOPERATIVE (Cooperative)
COOPRIX (Cooprix)
CORP (Corporation)
CREDIT_UNION (Credit union)
FOMIA (Federation of mutual insurance associations)
INC (Incorporated)
LTD (Limited)
LTEE (Limitée)
LLC (Limited liability corporation)
LLP (Limited liability partnership)
LTE (Lte.)
MBA (Mutual benefit association)
MIC (Mutual insurance company)
NFP (Not-for-profit corporation)
SA (S.A.)
SAVINGS_COMPANY (Savings company)
SAVINGS_UNION (Savings union)
SARL (Société à responsabilité limitée)
TRUST (Trust)
ULC (Unlimited liability corporation)
CA_LEGAL_TYPE
When ContactType is PERSON, valid values include the following:
ABO (Aboriginal Peoples indigenous to Canada)
CCT (Canadian citizen)
LGR (Legal Representative of a Canadian Citizen or Permanent Resident)
RES (Permanent resident of Canada)
When ContactType is a value other than PERSON, valid values include the following:
ASS (Canadian unincorporated association)
CCO (Canadian corporation)
EDU (Canadian educational institution)
GOV (Government or government entity in Canada)
HOP (Canadian Hospital)
INB (Indian Band recognized by the Indian Act of Canada)
LAM (Canadian Library, Archive, or Museum)
MAJ (Her/His Majesty the Queen/King)
OMK (Official mark registered in Canada)
PLT (Canadian Political Party)
PRT (Partnership Registered in Canada)
TDM (Trademark registered in Canada)
TRD (Canadian Trade Union)
TRS (Trust established in Canada)
ES_IDENTIFICATION
The value of ES_IDENTIFICATION depends on the following values:
The value of ES_LEGAL_FORM
The value of ES_IDENTIFICATION_TYPE
If ES_LEGAL_FORM is any value other than INDIVIDUAL:
Specify 1 letter + 8 numbers (CIF [Certificado de Identificación Fiscal])
Example: B12345678
If ES_LEGAL_FORM is INDIVIDUAL, the value that you specify for ES_IDENTIFICATION depends on the value of ES_IDENTIFICATION_TYPE:
If ES_IDENTIFICATION_TYPE is DNI_AND_NIF (for Spanish contacts):
Specify 8 numbers + 1 letter (DNI [Documento Nacional de Identidad], NIF [Número de Identificación Fiscal])
Example: 12345678M
If ES_IDENTIFICATION_TYPE is NIE (for foreigners with legal residence):
Specify 1 letter + 7 numbers + 1 letter ( NIE [Número de Identidad de Extranjero])
Example: Y1234567X
If ES_IDENTIFICATION_TYPE is OTHER (for contacts outside of Spain):
Specify a passport number, drivers license number, or national identity card number
ES_IDENTIFICATION_TYPE
Valid values include the following:
DNI_AND_NIF (For Spanish contacts)
NIE (For foreigners with legal residence)
OTHER (For contacts outside of Spain)
ES_LEGAL_FORM
Valid values include the following:
ASSOCIATION
CENTRAL_GOVERNMENT_BODY
CIVIL_SOCIETY
COMMUNITY_OF_OWNERS
COMMUNITY_PROPERTY
CONSULATE
COOPERATIVE
DESIGNATION_OF_ORIGIN_SUPERVISORY_COUNCIL
ECONOMIC_INTEREST_GROUP
EMBASSY
ENTITY_MANAGING_NATURAL_AREAS
FARM_PARTNERSHIP
FOUNDATION
GENERAL_AND_LIMITED_PARTNERSHIP
GENERAL_PARTNERSHIP
INDIVIDUAL
LIMITED_COMPANY
LOCAL_AUTHORITY
LOCAL_PUBLIC_ENTITY
MUTUAL_INSURANCE_COMPANY
NATIONAL_PUBLIC_ENTITY
ORDER_OR_RELIGIOUS_INSTITUTION
OTHERS (Only for contacts outside of Spain)
POLITICAL_PARTY
PROFESSIONAL_ASSOCIATION
PUBLIC_LAW_ASSOCIATION
PUBLIC_LIMITED_COMPANY
REGIONAL_GOVERNMENT_BODY
REGIONAL_PUBLIC_ENTITY
SAVINGS_BANK
SPANISH_OFFICE
SPORTS_ASSOCIATION
SPORTS_FEDERATION
SPORTS_LIMITED_COMPANY
TEMPORARY_ALLIANCE_OF_ENTERPRISES
TRADE_UNION
WORKER_OWNED_COMPANY
WORKER_OWNED_LIMITED_COMPANY
EU_COUNTRY_OF_CITIZENSHIP
BIRTH_DATE_IN_YYYY_MM_DD
FI_BUSINESS_NUMBER
FI_ID_NUMBER
FI_NATIONALITY
Valid values include the following:
FINNISH
NOT_FINNISH
FI_ORGANIZATION_TYPE
Valid values include the following:
COMPANY
CORPORATION
GOVERNMENT
INSTITUTION
POLITICAL_PARTY
PUBLIC_COMMUNITY
TOWNSHIP
IT_NATIONALITY
IT_PIN
IT_REGISTRANT_ENTITY_TYPE
Valid values include the following:
FOREIGNERS
FREELANCE_WORKERS (Freelance workers and professionals)
ITALIAN_COMPANIES (Italian companies and one-person companies)
NON_PROFIT_ORGANIZATIONS
OTHER_SUBJECTS
PUBLIC_ORGANIZATIONS
BIRTH_DATE_IN_YYYY_MM_DD
RU_PASSPORT_DATA
BIRTH_COUNTRY
SE_ID_NUMBER
SG_ID_NUMBER
UK_CONTACT_TYPE
Valid values include the following:
CRC (UK Corporation by Royal Charter)
FCORP (Non-UK Corporation)
FIND (Non-UK Individual, representing self)
FOTHER (Non-UK Entity that does not fit into any other category)
GOV (UK Government Body)
IND (UK Individual (representing self))
IP (UK Industrial/Provident Registered Company)
LLP (UK Limited Liability Partnership)
LTD (UK Limited Company)
OTHER (UK Entity that does not fit into any other category)
PLC (UK Public Limited Company)
PTNR (UK Partnership)
RCHAR (UK Registered Charity)
SCH (UK School)
STAT (UK Statutory Body)
STRA (UK Sole Trader)
UK_COMPANY_NUMBER
In addition, many TLDs require a VAT_NUMBER.
The sort type for returned values.
" } }, + "ListPricesPageMaxItems": { + "base": null, + "refs": { + "ListPricesRequest$MaxItems": "Number of Prices to be returned.
Used only for all TLDs. If you specify a TLD, don't specify a MaxItems.
Number of domains to be returned.
Default: 20
", "ListOperationsRequest$MaxItems": "Number of domains to be returned.
Default: 20
", - "ListPricesRequest$MaxItems": "Number of Prices to be returned.
Used only for all TLDs. If you specify a TLD, don't specify a MaxItems.
The number of billing records to be returned.
Default: 20
" } }, diff --git a/models/apis/route53domains/2014-05-15/endpoint-rule-set-1.json b/models/apis/route53domains/2014-05-15/endpoint-rule-set-1.json index 4f994c0ade7..3ccf51cbf5b 100644 --- a/models/apis/route53domains/2014-05-15/endpoint-rule-set-1.json +++ b/models/apis/route53domains/2014-05-15/endpoint-rule-set-1.json @@ -3,7 +3,7 @@ "parameters": { "Region": { "builtIn": "AWS::Region", - "required": true, + "required": false, "documentation": "The AWS region used to dispatch the request.", "type": "String" }, @@ -32,13 +32,12 @@ { "conditions": [ { - "fn": "aws.partition", + "fn": "isSet", "argv": [ { - "ref": "Region" + "ref": "Endpoint" } - ], - "assign": "PartitionResult" + ] } ], "type": "tree", @@ -46,14 +45,20 @@ { "conditions": [ { - "fn": "isSet", + "fn": "booleanEquals", "argv": [ { - "ref": "Endpoint" - } + "ref": "UseFIPS" + }, + true ] } ], + "error": "Invalid Configuration: FIPS and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], "type": "tree", "rules": [ { @@ -62,67 +67,42 @@ "fn": "booleanEquals", "argv": [ { - "ref": "UseFIPS" + "ref": "UseDualStack" }, true ] } ], - "error": "Invalid Configuration: FIPS and custom endpoint are not supported", + "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", "type": "error" }, { "conditions": [], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" - }, - true - ] - } - ], - "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", - "type": "error" + "endpoint": { + "url": { + "ref": "Endpoint" }, - { - "conditions": [], - "endpoint": { - "url": { - "ref": "Endpoint" - }, - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] - }, + } + ] + }, + { + "conditions": [], + "type": "tree", + "rules": [ { "conditions": [ { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseFIPS" - }, - true - ] - }, - { - "fn": "booleanEquals", + "fn": "isSet", "argv": [ { - "ref": "UseDualStack" - }, - true + "ref": "Region" + } ] } ], @@ -131,90 +111,215 @@ { "conditions": [ { - "fn": "booleanEquals", + "fn": "aws.partition", "argv": [ - true, { - "fn": "getAttr", + "ref": "Region" + } + ], + "assign": "PartitionResult" + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseFIPS" + }, + true + ] + }, + { + "fn": "booleanEquals", "argv": [ { - "ref": "PartitionResult" + "ref": "UseDualStack" + }, + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] }, - "supportsFIPS" + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://route53domains-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } ] + }, + { + "conditions": [], + "error": "FIPS and DualStack are enabled, but this partition does not support one or both", + "type": "error" } ] }, { - "fn": "booleanEquals", - "argv": [ - true, + "conditions": [ { - "fn": "getAttr", + "fn": "booleanEquals", "argv": [ { - "ref": "PartitionResult" + "ref": "UseFIPS" }, - "supportsDualStack" + true ] } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://route53domains-fips.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] + }, + { + "conditions": [], + "error": "FIPS is enabled but this partition does not support FIPS", + "type": "error" + } ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://route53domains-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] - }, - { - "conditions": [], - "error": "FIPS and DualStack are enabled, but this partition does not support one or both", - "type": "error" - } - ] - }, - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseFIPS" }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ { - "fn": "booleanEquals", - "argv": [ - true, + "conditions": [ { - "fn": "getAttr", + "fn": "booleanEquals", "argv": [ { - "ref": "PartitionResult" + "ref": "UseDualStack" }, - "supportsFIPS" + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://route53domains.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } ] + }, + { + "conditions": [], + "error": "DualStack is enabled but this partition does not support DualStack", + "type": "error" } ] - } - ], - "type": "tree", - "rules": [ + }, { "conditions": [], "type": "tree", @@ -222,7 +327,7 @@ { "conditions": [], "endpoint": { - "url": "https://route53domains-fips.{Region}.{PartitionResult#dnsSuffix}", + "url": "https://route53domains.{Region}.{PartitionResult#dnsSuffix}", "properties": {}, "headers": {} }, @@ -231,74 +336,13 @@ ] } ] - }, - { - "conditions": [], - "error": "FIPS is enabled but this partition does not support FIPS", - "type": "error" - } - ] - }, - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://route53domains.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] - }, - { - "conditions": [], - "error": "DualStack is enabled but this partition does not support DualStack", - "type": "error" } ] }, { "conditions": [], - "endpoint": { - "url": "https://route53domains.{Region}.{PartitionResult#dnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" + "error": "Invalid Configuration: Missing Region", + "type": "error" } ] } diff --git a/models/apis/route53domains/2014-05-15/endpoint-tests-1.json b/models/apis/route53domains/2014-05-15/endpoint-tests-1.json index b2039e36464..f837786f8dd 100644 --- a/models/apis/route53domains/2014-05-15/endpoint-tests-1.json +++ b/models/apis/route53domains/2014-05-15/endpoint-tests-1.json @@ -1,5 +1,18 @@ { "testCases": [ + { + "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://route53domains.us-east-1.amazonaws.com" + } + }, + "params": { + "Region": "us-east-1", + "UseFIPS": false, + "UseDualStack": false + } + }, { "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", "expect": { @@ -8,8 +21,8 @@ } }, "params": { - "UseFIPS": true, "Region": "us-east-1", + "UseFIPS": true, "UseDualStack": true } }, @@ -21,8 +34,8 @@ } }, "params": { - "UseFIPS": true, "Region": "us-east-1", + "UseFIPS": true, "UseDualStack": false } }, @@ -34,34 +47,234 @@ } }, "params": { - "UseFIPS": false, "Region": "us-east-1", + "UseFIPS": false, "UseDualStack": true } }, { - "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled", + "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://route53domains.us-east-1.amazonaws.com" + "url": "https://route53domains-fips.cn-north-1.api.amazonwebservices.com.cn" } }, "params": { + "Region": "cn-north-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://route53domains-fips.cn-north-1.amazonaws.com.cn" + } + }, + "params": { + "Region": "cn-north-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://route53domains.cn-north-1.api.amazonwebservices.com.cn" + } + }, + "params": { + "Region": "cn-north-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://route53domains.cn-north-1.amazonaws.com.cn" + } + }, + "params": { + "Region": "cn-north-1", "UseFIPS": false, - "Region": "us-east-1", "UseDualStack": false } }, { - "documentation": "For custom endpoint with fips disabled and dualstack disabled", + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://example.com" + "url": "https://route53domains-fips.us-gov-east-1.api.aws" + } + }, + "params": { + "Region": "us-gov-east-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://route53domains-fips.us-gov-east-1.amazonaws.com" + } + }, + "params": { + "Region": "us-gov-east-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://route53domains.us-gov-east-1.api.aws" + } + }, + "params": { + "Region": "us-gov-east-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://route53domains.us-gov-east-1.amazonaws.com" + } + }, + "params": { + "Region": "us-gov-east-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "error": "FIPS and DualStack are enabled, but this partition does not support one or both" + }, + "params": { + "Region": "us-iso-east-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://route53domains-fips.us-iso-east-1.c2s.ic.gov" } }, "params": { + "Region": "us-iso-east-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "error": "DualStack is enabled but this partition does not support DualStack" + }, + "params": { + "Region": "us-iso-east-1", "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://route53domains.us-iso-east-1.c2s.ic.gov" + } + }, + "params": { + "Region": "us-iso-east-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region us-isob-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "error": "FIPS and DualStack are enabled, but this partition does not support one or both" + }, + "params": { + "Region": "us-isob-east-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region us-isob-east-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://route53domains-fips.us-isob-east-1.sc2s.sgov.gov" + } + }, + "params": { + "Region": "us-isob-east-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "error": "DualStack is enabled but this partition does not support DualStack" + }, + "params": { + "Region": "us-isob-east-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://route53domains.us-isob-east-1.sc2s.sgov.gov" + } + }, + "params": { + "Region": "us-isob-east-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For custom endpoint with region set and fips disabled and dualstack disabled", + "expect": { + "endpoint": { + "url": "https://example.com" + } + }, + "params": { "Region": "us-east-1", + "UseFIPS": false, + "UseDualStack": false, + "Endpoint": "https://example.com" + } + }, + { + "documentation": "For custom endpoint with region not set and fips disabled and dualstack disabled", + "expect": { + "endpoint": { + "url": "https://example.com" + } + }, + "params": { + "UseFIPS": false, "UseDualStack": false, "Endpoint": "https://example.com" } @@ -72,8 +285,8 @@ "error": "Invalid Configuration: FIPS and custom endpoint are not supported" }, "params": { - "UseFIPS": true, "Region": "us-east-1", + "UseFIPS": true, "UseDualStack": false, "Endpoint": "https://example.com" } @@ -84,11 +297,17 @@ "error": "Invalid Configuration: Dualstack and custom endpoint are not supported" }, "params": { - "UseFIPS": false, "Region": "us-east-1", + "UseFIPS": false, "UseDualStack": true, "Endpoint": "https://example.com" } + }, + { + "documentation": "Missing region", + "expect": { + "error": "Invalid Configuration: Missing Region" + } } ], "version": "1.0" diff --git a/models/apis/sagemaker/2017-07-24/api-2.json b/models/apis/sagemaker/2017-07-24/api-2.json index 6ead2d3a9ab..a7966a9a87c 100644 --- a/models/apis/sagemaker/2017-07-24/api-2.json +++ b/models/apis/sagemaker/2017-07-24/api-2.json @@ -4425,7 +4425,23 @@ "type":"structure", "members":{ "ImageClassificationJobConfig":{"shape":"ImageClassificationJobConfig"}, - "TextClassificationJobConfig":{"shape":"TextClassificationJobConfig"} + "TextClassificationJobConfig":{"shape":"TextClassificationJobConfig"}, + "TabularJobConfig":{"shape":"TabularJobConfig"} + }, + "union":true + }, + "AutoMLProblemTypeConfigName":{ + "type":"string", + "enum":[ + "ImageClassification", + "TextClassification", + "Tabular" + ] + }, + "AutoMLProblemTypeResolvedAttributes":{ + "type":"structure", + "members":{ + "TabularResolvedAttributes":{"shape":"TabularResolvedAttributes"} }, "union":true }, @@ -4436,6 +4452,14 @@ "GPU" ] }, + "AutoMLResolvedAttributes":{ + "type":"structure", + "members":{ + "AutoMLJobObjective":{"shape":"AutoMLJobObjective"}, + "CompletionCriteria":{"shape":"AutoMLJobCompletionCriteria"}, + "AutoMLProblemTypeResolvedAttributes":{"shape":"AutoMLProblemTypeResolvedAttributes"} + } + }, "AutoMLS3DataSource":{ "type":"structure", "required":[ @@ -4689,6 +4713,12 @@ "type":"string", "min":1 }, + "CandidateGenerationConfig":{ + "type":"structure", + "members":{ + "AlgorithmsConfig":{"shape":"AutoMLAlgorithmsConfig"} + } + }, "CandidateName":{ "type":"string", "max":64, @@ -7844,7 +7874,10 @@ "ModelDeployConfig":{"shape":"ModelDeployConfig"}, "ModelDeployResult":{"shape":"ModelDeployResult"}, "DataSplitConfig":{"shape":"AutoMLDataSplitConfig"}, - "SecurityConfig":{"shape":"AutoMLSecurityConfig"} + "SecurityConfig":{"shape":"AutoMLSecurityConfig"}, + "AutoMLJobArtifacts":{"shape":"AutoMLJobArtifacts"}, + "ResolvedAttributes":{"shape":"AutoMLResolvedAttributes"}, + "AutoMLProblemTypeConfigName":{"shape":"AutoMLProblemTypeConfigName"} } }, "DescribeCodeRepositoryInput":{ @@ -18996,6 +19029,26 @@ "min":1, "pattern":"[\\u0020-\\uD7FF\\uE000-\\uFFFD\\uD800\\uDC00-\\uDBFF\\uDFFF\\t]*" }, + "TabularJobConfig":{ + "type":"structure", + "required":["TargetAttributeName"], + "members":{ + "CandidateGenerationConfig":{"shape":"CandidateGenerationConfig"}, + "CompletionCriteria":{"shape":"AutoMLJobCompletionCriteria"}, + "FeatureSpecificationS3Uri":{"shape":"S3Uri"}, + "Mode":{"shape":"AutoMLMode"}, + "GenerateCandidateDefinitionsOnly":{"shape":"GenerateCandidateDefinitionsOnly"}, + "ProblemType":{"shape":"ProblemType"}, + "TargetAttributeName":{"shape":"TargetAttributeName"}, + "SampleWeightAttributeName":{"shape":"SampleWeightAttributeName"} + } + }, + "TabularResolvedAttributes":{ + "type":"structure", + "members":{ + "ProblemType":{"shape":"ProblemType"} + } + }, "Tag":{ "type":"structure", "required":[ diff --git a/models/apis/sagemaker/2017-07-24/docs-2.json b/models/apis/sagemaker/2017-07-24/docs-2.json index b513bf97430..b8c54efc213 100644 --- a/models/apis/sagemaker/2017-07-24/docs-2.json +++ b/models/apis/sagemaker/2017-07-24/docs-2.json @@ -11,8 +11,8 @@ "CreateApp": "Creates a running app for the specified UserProfile. This operation is automatically invoked by Amazon SageMaker Studio upon access to the associated Domain, and when new kernel configurations are selected by the user. A user may have multiple Apps active simultaneously.
", "CreateAppImageConfig": "Creates a configuration for running a SageMaker image as a KernelGateway app. The configuration specifies the Amazon Elastic File System (EFS) storage volume on the image, and a list of the kernels in the image.
", "CreateArtifact": "Creates an artifact. An artifact is a lineage tracking entity that represents a URI addressable object or data. Some examples are the S3 URI of a dataset and the ECR registry path of an image. For more information, see Amazon SageMaker ML Lineage Tracking.
", - "CreateAutoMLJob": "Creates an Autopilot job.
Find the best-performing model after you run an Autopilot job by calling DescribeAutoMLJob.
For information about how to use Autopilot, see Automate Model Development with Amazon SageMaker Autopilot.
", - "CreateAutoMLJobV2": "Creates an Amazon SageMaker AutoML job that uses non-tabular data such as images or text for Computer Vision or Natural Language Processing problems.
Find the resulting model after you run an AutoML job V2 by calling DescribeAutoMLJobV2.
To create an AutoMLJob using tabular data, see CreateAutoMLJob.
This API action is callable through SageMaker Canvas only. Calling it directly from the CLI or an SDK results in an error.
Creates an Autopilot job also referred to as Autopilot experiment or AutoML job.
Find the best-performing model after you run an AutoML job by calling DescribeAutoMLJobV2 (recommended) or DescribeAutoMLJob.
CreateAutoMLJob only accepts tabular input data. We recommend using CreateAutoMLJobV2 for all problem types. CreateAutoMLJobV2 can process the same tabular data as its previous version CreateAutoMLJob, as well as non-tabular data for problem types such as image or text classification.
Find guidelines about how to migrate CreateAutoMLJob to CreateAutoMLJobV2 in Migrate a CreateAutoMLJob to CreateAutoMLJobV2.
Creates an Autopilot job also referred to as Autopilot experiment or AutoML job V2.
We recommend using CreateAutoMLJobV2 for all problem types. CreateAutoMLJobV2 can process the same tabular data as its previous version CreateAutoMLJob, as well as non-tabular data for problem types such as image or text classification.
Find guidelines about how to migrate CreateAutoMLJob to CreateAutoMLJobV2 in Migrate a CreateAutoMLJob to CreateAutoMLJobV2.
For the list of available problem types supported by CreateAutoMLJobV2, see AutoMLProblemTypeConfig.
Find the best-performing model after you run an AutoML job V2 by calling DescribeAutoMLJobV2. Calling DescribeAutoMLJob on a AutoML job V2 results in an error.
", "CreateCodeRepository": "Creates a Git repository as a resource in your SageMaker account. You can associate the repository with notebook instances so that you can use Git source control for the notebooks you create. The Git repository is a resource in your SageMaker account, so it can be associated with more than one notebook instance, and it persists independently from the lifecycle of any notebook instances it is associated with.
The repository can be hosted either in Amazon Web Services CodeCommit or in any other Git repository.
", "CreateCompilationJob": "Starts a model compilation job. After the model has been compiled, Amazon SageMaker saves the resulting model artifacts to an Amazon Simple Storage Service (Amazon S3) bucket that you specify.
If you choose to host your model using Amazon SageMaker hosting services, you can use the resulting model artifacts as part of the model. You can also use the artifacts with Amazon Web Services IoT Greengrass. In that case, deploy them as an ML resource.
In the request body, you provide the following:
A name for the compilation job
Information about the input model artifacts
The output location for the compiled model and the device (target) that the model runs on
The Amazon Resource Name (ARN) of the IAM role that Amazon SageMaker assumes to perform the model compilation job.
You can also provide a Tag to track the model compilation job's resource use and costs. The response body contains the CompilationJobArn for the compiled job.
To stop a model compilation job, use StopCompilationJob. To get information about a particular model compilation job, use DescribeCompilationJob. To get information about multiple model compilation jobs, use ListCompilationJobs.
", "CreateContext": "Creates a context. A context is a lineage tracking entity that represents a logical grouping of other tracking or experiment entities. Some examples are an endpoint and a model package. For more information, see Amazon SageMaker ML Lineage Tracking.
", @@ -111,8 +111,8 @@ "DescribeApp": "Describes the app.
", "DescribeAppImageConfig": "Describes an AppImageConfig.
", "DescribeArtifact": "Describes an artifact.
", - "DescribeAutoMLJob": "Returns information about an Amazon SageMaker AutoML job.
", - "DescribeAutoMLJobV2": "Returns information about an Amazon SageMaker AutoML V2 job.
This API action is callable through SageMaker Canvas only. Calling it directly from the CLI or an SDK results in an error.
Returns information about an AutoML job created by calling CreateAutoMLJob.
", + "DescribeAutoMLJobV2": "Returns information about an AutoML job V2 created by calling CreateAutoMLJobV2.
", "DescribeCodeRepository": "Gets details about the specified Git repository.
", "DescribeCompilationJob": "Returns information about a model compilation job.
To create a model compilation job, use CreateCompilationJob. To get information about multiple model compilation jobs, use ListCompilationJobs.
", "DescribeContext": "Describes a context.
", @@ -916,7 +916,8 @@ "AutoMLAlgorithmsConfig": { "base": null, "refs": { - "AutoMLCandidateGenerationConfig$AlgorithmsConfig": "Stores the configuration information for the selection of algorithms used to train the model candidates.
The list of available algorithms to choose from depends on the training mode set in AutoMLJobConfig.Mode .
AlgorithmsConfig should not be set in AUTO training mode.
When AlgorithmsConfig is provided, one AutoMLAlgorithms attribute must be set and one only.
If the list of algorithms provided as values for AutoMLAlgorithms is empty, AutoMLCandidateGenerationConfig uses the full set of algorithms for the given training mode.
When AlgorithmsConfig is not provided, AutoMLCandidateGenerationConfig uses the full set of algorithms for the given training mode.
For the list of all algorithms per training mode, see AutoMLAlgorithmConfig.
For more information on each algorithm, see the Algorithm support section in Autopilot developer guide.
" + "AutoMLCandidateGenerationConfig$AlgorithmsConfig": "Stores the configuration information for the selection of algorithms used to train the model candidates.
The list of available algorithms to choose from depends on the training mode set in AutoMLJobConfig.Mode .
AlgorithmsConfig should not be set in AUTO training mode.
When AlgorithmsConfig is provided, one AutoMLAlgorithms attribute must be set and one only.
If the list of algorithms provided as values for AutoMLAlgorithms is empty, AutoMLCandidateGenerationConfig uses the full set of algorithms for the given training mode.
When AlgorithmsConfig is not provided, AutoMLCandidateGenerationConfig uses the full set of algorithms for the given training mode.
For the list of all algorithms per training mode, see AutoMLAlgorithmConfig.
For more information on each algorithm, see the Algorithm support section in Autopilot developer guide.
", + "CandidateGenerationConfig$AlgorithmsConfig": "Stores the configuration information for the selection of algorithms used to train model candidates on tabular data.
The list of available algorithms to choose from depends on the training mode set in TabularJobConfig.Mode .
AlgorithmsConfig should not be set in AUTO training mode.
When AlgorithmsConfig is provided, one AutoMLAlgorithms attribute must be set and one only.
If the list of algorithms provided as values for AutoMLAlgorithms is empty, CandidateGenerationConfig uses the full set of algorithms for the given training mode.
When AlgorithmsConfig is not provided, CandidateGenerationConfig uses the full set of algorithms for the given training mode.
For the list of all algorithms per problem type and training mode, see AutoMLAlgorithmConfig.
For more information on each algorithm, see the Algorithm support section in Autopilot developer guide.
" } }, "AutoMLCandidate": { @@ -975,14 +976,14 @@ "base": "The data source for the Autopilot job.
", "refs": { "AutoMLChannel$DataSource": "The data source for an AutoML channel.
", - "AutoMLJobChannel$DataSource": "The data source for an AutoML channel.
" + "AutoMLJobChannel$DataSource": "The data source for an AutoML channel (Required).
" } }, "AutoMLDataSplitConfig": { - "base": "This structure specifies how to split the data into train and validation datasets.
If you are using the V1 API (for example CreateAutoMLJob) or the V2 API for Natural Language Processing problems (for example CreateAutoMLJobV2 with a TextClassificationJobConfig problem type), the validation and training datasets must contain the same headers. Also, for V1 API jobs, the validation dataset must be less than 2 GB in size.
This structure specifies how to split the data into train and validation datasets.
The validation and training datasets must contain the same headers. For jobs created by calling CreateAutoMLJob, the validation dataset must be less than 2 GB in size.
The configuration for splitting the input training dataset.
Type: AutoMLDataSplitConfig
", - "CreateAutoMLJobV2Request$DataSplitConfig": "This structure specifies how to split the data into train and validation datasets.
If you are using the V1 API (for example CreateAutoMLJob) or the V2 API for Natural Language Processing problems (for example CreateAutoMLJobV2 with a TextClassificationJobConfig problem type), the validation and training datasets must contain the same headers. Also, for V1 API jobs, the validation dataset must be less than 2 GB in size.
This structure specifies how to split the data into train and validation datasets.
The validation and training datasets must contain the same headers. For jobs created by calling CreateAutoMLJob, the validation dataset must be less than 2 GB in size.
Returns the configuration settings of how the data are split into train and validation datasets.
" } }, @@ -993,13 +994,13 @@ "AutoMLJobSummary$FailureReason": "The failure reason of an AutoML job.
", "AutoMLPartialFailureReason$PartialFailureMessage": "The message containing the reason for a partial failure of an AutoML job.
", "DescribeAutoMLJobResponse$FailureReason": "Returns the failure reason for an AutoML job, when applicable.
", - "DescribeAutoMLJobV2Response$FailureReason": "Returns the reason for the failure of the AutoML V2 job, when applicable.
" + "DescribeAutoMLJobV2Response$FailureReason": "Returns the reason for the failure of the AutoML job V2, when applicable.
" } }, "AutoMLInferenceContainerDefinitions": { "base": "The mapping of all supported processing unit (CPU, GPU, etc...) to inference container definitions for the candidate. This field is populated for the V2 API only (for example, for jobs created by calling CreateAutoMLJobV2).
The mapping of all supported processing unit (CPU, GPU, etc...) to inference container definitions for the candidate. This field is populated for the V2 API only (for example, for jobs created by calling CreateAutoMLJobV2).
The mapping of all supported processing unit (CPU, GPU, etc...) to inference container definitions for the candidate. This field is populated for the AutoML jobs V2 (for example, for jobs created by calling CreateAutoMLJobV2) related to image or text classification problem types only.
The unique ARN assigned to the AutoML job when it is created.
", "CreateAutoMLJobV2Response$AutoMLJobArn": "The unique ARN assigned to the AutoMLJob when it is created.
", "DescribeAutoMLJobResponse$AutoMLJobArn": "Returns the ARN of the AutoML job.
", - "DescribeAutoMLJobV2Response$AutoMLJobArn": "Returns the Amazon Resource Name (ARN) of the AutoML V2 job.
", + "DescribeAutoMLJobV2Response$AutoMLJobArn": "Returns the Amazon Resource Name (ARN) of the AutoML job V2.
", "DescribeProcessingJobResponse$AutoMLJobArn": "The ARN of an AutoML job associated with this processing job.
", "DescribeTrainingJobResponse$AutoMLJobArn": "The Amazon Resource Name (ARN) of an AutoML job.
", "DescribeTransformJobResponse$AutoMLJobArn": "The Amazon Resource Name (ARN) of the AutoML transform job.
", @@ -1029,11 +1030,12 @@ "AutoMLJobArtifacts": { "base": "The artifacts that are generated during an AutoML job.
", "refs": { - "DescribeAutoMLJobResponse$AutoMLJobArtifacts": "Returns information on the job's artifacts found in AutoMLJobArtifacts.
Returns information on the job's artifacts found in AutoMLJobArtifacts.
A channel is a named input source that training algorithms can consume. This channel is used for the non tabular training data of an AutoML job using the V2 API. For tabular training data, see AutoMLChannel. For more information, see Channel.
", + "base": "A channel is a named input source that training algorithms can consume. This channel is used for AutoML jobs V2 (jobs created by calling CreateAutoMLJobV2).
", "refs": { "AutoMLJobInputDataConfig$member": null } @@ -1042,8 +1044,10 @@ "base": "How long a job is allowed to run, or how many candidates a job is allowed to generate.
", "refs": { "AutoMLJobConfig$CompletionCriteria": "How long an AutoML job is allowed to run, or how many candidates a job is allowed to generate.
", + "AutoMLResolvedAttributes$CompletionCriteria": null, "ImageClassificationJobConfig$CompletionCriteria": "How long a job is allowed to run, or how many candidates a job is allowed to generate.
", "ResolvedAttributes$CompletionCriteria": null, + "TabularJobConfig$CompletionCriteria": null, "TextClassificationJobConfig$CompletionCriteria": "How long a job is allowed to run, or how many candidates a job is allowed to generate.
" } }, @@ -1057,7 +1061,7 @@ "AutoMLJobInputDataConfig": { "base": null, "refs": { - "CreateAutoMLJobV2Request$AutoMLJobInputDataConfig": "An array of channel objects describing the input data and their location. Each channel is a named input source. Similar to InputDataConfig supported by CreateAutoMLJob. The supported formats depend on the problem type:
ImageClassification: S3Prefix, ManifestFile, AugmentedManifestFile
TextClassification: S3Prefix
An array of channel objects describing the input data and their location. Each channel is a named input source. Similar to InputDataConfig supported by CreateAutoMLJob. The supported formats depend on the problem type:
For Tabular problem types: S3Prefix, ManifestFile.
For ImageClassification: S3Prefix, ManifestFile, AugmentedManifestFile.
For TextClassification: S3Prefix.
Returns an array of channel objects describing the input data and their location.
" } }, @@ -1069,17 +1073,18 @@ "CreateAutoMLJobV2Request$AutoMLJobName": "Identifies an Autopilot job. The name must be unique to your account and is case insensitive.
", "DescribeAutoMLJobRequest$AutoMLJobName": "Requests information about an AutoML job using its unique name.
", "DescribeAutoMLJobResponse$AutoMLJobName": "Returns the name of the AutoML job.
", - "DescribeAutoMLJobV2Request$AutoMLJobName": "Requests information about an AutoML V2 job using its unique name.
", - "DescribeAutoMLJobV2Response$AutoMLJobName": "Returns the name of the AutoML V2 job.
", + "DescribeAutoMLJobV2Request$AutoMLJobName": "Requests information about an AutoML job V2 using its unique name.
", + "DescribeAutoMLJobV2Response$AutoMLJobName": "Returns the name of the AutoML job V2.
", "ListCandidatesForAutoMLJobRequest$AutoMLJobName": "List the candidates created for the job by providing the job's name.
", "StopAutoMLJobRequest$AutoMLJobName": "The name of the object you are requesting.
" } }, "AutoMLJobObjective": { - "base": "Specifies a metric to minimize or maximize as the objective of a job. V2 API jobs (for example jobs created by calling CreateAutoMLJobV2), support Accuracy only.
Specifies a metric to minimize or maximize as the objective of a job.
", "refs": { - "CreateAutoMLJobRequest$AutoMLJobObjective": "Defines the objective metric used to measure the predictive quality of an AutoML job. You provide an AutoMLJobObjective$MetricName and Autopilot infers whether to minimize or maximize it. For CreateAutoMLJobV2, only Accuracy is supported.
Specifies a metric to minimize or maximize as the objective of a job. For CreateAutoMLJobV2, only Accuracy is supported.
Specifies a metric to minimize or maximize as the objective of a job. If not specified, the default objective metric depends on the problem type. See AutoMLJobObjective for the default values.
", + "CreateAutoMLJobV2Request$AutoMLJobObjective": "Specifies a metric to minimize or maximize as the objective of a job. If not specified, the default objective metric depends on the problem type. For the list of default values per problem type, see AutoMLJobObjective.
For tabular problem types, you must either provide the AutoMLJobObjective and indicate the type of supervised learning problem in AutoMLProblemTypeConfig (TabularJobConfig.ProblemType), or none.
Returns the job's objective.
", "DescribeAutoMLJobV2Response$AutoMLJobObjective": "Returns the job's objective.
", "ResolvedAttributes$AutoMLJobObjective": null @@ -1096,7 +1101,7 @@ "refs": { "AutoMLJobSummary$AutoMLJobSecondaryStatus": "The secondary status of the AutoML job.
", "DescribeAutoMLJobResponse$AutoMLJobSecondaryStatus": "Returns the secondary status of the AutoML job.
", - "DescribeAutoMLJobV2Response$AutoMLJobSecondaryStatus": "Returns the secondary status of the AutoML V2 job.
" + "DescribeAutoMLJobV2Response$AutoMLJobSecondaryStatus": "Returns the secondary status of the AutoML job V2.
" } }, "AutoMLJobStatus": { @@ -1104,7 +1109,7 @@ "refs": { "AutoMLJobSummary$AutoMLJobStatus": "The status of the AutoML job.
", "DescribeAutoMLJobResponse$AutoMLJobStatus": "Returns the status of the AutoML job.
", - "DescribeAutoMLJobV2Response$AutoMLJobStatus": "Returns the status of the AutoML V2 job.
", + "DescribeAutoMLJobV2Response$AutoMLJobStatus": "Returns the status of the AutoML job V2.
", "ListAutoMLJobsRequest$StatusEquals": "Request a list of jobs, using a filter for status.
" } }, @@ -1136,7 +1141,7 @@ "AutoMLMetricEnum": { "base": null, "refs": { - "AutoMLJobObjective$MetricName": "The name of the objective metric used to measure the predictive quality of a machine learning system. During training, the model's parameters are updated iteratively to optimize its performance based on the feedback provided by the objective metric when evaluating the model on the validation dataset.
For the list of all available metrics supported by Autopilot, see Autopilot metrics.
If you do not specify a metric explicitly, the default behavior is to automatically use:
MSE: for regression.
F1: for binary classification
Accuracy: for multiclass classification.
The name of the objective metric used to measure the predictive quality of a machine learning system. During training, the model's parameters are updated iteratively to optimize its performance based on the feedback provided by the objective metric when evaluating the model on the validation dataset.
For the list of all available metrics supported by Autopilot, see Autopilot metrics.
If you do not specify a metric explicitly, the default behavior is to automatically use:
For tabular problem types:
Regression: MSE.
Binary classification: F1.
Multiclass classification: Accuracy.
For image or text classification problem types: Accuracy
The name of the metric with the best result. For a description of the possible objective metrics, see AutoMLJobObjective$MetricName.
", "FinalAutoMLJobObjectiveMetric$StandardMetricName": "The name of the standard metric. For a description of the standard metrics, see Autopilot candidate metrics.
", "MetricDatum$MetricName": "The name of the metric.
" @@ -1151,7 +1156,8 @@ "AutoMLMode": { "base": null, "refs": { - "AutoMLJobConfig$Mode": "The method that Autopilot uses to train the data. You can either specify the mode manually or let Autopilot choose for you based on the dataset size by selecting AUTO. In AUTO mode, Autopilot chooses ENSEMBLING for datasets smaller than 100 MB, and HYPERPARAMETER_TUNING for larger ones.
The ENSEMBLING mode uses a multi-stack ensemble model to predict classification and regression tasks directly from your dataset. This machine learning mode combines several base models to produce an optimal predictive model. It then uses a stacking ensemble method to combine predictions from contributing members. A multi-stack ensemble model can provide better performance over a single model by combining the predictive capabilities of multiple models. See Autopilot algorithm support for a list of algorithms supported by ENSEMBLING mode.
The HYPERPARAMETER_TUNING (HPO) mode uses the best hyperparameters to train the best version of a model. HPO automatically selects an algorithm for the type of problem you want to solve. Then HPO finds the best hyperparameters according to your objective metric. See Autopilot algorithm support for a list of algorithms supported by HYPERPARAMETER_TUNING mode.
The method that Autopilot uses to train the data. You can either specify the mode manually or let Autopilot choose for you based on the dataset size by selecting AUTO. In AUTO mode, Autopilot chooses ENSEMBLING for datasets smaller than 100 MB, and HYPERPARAMETER_TUNING for larger ones.
The ENSEMBLING mode uses a multi-stack ensemble model to predict classification and regression tasks directly from your dataset. This machine learning mode combines several base models to produce an optimal predictive model. It then uses a stacking ensemble method to combine predictions from contributing members. A multi-stack ensemble model can provide better performance over a single model by combining the predictive capabilities of multiple models. See Autopilot algorithm support for a list of algorithms supported by ENSEMBLING mode.
The HYPERPARAMETER_TUNING (HPO) mode uses the best hyperparameters to train the best version of a model. HPO automatically selects an algorithm for the type of problem you want to solve. Then HPO finds the best hyperparameters according to your objective metric. See Autopilot algorithm support for a list of algorithms supported by HYPERPARAMETER_TUNING mode.
The method that Autopilot uses to train the data. You can either specify the mode manually or let Autopilot choose for you based on the dataset size by selecting AUTO. In AUTO mode, Autopilot chooses ENSEMBLING for datasets smaller than 100 MB, and HYPERPARAMETER_TUNING for larger ones.
The ENSEMBLING mode uses a multi-stack ensemble model to predict classification and regression tasks directly from your dataset. This machine learning mode combines several base models to produce an optimal predictive model. It then uses a stacking ensemble method to combine predictions from contributing members. A multi-stack ensemble model can provide better performance over a single model by combining the predictive capabilities of multiple models. See Autopilot algorithm support for a list of algorithms supported by ENSEMBLING mode.
The HYPERPARAMETER_TUNING (HPO) mode uses the best hyperparameters to train the best version of a model. HPO automatically selects an algorithm for the type of problem you want to solve. Then HPO finds the best hyperparameters according to your objective metric. See Autopilot algorithm support for a list of algorithms supported by HYPERPARAMETER_TUNING mode.
The list of reasons for partial failures within an AutoML job.
", "DescribeAutoMLJobResponse$PartialFailureReasons": "Returns a list of reasons for partial failures within an AutoML job.
", - "DescribeAutoMLJobV2Response$PartialFailureReasons": "Returns a list of reasons for partial failures within an AutoML V2 job.
" + "DescribeAutoMLJobV2Response$PartialFailureReasons": "Returns a list of reasons for partial failures within an AutoML job V2.
" } }, "AutoMLProblemTypeConfig": { - "base": "A collection of settings specific to the problem type used to configure an AutoML job using the V2 API. There must be one and only one config of the following type.
", + "base": "A collection of settings specific to the problem type used to configure an AutoML job V2. There must be one and only one config of the following type.
", "refs": { - "CreateAutoMLJobV2Request$AutoMLProblemTypeConfig": "Defines the configuration settings of one of the supported problem types.
", - "DescribeAutoMLJobV2Response$AutoMLProblemTypeConfig": "Returns the configuration settings of the problem type set for the AutoML V2 job.
" + "CreateAutoMLJobV2Request$AutoMLProblemTypeConfig": "Defines the configuration settings of one of the supported problem types.
For tabular problem types, you must either specify the type of supervised learning problem in AutoMLProblemTypeConfig (TabularJobConfig.ProblemType) and provide the AutoMLJobObjective, or none at all.
Returns the configuration settings of the problem type set for the AutoML job V2.
" + } + }, + "AutoMLProblemTypeConfigName": { + "base": null, + "refs": { + "DescribeAutoMLJobV2Response$AutoMLProblemTypeConfigName": "Returns the name of the problem type configuration set for the AutoML job V2.
" + } + }, + "AutoMLProblemTypeResolvedAttributes": { + "base": "The resolved attributes specific to the problem type of an AutoML job V2.
", + "refs": { + "AutoMLResolvedAttributes$AutoMLProblemTypeResolvedAttributes": "Defines the resolved attributes specific to a problem type.
" } }, "AutoMLProcessingUnit": { @@ -1196,6 +1214,12 @@ "AutoMLInferenceContainerDefinitions$key": "Processing unit for an inference container. Currently Autopilot only supports CPU or GPU.
The resolved attributes used to configure an AutoML job V2.
", + "refs": { + "DescribeAutoMLJobV2Response$ResolvedAttributes": "Returns the resolved attributes used by the AutoML job V2.
" + } + }, "AutoMLS3DataSource": { "base": "Describes the Amazon S3 data source.
", "refs": { @@ -1445,6 +1469,12 @@ "AutoMLJobArtifacts$CandidateDefinitionNotebookLocation": "The URL of the notebook location.
" } }, + "CandidateGenerationConfig": { + "base": "Stores the configuration information for how model candidates are generated using an AutoML job V2.
", + "refs": { + "TabularJobConfig$CandidateGenerationConfig": "The configuration information of how model candidates are generated.
" + } + }, "CandidateName": { "base": null, "refs": { @@ -2002,7 +2032,7 @@ "base": null, "refs": { "AutoMLChannel$CompressionType": "You can use Gzip or None. The default value is None.
The allowed compression types depend on the input format. We allow the compression type Gzip for S3Prefix inputs only. For all other inputs, the compression type should be None. If no compression type is provided, we default to None.
The allowed compression types depend on the input format and problem type. We allow the compression type Gzip for S3Prefix inputs on tabular data only. For all other inputs, the compression type should be None. If no compression type is provided, we default to None.
If training data is compressed, the compression type. The default value is None. CompressionType is used only in Pipe input mode. In File mode, leave this field unset or set it to None.
If your transform data is compressed, specify the compression type. Amazon SageMaker automatically decompresses the data for the transform job accordingly. The default value is None.
The name of the column used to provide the sentences to be classified. It should not be the same as the target column.
" + "TextClassificationJobConfig$ContentColumn": "The name of the column used to provide the sentences to be classified. It should not be the same as the target column (Required).
" } }, "ContentDigest": { @@ -2147,7 +2177,7 @@ "base": null, "refs": { "AutoMLChannel$ContentType": "The content type of the data from the input source. You can use text/csv;header=present or x-application/vnd.amazon+parquet. The default value is text/csv;header=present.
The content type of the data from the input source. The following are the allowed content types for different problems:
ImageClassification: image/png, image/jpeg, or image/*. The default value is image/*.
TextClassification: text/csv;header=present or x-application/vnd.amazon+parquet. The default value is text/csv;header=present.
The content type of the data from the input source. The following are the allowed content types for different problems:
For Tabular problem types: text/csv;header=present or x-application/vnd.amazon+parquet. The default value is text/csv;header=present.
For ImageClassification: image/png, image/jpeg, or image/*. The default value is image/*.
For TextClassification: text/csv;header=present or x-application/vnd.amazon+parquet. The default value is text/csv;header=present.
The MIME type of the data.
", "ContentTypes$member": null, "FileSource$ContentType": "The type of content stored in the file source.
", @@ -5562,7 +5592,8 @@ "base": null, "refs": { "CreateAutoMLJobRequest$GenerateCandidateDefinitionsOnly": "Generates possible candidates without training the models. A candidate is a combination of data preprocessors, algorithms, and algorithm parameter settings.
", - "DescribeAutoMLJobResponse$GenerateCandidateDefinitionsOnly": "Indicates whether the output for an AutoML job generates candidate definitions only.
" + "DescribeAutoMLJobResponse$GenerateCandidateDefinitionsOnly": "Indicates whether the output for an AutoML job generates candidate definitions only.
", + "TabularJobConfig$GenerateCandidateDefinitionsOnly": "Generates possible candidates without training the models. A model candidate is a combination of data preprocessors, algorithms, and algorithm parameter settings.
" } }, "GetDeviceFleetReportRequest": { @@ -6281,9 +6312,9 @@ } }, "ImageClassificationJobConfig": { - "base": "Stores the configuration information for the image classification problem of an AutoML job using the V2 API.
", + "base": "Stores the configuration information for the image classification problem of an AutoML job V2.
", "refs": { - "AutoMLProblemTypeConfig$ImageClassificationJobConfig": "Settings used to configure an AutoML job using the V2 API for the image classification problem type.
" + "AutoMLProblemTypeConfig$ImageClassificationJobConfig": "Settings used to configure an AutoML job V2 for the image classification problem type.
" } }, "ImageConfig": { @@ -8066,7 +8097,7 @@ "MaxCandidates": { "base": null, "refs": { - "AutoMLJobCompletionCriteria$MaxCandidates": "The maximum number of times a training job is allowed to run.
For V2 jobs (jobs created by calling CreateAutoMLJobV2), the supported value is 1.
The maximum number of times a training job is allowed to run.
For job V2s (jobs created by calling CreateAutoMLJobV2), the supported value is 1.
The maximum time, in seconds, that each training job executed inside hyperparameter tuning is allowed to run as part of a hyperparameter tuning job. For more information, see the StoppingCondition used by the CreateHyperParameterTuningJob action.
For V2 jobs (jobs created by calling CreateAutoMLJobV2), this field controls the runtime of the job candidate.
The maximum time, in seconds, that each training job executed inside hyperparameter tuning is allowed to run as part of a hyperparameter tuning job. For more information, see the StoppingCondition used by the CreateHyperParameterTuningJob action.
For job V2s (jobs created by calling CreateAutoMLJobV2), this field controls the runtime of the job candidate.
Defines the type of supervised learning problem available for the candidates. For more information, see Amazon SageMaker Autopilot problem types.
", "DescribeAutoMLJobResponse$ProblemType": "Returns the job's problem type.
", - "ResolvedAttributes$ProblemType": "The problem type.
" + "ResolvedAttributes$ProblemType": "The problem type.
", + "TabularJobConfig$ProblemType": "The type of supervised learning problem available for the model candidates of the AutoML job V2. For more information, see Amazon SageMaker Autopilot problem types.
", + "TabularResolvedAttributes$ProblemType": "The type of supervised learning problem available for the model candidates of the AutoML job V2 (Binary Classification, Multiclass Classification, Regression). For more information, see Amazon SageMaker Autopilot problem types.
" } }, "ProcessingClusterConfig": { @@ -11540,7 +11573,7 @@ "ResolvedAttributes": { "base": "The resolved attributes.
", "refs": { - "DescribeAutoMLJobResponse$ResolvedAttributes": "Contains ProblemType, AutoMLJobObjective, and CompletionCriteria. If you do not provide these values, they are auto-inferred. If you do provide them, the values used are the ones you provide.
Contains ProblemType, AutoMLJobObjective, and CompletionCriteria. If you do not provide these values, they are inferred.
The S3 URI, or location in Amazon S3, of OfflineStore.
S3 URIs have a format similar to the following: s3://example-bucket/prefix/.
The S3 path where offline records are written.
", "SharingSettings$S3OutputPath": "When NotebookOutputOption is Allowed, the Amazon S3 bucket used to store the shared notebook snapshots.
A URL to the Amazon S3 data source containing selected features from the input data source to run an Autopilot job V2. You can input FeatureAttributeNames (optional) in JSON format as shown below:
{ \"FeatureAttributeNames\":[\"col1\", \"col2\", ...] }.
You can also specify the data type of the feature (optional) in the format shown below:
{ \"FeatureDataTypes\":{\"col1\":\"numeric\", \"col2\":\"categorical\" ... } }
These column keys may not include the target column.
In ensembling mode, Autopilot only supports the following data types: numeric, categorical, text, and datetime. In HPO mode, Autopilot can support numeric, categorical, text, datetime, and sequence.
If only FeatureDataTypes is provided, the column keys (col1, col2,..) should be a subset of the column names in the input data.
If both FeatureDataTypes and FeatureAttributeNames are provided, then the column keys should be a subset of the column names provided in FeatureAttributeNames.
The key name FeatureAttributeNames is fixed. The values listed in [\"col1\", \"col2\", ...] are case sensitive and should be a list of strings containing unique values that are a subset of the column names in the input data. The list of columns provided must not include the target column.
Path to Amazon S3 storage location for TensorBoard output.
", "TransformOutput$S3OutputPath": "The Amazon S3 path where you want Amazon SageMaker to store the results of the transform job. For example, s3://bucket-name/key-name-prefix.
For every S3 object used as input for the transform job, batch transform stores the transformed data with an .out suffix in a corresponding subfolder in the location in the output prefix. For example, for the input data stored at s3://bucket-name/input-name-prefix/dataset01/data.csv, batch transform stores the transformed data at s3://bucket-name/output-name-prefix/input-name-prefix/data.csv.out. Batch transform doesn't upload partially processed objects. For an input S3 object that contains multiple records, it creates an .out file only if the transform job succeeds on the entire file. When the input contains multiple S3 objects, the batch transform job processes the listed S3 objects and uploads only the output for successfully processed objects. If any object fails in the transform job batch transform marks the job as failed to prompt investigation.
Depending on the value specified for the S3DataType, identifies either a key name prefix or a manifest. For example:
A key name prefix might look like this: s3://bucketname/exampleprefix.
A manifest might look like this: s3://bucketname/example.manifest
The manifest is an S3 object which is a JSON file with the following format:
[ {\"prefix\": \"s3://customer_bucket/some/prefix/\"},
\"relative/path/to/custdata-1\",
\"relative/path/custdata-2\",
...
\"relative/path/custdata-N\"
]
The preceding JSON matches the following S3Uris:
s3://customer_bucket/some/prefix/relative/path/to/custdata-1
s3://customer_bucket/some/prefix/relative/path/custdata-2
...
s3://customer_bucket/some/prefix/relative/path/custdata-N
The complete set of S3Uris in this manifest constitutes the input data for the channel for this datasource. The object that each S3Uris points to must be readable by the IAM role that Amazon SageMaker uses to perform tasks on your behalf.
If specified, this column name indicates which column of the dataset should be treated as sample weights for use by the objective metric during the training, evaluation, and the selection of the best model. This column is not considered as a predictive feature. For more information on Autopilot metrics, see Metrics and validation.
Sample weights should be numeric, non-negative, with larger values indicating which rows are more important than others. Data points that have invalid or no weight value are excluded.
Support for sample weights is available in Ensembling mode only.
" + "AutoMLChannel$SampleWeightAttributeName": "If specified, this column name indicates which column of the dataset should be treated as sample weights for use by the objective metric during the training, evaluation, and the selection of the best model. This column is not considered as a predictive feature. For more information on Autopilot metrics, see Metrics and validation.
Sample weights should be numeric, non-negative, with larger values indicating which rows are more important than others. Data points that have invalid or no weight value are excluded.
Support for sample weights is available in Ensembling mode only.
", + "TabularJobConfig$SampleWeightAttributeName": "If specified, this column name indicates which column of the dataset should be treated as sample weights for use by the objective metric during the training, evaluation, and the selection of the best model. This column is not considered as a predictive feature. For more information on Autopilot metrics, see Metrics and validation.
Sample weights should be numeric, non-negative, with larger values indicating which rows are more important than others. Data points that have invalid or no weight value are excluded.
Support for sample weights is available in Ensembling mode only.
" } }, "SamplingPercentage": { @@ -12897,6 +12932,18 @@ "DataCatalogConfig$TableName": "The name of the Glue table.
" } }, + "TabularJobConfig": { + "base": "The collection of settings used by an AutoML job V2 for the TABULAR problem type.
Settings used to configure an AutoML job V2 for a tabular problem type (regression, classification).
" + } + }, + "TabularResolvedAttributes": { + "base": "The resolved attributes specific to the TABULAR problem type.
Defines the resolved attributes for the TABULAR problem type.
A tag object that consists of a key and an optional value, used to manage metadata for SageMaker Amazon Web Services resources.
You can add tags to notebook instances, training jobs, hyperparameter tuning jobs, batch transform jobs, models, labeling jobs, work teams, endpoint configurations, and endpoints. For more information on adding tags to SageMaker resources, see AddTags.
For more information on adding metadata to your Amazon Web Services resources with tagging, see Tagging Amazon Web Services resources. For advice on best practices for managing Amazon Web Services resources with tagging, see Tagging Best Practices: Implement an Effective Amazon Web Services Resource Tagging Strategy.
", "refs": { @@ -13002,20 +13049,21 @@ "TargetAttributeName": { "base": null, "refs": { - "AutoMLChannel$TargetAttributeName": "The name of the target variable in supervised learning, usually represented by 'y'.
" + "AutoMLChannel$TargetAttributeName": "The name of the target variable in supervised learning, usually represented by 'y'.
", + "TabularJobConfig$TargetAttributeName": "The name of the target variable in supervised learning, usually represented by 'y'.
" } }, "TargetDevice": { "base": null, "refs": { "CompilationJobSummary$CompilationTargetDevice": "The type of device that the model will run on after the compilation job has completed.
", - "OutputConfig$TargetDevice": "Identifies the target device or the machine learning instance that you want to run your model on after the compilation has completed. Alternatively, you can specify OS, architecture, and accelerator using TargetPlatform fields. It can be used instead of TargetPlatform.
Identifies the target device or the machine learning instance that you want to run your model on after the compilation has completed. Alternatively, you can specify OS, architecture, and accelerator using TargetPlatform fields. It can be used instead of TargetPlatform.
Currently ml_trn1 is available only in US East (N. Virginia) Region, and ml_inf2 is available only in US East (Ohio) Region.
The name of the column used to provide the class labels. It should not be same as the content column.
" + "TextClassificationJobConfig$TargetLabelColumn": "The name of the column used to provide the class labels. It should not be same as the content column (Required).
" } }, "TargetObjectiveMetricValue": { @@ -13149,9 +13197,9 @@ } }, "TextClassificationJobConfig": { - "base": "Stores the configuration information for the text classification problem of an AutoML job using the V2 API.
", + "base": "Stores the configuration information for the text classification problem of an AutoML job V2.
", "refs": { - "AutoMLProblemTypeConfig$TextClassificationJobConfig": "Settings used to configure an AutoML job using the V2 API for the text classification problem type.
" + "AutoMLProblemTypeConfig$TextClassificationJobConfig": "Settings used to configure an AutoML job V2 for the text classification problem type.
" } }, "ThingName": { @@ -13203,8 +13251,8 @@ "DescribeAutoMLJobResponse$CreationTime": "Returns the creation time of the AutoML job.
", "DescribeAutoMLJobResponse$EndTime": "Returns the end time of the AutoML job.
", "DescribeAutoMLJobResponse$LastModifiedTime": "Returns the job's last modified time.
", - "DescribeAutoMLJobV2Response$CreationTime": "Returns the creation time of the AutoML V2 job.
", - "DescribeAutoMLJobV2Response$EndTime": "Returns the end time of the AutoML V2 job.
", + "DescribeAutoMLJobV2Response$CreationTime": "Returns the creation time of the AutoML job V2.
", + "DescribeAutoMLJobV2Response$EndTime": "Returns the end time of the AutoML job V2.
", "DescribeAutoMLJobV2Response$LastModifiedTime": "Returns the job's last modified time.
", "DescribeCompilationJobResponse$CompilationStartTime": "The time when the model compilation job started the CompilationJob instances.
You are billed for the time between this timestamp and the timestamp in the CompilationEndTime field. In Amazon CloudWatch Logs, the start time might be later than this time. That's because it takes time to download the compilation job, which depends on the size of the compilation job container.
The time when the model compilation job on a compilation job instance ended. For a successful or stopped job, this is when the job's model artifacts have finished uploading. For a failed job, this is when Amazon SageMaker detected that the job failed.
", diff --git a/service/cloudformation/api.go b/service/cloudformation/api.go index 32645acc42f..6cf6114bdb3 100644 --- a/service/cloudformation/api.go +++ b/service/cloudformation/api.go @@ -8258,6 +8258,29 @@ type CreateChangeSetInput struct { // associated notification topics, specify an empty list. NotificationARNs []*string `type:"list"` + // Determines what action will be taken if stack creation fails. If this parameter + // is specified, the DisableRollback parameter to the ExecuteChangeSet (https://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_ExecuteChangeSet.html) + // API operation must not be specified. This must be one of these values: + // + // * DELETE - Deletes the change set if the stack creation fails. This is + // only valid when the ChangeSetType parameter is set to CREATE. If the deletion + // of the stack fails, the status of the stack is DELETE_FAILED. + // + // * DO_NOTHING - if the stack creation fails, do nothing. This is equivalent + // to specifying true for the DisableRollback parameter to the ExecuteChangeSet + // (https://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_ExecuteChangeSet.html) + // API operation. + // + // * ROLLBACK - if the stack creation fails, roll back the stack. This is + // equivalent to specifying false for the DisableRollback parameter to the + // ExecuteChangeSet (https://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_ExecuteChangeSet.html) + // API operation. + // + // For nested stacks, when the OnStackFailure parameter is set to DELETE for + // the change set for the parent stack, any failure in a child stack will cause + // the parent stack creation to fail and all stacks to be deleted. + OnStackFailure *string `type:"string" enum:"OnStackFailure"` + // A list of Parameter structures that specify input parameters for the change // set. For more information, see the Parameter data type. Parameters []*Parameter `type:"list"` @@ -8448,6 +8471,12 @@ func (s *CreateChangeSetInput) SetNotificationARNs(v []*string) *CreateChangeSet return s } +// SetOnStackFailure sets the OnStackFailure field's value. +func (s *CreateChangeSetInput) SetOnStackFailure(v string) *CreateChangeSetInput { + s.OnStackFailure = &v + return s +} + // SetParameters sets the Parameters field's value. func (s *CreateChangeSetInput) SetParameters(v []*Parameter) *CreateChangeSetInput { s.Parameters = v @@ -10705,6 +10734,25 @@ type DescribeChangeSetOutput struct { // will be associated with the stack if you execute the change set. NotificationARNs []*string `type:"list"` + // Determines what action will be taken if stack creation fails. When this parameter + // is specified, the DisableRollback parameter to the ExecuteChangeSet (https://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_ExecuteChangeSet.html) + // API operation must not be specified. This must be one of these values: + // + // * DELETE - Deletes the change set if the stack creation fails. This is + // only valid when the ChangeSetType parameter is set to CREATE. If the deletion + // of the stack fails, the status of the stack is DELETE_FAILED. + // + // * DO_NOTHING - if the stack creation fails, do nothing. This is equivalent + // to specifying true for the DisableRollback parameter to the ExecuteChangeSet + // (https://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_ExecuteChangeSet.html) + // API operation. + // + // * ROLLBACK - if the stack creation fails, roll back the stack. This is + // equivalent to specifying false for the DisableRollback parameter to the + // ExecuteChangeSet (https://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_ExecuteChangeSet.html) + // API operation. + OnStackFailure *string `type:"string" enum:"OnStackFailure"` + // A list of Parameter structures that describes the input parameters and their // values used to create the change set. For more information, see the Parameter // (https://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_Parameter.html) @@ -10821,6 +10869,12 @@ func (s *DescribeChangeSetOutput) SetNotificationARNs(v []*string) *DescribeChan return s } +// SetOnStackFailure sets the OnStackFailure field's value. +func (s *DescribeChangeSetOutput) SetOnStackFailure(v string) *DescribeChangeSetOutput { + s.OnStackFailure = &v + return s +} + // SetParameters sets the Parameters field's value. func (s *DescribeChangeSetOutput) SetParameters(v []*Parameter) *DescribeChangeSetOutput { s.Parameters = v @@ -13241,7 +13295,19 @@ type ExecuteChangeSetInput struct { ClientRequestToken *string `min:"1" type:"string"` // Preserves the state of previously provisioned resources when an operation - // fails. + // fails. This parameter can't be specified when the OnStackFailure parameter + // to the CreateChangeSet (https://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_CreateChangeSet.html) + // API operation was specified. + // + // * True - if the stack creation fails, do nothing. This is equivalent to + // specifying DO_NOTHING for the OnStackFailure parameter to the CreateChangeSet + // (https://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_CreateChangeSet.html) + // API operation. + // + // * False - if the stack creation fails, roll back the stack. This is equivalent + // to specifying ROLLBACK for the OnStackFailure parameter to the CreateChangeSet + // (https://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_CreateChangeSet.html) + // API operation. // // Default: True DisableRollback *bool `type:"boolean"` @@ -23809,6 +23875,26 @@ func OnFailure_Values() []string { } } +const ( + // OnStackFailureDoNothing is a OnStackFailure enum value + OnStackFailureDoNothing = "DO_NOTHING" + + // OnStackFailureRollback is a OnStackFailure enum value + OnStackFailureRollback = "ROLLBACK" + + // OnStackFailureDelete is a OnStackFailure enum value + OnStackFailureDelete = "DELETE" +) + +// OnStackFailure_Values returns all elements of the OnStackFailure enum +func OnStackFailure_Values() []string { + return []string{ + OnStackFailureDoNothing, + OnStackFailureRollback, + OnStackFailureDelete, + } +} + const ( // OperationResultFilterNameOperationResultStatus is a OperationResultFilterName enum value OperationResultFilterNameOperationResultStatus = "OPERATION_RESULT_STATUS" diff --git a/service/ec2/api.go b/service/ec2/api.go index 1c461723a63..0eebf3cb500 100644 --- a/service/ec2/api.go +++ b/service/ec2/api.go @@ -17241,9 +17241,6 @@ func (c *EC2) DescribeAccountAttributesRequest(input *DescribeAccountAttributesI // Describes attributes of your Amazon Web Services account. The following are // the supported account attributes: // -// - supported-platforms: Indicates whether your account can launch instances -// into EC2-Classic and EC2-VPC, or only into EC2-VPC. -// // - default-vpc: The ID of the default VPC for your account, or none. // // - max-instances: This attribute is no longer supported. The returned value @@ -17251,19 +17248,16 @@ func (c *EC2) DescribeAccountAttributesRequest(input *DescribeAccountAttributesI // For more information, see On-Demand Instance Limits (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-on-demand-instances.html#ec2-on-demand-instances-limits) // in the Amazon Elastic Compute Cloud User Guide. // -// - vpc-max-security-groups-per-interface: The maximum number of security -// groups that you can assign to a network interface. -// // - max-elastic-ips: The maximum number of Elastic IP addresses that you -// can allocate for use with EC2-Classic. +// can allocate. +// +// - supported-platforms: This attribute is deprecated. // // - vpc-max-elastic-ips: The maximum number of Elastic IP addresses that -// you can allocate for use with EC2-VPC. +// you can allocate. // -// We are retiring EC2-Classic on August 15, 2022. We recommend that you migrate -// from EC2-Classic to a VPC. For more information, see Migrate from EC2-Classic -// to a VPC (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/vpc-migrate.html) -// in the Amazon EC2 User Guide. +// - vpc-max-security-groups-per-interface: The maximum number of security +// groups that you can assign to a network interface. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -178489,16 +178483,24 @@ func (s *VerifiedAccessLogKinesisDataFirehoseDestinationOptions) SetEnabled(v bo return s } -// Describes the destinations for Verified Access logs. +// Options for Verified Access logs. type VerifiedAccessLogOptions struct { _ struct{} `type:"structure"` // Sends Verified Access logs to CloudWatch Logs. CloudWatchLogs *VerifiedAccessLogCloudWatchLogsDestinationOptions `type:"structure"` + // Include trust data sent by trust providers into the logs. + IncludeTrustContext *bool `type:"boolean"` + // Sends Verified Access logs to Kinesis. KinesisDataFirehose *VerifiedAccessLogKinesisDataFirehoseDestinationOptions `type:"structure"` + // The logging version to use. + // + // Valid values: ocsf-0.1 | ocsf-1.0.0-rc.2 + LogVersion *string `type:"string"` + // Sends Verified Access logs to Amazon S3. S3 *VerifiedAccessLogS3DestinationOptions `type:"structure"` } @@ -178552,12 +178554,24 @@ func (s *VerifiedAccessLogOptions) SetCloudWatchLogs(v *VerifiedAccessLogCloudWa return s } +// SetIncludeTrustContext sets the IncludeTrustContext field's value. +func (s *VerifiedAccessLogOptions) SetIncludeTrustContext(v bool) *VerifiedAccessLogOptions { + s.IncludeTrustContext = &v + return s +} + // SetKinesisDataFirehose sets the KinesisDataFirehose field's value. func (s *VerifiedAccessLogOptions) SetKinesisDataFirehose(v *VerifiedAccessLogKinesisDataFirehoseDestinationOptions) *VerifiedAccessLogOptions { s.KinesisDataFirehose = v return s } +// SetLogVersion sets the LogVersion field's value. +func (s *VerifiedAccessLogOptions) SetLogVersion(v string) *VerifiedAccessLogOptions { + s.LogVersion = &v + return s +} + // SetS3 sets the S3 field's value. func (s *VerifiedAccessLogOptions) SetS3(v *VerifiedAccessLogS3DestinationOptions) *VerifiedAccessLogOptions { s.S3 = v @@ -178706,16 +178720,22 @@ func (s *VerifiedAccessLogS3DestinationOptions) SetPrefix(v string) *VerifiedAcc return s } -// Describes the destinations for Verified Access logs. +// Describes the options for Verified Access logs. type VerifiedAccessLogs struct { _ struct{} `type:"structure"` // CloudWatch Logs logging destination. CloudWatchLogs *VerifiedAccessLogCloudWatchLogsDestination `locationName:"cloudWatchLogs" type:"structure"` + // Describes current setting for including trust data into the logs. + IncludeTrustContext *bool `locationName:"includeTrustContext" type:"boolean"` + // Kinesis logging destination. KinesisDataFirehose *VerifiedAccessLogKinesisDataFirehoseDestination `locationName:"kinesisDataFirehose" type:"structure"` + // Describes current setting for the logging version. + LogVersion *string `locationName:"logVersion" type:"string"` + // Amazon S3 logging options. S3 *VerifiedAccessLogS3Destination `locationName:"s3" type:"structure"` } @@ -178744,12 +178764,24 @@ func (s *VerifiedAccessLogs) SetCloudWatchLogs(v *VerifiedAccessLogCloudWatchLog return s } +// SetIncludeTrustContext sets the IncludeTrustContext field's value. +func (s *VerifiedAccessLogs) SetIncludeTrustContext(v bool) *VerifiedAccessLogs { + s.IncludeTrustContext = &v + return s +} + // SetKinesisDataFirehose sets the KinesisDataFirehose field's value. func (s *VerifiedAccessLogs) SetKinesisDataFirehose(v *VerifiedAccessLogKinesisDataFirehoseDestination) *VerifiedAccessLogs { s.KinesisDataFirehose = v return s } +// SetLogVersion sets the LogVersion field's value. +func (s *VerifiedAccessLogs) SetLogVersion(v string) *VerifiedAccessLogs { + s.LogVersion = &v + return s +} + // SetS3 sets the S3 field's value. func (s *VerifiedAccessLogs) SetS3(v *VerifiedAccessLogS3Destination) *VerifiedAccessLogs { s.S3 = v diff --git a/service/ec2/examples_test.go b/service/ec2/examples_test.go index eec6953d8c6..60dac795aff 100644 --- a/service/ec2/examples_test.go +++ b/service/ec2/examples_test.go @@ -25,35 +25,9 @@ func parseTime(layout, value string) *time.Time { return &t } -// To allocate an Elastic IP address for EC2-VPC -// This example allocates an Elastic IP address to use with an instance in a VPC. +// To allocate an Elastic IP address +// This example allocates an Elastic IP address. func ExampleEC2_AllocateAddress_shared00() { - svc := ec2.New(session.New()) - input := &ec2.AllocateAddressInput{ - Domain: aws.String("vpc"), - } - - result, err := svc.AllocateAddress(input) - if err != nil { - if aerr, ok := err.(awserr.Error); ok { - switch aerr.Code() { - default: - fmt.Println(aerr.Error()) - } - } else { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - } - return - } - - fmt.Println(result) -} - -// To allocate an Elastic IP address for EC2-Classic -// This example allocates an Elastic IP address to use with an instance in EC2-Classic. -func ExampleEC2_AllocateAddress_shared01() { svc := ec2.New(session.New()) input := &ec2.AllocateAddressInput{} @@ -135,9 +109,8 @@ func ExampleEC2_AssignPrivateIpAddresses_shared01() { fmt.Println(result) } -// To associate an Elastic IP address in EC2-VPC -// This example associates the specified Elastic IP address with the specified instance -// in a VPC. +// To associate an Elastic IP address +// This example associates the specified Elastic IP address with the specified instance. func ExampleEC2_AssociateAddress_shared00() { svc := ec2.New(session.New()) input := &ec2.AssociateAddressInput{ @@ -191,33 +164,6 @@ func ExampleEC2_AssociateAddress_shared01() { fmt.Println(result) } -// To associate an Elastic IP address in EC2-Classic -// This example associates an Elastic IP address with an instance in EC2-Classic. -func ExampleEC2_AssociateAddress_shared02() { - svc := ec2.New(session.New()) - input := &ec2.AssociateAddressInput{ - InstanceId: aws.String("i-07ffe74c7330ebf53"), - PublicIp: aws.String("198.51.100.0"), - } - - result, err := svc.AssociateAddress(input) - if err != nil { - if aerr, ok := err.(awserr.Error); ok { - switch aerr.Code() { - default: - fmt.Println(aerr.Error()) - } - } else { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - } - return - } - - fmt.Println(result) -} - // To associate a DHCP options set with a VPC // This example associates the specified DHCP options set with the specified VPC. func ExampleEC2_AssociateDhcpOptions_shared00() { @@ -2072,72 +2018,6 @@ func ExampleEC2_DescribeAddresses_shared00() { fmt.Println(result) } -// To describe your Elastic IP addresses for EC2-VPC -// This example describes your Elastic IP addresses for use with instances in a VPC. -func ExampleEC2_DescribeAddresses_shared01() { - svc := ec2.New(session.New()) - input := &ec2.DescribeAddressesInput{ - Filters: []*ec2.Filter{ - { - Name: aws.String("domain"), - Values: []*string{ - aws.String("vpc"), - }, - }, - }, - } - - result, err := svc.DescribeAddresses(input) - if err != nil { - if aerr, ok := err.(awserr.Error); ok { - switch aerr.Code() { - default: - fmt.Println(aerr.Error()) - } - } else { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - } - return - } - - fmt.Println(result) -} - -// To describe your Elastic IP addresses for EC2-Classic -// This example describes your Elastic IP addresses for use with instances in EC2-Classic. -func ExampleEC2_DescribeAddresses_shared02() { - svc := ec2.New(session.New()) - input := &ec2.DescribeAddressesInput{ - Filters: []*ec2.Filter{ - { - Name: aws.String("domain"), - Values: []*string{ - aws.String("standard"), - }, - }, - }, - } - - result, err := svc.DescribeAddresses(input) - if err != nil { - if aerr, ok := err.(awserr.Error); ok { - switch aerr.Code() { - default: - fmt.Println(aerr.Error()) - } - } else { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - } - return - } - - fmt.Println(result) -} - // To describe your Availability Zones // This example describes the Availability Zones that are available to you. The response // includes Availability Zones only for the current region. @@ -2894,71 +2774,6 @@ func ExampleEC2_DescribeRouteTables_shared00() { fmt.Println(result) } -// To describe an available schedule -// This example describes a schedule that occurs every week on Sunday, starting on the -// specified date. Note that the output contains a single schedule as an example. -func ExampleEC2_DescribeScheduledInstanceAvailability_shared00() { - svc := ec2.New(session.New()) - input := &ec2.DescribeScheduledInstanceAvailabilityInput{ - FirstSlotStartTimeRange: &ec2.SlotDateTimeRangeRequest{ - EarliestTime: parseTime("2006-01-02T15:04:05.999999999Z", "2016-01-31T00:00:00Z"), - LatestTime: parseTime("2006-01-02T15:04:05.999999999Z", "2016-01-31T04:00:00Z"), - }, - Recurrence: &ec2.ScheduledInstanceRecurrenceRequest{ - Frequency: aws.String("Weekly"), - Interval: aws.Int64(1), - OccurrenceDays: []*int64{ - aws.Int64(1), - }, - }, - } - - result, err := svc.DescribeScheduledInstanceAvailability(input) - if err != nil { - if aerr, ok := err.(awserr.Error); ok { - switch aerr.Code() { - default: - fmt.Println(aerr.Error()) - } - } else { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - } - return - } - - fmt.Println(result) -} - -// To describe your Scheduled Instances -// This example describes the specified Scheduled Instance. -func ExampleEC2_DescribeScheduledInstances_shared00() { - svc := ec2.New(session.New()) - input := &ec2.DescribeScheduledInstancesInput{ - ScheduledInstanceIds: []*string{ - aws.String("sci-1234-1234-1234-1234-123456789012"), - }, - } - - result, err := svc.DescribeScheduledInstances(input) - if err != nil { - if aerr, ok := err.(awserr.Error); ok { - switch aerr.Code() { - default: - fmt.Println(aerr.Error()) - } - } else { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - } - return - } - - fmt.Println(result) -} - // To describe security group references // This example describes the security group references for the specified security group. func ExampleEC2_DescribeSecurityGroupReferences_shared00() { @@ -3281,14 +3096,14 @@ func ExampleEC2_DescribeSpotInstanceRequests_shared00() { func ExampleEC2_DescribeSpotPriceHistory_shared00() { svc := ec2.New(session.New()) input := &ec2.DescribeSpotPriceHistoryInput{ - EndTime: parseTime("2006-01-02T15:04:05.999999999Z", "2014-01-06T08:09:10"), + EndTime: parseTime("2006-01-02T15:04:05.999999999Z", "2014-01-06T08:09:10.05Z"), InstanceTypes: []*string{ aws.String("m1.xlarge"), }, ProductDescriptions: []*string{ aws.String("Linux/UNIX (Amazon VPC)"), }, - StartTime: parseTime("2006-01-02T15:04:05.999999999Z", "2014-01-06T07:08:09"), + StartTime: parseTime("2006-01-02T15:04:05.999999999Z", "2014-01-06T07:08:09.05Z"), } result, err := svc.DescribeSpotPriceHistory(input) @@ -3723,8 +3538,8 @@ func ExampleEC2_DisableVgwRoutePropagation_shared00() { fmt.Println(result) } -// To disassociate an Elastic IP address in EC2-VPC -// This example disassociates an Elastic IP address from an instance in a VPC. +// To disassociate an Elastic IP address +// This example disassociates an Elastic IP address from an instance. func ExampleEC2_DisassociateAddress_shared00() { svc := ec2.New(session.New()) input := &ec2.DisassociateAddressInput{ @@ -3749,32 +3564,6 @@ func ExampleEC2_DisassociateAddress_shared00() { fmt.Println(result) } -// To disassociate an Elastic IP addresses in EC2-Classic -// This example disassociates an Elastic IP address from an instance in EC2-Classic. -func ExampleEC2_DisassociateAddress_shared01() { - svc := ec2.New(session.New()) - input := &ec2.DisassociateAddressInput{ - PublicIp: aws.String("198.51.100.0"), - } - - result, err := svc.DisassociateAddress(input) - if err != nil { - if aerr, ok := err.(awserr.Error); ok { - switch aerr.Code() { - default: - fmt.Println(aerr.Error()) - } - } else { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - } - return - } - - fmt.Println(result) -} - // To disassociate an IAM instance profile // This example disassociates the specified IAM instance profile from an instance. func ExampleEC2_DisassociateIamInstanceProfile_shared00() { @@ -4474,37 +4263,6 @@ func ExampleEC2_MoveAddressToVpc_shared00() { fmt.Println(result) } -// To purchase a Scheduled Instance -// This example purchases a Scheduled Instance. -func ExampleEC2_PurchaseScheduledInstances_shared00() { - svc := ec2.New(session.New()) - input := &ec2.PurchaseScheduledInstancesInput{ - PurchaseRequests: []*ec2.PurchaseRequest{ - { - InstanceCount: aws.Int64(1), - PurchaseToken: aws.String("eyJ2IjoiMSIsInMiOjEsImMiOi..."), - }, - }, - } - - result, err := svc.PurchaseScheduledInstances(input) - if err != nil { - if aerr, ok := err.(awserr.Error); ok { - switch aerr.Code() { - default: - fmt.Println(aerr.Error()) - } - } else { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - } - return - } - - fmt.Println(result) -} - // To reboot an EC2 instance // This example reboots the specified EC2 instance. func ExampleEC2_RebootInstances_shared00() { @@ -4533,8 +4291,8 @@ func ExampleEC2_RebootInstances_shared00() { fmt.Println(result) } -// To release an Elastic IP address for EC2-VPC -// This example releases an Elastic IP address for use with instances in a VPC. +// To release an Elastic IP address +// This example releases the specified Elastic IP address. func ExampleEC2_ReleaseAddress_shared00() { svc := ec2.New(session.New()) input := &ec2.ReleaseAddressInput{ @@ -4559,32 +4317,6 @@ func ExampleEC2_ReleaseAddress_shared00() { fmt.Println(result) } -// To release an Elastic IP addresses for EC2-Classic -// This example releases an Elastic IP address for use with instances in EC2-Classic. -func ExampleEC2_ReleaseAddress_shared01() { - svc := ec2.New(session.New()) - input := &ec2.ReleaseAddressInput{ - PublicIp: aws.String("198.51.100.0"), - } - - result, err := svc.ReleaseAddress(input) - if err != nil { - if aerr, ok := err.(awserr.Error); ok { - switch aerr.Code() { - default: - fmt.Println(aerr.Error()) - } - } else { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - } - return - } - - fmt.Println(result) -} - // To replace the network ACL associated with a subnet // This example associates the specified network ACL with the subnet for the specified // network ACL association. @@ -4762,9 +4494,7 @@ func ExampleEC2_RequestSpotFleet_shared00() { // This example creates a Spot fleet request with two launch specifications that differ // only by Availability Zone. The Spot fleet launches the instances in the specified // Availability Zone with the lowest price. If your account supports EC2-VPC only, Amazon -// EC2 launches the Spot instances in the default subnet of the Availability Zone. If -// your account supports EC2-Classic, Amazon EC2 launches the instances in EC2-Classic -// in the Availability Zone. +// EC2 launches the Spot instances in the default subnet of the Availability Zone. func ExampleEC2_RequestSpotFleet_shared01() { svc := ec2.New(session.New()) input := &ec2.RequestSpotFleetInput{ @@ -4917,9 +4647,7 @@ func ExampleEC2_RequestSpotFleet_shared03() { // To create a one-time Spot Instance request // This example creates a one-time Spot Instance request for five instances in the specified // Availability Zone. If your account supports EC2-VPC only, Amazon EC2 launches the -// instances in the default subnet of the specified Availability Zone. If your account -// supports EC2-Classic, Amazon EC2 launches the instances in EC2-Classic in the specified -// Availability Zone. +// instances in the default subnet of the specified Availability Zone. func ExampleEC2_RequestSpotInstances_shared00() { svc := ec2.New(session.New()) input := &ec2.RequestSpotInstancesInput{ @@ -5085,32 +4813,6 @@ func ExampleEC2_ResetSnapshotAttribute_shared00() { fmt.Println(result) } -// To restore an address to EC2-Classic -// This example restores the specified Elastic IP address to the EC2-Classic platform. -func ExampleEC2_RestoreAddressToClassic_shared00() { - svc := ec2.New(session.New()) - input := &ec2.RestoreAddressToClassicInput{ - PublicIp: aws.String("198.51.100.0"), - } - - result, err := svc.RestoreAddressToClassic(input) - if err != nil { - if aerr, ok := err.(awserr.Error); ok { - switch aerr.Code() { - default: - fmt.Println(aerr.Error()) - } - } else { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - } - return - } - - fmt.Println(result) -} - // To launch an instance // This example launches an instance using the specified AMI, instance type, security // group, subnet, block device mapping, and tags. @@ -5165,92 +4867,6 @@ func ExampleEC2_RunInstances_shared00() { fmt.Println(result) } -// To launch a Scheduled Instance in a VPC -// This example launches the specified Scheduled Instance in a VPC. -func ExampleEC2_RunScheduledInstances_shared00() { - svc := ec2.New(session.New()) - input := &ec2.RunScheduledInstancesInput{ - InstanceCount: aws.Int64(1), - LaunchSpecification: &ec2.ScheduledInstancesLaunchSpecification{ - IamInstanceProfile: &ec2.ScheduledInstancesIamInstanceProfile{ - Name: aws.String("my-iam-role"), - }, - ImageId: aws.String("ami-12345678"), - InstanceType: aws.String("c4.large"), - KeyName: aws.String("my-key-pair"), - NetworkInterfaces: []*ec2.ScheduledInstancesNetworkInterface{ - { - AssociatePublicIpAddress: aws.Bool(true), - DeviceIndex: aws.Int64(0), - Groups: []*string{ - aws.String("sg-12345678"), - }, - SubnetId: aws.String("subnet-12345678"), - }, - }, - }, - ScheduledInstanceId: aws.String("sci-1234-1234-1234-1234-123456789012"), - } - - result, err := svc.RunScheduledInstances(input) - if err != nil { - if aerr, ok := err.(awserr.Error); ok { - switch aerr.Code() { - default: - fmt.Println(aerr.Error()) - } - } else { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - } - return - } - - fmt.Println(result) -} - -// To launch a Scheduled Instance in EC2-Classic -// This example launches the specified Scheduled Instance in EC2-Classic. -func ExampleEC2_RunScheduledInstances_shared01() { - svc := ec2.New(session.New()) - input := &ec2.RunScheduledInstancesInput{ - InstanceCount: aws.Int64(1), - LaunchSpecification: &ec2.ScheduledInstancesLaunchSpecification{ - IamInstanceProfile: &ec2.ScheduledInstancesIamInstanceProfile{ - Name: aws.String("my-iam-role"), - }, - ImageId: aws.String("ami-12345678"), - InstanceType: aws.String("c4.large"), - KeyName: aws.String("my-key-pair"), - Placement: &ec2.ScheduledInstancesPlacement{ - AvailabilityZone: aws.String("us-west-2b"), - }, - SecurityGroupIds: []*string{ - aws.String("sg-12345678"), - }, - }, - ScheduledInstanceId: aws.String("sci-1234-1234-1234-1234-123456789012"), - } - - result, err := svc.RunScheduledInstances(input) - if err != nil { - if aerr, ok := err.(awserr.Error); ok { - switch aerr.Code() { - default: - fmt.Println(aerr.Error()) - } - } else { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - } - return - } - - fmt.Println(result) -} - // To start a stopped EC2 instance // This example starts the specified EC2 instance. func ExampleEC2_StartInstances_shared00() { diff --git a/service/ecs/api.go b/service/ecs/api.go index 7e48172118b..c5e9ad602c9 100644 --- a/service/ecs/api.go +++ b/service/ecs/api.go @@ -1123,6 +1123,13 @@ func (c *ECS) DeleteTaskDefinitionsRequest(input *DeleteTaskDefinitionsInput) (r // A task definition revision will stay in DELETE_IN_PROGRESS status until all // the associated tasks and services have been terminated. // +// When you delete all INACTIVE task definition revisions, the task definition +// name is not displayed in the console and not returned in the API. If a task +// definition revisions are in the DELETE_IN_PROGRESS state, the task definition +// name is displayed in the console and returned in the API. The task definition +// name is retained by Amazon ECS and the revision is incremented the next time +// you create a task definition with that name. +// // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about // the error. @@ -10361,6 +10368,9 @@ type CreateServiceInput struct { // the service. For more information, see Tagging your Amazon ECS resources // (https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-using-tags.html) // in the Amazon Elastic Container Service Developer Guide. + // + // When you use Amazon ECS managed tags, you need to set the propagateTags request + // parameter. EnableECSManagedTags *bool `locationName:"enableECSManagedTags" type:"boolean"` // Determines whether the execute command functionality is turned on for the @@ -10485,6 +10495,8 @@ type CreateServiceInput struct { // to the task during task creation. To add tags to a task after task creation, // use the TagResource (https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_TagResource.html) // API action. + // + // The default is NONE. PropagateTags *string `locationName:"propagateTags" type:"string" enum:"PropagateTags"` // The name or full Amazon Resource Name (ARN) of the IAM role that allows Amazon diff --git a/service/glue/api.go b/service/glue/api.go index 8bbd5f785e1..1d3e309f962 100644 --- a/service/glue/api.go +++ b/service/glue/api.go @@ -35006,6 +35006,9 @@ type DatabaseIdentifier struct { // The name of the catalog database. DatabaseName *string `min:"1" type:"string"` + + // Region of the target database. + Region *string `min:"1" type:"string"` } // String returns the string representation. @@ -35035,6 +35038,9 @@ func (s *DatabaseIdentifier) Validate() error { if s.DatabaseName != nil && len(*s.DatabaseName) < 1 { invalidParams.Add(request.NewErrParamMinLen("DatabaseName", 1)) } + if s.Region != nil && len(*s.Region) < 1 { + invalidParams.Add(request.NewErrParamMinLen("Region", 1)) + } if invalidParams.Len() > 0 { return invalidParams @@ -35054,6 +35060,12 @@ func (s *DatabaseIdentifier) SetDatabaseName(v string) *DatabaseIdentifier { return s } +// SetRegion sets the Region field's value. +func (s *DatabaseIdentifier) SetRegion(v string) *DatabaseIdentifier { + s.Region = &v + return s +} + // The structure used to create or update a database. type DatabaseInput struct { _ struct{} `type:"structure"` @@ -67144,6 +67156,9 @@ type TableIdentifier struct { // The name of the target table. Name *string `min:"1" type:"string"` + + // Region of the target table. + Region *string `min:"1" type:"string"` } // String returns the string representation. @@ -67176,6 +67191,9 @@ func (s *TableIdentifier) Validate() error { if s.Name != nil && len(*s.Name) < 1 { invalidParams.Add(request.NewErrParamMinLen("Name", 1)) } + if s.Region != nil && len(*s.Region) < 1 { + invalidParams.Add(request.NewErrParamMinLen("Region", 1)) + } if invalidParams.Len() > 0 { return invalidParams @@ -67201,6 +67219,12 @@ func (s *TableIdentifier) SetName(v string) *TableIdentifier { return s } +// SetRegion sets the Region field's value. +func (s *TableIdentifier) SetRegion(v string) *TableIdentifier { + s.Region = &v + return s +} + // A structure used to define a table. type TableInput struct { _ struct{} `type:"structure"` diff --git a/service/pricing/api.go b/service/pricing/api.go index ceedbbfca12..44b29e3fe8e 100644 --- a/service/pricing/api.go +++ b/service/pricing/api.go @@ -77,18 +77,18 @@ func (c *Pricing) DescribeServicesRequest(input *DescribeServicesInput) (req *re // // Returned Error Types: // -// - InternalErrorException -// An error on the server occurred during the processing of your request. Try -// again later. -// // - InvalidParameterException // One or more parameters had an invalid value. // +// - InvalidNextTokenException +// The pagination token is invalid. Try again without a pagination token. +// // - NotFoundException // The requested resource can't be found. // -// - InvalidNextTokenException -// The pagination token is invalid. Try again without a pagination token. +// - InternalErrorException +// An error on the server occurred during the processing of your request. Try +// again later. // // - ExpiredNextTokenException // The pagination token expired. Try again without a pagination token. @@ -229,18 +229,18 @@ func (c *Pricing) GetAttributeValuesRequest(input *GetAttributeValuesInput) (req // // Returned Error Types: // -// - InternalErrorException -// An error on the server occurred during the processing of your request. Try -// again later. -// // - InvalidParameterException // One or more parameters had an invalid value. // +// - InvalidNextTokenException +// The pagination token is invalid. Try again without a pagination token. +// // - NotFoundException // The requested resource can't be found. // -// - InvalidNextTokenException -// The pagination token is invalid. Try again without a pagination token. +// - InternalErrorException +// An error on the server occurred during the processing of your request. Try +// again later. // // - ExpiredNextTokenException // The pagination token expired. Try again without a pagination token. @@ -380,10 +380,6 @@ func (c *Pricing) GetPriceListFileUrlRequest(input *GetPriceListFileUrlInput) (r // // Returned Error Types: // -// - InternalErrorException -// An error on the server occurred during the processing of your request. Try -// again later. -// // - InvalidParameterException // One or more parameters had an invalid value. // @@ -393,6 +389,10 @@ func (c *Pricing) GetPriceListFileUrlRequest(input *GetPriceListFileUrlInput) (r // - AccessDeniedException // General authentication failure. The request wasn't signed correctly. // +// - InternalErrorException +// An error on the server occurred during the processing of your request. Try +// again later. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/pricing-2017-10-15/GetPriceListFileUrl func (c *Pricing) GetPriceListFileUrl(input *GetPriceListFileUrlInput) (*GetPriceListFileUrlOutput, error) { req, out := c.GetPriceListFileUrlRequest(input) @@ -475,18 +475,18 @@ func (c *Pricing) GetProductsRequest(input *GetProductsInput) (req *request.Requ // // Returned Error Types: // -// - InternalErrorException -// An error on the server occurred during the processing of your request. Try -// again later. -// // - InvalidParameterException // One or more parameters had an invalid value. // +// - InvalidNextTokenException +// The pagination token is invalid. Try again without a pagination token. +// // - NotFoundException // The requested resource can't be found. // -// - InvalidNextTokenException -// The pagination token is invalid. Try again without a pagination token. +// - InternalErrorException +// An error on the server occurred during the processing of your request. Try +// again later. // // - ExpiredNextTokenException // The pagination token expired. Try again without a pagination token. @@ -636,25 +636,25 @@ func (c *Pricing) ListPriceListsRequest(input *ListPriceListsInput) (req *reques // // Returned Error Types: // -// - InternalErrorException -// An error on the server occurred during the processing of your request. Try -// again later. -// // - InvalidParameterException // One or more parameters had an invalid value. // -// - NotFoundException -// The requested resource can't be found. -// // - InvalidNextTokenException // The pagination token is invalid. Try again without a pagination token. // -// - ExpiredNextTokenException -// The pagination token expired. Try again without a pagination token. +// - NotFoundException +// The requested resource can't be found. // // - AccessDeniedException // General authentication failure. The request wasn't signed correctly. // +// - InternalErrorException +// An error on the server occurred during the processing of your request. Try +// again later. +// +// - ExpiredNextTokenException +// The pagination token expired. Try again without a pagination token. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/pricing-2017-10-15/ListPriceLists func (c *Pricing) ListPriceLists(input *ListPriceListsInput) (*ListPriceListsOutput, error) { req, out := c.ListPriceListsRequest(input) diff --git a/service/pricing/doc.go b/service/pricing/doc.go index c9d1f2f078f..5d9a35831b5 100644 --- a/service/pricing/doc.go +++ b/service/pricing/doc.go @@ -3,26 +3,32 @@ // Package pricing provides the client and types for making API // requests to AWS Price List Service. // -// Amazon Web Services Price List API is a centralized and convenient way to -// programmatically query Amazon Web Services for services, products, and pricing -// information. The Amazon Web Services Price List uses standardized product -// attributes such as Location, Storage Class, and Operating System, and provides -// prices at the SKU level. You can use the Amazon Web Services Price List to -// build cost control and scenario planning tools, reconcile billing data, forecast -// future spend for budgeting purposes, and provide cost benefit analysis that -// compare your internal workloads with Amazon Web Services. +// The Amazon Web Services Price List API is a centralized and convenient way +// to programmatically query Amazon Web Services for services, products, and +// pricing information. The Amazon Web Services Price List uses standardized +// product attributes such as Location, Storage Class, and Operating System, +// and provides prices at the SKU level. You can use the Amazon Web Services +// Price List to do the following: // -// Use GetServices without a service code to retrieve the service codes for -// all AWS services, then GetServices with a service code to retrieve the attribute -// names for that service. After you have the service code and attribute names, -// you can use GetAttributeValues to see what values are available for an attribute. -// With the service code and an attribute name and value, you can use GetProducts -// to find specific products that you're interested in, such as an AmazonEC2 -// instance, with a Provisioned IOPS volumeType. +// - Build cost control and scenario planning tools +// +// - Reconcile billing data // -// # Service Endpoint +// - Forecast future spend for budgeting purposes // -// Amazon Web Services Price List service API provides the following two endpoints: +// - Provide cost benefit analysis that compare your internal workloads with +// Amazon Web Services +// +// Use GetServices without a service code to retrieve the service codes for +// all Amazon Web Services, then GetServices with a service code to retrieve +// the attribute names for that service. After you have the service code and +// attribute names, you can use GetAttributeValues to see what values are available +// for an attribute. With the service code and an attribute name and value, +// you can use GetProducts to find specific products that you're interested +// in, such as an AmazonEC2 instance, with a Provisioned IOPS volumeType. +// +// You can use the following endpoints for the Amazon Web Services Price List +// API: // // - https://api.pricing.us-east-1.amazonaws.com // diff --git a/service/route53domains/api.go b/service/route53domains/api.go index 016671a0013..c47959bce08 100644 --- a/service/route53domains/api.go +++ b/service/route53domains/api.go @@ -2190,10 +2190,8 @@ func (c *Route53Domains) RegisterDomainRequest(input *RegisterDomainInput) (req // RegisterDomain API operation for Amazon Route 53 Domains. // -// This operation registers a domain. Domains are registered either by Amazon -// Registrar (for .com, .net, and .org domains) or by our registrar associate, -// Gandi (for all other domains). For some top-level domains (TLDs), this operation -// requires extra parameters. +// This operation registers a domain. For some top-level domains (TLDs), this +// operation requires extra parameters. // // When you register a domain, Amazon Route 53 does the following: // @@ -2206,12 +2204,12 @@ func (c *Route53Domains) RegisterDomainRequest(input *RegisterDomainInput) (req // choose whether to renew the registration. // // - Optionally enables privacy protection, so WHOIS queries return contact -// information either for Amazon Registrar (for .com, .net, and .org domains) -// or for our registrar associate, Gandi (for all other TLDs). If you don't -// enable privacy protection, WHOIS queries return the information that you -// entered for the administrative, registrant, and technical contacts. You -// must specify the same privacy setting for the administrative, registrant, -// and technical contacts. +// for the registrar or the phrase "REDACTED FOR PRIVACY", or "On behalf +// of