Skip to content

Commit

Permalink
Merge branch 'release-1.7.40'
Browse files Browse the repository at this point in the history
* release-1.7.40:
  Bumping version to 1.7.40
  Add endpoint mapping for pricing service
  Update to latest endpoints
  Update to latest models
  • Loading branch information
awstools committed Nov 7, 2017
2 parents cdb4dd1 + 7c62e34 commit 58dcf5a
Show file tree
Hide file tree
Showing 12 changed files with 557 additions and 145 deletions.
27 changes: 27 additions & 0 deletions .changes/1.7.40.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
[
{
"category": "``stepfunctions``",
"description": "Update stepfunctions client to latest version",
"type": "api-change"
},
{
"category": "``ec2``",
"description": "Update ec2 client to latest version",
"type": "api-change"
},
{
"category": "``kms``",
"description": "Update kms client to latest version",
"type": "api-change"
},
{
"category": "``organizations``",
"description": "Update organizations client to latest version",
"type": "api-change"
},
{
"category": "``pricing``",
"description": "Update pricing client to latest version",
"type": "api-change"
}
]
10 changes: 10 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@
CHANGELOG
=========

1.7.40
======

* api-change:``stepfunctions``: Update stepfunctions client to latest version
* api-change:``ec2``: Update ec2 client to latest version
* api-change:``kms``: Update kms client to latest version
* api-change:``organizations``: Update organizations client to latest version
* api-change:``pricing``: Update pricing client to latest version


1.7.39
======

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

__version__ = '1.7.39'
__version__ = '1.7.40'


