diff --git a/botocore/__init__.py b/botocore/__init__.py index a15edb77af..2fe1ff78d4 100644 --- a/botocore/__init__.py +++ b/botocore/__init__.py @@ -15,7 +15,7 @@ import re import logging -__version__ = '0.32.0' +__version__ = '0.33.0' class NullHandler(logging.Handler): diff --git a/botocore/data/aws/cloudformation.json b/botocore/data/aws/cloudformation.json index 13b5b3e17f..a940b582c8 100644 --- a/botocore/data/aws/cloudformation.json +++ b/botocore/data/aws/cloudformation.json @@ -6,7 +6,7 @@ "service_full_name": "AWS CloudFormation", "endpoint_prefix": "cloudformation", "xmlnamespace": "http://cloudformation.amazonaws.com/doc/2010-05-15/", - "documentation": "\n AWS CloudFormation\n

AWS CloudFormation enables you to create and manage AWS infrastructure deployments predictably and repeatedly.\n AWS CloudFormation helps you leverage AWS products such as Amazon EC2, EBS, Amazon SNS, ELB, and Auto Scaling\n to build highly-reliable, highly scalable, cost effective applications without worrying about creating and\n configuring the underlying the AWS infrastructure.

\n

With AWS CloudFormation, you declare all of your resources and dependencies in a template file. The template\n defines a collection of resources as a single unit called a stack. AWS CloudFormation creates and deletes all\n member resources of the stack together and manages all dependencies between the resources for you.

\n

For more information about this product, go to the CloudFormation Product Page.

\n

Amazon CloudFormation makes use of other AWS products. If you need additional technical information about a\n specific AWS product, you can find the product's technical documentation at http://aws.amazon.com/documentation/.

\n You must call the AWS CloudFormation API as a regular IAM user. AWS CloudFormation does not support calling the API with\n an IAM\n role\n\n ", + "documentation": "\n AWS CloudFormation\n

AWS CloudFormation enables you to create and manage AWS infrastructure deployments predictably and repeatedly.\n AWS CloudFormation helps you leverage AWS products such as Amazon EC2, EBS, Amazon SNS, ELB, and Auto Scaling\n to build highly-reliable, highly scalable, cost effective applications without worrying about creating and\n configuring the underlying AWS infrastructure.

\n

With AWS CloudFormation, you declare all of your resources and dependencies in a template file. The template\n defines a collection of resources as a single unit called a stack. AWS CloudFormation creates and deletes all\n member resources of the stack together and manages all dependencies between the resources for you.

\n

For more information about this product, go to the CloudFormation Product Page.

\n

Amazon CloudFormation makes use of other AWS products. If you need additional technical information about a\n specific AWS product, you can find the product's technical documentation at http://aws.amazon.com/documentation/.

\n\n ", "operations": { "CancelUpdateStack": { "name": "CancelUpdateStack", @@ -43,14 +43,14 @@ "shape_name": "TemplateBody", "type": "string", "min_length": 1, - "documentation": "\n

Structure containing the template body. (For more information, go to the AWS CloudFormation User\n Guide.)

\n

Conditional: You must pass TemplateBody or TemplateURL. If both are passed, only\n TemplateBody is used.

\n " + "documentation": "\n

Structure containing the template body. (For more information, go to Template Anatomy in the AWS CloudFormation User Guide.)

\n

Conditional: You must pass TemplateBody or TemplateURL. If both are passed, only\n TemplateBody is used.

\n " }, "TemplateURL": { "shape_name": "TemplateURL", "type": "string", "min_length": 1, "max_length": 1024, - "documentation": "\n

Location of file containing the template body. The URL must point to a template (max size: 307,200 bytes)\n located in an S3 bucket in the same region as the stack. For more information, go to the AWS CloudFormation User\n Guide.

\n

Conditional: You must pass TemplateURL or TemplateBody. If both are passed, only\n TemplateBody is used.

\n ", + "documentation": "\n

Location of file containing the template body. The URL must point to a template (max size: 307,200 bytes)\n located in an S3 bucket in the same region as the stack. For more information, go to the Template Anatomy in the AWS CloudFormation User Guide.

\n

Conditional: You must pass TemplateURL or TemplateBody. If both are passed, only\n TemplateBody is used.

\n ", "no_paramfile": true }, "Parameters": { @@ -108,7 +108,7 @@ ], "documentation": null }, - "documentation": "\n

The list of capabilities that you want to allow in the stack. If your template contains IAM resources, you\n must specify the CAPABILITY_IAM value for this parameter; otherwise, this action returns an\n InsufficientCapabilities error. IAM resources are the following: AWS::IAM::AccessKey, AWS::IAM::Group, AWS::IAM::Policy, AWS::IAM::User, and AWS::IAM::UserToGroupAddition.

\n " + "documentation": "\n

The list of capabilities that you want to allow in the stack. If your template contains certain resources, you\n must specify the CAPABILITY_IAM value for this parameter; otherwise, this action returns an\n InsufficientCapabilities error. The following resources require you to specify the capabilities parameter: AWS::CloudFormation::Stack, AWS::IAM::AccessKey, AWS::IAM::Group, AWS::IAM::InstanceProfile, AWS::IAM::Policy, AWS::IAM::Role, AWS::IAM::User, and AWS::IAM::UserToGroupAddition.

\n " }, "OnFailure": { "shape_name": "OnFailure", @@ -125,7 +125,7 @@ "type": "string", "min_length": 1, "max_length": 16384, - "documentation": "\n

Structure containing the stack policy body. (For more information, go to the \n AWS CloudFormation User Guide.)

\n

If you pass StackPolicyBody and StackPolicyURL, only\n StackPolicyBody is used.

\n " + "documentation": "\n

Structure containing the stack policy body. (For more information, go to \n Prevent Updates to Stack Resources in the AWS CloudFormation User Guide.)

\n

If you pass StackPolicyBody and StackPolicyURL, only\n StackPolicyBody is used.

\n " }, "StackPolicyURL": { "shape_name": "StackPolicyURL", @@ -276,7 +276,7 @@ "ResourceType": { "shape_name": "ResourceType", "type": "string", - "documentation": "\n

Type of the resource. (For more information, go to the AWS CloudFormation User\n Guide.)

\n " + "documentation": "\n

Type of resource. (For more information, go to \n AWS Resource Types Reference in the AWS CloudFormation User Guide.)

\n " }, "Timestamp": { "shape_name": "Timestamp", @@ -326,7 +326,7 @@ "documentation": "\n

The output for a DescribeStackEvents action.

\n " }, "errors": [], - "documentation": "\n

Returns all stack related events for a specified stack. For more information about a stack's event history, go to the AWS CloudFormation User\n Guide.

\n Events are returned, even if the stack never existed or has been successfully deleted.\n\n \n \nhttps://cloudformation.us-east-1.amazonaws.com/\n ?Action=DescribeStackEvents\n &StackName=MyStack\n &Version=2010-05-15\n &SignatureVersion=2\n &Timestamp=2010-07-27T22%3A26%3A28.000Z\n &AWSAccessKeyId=[AWS Access KeyID]\n &Signature=[Signature]\n\n \n\n \n \n Event-1-Id\n arn:aws:cloudformation:us-east-1:123456789:stack/MyStack/aaf549a0-a413-11df-adb3-5081b3858e83\n MyStack\n MyStack\n MyStack_One\n AWS::CloudFormation::Stack\n 2010-07-27T22:26:28Z\n CREATE_IN_PROGRESS\n User initiated\n \n \n Event-2-Id\n arn:aws:cloudformation:us-east-1:123456789:stack/MyStack/aaf549a0-a413-11df-adb3-5081b3858e83\n MyStack\n MyDBInstance\n MyStack_DB1\n AWS::SecurityGroup\n 2010-07-27T22:27:28Z\n CREATE_IN_PROGRESS\n {\"GroupDescription\":...}\n \n \n Event-3-Id\n arn:aws:cloudformation:us-east-1:123456789:stack/MyStack/aaf549a0-a413-11df-adb3-5081b3858e83\n MyStack\n MySG1\n MyStack_SG1\n AWS:: SecurityGroup\n 2010-07-27T22:28:28Z\n CREATE_COMPLETE\n \n \n\n \n ", + "documentation": "\n

Returns all stack related events for a specified stack. For more information about a stack's event history, go to Stacks in the AWS CloudFormation User Guide.

\n Events are returned, even if the stack never existed or has been successfully deleted.\n\n \n \nhttps://cloudformation.us-east-1.amazonaws.com/\n ?Action=DescribeStackEvents\n &StackName=MyStack\n &Version=2010-05-15\n &SignatureVersion=2\n &Timestamp=2010-07-27T22%3A26%3A28.000Z\n &AWSAccessKeyId=[AWS Access KeyID]\n &Signature=[Signature]\n\n \n\n \n \n Event-1-Id\n arn:aws:cloudformation:us-east-1:123456789:stack/MyStack/aaf549a0-a413-11df-adb3-5081b3858e83\n MyStack\n MyStack\n MyStack_One\n AWS::CloudFormation::Stack\n 2010-07-27T22:26:28Z\n CREATE_IN_PROGRESS\n User initiated\n \n \n Event-2-Id\n arn:aws:cloudformation:us-east-1:123456789:stack/MyStack/aaf549a0-a413-11df-adb3-5081b3858e83\n MyStack\n MyDBInstance\n MyStack_DB1\n AWS::SecurityGroup\n 2010-07-27T22:27:28Z\n CREATE_IN_PROGRESS\n {\"GroupDescription\":...}\n \n \n Event-3-Id\n arn:aws:cloudformation:us-east-1:123456789:stack/MyStack/aaf549a0-a413-11df-adb3-5081b3858e83\n MyStack\n MySG1\n MyStack_SG1\n AWS:: SecurityGroup\n 2010-07-27T22:28:28Z\n CREATE_COMPLETE\n \n \n\n \n ", "pagination": { "input_token": "NextToken", "output_token": "NextToken", @@ -387,7 +387,7 @@ "ResourceType": { "shape_name": "ResourceType", "type": "string", - "documentation": "\n

Type of the resource. (For more information, go to the AWS CloudFormation User\n Guide.)

\n ", + "documentation": "\n

