diff -Nru awscli-1.16.63/awscli/customizations/argrename.py awscli-1.16.81/awscli/customizations/argrename.py
--- awscli-1.16.63/awscli/customizations/argrename.py 2018-11-28 00:41:29.000000000 +0000
+++ awscli-1.16.81/awscli/customizations/argrename.py 2018-12-21 22:23:35.000000000 +0000
@@ -52,6 +52,8 @@
'route53domains.view-billing.start': 'start-time',
'route53domains.view-billing.end': 'end-time',
'apigateway.create-rest-api.version': 'api-version',
+ 'apigatewayv2.create-api.version': 'api-version',
+ 'apigatewayv2.update-api.version': 'api-version',
'pinpoint.get-campaign-version.version': 'campaign-version',
'pinpoint.get-segment-version.version': 'segment-version',
'stepfunctions.send-task-success.output': 'task-output',
@@ -72,6 +74,7 @@
'mobile.create-project.region': 'project-region',
'rekognition.create-stream-processor.output': 'stream-processor-output',
'eks.create-cluster.version': 'kubernetes-version',
+ 'eks.update-cluster-version.version': 'kubernetes-version',
}
# Same format as ARGUMENT_RENAMES, but instead of renaming the arguments,
diff -Nru awscli-1.16.63/awscli/customizations/awslambda.py awscli-1.16.81/awscli/customizations/awslambda.py
--- awscli-1.16.63/awscli/customizations/awslambda.py 2018-11-28 00:41:28.000000000 +0000
+++ awscli-1.16.81/awscli/customizations/awslambda.py 2018-12-21 22:23:35.000000000 +0000
@@ -17,19 +17,23 @@
from botocore.vendored import six
from awscli.arguments import CustomArgument, CLIArgument
-from awscli.customizations import utils
+
ERROR_MSG = (
"--zip-file must be a zip file with the fileb:// prefix.\n"
"Example usage: --zip-file fileb://path/to/file.zip")
-ZIP_DOCSTRING = ('The path to the zip file of the code you are uploading. '
- 'Example: fileb://code.zip
')
+ZIP_DOCSTRING = (
+ 'The path to the zip file of the {param_type} you are uploading. '
+ 'Example: fileb://{param_type}.zip
'
+)
def register_lambda_create_function(cli):
cli.register('building-argument-table.lambda.create-function',
- _extract_code_and_zip_file_arguments)
+ ZipFileArgumentHoister('Code').hoist)
+ cli.register('building-argument-table.lambda.publish-layer-version',
+ ZipFileArgumentHoister('Content').hoist)
cli.register('building-argument-table.lambda.update-function-code',
_modify_zipfile_docstring)
cli.register('process-cli-arg.lambda.update-function-code',
@@ -41,20 +45,36 @@
_should_contain_zip_content(value)
-def _extract_code_and_zip_file_arguments(session, argument_table, **kwargs):
- argument_table['zip-file'] = ZipFileArgument(
- 'zip-file', help_text=ZIP_DOCSTRING, cli_type_name='blob')
- code_argument = argument_table['code']
- code_model = copy.deepcopy(code_argument.argument_model)
- del code_model.members['ZipFile']
- argument_table['code'] = CodeArgument(
- name='code',
- argument_model=code_model,
- operation_model=code_argument._operation_model,
- is_required=False,
- event_emitter=session.get_component('event_emitter'),
- serialized_name='Code'
- )
+class ZipFileArgumentHoister(object):
+ """Hoists a ZipFile argument up to the top level.
+
+ Injects a top-level ZipFileArgument into the argument table which maps
+ a --zip-file parameter to the underlying ``serialized_name`` ZipFile
+ shape. Repalces the old ZipFile argument with an instance of
+ ReplacedZipFileArgument to prevent its usage and recommend the new
+ top-level injected parameter.
+ """
+ def __init__(self, serialized_name):
+ self._serialized_name = serialized_name
+ self._name = serialized_name.lower()
+
+ def hoist(self, session, argument_table, **kwargs):
+ help_text = ZIP_DOCSTRING.format(param_type=self._name)
+ argument_table['zip-file'] = ZipFileArgument(
+ 'zip-file', help_text=help_text, cli_type_name='blob',
+ serialized_name=self._serialized_name
+ )
+ argument = argument_table[self._name]
+ model = copy.deepcopy(argument.argument_model)
+ del model.members['ZipFile']
+ argument_table[self._name] = ReplacedZipFileArgument(
+ name=self._name,
+ argument_model=model,
+ operation_model=argument._operation_model,
+ is_required=False,
+ event_emitter=session.get_component('event_emitter'),
+ serialized_name=self._serialized_name,
+ )
def _modify_zipfile_docstring(session, argument_table, **kwargs):
@@ -78,28 +98,54 @@
class ZipFileArgument(CustomArgument):
+ """A new ZipFile argument to be injected at the top level.
+
+ This class injects a ZipFile argument under the specified serialized_name
+ parameter. This can be used to take a top level parameter like --zip-file
+ and inject it into a nested different parameter like Code so
+ --zip-file foo.zip winds up being serilized as
+ { 'Code': { 'ZipFile': } }.
+ """
+ def __init__(self, *args, **kwargs):
+ self._param_to_replace = kwargs.pop('serialized_name')
+ super(ZipFileArgument, self).__init__(*args, **kwargs)
+
def add_to_params(self, parameters, value):
if value is None:
return
_should_contain_zip_content(value)
zip_file_param = {'ZipFile': value}
- if parameters.get('Code'):
- parameters['Code'].update(zip_file_param)
+ if parameters.get(self._param_to_replace):
+ parameters[self._param_to_replace].update(zip_file_param)
else:
- parameters['Code'] = zip_file_param
+ parameters[self._param_to_replace] = zip_file_param
+
+
+class ReplacedZipFileArgument(CLIArgument):
+ """A replacement arugment for nested ZipFile argument.
+ This prevents the use of a non-working nested argument that expects binary.
+ Instead an instance of ZipFileArgument should be injected at the top level
+ and used instead. That way fileb:// can be used to load the binary
+ contents. And the argument class can inject those bytes into the correct
+ serialization name.
+ """
+ def __init__(self, *args, **kwargs):
+ super(ReplacedZipFileArgument, self).__init__(*args, **kwargs)
+ self._cli_name = '--%s' % kwargs['name']
+ self._param_to_replace = kwargs['serialized_name']
-class CodeArgument(CLIArgument):
def add_to_params(self, parameters, value):
if value is None:
return
unpacked = self._unpack_argument(value)
if 'ZipFile' in unpacked:
- raise ValueError("ZipFile cannot be provided "
- "as part of the --code argument. "
- "Please use the '--zip-file' "
- "option instead to specify a zip file.")
- if parameters.get('Code'):
- parameters['Code'].update(unpacked)
+ raise ValueError(
+ "ZipFile cannot be provided "
+ "as part of the %s argument. "
+ "Please use the '--zip-file' "
+ "option instead to specify a zip file." % self._cli_name)
+ if parameters.get(self._param_to_replace):
+ parameters[self._param_to_replace].update(unpacked)
else:
- parameters['Code'] = unpacked
+ parameters[self._param_to_replace] = unpacked
diff -Nru awscli-1.16.63/awscli/customizations/cloudformation/artifact_exporter.py awscli-1.16.81/awscli/customizations/cloudformation/artifact_exporter.py
--- awscli-1.16.63/awscli/customizations/cloudformation/artifact_exporter.py 2018-11-28 00:41:28.000000000 +0000
+++ awscli-1.16.81/awscli/customizations/cloudformation/artifact_exporter.py 2018-12-21 22:23:35.000000000 +0000
@@ -370,6 +370,33 @@
VERSION_PROPERTY = None
+class LambdaLayerVersionResource(ResourceWithS3UrlDict):
+ RESOURCE_TYPE = "AWS::Lambda::LayerVersion"
+ PROPERTY_NAME = "Content"
+ BUCKET_NAME_PROPERTY = "S3Bucket"
+ OBJECT_KEY_PROPERTY = "S3Key"
+ VERSION_PROPERTY = "S3ObjectVersion"
+ FORCE_ZIP = True
+
+
+class ServerlessLayerVersionResource(Resource):
+ RESOURCE_TYPE = "AWS::Serverless::LayerVersion"
+ PROPERTY_NAME = "ContentUri"
+ FORCE_ZIP = True
+
+
+class ServerlessRepoApplicationReadme(Resource):
+ RESOURCE_TYPE = "AWS::ServerlessRepo::Application"
+ PROPERTY_NAME = "ReadmeUrl"
+ PACKAGE_NULL_PROPERTY = False
+
+
+class ServerlessRepoApplicationLicense(Resource):
+ RESOURCE_TYPE = "AWS::ServerlessRepo::Application"
+ PROPERTY_NAME = "LicenseUrl"
+ PACKAGE_NULL_PROPERTY = False
+
+
class CloudFormationStackResource(Resource):
"""
Represents CloudFormation::Stack resource that can refer to a nested
@@ -420,7 +447,16 @@
parts["Key"], parts.get("Version", None))
-EXPORT_LIST = [
+class ServerlessApplicationResource(CloudFormationStackResource):
+ """
+ Represents Serverless::Application resource that can refer to a nested
+ app template via Location property.
+ """
+ RESOURCE_TYPE = "AWS::Serverless::Application"
+ PROPERTY_NAME = "Location"
+
+
+RESOURCES_EXPORT_LIST = [
ServerlessFunctionResource,
ServerlessApiResource,
GraphQLSchemaResource,
@@ -429,9 +465,18 @@
ApiGatewayRestApiResource,
LambdaFunctionResource,
ElasticBeanstalkApplicationVersion,
- CloudFormationStackResource
+ CloudFormationStackResource,
+ ServerlessApplicationResource,
+ ServerlessLayerVersionResource,
+ LambdaLayerVersionResource,
+]
+
+METADATA_EXPORT_LIST = [
+ ServerlessRepoApplicationReadme,
+ ServerlessRepoApplicationLicense
]
+
def include_transform_export_handler(template_dict, uploader):
if template_dict.get("Name", None) != "AWS::Include":
return template_dict
@@ -440,6 +485,7 @@
template_dict["Parameters"]["Location"] = uploader.upload_with_dedup(include_location)
return template_dict
+
GLOBAL_EXPORT_DICT = {
"Fn::Transform": include_transform_export_handler
}
@@ -451,7 +497,8 @@
"""
def __init__(self, template_path, parent_dir, uploader,
- resources_to_export=EXPORT_LIST):
+ resources_to_export=RESOURCES_EXPORT_LIST,
+ metadata_to_export=METADATA_EXPORT_LIST):
"""
Reads the template and makes it ready for export
"""
@@ -470,13 +517,14 @@
self.template_dict = yaml_parse(template_str)
self.template_dir = template_dir
self.resources_to_export = resources_to_export
+ self.metadata_to_export = metadata_to_export
self.uploader = uploader
def export_global_artifacts(self, template_dict):
"""
- Template params such as AWS::Include transforms are not specific to
+ Template params such as AWS::Include transforms are not specific to
any resource type but contain artifacts that should be exported,
- here we iterate through the template dict and export params with a
+ here we iterate through the template dict and export params with a
handler defined in GLOBAL_EXPORT_DICT
"""
for key, val in template_dict.items():
@@ -490,6 +538,26 @@
self.export_global_artifacts(item)
return template_dict
+ def export_metadata(self, template_dict):
+ """
+ Exports the local artifacts referenced by the metadata section in
+ the given template to an s3 bucket.
+
+ :return: The template with references to artifacts that have been
+ exported to s3.
+ """
+ if "Metadata" not in template_dict:
+ return template_dict
+
+ for metadata_type, metadata_dict in template_dict["Metadata"].items():
+ for exporter_class in self.metadata_to_export:
+ if exporter_class.RESOURCE_TYPE != metadata_type:
+ continue
+
+ exporter = exporter_class(self.uploader)
+ exporter.export(metadata_type, metadata_dict, self.template_dir)
+
+ return template_dict
def export(self):
"""
@@ -499,6 +567,8 @@
:return: The template with references to artifacts that have been
exported to s3.
"""
+ self.template_dict = self.export_metadata(self.template_dict)
+
if "Resources" not in self.template_dict:
return self.template_dict
diff -Nru awscli-1.16.63/awscli/customizations/ecs/deploy.py awscli-1.16.81/awscli/customizations/ecs/deploy.py
--- awscli-1.16.63/awscli/customizations/ecs/deploy.py 2018-11-28 00:41:29.000000000 +0000
+++ awscli-1.16.81/awscli/customizations/ecs/deploy.py 2018-12-21 22:23:35.000000000 +0000
@@ -100,7 +100,10 @@
MSG_CREATED_DEPLOYMENT = "Successfully created deployment {id}\n"
- MSG_WAITING = "Waiting for {deployment_id} to succeed..."
+ MSG_WAITING = "Waiting for {deployment_id} to succeed...\n"
+
+ MSG_SUCCESS = ("Successfully deployed {task_def} to "
+ "service '{service}'\n")
def _run_main(self, parsed_args, parsed_globals):
@@ -140,6 +143,12 @@
sys.stdout.flush()
deployer.wait_for_deploy_success(deployment_id)
+ service_name = self.resources['service']
+
+ sys.stdout.write(
+ self.MSG_SUCCESS.format(
+ task_def=self.task_def_arn, service=service_name))
+ sys.stdout.flush()
def _get_file_contents(self, file_path):
full_path = os.path.expandvars(os.path.expanduser(file_path))
diff -Nru awscli-1.16.63/awscli/customizations/ecs/filehelpers.py awscli-1.16.81/awscli/customizations/ecs/filehelpers.py
--- awscli-1.16.63/awscli/customizations/ecs/filehelpers.py 2018-11-28 00:41:29.000000000 +0000
+++ awscli-1.16.81/awscli/customizations/ecs/filehelpers.py 2018-12-21 22:23:35.000000000 +0000
@@ -78,4 +78,4 @@
try:
return json.loads(appspec_str)
except ValueError:
- return yaml.load(appspec_str)
+ return yaml.safe_load(appspec_str)
diff -Nru awscli-1.16.63/awscli/examples/budgets/create-budget.rst awscli-1.16.81/awscli/examples/budgets/create-budget.rst
--- awscli-1.16.63/awscli/examples/budgets/create-budget.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/budgets/create-budget.rst 2018-12-21 22:23:35.000000000 +0000
@@ -0,0 +1,57 @@
+**To create a Cost and Usage budget**
+
+This example creates a Cost and Usage budget.
+
+Command::
+
+ aws budgets create-budget --account-id 111122223333 --budget file://budget.json --notifications-with-subscribers file://notifications-with-subscribers.json
+
+budget.json::
+
+ {
+ "BudgetLimit": {
+ "Amount": "100",
+ "Unit": "USD"
+ },
+ "BudgetName": "Example Budget",
+ "BudgetType": "COST",
+ "CostFilters": {
+ "AZ" : [ "us-east-1" ]
+ },
+ "CostTypes": {
+ "IncludeCredit": true,
+ "IncludeDiscount": true,
+ "IncludeOtherSubscription": true,
+ "IncludeRecurring": true,
+ "IncludeRefund": true,
+ "IncludeSubscription": true,
+ "IncludeSupport": true,
+ "IncludeTax": true,
+ "IncludeUpfront": true,
+ "UseBlended": false
+ },
+ "TimePeriod": {
+ "Start": 1477958399,
+ "End": 3706473600
+ },
+ "TimeUnit": "MONTHLY"
+ }
+
+notifications-with-subscribers.json::
+
+ [
+ {
+ "Notification": {
+ "ComparisonOperator": "GREATER_THAN",
+ "NotificationType": "ACTUAL",
+ "Threshold": 80,
+ "ThresholdType": "PERCENTAGE"
+ },
+ "Subscribers": [
+ {
+ "Address": "example@example.com",
+ "SubscriptionType": "EMAIL"
+ }
+ ]
+ }
+ ]
diff -Nru awscli-1.16.63/awscli/examples/budgets/create-notification.rst awscli-1.16.81/awscli/examples/budgets/create-notification.rst
--- awscli-1.16.63/awscli/examples/budgets/create-notification.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/budgets/create-notification.rst 2018-12-21 22:23:35.000000000 +0000
@@ -0,0 +1,8 @@
+**To create a notification for the specified Cost and Usage budget**
+
+This example creates a notification for the specified Cost and Usage budget.
+
+Command::
+
+ aws budgets create-notification --account-id 111122223333 --budget-name "Example Budget" --notification NotificationType=ACTUAL,ComparisonOperator=GREATER_THAN,Threshold=80,ThresholdType=PERCENTAGE --subscriber SubscriptionType=EMAIL,Address=example@example.com
+
diff -Nru awscli-1.16.63/awscli/examples/budgets/create-subscriber.rst awscli-1.16.81/awscli/examples/budgets/create-subscriber.rst
--- awscli-1.16.63/awscli/examples/budgets/create-subscriber.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/budgets/create-subscriber.rst 2018-12-21 22:23:35.000000000 +0000
@@ -0,0 +1,8 @@
+**To create a subscriber for a notification associated with a Cost and Usage budget**
+
+This example creates a subscriber for the specified notification.
+
+Command::
+
+ aws budgets create-subscriber --account-id 111122223333 --budget-name "Example Budget" --notification NotificationType=ACTUAL,ComparisonOperator=GREATER_THAN,Threshold=80,ThresholdType=PERCENTAGE --subscriber SubscriptionType=EMAIL,Address=example@example.com
+
diff -Nru awscli-1.16.63/awscli/examples/budgets/delete-budget.rst awscli-1.16.81/awscli/examples/budgets/delete-budget.rst
--- awscli-1.16.63/awscli/examples/budgets/delete-budget.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/budgets/delete-budget.rst 2018-12-21 22:23:35.000000000 +0000
@@ -0,0 +1,8 @@
+**To delete a Cost and Usage budget**
+
+This example deletes the specified Cost and Usage budget.
+
+Command::
+
+ aws budgets delete-budget --account-id 111122223333 --budget-name "Example Budget"
+
diff -Nru awscli-1.16.63/awscli/examples/budgets/delete-notification.rst awscli-1.16.81/awscli/examples/budgets/delete-notification.rst
--- awscli-1.16.63/awscli/examples/budgets/delete-notification.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/budgets/delete-notification.rst 2018-12-21 22:23:35.000000000 +0000
@@ -0,0 +1,8 @@
+**To delete a notification from a budget**
+
+This example deletes the specified notification from the specified budget.
+
+Command::
+
+ aws budgets delete-notification --account-id 111122223333 --budget-name "Example Budget" --notification NotificationType=ACTUAL,ComparisonOperator=GREATER_THAN,Threshold=80,ThresholdType=PERCENTAGE
+
diff -Nru awscli-1.16.63/awscli/examples/budgets/delete-subscriber.rst awscli-1.16.81/awscli/examples/budgets/delete-subscriber.rst
--- awscli-1.16.63/awscli/examples/budgets/delete-subscriber.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/budgets/delete-subscriber.rst 2018-12-21 22:23:35.000000000 +0000
@@ -0,0 +1,8 @@
+**To delete a subscriber from a notification**
+
+This example deletes the specified subscriber from the specified notification.
+
+Command::
+
+ aws budgets delete-subscriber --account-id 111122223333 --budget-name "Example Budget" --notification NotificationType=ACTUAL,ComparisonOperator=GREATER_THAN,Threshold=80,ThresholdType=PERCENTAGE --subscriber SubscriptionType=EMAIL,Address=example@example.com
+
diff -Nru awscli-1.16.63/awscli/examples/budgets/describe-budget.rst awscli-1.16.81/awscli/examples/budgets/describe-budget.rst
--- awscli-1.16.63/awscli/examples/budgets/describe-budget.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/budgets/describe-budget.rst 2018-12-21 22:23:35.000000000 +0000
@@ -0,0 +1,54 @@
+**To retrieve a budget associated with an account**
+
+This example retrieves the specified Cost and Usage budget.
+
+Command::
+
+ aws budgets describe-budget --account-id 111122223333 --budget-name "Example Budget"
+
+Output::
+
+ {
+ "Budget": {
+ "CalculatedSpend": {
+ "ForecastedSpend": {
+ "Amount": "2641.54800000000022919266484677791595458984375",
+ "Unit": "USD"
+ },
+ "ActualSpend": {
+ "Amount": "604.4560000000000172803993336856365203857421875",
+ "Unit": "USD"
+ }
+ },
+ "BudgetType": "COST",
+ "BudgetLimit": {
+ "Amount": "100",
+ "Unit": "USD"
+ },
+ "BudgetName": "Example Budget",
+ "CostTypes": {
+ "IncludeOtherSubscription": true,
+ "IncludeUpfront": true,
+ "IncludeRefund": true,
+ "UseBlended": false,
+ "IncludeDiscount": true,
+ "UseAmortized": false,
+ "IncludeTax": true,
+ "IncludeCredit": true,
+ "IncludeSupport": true,
+ "IncludeRecurring": true,
+ "IncludeSubscription": true
+ },
+ "TimeUnit": "MONTHLY",
+ "TimePeriod": {
+ "Start": 1477958399.0,
+ "End": 3706473600.0
+ },
+ "CostFilters": {
+ "AZ": [
+ "us-east-1"
+ ]
+ }
+ }
+ }
+
diff -Nru awscli-1.16.63/awscli/examples/budgets/describe-budgets.rst awscli-1.16.81/awscli/examples/budgets/describe-budgets.rst
--- awscli-1.16.63/awscli/examples/budgets/describe-budgets.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/budgets/describe-budgets.rst 2018-12-21 22:23:35.000000000 +0000
@@ -0,0 +1,58 @@
+
+
+**To retrieve the budgets associated with an account**
+
+This example retrieves the Cost and Usage budgets for an account.
+
+Command::
+
+ aws budgets describe-budgets --account-id 111122223333 --max-results 20
+
+Output::
+
+ {
+ "Budgets": [
+ {
+ "CalculatedSpend": {
+ "ForecastedSpend": {
+ "Amount": "2641.54800000000022919266484677791595458984375",
+ "Unit": "USD"
+ },
+ "ActualSpend": {
+ "Amount": "604.4560000000000172803993336856365203857421875",
+ "Unit": "USD"
+ }
+ },
+ "BudgetType": "COST",
+ "BudgetLimit": {
+ "Amount": "100",
+ "Unit": "USD"
+ },
+ "BudgetName": "Example Budget",
+ "CostTypes": {
+ "IncludeOtherSubscription": true,
+ "IncludeUpfront": true,
+ "IncludeRefund": true,
+ "UseBlended": false,
+ "IncludeDiscount": true,
+ "UseAmortized": false,
+ "IncludeTax": true,
+ "IncludeCredit": true,
+ "IncludeSupport": true,
+ "IncludeRecurring": true,
+ "IncludeSubscription": true
+ },
+ "TimeUnit": "MONTHLY",
+ "TimePeriod": {
+ "Start": 1477958399.0,
+ "End": 3706473600.0
+ },
+ "CostFilters": {
+ "AZ": [
+ "us-east-1"
+ ]
+ }
+ }
+ ]
+ }
+
diff -Nru awscli-1.16.63/awscli/examples/budgets/describe-notifications-for-budget.rst awscli-1.16.81/awscli/examples/budgets/describe-notifications-for-budget.rst
--- awscli-1.16.63/awscli/examples/budgets/describe-notifications-for-budget.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/budgets/describe-notifications-for-budget.rst 2018-12-21 22:23:35.000000000 +0000
@@ -0,0 +1,19 @@
+**To retrieve the notifications for a budget**
+
+This example retrieves the notifications for a Cost and Usage budget.
+
+Command::
+
+ aws budgets describe-notifications-for-budget --account-id 111122223333 --budget-name "Example Budget" --max-results 5
+
+Output::
+
+ {
+ "Notifications": [
+ {
+ "Threshold": 80.0,
+ "ComparisonOperator": "GREATER_THAN",
+ "NotificationType": "ACTUAL"
+ }
+ ]
+ }
diff -Nru awscli-1.16.63/awscli/examples/budgets/describe-subscribers-for-notification.rst awscli-1.16.81/awscli/examples/budgets/describe-subscribers-for-notification.rst
--- awscli-1.16.63/awscli/examples/budgets/describe-subscribers-for-notification.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/budgets/describe-subscribers-for-notification.rst 2018-12-21 22:23:35.000000000 +0000
@@ -0,0 +1,22 @@
+**To retrieve the subscribers for a budget notification**
+
+This example retrieves the subscribers for a Cost and Usage budget notification.
+
+Command::
+
+ aws budgets describe-subscribers-for-notification --account-id 111122223333 --budget-name "Example Budget" --notification NotificationType=ACTUAL,ComparisonOperator=GREATER_THAN,Threshold=80,ThresholdType=PERCENTAGE --max-results 5
+
+Output::
+
+ {
+ "Subscribers": [
+ {
+ "SubscriptionType": "EMAIL",
+ "Address": "example2@example.com"
+ },
+ {
+ "SubscriptionType": "EMAIL",
+ "Address": "example@example.com"
+ }
+ ]
+ }
diff -Nru awscli-1.16.63/awscli/examples/budgets/update-budget.rst awscli-1.16.81/awscli/examples/budgets/update-budget.rst
--- awscli-1.16.63/awscli/examples/budgets/update-budget.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/budgets/update-budget.rst 2018-12-21 22:23:35.000000000 +0000
@@ -0,0 +1,40 @@
+**To replace a budget for a Cost and Usage budget**
+
+This example replaces a Cost and Usage budget with a new budget.
+
+Command::
+
+ aws budgets update-budget --account-id 111122223333 --new-budget file://new-budget.json
+
+new-budget.json::
+
+ {
+ "BudgetLimit": {
+ "Amount": "100",
+ "Unit": "USD"
+ },
+ "BudgetName": "Example Budget",
+ "BudgetType": "COST",
+ "CostFilters": {
+ "AZ" : [ "us-east-1" ]
+ },
+ "CostTypes": {
+ "IncludeCredit": false,
+ "IncludeDiscount": true,
+ "IncludeOtherSubscription": true,
+ "IncludeRecurring": true,
+ "IncludeRefund": true,
+ "IncludeSubscription": true,
+ "IncludeSupport": true,
+ "IncludeTax": true,
+ "IncludeUpfront": true,
+ "UseBlended": false,
+ "UseAmortized": true
+ },
+ "TimePeriod": {
+ "Start": 1477958399,
+ "End": 3706473600
+ },
+ "TimeUnit": "MONTHLY"
+ }
+
diff -Nru awscli-1.16.63/awscli/examples/budgets/update-notification.rst awscli-1.16.81/awscli/examples/budgets/update-notification.rst
--- awscli-1.16.63/awscli/examples/budgets/update-notification.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/budgets/update-notification.rst 2018-12-21 22:23:35.000000000 +0000
@@ -0,0 +1,8 @@
+**To replace a notification for a Cost and Usage budget**
+
+This example replaces an 80% notification for a Cost and Usage budget with a 90% notification.
+
+Command::
+
+ aws budgets update-notification --account-id 111122223333 --budget-name "Example Budget" --old-notification NotificationType=ACTUAL,ComparisonOperator=GREATER_THAN,Threshold=80,ThresholdType=PERCENTAGE --new-notification NotificationType=ACTUAL,ComparisonOperator=GREATER_THAN,Threshold=90,ThresholdType=PERCENTAGE
+
diff -Nru awscli-1.16.63/awscli/examples/budgets/update-subscriber.rst awscli-1.16.81/awscli/examples/budgets/update-subscriber.rst
--- awscli-1.16.63/awscli/examples/budgets/update-subscriber.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/budgets/update-subscriber.rst 2018-12-21 22:23:35.000000000 +0000
@@ -0,0 +1,7 @@
+**To replace a subscriber for a Cost and Usage budget**
+
+This example replaces the subscriber for a Cost and Usage budget.
+
+Command::
+
+ aws budgets update-subscriber --account-id 111122223333 --budget-name "Example Budget" --notification NotificationType=ACTUAL,ComparisonOperator=GREATER_THAN,Threshold=80,ThresholdType=PERCENTAGE --old-subscriber SubscriptionType=EMAIL,Address=example@example.com --new-subscriber SubscriptionType=EMAIL,Address=example2@example.com
diff -Nru awscli-1.16.63/awscli/examples/ce/get-cost-and-usage.rst awscli-1.16.81/awscli/examples/ce/get-cost-and-usage.rst
--- awscli-1.16.63/awscli/examples/ce/get-cost-and-usage.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/ce/get-cost-and-usage.rst 2018-12-21 22:23:35.000000000 +0000
@@ -0,0 +1,88 @@
+
+**To retrieve the S3 usage of an account for the month of September 2017**
+
+This example retrieves the S3 usage of an account for the month of September 2017.
+
+Command::
+
+ aws ce get-cost-and-usage --time-period Start=2017-09-01,End=2017-10-01 --granularity MONTHLY --metrics "BlendedCost" "UnblendedCost" "UsageQuantity" --group-by Type=DIMENSION,Key=SERVICE Type=TAG,Key=Environment --filter file://filters.json
+
+filters.json::
+ {
+ "Dimensions": {
+ "Key": "SERVICE",
+ "Values": [
+ "Amazon Simple Storage Service"
+ ]
+ }
+ }
+
+
+Output::
+
+ {
+ "GroupDefinitions": [
+ {
+ "Type": "DIMENSION",
+ "Key": "SERVICE"
+ },
+ {
+ "Type": "TAG",
+ "Key": "Environment"
+ }
+ ],
+ "ResultsByTime": [
+ {
+ "Estimated": false,
+ "TimePeriod": {
+ "Start": "2017-09-01",
+ "End": "2017-10-01"
+ },
+ "Total": {},
+ "Groups": [
+ {
+ "Keys": [
+ "Amazon Simple Storage Service",
+ "Environment$"
+ ],
+ "Metrics": {
+ "BlendedCost": {
+ "Amount": "40.3527508453",
+ "Unit": "USD"
+ },
+ "UnblendedCost": {
+ "Amount": "40.3543773134",
+ "Unit": "USD"
+ },
+ "UsageQuantity": {
+ "Amount": "9312771.098461578",
+ "Unit": "N/A"
+ }
+ }
+ },
+ {
+ "Keys": [
+ "Amazon Simple Storage Service",
+ "Environment$Dev"
+ ],
+ "Metrics": {
+ "BlendedCost": {
+ "Amount": "0.2682364644",
+ "Unit": "USD"
+ },
+ "UnblendedCost": {
+ "Amount": "0.2682364644",
+ "Unit": "USD"
+ },
+ "UsageQuantity": {
+ "Amount": "22403.4395271182",
+ "Unit": "N/A"
+ }
+ }
+ }
+ ]
+ }
+ ]
+ }
+
+
diff -Nru awscli-1.16.63/awscli/examples/ce/get-dimension-values.rst awscli-1.16.81/awscli/examples/ce/get-dimension-values.rst
--- awscli-1.16.63/awscli/examples/ce/get-dimension-values.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/ce/get-dimension-values.rst 2018-12-21 22:23:35.000000000 +0000
@@ -0,0 +1,41 @@
+
+**To retrieve the tags for the dimension SERVICE, with a value of "Elastic"**
+
+This example retrieves the tags for the dimension SERVICE, with a value of "Elastic" for January 01 2017 through May 18 2017.
+
+Command::
+
+ aws ce get-dimension-values --search-string Elastic --time-period Start=2017-01-01,End=2017-05-18 --dimension SERVICE
+
+Output::
+
+ {
+ "TotalSize": 6,
+ "DimensionValues": [
+ {
+ "Attributes": {},
+ "Value": "Amazon ElastiCache"
+ },
+ {
+ "Attributes": {},
+ "Value": "EC2 - Other"
+ },
+ {
+ "Attributes": {},
+ "Value": "Amazon Elastic Compute Cloud - Compute"
+ },
+ {
+ "Attributes": {},
+ "Value": "Amazon Elastic Load Balancing"
+ },
+ {
+ "Attributes": {},
+ "Value": "Amazon Elastic MapReduce"
+ },
+ {
+ "Attributes": {},
+ "Value": "Amazon Elasticsearch Service"
+ }
+ ],
+ "ReturnSize": 6
+ }
diff -Nru awscli-1.16.63/awscli/examples/ce/get-reservation-coverage.rst awscli-1.16.81/awscli/examples/ce/get-reservation-coverage.rst
--- awscli-1.16.63/awscli/examples/ce/get-reservation-coverage.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/ce/get-reservation-coverage.rst 2018-12-21 22:23:35.000000000 +0000
@@ -0,0 +1,63 @@
+
+**To retrieve the reservation coverage for EC2 t2.nano instances in the us-east-1 region**
+
+This example retrieves the reservation coverage for EC2 t2.nano instances in the us-east-1 region for July-September of 2017.
+
+Command::
+
+ aws ce get-reservation-coverage --time-period Start=2017-07-01,End=2017-10-01 --group-by Type=Dimension,Key=REGION --filter file://filters.json
+
+filters.json::
+
+ {
+ "And": [
+ {
+ "Dimensions": {
+ "Key": "INSTANCE_TYPE",
+ "Values": [
+ "t2.nano"
+ ]
+ },
+ "Dimensions": {
+ "Key": "REGION",
+ "Values": [
+ "us-east-1"
+ ]
+ }
+ }
+ ]
+ }
+
+Output::
+
+ {
+ "TotalSize": 6,
+ "DimensionValues": [
+ {
+ "Attributes": {},
+ "Value": "Amazon ElastiCache"
+ },
+ {
+ "Attributes": {},
+ "Value": "EC2 - Other"
+ },
+ {
+ "Attributes": {},
+ "Value": "Amazon Elastic Compute Cloud - Compute"
+ },
+ {
+ "Attributes": {},
+ "Value": "Amazon Elastic Load Balancing"
+ },
+ {
+ "Attributes": {},
+ "Value": "Amazon Elastic MapReduce"
+ },
+ {
+ "Attributes": {},
+ "Value": "Amazon Elasticsearch Service"
+ }
+ ],
+ "ReturnSize": 6
+ }
+
diff -Nru awscli-1.16.63/awscli/examples/ce/get-reservation-purchase-recommendation.rst awscli-1.16.81/awscli/examples/ce/get-reservation-purchase-recommendation.rst
--- awscli-1.16.63/awscli/examples/ce/get-reservation-purchase-recommendation.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/ce/get-reservation-purchase-recommendation.rst 2018-12-21 22:23:35.000000000 +0000
@@ -0,0 +1,17 @@
+**To retrieve the reservation recommendations for Partial Upfront EC2 RIs with a three year term**
+
+This example retrieves recommendations for Partial Upfront EC2 instances with a three-year term, based on the last 60 days of EC2 usage.
+
+Command::
+
+ aws ce get-reservation-purchase-recommendation --service "Amazon Redshift" --lookback-period-in-days SIXTY_DAYS --term-in-years THREE_YEARS --payment-option PARTIAL_UPFRONT
+
+Output::
+
+ {
+ "Recommendations": [],
+ "Metadata": {
+ "GenerationTimestamp": "2018-08-08T15:20:57Z",
+ "RecommendationId": "00d59dde-a1ad-473f-8ff2-iexample3330b"
+ }
+}
diff -Nru awscli-1.16.63/awscli/examples/ce/get-reservation-utilization.rst awscli-1.16.81/awscli/examples/ce/get-reservation-utilization.rst
--- awscli-1.16.63/awscli/examples/ce/get-reservation-utilization.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/ce/get-reservation-utilization.rst 2018-12-21 22:23:35.000000000 +0000
@@ -0,0 +1,36 @@
+**To retrieve the reservation utilization for your account**
+
+This example retrieves the RI utilization for all t2.nano instance types from 2018-03-01 to 2018-08-01 for the account.
+
+Command::
+
+ aws ce get-reservation-utilization --time-period Start=2018-03-01,End=2018-08-01 --filter file://filters.json
+
+filters.json::
+ {
+ "Dimensions": {
+ "Key": "INSTANCE_TYPE",
+ "Values": [
+ "t2.nano"
+ ]
+ }
+ }
+
+Output::
+
+ {
+ "Total": {
+ "TotalAmortizedFee": "0",
+ "UtilizationPercentage": "0",
+ "PurchasedHours": "0",
+ "NetRISavings": "0",
+ "TotalActualHours": "0",
+ "AmortizedRecurringFee": "0",
+ "UnusedHours": "0",
+ "TotalPotentialRISavings": "0",
+ "OnDemandCostOfRIHoursUsed": "0",
+ "AmortizedUpfrontFee": "0"
+ },
+ "UtilizationsByTime": []
+ }
+
diff -Nru awscli-1.16.63/awscli/examples/ce/get-tags.rst awscli-1.16.81/awscli/examples/ce/get-tags.rst
--- awscli-1.16.63/awscli/examples/ce/get-tags.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/ce/get-tags.rst 2018-12-21 22:23:35.000000000 +0000
@@ -0,0 +1,18 @@
+**To retrieve keys and values for a cost allocation tag**
+
+This example retrieves all cost allocation tags with a key of "Project" and a value that contains "secretProject".
+
+Command::
+
+ aws ce get-tags --search-string secretProject --time-period Start=2017-01-01,End=2017-05-18 --tag-key Project
+
+Output::
+
+ {
+ "ReturnSize": 2,
+ "Tags": [
+ "secretProject1",
+ "secretProject2"
+ ],
+ "TotalSize": 2
+ }
diff -Nru awscli-1.16.63/awscli/examples/cur/delete-report-definition.rst awscli-1.16.81/awscli/examples/cur/delete-report-definition.rst
--- awscli-1.16.63/awscli/examples/cur/delete-report-definition.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/cur/delete-report-definition.rst 2018-12-21 22:23:35.000000000 +0000
@@ -0,0 +1,7 @@
+**To delete an AWS Cost and Usage Report**
+
+This example deletes an AWS Cost and Usage Report.
+
+Command::
+
+ aws cur --region us-east-1 delete-report-definition --report-name "ExampleReport"
diff -Nru awscli-1.16.63/awscli/examples/cur/describe-report-definitions.rst awscli-1.16.81/awscli/examples/cur/describe-report-definitions.rst
--- awscli-1.16.63/awscli/examples/cur/describe-report-definitions.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/cur/describe-report-definitions.rst 2018-12-21 22:23:35.000000000 +0000
@@ -0,0 +1,31 @@
+
+**To retrieve a list of AWS Cost and Usage Reports**
+
+This example describes a list of AWS Cost and Usage Reports owned by an account.
+
+Command::
+
+ aws cur --region us-east-1 describe-report-definitions --max-items 5
+
+Output::
+
+ {
+ "ReportDefinitions": [
+ {
+ "ReportName": "ExampleReport",
+ "Compression": "ZIP",
+ "S3Region": "us-east-1",
+ "Format": "textORcsv",
+ "S3Prefix": "exampleprefix",
+ "S3Bucket": "example-s3-bucket",
+ "TimeUnit": "DAILY",
+ "AdditionalArtifacts": [
+ "REDSHIFT",
+ "QUICKSIGHT"
+ ],
+ "AdditionalSchemaElements": [
+ "RESOURCES"
+ ]
+ }
+ ]
+ }
diff -Nru awscli-1.16.63/awscli/examples/cur/put-report-definition.rst awscli-1.16.81/awscli/examples/cur/put-report-definition.rst
--- awscli-1.16.63/awscli/examples/cur/put-report-definition.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/cur/put-report-definition.rst 2018-12-21 22:23:35.000000000 +0000
@@ -0,0 +1,26 @@
+
+**To create an AWS Cost and Usage Reports**
+
+This example creates a daily AWS Cost and Usage Report that can be uploaded into Amazon Redshift or Amazon QuickSight.
+
+Command::
+
+ aws cur --region us-east-1 put-report-definition --report-definition file://report-definition.json
+
+report-definition.json::
+ {
+ "ReportName": "ExampleReport",
+ "TimeUnit": "DAILY",
+ "Format": "textORcsv",
+ "Compression": "ZIP",
+ "AdditionalSchemaElements": [
+ "RESOURCES"
+ ],
+ "S3Bucket": "example-s3-bucket",
+ "S3Prefix": "exampleprefix",
+ "S3Region": "us-east-1",
+ "AdditionalArtifacts": [
+ "REDSHIFT",
+ "QUICKSIGHT"
+ ]
+ }
diff -Nru awscli-1.16.63/awscli/examples/ec2/create-placement-group.rst awscli-1.16.81/awscli/examples/ec2/create-placement-group.rst
--- awscli-1.16.63/awscli/examples/ec2/create-placement-group.rst 2018-11-28 00:41:28.000000000 +0000
+++ awscli-1.16.81/awscli/examples/ec2/create-placement-group.rst 2018-12-21 22:23:35.000000000 +0000
@@ -5,3 +5,11 @@
Command::
aws ec2 create-placement-group --group-name my-cluster --strategy cluster
+
+**To create a partition placement group**
+
+This example command creates a partition placement group named ``HDFS-Group-A`` with five partitions.
+
+Command::
+
+ aws ec2 create-placement-group --group-name HDFS-Group-A --strategy partition --partition-count 5
diff -Nru awscli-1.16.63/awscli/examples/ec2/describe-availability-zones.rst awscli-1.16.81/awscli/examples/ec2/describe-availability-zones.rst
--- awscli-1.16.63/awscli/examples/ec2/describe-availability-zones.rst 2018-11-28 00:41:28.000000000 +0000
+++ awscli-1.16.81/awscli/examples/ec2/describe-availability-zones.rst 2018-12-21 22:23:35.000000000 +0000
@@ -12,21 +12,24 @@
"AvailabilityZones": [
{
"State": "available",
- "RegionName": "us-east-1",
"Messages": [],
- "ZoneName": "us-east-1b"
+ "RegionName": "us-west-2",
+ "ZoneName": "us-west-2a",
+ "ZoneId": "usw2-az2"
},
{
"State": "available",
- "RegionName": "us-east-1",
"Messages": [],
- "ZoneName": "us-east-1c"
+ "RegionName": "us-west-2",
+ "ZoneName": "us-west-2b",
+ "ZoneId": "usw2-az1"
},
{
"State": "available",
- "RegionName": "us-east-1",
"Messages": [],
- "ZoneName": "us-east-1d"
+ "RegionName": "us-west-2",
+ "ZoneName": "us-west-2c",
+ "ZoneId": "usw2-az3"
}
]
}
diff -Nru awscli-1.16.63/awscli/examples/ec2/run-instances.rst awscli-1.16.81/awscli/examples/ec2/run-instances.rst
--- awscli-1.16.63/awscli/examples/ec2/run-instances.rst 2018-11-28 00:41:28.000000000 +0000
+++ awscli-1.16.81/awscli/examples/ec2/run-instances.rst 2018-12-21 22:23:35.000000000 +0000
@@ -301,26 +301,26 @@
aws ec2 run-instances --image-id ami-abc12345 --count 1 --instance-type t2.micro --key-name MyKeyPair --subnet-id subnet-6e7f829e --tag-specifications 'ResourceType=instance,Tags=[{Key=webserver,Value=production}]' 'ResourceType=volume,Tags=[{Key=cost-center,Value=cc123}]'
-**To launch an instance with the credit option for CPU usage of "unlimited"**
+**To launch an instance with the credit option for CPU usage of ``unlimited``**
-You can launch an instance and specify the credit option for CPU usage for the instance. If you do not specify the credit option, the instance launches with the default "standard" credit option. The following example launches a t2.micro instance with the "unlimited" credit option.
+You can launch a burstable performance instance (T2 and T3) and specify the credit option for CPU usage for the instance. If you do not specify the credit option, a T2 instance launches with the default ``standard`` credit option and a T3 instance launches with the default ``unlimited`` credit option. The following example launches a t2.micro instance with the ``unlimited`` credit option.
Command::
aws ec2 run-instances --image-id ami-abc12345 --count 1 --instance-type t2.micro --key-name MyKeyPair --credit-specification CpuCredits=unlimited
-**To launch an instance with a custom number of vCPUs**
-
-This example launches an ``r4.4xlarge`` instance type with six vCPUs (three CPU cores multiplied by two threads per core).
-
+**To launch an instance into a partition placement group**
+
+You can launch an instance into a partition placement group without specifying the partition. In this example, the partition placement group is named ``HDFS-Group-A``.
+
Command::
-
- aws ec2 run-instances --image-id ami-1a2b3c4d --instance-type r4.4xlarge --cpu-options "CoreCount=3,ThreadsPerCore=2" --key-name MyKeyPair
-
-**To launch an instance and disable hyperthreading**
-
-This example launchs an ``r4.4xlarge`` instance type and disables hyperthreading by specifying one thread per core and specifying the default number of CPU cores for the instance type (eight).
-
+
+ aws ec2 run-instances --placement "GroupName = HDFS-Group-A"
+
+**To launch an instance into a specific partition of a partition placement group**
+
+You can launch an instance into a specific partition of a partition placement group by specifying the partition number. In this example, the partition placement group is named ``HDFS-Group-A`` and the partition number is ``3``.
+
Command::
-
- aws ec2 run-instances --image-id ami-1a2b3c4d --instance-type r4.4xlarge --cpu-options "CoreCount=8,ThreadsPerCore=1" --key-name MyKeyPair
\ No newline at end of file
+
+ aws ec2 run-instances --placement "GroupName = HDFS-Group-A, PartitionNumber = 3"
diff -Nru awscli-1.16.63/awscli/examples/elastictranscoder/cancel-job.rst awscli-1.16.81/awscli/examples/elastictranscoder/cancel-job.rst
--- awscli-1.16.63/awscli/examples/elastictranscoder/cancel-job.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/elastictranscoder/cancel-job.rst 2018-12-21 22:23:35.000000000 +0000
@@ -0,0 +1,8 @@
+**To cancel a job for ElasticTranscoder**
+
+This cancels the specified job for ElasticTranscoder.
+
+Command::
+
+ aws elastictranscoder cancel-job --id 3333333333333-abcde3
+
diff -Nru awscli-1.16.63/awscli/examples/elastictranscoder/create-job.rst awscli-1.16.81/awscli/examples/elastictranscoder/create-job.rst
--- awscli-1.16.63/awscli/examples/elastictranscoder/create-job.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/elastictranscoder/create-job.rst 2018-12-21 22:23:35.000000000 +0000
@@ -0,0 +1,92 @@
+
+**To create a job for ElasticTranscoder**
+
+This creates a job for ElasticTranscoder.
+
+Command::
+
+ aws elastictranscoder create-job --pipeline-id 1111111111111-abcde1 --inputs file://inputs.json --outputs file://outputs.json --output-key-prefix "recipes/" --user-metadata file://user-metadata.json
+
+inputs.json::
+ [{
+ "Key":"ETS_example_file.mp4",
+ "FrameRate":"auto",
+ "Resolution":"auto",
+ "AspectRatio":"auto",
+ "Interlaced":"auto",
+ "Container":"mp4"
+ }]
+
+outputs.json::
+ [
+ {
+ "Key":"webm/ETS_example_file-kindlefirehd.webm",
+ "Rotate":"0",
+ "PresetId":"1351620000001-100250"
+ }
+ ]
+
+user-metadata.json::
+ {
+ "Food type":"Italian",
+ "Cook book":"recipe notebook"
+ }
+
+
+Output::
+
+ {
+ "Job": {
+ "Status": "Submitted",
+ "Inputs": [
+ {
+ "Container": "mp4",
+ "FrameRate": "auto",
+ "Key": "ETS_example_file.mp4",
+ "AspectRatio": "auto",
+ "Resolution": "auto",
+ "Interlaced": "auto"
+ }
+ ],
+ "Playlists": [],
+ "Outputs": [
+ {
+ "Status": "Submitted",
+ "Rotate": "0",
+ "PresetId": "1351620000001-100250",
+ "Watermarks": [],
+ "Key": "webm/ETS_example_file-kindlefirehd.webm",
+ "Id": "1"
+ }
+ ],
+ "PipelineId": "3333333333333-abcde3",
+ "OutputKeyPrefix": "recipes/",
+ "UserMetadata": {
+ "Cook book": "recipe notebook",
+ "Food type": "Italian"
+ },
+ "Output": {
+ "Status": "Submitted",
+ "Rotate": "0",
+ "PresetId": "1351620000001-100250",
+ "Watermarks": [],
+ "Key": "webm/ETS_example_file-kindlefirehd.webm",
+ "Id": "1"
+ },
+ "Timing": {
+ "SubmitTimeMillis": 1533838012298
+ },
+ "Input": {
+ "Container": "mp4",
+ "FrameRate": "auto",
+ "Key": "ETS_example_file.mp4",
+ "AspectRatio": "auto",
+ "Resolution": "auto",
+ "Interlaced": "auto"
+ },
+ "Id": "1533838012294-example",
+ "Arn": "arn:aws:elastictranscoder:us-west-2:123456789012:job/1533838012294-example"
+ }
+ }
+
+
diff -Nru awscli-1.16.63/awscli/examples/elastictranscoder/create-pipeline.rst awscli-1.16.81/awscli/examples/elastictranscoder/create-pipeline.rst
--- awscli-1.16.63/awscli/examples/elastictranscoder/create-pipeline.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/elastictranscoder/create-pipeline.rst 2018-12-21 22:23:35.000000000 +0000
@@ -0,0 +1,91 @@
+
+**To create a pipeline for ElasticTranscoder**
+
+This creates a pipeline for ElasticTranscoder.
+
+Command::
+
+ aws elastictranscoder create-pipeline --name Default --input-bucket salesoffice.example.com-source --role arn:aws:iam::123456789012:role/Elastic_Transcoder_Default_Role --notifications Progressing="",Completed="",Warning="",Error=arn:aws:sns:us-east-1:111222333444:ETS_Errors --content-config file://content-config.json --thumbnail-config file://thumbnail-config.json
+
+content-config.json::
+ {
+ "Bucket":"salesoffice.example.com-public-promos",
+ "Permissions":[
+ {
+ "GranteeType":"Email",
+ "Grantee":"marketing-promos@example.com",
+ "Access":[
+ "FullControl"
+ ]
+ }
+ ],
+ "StorageClass":"Standard"
+ }
+
+thumbnail-config.json::
+ {
+ "Bucket":"salesoffice.example.com-public-promos-thumbnails",
+ "Permissions":[
+ {
+ "GranteeType":"Email",
+ "Grantee":"marketing-promos@example.com",
+ "Access":[
+ "FullControl"
+ ]
+ }
+ ],
+ "StorageClass":"ReducedRedundancy"
+ }
+
+
+Output::
+
+ {
+ "Pipeline": {
+ "Status": "Active",
+ "ContentConfig": {
+ "Bucket": "salesoffice.example.com-public-promos",
+ "StorageClass": "Standard",
+ "Permissions": [
+ {
+ "Access": [
+ "FullControl"
+ ],
+ "Grantee": "marketing-promos@example.com",
+ "GranteeType": "Email"
+ }
+ ]
+ },
+ "Name": "Default",
+ "ThumbnailConfig": {
+ "Bucket": "salesoffice.example.com-public-promos-thumbnails",
+ "StorageClass": "ReducedRedundancy",
+ "Permissions": [
+ {
+ "Access": [
+ "FullControl"
+ ],
+ "Grantee": "marketing-promos@example.com",
+ "GranteeType": "Email"
+ }
+ ]
+ },
+ "Notifications": {
+ "Completed": "",
+ "Warning": "",
+ "Progressing": "",
+ "Error": "arn:aws:sns:us-east-1:123456789012:ETS_Errors"
+ },
+ "Role": "arn:aws:iam::123456789012:role/Elastic_Transcoder_Default_Role",
+ "InputBucket": "salesoffice.example.com-source",
+ "Id": "1533765810590-example",
+ "Arn": "arn:aws:elastictranscoder:us-west-2:123456789012:pipeline/1533765810590-example"
+ },
+ "Warnings": [
+ {
+ "Message": "The SNS notification topic for Error events and the pipeline are in different regions, which increases processing time for jobs in the pipeline and can incur additional charges. To decrease processing time and prevent cross-regional charges, use the same region for the SNS notification topic and the pipeline.",
+ "Code": "6006"
+ }
+ ]
+ }
+
diff -Nru awscli-1.16.63/awscli/examples/elastictranscoder/create-preset.rst awscli-1.16.81/awscli/examples/elastictranscoder/create-preset.rst
--- awscli-1.16.63/awscli/examples/elastictranscoder/create-preset.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/elastictranscoder/create-preset.rst 2018-12-21 22:23:35.000000000 +0000
@@ -0,0 +1,136 @@
+
+**To create a preset for ElasticTranscoder**
+
+This creates a preset for ElasticTranscoder.
+
+Command::
+
+ aws elastictranscoder create-preset --name DefaultPreset --description "Use for published videos" --container mp4 --video file://video.json --audio file://audio.json --thumbnails file://thumbnails.json
+
+
+video.json::
+ {
+ "Codec":"H.264",
+ "CodecOptions":{
+ "Profile":"main",
+ "Level":"2.2",
+ "MaxReferenceFrames":"3",
+ "MaxBitRate":"",
+ "BufferSize":"",
+ "InterlacedMode":"Progressive",
+ "ColorSpaceConversionMode":"None"
+ },
+ "KeyframesMaxDist":"240",
+ "FixedGOP":"false",
+ "BitRate":"1600",
+ "FrameRate":"auto",
+ "MaxFrameRate":"30",
+ "MaxWidth":"auto",
+ "MaxHeight":"auto",
+ "SizingPolicy":"Fit",
+ "PaddingPolicy":"Pad",
+ "DisplayAspectRatio":"auto",
+ "Watermarks":[
+ {
+ "Id":"company logo",
+ "MaxWidth":"20%",
+ "MaxHeight":"20%",
+ "SizingPolicy":"ShrinkToFit",
+ "HorizontalAlign":"Right",
+ "HorizontalOffset":"10px",
+ "VerticalAlign":"Bottom",
+ "VerticalOffset":"10px",
+ "Opacity":"55.5",
+ "Target":"Content"
+ }
+ ]
+ }
+
+audio.json::
+ {
+ "Codec":"AAC",
+ "CodecOptions":{
+ "Profile":"AAC-LC"
+ },
+ "SampleRate":"44100",
+ "BitRate":"96",
+ "Channels":"2"
+ }
+
+thumbnails.json::
+ {
+ "Format":"png",
+ "Interval":"120",
+ "MaxWidth":"auto",
+ "MaxHeight":"auto",
+ "SizingPolicy":"Fit",
+ "PaddingPolicy":"Pad"
+ }
+
+
+Output::
+
+ {
+ "Preset": {
+ "Thumbnails": {
+ "SizingPolicy": "Fit",
+ "MaxWidth": "auto",
+ "Format": "png",
+ "PaddingPolicy": "Pad",
+ "Interval": "120",
+ "MaxHeight": "auto"
+ },
+ "Container": "mp4",
+ "Description": "Use for published videos",
+ "Video": {
+ "SizingPolicy": "Fit",
+ "MaxWidth": "auto",
+ "PaddingPolicy": "Pad",
+ "MaxFrameRate": "30",
+ "FrameRate": "auto",
+ "MaxHeight": "auto",
+ "KeyframesMaxDist": "240",
+ "FixedGOP": "false",
+ "Codec": "H.264",
+ "Watermarks": [
+ {
+ "SizingPolicy": "ShrinkToFit",
+ "VerticalOffset": "10px",
+ "VerticalAlign": "Bottom",
+ "Target": "Content",
+ "MaxWidth": "20%",
+ "MaxHeight": "20%",
+ "HorizontalAlign": "Right",
+ "HorizontalOffset": "10px",
+ "Opacity": "55.5",
+ "Id": "company logo"
+ }
+ ],
+ "CodecOptions": {
+ "Profile": "main",
+ "MaxBitRate": "32",
+ "InterlacedMode": "Progressive",
+ "Level": "2.2",
+ "ColorSpaceConversionMode": "None",
+ "MaxReferenceFrames": "3",
+ "BufferSize": "5"
+ },
+ "BitRate": "1600",
+ "DisplayAspectRatio": "auto"
+ },
+ "Audio": {
+ "Channels": "2",
+ "CodecOptions": {
+ "Profile": "AAC-LC"
+ },
+ "SampleRate": "44100",
+ "Codec": "AAC",
+ "BitRate": "96"
+ },
+ "Type": "Custom",
+ "Id": "1533765290724-example"
+ "Arn": "arn:aws:elastictranscoder:us-west-2:123456789012:preset/1533765290724-example",
+ "Name": "DefaultPreset"
+ },
+ "Warning": ""
+ }
diff -Nru awscli-1.16.63/awscli/examples/elastictranscoder/delete-pipeline.rst awscli-1.16.81/awscli/examples/elastictranscoder/delete-pipeline.rst
--- awscli-1.16.63/awscli/examples/elastictranscoder/delete-pipeline.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/elastictranscoder/delete-pipeline.rst 2018-12-21 22:23:35.000000000 +0000
@@ -0,0 +1,13 @@
+**To delete the specified ElasticTranscoder pipeline**
+
+This deletes the specified ElasticTranscoder pipeline.
+
+Command::
+
+ aws elastictranscoder delete-pipeline --id 1111111111111-abcde1
+
+Output::
+
+ {
+ "Success":"true"
+ }
diff -Nru awscli-1.16.63/awscli/examples/elastictranscoder/delete-preset.rst awscli-1.16.81/awscli/examples/elastictranscoder/delete-preset.rst
--- awscli-1.16.63/awscli/examples/elastictranscoder/delete-preset.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/elastictranscoder/delete-preset.rst 2018-12-21 22:23:35.000000000 +0000
@@ -0,0 +1,8 @@
+**To delete the specified ElasticTranscoder preset**
+
+This deletes the specified ElasticTranscoder preset.
+
+Command::
+
+ aws elastictranscoder delete-preset --id 5555555555555-abcde5
+
diff -Nru awscli-1.16.63/awscli/examples/elastictranscoder/list-jobs-by-pipeline.rst awscli-1.16.81/awscli/examples/elastictranscoder/list-jobs-by-pipeline.rst
--- awscli-1.16.63/awscli/examples/elastictranscoder/list-jobs-by-pipeline.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/elastictranscoder/list-jobs-by-pipeline.rst 2018-12-21 22:23:35.000000000 +0000
@@ -0,0 +1,14 @@
+
+**To retrieve a list of ElasticTranscoder jobs in the specified pipeline**
+
+This example retrieves a list of ElasticTranscoder jobs in the specified pipeline.
+
+Command::
+
+ aws elastictranscoder list-jobs-by-pipeline --pipeline-id 1111111111111-abcde1
+
+Output::
+
+ {
+ "Jobs": []
+ }
diff -Nru awscli-1.16.63/awscli/examples/elastictranscoder/list-jobs-by-status.rst awscli-1.16.81/awscli/examples/elastictranscoder/list-jobs-by-status.rst
--- awscli-1.16.63/awscli/examples/elastictranscoder/list-jobs-by-status.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/elastictranscoder/list-jobs-by-status.rst 2018-12-21 22:23:35.000000000 +0000
@@ -0,0 +1,15 @@
+
+**To retrieve a list of ElasticTranscoder jobs with a status of Complete**
+
+This example retrieves a list of ElasticTranscoder jobs with a status of Complete.
+
+Command::
+
+ aws elastictranscoder list-jobs-by-status --status Complete
+
+Output::
+
+ {
+ "Jobs": []
+ }
+
diff -Nru awscli-1.16.63/awscli/examples/elastictranscoder/list-pipelines.rst awscli-1.16.81/awscli/examples/elastictranscoder/list-pipelines.rst
--- awscli-1.16.63/awscli/examples/elastictranscoder/list-pipelines.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/elastictranscoder/list-pipelines.rst 2018-12-21 22:23:35.000000000 +0000
@@ -0,0 +1,85 @@
+
+**To retrieve a list of ElasticTranscoder pipelines**
+
+This example retrieves a list of ElasticTranscoder pipelines.
+
+Command::
+
+ aws elastictranscoder list-pipelines
+
+Output::
+
+ {
+ "Pipelines": [
+ {
+ "Status": "Active",
+ "ContentConfig": {
+ "Bucket": "ets-example",
+ "Permissions": []
+ },
+ "Name": "example-pipeline",
+ "ThumbnailConfig": {
+ "Bucket": "ets-example",
+ "Permissions": []
+ },
+ "Notifications": {
+ "Completed": "arn:aws:sns:us-west-2:123456789012:ets_example",
+ "Warning": "",
+ "Progressing": "",
+ "Error": ""
+ },
+ "Role": "arn:aws:iam::123456789012:role/Elastic_Transcoder_Default_Role",
+ "InputBucket": "ets-example",
+ "OutputBucket": "ets-example",
+ "Id": "3333333333333-abcde3",
+ "Arn": "arn:aws:elastictranscoder:us-west-2:123456789012:pipeline/3333333333333-abcde3"
+ },
+ {
+ "Status": "Paused",
+ "ContentConfig": {
+ "Bucket": "ets-example",
+ "Permissions": []
+ },
+ "Name": "example-php-test",
+ "ThumbnailConfig": {
+ "Bucket": "ets-example",
+ "Permissions": []
+ },
+ "Notifications": {
+ "Completed": "",
+ "Warning": "",
+ "Progressing": "",
+ "Error": ""
+ },
+ "Role": "arn:aws:iam::123456789012:role/Elastic_Transcoder_Default_Role",
+ "InputBucket": "ets-example",
+ "OutputBucket": "ets-example",
+ "Id": "3333333333333-abcde2",
+ "Arn": "arn:aws:elastictranscoder:us-west-2:123456789012:pipeline/3333333333333-abcde2"
+ },
+ {
+ "Status": "Active",
+ "ContentConfig": {
+ "Bucket": "ets-west-output",
+ "Permissions": []
+ },
+ "Name": "pipeline-west",
+ "ThumbnailConfig": {
+ "Bucket": "ets-west-output",
+ "Permissions": []
+ },
+ "Notifications": {
+ "Completed": "arn:aws:sns:us-west-2:123456789012:ets-notifications",
+ "Warning": "",
+ "Progressing": "",
+ "Error": ""
+ },
+ "Role": "arn:aws:iam::123456789012:role/Elastic_Transcoder_Default_Role",
+ "InputBucket": "ets-west-input",
+ "OutputBucket": "ets-west-output",
+ "Id": "3333333333333-abcde1",
+ "Arn": "arn:aws:elastictranscoder:us-west-2:123456789012:pipeline/3333333333333-abcde1"
+ }
+ ]
+ }
+
diff -Nru awscli-1.16.63/awscli/examples/elastictranscoder/list-presets.rst awscli-1.16.81/awscli/examples/elastictranscoder/list-presets.rst
--- awscli-1.16.63/awscli/examples/elastictranscoder/list-presets.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/elastictranscoder/list-presets.rst 2018-12-21 22:23:35.000000000 +0000
@@ -0,0 +1,95 @@
+**To retrieve a list of ElasticTranscoder presets**
+
+This example retrieves a list of ElasticTranscoder presets.
+
+Command::
+
+ aws elastictranscoder list-presets --max-items 2
+
+Output::
+
+ {
+ "Presets": [
+ {
+ "Container": "mp4",
+ "Name": "KindleFireHD-preset",
+ "Video": {
+ "Resolution": "1280x720",
+ "FrameRate": "30",
+ "KeyframesMaxDist": "90",
+ "FixedGOP": "false",
+ "Codec": "H.264",
+ "Watermarks": [],
+ "CodecOptions": {
+ "Profile": "main",
+ "MaxReferenceFrames": "3",
+ "ColorSpaceConversionMode": "None",
+ "InterlacedMode": "Progressive",
+ "Level": "4"
+ },
+ "AspectRatio": "16:9",
+ "BitRate": "2200"
+ },
+ "Audio": {
+ "Channels": "2",
+ "CodecOptions": {
+ "Profile": "AAC-LC"
+ },
+ "SampleRate": "48000",
+ "Codec": "AAC",
+ "BitRate": "160"
+ },
+ "Type": "Custom",
+ "Id": "3333333333333-abcde2",
+ "Arn": "arn:aws:elastictranscoder:us-west-2:123456789012:preset/3333333333333-abcde2",
+ "Thumbnails": {
+ "AspectRatio": "16:9",
+ "Interval": "60",
+ "Resolution": "192x108",
+ "Format": "png"
+ }
+ },
+ {
+ "Thumbnails": {
+ "AspectRatio": "16:9",
+ "Interval": "60",
+ "Resolution": "192x108",
+ "Format": "png"
+ },
+ "Container": "mp4",
+ "Description": "Custom preset for transcoding jobs",
+ "Video": {
+ "Resolution": "1280x720",
+ "FrameRate": "30",
+ "KeyframesMaxDist": "90",
+ "FixedGOP": "false",
+ "Codec": "H.264",
+ "Watermarks": [],
+ "CodecOptions": {
+ "Profile": "main",
+ "MaxReferenceFrames": "3",
+ "ColorSpaceConversionMode": "None",
+ "InterlacedMode": "Progressive",
+ "Level": "3.1"
+ },
+ "AspectRatio": "16:9",
+ "BitRate": "2200"
+ },
+ "Audio": {
+ "Channels": "2",
+ "CodecOptions": {
+ "Profile": "AAC-LC"
+ },
+ "SampleRate": "44100",
+ "Codec": "AAC",
+ "BitRate": "160"
+ },
+ "Type": "Custom",
+ "Id": "3333333333333-abcde3",
+ "Arn": "arn:aws:elastictranscoder:us-west-2:123456789012:preset/3333333333333-abcde3",
+ "Name": "Roman's Preset"
+ }
+ ],
+ "NextToken": "eyJQYWdlVG9rZW4iOiBudWxsLCAiYm90b190cnVuY2F0ZV9hbW91bnQiOiAyfQ=="
+ }
+
diff -Nru awscli-1.16.63/awscli/examples/elastictranscoder/read-job.rst awscli-1.16.81/awscli/examples/elastictranscoder/read-job.rst
--- awscli-1.16.63/awscli/examples/elastictranscoder/read-job.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/elastictranscoder/read-job.rst 2018-12-21 22:23:35.000000000 +0000
@@ -0,0 +1,66 @@
+
+**To retrieve an ElasticTranscoder job**
+
+This example retrieves the specified ElasticTranscoder job.
+
+Command::
+
+ aws elastictranscoder read-job --id 1533838012294-example
+
+Output::
+
+ {
+ "Job": {
+ "Status": "Progressing",
+ "Inputs": [
+ {
+ "Container": "mp4",
+ "FrameRate": "auto",
+ "Key": "ETS_example_file.mp4",
+ "AspectRatio": "auto",
+ "Resolution": "auto",
+ "Interlaced": "auto"
+ }
+ ],
+ "Playlists": [],
+ "Outputs": [
+ {
+ "Status": "Progressing",
+ "Rotate": "0",
+ "PresetId": "1351620000001-100250",
+ "Watermarks": [],
+ "Key": "webm/ETS_example_file-kindlefirehd.webm",
+ "Id": "1"
+ }
+ ],
+ "PipelineId": "3333333333333-abcde3",
+ "OutputKeyPrefix": "recipes/",
+ "UserMetadata": {
+ "Cook book": "recipe notebook",
+ "Food type": "Italian"
+ },
+ "Output": {
+ "Status": "Progressing",
+ "Rotate": "0",
+ "PresetId": "1351620000001-100250",
+ "Watermarks": [],
+ "Key": "webm/ETS_example_file-kindlefirehd.webm",
+ "Id": "1"
+ },
+ "Timing": {
+ "SubmitTimeMillis": 1533838012298,
+ "StartTimeMillis": 1533838013786
+ },
+ "Input": {
+ "Container": "mp4",
+ "FrameRate": "auto",
+ "Key": "ETS_example_file.mp4",
+ "AspectRatio": "auto",
+ "Resolution": "auto",
+ "Interlaced": "auto"
+ },
+ "Id": "1533838012294-example",
+ "Arn": "arn:aws:elastictranscoder:us-west-2:123456789012:job/1533838012294-example"
+ }
+ }
+
diff -Nru awscli-1.16.63/awscli/examples/elastictranscoder/read-pipeline.rst awscli-1.16.81/awscli/examples/elastictranscoder/read-pipeline.rst
--- awscli-1.16.63/awscli/examples/elastictranscoder/read-pipeline.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/elastictranscoder/read-pipeline.rst 2018-12-21 22:23:35.000000000 +0000
@@ -0,0 +1,59 @@
+**To retrieve an ElasticTranscoder pipeline**
+
+This example retrieves the specified ElasticTranscoder pipeline.
+
+Command::
+
+ aws elastictranscoder read-pipeline --id 3333333333333-abcde3
+
+Output::
+
+ {
+ "Pipeline": {
+ "Status": "Active",
+ "ContentConfig": {
+ "Bucket": "ets-example",
+ "StorageClass": "Standard",
+ "Permissions": [
+ {
+ "Access": [
+ "FullControl"
+ ],
+ "Grantee": "marketing-promos@example.com",
+ "GranteeType": "Email"
+ }
+ ]
+ },
+ "Name": "Default",
+ "ThumbnailConfig": {
+ "Bucket": "ets-example",
+ "StorageClass": "ReducedRedundancy",
+ "Permissions": [
+ {
+ "Access": [
+ "FullControl"
+ ],
+ "Grantee": "marketing-promos@example.com",
+ "GranteeType": "Email"
+ }
+ ]
+ },
+ "Notifications": {
+ "Completed": "",
+ "Warning": "",
+ "Progressing": "",
+ "Error": "arn:aws:sns:us-east-1:123456789012:ETS_Errors"
+ },
+ "Role": "arn:aws:iam::123456789012:role/Elastic_Transcoder_Default_Role",
+ "InputBucket": "ets-example",
+ "Id": "3333333333333-abcde3",
+ "Arn": "arn:aws:elastictranscoder:us-west-2:123456789012:pipeline/3333333333333-abcde3"
+ },
+ "Warnings": [
+ {
+ "Message": "The SNS notification topic for Error events and the pipeline are in different regions, which increases processing time for jobs in the pipeline and can incur additional charges. To decrease processing time and prevent cross-regional charges, use the same region for the SNS notification topic and the pipeline.",
+ "Code": "6006"
+ }
+ ]
+ }
+
diff -Nru awscli-1.16.63/awscli/examples/elastictranscoder/read-preset.rst awscli-1.16.81/awscli/examples/elastictranscoder/read-preset.rst
--- awscli-1.16.63/awscli/examples/elastictranscoder/read-preset.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/elastictranscoder/read-preset.rst 2018-12-21 22:23:35.000000000 +0000
@@ -0,0 +1,100 @@
+**To retrieve an ElasticTranscoder preset**
+
+This example retrieves the specified ElasticTranscoder preset.
+
+Command::
+
+ aws elastictranscoder read-preset --id 1351620000001-500020
+
+Output::
+
+ {
+ "Preset": {
+ "Thumbnails": {
+ "SizingPolicy": "ShrinkToFit",
+ "MaxWidth": "192",
+ "Format": "png",
+ "PaddingPolicy": "NoPad",
+ "Interval": "300",
+ "MaxHeight": "108"
+ },
+ "Container": "fmp4",
+ "Description": "System preset: MPEG-Dash Video - 4.8M",
+ "Video": {
+ "SizingPolicy": "ShrinkToFit",
+ "MaxWidth": "1280",
+ "PaddingPolicy": "NoPad",
+ "FrameRate": "30",
+ "MaxHeight": "720",
+ "KeyframesMaxDist": "60",
+ "FixedGOP": "true",
+ "Codec": "H.264",
+ "Watermarks": [
+ {
+ "SizingPolicy": "ShrinkToFit",
+ "VerticalOffset": "10%",
+ "VerticalAlign": "Top",
+ "Target": "Content",
+ "MaxWidth": "10%",
+ "MaxHeight": "10%",
+ "HorizontalAlign": "Left",
+ "HorizontalOffset": "10%",
+ "Opacity": "100",
+ "Id": "TopLeft"
+ },
+ {
+ "SizingPolicy": "ShrinkToFit",
+ "VerticalOffset": "10%",
+ "VerticalAlign": "Top",
+ "Target": "Content",
+ "MaxWidth": "10%",
+ "MaxHeight": "10%",
+ "HorizontalAlign": "Right",
+ "HorizontalOffset": "10%",
+ "Opacity": "100",
+ "Id": "TopRight"
+ },
+ {
+ "SizingPolicy": "ShrinkToFit",
+ "VerticalOffset": "10%",
+ "VerticalAlign": "Bottom",
+ "Target": "Content",
+ "MaxWidth": "10%",
+ "MaxHeight": "10%",
+ "HorizontalAlign": "Left",
+ "HorizontalOffset": "10%",
+ "Opacity": "100",
+ "Id": "BottomLeft"
+ },
+ {
+ "SizingPolicy": "ShrinkToFit",
+ "VerticalOffset": "10%",
+ "VerticalAlign": "Bottom",
+ "Target": "Content",
+ "MaxWidth": "10%",
+ "MaxHeight": "10%",
+ "HorizontalAlign": "Right",
+ "HorizontalOffset": "10%",
+ "Opacity": "100",
+ "Id": "BottomRight"
+ }
+ ],
+ "CodecOptions": {
+ "Profile": "main",
+ "MaxBitRate": "4800",
+ "InterlacedMode": "Progressive",
+ "Level": "3.1",
+ "ColorSpaceConversionMode": "None",
+ "MaxReferenceFrames": "3",
+ "BufferSize": "9600"
+ },
+ "BitRate": "4800",
+ "DisplayAspectRatio": "auto"
+ },
+ "Type": "System",
+ "Id": "1351620000001-500020",
+ "Arn": "arn:aws:elastictranscoder:us-west-2:123456789012:preset/1351620000001-500020",
+ "Name": "System preset: MPEG-Dash Video - 4.8M"
+ }
+ }
+
diff -Nru awscli-1.16.63/awscli/examples/elastictranscoder/update-pipeline-notifications.rst awscli-1.16.81/awscli/examples/elastictranscoder/update-pipeline-notifications.rst
--- awscli-1.16.63/awscli/examples/elastictranscoder/update-pipeline-notifications.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/elastictranscoder/update-pipeline-notifications.rst 2018-12-21 22:23:35.000000000 +0000
@@ -0,0 +1,53 @@
+
+**To update the notifications of an ElasticTranscoder pipeline**
+
+This example updates the notifications of the specified ElasticTranscoder pipeline.
+
+Command::
+
+ aws elastictranscoder update-pipeline-notifications --id 1111111111111-abcde1 --notifications Progressing=arn:aws:sns:us-west-2:0123456789012:my-topic,Completed=arn:aws:sns:us-west-2:0123456789012:my-topic,Warning=arn:aws:sns:us-west-2:0123456789012:my-topic,Error=arn:aws:sns:us-east-1:111222333444:ETS_Errors
+
+Output::
+
+ {
+ "Pipeline": {
+ "Status": "Active",
+ "ContentConfig": {
+ "Bucket": "ets-example",
+ "StorageClass": "Standard",
+ "Permissions": [
+ {
+ "Access": [
+ "FullControl"
+ ],
+ "Grantee": "marketing-promos@example.com",
+ "GranteeType": "Email"
+ }
+ ]
+ },
+ "Name": "Default",
+ "ThumbnailConfig": {
+ "Bucket": "ets-example",
+ "StorageClass": "ReducedRedundancy",
+ "Permissions": [
+ {
+ "Access": [
+ "FullControl"
+ ],
+ "Grantee": "marketing-promos@example.com",
+ "GranteeType": "Email"
+ }
+ ]
+ },
+ "Notifications": {
+ "Completed": "arn:aws:sns:us-west-2:0123456789012:my-topic",
+ "Warning": "arn:aws:sns:us-west-2:0123456789012:my-topic",
+ "Progressing": "arn:aws:sns:us-west-2:0123456789012:my-topic",
+ "Error": "arn:aws:sns:us-east-1:111222333444:ETS_Errors"
+ },
+ "Role": "arn:aws:iam::123456789012:role/Elastic_Transcoder_Default_Role",
+ "InputBucket": "ets-example",
+ "Id": "1111111111111-abcde1",
+ "Arn": "arn:aws:elastictranscoder:us-west-2:123456789012:pipeline/1111111111111-abcde1"
+ }
+ }
diff -Nru awscli-1.16.63/awscli/examples/elastictranscoder/update-pipeline.rst awscli-1.16.81/awscli/examples/elastictranscoder/update-pipeline.rst
--- awscli-1.16.63/awscli/examples/elastictranscoder/update-pipeline.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/elastictranscoder/update-pipeline.rst 2018-12-21 22:23:35.000000000 +0000
@@ -0,0 +1,92 @@
+
+**To update an ElasticTranscoder pipeline**
+
+This example updates the specified ElasticTranscoder pipeline.
+
+Command::
+
+ aws elastictranscoder update-pipeline --id 1111111111111-abcde1 --name DefaultExample --input-bucket salesoffice.example.com-source --role arn:aws:iam::123456789012:role/Elastic_Transcoder_Default_Role --notifications Progressing="",Completed="",Warning="",Error=arn:aws:sns:us-east-1:111222333444:ETS_Errors --content-config file://content-config.json --thumbnail-config file://thumbnail-config.json
+
+content-config.json::
+ {
+ "Bucket":"salesoffice.example.com-public-promos",
+ "Permissions":[
+ {
+ "GranteeType":"Email",
+ "Grantee":"marketing-promos@example.com",
+ "Access":[
+ "FullControl"
+ ]
+ }
+ ],
+ "StorageClass":"Standard"
+ }
+
+thumbnail-config.json::
+ {
+ "Bucket":"salesoffice.example.com-public-promos-thumbnails",
+ "Permissions":[
+ {
+ "GranteeType":"Email",
+ "Grantee":"marketing-promos@example.com",
+ "Access":[
+ "FullControl"
+ ]
+ }
+ ],
+ "StorageClass":"ReducedRedundancy"
+ }
+
+
+Output::
+
+ {
+ "Pipeline": {
+ "Status": "Active",
+ "ContentConfig": {
+ "Bucket": "ets-example",
+ "StorageClass": "Standard",
+ "Permissions": [
+ {
+ "Access": [
+ "FullControl"
+ ],
+ "Grantee": "marketing-promos@example.com",
+ "GranteeType": "Email"
+ }
+ ]
+ },
+ "Name": "DefaultExample",
+ "ThumbnailConfig": {
+ "Bucket": "ets-example",
+ "StorageClass": "ReducedRedundancy",
+ "Permissions": [
+ {
+ "Access": [
+ "FullControl"
+ ],
+ "Grantee": "marketing-promos@example.com",
+ "GranteeType": "Email"
+ }
+ ]
+ },
+ "Notifications": {
+ "Completed": "",
+ "Warning": "",
+ "Progressing": "",
+ "Error": "arn:aws:sns:us-east-1:111222333444:ETS_Errors"
+ },
+ "Role": "arn:aws:iam::123456789012:role/Elastic_Transcoder_Default_Role",
+ "InputBucket": "ets-example",
+ "Id": "3333333333333-abcde3",
+ "Arn": "arn:aws:elastictranscoder:us-west-2:123456789012:pipeline/3333333333333-abcde3"
+ },
+ "Warnings": [
+ {
+ "Message": "The SNS notification topic for Error events and the pipeline are in different regions, which increases processing time for jobs in the pipeline and can incur additional charges. To decrease processing time and prevent cross-regional charges, use the same region for the SNS notification topic and the pipeline.",
+ "Code": "6006"
+ }
+ ]
+ }
+
+
diff -Nru awscli-1.16.63/awscli/examples/elastictranscoder/update-pipeline-status.rst awscli-1.16.81/awscli/examples/elastictranscoder/update-pipeline-status.rst
--- awscli-1.16.63/awscli/examples/elastictranscoder/update-pipeline-status.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/elastictranscoder/update-pipeline-status.rst 2018-12-21 22:23:35.000000000 +0000
@@ -0,0 +1,53 @@
+**To update the status of an ElasticTranscoder pipeline**
+
+This example updates the status of the specified ElasticTranscoder pipeline.
+
+Command::
+
+ aws elastictranscoder update-pipeline-status --id 1111111111111-abcde1 --status Paused
+
+Output::
+
+ {
+ "Pipeline": {
+ "Status": "Paused",
+ "ContentConfig": {
+ "Bucket": "ets-example",
+ "StorageClass": "Standard",
+ "Permissions": [
+ {
+ "Access": [
+ "FullControl"
+ ],
+ "Grantee": "marketing-promos@example.com",
+ "GranteeType": "Email"
+ }
+ ]
+ },
+ "Name": "Default",
+ "ThumbnailConfig": {
+ "Bucket": "ets-example",
+ "StorageClass": "ReducedRedundancy",
+ "Permissions": [
+ {
+ "Access": [
+ "FullControl"
+ ],
+ "Grantee": "marketing-promos@example.com",
+ "GranteeType": "Email"
+ }
+ ]
+ },
+ "Notifications": {
+ "Completed": "",
+ "Warning": "",
+ "Progressing": "",
+ "Error": "arn:aws:sns:us-east-1:803981987763:ETS_Errors"
+ },
+ "Role": "arn:aws:iam::123456789012:role/Elastic_Transcoder_Default_Role",
+ "InputBucket": "ets-example",
+ "Id": "1111111111111-abcde1",
+ "Arn": "arn:aws:elastictranscoder:us-west-2:123456789012:pipeline/1111111111111-abcde1"
+ }
+ }
+
diff -Nru awscli-1.16.63/awscli/examples/iam/create-user.rst awscli-1.16.81/awscli/examples/iam/create-user.rst
--- awscli-1.16.63/awscli/examples/iam/create-user.rst 2018-11-28 00:41:28.000000000 +0000
+++ awscli-1.16.81/awscli/examples/iam/create-user.rst 2018-12-21 22:23:36.000000000 +0000
@@ -11,7 +11,7 @@
"UserName": "Bob",
"Path": "/",
"CreateDate": "2013-06-08T03:20:41.270Z",
- "UserId": "AKIAIOSFODNN7EXAMPLE",
+ "UserId": "AIDAIOSFODNN7EXAMPLE",
"Arn": "arn:aws:iam::123456789012:user/Bob"
}
}
@@ -19,4 +19,3 @@
For more information, see `Adding a New User to Your AWS Account`_ in the *Using IAM* guide.
.. _`Adding a New User to Your AWS Account`: http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_SettingUpUser.html
-
diff -Nru awscli-1.16.63/awscli/examples/pricing/describe-services.rst awscli-1.16.81/awscli/examples/pricing/describe-services.rst
--- awscli-1.16.63/awscli/examples/pricing/describe-services.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/pricing/describe-services.rst 2018-12-21 22:23:36.000000000 +0000
@@ -0,0 +1,82 @@
+**To retrieve service metadata**
+
+This example retrieves the metadata for the Amazon EC2 service code.
+
+Command::
+
+ aws pricing describe-services --service-code AmazonEC2 --format-version aws_v1 --max-items 1
+
+Output::
+
+ {
+ "Services": [
+ {
+ "ServiceCode": "AmazonEC2",
+ "AttributeNames": [
+ "volumeType",
+ "maxIopsvolume",
+ "instance",
+ "instanceCapacity10xlarge",
+ "locationType",
+ "instanceFamily",
+ "operatingSystem",
+ "clockSpeed",
+ "LeaseContractLength",
+ "ecu",
+ "networkPerformance",
+ "instanceCapacity8xlarge",
+ "group",
+ "maxThroughputvolume",
+ "gpuMemory",
+ "ebsOptimized",
+ "elasticGpuType",
+ "maxVolumeSize",
+ "gpu",
+ "processorFeatures",
+ "intelAvxAvailable",
+ "instanceCapacity4xlarge",
+ "servicecode",
+ "groupDescription",
+ "processorArchitecture",
+ "physicalCores",
+ "productFamily",
+ "enhancedNetworkingSupported",
+ "intelTurboAvailable",
+ "memory",
+ "dedicatedEbsThroughput",
+ "vcpu",
+ "OfferingClass",
+ "instanceCapacityLarge",
+ "capacitystatus",
+ "termType",
+ "storage",
+ "intelAvx2Available",
+ "storageMedia",
+ "physicalProcessor",
+ "provisioned",
+ "servicename",
+ "PurchaseOption",
+ "instanceCapacity18xlarge",
+ "instanceType",
+ "tenancy",
+ "usagetype",
+ "normalizationSizeFactor",
+ "instanceCapacity2xlarge",
+ "instanceCapacity16xlarge",
+ "maxIopsBurstPerformance",
+ "instanceCapacity12xlarge",
+ "instanceCapacity32xlarge",
+ "instanceCapacityXlarge",
+ "licenseModel",
+ "currentGeneration",
+ "preInstalledSw",
+ "location",
+ "instanceCapacity24xlarge",
+ "instanceCapacity9xlarge",
+ "instanceCapacityMedium",
+ "operation"
+ ]
+ }
+ ],
+ "FormatVersion": "aws_v1"
+ }
diff -Nru awscli-1.16.63/awscli/examples/pricing/get-attribute-values.rst awscli-1.16.81/awscli/examples/pricing/get-attribute-values.rst
--- awscli-1.16.63/awscli/examples/pricing/get-attribute-values.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/pricing/get-attribute-values.rst 2018-12-21 22:23:36.000000000 +0000
@@ -0,0 +1,22 @@
+**To retrieve a list of attribute values**
+
+This example retrieves a list of values available for the given attribute.
+
+Command::
+
+ aws pricing get-attribute-values --service-code AmazonEC2 --attribute-name volumeType --max-items 2
+
+Output::
+
+ {
+ "NextToken": "eyJOZXh0VG9rZW4iOiBudWxsLCAiYm90b190cnVuY2F0ZV9hbW91bnQiOiAyfQ==",
+ "AttributeValues": [
+ {
+ "Value": "Cold HDD"
+ },
+ {
+ "Value": "General Purpose"
+ }
+ ]
+}
+
diff -Nru awscli-1.16.63/awscli/examples/pricing/get-products.rst awscli-1.16.81/awscli/examples/pricing/get-products.rst
--- awscli-1.16.63/awscli/examples/pricing/get-products.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/pricing/get-products.rst 2018-12-21 22:23:36.000000000 +0000
@@ -0,0 +1,32 @@
+**To retrieve a list of products**
+
+This example retrieves a list of products that match the given criteria.
+
+Command::
+
+ aws pricing get-products --filters file://filters.json --format-version aws_v1 --max-results 1 --service-code AmazonEC2
+
+filters.json::
+
+ [
+ {
+ "Type": "TERM_MATCH",
+ "Field": "ServiceCode",
+ "Value": "AmazonEC2"
+ },
+ {
+ "Type": "TERM_MATCH",
+ "Field": "volumeType",
+ "Value": "Provisioned IOPS"
+ }
+ ]
+
+Output::
+
+ {
+ "FormatVersion": "aws_v1",
+ "NextToken": "WGDY7ko8fQXdlaUZVdasFQ==:RVSagyIFn770XQOzdUIcO9BY6ucBG9itXAZGZF/zioUzOsUKh6PCcPWaOyPZRiMePb986TeoKYB9l55fw/CyoMq5ymnGmT1Vj39TljbbAlhcqnVfTmPIilx8Uy5bdDaBYy/e/2Ofw9Edzsykbs8LTBuNbiDQ+BBds5yeI9AQkUepruKk3aEahFPxJ55kx/zk",
+ "PriceList": [
+ "{\"product\":{\"productFamily\":\"Storage\",\"attributes\":{\"storageMedia\":\"SSD-backed\",\"maxThroughputvolume\":\"320 MB/sec\",\"volumeType\":\"Provisioned IOPS\",\"maxIopsvolume\":\"20000\",\"servicecode\":\"AmazonEC2\",\"usagetype\":\"APS1-EBS:VolumeUsage.piops\",\"locationType\":\"AWS Region\",\"location\":\"Asia Pacific (Singapore)\",\"servicename\":\"Amazon Elastic Compute Cloud\",\"maxVolumeSize\":\"16 TiB\",\"operation\":\"\"},\"sku\":\"3MKHN58N7RDDVGKJ\"},\"serviceCode\":\"AmazonEC2\",\"terms\":{\"OnDemand\":{\"3MKHN58N7RDDVGKJ.JRTCKXETXF\":{\"priceDimensions\":{\"3MKHN58N7RDDVGKJ.JRTCKXETXF.6YS6EN2CT7\":{\"unit\":\"GB-Mo\",\"endRange\":\"Inf\",\"description\":\"$0.138 per GB-month of Provisioned IOPS SSD (io1) provisioned storage - Asia Pacific (Singapore)\",\"appliesTo\":[],\"rateCode\":\"3MKHN58N7RDDVGKJ.JRTCKXETXF.6YS6EN2CT7\",\"beginRange\":\"0\",\"pricePerUnit\":{\"USD\":\"0.1380000000\"}}},\"sku\":\"3MKHN58N7RDDVGKJ\",\"effectiveDate\":\"2018-08-01T00:00:00Z\",\"offerTermCode\":\"JRTCKXETXF\",\"termAttributes\":{}}}},\"version\":\"20180808005701\",\"publicationDate\":\"2018-08-08T00:57:01Z\"}"
+ ]
+ }
diff -Nru awscli-1.16.63/awscli/examples/rds/backtrack-db-cluster.rst awscli-1.16.81/awscli/examples/rds/backtrack-db-cluster.rst
--- awscli-1.16.63/awscli/examples/rds/backtrack-db-cluster.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/rds/backtrack-db-cluster.rst 2018-12-21 22:23:36.000000000 +0000
@@ -0,0 +1,7 @@
+**To backtrack an Aurora DB cluster**
+
+The following backtracks the DB cluster sample-cluster to March 19, 2018, at 10 a.m.:
+
+ aws rds backtrack-db-cluster --db-cluster-identifier sample-cluster --backtrack-to 2018-03-19T10:00:00+00:00
+
+This command outputs a JSON block that acknowledges the change to the RDS resource.
diff -Nru awscli-1.16.63/awscli/examples/resource-groups/create-group.rst awscli-1.16.81/awscli/examples/resource-groups/create-group.rst
--- awscli-1.16.63/awscli/examples/resource-groups/create-group.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/resource-groups/create-group.rst 2018-12-21 22:23:36.000000000 +0000
@@ -0,0 +1,42 @@
+**To create a tag-based resource group**
+
+This example creates a tag-based resource group of Amazon EC2 instances in the current region that are tagged with a tag key of Name, and a tag key value of WebServers. The group name is WebServer3.
+
+Command::
+
+ aws resource-groups create-group --name WebServer3 --resource-query '{"Type":"TAG_FILTERS_1_0", "Query":"{\"ResourceTypeFilters\":[\"AWS::EC2::Instance\"],\"TagFilters\":[{\"Key\":\"Name\", \"Values\":[\"WebServers\"]}]}"}'
+
+Output::
+
+ {
+ "Group": {
+ "GroupArn": "arn:aws:resource-groups:us-east-2:000000000000:group/WebServer3",
+ "Name": "WebServer3"
+ },
+ "ResourceQuery": {
+ "Type": "TAG_FILTERS_1_0",
+ "Query": "{\"ResourceTypeFilters\":[\"AWS::EC2::Instance\"],\"TagFilters\":[{\"Key\":\"Name\", \"Values\":[\"WebServers\"]}]}"
+ }
+}
+
+**To create a CloudFormation stack-based resource group**
+
+This example creates an AWS CloudFormation stack-based resource group named sampleCFNstackgroup. The query allows all resources that are in the CloudFormation stack that are supported by AWS Resource Groups.
+
+Command::
+
+ aws resource-groups create-group --name sampleCFNstackgroup --resource-query '{"Type": "CLOUDFORMATION_STACK_1_0", "Query": "{\"ResourceTypeFilters\":[\"AWS::AllSupported\"],\"StackIdentifier\":\"arn:aws:cloudformation:us-east-2:123456789012:stack/testcloudformationstack/1415z9z0-z39z-11z8-97z5-500z212zz6fz\"}"}'
+
+Output::
+
+ {
+ "Group": {
+ "GroupArn": "arn:aws:resource-groups:us-east-2:123456789012:group/sampleCFNstackgroup",
+ "Name": "sampleCFNstackgroup"
+ },
+ "ResourceQuery": {
+ "Type": "CLOUDFORMATION_STACK_1_0",
+ "Query":'{\"CloudFormationStackArn\":\"arn:aws:cloudformation:us-east-2:123456789012:stack/testcloudformationstack/1415z9z0-z39z-11z8-97z5-500z212zz6fz\",\"ResourceTypeFilters\":[\"AWS::AllSupported\"]}"}'
+ }
+}
+
diff -Nru awscli-1.16.63/awscli/examples/resource-groups/update-group-query.rst awscli-1.16.81/awscli/examples/resource-groups/update-group-query.rst
--- awscli-1.16.63/awscli/examples/resource-groups/update-group-query.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/resource-groups/update-group-query.rst 2018-12-21 22:23:36.000000000 +0000
@@ -0,0 +1,42 @@
+**To update the query for a tag-based resource group**
+
+This example updates the query for a tag-based resource group of Amazon EC2 instances. To update the group query, you can change the values specified for ResourceTypeFilters or TagFilters.
+
+Command::
+
+ aws resource-groups update-group-query --group-name WebServer3 --resource-query '{"Type":"TAG_FILTERS_1_0", "Query":"{\"ResourceTypeFilters\":[\"AWS::EC2::Instance\"],\"TagFilters\":[{\"Key\":\"Name\", \"Values\":[\"WebServers\"]}]}"}'
+
+Output::
+
+ {
+ "Group": {
+ "GroupArn": "arn:aws:resource-groups:us-east-2:000000000000:group/WebServer3",
+ "Name": "WebServer3"
+ },
+ "ResourceQuery": {
+ "Type": "TAG_FILTERS_1_0",
+ "Query": "{\"ResourceTypeFilters\":[\"AWS::EC2::Instance\"],\"TagFilters\":[{\"Key\":\"Name\", \"Values\":[\"WebServers\"]}]}"
+ }
+}
+
+**To update the query for a CloudFormation stack-based resource group**
+
+This example updates the query for an AWS CloudFormation stack-based resource group named sampleCFNstackgroup. To update the group query, you can change the values specified for ResourceTypeFilters or StackIdentifier.
+
+Command::
+
+ aws resource-groups update-group-query --group-name sampleCFNstackgroup --resource-query '{"Type": "CLOUDFORMATION_STACK_1_0", "Query": "{\"ResourceTypeFilters\":[\"AWS::AllSupported\"],\"StackIdentifier\":\"arn:aws:cloudformation:us-east-2:123456789012:stack/testcloudformationstack/1415z9z0-z39z-11z8-97z5-500z212zz6fz\"}"}'
+
+Output::
+
+ {
+ "Group": {
+ "GroupArn": "arn:aws:resource-groups:us-east-2:123456789012:group/sampleCFNstackgroup",
+ "Name": "sampleCFNstackgroup"
+ },
+ "ResourceQuery": {
+ "Type": "CLOUDFORMATION_STACK_1_0",
+ "Query":'{\"CloudFormationStackArn\":\"arn:aws:cloudformation:us-east-2:123456789012:stack/testcloudformationstack/1415z9z0-z39z-11z8-97z5-500z212zz6fz\",\"ResourceTypeFilters\":[\"AWS::AllSupported\"]}"}'
+ }
+}
+
diff -Nru awscli-1.16.63/awscli/examples/resource-groups/update-group.rst awscli-1.16.81/awscli/examples/resource-groups/update-group.rst
--- awscli-1.16.63/awscli/examples/resource-groups/update-group.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/resource-groups/update-group.rst 2018-12-21 22:23:36.000000000 +0000
@@ -0,0 +1,19 @@
+**To update the description for a resource group**
+
+This example updates the description for a group named WebServer3 in the current region.
+
+Command::
+
+ aws resource-groups update-group --group-name WebServer3 --description "Group of web server resources."
+
+Output::
+
+ {
+ "Group": {
+ "GroupArn": "arn:aws:resource-groups:us-east-2:000000000000:group/WebServer3",
+ "Name": "WebServer3"
+ "Description": "Group of web server resources."
+ }
+}
+
+
diff -Nru awscli-1.16.63/awscli/examples/waf/update-byte-match-set.rst awscli-1.16.81/awscli/examples/waf/update-byte-match-set.rst
--- awscli-1.16.63/awscli/examples/waf/update-byte-match-set.rst 2018-11-28 00:41:28.000000000 +0000
+++ awscli-1.16.81/awscli/examples/waf/update-byte-match-set.rst 2018-12-21 22:23:36.000000000 +0000
@@ -1,8 +1,8 @@
**To update a byte match set**
-The following ``update-byte-match-set`` command deletes a ByteMatchTuple object (filter) in a ByteMatchSet:
+The following ``update-byte-match-set`` command deletes a ByteMatchTuple object (filter) in a ByteMatchSet::
-aws waf update-byte-match-set --byte-match-set-id a123fae4-b567-8e90-1234-5ab67ac8ca90 --change-token 12cs345-67cd-890b-1cd2-c3a4567d89f1 --updates Action="DELETE",ByteMatchTuple={FieldToMatch={Type="HEADER",Data="referer"},TargetString="badrefer1",TextTransformation="NONE",PositionalConstraint="CONTAINS"}
+ aws waf update-byte-match-set --byte-match-set-id a123fae4-b567-8e90-1234-5ab67ac8ca90 --change-token 12cs345-67cd-890b-1cd2-c3a4567d89f1 --updates Action="DELETE",ByteMatchTuple={FieldToMatch={Type="HEADER",Data="referer"},TargetString="badrefer1",TextTransformation="NONE",PositionalConstraint="CONTAINS"}
diff -Nru awscli-1.16.63/awscli/examples/waf/update-ip-set.rst awscli-1.16.81/awscli/examples/waf/update-ip-set.rst
--- awscli-1.16.63/awscli/examples/waf/update-ip-set.rst 2018-11-28 00:41:28.000000000 +0000
+++ awscli-1.16.81/awscli/examples/waf/update-ip-set.rst 2018-12-21 22:23:36.000000000 +0000
@@ -8,29 +8,27 @@
aws waf update-ip-set --ip-set-id a123fae4-b567-8e90-1234-5ab67ac8ca90 --change-token 12cs345-67cd-890b-1cd2-c3a4567d89f1 --updates file://change.json
-Where content of the JSON file is:
-
-[
-{
-"Action": "INSERT",
-"IPSetDescriptor":
-{
-"Type": "IPV4",
-"Value": "12.34.56.78/16"
-}
-},
-{
-"Action": "DELETE",
-"IPSetDescriptor":
-{
-"Type": "IPV6",
-"Value": "1111:0000:0000:0000:0000:0000:0000:0111/128"
-}
-}
-]
-
-
+Where content of the JSON file is::
+ [
+ {
+ "Action": "INSERT",
+ "IPSetDescriptor":
+ {
+ "Type": "IPV4",
+ "Value": "12.34.56.78/16"
+ }
+ },
+ {
+ "Action": "DELETE",
+ "IPSetDescriptor":
+ {
+ "Type": "IPV6",
+ "Value": "1111:0000:0000:0000:0000:0000:0000:0111/128"
+ }
+ }
+ ]
+
For more information, see `Working with IP Match Conditions`_ in the *AWS WAF* developer guide.
.. _`Working with IP Match Conditions`: https://docs.aws.amazon.com/waf/latest/developerguide/web-acl-ip-conditions.html
diff -Nru awscli-1.16.63/awscli/examples/waf/update-rule.rst awscli-1.16.81/awscli/examples/waf/update-rule.rst
--- awscli-1.16.63/awscli/examples/waf/update-rule.rst 2018-11-28 00:41:28.000000000 +0000
+++ awscli-1.16.81/awscli/examples/waf/update-rule.rst 2018-12-21 22:23:36.000000000 +0000
@@ -1,8 +1,10 @@
**To update a rule**
-The following ``update-rule`` command deletes a Predicate object in a rule.
+The following ``update-rule`` command deletes a Predicate object in a rule::
+
+
+ aws waf update-rule --rule-id a123fae4-b567-8e90-1234-5ab67ac8ca90 --change-token 12cs345-67cd-890b-1cd2-c3a4567d89f1 --updates Action="DELETE",Predicate={Negated=false,Type="ByteMatch",DataId="MyByteMatchSetID"}
-aws waf update-rule --rule-id a123fae4-b567-8e90-1234-5ab67ac8ca90 --change-token 12cs345-67cd-890b-1cd2-c3a4567d89f1 --updates Action="DELETE",Predicate="{Negated=false,Type="ByteMatch",DataId="MyByteMatchSetID"}"
diff -Nru awscli-1.16.63/awscli/examples/waf/update-size-constraint-set.rst awscli-1.16.81/awscli/examples/waf/update-size-constraint-set.rst
--- awscli-1.16.63/awscli/examples/waf/update-size-constraint-set.rst 2018-11-28 00:41:28.000000000 +0000
+++ awscli-1.16.81/awscli/examples/waf/update-size-constraint-set.rst 2018-12-21 22:23:36.000000000 +0000
@@ -1,8 +1,8 @@
**To update a size constraint set**
-The following ``update-size-constraint-set`` command deletes a SizeConstraint object (filters) in a size constraint set.
+The following ``update-size-constraint-set`` command deletes a SizeConstraint object (filters) in a size constraint set::
-aws waf update-size-constraint-set --size-constraint-set-id a123fae4-b567-8e90-1234-5ab67ac8ca90 --change-token 12cs345-67cd-890b-1cd2-c3a4567d89f1 --updates Action="DELETE",SizeConstraint={FieldToMatch={Type="QUERY_STRING"},TextTransformation="NONE",ComparisonOperator="GT",Size=0}
+ aws waf update-size-constraint-set --size-constraint-set-id a123fae4-b567-8e90-1234-5ab67ac8ca90 --change-token 12cs345-67cd-890b-1cd2-c3a4567d89f1 --updates Action="DELETE",SizeConstraint={FieldToMatch={Type="QUERY_STRING"},TextTransformation="NONE",ComparisonOperator="GT",Size=0}
diff -Nru awscli-1.16.63/awscli/examples/waf/update-sql-injection-match-set.rst awscli-1.16.81/awscli/examples/waf/update-sql-injection-match-set.rst
--- awscli-1.16.63/awscli/examples/waf/update-sql-injection-match-set.rst 2018-11-28 00:41:28.000000000 +0000
+++ awscli-1.16.81/awscli/examples/waf/update-sql-injection-match-set.rst 2018-12-21 22:23:36.000000000 +0000
@@ -1,8 +1,8 @@
**To update a SQL Injection Match Set**
-The following ``update-sql-injection-match-set`` command deletes a SqlInjectionMatchTuple object (filters) in a SQL injection match set.
+The following ``update-sql-injection-match-set`` command deletes a SqlInjectionMatchTuple object (filters) in a SQL injection match set::
-aws waf update-sql-injection-match-set --sql-injection-match-set-id a123fae4-b567-8e90-1234-5ab67ac8ca90 --change-token 12cs345-67cd-890b-1cd2-c3a4567d89f1 --updates Action="DELETE",SqlInjectionMatchTuple={FieldToMatch={Type="QUERY_STRING"},TextTransformation="URL_DECODE"}
+ aws waf update-sql-injection-match-set --sql-injection-match-set-id a123fae4-b567-8e90-1234-5ab67ac8ca90 --change-token 12cs345-67cd-890b-1cd2-c3a4567d89f1 --updates Action="DELETE",SqlInjectionMatchTuple={FieldToMatch={Type="QUERY_STRING"},TextTransformation="URL_DECODE"}
diff -Nru awscli-1.16.63/awscli/examples/waf/update-xss-match-set.rst awscli-1.16.81/awscli/examples/waf/update-xss-match-set.rst
--- awscli-1.16.63/awscli/examples/waf/update-xss-match-set.rst 2018-11-28 00:41:28.000000000 +0000
+++ awscli-1.16.81/awscli/examples/waf/update-xss-match-set.rst 2018-12-21 22:23:36.000000000 +0000
@@ -1,8 +1,8 @@
**To update an XSSMatchSet**
-The following ``update-xss-match-set`` command deletes an XssMatchTuple object (filters) in an XssMatchSet.
+The following ``update-xss-match-set`` command deletes an XssMatchTuple object (filters) in an XssMatchSet::
-aws waf update-xss-match-set --xss-match-set-id a123fae4-b567-8e90-1234-5ab67ac8ca90 --change-token 12cs345-67cd-890b-1cd2-c3a4567d89f1 --updates Action="DELETE",XssMatchTuple={FieldToMatch={Type="QUERY_STRING"},TextTransformation="URL_DECODE"}
+ aws waf update-xss-match-set --xss-match-set-id a123fae4-b567-8e90-1234-5ab67ac8ca90 --change-token 12cs345-67cd-890b-1cd2-c3a4567d89f1 --updates Action="DELETE",XssMatchTuple={FieldToMatch={Type="QUERY_STRING"},TextTransformation="URL_DECODE"}
diff -Nru awscli-1.16.63/awscli/examples/waf-regional/associate-web-acl.rst awscli-1.16.81/awscli/examples/waf-regional/associate-web-acl.rst
--- awscli-1.16.63/awscli/examples/waf-regional/associate-web-acl.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/waf-regional/associate-web-acl.rst 2018-12-21 22:23:36.000000000 +0000
@@ -0,0 +1,14 @@
+**To associate a web ACL with a resource**
+
+The following ``associate-web-acl`` command associates a web ACL, specified by the web-acl-id, with a resource, specified by the resource-arn. The resource ARN can refer to either a application load balancer or an API Gateway::
+
+ aws waf-regional associate-web-acl --web-acl-id a123fae4-b567-8e90-1234-5ab67ac8ca90 --resource-arn 12cs345-67cd-890b-1cd2-c3a4567d89f1
+
+
+
+
+
+For more information, see `Working with Web ACLs`_ in the *AWS WAF* developer guide.
+
+.. _`Working with Web ACLs`: https://docs.aws.amazon.com/waf/latest/developerguide/web-acl-working-with.html
+
diff -Nru awscli-1.16.63/awscli/examples/waf-regional/update-byte-match-set.rst awscli-1.16.81/awscli/examples/waf-regional/update-byte-match-set.rst
--- awscli-1.16.63/awscli/examples/waf-regional/update-byte-match-set.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/waf-regional/update-byte-match-set.rst 2018-12-21 22:23:36.000000000 +0000
@@ -0,0 +1,13 @@
+**To update a byte match set**
+
+The following ``update-byte-match-set`` command deletes a ByteMatchTuple object (filter) in a ByteMatchSet:
+
+ aws waf-regional update-byte-match-set --byte-match-set-id a123fae4-b567-8e90-1234-5ab67ac8ca90 --change-token 12cs345-67cd-890b-1cd2-c3a4567d89f1 --updates Action="DELETE",ByteMatchTuple={FieldToMatch={Type="HEADER",Data="referer"},TargetString="badrefer1",TextTransformation="NONE",PositionalConstraint="CONTAINS"}
+
+
+
+
+For more information, see `Working with String Match Conditions`_ in the *AWS WAF* developer guide.
+
+.. _`Working with String Match Conditions`: https://docs.aws.amazon.com/waf/latest/developerguide/web-acl-string-conditions.html
+
diff -Nru awscli-1.16.63/awscli/examples/waf-regional/update-ip-set.rst awscli-1.16.81/awscli/examples/waf-regional/update-ip-set.rst
--- awscli-1.16.63/awscli/examples/waf-regional/update-ip-set.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/waf-regional/update-ip-set.rst 2018-12-21 22:23:36.000000000 +0000
@@ -0,0 +1,35 @@
+**To update an IP set**
+
+The following ``update-ip-set`` command updates an IPSet with an IPv4 address and deletes an IPv6 address::
+
+ aws waf update-ip-set --ip-set-id a123fae4-b567-8e90-1234-5ab67ac8ca90 --change-token 12cs345-67cd-890b-1cd2-c3a4567d89f1 --updates Action="INSERT",IPSetDescriptor={Type="IPV4",Value="12.34.56.78/16"},Action="DELETE",IPSetDescriptor={Type="IPV6",Value="1111:0000:0000:0000:0000:0000:0000:0111/128"}
+
+Alternatively you can use a JSON file to specify the input. For example::
+
+ aws waf-regional update-ip-set --ip-set-id a123fae4-b567-8e90-1234-5ab67ac8ca90 --change-token 12cs345-67cd-890b-1cd2-c3a4567d89f1 --updates file://change.json
+
+Where content of the JSON file is::
+
+ [
+ {
+ "Action": "INSERT",
+ "IPSetDescriptor":
+ {
+ "Type": "IPV4",
+ "Value": "12.34.56.78/16"
+ }
+ },
+ {
+ "Action": "DELETE",
+ "IPSetDescriptor":
+ {
+ "Type": "IPV6",
+ "Value": "1111:0000:0000:0000:0000:0000:0000:0111/128"
+ }
+ }
+ ]
+
+For more information, see `Working with IP Match Conditions`_ in the *AWS WAF* developer guide.
+
+.. _`Working with IP Match Conditions`: https://docs.aws.amazon.com/waf/latest/developerguide/web-acl-ip-conditions.html
+
diff -Nru awscli-1.16.63/awscli/examples/waf-regional/update-rule.rst awscli-1.16.81/awscli/examples/waf-regional/update-rule.rst
--- awscli-1.16.63/awscli/examples/waf-regional/update-rule.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/waf-regional/update-rule.rst 2018-12-21 22:23:36.000000000 +0000
@@ -0,0 +1,14 @@
+**To update a rule**
+
+The following ``update-rule`` command deletes a Predicate object in a rule::
+
+ aws waf-regional update-rule --rule-id a123fae4-b567-8e90-1234-5ab67ac8ca90 --change-token 12cs345-67cd-890b-1cd2-c3a4567d89f1 --updates Action="DELETE",Predicate={Negated=false,Type="ByteMatch",DataId="MyByteMatchSetID"}
+
+
+
+
+For more information, see `Working with Rules`_ in the *AWS WAF* developer guide.
+
+.. _`Working with Rules`:
+ https://docs.aws.amazon.com/waf/latest/developerguide/web-acl-rules.html
+
diff -Nru awscli-1.16.63/awscli/examples/waf-regional/update-size-constraint-set.rst awscli-1.16.81/awscli/examples/waf-regional/update-size-constraint-set.rst
--- awscli-1.16.63/awscli/examples/waf-regional/update-size-constraint-set.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/waf-regional/update-size-constraint-set.rst 2018-12-21 22:23:36.000000000 +0000
@@ -0,0 +1,13 @@
+**To update a size constraint set**
+
+The following ``update-size-constraint-set`` command deletes a SizeConstraint object (filters) in a size constraint set::
+
+ aws waf-regional update-size-constraint-set --size-constraint-set-id a123fae4-b567-8e90-1234-5ab67ac8ca90 --change-token 12cs345-67cd-890b-1cd2-c3a4567d89f1 --updates Action="DELETE",SizeConstraint={FieldToMatch={Type="QUERY_STRING"},TextTransformation="NONE",ComparisonOperator="GT",Size=0}
+
+
+
+
+For more information, see `Working with Size Constraint Conditions`_ in the *AWS WAF* developer guide.
+
+.. _`Working with Size Constraint Conditions`: https://docs.aws.amazon.com/waf/latest/developerguide/web-acl-size-conditions.html
+
diff -Nru awscli-1.16.63/awscli/examples/waf-regional/update-sql-injection-match-set.rst awscli-1.16.81/awscli/examples/waf-regional/update-sql-injection-match-set.rst
--- awscli-1.16.63/awscli/examples/waf-regional/update-sql-injection-match-set.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/waf-regional/update-sql-injection-match-set.rst 2018-12-21 22:23:36.000000000 +0000
@@ -0,0 +1,13 @@
+**To update a SQL Injection Match Set**
+
+The following ``update-sql-injection-match-set`` command deletes a SqlInjectionMatchTuple object (filters) in a SQL injection match set:
+
+ aws waf-regional update-sql-injection-match-set --sql-injection-match-set-id a123fae4-b567-8e90-1234-5ab67ac8ca90 --change-token 12cs345-67cd-890b-1cd2-c3a4567d89f1 --updates Action="DELETE",SqlInjectionMatchTuple={FieldToMatch={Type="QUERY_STRING"},TextTransformation="URL_DECODE"}
+
+
+
+
+For more information, see `Working with SQL Injection Match Conditions`_ in the *AWS WAF* developer guide.
+
+.. _`Working with SQL Injection Match Conditions`: https://docs.aws.amazon.com/waf/latest/developerguide/web-acl-sql-conditions.html
+
diff -Nru awscli-1.16.63/awscli/examples/waf-regional/update-web-acl.rst awscli-1.16.81/awscli/examples/waf-regional/update-web-acl.rst
--- awscli-1.16.63/awscli/examples/waf-regional/update-web-acl.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/waf-regional/update-web-acl.rst 2018-12-21 22:23:36.000000000 +0000
@@ -0,0 +1,13 @@
+**To update a web ACL**
+
+The following ``update-web-acl`` command deletes an ActivatedRule object in a WebACL::
+
+ aws waf-regional update-web-acl --web-acl-id a123fae4-b567-8e90-1234-5ab67ac8ca90 --change-token 12cs345-67cd-890b-1cd2-c3a4567d89f1 --updates Action="DELETE",ActivatedRule={Priority=1,RuleId="WAFRule-1-Example",Action={Type="ALLOW"},Type="ALLOW"}
+
+
+
+
+For more information, see `Working with Web ACLs`_ in the *AWS WAF* developer guide.
+
+.. _`Working with Web ACLs`: https://docs.aws.amazon.com/waf/latest/developerguide/web-acl-working-with.html
+
diff -Nru awscli-1.16.63/awscli/examples/waf-regional/update-xss-match-set.rst awscli-1.16.81/awscli/examples/waf-regional/update-xss-match-set.rst
--- awscli-1.16.63/awscli/examples/waf-regional/update-xss-match-set.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.16.81/awscli/examples/waf-regional/update-xss-match-set.rst 2018-12-21 22:23:36.000000000 +0000
@@ -0,0 +1,13 @@
+**To update an XSSMatchSet**
+
+The following ``update-xss-match-set`` command deletes an XssMatchTuple object (filters) in an XssMatchSet::
+
+ aws waf-regional update-xss-match-set --xss-match-set-id a123fae4-b567-8e90-1234-5ab67ac8ca90 --change-token 12cs345-67cd-890b-1cd2-c3a4567d89f1 --updates Action="DELETE",XssMatchTuple={FieldToMatch={Type="QUERY_STRING"},TextTransformation="URL_DECODE"}
+
+
+
+
+For more information, see `Working with Cross-site Scripting Match Conditions`_ in the *AWS WAF* developer guide.
+
+.. _`Working with Cross-site Scripting Match Conditions`: https://docs.aws.amazon.com/waf/latest/developerguide/web-acl-xss-conditions.html
+
diff -Nru awscli-1.16.63/awscli/__init__.py awscli-1.16.81/awscli/__init__.py
--- awscli-1.16.63/awscli/__init__.py 2018-11-28 00:41:29.000000000 +0000
+++ awscli-1.16.81/awscli/__init__.py 2018-12-21 22:23:36.000000000 +0000
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.16.63'
+__version__ = '1.16.81'
#
# Get our data path to be added to botocore's search path
diff -Nru awscli-1.16.63/awscli/paramfile.py awscli-1.16.81/awscli/paramfile.py
--- awscli-1.16.63/awscli/paramfile.py 2018-11-28 00:41:28.000000000 +0000
+++ awscli-1.16.81/awscli/paramfile.py 2018-12-21 22:23:36.000000000 +0000
@@ -31,8 +31,11 @@
# download the content (i.e TemplateURL in cloudformation).
PARAMFILE_DISABLED = set([
'api-gateway.put-integration.uri',
+ 'apigatewayv2.create-integration.integration-uri',
'appstream.create-stack.redirect-url',
+ 'appstream.create-stack.feedback-url',
'appstream.update-stack.redirect-url',
+ 'appstream.update-stack.feedback-url',
'cloudformation.create-stack.template-url',
'cloudformation.update-stack.template-url',
'cloudformation.create-stack-set.template-url',
@@ -83,6 +86,11 @@
'rds.copy-db-snapshot.pre-signed-url',
'rds.create-db-instance-read-replica.pre-signed-url',
+ 'sagemaker.create-notebook-instance.default-code-repository',
+ 'sagemaker.create-notebook-instance.additional-code-repositories',
+ 'sagemaker.update-notebook-instance.default-code-repository',
+ 'sagemaker.update-notebook-instance.additional-code-repositories',
+
'serverlessapplicationrepository.create-application.home-page-url',
'serverlessapplicationrepository.create-application.license-url',
'serverlessapplicationrepository.create-application.readme-url',
diff -Nru awscli-1.16.63/awscli/topics/config-vars.rst awscli-1.16.81/awscli/topics/config-vars.rst
--- awscli-1.16.63/awscli/topics/config-vars.rst 2018-11-28 00:41:28.000000000 +0000
+++ awscli-1.16.81/awscli/topics/config-vars.rst 2018-12-21 22:23:36.000000000 +0000
@@ -244,6 +244,10 @@
maps to the ``RoleSessionName`` parameter in the ``AssumeRole`` operation.
This is an optional parameter. If you do not provide this value, a
session name will be automatically generated.
+* ``duration_seconds`` - The duration, in seconds, of the role session.
+ The value can range from 900 seconds (15 minutes) up to the maximum
+ session duration setting for the role. This is an optional parameter
+ and by default, the value is set to 3600 seconds.
If you do not have MFA authentication required, then you only need to specify a
``role_arn`` and either a ``source_profile`` or a ``credential_source``.
diff -Nru awscli-1.16.63/awscli/topics/s3-faq.rst awscli-1.16.81/awscli/topics/s3-faq.rst
--- awscli-1.16.63/awscli/topics/s3-faq.rst 2018-11-28 00:41:28.000000000 +0000
+++ awscli-1.16.81/awscli/topics/s3-faq.rst 2018-12-21 22:23:36.000000000 +0000
@@ -25,7 +25,7 @@
instead will return an error message back the AWS CLI. The AWS CLI will retry
this error up to 5 times before giving up. On the case that any files fail to
transfer successfully to S3, the AWS CLI will exit with a non zero RC.
-See ``aws help returncodes`` for more information.
+See ``aws help return-codes`` for more information.
If the upload request is signed with Signature Version 4, then a
``Content-MD5`` is not calculated. Instead, the AWS CLI uses the
@@ -52,7 +52,7 @@
MD5 checksum does not match the expected checksum, the file is deleted
and the download is retried. This process is retried up to 3 times.
If a downloads fails, the AWS CLI will exit with a non zero RC.
-See ``aws help returncodes`` for more information.
+See ``aws help return-codes`` for more information.
There are several conditions where the CLI is *not* able to verify
checksums on downloads:
diff -Nru awscli-1.16.63/awscli.egg-info/PKG-INFO awscli-1.16.81/awscli.egg-info/PKG-INFO
--- awscli-1.16.63/awscli.egg-info/PKG-INFO 2018-11-28 00:41:30.000000000 +0000
+++ awscli-1.16.81/awscli.egg-info/PKG-INFO 2018-12-21 22:23:37.000000000 +0000
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: awscli
-Version: 1.16.63
+Version: 1.16.81
Summary: Universal Command Line Environment for AWS.
Home-page: http://aws.amazon.com/cli/
Author: Amazon Web Services
diff -Nru awscli-1.16.63/awscli.egg-info/requires.txt awscli-1.16.81/awscli.egg-info/requires.txt
--- awscli-1.16.63/awscli.egg-info/requires.txt 2018-11-28 00:41:30.000000000 +0000
+++ awscli-1.16.81/awscli.egg-info/requires.txt 2018-12-21 22:23:37.000000000 +0000
@@ -1,4 +1,4 @@
-botocore==1.12.53
+botocore==1.12.71
colorama<=0.3.9,>=0.2.5
docutils>=0.10
rsa<=3.5.0,>=3.1.2
diff -Nru awscli-1.16.63/awscli.egg-info/SOURCES.txt awscli-1.16.81/awscli.egg-info/SOURCES.txt
--- awscli-1.16.63/awscli.egg-info/SOURCES.txt 2018-11-28 00:41:30.000000000 +0000
+++ awscli-1.16.81/awscli.egg-info/SOURCES.txt 2018-12-21 22:23:37.000000000 +0000
@@ -392,6 +392,25 @@
awscli/examples/batch/terminate-job.rst
awscli/examples/batch/update-compute-environment.rst
awscli/examples/batch/update-job-queue.rst
+awscli/examples/budgets/create-budget.rst
+awscli/examples/budgets/create-notification.rst
+awscli/examples/budgets/create-subscriber.rst
+awscli/examples/budgets/delete-budget.rst
+awscli/examples/budgets/delete-notification.rst
+awscli/examples/budgets/delete-subscriber.rst
+awscli/examples/budgets/describe-budget.rst
+awscli/examples/budgets/describe-budgets.rst
+awscli/examples/budgets/describe-notifications-for-budget.rst
+awscli/examples/budgets/describe-subscribers-for-notification.rst
+awscli/examples/budgets/update-budget.rst
+awscli/examples/budgets/update-notification.rst
+awscli/examples/budgets/update-subscriber.rst
+awscli/examples/ce/get-cost-and-usage.rst
+awscli/examples/ce/get-dimension-values.rst
+awscli/examples/ce/get-reservation-coverage.rst
+awscli/examples/ce/get-reservation-purchase-recommendation.rst
+awscli/examples/ce/get-reservation-utilization.rst
+awscli/examples/ce/get-tags.rst
awscli/examples/cloud9/create-environment-ec2.rst
awscli/examples/cloud9/create-environment-membership.rst
awscli/examples/cloud9/delete-environment-membership.rst
@@ -534,6 +553,9 @@
awscli/examples/configure/get/_examples.rst
awscli/examples/configure/set/_description.rst
awscli/examples/configure/set/_examples.rst
+awscli/examples/cur/delete-report-definition.rst
+awscli/examples/cur/describe-report-definitions.rst
+awscli/examples/cur/put-report-definition.rst
awscli/examples/datapipeline/activate-pipeline.rst
awscli/examples/datapipeline/add-tags.rst
awscli/examples/datapipeline/create-pipeline.rst
@@ -982,6 +1004,22 @@
awscli/examples/elasticbeanstalk/update-configuration-template.rst
awscli/examples/elasticbeanstalk/update-environment.rst
awscli/examples/elasticbeanstalk/validate-configuration-settings.rst
+awscli/examples/elastictranscoder/cancel-job.rst
+awscli/examples/elastictranscoder/create-job.rst
+awscli/examples/elastictranscoder/create-pipeline.rst
+awscli/examples/elastictranscoder/create-preset.rst
+awscli/examples/elastictranscoder/delete-pipeline.rst
+awscli/examples/elastictranscoder/delete-preset.rst
+awscli/examples/elastictranscoder/list-jobs-by-pipeline.rst
+awscli/examples/elastictranscoder/list-jobs-by-status.rst
+awscli/examples/elastictranscoder/list-pipelines.rst
+awscli/examples/elastictranscoder/list-presets.rst
+awscli/examples/elastictranscoder/read-job.rst
+awscli/examples/elastictranscoder/read-pipeline.rst
+awscli/examples/elastictranscoder/read-preset.rst
+awscli/examples/elastictranscoder/update-pipeline-notifications.rst
+awscli/examples/elastictranscoder/update-pipeline-status.rst
+awscli/examples/elastictranscoder/update-pipeline.rst
awscli/examples/elb/add-tags.rst
awscli/examples/elb/apply-security-groups-to-load-balancer.rst
awscli/examples/elb/attach-load-balancer-to-subnets.rst
@@ -1371,7 +1409,11 @@
awscli/examples/organizations/update-policy.rst
awscli/examples/pi/describe-dimension-keys.rst
awscli/examples/pi/get-resource-metrics.rst
+awscli/examples/pricing/describe-services.rst
+awscli/examples/pricing/get-attribute-values.rst
+awscli/examples/pricing/get-products.rst
awscli/examples/rds/add-source-identifier-to-subscription.rst
+awscli/examples/rds/backtrack-db-cluster.rst
awscli/examples/rds/create-db-instance-read-replica.rst
awscli/examples/rds/create-db-instance.rst
awscli/examples/rds/create-db-security-group.rst
@@ -1439,6 +1481,9 @@
awscli/examples/redshift/restore-from-cluster-snapshot.rst
awscli/examples/redshift/revoke-cluster-security-group-ingress.rst
awscli/examples/redshift/revoke-snapshot-access.rst
+awscli/examples/resource-groups/create-group.rst
+awscli/examples/resource-groups/update-group-query.rst
+awscli/examples/resource-groups/update-group.rst
awscli/examples/route53/change-resource-record-sets.rst
awscli/examples/route53/change-tags-for-resource.rst
awscli/examples/route53/create-health-check.rst
@@ -1674,6 +1719,14 @@
awscli/examples/waf/update-sql-injection-match-set.rst
awscli/examples/waf/update-web-acl.rst
awscli/examples/waf/update-xss-match-set.rst
+awscli/examples/waf-regional/associate-web-acl.rst
+awscli/examples/waf-regional/update-byte-match-set.rst
+awscli/examples/waf-regional/update-ip-set.rst
+awscli/examples/waf-regional/update-rule.rst
+awscli/examples/waf-regional/update-size-constraint-set.rst
+awscli/examples/waf-regional/update-sql-injection-match-set.rst
+awscli/examples/waf-regional/update-web-acl.rst
+awscli/examples/waf-regional/update-xss-match-set.rst
awscli/examples/workdocs/abort-document-version-upload.rst
awscli/examples/workdocs/activate-user.rst
awscli/examples/workdocs/add-resource-permissions.rst
diff -Nru awscli-1.16.63/debian/changelog awscli-1.16.81/debian/changelog
--- awscli-1.16.63/debian/changelog 2018-11-28 09:59:23.000000000 +0000
+++ awscli-1.16.81/debian/changelog 2018-12-28 07:15:13.000000000 +0000
@@ -1,3 +1,11 @@
+awscli (1.16.81-1) unstable; urgency=medium
+
+ * New upstream version 1.16.81
+ * debian/patches: refresh
+ * Bump Stanrads-Version to 4.3.0
+
+ -- TANIGUCHI Takaki Fri, 28 Dec 2018 16:15:13 +0900
+
awscli (1.16.63-1) unstable; urgency=medium
* New upstream version 1.16.63
diff -Nru awscli-1.16.63/debian/control awscli-1.16.81/debian/control
--- awscli-1.16.63/debian/control 2018-11-28 09:59:23.000000000 +0000
+++ awscli-1.16.81/debian/control 2018-12-28 07:15:13.000000000 +0000
@@ -16,7 +16,7 @@
, python3-rsa(>=3.1.2)
, python3-s3transfer(>=0.1.9)
, python3-yaml(>=3.10)
-Standards-Version: 4.2.1
+Standards-Version: 4.3.0
Homepage: http://aws.amazon.com/cli/
Vcs-Git: https://salsa.debian.org/python-team/modules/awscli.git
Vcs-Browser: https://salsa.debian.org/python-team/modules/awscli
diff -Nru awscli-1.16.63/debian/patches/adopt_to_botocore_changes awscli-1.16.81/debian/patches/adopt_to_botocore_changes
--- awscli-1.16.63/debian/patches/adopt_to_botocore_changes 2018-11-28 09:59:23.000000000 +0000
+++ awscli-1.16.81/debian/patches/adopt_to_botocore_changes 2018-12-28 07:15:13.000000000 +0000
@@ -13,11 +13,11 @@
awscli/customizations/configure/__init__.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
-diff --git a/awscli/customizations/awslambda.py b/awscli/customizations/awslambda.py
-index 03fff2b..6733b26 100644
---- a/awscli/customizations/awslambda.py
-+++ b/awscli/customizations/awslambda.py
-@@ -14,7 +14,7 @@ import zipfile
+Index: awscli/awscli/customizations/awslambda.py
+===================================================================
+--- awscli.orig/awscli/customizations/awslambda.py 2018-12-28 16:12:52.452872576 +0900
++++ awscli/awscli/customizations/awslambda.py 2018-12-28 16:12:52.444872566 +0900
+@@ -14,7 +14,7 @@
import copy
from contextlib import closing
@@ -25,11 +25,11 @@
+import six
from awscli.arguments import CustomArgument, CLIArgument
- from awscli.customizations import utils
-diff --git a/awscli/customizations/configure/__init__.py b/awscli/customizations/configure/__init__.py
-index ea49773..61331bd 100644
---- a/awscli/customizations/configure/__init__.py
-+++ b/awscli/customizations/configure/__init__.py
+
+Index: awscli/awscli/customizations/configure/__init__.py
+===================================================================
+--- awscli.orig/awscli/customizations/configure/__init__.py 2018-12-28 16:12:52.452872576 +0900
++++ awscli/awscli/customizations/configure/__init__.py 2018-12-28 16:12:52.444872566 +0900
@@ -11,7 +11,7 @@
# ANY KIND, either express or implied. See the License for the specific
# language governing permissions and limitations under the License.
diff -Nru awscli-1.16.63/PKG-INFO awscli-1.16.81/PKG-INFO
--- awscli-1.16.63/PKG-INFO 2018-11-28 00:41:30.000000000 +0000
+++ awscli-1.16.81/PKG-INFO 2018-12-21 22:23:38.000000000 +0000
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: awscli
-Version: 1.16.63
+Version: 1.16.81
Summary: Universal Command Line Environment for AWS.
Home-page: http://aws.amazon.com/cli/
Author: Amazon Web Services
diff -Nru awscli-1.16.63/setup.cfg awscli-1.16.81/setup.cfg
--- awscli-1.16.63/setup.cfg 2018-11-28 00:41:30.000000000 +0000
+++ awscli-1.16.81/setup.cfg 2018-12-21 22:23:38.000000000 +0000
@@ -3,7 +3,7 @@
[metadata]
requires-dist =
- botocore==1.12.53
+ botocore==1.12.71
colorama>=0.2.5,<=0.3.9
docutils>=0.10
rsa>=3.1.2,<=3.5.0
diff -Nru awscli-1.16.63/setup.py awscli-1.16.81/setup.py
--- awscli-1.16.63/setup.py 2018-11-28 00:41:29.000000000 +0000
+++ awscli-1.16.81/setup.py 2018-12-21 22:23:36.000000000 +0000
@@ -23,7 +23,7 @@
raise RuntimeError("Unable to find version string.")
-requires = ['botocore==1.12.53',
+requires = ['botocore==1.12.71',
'colorama>=0.2.5,<=0.3.9',
'docutils>=0.10',
'rsa>=3.1.2,<=3.5.0',