class NullHandler(logging.Handler):
Expand Down
6 changes: 6 additions & 0 deletions botocore/data/ec2/2016-11-15/service-2.json
Original file line number Diff line number Diff line change
Expand Up @@ -12604,6 +12604,12 @@
"c4.2xlarge",
"c4.4xlarge",
"c4.8xlarge",
"c5.large",
"c5.xlarge",
"c5.2xlarge",
"c5.4xlarge",
"c5.9xlarge",
"c5.18xlarge",
"cc1.4xlarge",
"cc2.8xlarge",
"g2.2xlarge",
Expand Down
10 changes: 10 additions & 0 deletions botocore/data/endpoints.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,16 @@
"us-west-2" : { }
}
},
"api.pricing" : {
"defaults" : {
"credentialScope" : {
"service" : "pricing"
}
},
"endpoints" : {
"us-east-1" : { }
}
},
"apigateway" : {
"endpoints" : {
"ap-northeast-1" : { },
Expand Down
172 changes: 87 additions & 85 deletions botocore/data/kms/2014-11-01/service-2.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions botocore/data/organizations/2016-11-28/service-2.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
{"shape":"ServiceException"},
{"shape":"TooManyRequestsException"}
],
"documentation":"<p>Creates an AWS account that is automatically a member of the organization whose credentials made the request. This is an asynchronous request that AWS performs in the background. If you want to check the status of the request later, you need the <code>OperationId</code> response element from this operation to provide as a parameter to the <a>DescribeCreateAccountStatus</a> operation.</p> <p>The user who calls the API for an invitation to join must have the <code>organizations:CreateAccount</code> permission. If you enabled all features in the organization, then the user must also have the <code>iam:CreateServiceLinkedRole</code> permission so that Organizations can create the required service-linked role named <i>OrgsServiceLinkedRoleName</i>. For more information, see <a href=\"http://docs.aws.amazon.com/organizations/latest/userguide/orgs_integration_services.html#orgs_integration_service-linked-roles\">AWS Organizations and Service-Linked Roles</a> in the <i>AWS Organizations User Guide</i>.</p> <p>The user in the master account who calls this API must also have the <code>iam:CreateRole</code> permission because AWS Organizations preconfigures the new member account with a role (named <code>OrganizationAccountAccessRole</code> by default) that grants users in the master account administrator permissions in the new member account. Principals in the master account can assume the role. AWS Organizations clones the company name and address information for the new account from the organization's master account.</p> <p/> <p>For more information about creating accounts, see <a href=\"http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_create.html\">Creating an AWS Account in Your Organization</a> in the <i>AWS Organizations User Guide</i>.</p> <important> <p>When you create an account in an organization using the AWS Organizations console, API, or CLI commands, the information required for the account to operate as a standalone account, such as a payment method and signing the End User Licence Agreement (EULA) is <i>not</i> automatically collected. If you must remove an account from your organization later, you can do so only after you provide the missing information. Follow the steps at <a href=\"http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info\"> To leave an organization when all required account information has not yet been provided</a> in the <i>AWS Organizations User Guide</i>.</p> </important> <note> <p>When you create a member account with this operation, you can choose whether to create the account with the <b>IAM User and Role Access to Billing Information</b> switch enabled. If you enable it, IAM users and roles that have appropriate permissions can view billing information for the account. If you disable this, then only the account root user can access billing information. For information about how to disable this for an account, see <a href=\"http://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/grantaccess.html\">Granting Access to Your Billing Information and Tools</a>.</p> </note> <p>This operation can be called only from the organization's master account.</p> <important> <p>If you get an exception that indicates that you exceeded your account limits for the organization or that you can\"t add an account because your organization is still initializing, please contact <a href=\"https://console.aws.amazon.com/support/home#/\"> AWS Customer Support</a>.</p> </important>"
"documentation":"<p>Creates an AWS account that is automatically a member of the organization whose credentials made the request. This is an asynchronous request that AWS performs in the background. If you want to check the status of the request later, you need the <code>OperationId</code> response element from this operation to provide as a parameter to the <a>DescribeCreateAccountStatus</a> operation.</p> <p>The user who calls the API for an invitation to join must have the <code>organizations:CreateAccount</code> permission. If you enabled all features in the organization, then the user must also have the <code>iam:CreateServiceLinkedRole</code> permission so that Organizations can create the required service-linked role named <i>OrgsServiceLinkedRoleName</i>. For more information, see <a href=\"http://docs.aws.amazon.com/organizations/latest/userguide/orgs_integration_services.html#orgs_integration_service-linked-roles\">AWS Organizations and Service-Linked Roles</a> in the <i>AWS Organizations User Guide</i>.</p> <p>The user in the master account who calls this API must also have the <code>iam:CreateRole</code> permission because AWS Organizations preconfigures the new member account with a role (named <code>OrganizationAccountAccessRole</code>) that grants users in the master account administrator permissions in the new member account. Principals in the master account can assume the role. AWS Organizations clones the company name and address information for the new account from the organization's master account.</p> <p>This operation can be called only from the organization's master account.</p> <p>For more information about creating accounts, see <a href=\"http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_create.html\">Creating an AWS Account in Your Organization</a> in the <i>AWS Organizations User Guide</i>.</p> <important> <p>When you create an account in an organization using the AWS Organizations console, API, or CLI commands, the information required for the account to operate as a standalone account, such as a payment method and signing the End User Licence Agreement (EULA) is <i>not</i> automatically collected. If you must remove an account from your organization later, you can do so only after you provide the missing information. Follow the steps at <a href=\"http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info\"> To leave an organization when all required account information has not yet been provided</a> in the <i>AWS Organizations User Guide</i>.</p> </important> <note> <p>When you create a member account with this operation, you can choose whether to create the account with the <b>IAM User and Role Access to Billing Information</b> switch enabled. If you enable it, IAM users and roles that have appropriate permissions can view billing information for the account. If you disable this, then only the account root user can access billing information. For information about how to disable this for an account, see <a href=\"http://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/grantaccess.html\">Granting Access to Your Billing Information and Tools</a>.</p> </note> <important> <p>If you get an exception that indicates that you exceeded your account limits for the organization or that you can\"t add an account because your organization is still initializing, please contact <a href=\"https://console.aws.amazon.com/support/home#/\"> AWS Customer Support</a>.</p> </important>"
},
"CreateOrganization":{
"name":"CreateOrganization",
Expand Down Expand Up @@ -499,7 +499,7 @@
{"shape":"ServiceException"},
{"shape":"TooManyRequestsException"}
],
"documentation":"<p>Lists the accounts in an organization that are contained by the specified target root or organizational unit (OU). If you specify the root, you get a list of all the accounts that are not in any OU. If you specify an OU, you get a list of all the accounts in only that OU, and not in any child OUs. To get a list of all accounts in the organization, use the <a>ListAccounts</a> operation.</p>"
"documentation":"<p>Lists the accounts in an organization that are contained by the specified target root or organizational unit (OU). If you specify the root, you get a list of all the accounts that are not in any OU. If you specify an OU, you get a list of all the accounts in only that OU, and not in any child OUs. To get a list of all accounts in the organization, use the <a>ListAccounts</a> operation.</p> <p>This operation can be called only from the organization's master account.</p>"
},
"ListChildren":{
"name":"ListChildren",
Expand All @@ -517,7 +517,7 @@
{"shape":"ServiceException"},
{"shape":"TooManyRequestsException"}
],
"documentation":"<p>Lists all of the OUs or accounts that are contained in the specified parent OU or root. This operation, along with <a>ListParents</a> enables you to traverse the tree structure that makes up this root.</p>"
"documentation":"<p>Lists all of the OUs or accounts that are contained in the specified parent OU or root. This operation, along with <a>ListParents</a> enables you to traverse the tree structure that makes up this root.</p> <p>This operation can be called only from the organization's master account.</p>"
},
"ListCreateAccountStatus":{
"name":"ListCreateAccountStatus",
Expand Down
3 changes: 3 additions & 0 deletions botocore/data/pricing/2017-10-15/paginators-1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"pagination": {}
}

0 comments on commit 58dcf5a

Please sign in to comment.