Type of resource. ((For more information, go to \n AWS Resource Types Reference in the AWS CloudFormation User Guide.)

\n ", "required": true }, "LastUpdatedTimestamp": { @@ -496,7 +496,7 @@ "ResourceType": { "shape_name": "ResourceType", "type": "string", - "documentation": "\n

Type of the resource. (For more information, go to the AWS CloudFormation User\n Guide.)

\n ", + "documentation": "\n

Type of resource. (For more information, go to \n AWS Resource Types Reference in the AWS CloudFormation User Guide.)

\n ", "required": true }, "Timestamp": { @@ -559,7 +559,7 @@ "type": "string", "min_length": 1, "max_length": 1024, - "documentation": null + "documentation": "String that identifies the start of the next list of stacks, if there is one." } }, "documentation": "\n

The input for DescribeStacks action.

\n " @@ -747,7 +747,7 @@ "type": "string", "min_length": 1, "max_length": 1024, - "documentation": null + "documentation": "String that identifies the start of the next list of stacks, if there is one." } }, "documentation": "\n

The output for a DescribeStacks action.

\n " @@ -771,14 +771,14 @@ "shape_name": "TemplateBody", "type": "string", "min_length": 1, - "documentation": "\n

Structure containing the template body. (For more information, go to the AWS CloudFormation User\n Guide.)

\n

Conditional: You must pass TemplateBody or TemplateURL. If both are passed, only\n TemplateBody is used.

\n " + "documentation": "\n

Structure containing the template body. (For more information, go to Template Anatomy\n in the AWS CloudFormation User Guide.)

\n

Conditional: You must pass TemplateBody or TemplateURL. If both are passed, only\n TemplateBody is used.

\n " }, "TemplateURL": { "shape_name": "TemplateURL", "type": "string", "min_length": 1, "max_length": 1024, - "documentation": "\n

Location of file containing the template body. The URL must point to a template located in an S3 bucket in the\n same region as the stack. For more information, go to the AWS CloudFormation User\n Guide.

\n

Conditional: You must pass TemplateURL or TemplateBody. If both are passed, only\n TemplateBody is used.

\n ", + "documentation": "\n

Location of file containing the template body. The URL must point to a template located in an S3 bucket in the\n same region as the stack. For more information, go to Template Anatomy\n in the AWS CloudFormation User Guide.

\n

Conditional: You must pass TemplateURL or TemplateBody. If both are passed, only\n TemplateBody is used.

\n ", "no_paramfile": true }, "Parameters": { @@ -845,13 +845,13 @@ "type": "string", "min_length": 1, "max_length": 16384, - "documentation": "\n

Structure containing the stack policy body. (For more information, go to the \n AWS CloudFormation User Guide.)

\n " + "documentation": "\n

Structure containing the stack policy body. (For more information, go to \n Prevent Updates to Stack Resources in the AWS CloudFormation User Guide.)

\n " } }, "documentation": "\n

The output for the GetStackPolicy action.

\n " }, "errors": [], - "documentation": "\n

Returns the stack policy for a specified stack. If a stack doesn't have a policy, a null value is returned.

\n \n \nhttps://cloudformation.us-east-1.amazonaws.com/\n ?Action=GetStackPolicy\n &StackName=MyStack\n &Version=2010-05-15\n &SignatureVersion=2\n &Timestamp=2010-07-27T22%3A26%3A28.000Z\n &AWSAccessKeyId=[AWS Access KeyID]\n &Signature=[Signature]\n \n\n \"{\n \"Statement\" : [\n {\n \"Effect\" : \"Deny\",\n \"Action\" : \"Update*\",\n \"Resource\" : \"LogicalResourceId/ProductionDatabase\"\n },\n {\n \"Effect\" : \"Allow\",\n \"Action\" : \"Update:*\",\n \"Resource\" : \"*\"\n }\n ]\n }\n\n \n " + "documentation": "\n

Returns the stack policy for a specified stack. If a stack doesn't have a policy, a null value is returned.

\n \n \nhttps://cloudformation.us-east-1.amazonaws.com/\n ?Action=GetStackPolicy\n &StackName=MyStack\n &Version=2010-05-15\n &SignatureVersion=2\n &Timestamp=2010-07-27T22%3A26%3A28.000Z\n &AWSAccessKeyId=[AWS Access KeyID]\n &Signature=[Signature]\n \n\n \"{\n \"Statement\" : [\n {\n \"Effect\" : \"Deny\",\n \"Action\" : \"Update*\",\n \"Principal\" : \"*\",\n \"Resource\" : \"LogicalResourceId/ProductionDatabase\"\n },\n {\n \"Effect\" : \"Allow\",\n \"Action\" : \"Update:*\",\n \"Principal\" : \"*\",\n \"Resource\" : \"*\"\n }\n ]\n }\n\n \n " }, "GetTemplate": { "name": "GetTemplate", @@ -876,7 +876,7 @@ "shape_name": "TemplateBody", "type": "string", "min_length": 1, - "documentation": "\n

Structure containing the template body. (For more information, go to the AWS CloudFormation User\n Guide.)

\n " + "documentation": "\n

Structure containing the template body. (For more information, go to Template Anatomy\n in the AWS CloudFormation User Guide.)

\n " } }, "documentation": "\n

The output for GetTemplate action.

\n " @@ -931,7 +931,7 @@ "ResourceType": { "shape_name": "ResourceType", "type": "string", - "documentation": "\n

Type of the resource. (For more information, go to the AWS CloudFormation User\n Guide.)

\n ", + "documentation": "\n

Type of resource. (For more information, go to \n AWS Resource Types Reference in the AWS CloudFormation User Guide.)

\n ", "required": true }, "LastUpdatedTimestamp": { @@ -1143,7 +1143,7 @@ "type": "string", "min_length": 1, "max_length": 16384, - "documentation": "\n

Structure containing the stack policy body. (For more information, go to the \n AWS CloudFormation User Guide.)

\n

You must pass StackPolicyBody or StackPolicyURL. If both are passed, only\n StackPolicyBody is used.

\n " + "documentation": "\n

Structure containing the stack policy body. (For more information, go to \n Prevent Updates to Stack Resources in the AWS CloudFormation User Guide.)

\n

You must pass StackPolicyBody or StackPolicyURL. If both are passed, only\n StackPolicyBody is used.

\n " }, "StackPolicyURL": { "shape_name": "StackPolicyURL", @@ -1175,14 +1175,14 @@ "shape_name": "TemplateBody", "type": "string", "min_length": 1, - "documentation": "\n

Structure containing the template body. (For more information, go to the AWS CloudFormation User\n Guide.)

\n

Conditional: You must pass TemplateBody or TemplateURL. If both are passed, only\n TemplateBody is used.

\n " + "documentation": "\n

Structure containing the template body. (For more information, go to Template Anatomy\n in the AWS CloudFormation User Guide.)

\n

Conditional: You must pass TemplateBody or TemplateURL. If both are passed, only\n TemplateBody is used.

\n " }, "TemplateURL": { "shape_name": "TemplateURL", "type": "string", "min_length": 1, "max_length": 1024, - "documentation": "\n

Location of file containing the template body. The URL must point to a template located in an S3 bucket in the\n same region as the stack. For more information, go to the AWS CloudFormation User\n Guide.

\n

Conditional: You must pass TemplateURL or TemplateBody. If both are passed, only\n TemplateBody is used.

\n ", + "documentation": "\n

Location of file containing the template body. The URL must point to a template located in an S3 bucket in the\n same region as the stack. For more information, go to Template Anatomy\n in the AWS CloudFormation User Guide.

\n

Conditional: You must pass TemplateURL or TemplateBody. If both are passed, only\n TemplateBody is used.

\n ", "no_paramfile": true }, "StackPolicyDuringUpdateBody": { @@ -1284,14 +1284,14 @@ "shape_name": "TemplateBody", "type": "string", "min_length": 1, - "documentation": "\n

String containing the template body. (For more information, go to the AWS CloudFormation User\n Guide.)

\n

Conditional: You must pass TemplateURL or TemplateBody. If both are passed, only\n TemplateBody is used.

\n " + "documentation": "\n

String containing the template body. (For more information, go to Template Anatomy\n in the AWS CloudFormation User Guide.)

\n

Conditional: You must pass TemplateURL or TemplateBody. If both are passed, only\n TemplateBody is used.

\n " }, "TemplateURL": { "shape_name": "TemplateURL", "type": "string", "min_length": 1, "max_length": 1024, - "documentation": "\n

Location of file containing the template body. The URL must point to a template (max size: 307,200 bytes)\n located in an S3 bucket in the same region as the stack. For more information, go to the AWS CloudFormation User\n Guide.

\n

Conditional: You must pass TemplateURL or TemplateBody. If both are passed, only\n TemplateBody is used.

\n ", + "documentation": "\n

Location of file containing the template body. The URL must point to a template (max size: 307,200 bytes)\n located in an S3 bucket in the same region as the stack. For more information, go to Template Anatomy\n in the AWS CloudFormation User Guide.

\n

Conditional: You must pass TemplateURL or TemplateBody. If both are passed, only\n TemplateBody is used.

\n ", "no_paramfile": true } }, diff --git a/botocore/data/aws/route53.json b/botocore/data/aws/route53.json index 596ab3257e..e7c7a5c11b 100644 --- a/botocore/data/aws/route53.json +++ b/botocore/data/aws/route53.json @@ -1,19 +1,19 @@ { - "api_version": "2012-12-12", + "api_version": "2013-04-01", "type": "rest-xml", "signature_version": "v3https", "service_full_name": "Amazon Route 53", "service_abbreviation": "Route 53", "global_endpoint": "route53.amazonaws.com", "endpoint_prefix": "route53", - "xmlnamespace": "https://route53.amazonaws.com/doc/2012-12-12/", + "xmlnamespace": "https://route53.amazonaws.com/doc/2013-04-01/", "documentation": "\n ", "operations": { "ChangeResourceRecordSets": { "name": "ChangeResourceRecordSets", "http": { "method": "POST", - "uri": "/2012-12-12/hostedzone/{HostedZoneId}/rrset/" + "uri": "/2013-04-01/hostedzone/{HostedZoneId}/rrset/" }, "input": { "shape_name": "ChangeResourceRecordSetsRequest", @@ -23,7 +23,7 @@ "shape_name": "ResourceId", "type": "string", "max_length": 32, - "documentation": "\n

Alias resource record sets only: The value of the hosted zone ID for the AWS resource.

\n

For more information, an example, and several ways to get the hosted zone ID for the LoadBalancer, see Creating Alias Resource Record Sets for Elastic Load Balancing in the Amazon Route 53 Developer Guide

.\n ", + "documentation": "\n

The ID of the hosted zone that contains the resource record sets that you want to change.

\n ", "required": true, "location": "uri" }, @@ -49,9 +49,10 @@ "type": "string", "enum": [ "CREATE", - "DELETE" + "DELETE", + "UPSERT" ], - "documentation": "\n

The action to perform.

\n

Valid values: CREATE | DELETE

\n ", + "documentation": "\n

The action to perform.

\n

Valid values: CREATE | DELETE | UPSERT

\n ", "required": true }, "ResourceRecordSet": { @@ -110,7 +111,8 @@ "ap-southeast-1", "ap-southeast-2", "ap-northeast-1", - "sa-east-1" + "sa-east-1", + "cn-north-1" ], "documentation": "\n

Regional resource record sets only: Among resource record sets that have the same combination of DNS name and type, a value that specifies the AWS region for the current resource record set.

\n " }, @@ -356,13 +358,13 @@ "documentation": "\n

The request was rejected because Route 53 was still processing a prior request.

\n " } ], - "documentation": "\n

Use this action to create or change your authoritative DNS information. To use this action, send a POST request to the 2012-12-12/hostedzone/hosted Zone ID/rrset resource. The request body must include an XML document with a ChangeResourceRecordSetsRequest element.

\n

Changes are a list of change items and are considered transactional. For more information on transactional changes, also known as change batches, see Creating, Changing, and Deleting Resource Record Sets Using the Route 53 API in the Amazon Route 53 Developer Guide.

\n Due to the nature of transactional changes, you cannot delete the same resource record set more than once in a single change batch. If you attempt to delete the same change batch more than once, Route 53 returns an InvalidChangeBatch error.\n

In response to a ChangeResourceRecordSets request, your DNS data is changed on all Route 53 DNS servers. Initially, the status of a change is PENDING. This means the change has not yet propagated to all the authoritative Route 53 DNS servers. When the change is propagated to all hosts, the change returns a status of INSYNC.

\n

Note the following limitations on a ChangeResourceRecordSets request:

\n

- A request cannot contain more than 100 Change elements.

\n

- A request cannot contain more than 1000 ResourceRecord elements.

\n

The sum of the number of characters (including spaces) in all Value elements in a request cannot exceed 32,000 characters.

\n " + "documentation": "\n

Use this action to create or change your authoritative DNS information. To use this action, send a POST request to the 2013-04-01/hostedzone/hosted Zone ID/rrset resource. The request body must include an XML document with a ChangeResourceRecordSetsRequest element.

\n

Changes are a list of change items and are considered transactional. For more information on transactional changes, also known as change batches, see Creating, Changing, and Deleting Resource Record Sets Using the Route 53 API in the Amazon Route 53 Developer Guide.

\n Due to the nature of transactional changes, you cannot delete the same resource record set more than once in a single change batch. If you attempt to delete the same change batch more than once, Route 53 returns an InvalidChangeBatch error.\n

In response to a ChangeResourceRecordSets request, your DNS data is changed on all Route 53 DNS servers. Initially, the status of a change is PENDING. This means the change has not yet propagated to all the authoritative Route 53 DNS servers. When the change is propagated to all hosts, the change returns a status of INSYNC.

\n

Note the following limitations on a ChangeResourceRecordSets request:

\n

- A request cannot contain more than 100 Change elements.

\n

- A request cannot contain more than 1000 ResourceRecord elements.

\n

The sum of the number of characters (including spaces) in all Value elements in a request cannot exceed 32,000 characters.

\n " }, "CreateHealthCheck": { "name": "CreateHealthCheck", "http": { "method": "POST", - "uri": "/2012-12-12/healthcheck", + "uri": "/2013-04-01/healthcheck", "response_code": 201 }, "input": { @@ -394,29 +396,38 @@ "type": "integer", "min_length": 1, "max_length": 65535, - "documentation": "\n

Port on which connection will be opened to the instance to health check. For HTTP this defaults to 80 if the port is not specified.

\n " + "documentation": "\n

Port on which connection will be opened to the instance to health check. For HTTP and HTTP_STR_MATCH this defaults to 80 if the port is not specified. For HTTPS and HTTPS_STR_MATCH this defaults to 443 if the port is not specified.

\n " }, "Type": { "shape_name": "HealthCheckType", "type": "string", "enum": [ "HTTP", + "HTTPS", + "HTTP_STR_MATCH", + "HTTPS_STR_MATCH", "TCP" ], - "documentation": "\n

The type of health check to be performed. Currently supported protocols are TCP and HTTP.

\n ", + "documentation": "\n

The type of health check to be performed. Currently supported types are TCP, HTTP, HTTPS, HTTP_STR_MATCH, and HTTPS_STR_MATCH.

\n ", "required": true }, "ResourcePath": { "shape_name": "ResourcePath", "type": "string", "max_length": 255, - "documentation": "\n

Path to ping on the instance to check the health. Required only for HTTP health checks, HTTP request is issued to the instance on the given port and path.

\n " + "documentation": "\n

Path to ping on the instance to check the health. Required for HTTP, HTTPS, HTTP_STR_MATCH, and HTTPS_STR_MATCH health checks, HTTP request is issued to the instance on the given port and path.

\n " }, "FullyQualifiedDomainName": { "shape_name": "FullyQualifiedDomainName", "type": "string", "max_length": 255, "documentation": "\n

Fully qualified domain name of the instance to be health checked.

\n " + }, + "SearchString": { + "shape_name": "SearchString", + "type": "string", + "max_length": 255, + "documentation": "\n

A string to search for in the body of a health check response. Required for HTTP_STR_MATCH and HTTPS_STR_MATCH health checks.

\n " } }, "member_order": [ @@ -424,7 +435,8 @@ "Port", "Type", "ResourcePath", - "FullyQualifiedDomainName" + "FullyQualifiedDomainName", + "SearchString" ], "documentation": "\n

A complex type that contains health check configuration.

\n ", "required": true @@ -476,29 +488,38 @@ "type": "integer", "min_length": 1, "max_length": 65535, - "documentation": "\n

Port on which connection will be opened to the instance to health check. For HTTP this defaults to 80 if the port is not specified.

\n " + "documentation": "\n

Port on which connection will be opened to the instance to health check. For HTTP and HTTP_STR_MATCH this defaults to 80 if the port is not specified. For HTTPS and HTTPS_STR_MATCH this defaults to 443 if the port is not specified.

\n " }, "Type": { "shape_name": "HealthCheckType", "type": "string", "enum": [ "HTTP", + "HTTPS", + "HTTP_STR_MATCH", + "HTTPS_STR_MATCH", "TCP" ], - "documentation": "\n

The type of health check to be performed. Currently supported protocols are TCP and HTTP.

\n ", + "documentation": "\n

The type of health check to be performed. Currently supported types are TCP, HTTP, HTTPS, HTTP_STR_MATCH, and HTTPS_STR_MATCH.

\n ", "required": true }, "ResourcePath": { "shape_name": "ResourcePath", "type": "string", "max_length": 255, - "documentation": "\n

Path to ping on the instance to check the health. Required only for HTTP health checks, HTTP request is issued to the instance on the given port and path.

\n " + "documentation": "\n

Path to ping on the instance to check the health. Required for HTTP, HTTPS, HTTP_STR_MATCH, and HTTPS_STR_MATCH health checks, HTTP request is issued to the instance on the given port and path.

\n " }, "FullyQualifiedDomainName": { "shape_name": "FullyQualifiedDomainName", "type": "string", "max_length": 255, "documentation": "\n

Fully qualified domain name of the instance to be health checked.

\n " + }, + "SearchString": { + "shape_name": "SearchString", + "type": "string", + "max_length": 255, + "documentation": "\n

A string to search for in the body of a health check response. Required for HTTP_STR_MATCH and HTTPS_STR_MATCH health checks.

\n " } }, "member_order": [ @@ -506,7 +527,8 @@ "Port", "Type", "ResourcePath", - "FullyQualifiedDomainName" + "FullyQualifiedDomainName", + "SearchString" ], "documentation": "\n

A complex type that contains the health check configuration.

\n ", "required": true @@ -574,13 +596,13 @@ "documentation": "\n

Some value specified in the request is invalid or the XML document is malformed.

\n " } ], - "documentation": "\n

This action creates a new health check.

\n

To create a new health check, send a POST request to the 2012-12-12/healthcheck resource. The request body must include an XML document with a CreateHealthCheckRequest element. The response returns the CreateHealthCheckResponse element that contains metadata about the health check.

\n " + "documentation": "\n

This action creates a new health check.

\n

To create a new health check, send a POST request to the 2013-04-01/healthcheck resource. The request body must include an XML document with a CreateHealthCheckRequest element. The response returns the CreateHealthCheckResponse element that contains metadata about the health check.

\n " }, "CreateHostedZone": { "name": "CreateHostedZone", "http": { "method": "POST", - "uri": "/2012-12-12/hostedzone", + "uri": "/2013-04-01/hostedzone", "response_code": 201 }, "input": { @@ -836,13 +858,13 @@ "documentation": "\n

Route 53 allows some duplicate domain names, but there is a maximum number of duplicate names. This error indicates that you have reached that maximum. If you want to create another hosted zone with the same name and Route 53 generates this error, you can request an increase to the limit on the Contact Us page.

\n " } ], - "documentation": "\n

This action creates a new hosted zone.

\n

To create a new hosted zone, send a POST request to the 2012-12-12/hostedzone resource. The request body must include an XML document with a CreateHostedZoneRequest element. The response returns the CreateHostedZoneResponse element that contains metadata about the hosted zone.

\n

Route 53 automatically creates a default SOA record and four NS records for the zone. The NS records in the hosted zone are the name servers you give your registrar to delegate your domain to. For more information about SOA and NS records, see NS and SOA Records that Route 53 Creates for a Hosted Zone in the Amazon Route 53 Developer Guide.

\n

When you create a zone, its initial status is PENDING. This means that it is not yet available on all DNS servers. The status of the zone changes to INSYNC when the NS and SOA records are available on all Route 53 DNS servers.

\n " + "documentation": "\n

This action creates a new hosted zone.

\n

To create a new hosted zone, send a POST request to the 2013-04-01/hostedzone resource. The request body must include an XML document with a CreateHostedZoneRequest element. The response returns the CreateHostedZoneResponse element that contains metadata about the hosted zone.

\n

Route 53 automatically creates a default SOA record and four NS records for the zone. The NS records in the hosted zone are the name servers you give your registrar to delegate your domain to. For more information about SOA and NS records, see NS and SOA Records that Route 53 Creates for a Hosted Zone in the Amazon Route 53 Developer Guide.

\n

When you create a zone, its initial status is PENDING. This means that it is not yet available on all DNS servers. The status of the zone changes to INSYNC when the NS and SOA records are available on all Route 53 DNS servers.

\n " }, "DeleteHealthCheck": { "name": "DeleteHealthCheck", "http": { "method": "DELETE", - "uri": "/2012-12-12/healthcheck/{HealthCheckId}" + "uri": "/2013-04-01/healthcheck/{HealthCheckId}" }, "input": { "shape_name": "DeleteHealthCheckRequest", @@ -906,13 +928,13 @@ "documentation": "\n

Some value specified in the request is invalid or the XML document is malformed.

\n " } ], - "documentation": "\n

This action deletes a health check. To delete a health check, send a DELETE request to the 2012-12-12/healthcheck/health check ID resource.

\n You can delete a health check only if there are no resource record sets associated with this health check. If resource record sets are associated with this health check, you must disassociate them before you can delete your health check. If you try to delete a health check that is associated with resource record sets, Route 53 will deny your request with a HealthCheckInUse error. For information about disassociating the records from your health check, see ChangeResourceRecordSets.\n " + "documentation": "\n

This action deletes a health check. To delete a health check, send a DELETE request to the 2013-04-01/healthcheck/health check ID resource.

\n You can delete a health check only if there are no resource record sets associated with this health check. If resource record sets are associated with this health check, you must disassociate them before you can delete your health check. If you try to delete a health check that is associated with resource record sets, Route 53 will deny your request with a HealthCheckInUse error. For information about disassociating the records from your health check, see ChangeResourceRecordSets.\n " }, "DeleteHostedZone": { "name": "DeleteHostedZone", "http": { "method": "DELETE", - "uri": "/2012-12-12/hostedzone/{Id}" + "uri": "/2013-04-01/hostedzone/{Id}" }, "input": { "shape_name": "DeleteHostedZoneRequest", @@ -1035,13 +1057,13 @@ "documentation": "\n

Some value specified in the request is invalid or the XML document is malformed.

\n " } ], - "documentation": "\n

This action deletes a hosted zone. To delete a hosted zone, send a DELETE request to the 2012-12-12/hostedzone/hosted zone ID resource.

\n

For more information about deleting a hosted zone, see Deleting a Hosted Zone in the Amazon Route 53 Developer Guide.

\n You can delete a hosted zone only if there are no resource record sets other than the default SOA record and NS resource record sets. If your hosted zone contains other resource record sets, you must delete them before you can delete your hosted zone. If you try to delete a hosted zone that contains other resource record sets, Route 53 will deny your request with a HostedZoneNotEmpty error. For information about deleting records from your hosted zone, see ChangeResourceRecordSets.\n " + "documentation": "\n

This action deletes a hosted zone. To delete a hosted zone, send a DELETE request to the 2013-04-01/hostedzone/hosted zone ID resource.

\n

For more information about deleting a hosted zone, see Deleting a Hosted Zone in the Amazon Route 53 Developer Guide.

\n You can delete a hosted zone only if there are no resource record sets other than the default SOA record and NS resource record sets. If your hosted zone contains other resource record sets, you must delete them before you can delete your hosted zone. If you try to delete a hosted zone that contains other resource record sets, Route 53 will deny your request with a HostedZoneNotEmpty error. For information about deleting records from your hosted zone, see ChangeResourceRecordSets.\n " }, "GetChange": { "name": "GetChange", "http": { "method": "GET", - "uri": "/2012-12-12/change/{Id}" + "uri": "/2013-04-01/change/{Id}" }, "input": { "shape_name": "GetChangeRequest", @@ -1146,7 +1168,7 @@ "name": "GetHealthCheck", "http": { "method": "GET", - "uri": "/2012-12-12/healthcheck/{HealthCheckId}" + "uri": "/2013-04-01/healthcheck/{HealthCheckId}" }, "input": { "shape_name": "GetHealthCheckRequest", @@ -1206,29 +1228,38 @@ "type": "integer", "min_length": 1, "max_length": 65535, - "documentation": "\n

Port on which connection will be opened to the instance to health check. For HTTP this defaults to 80 if the port is not specified.

\n " + "documentation": "\n

Port on which connection will be opened to the instance to health check. For HTTP and HTTP_STR_MATCH this defaults to 80 if the port is not specified. For HTTPS and HTTPS_STR_MATCH this defaults to 443 if the port is not specified.

\n " }, "Type": { "shape_name": "HealthCheckType", "type": "string", "enum": [ "HTTP", + "HTTPS", + "HTTP_STR_MATCH", + "HTTPS_STR_MATCH", "TCP" ], - "documentation": "\n

The type of health check to be performed. Currently supported protocols are TCP and HTTP.

\n ", + "documentation": "\n

The type of health check to be performed. Currently supported types are TCP, HTTP, HTTPS, HTTP_STR_MATCH, and HTTPS_STR_MATCH.

\n ", "required": true }, "ResourcePath": { "shape_name": "ResourcePath", "type": "string", "max_length": 255, - "documentation": "\n

Path to ping on the instance to check the health. Required only for HTTP health checks, HTTP request is issued to the instance on the given port and path.

\n " + "documentation": "\n

Path to ping on the instance to check the health. Required for HTTP, HTTPS, HTTP_STR_MATCH, and HTTPS_STR_MATCH health checks, HTTP request is issued to the instance on the given port and path.

\n " }, "FullyQualifiedDomainName": { "shape_name": "FullyQualifiedDomainName", "type": "string", "max_length": 255, "documentation": "\n

Fully qualified domain name of the instance to be health checked.

\n " + }, + "SearchString": { + "shape_name": "SearchString", + "type": "string", + "max_length": 255, + "documentation": "\n

A string to search for in the body of a health check response. Required for HTTP_STR_MATCH and HTTPS_STR_MATCH health checks.

\n " } }, "member_order": [ @@ -1236,7 +1267,8 @@ "Port", "Type", "ResourcePath", - "FullyQualifiedDomainName" + "FullyQualifiedDomainName", + "SearchString" ], "documentation": "\n

A complex type that contains the health check configuration.

\n ", "required": true @@ -1280,15 +1312,27 @@ } }, "documentation": "\n

Some value specified in the request is invalid or the XML document is malformed.

\n " + }, + { + "shape_name": "IncompatibleVersion", + "type": "structure", + "members": { + "message": { + "shape_name": "ErrorMessage", + "type": "string", + "documentation": null + } + }, + "documentation": "\n

The resource you are trying to access is unsupported on this Route 53 endpoint. Please consider using a newer endpoint or a tool that does so.

\n " } ], - "documentation": "\n

To retrieve the health check, send a GET request to the 2012-12-12/healthcheck/health check ID resource.

\n " + "documentation": "\n

To retrieve the health check, send a GET request to the 2013-04-01/healthcheck/health check ID resource.

\n " }, "GetHostedZone": { "name": "GetHostedZone", "http": { "method": "GET", - "uri": "/2012-12-12/hostedzone/{Id}" + "uri": "/2013-04-01/hostedzone/{Id}" }, "input": { "shape_name": "GetHostedZoneRequest", @@ -1428,13 +1472,13 @@ "documentation": "\n

Some value specified in the request is invalid or the XML document is malformed.

\n " } ], - "documentation": "\n

To retrieve the delegation set for a hosted zone, send a GET request to the 2012-12-12/hostedzone/hosted zone ID resource. The delegation set is the four Route 53 name servers that were assigned to the hosted zone when you created it.

\n " + "documentation": "\n

To retrieve the delegation set for a hosted zone, send a GET request to the 2013-04-01/hostedzone/hosted zone ID resource. The delegation set is the four Route 53 name servers that were assigned to the hosted zone when you created it.

\n " }, "ListHealthChecks": { "name": "ListHealthChecks", "http": { "method": "GET", - "uri": "/2012-12-12/healthcheck?marker={Marker}&maxitems={MaxItems}" + "uri": "/2013-04-01/healthcheck?marker={Marker}&maxitems={MaxItems}" }, "input": { "shape_name": "ListHealthChecksRequest", @@ -1458,7 +1502,7 @@ "Marker", "MaxItems" ], - "documentation": "\n

To retrieve a list of your health checks, send a GET request to the 2012-12-12/healthcheck resource. The response to this request includes a HealthChecks element with zero or more HealthCheck child elements. By default, the list of health checks is displayed on a single page. You can control the length of the page that is displayed by using the MaxItems parameter. You can use the Marker parameter to control the health check that the list begins with.

\n Route 53 returns a maximum of 100 items. If you set MaxItems to a value greater than 100, Route 53 returns only the first 100.\n " + "documentation": "\n

To retrieve a list of your health checks, send a GET request to the 2013-04-01/healthcheck resource. The response to this request includes a HealthChecks element with zero or more HealthCheck child elements. By default, the list of health checks is displayed on a single page. You can control the length of the page that is displayed by using the MaxItems parameter. You can use the Marker parameter to control the health check that the list begins with.

\n Route 53 returns a maximum of 100 items. If you set MaxItems to a value greater than 100, Route 53 returns only the first 100.\n " }, "output": { "shape_name": "ListHealthChecksResponse", @@ -1503,29 +1547,38 @@ "type": "integer", "min_length": 1, "max_length": 65535, - "documentation": "\n

Port on which connection will be opened to the instance to health check. For HTTP this defaults to 80 if the port is not specified.

\n " + "documentation": "\n

Port on which connection will be opened to the instance to health check. For HTTP and HTTP_STR_MATCH this defaults to 80 if the port is not specified. For HTTPS and HTTPS_STR_MATCH this defaults to 443 if the port is not specified.

\n " }, "Type": { "shape_name": "HealthCheckType", "type": "string", "enum": [ "HTTP", + "HTTPS", + "HTTP_STR_MATCH", + "HTTPS_STR_MATCH", "TCP" ], - "documentation": "\n

The type of health check to be performed. Currently supported protocols are TCP and HTTP.

\n ", + "documentation": "\n

The type of health check to be performed. Currently supported types are TCP, HTTP, HTTPS, HTTP_STR_MATCH, and HTTPS_STR_MATCH.

\n ", "required": true }, "ResourcePath": { "shape_name": "ResourcePath", "type": "string", "max_length": 255, - "documentation": "\n

Path to ping on the instance to check the health. Required only for HTTP health checks, HTTP request is issued to the instance on the given port and path.

\n " + "documentation": "\n

Path to ping on the instance to check the health. Required for HTTP, HTTPS, HTTP_STR_MATCH, and HTTPS_STR_MATCH health checks, HTTP request is issued to the instance on the given port and path.

\n " }, "FullyQualifiedDomainName": { "shape_name": "FullyQualifiedDomainName", "type": "string", "max_length": 255, "documentation": "\n

Fully qualified domain name of the instance to be health checked.

\n " + }, + "SearchString": { + "shape_name": "SearchString", + "type": "string", + "max_length": 255, + "documentation": "\n

A string to search for in the body of a health check response. Required for HTTP_STR_MATCH and HTTPS_STR_MATCH health checks.

\n " } }, "member_order": [ @@ -1533,7 +1586,8 @@ "Port", "Type", "ResourcePath", - "FullyQualifiedDomainName" + "FullyQualifiedDomainName", + "SearchString" ], "documentation": "\n

A complex type that contains the health check configuration.

\n ", "required": true @@ -1597,15 +1651,27 @@ } }, "documentation": "\n

Some value specified in the request is invalid or the XML document is malformed.

\n " + }, + { + "shape_name": "IncompatibleVersion", + "type": "structure", + "members": { + "message": { + "shape_name": "ErrorMessage", + "type": "string", + "documentation": null + } + }, + "documentation": "\n

The resource you are trying to access is unsupported on this Route 53 endpoint. Please consider using a newer endpoint or a tool that does so.

\n " } ], - "documentation": "\n

To retrieve a list of your health checks, send a GET request to the 2012-12-12/healthcheck resource. The response to this request includes a HealthChecks element with zero, one, or multiple HealthCheck child elements. By default, the list of health checks is displayed on a single page. You can control the length of the page that is displayed by using the MaxItems parameter. You can use the Marker parameter to control the health check that the list begins with.

\n Amazon Route 53 returns a maximum of 100 items. If you set MaxItems to a value greater than 100, Amazon Route 53 returns only the first 100.\n " + "documentation": "\n

To retrieve a list of your health checks, send a GET request to the 2013-04-01/healthcheck resource. The response to this request includes a HealthChecks element with zero, one, or multiple HealthCheck child elements. By default, the list of health checks is displayed on a single page. You can control the length of the page that is displayed by using the MaxItems parameter. You can use the Marker parameter to control the health check that the list begins with.

\n Amazon Route 53 returns a maximum of 100 items. If you set MaxItems to a value greater than 100, Amazon Route 53 returns only the first 100.\n " }, "ListHostedZones": { "name": "ListHostedZones", "http": { "method": "GET", - "uri": "/2012-12-12/hostedzone?marker={Marker}&maxitems={MaxItems}" + "uri": "/2013-04-01/hostedzone?marker={Marker}&maxitems={MaxItems}" }, "input": { "shape_name": "ListHostedZonesRequest", @@ -1629,7 +1695,7 @@ "Marker", "MaxItems" ], - "documentation": "\n

To retrieve a list of your hosted zones, send a GET request to the 2012-12-12/hostedzone resource. The response to this request includes a HostedZones element with zero or more HostedZone child elements. By default, the list of hosted zones is displayed on a single page. You can control the length of the page that is displayed by using the MaxItems parameter. You can use the Marker parameter to control the hosted zone that the list begins with. For more information about listing hosted zones, see Listing the Hosted Zones for an AWS Account in the Amazon Route 53 Developer Guide.

\n Route 53 returns a maximum of 100 items. If you set MaxItems to a value greater than 100, Route 53 returns only the first 100.\n " + "documentation": "\n

To retrieve a list of your hosted zones, send a GET request to the 2013-04-01/hostedzone resource. The response to this request includes a HostedZones element with zero or more HostedZone child elements. By default, the list of hosted zones is displayed on a single page. You can control the length of the page that is displayed by using the MaxItems parameter. You can use the Marker parameter to control the hosted zone that the list begins with. For more information about listing hosted zones, see Listing the Hosted Zones for an AWS Account in the Amazon Route 53 Developer Guide.

\n Route 53 returns a maximum of 100 items. If you set MaxItems to a value greater than 100, Route 53 returns only the first 100.\n " }, "output": { "shape_name": "ListHostedZonesResponse", @@ -1748,13 +1814,13 @@ "documentation": "\n

Some value specified in the request is invalid or the XML document is malformed.

\n " } ], - "documentation": "\n

To retrieve a list of your hosted zones, send a GET request to the 2012-12-12/hostedzone resource. The response to this request includes a HostedZones element with zero, one, or multiple HostedZone child elements. By default, the list of hosted zones is displayed on a single page. You can control the length of the page that is displayed by using the MaxItems parameter. You can use the Marker parameter to control the hosted zone that the list begins with.

\n Amazon Route 53 returns a maximum of 100 items. If you set MaxItems to a value greater than 100, Amazon Route 53 returns only the first 100.\n " + "documentation": "\n

To retrieve a list of your hosted zones, send a GET request to the 2013-04-01/hostedzone resource. The response to this request includes a HostedZones element with zero, one, or multiple HostedZone child elements. By default, the list of hosted zones is displayed on a single page. You can control the length of the page that is displayed by using the MaxItems parameter. You can use the Marker parameter to control the hosted zone that the list begins with.

\n Amazon Route 53 returns a maximum of 100 items. If you set MaxItems to a value greater than 100, Amazon Route 53 returns only the first 100.\n " }, "ListResourceRecordSets": { "name": "ListResourceRecordSets", "http": { "method": "GET", - "uri": "/2012-12-12/hostedzone/{HostedZoneId}/rrset?type={StartRecordType}&name={StartRecordName}&identifier={StartRecordIdentifier}&maxitems={MaxItems}" + "uri": "/2013-04-01/hostedzone/{HostedZoneId}/rrset?type={StartRecordType}&name={StartRecordName}&identifier={StartRecordIdentifier}&maxitems={MaxItems}" }, "input": { "shape_name": "ListResourceRecordSetsRequest", @@ -1880,7 +1946,8 @@ "ap-southeast-1", "ap-southeast-2", "ap-northeast-1", - "sa-east-1" + "sa-east-1", + "cn-north-1" ], "documentation": "\n

Regional resource record sets only: Among resource record sets that have the same combination of DNS name and type, a value that specifies the AWS region for the current resource record set.

\n " }, diff --git a/services/cloudformation.json b/services/cloudformation.json index aa2e2cbfbe..590a193448 100644 --- a/services/cloudformation.json +++ b/services/cloudformation.json @@ -6,7 +6,7 @@ "service_full_name": "AWS CloudFormation", "endpoint_prefix": "cloudformation", "xmlnamespace": "http://cloudformation.amazonaws.com/doc/2010-05-15/", - "documentation": "\n AWS CloudFormation\n

AWS CloudFormation enables you to create and manage AWS infrastructure deployments predictably and repeatedly.\n AWS CloudFormation helps you leverage AWS products such as Amazon EC2, EBS, Amazon SNS, ELB, and Auto Scaling\n to build highly-reliable, highly scalable, cost effective applications without worrying about creating and\n configuring the underlying the AWS infrastructure.

\n

With AWS CloudFormation, you declare all of your resources and dependencies in a template file. The template\n defines a collection of resources as a single unit called a stack. AWS CloudFormation creates and deletes all\n member resources of the stack together and manages all dependencies between the resources for you.

\n

For more information about this product, go to the CloudFormation Product Page.

\n

Amazon CloudFormation makes use of other AWS products. If you need additional technical information about a\n specific AWS product, you can find the product's technical documentation at http://aws.amazon.com/documentation/.

\n You must call the AWS CloudFormation API as a regular IAM user. AWS CloudFormation does not support calling the API with\n an IAM\n role\n\n ", + "documentation": "\n AWS CloudFormation\n

AWS CloudFormation enables you to create and manage AWS infrastructure deployments predictably and repeatedly.\n AWS CloudFormation helps you leverage AWS products such as Amazon EC2, EBS, Amazon SNS, ELB, and Auto Scaling\n to build highly-reliable, highly scalable, cost effective applications without worrying about creating and\n configuring the underlying AWS infrastructure.

\n

With AWS CloudFormation, you declare all of your resources and dependencies in a template file. The template\n defines a collection of resources as a single unit called a stack. AWS CloudFormation creates and deletes all\n member resources of the stack together and manages all dependencies between the resources for you.

\n

For more information about this product, go to the CloudFormation Product Page.

\n

Amazon CloudFormation makes use of other AWS products. If you need additional technical information about a\n specific AWS product, you can find the product's technical documentation at http://aws.amazon.com/documentation/.

\n\n ", "operations": { "CancelUpdateStack": { "name": "CancelUpdateStack", @@ -45,14 +45,14 @@ "shape_name": "TemplateBody", "type": "string", "min_length": 1, - "documentation": "\n

Structure containing the template body. (For more information, go to the AWS CloudFormation User\n Guide.)

\n

Conditional: You must pass TemplateBody or TemplateURL. If both are passed, only\n TemplateBody is used.

\n " + "documentation": "\n

Structure containing the template body. (For more information, go to Template Anatomy in the AWS CloudFormation User Guide.)

\n

Conditional: You must pass TemplateBody or TemplateURL. If both are passed, only\n TemplateBody is used.

\n " }, "TemplateURL": { "shape_name": "TemplateURL", "type": "string", "min_length": 1, "max_length": 1024, - "documentation": "\n

Location of file containing the template body. The URL must point to a template (max size: 307,200 bytes)\n located in an S3 bucket in the same region as the stack. For more information, go to the AWS CloudFormation User\n Guide.

\n

Conditional: You must pass TemplateURL or TemplateBody. If both are passed, only\n TemplateBody is used.

\n " + "documentation": "\n

Location of file containing the template body. The URL must point to a template (max size: 307,200 bytes)\n located in an S3 bucket in the same region as the stack. For more information, go to the Template Anatomy in the AWS CloudFormation User Guide.

\n

Conditional: You must pass TemplateURL or TemplateBody. If both are passed, only\n TemplateBody is used.

\n " }, "Parameters": { "shape_name": "Parameters", @@ -109,7 +109,7 @@ ], "documentation": null }, - "documentation": "\n

The list of capabilities that you want to allow in the stack. If your template contains IAM resources, you\n must specify the CAPABILITY_IAM value for this parameter; otherwise, this action returns an\n InsufficientCapabilities error. IAM resources are the following: AWS::IAM::AccessKey, AWS::IAM::Group, AWS::IAM::Policy, AWS::IAM::User, and AWS::IAM::UserToGroupAddition.

\n " + "documentation": "\n

The list of capabilities that you want to allow in the stack. If your template contains certain resources, you\n must specify the CAPABILITY_IAM value for this parameter; otherwise, this action returns an\n InsufficientCapabilities error. The following resources require you to specify the capabilities parameter: AWS::CloudFormation::Stack, AWS::IAM::AccessKey, AWS::IAM::Group, AWS::IAM::InstanceProfile, AWS::IAM::Policy, AWS::IAM::Role, AWS::IAM::User, and AWS::IAM::UserToGroupAddition.

\n " }, "OnFailure": { "shape_name": "OnFailure", @@ -126,7 +126,7 @@ "type": "string", "min_length": 1, "max_length": 16384, - "documentation": "\n

Structure containing the stack policy body. (For more information, go to the \n AWS CloudFormation User Guide.)

\n

If you pass StackPolicyBody and StackPolicyURL, only\n StackPolicyBody is used.

\n " + "documentation": "\n

Structure containing the stack policy body. (For more information, go to \n Prevent Updates to Stack Resources in the AWS CloudFormation User Guide.)

\n

If you pass StackPolicyBody and StackPolicyURL, only\n StackPolicyBody is used.

\n " }, "StackPolicyURL": { "shape_name": "StackPolicyURL", @@ -281,7 +281,7 @@ "ResourceType": { "shape_name": "ResourceType", "type": "string", - "documentation": "\n

Type of the resource. (For more information, go to the AWS CloudFormation User\n Guide.)

\n " + "documentation": "\n

Type of resource. (For more information, go to \n AWS Resource Types Reference in the AWS CloudFormation User Guide.)

\n " }, "Timestamp": { "shape_name": "Timestamp", @@ -333,7 +333,7 @@ "errors": [ ], - "documentation": "\n

Returns all stack related events for a specified stack. For more information about a stack's event history, go to the AWS CloudFormation User\n Guide.

\n Events are returned, even if the stack never existed or has been successfully deleted.\n\n \n \nhttps://cloudformation.us-east-1.amazonaws.com/\n ?Action=DescribeStackEvents\n &StackName=MyStack\n &Version=2010-05-15\n &SignatureVersion=2\n &Timestamp=2010-07-27T22%3A26%3A28.000Z\n &AWSAccessKeyId=[AWS Access KeyID]\n &Signature=[Signature]\n\n \n\n \n \n Event-1-Id\n arn:aws:cloudformation:us-east-1:123456789:stack/MyStack/aaf549a0-a413-11df-adb3-5081b3858e83\n MyStack\n MyStack\n MyStack_One\n AWS::CloudFormation::Stack\n 2010-07-27T22:26:28Z\n CREATE_IN_PROGRESS\n User initiated\n \n \n Event-2-Id\n arn:aws:cloudformation:us-east-1:123456789:stack/MyStack/aaf549a0-a413-11df-adb3-5081b3858e83\n MyStack\n MyDBInstance\n MyStack_DB1\n AWS::SecurityGroup\n 2010-07-27T22:27:28Z\n CREATE_IN_PROGRESS\n {\"GroupDescription\":...}\n \n \n Event-3-Id\n arn:aws:cloudformation:us-east-1:123456789:stack/MyStack/aaf549a0-a413-11df-adb3-5081b3858e83\n MyStack\n MySG1\n MyStack_SG1\n AWS:: SecurityGroup\n 2010-07-27T22:28:28Z\n CREATE_COMPLETE\n \n \n\n \n " + "documentation": "\n

Returns all stack related events for a specified stack. For more information about a stack's event history, go to Stacks in the AWS CloudFormation User Guide.

\n Events are returned, even if the stack never existed or has been successfully deleted.\n\n \n \nhttps://cloudformation.us-east-1.amazonaws.com/\n ?Action=DescribeStackEvents\n &StackName=MyStack\n &Version=2010-05-15\n &SignatureVersion=2\n &Timestamp=2010-07-27T22%3A26%3A28.000Z\n &AWSAccessKeyId=[AWS Access KeyID]\n &Signature=[Signature]\n\n \n\n \n \n Event-1-Id\n arn:aws:cloudformation:us-east-1:123456789:stack/MyStack/aaf549a0-a413-11df-adb3-5081b3858e83\n MyStack\n MyStack\n MyStack_One\n AWS::CloudFormation::Stack\n 2010-07-27T22:26:28Z\n CREATE_IN_PROGRESS\n User initiated\n \n \n Event-2-Id\n arn:aws:cloudformation:us-east-1:123456789:stack/MyStack/aaf549a0-a413-11df-adb3-5081b3858e83\n MyStack\n MyDBInstance\n MyStack_DB1\n AWS::SecurityGroup\n 2010-07-27T22:27:28Z\n CREATE_IN_PROGRESS\n {\"GroupDescription\":...}\n \n \n Event-3-Id\n arn:aws:cloudformation:us-east-1:123456789:stack/MyStack/aaf549a0-a413-11df-adb3-5081b3858e83\n MyStack\n MySG1\n MyStack_SG1\n AWS:: SecurityGroup\n 2010-07-27T22:28:28Z\n CREATE_COMPLETE\n \n \n\n \n " }, "DescribeStackResource": { "name": "DescribeStackResource", @@ -388,7 +388,7 @@ "ResourceType": { "shape_name": "ResourceType", "type": "string", - "documentation": "\n

Type of the resource. (For more information, go to the AWS CloudFormation User\n Guide.)

\n ", + "documentation": "\n

Type of resource. ((For more information, go to \n AWS Resource Types Reference in the AWS CloudFormation User Guide.)

\n ", "required": true }, "LastUpdatedTimestamp": { @@ -499,7 +499,7 @@ "ResourceType": { "shape_name": "ResourceType", "type": "string", - "documentation": "\n

Type of the resource. (For more information, go to the AWS CloudFormation User\n Guide.)

\n ", + "documentation": "\n

Type of resource. (For more information, go to \n AWS Resource Types Reference in the AWS CloudFormation User Guide.)

\n ", "required": true }, "Timestamp": { @@ -564,7 +564,7 @@ "type": "string", "min_length": 1, "max_length": 1024, - "documentation": null + "documentation": "String that identifies the start of the next list of stacks, if there is one." } }, "documentation": "\n

The input for DescribeStacks action.

\n " @@ -752,7 +752,7 @@ "type": "string", "min_length": 1, "max_length": 1024, - "documentation": null + "documentation": "String that identifies the start of the next list of stacks, if there is one." } }, "documentation": "\n

The output for a DescribeStacks action.

\n " @@ -772,14 +772,14 @@ "shape_name": "TemplateBody", "type": "string", "min_length": 1, - "documentation": "\n

Structure containing the template body. (For more information, go to the AWS CloudFormation User\n Guide.)

\n

Conditional: You must pass TemplateBody or TemplateURL. If both are passed, only\n TemplateBody is used.

\n " + "documentation": "\n

Structure containing the template body. (For more information, go to Template Anatomy\n in the AWS CloudFormation User Guide.)

\n

Conditional: You must pass TemplateBody or TemplateURL. If both are passed, only\n TemplateBody is used.

\n " }, "TemplateURL": { "shape_name": "TemplateURL", "type": "string", "min_length": 1, "max_length": 1024, - "documentation": "\n

Location of file containing the template body. The URL must point to a template located in an S3 bucket in the\n same region as the stack. For more information, go to the AWS CloudFormation User\n Guide.

\n

Conditional: You must pass TemplateURL or TemplateBody. If both are passed, only\n TemplateBody is used.

\n " + "documentation": "\n

Location of file containing the template body. The URL must point to a template located in an S3 bucket in the\n same region as the stack. For more information, go to Template Anatomy\n in the AWS CloudFormation User Guide.

\n

Conditional: You must pass TemplateURL or TemplateBody. If both are passed, only\n TemplateBody is used.

\n " }, "Parameters": { "shape_name": "Parameters", @@ -847,7 +847,7 @@ "type": "string", "min_length": 1, "max_length": 16384, - "documentation": "\n

Structure containing the stack policy body. (For more information, go to the \n AWS CloudFormation User Guide.)

\n " + "documentation": "\n

Structure containing the stack policy body. (For more information, go to \n Prevent Updates to Stack Resources in the AWS CloudFormation User Guide.)

\n " } }, "documentation": "\n

The output for the GetStackPolicy action.

\n " @@ -855,7 +855,7 @@ "errors": [ ], - "documentation": "\n

Returns the stack policy for a specified stack. If a stack doesn't have a policy, a null value is returned.

\n \n \nhttps://cloudformation.us-east-1.amazonaws.com/\n ?Action=GetStackPolicy\n &StackName=MyStack\n &Version=2010-05-15\n &SignatureVersion=2\n &Timestamp=2010-07-27T22%3A26%3A28.000Z\n &AWSAccessKeyId=[AWS Access KeyID]\n &Signature=[Signature]\n \n\n \"{\n \"Statement\" : [\n {\n \"Effect\" : \"Deny\",\n \"Action\" : \"Update*\",\n \"Resource\" : \"LogicalResourceId/ProductionDatabase\"\n },\n {\n \"Effect\" : \"Allow\",\n \"Action\" : \"Update:*\",\n \"Resource\" : \"*\"\n }\n ]\n }\n\n \n " + "documentation": "\n

Returns the stack policy for a specified stack. If a stack doesn't have a policy, a null value is returned.

\n \n \nhttps://cloudformation.us-east-1.amazonaws.com/\n ?Action=GetStackPolicy\n &StackName=MyStack\n &Version=2010-05-15\n &SignatureVersion=2\n &Timestamp=2010-07-27T22%3A26%3A28.000Z\n &AWSAccessKeyId=[AWS Access KeyID]\n &Signature=[Signature]\n \n\n \"{\n \"Statement\" : [\n {\n \"Effect\" : \"Deny\",\n \"Action\" : \"Update*\",\n \"Principal\" : \"*\",\n \"Resource\" : \"LogicalResourceId/ProductionDatabase\"\n },\n {\n \"Effect\" : \"Allow\",\n \"Action\" : \"Update:*\",\n \"Principal\" : \"*\",\n \"Resource\" : \"*\"\n }\n ]\n }\n\n \n " }, "GetTemplate": { "name": "GetTemplate", @@ -880,7 +880,7 @@ "shape_name": "TemplateBody", "type": "string", "min_length": 1, - "documentation": "\n

Structure containing the template body. (For more information, go to the AWS CloudFormation User\n Guide.)

\n " + "documentation": "\n

Structure containing the template body. (For more information, go to Template Anatomy\n in the AWS CloudFormation User Guide.)

\n " } }, "documentation": "\n

The output for GetTemplate action.

\n " @@ -937,7 +937,7 @@ "ResourceType": { "shape_name": "ResourceType", "type": "string", - "documentation": "\n

Type of the resource. (For more information, go to the AWS CloudFormation User\n Guide.)

\n ", + "documentation": "\n

Type of resource. (For more information, go to \n AWS Resource Types Reference in the AWS CloudFormation User Guide.)

\n ", "required": true }, "LastUpdatedTimestamp": { @@ -1141,7 +1141,7 @@ "type": "string", "min_length": 1, "max_length": 16384, - "documentation": "\n

Structure containing the stack policy body. (For more information, go to the \n AWS CloudFormation User Guide.)

\n

You must pass StackPolicyBody or StackPolicyURL. If both are passed, only\n StackPolicyBody is used.

\n " + "documentation": "\n

Structure containing the stack policy body. (For more information, go to \n Prevent Updates to Stack Resources in the AWS CloudFormation User Guide.)

\n

You must pass StackPolicyBody or StackPolicyURL. If both are passed, only\n StackPolicyBody is used.

\n " }, "StackPolicyURL": { "shape_name": "StackPolicyURL", @@ -1175,14 +1175,14 @@ "shape_name": "TemplateBody", "type": "string", "min_length": 1, - "documentation": "\n

Structure containing the template body. (For more information, go to the AWS CloudFormation User\n Guide.)

\n

Conditional: You must pass TemplateBody or TemplateURL. If both are passed, only\n TemplateBody is used.

\n " + "documentation": "\n

Structure containing the template body. (For more information, go to Template Anatomy\n in the AWS CloudFormation User Guide.)

\n

Conditional: You must pass TemplateBody or TemplateURL. If both are passed, only\n TemplateBody is used.

\n " }, "TemplateURL": { "shape_name": "TemplateURL", "type": "string", "min_length": 1, "max_length": 1024, - "documentation": "\n

Location of file containing the template body. The URL must point to a template located in an S3 bucket in the\n same region as the stack. For more information, go to the AWS CloudFormation User\n Guide.

\n

Conditional: You must pass TemplateURL or TemplateBody. If both are passed, only\n TemplateBody is used.

\n " + "documentation": "\n

Location of file containing the template body. The URL must point to a template located in an S3 bucket in the\n same region as the stack. For more information, go to Template Anatomy\n in the AWS CloudFormation User Guide.

\n

Conditional: You must pass TemplateURL or TemplateBody. If both are passed, only\n TemplateBody is used.

\n " }, "StackPolicyDuringUpdateBody": { "shape_name": "StackPolicyDuringUpdateBody", @@ -1283,14 +1283,14 @@ "shape_name": "TemplateBody", "type": "string", "min_length": 1, - "documentation": "\n

String containing the template body. (For more information, go to the AWS CloudFormation User\n Guide.)

\n

Conditional: You must pass TemplateURL or TemplateBody. If both are passed, only\n TemplateBody is used.

\n " + "documentation": "\n

String containing the template body. (For more information, go to Template Anatomy\n in the AWS CloudFormation User Guide.)

\n

Conditional: You must pass TemplateURL or TemplateBody. If both are passed, only\n TemplateBody is used.

\n " }, "TemplateURL": { "shape_name": "TemplateURL", "type": "string", "min_length": 1, "max_length": 1024, - "documentation": "\n

Location of file containing the template body. The URL must point to a template (max size: 307,200 bytes)\n located in an S3 bucket in the same region as the stack. For more information, go to the AWS CloudFormation User\n Guide.

\n

Conditional: You must pass TemplateURL or TemplateBody. If both are passed, only\n TemplateBody is used.

\n " + "documentation": "\n

Location of file containing the template body. The URL must point to a template (max size: 307,200 bytes)\n located in an S3 bucket in the same region as the stack. For more information, go to Template Anatomy\n in the AWS CloudFormation User Guide.

\n

Conditional: You must pass TemplateURL or TemplateBody. If both are passed, only\n TemplateBody is used.

\n " } }, "documentation": "\n

The input for ValidateTemplate action.

\n " diff --git a/services/route53.json b/services/route53.json index 9a0c03e4c8..012aefcda8 100644 --- a/services/route53.json +++ b/services/route53.json @@ -1,19 +1,19 @@ { - "api_version": "2012-12-12", + "api_version": "2013-04-01", "type": "rest-xml", "signature_version": "v3https", "service_full_name": "Amazon Route 53", "service_abbreviation": "Route 53", "global_endpoint": "route53.amazonaws.com", "endpoint_prefix": "route53", - "xmlnamespace": "https://route53.amazonaws.com/doc/2012-12-12/", + "xmlnamespace": "https://route53.amazonaws.com/doc/2013-04-01/", "documentation": "\n ", "operations": { "ChangeResourceRecordSets": { "name": "ChangeResourceRecordSets", "http": { "method": "POST", - "uri": "/2012-12-12/hostedzone/{HostedZoneId}/rrset/" + "uri": "/2013-04-01/hostedzone/{HostedZoneId}/rrset/" }, "input": { "shape_name": "ChangeResourceRecordSetsRequest", @@ -23,7 +23,7 @@ "shape_name": "ResourceId", "type": "string", "max_length": 32, - "documentation": "\n

Alias resource record sets only: The value of the hosted zone ID for the AWS resource.

\n

For more information, an example, and several ways to get the hosted zone ID for the LoadBalancer, see Creating Alias Resource Record Sets for Elastic Load Balancing in the Amazon Route 53 Developer Guide

.\n ", + "documentation": "\n

The ID of the hosted zone that contains the resource record sets that you want to change.

\n ", "required": true, "location": "uri" }, @@ -49,9 +49,10 @@ "type": "string", "enum": [ "CREATE", - "DELETE" + "DELETE", + "UPSERT" ], - "documentation": "\n

The action to perform.

\n

Valid values: CREATE | DELETE

\n ", + "documentation": "\n

The action to perform.

\n

Valid values: CREATE | DELETE | UPSERT

\n ", "required": true }, "ResourceRecordSet": { @@ -110,7 +111,8 @@ "ap-southeast-1", "ap-southeast-2", "ap-northeast-1", - "sa-east-1" + "sa-east-1", + "cn-north-1" ], "documentation": "\n

Regional resource record sets only: Among resource record sets that have the same combination of DNS name and type, a value that specifies the AWS region for the current resource record set.

\n " }, @@ -356,13 +358,13 @@ "documentation": "\n

The request was rejected because Route 53 was still processing a prior request.

\n " } ], - "documentation": "\n

Use this action to create or change your authoritative DNS information. To use this action, send a POST request to the 2012-12-12/hostedzone/hosted Zone ID/rrset resource. The request body must include an XML document with a ChangeResourceRecordSetsRequest element.

\n

Changes are a list of change items and are considered transactional. For more information on transactional changes, also known as change batches, see Creating, Changing, and Deleting Resource Record Sets Using the Route 53 API in the Amazon Route 53 Developer Guide.

\n Due to the nature of transactional changes, you cannot delete the same resource record set more than once in a single change batch. If you attempt to delete the same change batch more than once, Route 53 returns an InvalidChangeBatch error.\n

In response to a ChangeResourceRecordSets request, your DNS data is changed on all Route 53 DNS servers. Initially, the status of a change is PENDING. This means the change has not yet propagated to all the authoritative Route 53 DNS servers. When the change is propagated to all hosts, the change returns a status of INSYNC.

\n

Note the following limitations on a ChangeResourceRecordSets request:

\n

- A request cannot contain more than 100 Change elements.

\n

- A request cannot contain more than 1000 ResourceRecord elements.

\n

The sum of the number of characters (including spaces) in all Value elements in a request cannot exceed 32,000 characters.

\n " + "documentation": "\n

Use this action to create or change your authoritative DNS information. To use this action, send a POST request to the 2013-04-01/hostedzone/hosted Zone ID/rrset resource. The request body must include an XML document with a ChangeResourceRecordSetsRequest element.

\n

Changes are a list of change items and are considered transactional. For more information on transactional changes, also known as change batches, see Creating, Changing, and Deleting Resource Record Sets Using the Route 53 API in the Amazon Route 53 Developer Guide.

\n Due to the nature of transactional changes, you cannot delete the same resource record set more than once in a single change batch. If you attempt to delete the same change batch more than once, Route 53 returns an InvalidChangeBatch error.\n

In response to a ChangeResourceRecordSets request, your DNS data is changed on all Route 53 DNS servers. Initially, the status of a change is PENDING. This means the change has not yet propagated to all the authoritative Route 53 DNS servers. When the change is propagated to all hosts, the change returns a status of INSYNC.

\n

Note the following limitations on a ChangeResourceRecordSets request:

\n

- A request cannot contain more than 100 Change elements.

\n

- A request cannot contain more than 1000 ResourceRecord elements.

\n

The sum of the number of characters (including spaces) in all Value elements in a request cannot exceed 32,000 characters.

\n " }, "CreateHealthCheck": { "name": "CreateHealthCheck", "http": { "method": "POST", - "uri": "/2012-12-12/healthcheck", + "uri": "/2013-04-01/healthcheck", "response_code": 201 }, "input": { @@ -394,29 +396,38 @@ "type": "integer", "min_length": 1, "max_length": 65535, - "documentation": "\n

Port on which connection will be opened to the instance to health check. For HTTP this defaults to 80 if the port is not specified.

\n " + "documentation": "\n

Port on which connection will be opened to the instance to health check. For HTTP and HTTP_STR_MATCH this defaults to 80 if the port is not specified. For HTTPS and HTTPS_STR_MATCH this defaults to 443 if the port is not specified.

\n " }, "Type": { "shape_name": "HealthCheckType", "type": "string", "enum": [ "HTTP", + "HTTPS", + "HTTP_STR_MATCH", + "HTTPS_STR_MATCH", "TCP" ], - "documentation": "\n

The type of health check to be performed. Currently supported protocols are TCP and HTTP.

\n ", + "documentation": "\n

The type of health check to be performed. Currently supported types are TCP, HTTP, HTTPS, HTTP_STR_MATCH, and HTTPS_STR_MATCH.

\n ", "required": true }, "ResourcePath": { "shape_name": "ResourcePath", "type": "string", "max_length": 255, - "documentation": "\n

Path to ping on the instance to check the health. Required only for HTTP health checks, HTTP request is issued to the instance on the given port and path.

\n " + "documentation": "\n

Path to ping on the instance to check the health. Required for HTTP, HTTPS, HTTP_STR_MATCH, and HTTPS_STR_MATCH health checks, HTTP request is issued to the instance on the given port and path.

\n " }, "FullyQualifiedDomainName": { "shape_name": "FullyQualifiedDomainName", "type": "string", "max_length": 255, "documentation": "\n

Fully qualified domain name of the instance to be health checked.

\n " + }, + "SearchString": { + "shape_name": "SearchString", + "type": "string", + "max_length": 255, + "documentation": "\n

A string to search for in the body of a health check response. Required for HTTP_STR_MATCH and HTTPS_STR_MATCH health checks.

\n " } }, "member_order": [ @@ -424,7 +435,8 @@ "Port", "Type", "ResourcePath", - "FullyQualifiedDomainName" + "FullyQualifiedDomainName", + "SearchString" ], "documentation": "\n

A complex type that contains health check configuration.

\n ", "required": true @@ -476,29 +488,38 @@ "type": "integer", "min_length": 1, "max_length": 65535, - "documentation": "\n

Port on which connection will be opened to the instance to health check. For HTTP this defaults to 80 if the port is not specified.

\n " + "documentation": "\n

Port on which connection will be opened to the instance to health check. For HTTP and HTTP_STR_MATCH this defaults to 80 if the port is not specified. For HTTPS and HTTPS_STR_MATCH this defaults to 443 if the port is not specified.

\n " }, "Type": { "shape_name": "HealthCheckType", "type": "string", "enum": [ "HTTP", + "HTTPS", + "HTTP_STR_MATCH", + "HTTPS_STR_MATCH", "TCP" ], - "documentation": "\n

The type of health check to be performed. Currently supported protocols are TCP and HTTP.

\n ", + "documentation": "\n

The type of health check to be performed. Currently supported types are TCP, HTTP, HTTPS, HTTP_STR_MATCH, and HTTPS_STR_MATCH.

\n ", "required": true }, "ResourcePath": { "shape_name": "ResourcePath", "type": "string", "max_length": 255, - "documentation": "\n

Path to ping on the instance to check the health. Required only for HTTP health checks, HTTP request is issued to the instance on the given port and path.

\n " + "documentation": "\n

Path to ping on the instance to check the health. Required for HTTP, HTTPS, HTTP_STR_MATCH, and HTTPS_STR_MATCH health checks, HTTP request is issued to the instance on the given port and path.

\n " }, "FullyQualifiedDomainName": { "shape_name": "FullyQualifiedDomainName", "type": "string", "max_length": 255, "documentation": "\n

Fully qualified domain name of the instance to be health checked.

\n " + }, + "SearchString": { + "shape_name": "SearchString", + "type": "string", + "max_length": 255, + "documentation": "\n

A string to search for in the body of a health check response. Required for HTTP_STR_MATCH and HTTPS_STR_MATCH health checks.

\n " } }, "member_order": [ @@ -506,7 +527,8 @@ "Port", "Type", "ResourcePath", - "FullyQualifiedDomainName" + "FullyQualifiedDomainName", + "SearchString" ], "documentation": "\n

A complex type that contains the health check configuration.

\n ", "required": true @@ -574,13 +596,13 @@ "documentation": "\n

Some value specified in the request is invalid or the XML document is malformed.

\n " } ], - "documentation": "\n

This action creates a new health check.

\n

To create a new health check, send a POST request to the 2012-12-12/healthcheck resource. The request body must include an XML document with a CreateHealthCheckRequest element. The response returns the CreateHealthCheckResponse element that contains metadata about the health check.

\n " + "documentation": "\n

This action creates a new health check.

\n

To create a new health check, send a POST request to the 2013-04-01/healthcheck resource. The request body must include an XML document with a CreateHealthCheckRequest element. The response returns the CreateHealthCheckResponse element that contains metadata about the health check.

\n " }, "CreateHostedZone": { "name": "CreateHostedZone", "http": { "method": "POST", - "uri": "/2012-12-12/hostedzone", + "uri": "/2013-04-01/hostedzone", "response_code": 201 }, "input": { @@ -836,13 +858,13 @@ "documentation": "\n

Route 53 allows some duplicate domain names, but there is a maximum number of duplicate names. This error indicates that you have reached that maximum. If you want to create another hosted zone with the same name and Route 53 generates this error, you can request an increase to the limit on the Contact Us page.

\n " } ], - "documentation": "\n

This action creates a new hosted zone.

\n

To create a new hosted zone, send a POST request to the 2012-12-12/hostedzone resource. The request body must include an XML document with a CreateHostedZoneRequest element. The response returns the CreateHostedZoneResponse element that contains metadata about the hosted zone.

\n

Route 53 automatically creates a default SOA record and four NS records for the zone. The NS records in the hosted zone are the name servers you give your registrar to delegate your domain to. For more information about SOA and NS records, see NS and SOA Records that Route 53 Creates for a Hosted Zone in the Amazon Route 53 Developer Guide.

\n

When you create a zone, its initial status is PENDING. This means that it is not yet available on all DNS servers. The status of the zone changes to INSYNC when the NS and SOA records are available on all Route 53 DNS servers.

\n " + "documentation": "\n

This action creates a new hosted zone.

\n

To create a new hosted zone, send a POST request to the 2013-04-01/hostedzone resource. The request body must include an XML document with a CreateHostedZoneRequest element. The response returns the CreateHostedZoneResponse element that contains metadata about the hosted zone.

\n

Route 53 automatically creates a default SOA record and four NS records for the zone. The NS records in the hosted zone are the name servers you give your registrar to delegate your domain to. For more information about SOA and NS records, see NS and SOA Records that Route 53 Creates for a Hosted Zone in the Amazon Route 53 Developer Guide.

\n

When you create a zone, its initial status is PENDING. This means that it is not yet available on all DNS servers. The status of the zone changes to INSYNC when the NS and SOA records are available on all Route 53 DNS servers.

\n " }, "DeleteHealthCheck": { "name": "DeleteHealthCheck", "http": { "method": "DELETE", - "uri": "/2012-12-12/healthcheck/{HealthCheckId}" + "uri": "/2013-04-01/healthcheck/{HealthCheckId}" }, "input": { "shape_name": "DeleteHealthCheckRequest", @@ -907,13 +929,13 @@ "documentation": "\n

Some value specified in the request is invalid or the XML document is malformed.

\n " } ], - "documentation": "\n

This action deletes a health check. To delete a health check, send a DELETE request to the 2012-12-12/healthcheck/health check ID resource.

\n You can delete a health check only if there are no resource record sets associated with this health check. If resource record sets are associated with this health check, you must disassociate them before you can delete your health check. If you try to delete a health check that is associated with resource record sets, Route 53 will deny your request with a HealthCheckInUse error. For information about disassociating the records from your health check, see ChangeResourceRecordSets.\n " + "documentation": "\n

This action deletes a health check. To delete a health check, send a DELETE request to the 2013-04-01/healthcheck/health check ID resource.

\n You can delete a health check only if there are no resource record sets associated with this health check. If resource record sets are associated with this health check, you must disassociate them before you can delete your health check. If you try to delete a health check that is associated with resource record sets, Route 53 will deny your request with a HealthCheckInUse error. For information about disassociating the records from your health check, see ChangeResourceRecordSets.\n " }, "DeleteHostedZone": { "name": "DeleteHostedZone", "http": { "method": "DELETE", - "uri": "/2012-12-12/hostedzone/{Id}" + "uri": "/2013-04-01/hostedzone/{Id}" }, "input": { "shape_name": "DeleteHostedZoneRequest", @@ -1036,13 +1058,13 @@ "documentation": "\n

Some value specified in the request is invalid or the XML document is malformed.

\n " } ], - "documentation": "\n

This action deletes a hosted zone. To delete a hosted zone, send a DELETE request to the 2012-12-12/hostedzone/hosted zone ID resource.

\n

For more information about deleting a hosted zone, see Deleting a Hosted Zone in the Amazon Route 53 Developer Guide.

\n You can delete a hosted zone only if there are no resource record sets other than the default SOA record and NS resource record sets. If your hosted zone contains other resource record sets, you must delete them before you can delete your hosted zone. If you try to delete a hosted zone that contains other resource record sets, Route 53 will deny your request with a HostedZoneNotEmpty error. For information about deleting records from your hosted zone, see ChangeResourceRecordSets.\n " + "documentation": "\n

This action deletes a hosted zone. To delete a hosted zone, send a DELETE request to the 2013-04-01/hostedzone/hosted zone ID resource.

\n

For more information about deleting a hosted zone, see Deleting a Hosted Zone in the Amazon Route 53 Developer Guide.

\n You can delete a hosted zone only if there are no resource record sets other than the default SOA record and NS resource record sets. If your hosted zone contains other resource record sets, you must delete them before you can delete your hosted zone. If you try to delete a hosted zone that contains other resource record sets, Route 53 will deny your request with a HostedZoneNotEmpty error. For information about deleting records from your hosted zone, see ChangeResourceRecordSets.\n " }, "GetChange": { "name": "GetChange", "http": { "method": "GET", - "uri": "/2012-12-12/change/{Id}" + "uri": "/2013-04-01/change/{Id}" }, "input": { "shape_name": "GetChangeRequest", @@ -1147,7 +1169,7 @@ "name": "GetHealthCheck", "http": { "method": "GET", - "uri": "/2012-12-12/healthcheck/{HealthCheckId}" + "uri": "/2013-04-01/healthcheck/{HealthCheckId}" }, "input": { "shape_name": "GetHealthCheckRequest", @@ -1207,29 +1229,38 @@ "type": "integer", "min_length": 1, "max_length": 65535, - "documentation": "\n

Port on which connection will be opened to the instance to health check. For HTTP this defaults to 80 if the port is not specified.

\n " + "documentation": "\n

Port on which connection will be opened to the instance to health check. For HTTP and HTTP_STR_MATCH this defaults to 80 if the port is not specified. For HTTPS and HTTPS_STR_MATCH this defaults to 443 if the port is not specified.

\n " }, "Type": { "shape_name": "HealthCheckType", "type": "string", "enum": [ "HTTP", + "HTTPS", + "HTTP_STR_MATCH", + "HTTPS_STR_MATCH", "TCP" ], - "documentation": "\n

The type of health check to be performed. Currently supported protocols are TCP and HTTP.

\n ", + "documentation": "\n

The type of health check to be performed. Currently supported types are TCP, HTTP, HTTPS, HTTP_STR_MATCH, and HTTPS_STR_MATCH.

\n ", "required": true }, "ResourcePath": { "shape_name": "ResourcePath", "type": "string", "max_length": 255, - "documentation": "\n

Path to ping on the instance to check the health. Required only for HTTP health checks, HTTP request is issued to the instance on the given port and path.

\n " + "documentation": "\n

Path to ping on the instance to check the health. Required for HTTP, HTTPS, HTTP_STR_MATCH, and HTTPS_STR_MATCH health checks, HTTP request is issued to the instance on the given port and path.

\n " }, "FullyQualifiedDomainName": { "shape_name": "FullyQualifiedDomainName", "type": "string", "max_length": 255, "documentation": "\n

Fully qualified domain name of the instance to be health checked.

\n " + }, + "SearchString": { + "shape_name": "SearchString", + "type": "string", + "max_length": 255, + "documentation": "\n

A string to search for in the body of a health check response. Required for HTTP_STR_MATCH and HTTPS_STR_MATCH health checks.

\n " } }, "member_order": [ @@ -1237,7 +1268,8 @@ "Port", "Type", "ResourcePath", - "FullyQualifiedDomainName" + "FullyQualifiedDomainName", + "SearchString" ], "documentation": "\n

A complex type that contains the health check configuration.

\n ", "required": true @@ -1281,15 +1313,27 @@ } }, "documentation": "\n

Some value specified in the request is invalid or the XML document is malformed.

\n " + }, + { + "shape_name": "IncompatibleVersion", + "type": "structure", + "members": { + "message": { + "shape_name": "ErrorMessage", + "type": "string", + "documentation": null + } + }, + "documentation": "\n

The resource you are trying to access is unsupported on this Route 53 endpoint. Please consider using a newer endpoint or a tool that does so.

\n " } ], - "documentation": "\n

To retrieve the health check, send a GET request to the 2012-12-12/healthcheck/health check ID resource.

\n " + "documentation": "\n

To retrieve the health check, send a GET request to the 2013-04-01/healthcheck/health check ID resource.

\n " }, "GetHostedZone": { "name": "GetHostedZone", "http": { "method": "GET", - "uri": "/2012-12-12/hostedzone/{Id}" + "uri": "/2013-04-01/hostedzone/{Id}" }, "input": { "shape_name": "GetHostedZoneRequest", @@ -1429,13 +1473,13 @@ "documentation": "\n

Some value specified in the request is invalid or the XML document is malformed.

\n " } ], - "documentation": "\n

To retrieve the delegation set for a hosted zone, send a GET request to the 2012-12-12/hostedzone/hosted zone ID resource. The delegation set is the four Route 53 name servers that were assigned to the hosted zone when you created it.

\n " + "documentation": "\n

To retrieve the delegation set for a hosted zone, send a GET request to the 2013-04-01/hostedzone/hosted zone ID resource. The delegation set is the four Route 53 name servers that were assigned to the hosted zone when you created it.

\n " }, "ListHealthChecks": { "name": "ListHealthChecks", "http": { "method": "GET", - "uri": "/2012-12-12/healthcheck?marker={Marker}&maxitems={MaxItems}" + "uri": "/2013-04-01/healthcheck?marker={Marker}&maxitems={MaxItems}" }, "input": { "shape_name": "ListHealthChecksRequest", @@ -1459,7 +1503,7 @@ "Marker", "MaxItems" ], - "documentation": "\n

To retrieve a list of your health checks, send a GET request to the 2012-12-12/healthcheck resource. The response to this request includes a HealthChecks element with zero or more HealthCheck child elements. By default, the list of health checks is displayed on a single page. You can control the length of the page that is displayed by using the MaxItems parameter. You can use the Marker parameter to control the health check that the list begins with.

\n Route 53 returns a maximum of 100 items. If you set MaxItems to a value greater than 100, Route 53 returns only the first 100.\n " + "documentation": "\n

To retrieve a list of your health checks, send a GET request to the 2013-04-01/healthcheck resource. The response to this request includes a HealthChecks element with zero or more HealthCheck child elements. By default, the list of health checks is displayed on a single page. You can control the length of the page that is displayed by using the MaxItems parameter. You can use the Marker parameter to control the health check that the list begins with.

\n Route 53 returns a maximum of 100 items. If you set MaxItems to a value greater than 100, Route 53 returns only the first 100.\n " }, "output": { "shape_name": "ListHealthChecksResponse", @@ -1504,29 +1548,38 @@ "type": "integer", "min_length": 1, "max_length": 65535, - "documentation": "\n

Port on which connection will be opened to the instance to health check. For HTTP this defaults to 80 if the port is not specified.

\n " + "documentation": "\n

Port on which connection will be opened to the instance to health check. For HTTP and HTTP_STR_MATCH this defaults to 80 if the port is not specified. For HTTPS and HTTPS_STR_MATCH this defaults to 443 if the port is not specified.

\n " }, "Type": { "shape_name": "HealthCheckType", "type": "string", "enum": [ "HTTP", + "HTTPS", + "HTTP_STR_MATCH", + "HTTPS_STR_MATCH", "TCP" ], - "documentation": "\n

The type of health check to be performed. Currently supported protocols are TCP and HTTP.

\n ", + "documentation": "\n

The type of health check to be performed. Currently supported types are TCP, HTTP, HTTPS, HTTP_STR_MATCH, and HTTPS_STR_MATCH.

\n ", "required": true }, "ResourcePath": { "shape_name": "ResourcePath", "type": "string", "max_length": 255, - "documentation": "\n

Path to ping on the instance to check the health. Required only for HTTP health checks, HTTP request is issued to the instance on the given port and path.

\n " + "documentation": "\n

Path to ping on the instance to check the health. Required for HTTP, HTTPS, HTTP_STR_MATCH, and HTTPS_STR_MATCH health checks, HTTP request is issued to the instance on the given port and path.

\n " }, "FullyQualifiedDomainName": { "shape_name": "FullyQualifiedDomainName", "type": "string", "max_length": 255, "documentation": "\n

Fully qualified domain name of the instance to be health checked.

\n " + }, + "SearchString": { + "shape_name": "SearchString", + "type": "string", + "max_length": 255, + "documentation": "\n

A string to search for in the body of a health check response. Required for HTTP_STR_MATCH and HTTPS_STR_MATCH health checks.

\n " } }, "member_order": [ @@ -1534,7 +1587,8 @@ "Port", "Type", "ResourcePath", - "FullyQualifiedDomainName" + "FullyQualifiedDomainName", + "SearchString" ], "documentation": "\n

A complex type that contains the health check configuration.

\n ", "required": true @@ -1598,15 +1652,27 @@ } }, "documentation": "\n

Some value specified in the request is invalid or the XML document is malformed.

\n " + }, + { + "shape_name": "IncompatibleVersion", + "type": "structure", + "members": { + "message": { + "shape_name": "ErrorMessage", + "type": "string", + "documentation": null + } + }, + "documentation": "\n

The resource you are trying to access is unsupported on this Route 53 endpoint. Please consider using a newer endpoint or a tool that does so.

\n " } ], - "documentation": "\n

To retrieve a list of your health checks, send a GET request to the 2012-12-12/healthcheck resource. The response to this request includes a HealthChecks element with zero, one, or multiple HealthCheck child elements. By default, the list of health checks is displayed on a single page. You can control the length of the page that is displayed by using the MaxItems parameter. You can use the Marker parameter to control the health check that the list begins with.

\n Amazon Route 53 returns a maximum of 100 items. If you set MaxItems to a value greater than 100, Amazon Route 53 returns only the first 100.\n " + "documentation": "\n

To retrieve a list of your health checks, send a GET request to the 2013-04-01/healthcheck resource. The response to this request includes a HealthChecks element with zero, one, or multiple HealthCheck child elements. By default, the list of health checks is displayed on a single page. You can control the length of the page that is displayed by using the MaxItems parameter. You can use the Marker parameter to control the health check that the list begins with.

\n Amazon Route 53 returns a maximum of 100 items. If you set MaxItems to a value greater than 100, Amazon Route 53 returns only the first 100.\n " }, "ListHostedZones": { "name": "ListHostedZones", "http": { "method": "GET", - "uri": "/2012-12-12/hostedzone?marker={Marker}&maxitems={MaxItems}" + "uri": "/2013-04-01/hostedzone?marker={Marker}&maxitems={MaxItems}" }, "input": { "shape_name": "ListHostedZonesRequest", @@ -1630,7 +1696,7 @@ "Marker", "MaxItems" ], - "documentation": "\n

To retrieve a list of your hosted zones, send a GET request to the 2012-12-12/hostedzone resource. The response to this request includes a HostedZones element with zero or more HostedZone child elements. By default, the list of hosted zones is displayed on a single page. You can control the length of the page that is displayed by using the MaxItems parameter. You can use the Marker parameter to control the hosted zone that the list begins with. For more information about listing hosted zones, see Listing the Hosted Zones for an AWS Account in the Amazon Route 53 Developer Guide.

\n Route 53 returns a maximum of 100 items. If you set MaxItems to a value greater than 100, Route 53 returns only the first 100.\n " + "documentation": "\n

To retrieve a list of your hosted zones, send a GET request to the 2013-04-01/hostedzone resource. The response to this request includes a HostedZones element with zero or more HostedZone child elements. By default, the list of hosted zones is displayed on a single page. You can control the length of the page that is displayed by using the MaxItems parameter. You can use the Marker parameter to control the hosted zone that the list begins with. For more information about listing hosted zones, see Listing the Hosted Zones for an AWS Account in the Amazon Route 53 Developer Guide.

\n Route 53 returns a maximum of 100 items. If you set MaxItems to a value greater than 100, Route 53 returns only the first 100.\n " }, "output": { "shape_name": "ListHostedZonesResponse", @@ -1749,13 +1815,13 @@ "documentation": "\n

Some value specified in the request is invalid or the XML document is malformed.

\n " } ], - "documentation": "\n

To retrieve a list of your hosted zones, send a GET request to the 2012-12-12/hostedzone resource. The response to this request includes a HostedZones element with zero, one, or multiple HostedZone child elements. By default, the list of hosted zones is displayed on a single page. You can control the length of the page that is displayed by using the MaxItems parameter. You can use the Marker parameter to control the hosted zone that the list begins with.

\n Amazon Route 53 returns a maximum of 100 items. If you set MaxItems to a value greater than 100, Amazon Route 53 returns only the first 100.\n " + "documentation": "\n

To retrieve a list of your hosted zones, send a GET request to the 2013-04-01/hostedzone resource. The response to this request includes a HostedZones element with zero, one, or multiple HostedZone child elements. By default, the list of hosted zones is displayed on a single page. You can control the length of the page that is displayed by using the MaxItems parameter. You can use the Marker parameter to control the hosted zone that the list begins with.

\n Amazon Route 53 returns a maximum of 100 items. If you set MaxItems to a value greater than 100, Amazon Route 53 returns only the first 100.\n " }, "ListResourceRecordSets": { "name": "ListResourceRecordSets", "http": { "method": "GET", - "uri": "/2012-12-12/hostedzone/{HostedZoneId}/rrset?type={StartRecordType}&name={StartRecordName}&identifier={StartRecordIdentifier}&maxitems={MaxItems}" + "uri": "/2013-04-01/hostedzone/{HostedZoneId}/rrset?type={StartRecordType}&name={StartRecordName}&identifier={StartRecordIdentifier}&maxitems={MaxItems}" }, "input": { "shape_name": "ListResourceRecordSetsRequest", @@ -1881,7 +1947,8 @@ "ap-southeast-1", "ap-southeast-2", "ap-northeast-1", - "sa-east-1" + "sa-east-1", + "cn-north-1" ], "documentation": "\n

Regional resource record sets only: Among resource record sets that have the same combination of DNS name and type, a value that specifies the AWS region for the current resource record set.

\n " }, @@ -2064,4 +2131,4 @@ "documentation": "\n

Imagine all the resource record sets in a zone listed out in front of you.\n Imagine them sorted lexicographically first by DNS name (with the labels\n reversed, like \"com.amazon.www\" for example), and secondarily,\n lexicographically by record type. This operation retrieves at most MaxItems\n resource record sets from this list, in order, starting at a position\n specified by the Name and Type arguments:

\n \n

Use ListResourceRecordSets to retrieve a single known record set by\n specifying the record set's name and type, and setting MaxItems = 1

\n

To retrieve all the records in a HostedZone, first pause any processes\n making calls to ChangeResourceRecordSets. Initially call ListResourceRecordSets\n without a Name and Type to get the first page of record sets. For subsequent\n calls, set Name and Type to the NextName and NextType values returned by the\n previous response.\n

\n

In the presence of concurrent ChangeResourceRecordSets calls, there is no\n consistency of results across calls to ListResourceRecordSets. The only way\n to get a consistent multi-page snapshot of all RRSETs in a zone is to stop\n making changes while pagination is in progress.

\n

However, the results from ListResourceRecordSets are consistent within a\n page. If MakeChange calls are taking place concurrently, the result of each\n one will either be completely visible in your results or not at all. You will\n not see partial changes, or changes that do not ultimately succeed. (This\n follows from the fact that MakeChange is atomic)\n

\n

The results from ListResourceRecordSets are strongly consistent with\n ChangeResourceRecordSets. To be precise, if a single process makes a call to\n ChangeResourceRecordSets and receives a successful response, the effects of that\n change will be visible in a subsequent call to ListResourceRecordSets by\n that process.

\n " } } -} \ No newline at end of file +} diff --git a/tests/unit/test_route53_operations.py b/tests/unit/test_route53_operations.py index 7883d78070..ace91c43e7 100644 --- a/tests/unit/test_route53_operations.py +++ b/tests/unit/test_route53_operations.py @@ -17,10 +17,10 @@ import botocore.session -CREATE_HOSTED_ZONE_PAYLOAD="""foobar.comfoobarblahblahblah""" -CREATE_RRSET_PAYLOAD="""Adding TXT recordCREATEmidocs.comTXT600"v=foobar"""" -DELETE_RRSET_PAYLOAD="""Adding TXT recordDELETEmidocs.comTXT600"v=foobar"""" -CREATE_HEALTH_CHECK_PAYLOAD="""foobar192.168.10.08888HTTPfoo/barfoobar.com""" +CREATE_HOSTED_ZONE_PAYLOAD="""foobar.comfoobarblahblahblah""" +CREATE_RRSET_PAYLOAD="""Adding TXT recordCREATEmidocs.comTXT600"v=foobar"""" +DELETE_RRSET_PAYLOAD="""Adding TXT recordDELETEmidocs.comTXT600"v=foobar"""" +CREATE_HEALTH_CHECK_PAYLOAD="""foobar192.168.10.08888HTTPfoo/barfoobar.com""" class TestRoute53Operations(BaseEnvVar):