Skip to content

Commit

Permalink
Merge branch 'release-1.4.62' into develop
Browse files Browse the repository at this point in the history 
* release-1.4.62:
  Bumping version to 1.4.62
  Update to latest models
  • Loading branch information
AWS committed Oct 13, 2016
2 parents 772bfe4 + 30f9903 commit 8f38e97
Show file tree
Hide file tree
Showing 7 changed files with 876 additions and 1,530 deletions.
17 changes: 17 additions & 0 deletions .changes/1.4.62.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
[
{
"category": "``elasticbeanstalk``",
"description": "Update elasticbeanstalk client to latest version",
"type": "feature"
},
{
"category": "``acm``",
"description": "Update acm client to latest version",
"type": "feature"
},
{
"category": "``gamelift``",
"description": "Update gamelift client to latest version",
"type": "feature"
}
]
8 changes: 8 additions & 0 deletions CHANGELOG.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@
CHANGELOG
=========

1.4.62
======

* feature:``elasticbeanstalk``: Update elasticbeanstalk client to latest version
* feature:``acm``: Update acm client to latest version
* feature:``gamelift``: Update gamelift client to latest version


1.4.61
======

Expand Down
2 changes: 1 addition & 1 deletion botocore/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import re
import logging

__version__ = '1.4.61'
__version__ = '1.4.62'


