[Python-modules-commits] [python-botocore] 06/10: New upstream version 1.5.80
Takaki Taniguchi
takaki at moszumanska.debian.org
Mon Jul 10 07:45:21 UTC 2017
This is an automated email from the git hooks/post-receive script.
takaki pushed a commit to branch master
in repository python-botocore.
commit d01fc80659a7accc02f5502b502a1ce6d90d97d0
Author: TANIGUCHI Takaki <takaki at asis.media-as.org>
Date: Mon Jul 10 16:39:11 2017 +0900
New upstream version 1.5.80
---
PKG-INFO | 2 +-
botocore.egg-info/PKG-INFO | 2 +-
botocore.egg-info/SOURCES.txt | 2 +
botocore/__init__.py | 2 +-
botocore/args.py | 2 +
botocore/auth.py | 2 +-
botocore/compat.py | 4 +-
botocore/config.py | 7 +
botocore/data/cloudwatch/2010-08-01/service-2.json | 303 +++++++++++++++++++--
botocore/data/ds/2015-04-16/paginators-1.json | 3 +
botocore/data/ds/2015-04-16/service-2.json | 187 ++++++++++++-
botocore/data/endpoints.json | 31 +++
botocore/data/kinesis/2013-12-02/service-2.json | 210 +++++++++++++-
botocore/data/kms/2014-11-01/service-2.json | 11 +
botocore/data/route53/2013-04-01/service-2.json | 3 +-
botocore/data/ssm/2014-11-06/service-2.json | 128 +++++++--
botocore/docs/sharedexample.py | 2 +-
botocore/endpoint.py | 7 +-
botocore/handlers.py | 4 +-
botocore/utils.py | 6 +-
docs/source/conf.py | 2 +-
tests/functional/test_client_class_names.py | 4 +-
tests/functional/test_regions.py | 6 +-
tests/functional/test_six_threading.py | 65 +++++
tests/integration/test_smoke.py | 8 +-
tests/unit/auth/test_signers.py | 30 +-
tests/unit/test_args.py | 30 +-
tests/unit/test_client.py | 16 +-
tests/unit/test_endpoint.py | 6 +
tests/unit/test_exceptions.py | 6 +-
tests/unit/test_idempotency.py | 2 +-
tests/unit/test_regions.py | 56 ++--
tests/unit/test_session.py | 2 +-
33 files changed, 1027 insertions(+), 124 deletions(-)
diff --git a/PKG-INFO b/PKG-INFO
index 9f6e757..ca8a9bf 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: botocore
-Version: 1.5.78
+Version: 1.5.80
Summary: Low-level, data-driven core of boto 3.
Home-page: https://github.com/boto/botocore
Author: Amazon Web Services
diff --git a/botocore.egg-info/PKG-INFO b/botocore.egg-info/PKG-INFO
index 9f6e757..ca8a9bf 100644
--- a/botocore.egg-info/PKG-INFO
+++ b/botocore.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: botocore
-Version: 1.5.78
+Version: 1.5.80
Summary: Low-level, data-driven core of boto 3.
Home-page: https://github.com/boto/botocore
Author: Amazon Web Services
diff --git a/botocore.egg-info/SOURCES.txt b/botocore.egg-info/SOURCES.txt
index 42a620d..b6d8d52 100644
--- a/botocore.egg-info/SOURCES.txt
+++ b/botocore.egg-info/SOURCES.txt
@@ -172,6 +172,7 @@ botocore/data/dms/2016-01-01/examples-1.json
botocore/data/dms/2016-01-01/paginators-1.json
botocore/data/dms/2016-01-01/service-2.json
botocore/data/ds/2015-04-16/examples-1.json
+botocore/data/ds/2015-04-16/paginators-1.json
botocore/data/ds/2015-04-16/service-2.json
botocore/data/dynamodb/2012-08-10/examples-1.json
botocore/data/dynamodb/2012-08-10/paginators-1.json
@@ -604,6 +605,7 @@ tests/functional/test_regions.py
tests/functional/test_s3.py
tests/functional/test_session.py
tests/functional/test_six_imports.py
+tests/functional/test_six_threading.py
tests/functional/test_stub.py
tests/functional/test_waiter_config.py
tests/functional/docs/__init__.py
diff --git a/botocore/__init__.py b/botocore/__init__.py
index 3d74112..d07d01c 100644
--- a/botocore/__init__.py
+++ b/botocore/__init__.py
@@ -16,7 +16,7 @@ import os
import re
import logging
-__version__ = '1.5.78'
+__version__ = '1.5.80'
class NullHandler(logging.Handler):
diff --git a/botocore/args.py b/botocore/args.py
index 9e69a53..49af1c7 100644
--- a/botocore/args.py
+++ b/botocore/args.py
@@ -75,6 +75,7 @@ class ClientArgsCreator(object):
endpoint_url=endpoint_config['endpoint_url'], verify=verify,
response_parser_factory=self._response_parser_factory,
max_pool_connections=new_config.max_pool_connections,
+ proxies=new_config.proxies,
timeout=(new_config.connect_timeout, new_config.read_timeout))
serializer = botocore.serialize.create_serializer(
@@ -129,6 +130,7 @@ class ClientArgsCreator(object):
connect_timeout=client_config.connect_timeout,
read_timeout=client_config.read_timeout,
max_pool_connections=client_config.max_pool_connections,
+ proxies=client_config.proxies,
)
s3_config = self.compute_s3_config(scoped_config,
client_config)
diff --git a/botocore/auth.py b/botocore/auth.py
index 7478580..8cc7337 100644
--- a/botocore/auth.py
+++ b/botocore/auth.py
@@ -110,7 +110,7 @@ class SigV2Auth(BaseSigner):
params = request.data
else:
# GET
- params = request.param
+ params = request.params
params['AWSAccessKeyId'] = self.credentials.access_key
params['SignatureVersion'] = '2'
params['SignatureMethod'] = 'HmacSHA256'
diff --git a/botocore/compat.py b/botocore/compat.py
index d1d45ee..0180df4 100644
--- a/botocore/compat.py
+++ b/botocore/compat.py
@@ -165,7 +165,7 @@ if sys.version_info[:2] == (2, 6):
'ignore',
message="Certificate has no.*subjectAltName.*",
category=exceptions.SecurityWarning,
- module=".*urllib3\.connection")
+ module=r".*urllib3\.connection")
else:
import xml.etree.cElementTree
XMLParseError = xml.etree.cElementTree.ParseError
@@ -183,7 +183,7 @@ def filter_ssl_warnings():
'ignore',
message="A true SSLContext object is not available.*",
category=exceptions.InsecurePlatformWarning,
- module=".*urllib3\.util\.ssl_")
+ module=r".*urllib3\.util\.ssl_")
filter_ssl_san_warnings()
diff --git a/botocore/config.py b/botocore/config.py
index 8c136aa..b318941 100644
--- a/botocore/config.py
+++ b/botocore/config.py
@@ -54,6 +54,12 @@ class Config(object):
keep in a connection pool. If this value is not set, the default
value of 10 is used.
+ :type proxies: dict
+ :param proxies: A dictionary of proxy servers to use by protocol or
+ endpoint, e.g.:
+ {'http': 'foo.bar:3128', 'http://hostname': 'foo.bar:4012'}.
+ The proxies are used on each request.
+
:type s3: dict
:param s3: A dictionary of s3 specific configurations.
Valid keys are:
@@ -92,6 +98,7 @@ class Config(object):
('read_timeout', DEFAULT_TIMEOUT),
('parameter_validation', True),
('max_pool_connections', MAX_POOL_CONNECTIONS),
+ ('proxies', None),
('s3', None)
])
diff --git a/botocore/data/cloudwatch/2010-08-01/service-2.json b/botocore/data/cloudwatch/2010-08-01/service-2.json
index 822981d..3bf1542 100644
--- a/botocore/data/cloudwatch/2010-08-01/service-2.json
+++ b/botocore/data/cloudwatch/2010-08-01/service-2.json
@@ -23,6 +23,24 @@
],
"documentation":"<p>Deletes the specified alarms. In the event of an error, no alarms are deleted.</p>"
},
+ "DeleteDashboards":{
+ "name":"DeleteDashboards",
+ "http":{
+ "method":"POST",
+ "requestUri":"/"
+ },
+ "input":{"shape":"DeleteDashboardsInput"},
+ "output":{
+ "shape":"DeleteDashboardsOutput",
+ "resultWrapper":"DeleteDashboardsResult"
+ },
+ "errors":[
+ {"shape":"InvalidParameterValueException"},
+ {"shape":"DashboardNotFoundError"},
+ {"shape":"InternalServiceFault"}
+ ],
+ "documentation":"<p>Deletes all dashboards that you specify. You may specify up to 100 dashboards to delete. If there is an error during this call, no dashboards are deleted.</p>"
+ },
"DescribeAlarmHistory":{
"name":"DescribeAlarmHistory",
"http":{
@@ -37,7 +55,7 @@
"errors":[
{"shape":"InvalidNextToken"}
],
- "documentation":"<p>Retrieves the history for the specified alarm. You can filter the results by date range or item type. If an alarm name is not specified, the histories for all alarms are returned.</p> <p>Note that Amazon CloudWatch retains the history of an alarm even if you delete the alarm.</p>"
+ "documentation":"<p>Retrieves the history for the specified alarm. You can filter the results by date range or item type. If an alarm name is not specified, the histories for all alarms are returned.</p> <p>CloudWatch retains the history of an alarm even if you delete the alarm.</p>"
},
"DescribeAlarms":{
"name":"DescribeAlarms",
@@ -66,7 +84,7 @@
"shape":"DescribeAlarmsForMetricOutput",
"resultWrapper":"DescribeAlarmsForMetricResult"
},
- "documentation":"<p>Retrieves the alarms for the specified metric. Specify a statistic, period, or unit to filter the results.</p>"
+ "documentation":"<p>Retrieves the alarms for the specified metric. To filter the results, specify a statistic, period, or unit.</p>"
},
"DisableAlarmActions":{
"name":"DisableAlarmActions",
@@ -86,6 +104,24 @@
"input":{"shape":"EnableAlarmActionsInput"},
"documentation":"<p>Enables the actions for the specified alarms.</p>"
},
+ "GetDashboard":{
+ "name":"GetDashboard",
+ "http":{
+ "method":"POST",
+ "requestUri":"/"
+ },
+ "input":{"shape":"GetDashboardInput"},
+ "output":{
+ "shape":"GetDashboardOutput",
+ "resultWrapper":"GetDashboardResult"
+ },
+ "errors":[
+ {"shape":"InvalidParameterValueException"},
+ {"shape":"DashboardNotFoundError"},
+ {"shape":"InternalServiceFault"}
+ ],
+ "documentation":"<p>Displays the details of the dashboard that you specify.</p> <p>To copy an existing dashboard, use <code>GetDashboard</code>, and then use the data returned within <code>DashboardBody</code> as the template for the new dashboard when you call <code>PutDashboard</code> to create the copy.</p>"
+ },
"GetMetricStatistics":{
"name":"GetMetricStatistics",
"http":{
@@ -103,7 +139,24 @@
{"shape":"InvalidParameterCombinationException"},
{"shape":"InternalServiceFault"}
],
- "documentation":"<p>Gets statistics for the specified metric.</p> <p>Amazon CloudWatch retains metric data as follows:</p> <ul> <li> <p>Data points with a period of 60 seconds (1 minute) are available for 15 days</p> </li> <li> <p>Data points with a period of 300 seconds (5 minute) are available for 63 days</p> </li> <li> <p>Data points with a period of 3600 seconds (1 hour) are available for 455 days (15 months)</p> </li> </ul> <p>Note that CloudWatch started retaining 5-minute an [...]
+ "documentation":"<p>Gets statistics for the specified metric.</p> <p>Amazon CloudWatch retains metric data as follows:</p> <ul> <li> <p>Data points with a period of 60 seconds (1-minute) are available for 15 days</p> </li> <li> <p>Data points with a period of 300 seconds (5-minute) are available for 63 days</p> </li> <li> <p>Data points with a period of 3600 seconds (1 hour) are available for 455 days (15 months)</p> </li> </ul> <p>CloudWatch started retaining 5-minute and 1-hour m [...]
+ },
+ "ListDashboards":{
+ "name":"ListDashboards",
+ "http":{
+ "method":"POST",
+ "requestUri":"/"
+ },
+ "input":{"shape":"ListDashboardsInput"},
+ "output":{
+ "shape":"ListDashboardsOutput",
+ "resultWrapper":"ListDashboardsResult"
+ },
+ "errors":[
+ {"shape":"InvalidParameterValueException"},
+ {"shape":"InternalServiceFault"}
+ ],
+ "documentation":"<p>Returns a list of the dashboards for your account. If you include <code>DashboardNamePrefix</code>, only those dashboards with names starting with the prefix are listed. Otherwise, all dashboards in your account are listed. </p>"
},
"ListMetrics":{
"name":"ListMetrics",
@@ -122,6 +175,23 @@
],
"documentation":"<p>List the specified metrics. You can use the returned metrics with <a>GetMetricStatistics</a> to obtain statistical data.</p> <p>Up to 500 results are returned for any one call. To retrieve additional results, use the returned token with subsequent calls.</p> <p>After you create a metric, allow up to fifteen minutes before the metric appears. Statistics about the metric, however, are available sooner using <a>GetMetricStatistics</a>.</p>"
},
+ "PutDashboard":{
+ "name":"PutDashboard",
+ "http":{
+ "method":"POST",
+ "requestUri":"/"
+ },
+ "input":{"shape":"PutDashboardInput"},
+ "output":{
+ "shape":"PutDashboardOutput",
+ "resultWrapper":"PutDashboardResult"
+ },
+ "errors":[
+ {"shape":"DashboardInvalidInputError"},
+ {"shape":"InternalServiceFault"}
+ ],
+ "documentation":"<p>Creates a dashboard if it does not already exist, or updates an existing dashboard. If you update a dashboard, the entire contents are replaced with what you specify here.</p> <p>You can have up to 500 dashboards per account. All dashboards in your account are global, not region-specific.</p> <p>To copy an existing dashboard, use <code>GetDashboard</code>, and then use the data returned within <code>DashboardBody</code> as the template for the new dashboard when [...]
+ },
"PutMetricAlarm":{
"name":"PutMetricAlarm",
"http":{
@@ -132,7 +202,7 @@
"errors":[
{"shape":"LimitExceededFault"}
],
- "documentation":"<p>Creates or updates an alarm and associates it with the specified metric. Optionally, this operation can associate one or more Amazon SNS resources with the alarm.</p> <p>When this operation creates an alarm, the alarm state is immediately set to <code>INSUFFICIENT_DATA</code>. The alarm is evaluated and its state is set appropriately. Any actions associated with the state are then executed.</p> <p>When you update an existing alarm, its state is left unchanged, b [...]
+ "documentation":"<p>Creates or updates an alarm and associates it with the specified metric. Optionally, this operation can associate one or more Amazon SNS resources with the alarm.</p> <p>When this operation creates an alarm, the alarm state is immediately set to <code>INSUFFICIENT_DATA</code>. The alarm is evaluated and its state is set appropriately. Any actions associated with the state are then executed.</p> <p>When you update an existing alarm, its state is left unchanged, b [...]
},
"PutMetricData":{
"name":"PutMetricData",
@@ -147,7 +217,7 @@
{"shape":"InvalidParameterCombinationException"},
{"shape":"InternalServiceFault"}
],
- "documentation":"<p>Publishes metric data points to Amazon CloudWatch. Amazon CloudWatch associates the data points with the specified metric. If the specified metric does not exist, Amazon CloudWatch creates the metric. When Amazon CloudWatch creates a metric, it can take up to fifteen minutes for the metric to appear in calls to <a>ListMetrics</a>.</p> <p>Each <code>PutMetricData</code> request is limited to 40 KB in size for HTTP POST requests.</p> <p>Although the <code>Value</c [...]
+ "documentation":"<p>Publishes metric data points to Amazon CloudWatch. CloudWatch associates the data points with the specified metric. If the specified metric does not exist, CloudWatch creates the metric. When CloudWatch creates a metric, it can take up to fifteen minutes for the metric to appear in calls to <a>ListMetrics</a>.</p> <p>Each <code>PutMetricData</code> request is limited to 40 KB in size for HTTP POST requests.</p> <p>Although the <code>Value</code> parameter accept [...]
},
"SetAlarmState":{
"name":"SetAlarmState",
@@ -160,7 +230,7 @@
{"shape":"ResourceNotFound"},
{"shape":"InvalidFormatFault"}
],
- "documentation":"<p>Temporarily sets the state of an alarm for testing purposes. When the updated state differs from the previous value, the action configured for the appropriate state is invoked. For example, if your alarm is configured to send an Amazon SNS message when an alarm is triggered, temporarily changing the alarm state to <code>ALARM</code> sends an Amazon SNS message. The alarm returns to its actual state (often within seconds). Because the alarm state change happens v [...]
+ "documentation":"<p>Temporarily sets the state of an alarm for testing purposes. When the updated state differs from the previous value, the action configured for the appropriate state is invoked. For example, if your alarm is configured to send an Amazon SNS message when an alarm is triggered, temporarily changing the alarm state to <code>ALARM</code> sends an SNS message. The alarm returns to its actual state (often within seconds). Because the alarm state change happens quickly, [...]
}
},
"shapes":{
@@ -235,6 +305,87 @@
"LessThanOrEqualToThreshold"
]
},
+ "DashboardArn":{"type":"string"},
+ "DashboardBody":{"type":"string"},
+ "DashboardEntries":{
+ "type":"list",
+ "member":{"shape":"DashboardEntry"}
+ },
+ "DashboardEntry":{
+ "type":"structure",
+ "members":{
+ "DashboardName":{
+ "shape":"DashboardName",
+ "documentation":"<p>The name of the dashboard.</p>"
+ },
+ "DashboardArn":{
+ "shape":"DashboardArn",
+ "documentation":"<p>The Amazon Resource Name (ARN) of the dashboard.</p>"
+ },
+ "LastModified":{
+ "shape":"LastModified",
+ "documentation":"<p>The time stamp of when the dashboard was last modified, either by an API call or through the console. This number is expressed as the number of milliseconds since Jan 1, 1970 00:00:00 UTC.</p>"
+ },
+ "Size":{
+ "shape":"Size",
+ "documentation":"<p>The size of the dashboard, in bytes.</p>"
+ }
+ },
+ "documentation":"<p>Represents a specific dashboard.</p>"
+ },
+ "DashboardErrorMessage":{"type":"string"},
+ "DashboardInvalidInputError":{
+ "type":"structure",
+ "members":{
+ "message":{"shape":"DashboardErrorMessage"},
+ "dashboardValidationMessages":{"shape":"DashboardValidationMessages"}
+ },
+ "documentation":"<p>Some part of the dashboard data is invalid.</p>",
+ "error":{
+ "code":"InvalidParameterInput",
+ "httpStatusCode":400,
+ "senderFault":true
+ },
+ "exception":true
+ },
+ "DashboardName":{"type":"string"},
+ "DashboardNamePrefix":{"type":"string"},
+ "DashboardNames":{
+ "type":"list",
+ "member":{"shape":"DashboardName"}
+ },
+ "DashboardNotFoundError":{
+ "type":"structure",
+ "members":{
+ "message":{"shape":"DashboardErrorMessage"}
+ },
+ "documentation":"<p>The specified dashboard does not exist.</p>",
+ "error":{
+ "code":"ResourceNotFound",
+ "httpStatusCode":404,
+ "senderFault":true
+ },
+ "exception":true
+ },
+ "DashboardValidationMessage":{
+ "type":"structure",
+ "members":{
+ "DataPath":{
+ "shape":"DataPath",
+ "documentation":"<p>The data path related to the message.</p>"
+ },
+ "Message":{
+ "shape":"Message",
+ "documentation":"<p>A message describing the error or warning.</p>"
+ }
+ },
+ "documentation":"<p>An error or warning for the operation.</p>"
+ },
+ "DashboardValidationMessages":{
+ "type":"list",
+ "member":{"shape":"DashboardValidationMessage"}
+ },
+ "DataPath":{"type":"string"},
"Datapoint":{
"type":"structure",
"members":{
@@ -271,7 +422,7 @@
"documentation":"<p>The percentile statistic for the data point.</p>"
}
},
- "documentation":"<p>Encapsulates the statistical data that Amazon CloudWatch computes from metric data.</p>",
+ "documentation":"<p>Encapsulates the statistical data that CloudWatch computes from metric data.</p>",
"xmlOrder":[
"Timestamp",
"SampleCount",
@@ -303,6 +454,20 @@
}
}
},
+ "DeleteDashboardsInput":{
+ "type":"structure",
+ "members":{
+ "DashboardNames":{
+ "shape":"DashboardNames",
+ "documentation":"<p>The dashboards to be deleted.</p>"
+ }
+ }
+ },
+ "DeleteDashboardsOutput":{
+ "type":"structure",
+ "members":{
+ }
+ },
"DescribeAlarmHistoryInput":{
"type":"structure",
"members":{
@@ -400,7 +565,7 @@
},
"AlarmNamePrefix":{
"shape":"AlarmNamePrefix",
- "documentation":"<p>The alarm name prefix. You cannot specify <code>AlarmNames</code> if this parameter is specified.</p>"
+ "documentation":"<p>The alarm name prefix. If this parameter is specified, you cannot specify <code>AlarmNames</code>.</p>"
},
"StateValue":{
"shape":"StateValue",
@@ -535,6 +700,32 @@
"min":1
},
"FaultDescription":{"type":"string"},
+ "GetDashboardInput":{
+ "type":"structure",
+ "members":{
+ "DashboardName":{
+ "shape":"DashboardName",
+ "documentation":"<p>The name of the dashboard to be described.</p>"
+ }
+ }
+ },
+ "GetDashboardOutput":{
+ "type":"structure",
+ "members":{
+ "DashboardArn":{
+ "shape":"DashboardArn",
+ "documentation":"<p>The Amazon Resource Name (ARN) of the dashboard.</p>"
+ },
+ "DashboardBody":{
+ "shape":"DashboardBody",
+ "documentation":"<p>The detailed information about the dashboard, including what widgets are included and their location on the dashboard. For more information about the <code>DashboardBody</code> syntax, see <a>CloudWatch-Dashboard-Body-Structure</a>. </p>"
+ },
+ "DashboardName":{
+ "shape":"DashboardName",
+ "documentation":"<p>The name of the dashboard.</p>"
+ }
+ }
+ },
"GetMetricStatisticsInput":{
"type":"structure",
"required":[
@@ -555,27 +746,27 @@
},
"Dimensions":{
"shape":"Dimensions",
- "documentation":"<p>The dimensions. If the metric contains multiple dimensions, you must include a value for each dimension. CloudWatch treats each unique combination of dimensions as a separate metric. You can't retrieve statistics using combinations of dimensions that were not specially published. You must specify the same dimensions that were used when the metrics were created. For an example, see <a href=\"http://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/cloudw [...]
+ "documentation":"<p>The dimensions. If the metric contains multiple dimensions, you must include a value for each dimension. CloudWatch treats each unique combination of dimensions as a separate metric. If a specific combination of dimensions was not published, you can't retrieve statistics for it. You must specify the same dimensions that were used when the metrics were created. For an example, see <a href=\"http://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/cloudwa [...]
},
"StartTime":{
"shape":"Timestamp",
- "documentation":"<p>The time stamp that determines the first data point to return. Note that start times are evaluated relative to the time that CloudWatch receives the request.</p> <p>The value specified is inclusive; results include data points with the specified time stamp. The time stamp must be in ISO 8601 UTC format (for example, 2016-10-03T23:00:00Z).</p> <p>CloudWatch rounds the specified time stamp as follows:</p> <ul> <li> <p>Start time less than 15 days ago - Round d [...]
+ "documentation":"<p>The time stamp that determines the first data point to return. Start times are evaluated relative to the time that CloudWatch receives the request.</p> <p>The value specified is inclusive; results include data points with the specified time stamp. The time stamp must be in ISO 8601 UTC format (for example, 2016-10-03T23:00:00Z).</p> <p>CloudWatch rounds the specified time stamp as follows:</p> <ul> <li> <p>Start time less than 15 days ago - Round down to the [...]
},
"EndTime":{
"shape":"Timestamp",
- "documentation":"<p>The time stamp that determines the last data point to return.</p> <p>The value specified is exclusive; results will include data points up to the specified time stamp. The time stamp must be in ISO 8601 UTC format (for example, 2016-10-10T23:00:00Z).</p>"
+ "documentation":"<p>The time stamp that determines the last data point to return.</p> <p>The value specified is exclusive; results include data points up to the specified time stamp. The time stamp must be in ISO 8601 UTC format (for example, 2016-10-10T23:00:00Z).</p>"
},
"Period":{
"shape":"Period",
- "documentation":"<p>The granularity, in seconds, of the returned data points. A period can be as short as one minute (60 seconds) and must be a multiple of 60. The default value is 60.</p> <p>If the <code>StartTime</code> parameter specifies a time stamp that is greater than 15 days ago, you must specify the period as follows or no data points in that time range is returned:</p> <ul> <li> <p>Start time between 15 and 63 days ago - Use a multiple of 300 seconds (5 minutes).</p> [...]
+ "documentation":"<p>The granularity, in seconds, of the returned data points. A period can be as short as one minute (60 seconds) and must be a multiple of 60. </p> <p>If the <code>StartTime</code> parameter specifies a time stamp that is greater than 15 days ago, you must specify the period as follows or no data points in that time range is returned:</p> <ul> <li> <p>Start time between 15 and 63 days ago - Use a multiple of 300 seconds (5 minutes).</p> </li> <li> <p>Start time [...]
},
"Statistics":{
"shape":"Statistics",
- "documentation":"<p>The metric statistics, other than percentile. For percentile statistics, use <code>ExtendedStatistic</code>.</p>"
+ "documentation":"<p>The metric statistics, other than percentile. For percentile statistics, use <code>ExtendedStatistics</code>. When calling <code>GetMetricStatistics</code>, you must specify either <code>Statistics</code> or <code>ExtendedStatistics</code>, but not both.</p>"
},
"ExtendedStatistics":{
"shape":"ExtendedStatistics",
- "documentation":"<p>The percentile statistics. Specify values between p0.0 and p100.</p>"
+ "documentation":"<p>The percentile statistics. Specify values between p0.0 and p100. When calling <code>GetMetricStatistics</code>, you must specify either <code>Statistics</code> or <code>ExtendedStatistics</code>, but not both.</p>"
},
"Unit":{
"shape":"StandardUnit",
@@ -670,7 +861,7 @@
"documentation":"<p/>"
}
},
- "documentation":"<p>Parameters that cannot be used together were used together.</p>",
+ "documentation":"<p>Parameters were used together that cannot be used together.</p>",
"error":{
"code":"InvalidParameterCombination",
"httpStatusCode":400,
@@ -694,6 +885,7 @@
},
"exception":true
},
+ "LastModified":{"type":"timestamp"},
"LimitExceededFault":{
"type":"structure",
"members":{
@@ -710,6 +902,32 @@
},
"exception":true
},
+ "ListDashboardsInput":{
+ "type":"structure",
+ "members":{
+ "DashboardNamePrefix":{
+ "shape":"DashboardNamePrefix",
+ "documentation":"<p>If you specify this parameter, only the dashboards with names starting with the specified string are listed. The maximum length is 255, and valid characters are A-Z, a-z, 0-9, \".\", \"-\", and \"_\". </p>"
+ },
+ "NextToken":{
+ "shape":"NextToken",
+ "documentation":"<p>The token returned by a previous call to indicate that there is more data available.</p>"
+ }
+ }
+ },
+ "ListDashboardsOutput":{
+ "type":"structure",
+ "members":{
+ "DashboardEntries":{
+ "shape":"DashboardEntries",
+ "documentation":"<p>The list of matching dashboards.</p>"
+ },
+ "NextToken":{
+ "shape":"NextToken",
+ "documentation":"<p>The token that marks the start of the next batch of returned results.</p>"
+ }
+ }
+ },
"ListMetricsInput":{
"type":"structure",
"members":{
@@ -753,6 +971,7 @@
"max":100,
"min":1
},
+ "Message":{"type":"string"},
"Metric":{
"type":"structure",
"members":{
@@ -867,8 +1086,14 @@
"shape":"ComparisonOperator",
"documentation":"<p>The arithmetic operation to use when comparing the specified statistic and threshold. The specified statistic value is used as the first operand.</p>"
},
- "TreatMissingData":{"shape":"TreatMissingData"},
- "EvaluateLowSampleCountPercentile":{"shape":"EvaluateLowSampleCountPercentile"}
+ "TreatMissingData":{
+ "shape":"TreatMissingData",
+ "documentation":"<p>Sets how this alarm is to handle missing data points. If this parameter is omitted, the default behavior of <code>missing</code> is used.</p>"
+ },
+ "EvaluateLowSampleCountPercentile":{
+ "shape":"EvaluateLowSampleCountPercentile",
+ "documentation":"<p>Used only for alarms based on percentiles. If <code>ignore</code>, the alarm state does not change during periods with too few data points to be statistically significant. If <code>evaluate</code> or this parameter is not used, the alarm will always be evaluated and possibly change state no matter how many data points are available.</p>"
+ }
},
"documentation":"<p>Represents an alarm.</p>",
"xmlOrder":[
@@ -924,7 +1149,7 @@
},
"Value":{
"shape":"DatapointValue",
- "documentation":"<p>The value for the metric.</p> <p>Although the parameter accepts numbers of type Double, Amazon CloudWatch rejects values that are either too small or too large. Values must be in the range of 8.515920e-109 to 1.174271e+108 (Base 10) or 2e-360 to 2e360 (Base 2). In addition, special values (for example, NaN, +Infinity, -Infinity) are not supported.</p>"
+ "documentation":"<p>The value for the metric.</p> <p>Although the parameter accepts numbers of type Double, CloudWatch rejects values that are either too small or too large. Values must be in the range of 8.515920e-109 to 1.174271e+108 (Base 10) or 2e-360 to 2e360 (Base 2). In addition, special values (for example, NaN, +Infinity, -Infinity) are not supported.</p>"
},
"StatisticValues":{
"shape":"StatisticSet",
@@ -933,7 +1158,8 @@
"Unit":{
"shape":"StandardUnit",
"documentation":"<p>The unit of the metric.</p>"
- }
+ },
+ "StorageResolution":{"shape":"StorageResolution"}
},
"documentation":"<p>Encapsulates the information sent to either create a metric or add new values to be aggregated into an existing metric.</p>"
},
@@ -976,7 +1202,29 @@
},
"Period":{
"type":"integer",
- "min":60
+ "min":1
+ },
+ "PutDashboardInput":{
+ "type":"structure",
+ "members":{
+ "DashboardName":{
+ "shape":"DashboardName",
+ "documentation":"<p>The name of the dashboard. If a dashboard with this name already exists, this call modifies that dashboard, replacing its current contents. Otherwise, a new dashboard is created. The maximum length is 255, and valid characters are A-Z, a-z, 0-9, \".\", \"-\", and \"_\".</p>"
+ },
+ "DashboardBody":{
+ "shape":"DashboardBody",
+ "documentation":"<p>The detailed information about the dashboard in JSON format, including the widgets to include and their location on the dashboard.</p> <p>For more information about the syntax, see <a>CloudWatch-Dashboard-Body-Structure</a>.</p>"
+ }
+ }
+ },
+ "PutDashboardOutput":{
+ "type":"structure",
+ "members":{
+ "DashboardValidationMessages":{
+ "shape":"DashboardValidationMessages",
+ "documentation":"<p>If the input for <code>PutDashboard</code> was correct and the dashboard was successfully created or modified, this result is empty.</p> <p>If this result includes only warning messages, then the input was valid enough for the dashboard to be created or modified, but some elements of the dashboard may not render.</p> <p>If this result includes error messages, the input was not valid and the operation failed.</p>"
+ }
+ }
},
"PutMetricAlarmInput":{
"type":"structure",
@@ -1036,15 +1284,15 @@
},
"Period":{
"shape":"Period",
- "documentation":"<p>The period, in seconds, over which the specified statistic is applied.</p>"
+ "documentation":"<p>The period, in seconds, over which the specified statistic is applied. An alarm's total current evaluation period can be no longer than one day, so this number multiplied by <code>EvaluationPeriods</code> must be 86,400 or less.</p>"
},
"Unit":{
"shape":"StandardUnit",
- "documentation":"<p>The unit of measure for the statistic. For example, the units for the Amazon EC2 NetworkIn metric are Bytes because NetworkIn tracks the number of bytes that an instance receives on all network interfaces. You can also specify a unit when you create a custom metric. Units help provide conceptual meaning to your data. Metric data points that specify a unit of measure, such as Percent, are aggregated separately.</p> <p>If you specify a unit, you must use a uni [...]
+ "documentation":"<p>The unit of measure for the statistic. For example, the units for the Amazon EC2 NetworkIn metric are Bytes because NetworkIn tracks the number of bytes that an instance receives on all network interfaces. You can also specify a unit when you create a custom metric. Units help provide conceptual meaning to your data. Metric data points that specify a unit of measure, such as Percent, are aggregated separately.</p> <p>If you specify a unit, you must use a uni [...]
},
"EvaluationPeriods":{
"shape":"EvaluationPeriods",
- "documentation":"<p>The number of periods over which data is compared to the specified threshold.</p>"
+ "documentation":"<p>The number of periods over which data is compared to the specified threshold. An alarm's total current evaluation period can be no longer than one day, so this number multiplied by <code>Period</code> must be 86,400 or less.</p>"
},
"Threshold":{
"shape":"Threshold",
@@ -1060,7 +1308,7 @@
},
"EvaluateLowSampleCountPercentile":{
"shape":"EvaluateLowSampleCountPercentile",
- "documentation":"<p> Used only for alarms based on percentiles. If you specify <code>ignore</code>, the alarm state will not change during periods with too few data points to be statistically significant. If you specify <code>evaluate</code> or omit this parameter, the alarm will always be evaluated and possibly change state no matter how many data points are available. For more information, see <a href=\"http://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/AlarmThatSe [...]
+ "documentation":"<p> Used only for alarms based on percentiles. If you specify <code>ignore</code>, the alarm state does not change during periods with too few data points to be statistically significant. If you specify <code>evaluate</code> or omit this parameter, the alarm is always evaluated and possibly changes state no matter how many data points are available. For more information, see <a href=\"http://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/AlarmThatSendsE [...]
}
}
},
@@ -1133,6 +1381,7 @@
}
}
},
+ "Size":{"type":"long"},
"StandardUnit":{
"type":"string",
"enum":[
@@ -1227,6 +1476,10 @@
"max":5,
"min":1
},
+ "StorageResolution":{
+ "type":"integer",
+ "min":1
+ },
"Threshold":{"type":"double"},
"Timestamp":{"type":"timestamp"},
"TreatMissingData":{
@@ -1235,5 +1488,5 @@
"min":1
}
},
- "documentation":"<p>Amazon CloudWatch monitors your Amazon Web Services (AWS) resources and the applications you run on AWS in real-time. You can use CloudWatch to collect and track metrics, which are the variables you want to measure for your resources and applications.</p> <p>CloudWatch alarms send notifications or automatically make changes to the resources you are monitoring based on rules that you define. For example, you can monitor the CPU usage and disk reads and writes of your [...]
+ "documentation":"<p>Amazon CloudWatch monitors your Amazon Web Services (AWS) resources and the applications you run on AWS in real time. You can use CloudWatch to collect and track metrics, which are the variables you want to measure for your resources and applications.</p> <p>CloudWatch alarms send notifications or automatically change the resources you are monitoring based on rules that you define. For example, you can monitor the CPU usage and disk reads and writes of your Amazon E [...]
}
diff --git a/botocore/data/ds/2015-04-16/paginators-1.json b/botocore/data/ds/2015-04-16/paginators-1.json
new file mode 100644
index 0000000..ea14245
--- /dev/null
+++ b/botocore/data/ds/2015-04-16/paginators-1.json
@@ -0,0 +1,3 @@
+{
+ "pagination": {}
+}
diff --git a/botocore/data/ds/2015-04-16/service-2.json b/botocore/data/ds/2015-04-16/service-2.json
index 0a364af..6446bcd 100644
--- a/botocore/data/ds/2015-04-16/service-2.json
+++ b/botocore/data/ds/2015-04-16/service-2.json
@@ -320,6 +320,24 @@
],
"documentation":"<p>Obtains information about the directories that belong to this account.</p> <p>You can retrieve information about specific directories by passing the directory identifiers in the <i>DirectoryIds</i> parameter. Otherwise, all directories that belong to the current account are returned.</p> <p>This operation supports pagination with the use of the <i>NextToken</i> request and response parameters. If more results are available, the <i>DescribeDirectoriesResult.NextT [...]
},
+ "DescribeDomainControllers":{
+ "name":"DescribeDomainControllers",
+ "http":{
+ "method":"POST",
+ "requestUri":"/"
+ },
+ "input":{"shape":"DescribeDomainControllersRequest"},
+ "output":{"shape":"DescribeDomainControllersResult"},
+ "errors":[
+ {"shape":"EntityDoesNotExistException"},
+ {"shape":"InvalidNextTokenException"},
+ {"shape":"InvalidParameterException"},
+ {"shape":"ClientException"},
+ {"shape":"ServiceException"},
+ {"shape":"UnsupportedOperationException"}
+ ],
+ "documentation":"<p>Provides information about any domain controllers in your directory.</p>"
+ },
"DescribeEventTopics":{
"name":"DescribeEventTopics",
"http":{
@@ -618,6 +636,25 @@
],
"documentation":"<p>Updates a conditional forwarder that has been set up for your AWS directory.</p>"
},
+ "UpdateNumberOfDomainControllers":{
+ "name":"UpdateNumberOfDomainControllers",
+ "http":{
+ "method":"POST",
+ "requestUri":"/"
+ },
+ "input":{"shape":"UpdateNumberOfDomainControllersRequest"},
+ "output":{"shape":"UpdateNumberOfDomainControllersResult"},
+ "errors":[
+ {"shape":"EntityDoesNotExistException"},
+ {"shape":"DirectoryUnavailableException"},
+ {"shape":"DomainControllerLimitExceededException"},
+ {"shape":"InvalidParameterException"},
+ {"shape":"UnsupportedOperationException"},
+ {"shape":"ClientException"},
+ {"shape":"ServiceException"}
+ ],
+ "documentation":"<p>Adds or removes domain controllers to or from the directory. Based on the difference between current value and new value (provided through this API call), domain controllers will be added or removed. It may take up to 45 minutes for any new domain controllers to become fully active once the requested number of domain controllers is updated. During this time, you cannot make another update request.</p>"
+ },
"UpdateRadius":{
"name":"UpdateRadius",
"http":{
@@ -1072,7 +1109,10 @@
"shape":"Description",
"documentation":"<p>A textual description for the directory. This label will appear on the AWS console <code>Directory Details</code> page after the directory is created.</p>"
},
- "VpcSettings":{"shape":"DirectoryVpcSettings"}
+ "VpcSettings":{
+ "shape":"DirectoryVpcSettings",
+ "documentation":"<p>Contains VPC information for the <a>CreateDirectory</a> or <a>CreateMicrosoftAD</a> operation.</p>"
+ }
},
"documentation":"<p>Creates a Microsoft AD in the AWS cloud.</p>"
},
@@ -1332,6 +1372,41 @@
},
"documentation":"<p>Contains the results of the <a>DescribeDirectories</a> operation.</p>"
},
+ "DescribeDomainControllersRequest":{
+ "type":"structure",
+ "required":["DirectoryId"],
+ "members":{
+ "DirectoryId":{
+ "shape":"DirectoryId",
+ "documentation":"<p>Identifier of the directory for which to retrieve the domain controller information.</p>"
+ },
+ "DomainControllerIds":{
+ "shape":"DomainControllerIds",
+ "documentation":"<p>A list of identifiers for the domain controllers whose information will be provided.</p>"
+ },
+ "NextToken":{
+ "shape":"NextToken",
+ "documentation":"<p>The <i>DescribeDomainControllers.NextToken</i> value from a previous call to <a>DescribeDomainControllers</a>. Pass null if this is the first call. </p>"
+ },
+ "Limit":{
+ "shape":"Limit",
+ "documentation":"<p>The maximum number of items to return.</p>"
+ }
+ }
+ },
+ "DescribeDomainControllersResult":{
+ "type":"structure",
+ "members":{
+ "DomainControllers":{
+ "shape":"DomainControllers",
+ "documentation":"<p>List of the <a>DomainController</a> objects that were retrieved.</p>"
+ },
+ "NextToken":{
+ "shape":"NextToken",
+ "documentation":"<p>If not null, more results are available. Pass this value for the <code>NextToken</code> parameter in a subsequent call to <a>DescribeDomainControllers</a> retrieve the next set of items.</p>"
+ }
+ }
+ },
"DescribeEventTopicsRequest":{
"type":"structure",
"members":{
@@ -1434,6 +1509,10 @@
"min":0,
"pattern":"^([a-zA-Z0-9_])[\\\\a-zA-Z0-9_@#%*+=:?./!\\s-]*$"
},
+ "DesiredNumberOfDomainControllers":{
+ "type":"integer",
+ "min":2
+ },
"DirectoryConnectSettings":{
"type":"structure",
"required":[
@@ -1566,6 +1645,10 @@
"SsoEnabled":{
"shape":"SsoEnabled",
"documentation":"<p>Indicates if single-sign on is enabled for the directory. For more information, see <a>EnableSso</a> and <a>DisableSso</a>.</p>"
+ },
+ "DesiredNumberOfDomainControllers":{
+ "shape":"DesiredNumberOfDomainControllers",
+ "documentation":"<p>The desired number of domain controllers in the directory if the directory is Microsoft AD.</p>"
}
},
"documentation":"<p>Contains information about an AWS Directory Service directory.</p>"
@@ -1769,6 +1852,86 @@
"type":"list",
"member":{"shape":"IpAddr"}
},
+ "DomainController":{
+ "type":"structure",
+ "members":{
+ "DirectoryId":{
+ "shape":"DirectoryId",
+ "documentation":"<p>Identifier of the directory where the domain controller resides.</p>"
+ },
+ "DomainControllerId":{
+ "shape":"DomainControllerId",
+ "documentation":"<p>Identifies a specific domain controller in the directory.</p>"
+ },
+ "DnsIpAddr":{
+ "shape":"IpAddr",
+ "documentation":"<p>The IP address of the domain controller.</p>"
+ },
+ "VpcId":{
+ "shape":"VpcId",
+ "documentation":"<p>The identifier of the VPC that contains the domain controller.</p>"
+ },
+ "SubnetId":{
+ "shape":"SubnetId",
+ "documentation":"<p>Identifier of the subnet in the VPC that contains the domain controller.</p>"
+ },
+ "AvailabilityZone":{
+ "shape":"AvailabilityZone",
+ "documentation":"<p>The Availability Zone where the domain controller is located.</p>"
+ },
+ "Status":{
+ "shape":"DomainControllerStatus",
+ "documentation":"<p>The status of the domain controller.</p>"
+ },
+ "StatusReason":{
+ "shape":"DomainControllerStatusReason",
+ "documentation":"<p>A description of the domain controller state.</p>"
+ },
+ "LaunchTime":{
+ "shape":"LaunchTime",
+ "documentation":"<p>Specifies when the domain controller was created.</p>"
+ },
+ "StatusLastUpdatedDateTime":{
+ "shape":"LastUpdatedDateTime",
+ "documentation":"<p>The date and time that the status was last updated.</p>"
+ }
+ },
+ "documentation":"<p>Contains information about the domain controllers for a specified directory.</p>"
+ },
+ "DomainControllerId":{
+ "type":"string",
+ "pattern":"^dc-[0-9a-f]{10}$"
+ },
+ "DomainControllerIds":{
+ "type":"list",
+ "member":{"shape":"DomainControllerId"}
+ },
+ "DomainControllerLimitExceededException":{
+ "type":"structure",
+ "members":{
+ "Message":{"shape":"ExceptionMessage"},
+ "RequestId":{"shape":"RequestId"}
+ },
+ "documentation":"<p>The maximum allowed number of domain controllers per directory was exceeded. The default limit per directory is 20 domain controllers.</p>",
+ "exception":true
+ },
+ "DomainControllerStatus":{
+ "type":"string",
+ "enum":[
+ "Creating",
+ "Active",
+ "Impaired",
+ "Restoring",
+ "Deleting",
+ "Deleted",
+ "Failed"
+ ]
+ },
+ "DomainControllerStatusReason":{"type":"string"},
+ "DomainControllers":{
+ "type":"list",
+ "member":{"shape":"DomainController"}
+ },
"EnableRadiusRequest":{
"type":"structure",
"required":[
@@ -2741,6 +2904,28 @@
},
"documentation":"<p>The result of an UpdateConditionalForwarder request.</p>"
},
+ "UpdateNumberOfDomainControllersRequest":{
+ "type":"structure",
+ "required":[
+ "DirectoryId",
+ "DesiredNumber"
+ ],
+ "members":{
+ "DirectoryId":{
+ "shape":"DirectoryId",
+ "documentation":"<p>Identifier of the directory to which the domain controllers will be added or removed.</p>"
+ },
+ "DesiredNumber":{
+ "shape":"DesiredNumberOfDomainControllers",
+ "documentation":"<p>The number of domain controllers desired in the directory.</p>"
+ }
+ }
+ },
+ "UpdateNumberOfDomainControllersResult":{
+ "type":"structure",
+ "members":{
+ }
+ },
"UpdateRadiusRequest":{
"type":"structure",
"required":[
diff --git a/botocore/data/endpoints.json b/botocore/data/endpoints.json
index 90700c1..204f5b1 100644
--- a/botocore/data/endpoints.json
+++ b/botocore/data/endpoints.json
@@ -131,6 +131,9 @@
},
"athena" : {
"endpoints" : {
+ "ap-northeast-1" : { },
+ "ap-southeast-1" : { },
+ "eu-west-1" : { },
"us-east-1" : { },
"us-east-2" : { },
"us-west-2" : { }
@@ -274,10 +277,13 @@
"ap-northeast-1" : { },
"ap-southeast-1" : { },
"ap-southeast-2" : { },
+ "ca-central-1" : { },
"eu-central-1" : { },
"eu-west-1" : { },
+ "eu-west-2" : { },
"us-east-1" : { },
"us-east-2" : { },
+ "us-west-1" : { },
"us-west-2" : { }
}
},
@@ -285,8 +291,10 @@
"endpoints" : {
"ap-northeast-1" : { },
"ap-northeast-2" : { },
+ "ap-south-1" : { },
"ap-southeast-1" : { },
"ap-southeast-2" : { },
+ "ca-central-1" : { },
"eu-central-1" : { },
"eu-west-1" : { },
"eu-west-2" : { },
@@ -320,11 +328,14 @@
"ap-northeast-1" : { },
"ap-southeast-1" : { },
"ap-southeast-2" : { },
+ "ca-central-1" : { },
... 1406 lines suppressed ...
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-botocore.git
More information about the Python-modules-commits
mailing list