class NullHandler(logging.Handler):
Expand Down
110 changes: 95 additions & 15 deletions botocore/data/acm/2015-12-08/service-2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,20 @@
],
"documentation":"<p>Retrieves an ACM Certificate and certificate chain for the certificate specified by an ARN. The chain is an ordered list of certificates that contains the root certificate, intermediate certificates of subordinate CAs, and the ACM Certificate. The certificate and certificate chain are base64 encoded. If you want to decode the certificate chain to see the individual certificate fields, you can use OpenSSL.</p> <note> <p>Currently, ACM Certificates can be used only with Elastic Load Balancing and Amazon CloudFront.</p> </note>"
},
"ImportCertificate":{
"name":"ImportCertificate",
"http":{
"method":"POST",
"requestUri":"/"
},
"input":{"shape":"ImportCertificateRequest"},
"output":{"shape":"ImportCertificateResponse"},
"errors":[
{"shape":"ResourceNotFoundException"},
{"shape":"LimitExceededException"}
],
"documentation":"<p>Imports an SSL/TLS certificate into AWS Certificate Manager (ACM) to use with <a href=\"http://docs.aws.amazon.com/acm/latest/userguide/acm-services.html\">ACM's integrated AWS services</a>.</p> <note> <p>ACM does not provide <a href=\"http://docs.aws.amazon.com/acm/latest/userguide/acm-renewal.html\">managed renewal</a> for certificates that you import.</p> </note> <p>For more information about importing certificates into ACM, including the differences between certificates that you import and those that ACM provides, see <a href=\"http://docs.aws.amazon.com/acm/latest/userguide/import-certificate.html\">Importing Certificates</a> in the <i>AWS Certificate Manager User Guide</i>.</p> <p>To import a certificate, you must provide the certificate and the matching private key. When the certificate is not self-signed, you must also provide a certificate chain. You can omit the certificate chain when importing a self-signed certificate.</p> <p>The certificate, private key, and certificate chain must be PEM-encoded. For more information about converting these items to PEM format, see <a href=\"http://docs.aws.amazon.com/acm/latest/userguide/import-certificate.html#import-certificate-troubleshooting\">Importing Certificates Troubleshooting</a> in the <i>AWS Certificate Manager User Guide</i>.</p> <p>To import a new certificate, omit the <code>CertificateArn</code> field. Include this field only when you want to replace a previously imported certificate.</p> <p>This operation returns the <a href=\"http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Amazon Resource Name (ARN)</a> of the imported certificate.</p>"
},
"ListCertificates":{
"name":"ListCertificates",
"http":{
Expand Down Expand Up @@ -119,7 +133,7 @@
{"shape":"LimitExceededException"},
{"shape":"InvalidDomainValidationOptionsException"}
],
"documentation":"<p>Requests an ACM Certificate for use with other AWS services. To request an ACM Certificate, you must specify the fully qualified domain name (FQDN) for your site. You can also specify additional FQDNs if users can reach your site by using other names. For each domain name you specify, email is sent to the domain owner to request approval to issue the certificate. After receiving approval from the domain owner, the ACM Certificate is issued. For more information, see the <a href=\"http://docs.aws.amazon.com/acm/latest/userguide/overview.html\">AWS Certificate Manager User Guide </a>.</p>"
"documentation":"<p>Requests an ACM Certificate for use with other AWS services. To request an ACM Certificate, you must specify the fully qualified domain name (FQDN) for your site. You can also specify additional FQDNs if users can reach your site by using other names. For each domain name you specify, email is sent to the domain owner to request approval to issue the certificate. After receiving approval from the domain owner, the ACM Certificate is issued. For more information, see the <a href=\"http://docs.aws.amazon.com/acm/latest/userguide/\">AWS Certificate Manager User Guide</a>.</p>"
},
"ResendValidationEmail":{
"name":"ResendValidationEmail",
Expand Down Expand Up @@ -163,54 +177,68 @@
},
"CertificateBody":{
"type":"string",
"max":524288,
"max":32768,
"min":1,
"pattern":"-{5}BEGIN CERTIFICATE-{5}\\u000D?\\u000A([A-Za-z0-9/+]{64}\\u000D?\\u000A)*[A-Za-z0-9/+]{1,64}={0,2}\\u000D?\\u000A-{5}END CERTIFICATE-{5}(\\u000D?\\u000A)?"
},
"CertificateBodyBlob":{
"type":"blob",
"max":32768,
"min":1
},
"CertificateChain":{
"type":"string",
"max":2097152,
"min":1,
"pattern":"(-{5}BEGIN CERTIFICATE-{5}\\u000D?\\u000A([A-Za-z0-9/+]{64}\\u000D?\\u000A)*[A-Za-z0-9/+]{1,64}={0,2}\\u000D?\\u000A-{5}END CERTIFICATE-{5}\\u000D?\\u000A)*-{5}BEGIN CERTIFICATE-{5}\\u000D?\\u000A([A-Za-z0-9/+]{64}\\u000D?\\u000A)*[A-Za-z0-9/+]{1,64}={0,2}\\u000D?\\u000A-{5}END CERTIFICATE-{5}(\\u000D?\\u000A)?"
},
"CertificateChainBlob":{
"type":"blob",
"max":2097152,
"min":1
},
"CertificateDetail":{
"type":"structure",
"members":{
"CertificateArn":{
"shape":"Arn",
"documentation":"<p>The Amazon Resource Name (ARN) of the certificate. For more information about ARNs, see <a href=\"http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Amazon Resource Names (ARNs) and AWS Service Namespaces</a>.</p>"
"documentation":"<p>The Amazon Resource Name (ARN) of the certificate. For more information about ARNs, see <a href=\"http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Amazon Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General Reference</i>.</p>"
},
"DomainName":{
"shape":"DomainNameString",
"documentation":"<p>The fully qualified domain name (FQDN) for the certificate, such as www.example.com or example.com.</p>"
"documentation":"<p>The fully qualified domain name for the certificate, such as www.example.com or example.com.</p>"
},
"SubjectAlternativeNames":{
"shape":"DomainList",
"documentation":"<p>One or more domain names (subject alternative names) included in the certificate request. After the certificate is issued, this list includes the domain names bound to the public key contained in the certificate. The subject alternative names include the canonical domain name (CN) of the certificate and additional domain names that can be used to connect to the website.</p>"
"documentation":"<p>One or more domain names (subject alternative names) included in the certificate. This list contains the domain names that are bound to the public key that is contained in the certificate. The subject alternative names include the canonical domain name (CN) of the certificate and additional domain names that can be used to connect to the website.</p>"
},
"DomainValidationOptions":{
"shape":"DomainValidationList",
"documentation":"<p>Contains information about the email address or addresses used for domain validation.</p>"
"documentation":"<p>Contains information about the email address or addresses used for domain validation. This field exists only when the certificate type is <code>AMAZON_ISSUED</code>.</p>"
},
"Serial":{
"shape":"String",
"documentation":"<p>The serial number of the certificate.</p>"
},
"Subject":{
"shape":"String",
"documentation":"<p>The X.500 distinguished name of the entity associated with the public key contained in the certificate.</p>"
"documentation":"<p>The name of the entity that is associated with the public key contained in the certificate.</p>"
},
"Issuer":{
"shape":"String",
"documentation":"<p>The X.500 distinguished name of the CA that issued and signed the certificate.</p>"
"documentation":"<p>The name of the certificate authority that issued and signed the certificate.</p>"
},
"CreatedAt":{
"shape":"TStamp",
"documentation":"<p>The time at which the certificate was requested.</p>"
"documentation":"<p>The time at which the certificate was requested. This value exists only when the certificate type is <code>AMAZON_ISSUED</code>.</p>"
},
"IssuedAt":{
"shape":"TStamp",
"documentation":"<p>The time at which the certificate was issued.</p>"
"documentation":"<p>The time at which the certificate was issued. This value exists only when the certificate type is <code>AMAZON_ISSUED</code>.</p>"
},
"ImportedAt":{
"shape":"TStamp",
"documentation":"<p>The date and time at which the certificate was imported. This value exists only when the certificate type is <code>IMPORTED</code>.</p>"
},
"Status":{
"shape":"CertificateStatus",
Expand All @@ -234,19 +262,23 @@
},
"KeyAlgorithm":{
"shape":"KeyAlgorithm",
"documentation":"<p>The algorithm used to generate the key pair (the public and private key). Currently the only supported value is <code>RSA_2048</code>.</p>"
"documentation":"<p>The algorithm that was used to generate the key pair (the public and private key).</p>"
},
"SignatureAlgorithm":{
"shape":"String",
"documentation":"<p>The algorithm used to generate a signature. Currently the only supported value is <code>SHA256WITHRSA</code>.</p>"
"documentation":"<p>The algorithm that was used to sign the certificate.</p>"
},
"InUseBy":{
"shape":"InUseList",
"documentation":"<p>A list of ARNs for the resources that are using the certificate. An ACM Certificate can be used by multiple AWS resources.</p>"
"documentation":"<p>A list of ARNs for the AWS resources that are using the certificate. A certificate can be used by multiple AWS resources.</p>"
},
"FailureReason":{
"shape":"FailureReason",
"documentation":"<p>The reason the certificate request failed. This value exists only when the structure's <code>Status</code> is <code>FAILED</code>. For more information, see <a href=\"http://docs.aws.amazon.com/acm/latest/userguide/troubleshooting.html#troubleshooting-failed\">Certificate Request Failed</a> in the <i>AWS Certificate Manager User Guide</i>.</p>"
"documentation":"<p>The reason the certificate request failed. This value exists only when the certificate status is <code>FAILED</code>. For more information, see <a href=\"http://docs.aws.amazon.com/acm/latest/userguide/troubleshooting.html#troubleshooting-failed\">Certificate Request Failed</a> in the <i>AWS Certificate Manager User Guide</i>.</p>"
},
"Type":{
"shape":"CertificateType",
"documentation":"<p>The source of the certificate. For certificates provided by ACM, this value is <code>AMAZON_ISSUED</code>. For certificates that you imported with <a>ImportCertificate</a>, this value is <code>IMPORTED</code>. ACM does not provide <a href=\"http://docs.aws.amazon.com/acm/latest/userguide/acm-renewal.html\">managed renewal</a> for imported certificates. For more information about the differences between certificates that you import and those that ACM provides, see <a href=\"http://docs.aws.amazon.com/acm/latest/userguide/import-certificate.html\">Importing Certificates</a> in the <i>AWS Certificate Manager User Guide</i>.</p>"
}
},
"documentation":"<p>Contains detailed metadata about an ACM Certificate. This structure is returned in the response to a <a>DescribeCertificate</a> request.</p>"
Expand Down Expand Up @@ -285,6 +317,13 @@
"type":"list",
"member":{"shape":"CertificateSummary"}
},
"CertificateType":{
"type":"string",
"enum":[
"IMPORTED",
"AMAZON_ISSUED"
]
},
"DeleteCertificateRequest":{
"type":"structure",
"required":["CertificateArn"],
Expand Down Expand Up @@ -414,6 +453,40 @@
"min":1,
"pattern":"\\w+"
},
"ImportCertificateRequest":{
"type":"structure",
"required":[
"Certificate",
"PrivateKey"
],
"members":{
"CertificateArn":{
"shape":"Arn",
"documentation":"<p>The <a href=\"http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Amazon Resource Name (ARN)</a> of an imported certificate to replace. To import a new certificate, omit this field.</p>"
},
"Certificate":{
"shape":"CertificateBodyBlob",
"documentation":"<p>The certificate to import. It must meet the following requirements:</p> <ul> <li> <p>Must be PEM-encoded.</p> </li> <li> <p>Must contain a 1024-bit or 2048-bit RSA public key.</p> </li> <li> <p>Must be valid at the time of import. You cannot import a certificate before its validity period begins (the certificate's <code>NotBefore</code> date) or after it expires (the certificate's <code>NotAfter</code> date).</p> </li> </ul>"
},
"PrivateKey":{
"shape":"PrivateKeyBlob",
"documentation":"<p>The private key that matches the public key in the certificate. It must meet the following requirements:</p> <ul> <li> <p>Must be PEM-encoded.</p> </li> <li> <p>Must be unencrypted. You cannot import a private key that is protected by a password or passphrase.</p> </li> </ul>"
},
"CertificateChain":{
"shape":"CertificateChainBlob",
"documentation":"<p>The certificate chain. It must be PEM-encoded.</p>"
}
}
},
"ImportCertificateResponse":{
"type":"structure",
"members":{
"CertificateArn":{
"shape":"Arn",
"documentation":"<p>The <a href=\"http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Amazon Resource Name (ARN)</a> of the imported certificate.</p>"
}
}
},
"InUseList":{
"type":"list",
"member":{"shape":"String"}
Expand Down Expand Up @@ -454,6 +527,7 @@
"type":"string",
"enum":[
"RSA_2048",
"RSA_1024",
"EC_prime256v1"
]
},
Expand Down Expand Up @@ -525,6 +599,12 @@
"min":1,
"pattern":"[\\u0009\\u000A\\u000D\\u0020-\\u00FF]*"
},
"PrivateKeyBlob":{
"type":"blob",
"max":524288,
"min":1,
"sensitive":true
},
"RemoveTagsFromCertificateRequest":{
"type":"structure",
"required":[
Expand Down Expand Up @@ -682,5 +762,5 @@
"member":{"shape":"String"}
}
},
"documentation":"<fullname>AWS Certificate Manager</fullname> <p>Welcome to the AWS Certificate Manager (ACM) Command Reference. This guide provides descriptions, syntax, and usage examples for each ACM command. You can use AWS Certificate Manager to request ACM Certificates for your AWS-based websites and applications. For general information about using ACM and for more information about using the console, see the <a href=\"http://docs.aws.amazon.com/acm/latest/userguide/acm-overview.html\">AWS Certificate Manager User Guide</a>. For more information about using the ACM API, see the <a href=\"http://docs.aws.amazon.com/acm/latest/APIReference/Welcome.html\">AWS Certificate Manager API Reference</a>.</p>"
"documentation":"<fullname>AWS Certificate Manager</fullname> <p>Welcome to the AWS Certificate Manager (ACM) API documentation.</p> <p>You can use ACM to manage SSL/TLS certificates for your AWS-based websites and applications. For general information about using ACM, see the <a href=\"http://docs.aws.amazon.com/acm/latest/userguide/\"> <i>AWS Certificate Manager User Guide</i> </a>.</p>"
}
Loading

0 comments on commit 8f38e97

Please sign in to comment.