AdditionalSlaveSecurityGroups - A list of additional Amazon EC2'
@@ -298,12 +301,17 @@
'listing clusters. For example, 2014-07-15T00:01:30. ')
EMR_MANAGED_MASTER_SECURITY_GROUP = (
- 'The identifier of the Amazon EC2 security group (managed by Amazon '
- 'Elastic MapReduce) for the master node.
')
+ 'The identifier of the Amazon EC2 security group '
+ 'for the master node.
')
EMR_MANAGED_SLAVE_SECURITY_GROUP = (
- 'The identifier of the Amazon EC2 security group (managed by Amazon '
- 'Elastic MapReduce) for the slave nodes.
')
+ 'The identifier of the Amazon EC2 security group '
+ 'for the slave nodes.
')
+
+SERVICE_ACCESS_SECURITY_GROUP = (
+ 'The identifier of the Amazon EC2 security group '
+ 'for the Amazon EMR service to access '
+ 'clusters in VPC private subnets.
')
ADDITIONAL_MASTER_SECURITY_GROUPS = (
' A list of additional Amazon EC2 security group IDs for '
diff -Nru awscli-1.9.9/awscli/customizations/globalargs.py awscli-1.10.1/awscli/customizations/globalargs.py
--- awscli-1.9.9/awscli/customizations/globalargs.py 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/customizations/globalargs.py 2016-01-28 22:38:12.000000000 +0000
@@ -13,6 +13,8 @@
import sys
import os
+from botocore.client import Config
+from botocore.endpoint import DEFAULT_TIMEOUT
from botocore.handlers import disable_signing
import jmespath
@@ -24,6 +26,7 @@
cli.register('top-level-args-parsed', no_sign_request)
cli.register('top-level-args-parsed', resolve_verify_ssl)
cli.register('top-level-args-parsed', resolve_cli_read_timeout)
+ cli.register('top-level-args-parsed', resolve_cli_connect_timeout)
def resolve_types(parsed_args, **kwargs):
@@ -80,9 +83,32 @@
session.register('choose-signer', disable_signing)
+def resolve_cli_connect_timeout(parsed_args, session, **kwargs):
+ arg_name = 'connect_timeout'
+ _resolve_timeout(session, parsed_args, arg_name)
+
+
def resolve_cli_read_timeout(parsed_args, session, **kwargs):
arg_name = 'read_timeout'
- arg_value = getattr(parsed_args, arg_name, None)
+ _resolve_timeout(session, parsed_args, arg_name)
- if arg_value is not None:
- setattr(parsed_args, arg_name, int(arg_value))
+
+def _resolve_timeout(session, parsed_args, arg_name):
+ arg_value = getattr(parsed_args, arg_name, None)
+ if arg_value is None:
+ arg_value = DEFAULT_TIMEOUT
+ arg_value = int(arg_value)
+ if arg_value == 0:
+ arg_value = None
+ setattr(parsed_args, arg_name, arg_value)
+ # Update in the default client config so that the timeout will be used
+ # by all clients created from then on.
+ _update_default_client_config(session, arg_name, arg_value)
+
+
+def _update_default_client_config(session, arg_name, arg_value):
+ current_default_config = session.get_default_client_config()
+ new_default_config = Config(**{arg_name: arg_value})
+ if current_default_config is not None:
+ new_default_config = current_default_config.merge(new_default_config)
+ session.set_default_client_config(new_default_config)
diff -Nru awscli-1.9.9/awscli/customizations/iot.py awscli-1.10.1/awscli/customizations/iot.py
--- awscli-1.9.9/awscli/customizations/iot.py 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/customizations/iot.py 2016-01-28 22:38:13.000000000 +0000
@@ -35,13 +35,13 @@
after_event = 'after-call.iot.CreateKeysAndCertificate'
argument_table['certificate-pem-outfile'] = QueryOutFileArgument(
session=session, name='certificate-pem-outfile',
- query='certificatePem', after_call_event=after_event)
+ query='certificatePem', after_call_event=after_event, perm=0o600)
argument_table['public-key-outfile'] = QueryOutFileArgument(
session=session, name='public-key-outfile', query='keyPair.PublicKey',
- after_call_event=after_event)
+ after_call_event=after_event, perm=0o600)
argument_table['private-key-outfile'] = QueryOutFileArgument(
session=session, name='private-key-outfile',
- query='keyPair.PrivateKey', after_call_event=after_event)
+ query='keyPair.PrivateKey', after_call_event=after_event, perm=0o600)
def register_create_keys_from_csr_arguments(session, argument_table, **kwargs):
@@ -49,4 +49,4 @@
argument_table['certificate-pem-outfile'] = QueryOutFileArgument(
session=session, name='certificate-pem-outfile',
query='certificatePem',
- after_call_event='after-call.iot.CreateCertificateFromCsr')
+ after_call_event='after-call.iot.CreateCertificateFromCsr', perm=0o600)
diff -Nru awscli-1.9.9/awscli/customizations/opsworks.py awscli-1.10.1/awscli/customizations/opsworks.py
--- awscli-1.9.9/awscli/customizations/opsworks.py 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/customizations/opsworks.py 2016-01-28 22:38:12.000000000 +0000
@@ -24,6 +24,7 @@
from awscli.compat import shlex_quote, urlopen
from awscli.customizations.commands import BasicCommand
+from awscli.customizations.utils import create_client_from_parsed_globals
from awscli.errorhandler import ClientError
@@ -126,16 +127,9 @@
self._name_for_iam = None
def _create_clients(self, args, parsed_globals):
- endpoint_args = {}
- if 'region' in parsed_globals:
- endpoint_args['region_name'] = parsed_globals.region
- if 'endpoint_url' in parsed_globals:
- endpoint_args['endpoint_url'] = parsed_globals.endpoint_url
- if 'verify_ssl' in parsed_globals:
- endpoint_args['verify'] = parsed_globals.verify_ssl
self.iam = self._session.create_client('iam')
- self.opsworks = self._session.create_client(
- 'opsworks', **endpoint_args)
+ self.opsworks = create_client_from_parsed_globals(
+ self._session, 'opsworks', parsed_globals)
def _run_main(self, args, parsed_globals):
self._create_clients(args, parsed_globals)
diff -Nru awscli-1.9.9/awscli/customizations/s3/filegenerator.py awscli-1.10.1/awscli/customizations/s3/filegenerator.py
--- awscli-1.9.9/awscli/customizations/s3/filegenerator.py 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/customizations/s3/filegenerator.py 2016-01-28 22:38:12.000000000 +0000
@@ -19,7 +19,7 @@
from awscli.customizations.s3.utils import find_bucket_key, get_file_stat
from awscli.customizations.s3.utils import BucketLister, create_warning, \
- find_dest_path_comp_key
+ find_dest_path_comp_key, EPOCH_TIME
from awscli.errorhandler import ClientError
from awscli.compat import six
from awscli.compat import queue
@@ -173,6 +173,7 @@
if not self.should_ignore_file(path):
if not dir_op:
size, last_update = get_file_stat(path)
+ last_update = self._validate_update_time(last_update, path)
yield path, {'Size': size, 'LastModified': last_update}
else:
@@ -208,11 +209,25 @@
yield x
else:
size, last_update = get_file_stat(file_path)
+ last_update = self._validate_update_time(
+ last_update, path)
yield (
file_path,
{'Size': size, 'LastModified': last_update}
)
+ def _validate_update_time(self, update_time, path):
+ # If the update time is None we know we ran into an invalid tiemstamp.
+ if update_time is None:
+ warning = create_warning(
+ path=path,
+ error_message="File has an invalid timestamp. Passing epoch "
+ "time as timestamp.",
+ skip_file=False)
+ self.result_queue.put(warning)
+ return EPOCH_TIME
+ return update_time
+
def normalize_sort(self, names, os_sep, character):
"""
The purpose of this function is to ensure that the same path seperator
diff -Nru awscli-1.9.9/awscli/customizations/s3/fileinfo.py awscli-1.10.1/awscli/customizations/s3/fileinfo.py
--- awscli-1.9.9/awscli/customizations/s3/fileinfo.py 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/customizations/s3/fileinfo.py 2016-01-28 22:38:12.000000000 +0000
@@ -308,7 +308,8 @@
"""
Copies a object in s3 to another location in s3.
"""
- copy_source = self.src
+ source_bucket, source_key = find_bucket_key(self.src)
+ copy_source = {'Bucket': source_bucket, 'Key': source_key}
bucket, key = find_bucket_key(self.dest)
params = {'Bucket': bucket,
'CopySource': copy_source, 'Key': key}
diff -Nru awscli-1.9.9/awscli/customizations/s3/s3handler.py awscli-1.10.1/awscli/customizations/s3/s3handler.py
--- awscli-1.9.9/awscli/customizations/s3/s3handler.py 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/customizations/s3/s3handler.py 2016-01-28 22:38:12.000000000 +0000
@@ -65,7 +65,7 @@
'content_disposition': None, 'content_encoding': None,
'content_language': None, 'expires': None, 'grants': None,
'only_show_errors': False, 'is_stream': False,
- 'paths_type': None, 'expected_size': None,
+ 'paths_type': None, 'expected_size': None, 'metadata': None,
'metadata_directive': None, 'ignore_glacier_warnings': False
}
self.params['region'] = params['region']
diff -Nru awscli-1.9.9/awscli/customizations/s3/subcommands.py awscli-1.10.1/awscli/customizations/s3/subcommands.py
--- awscli-1.9.9/awscli/customizations/s3/subcommands.py 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/customizations/s3/subcommands.py 2016-01-28 22:38:12.000000000 +0000
@@ -115,7 +115,10 @@
'dest': 'filters',
'help_text': (
"Don't exclude files or objects "
- "in the command that match the specified pattern")}
+ "in the command that match the specified pattern. "
+ 'See Use of '
+ 'Exclude and Include Filters for details.')}
ACL = {'name': 'acl',
@@ -298,6 +301,23 @@
}
+METADATA = {
+ 'name': 'metadata', 'cli_type_name': 'map',
+ 'schema': {
+ 'type': 'map',
+ 'key': {'type': 'string'},
+ 'value': {'type': 'string'}
+ },
+ 'help_text': (
+ "A map of metadata to store with the objects in S3. This will be "
+ "applied to every object which is part of this request. In a sync, this"
+ "means that files which haven't changed won't receive the new metadata."
+ " When copying between two s3 locations, the metadata-directive "
+ "argument will default to 'REPLACE' unless otherwise specified."
+ )
+}
+
+
METADATA_DIRECTIVE = {
'name': 'metadata-directive', 'choices': ['COPY', 'REPLACE'],
'help_text': (
@@ -386,6 +406,7 @@
endpoint_url=endpoint_url, verify=verify,
config=config)
+
class S3Command(BasicCommand):
def _run_main(self, parsed_args, parsed_globals):
self.client = get_client(self._session, parsed_globals.region,
@@ -649,7 +670,7 @@
"or "
ARG_TABLE = [{'name': 'paths', 'nargs': 2, 'positional_arg': True,
'synopsis': USAGE}] + TRANSFER_ARGS + \
- [METADATA_DIRECTIVE, EXPECTED_SIZE, RECURSIVE]
+ [METADATA, METADATA_DIRECTIVE, EXPECTED_SIZE, RECURSIVE]
class MvCommand(S3TransferCommand):
@@ -659,8 +680,8 @@
USAGE = " or " \
"or "
ARG_TABLE = [{'name': 'paths', 'nargs': 2, 'positional_arg': True,
- 'synopsis': USAGE}] + TRANSFER_ARGS + [METADATA_DIRECTIVE,
- RECURSIVE]
+ 'synopsis': USAGE}] + TRANSFER_ARGS +\
+ [METADATA, METADATA_DIRECTIVE, RECURSIVE]
class RmCommand(S3TransferCommand):
NAME = 'rm'
@@ -680,7 +701,8 @@
USAGE = " or " \
" or "
ARG_TABLE = [{'name': 'paths', 'nargs': 2, 'positional_arg': True,
- 'synopsis': USAGE}] + TRANSFER_ARGS
+ 'synopsis': USAGE}] + TRANSFER_ARGS + \
+ [METADATA, METADATA_DIRECTIVE]
class MbCommand(S3TransferCommand):
diff -Nru awscli-1.9.9/awscli/customizations/s3/tasks.py awscli-1.10.1/awscli/customizations/s3/tasks.py
--- awscli-1.9.9/awscli/customizations/s3/tasks.py 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/customizations/s3/tasks.py 2016-01-28 22:38:12.000000000 +0000
@@ -161,7 +161,7 @@
params = {'Bucket': bucket, 'Key': key,
'PartNumber': self._part_number,
'UploadId': upload_id,
- 'CopySource': '%s/%s' % (src_bucket, src_key),
+ 'CopySource': {'Bucket': src_bucket, 'Key': src_key},
'CopySourceRange': range_param}
RequestParamsMapper.map_upload_part_copy_params(
params, self._params)
diff -Nru awscli-1.9.9/awscli/customizations/s3/utils.py awscli-1.10.1/awscli/customizations/s3/utils.py
--- awscli-1.9.9/awscli/customizations/s3/utils.py 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/customizations/s3/utils.py 2016-01-28 22:38:12.000000000 +0000
@@ -22,16 +22,16 @@
from functools import partial
from dateutil.parser import parse
-from dateutil.tz import tzlocal
+from dateutil.tz import tzlocal, tzutc
from botocore.compat import unquote_str
from awscli.compat import six
from awscli.compat import PY3
from awscli.compat import queue
-
HUMANIZE_SUFFIXES = ('KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB')
MAX_PARTS = 10000
+EPOCH_TIME = datetime(1970, 1, 1, tzinfo=tzutc())
# The maximum file size you can upload via S3 per request.
# See: http://docs.aws.amazon.com/AmazonS3/latest/dev/UploadingObjects.html
# and: http://docs.aws.amazon.com/AmazonS3/latest/dev/qfacts.html
@@ -217,10 +217,21 @@
"""
try:
stats = os.stat(path)
- update_time = datetime.fromtimestamp(stats.st_mtime, tzlocal())
- except (ValueError, IOError) as e:
+ except IOError as e:
raise ValueError('Could not retrieve file stat of "%s": %s' % (
path, e))
+
+ try:
+ update_time = datetime.fromtimestamp(stats.st_mtime, tzlocal())
+ except ValueError:
+ # Python's fromtimestamp raises value errors when the timestamp is out
+ # of range of the platform's C localtime() function. This can cause
+ # issues when syncing from systems with a wide range of valid timestamps
+ # to systems with a lower range. Some systems support 64-bit timestamps,
+ # for instance, while others only support 32-bit. We don't want to fail
+ # in these cases, so instead we pass along none.
+ update_time = None
+
return stats.st_size, update_time
@@ -252,12 +263,13 @@
return dest_path, compare_key
-def create_warning(path, error_message):
+def create_warning(path, error_message, skip_file=True):
"""
This creates a ``PrintTask`` for whenever a warning is to be thrown.
"""
print_string = "warning: "
- print_string = print_string + "Skipping file " + path + ". "
+ if skip_file:
+ print_string = print_string + "Skipping file " + path + ". "
print_string = print_string + error_message
warning_message = PrintTask(message=print_string, error=False,
warning=True)
@@ -300,18 +312,34 @@
"""
if out_file is None:
out_file = sys.stdout
- # Check for an encoding on the file.
- encoding = getattr(out_file, 'encoding', None)
- if encoding is not None and not PY3:
- out_file.write(statement.encode(out_file.encoding))
- else:
- try:
- out_file.write(statement)
- except UnicodeEncodeError:
- # Some file like objects like cStringIO will
- # try to decode as ascii. Interestingly enough
- # this works with a normal StringIO.
- out_file.write(statement.encode('utf-8'))
+ try:
+ # Otherwise we assume that out_file is a
+ # text writer type that accepts str/unicode instead
+ # of bytes.
+ out_file.write(statement)
+ except UnicodeEncodeError:
+ # Some file like objects like cStringIO will
+ # try to decode as ascii on python2.
+ #
+ # This can also fail if our encoding associated
+ # with the text writer cannot encode the unicode
+ # ``statement`` we've been given. This commonly
+ # happens on windows where we have some S3 key
+ # previously encoded with utf-8 that can't be
+ # encoded using whatever codepage the user has
+ # configured in their console.
+ #
+ # At this point we've already failed to do what's
+ # been requested. We now try to make a best effort
+ # attempt at printing the statement to the outfile.
+ # We're using 'ascii' as the default because if the
+ # stream doesn't give us any encoding information
+ # we want to pick an encoding that has the highest
+ # chance of printing successfully.
+ new_encoding = getattr(out_file, 'encoding', 'ascii')
+ new_statement = statement.encode(
+ new_encoding, 'replace').decode(new_encoding)
+ out_file.write(new_statement)
out_file.flush()
@@ -449,50 +477,19 @@
self._date_parser = date_parser
def list_objects(self, bucket, prefix=None, page_size=None):
- kwargs = {'Bucket': bucket, 'EncodingType': 'url',
- 'PaginationConfig': {'PageSize': page_size}}
+ kwargs = {'Bucket': bucket, 'PaginationConfig': {'PageSize': page_size}}
if prefix is not None:
kwargs['Prefix'] = prefix
- # This event handler is needed because we use encoding_type url and
- # we're paginating. The pagination token is the last Key of the
- # Contents list. However, botocore does not know that the encoding
- # type needs to be urldecoded.
- with ScopedEventHandler(self._client.meta.events,
- 'after-call.s3.ListObjects',
- self._decode_keys,
- 'BucketListerDecodeKeys'):
- paginator = self._client.get_paginator('list_objects')
- pages = paginator.paginate(**kwargs)
- for page in pages:
- contents = page.get('Contents', [])
- for content in contents:
- source_path = bucket + '/' + content['Key']
- content['LastModified'] = self._date_parser(
- content['LastModified'])
- yield source_path, content
-
- def _decode_keys(self, parsed, **kwargs):
- if 'Contents' in parsed:
- for content in parsed['Contents']:
- content['Key'] = unquote_str(content['Key'])
-
-
-class ScopedEventHandler(object):
- """Register an event callback for the duration of a scope."""
-
- def __init__(self, event_emitter, event_name, handler, unique_id=None):
- self._event_emitter = event_emitter
- self._event_name = event_name
- self._handler = handler
- self._unique_id = unique_id
-
- def __enter__(self):
- self._event_emitter.register(self._event_name, self._handler,
- self._unique_id)
- def __exit__(self, exc_type, exc_value, traceback):
- self._event_emitter.unregister(self._event_name, self._handler,
- self._unique_id)
+ paginator = self._client.get_paginator('list_objects')
+ pages = paginator.paginate(**kwargs)
+ for page in pages:
+ contents = page.get('Contents', [])
+ for content in contents:
+ source_path = bucket + '/' + content['Key']
+ content['LastModified'] = self._date_parser(
+ content['LastModified'])
+ yield source_path, content
class PrintTask(namedtuple('PrintTask',
@@ -551,6 +548,7 @@
def map_put_object_params(cls, request_params, cli_params):
"""Map CLI params to PutObject request params"""
cls._set_general_object_params(request_params, cli_params)
+ cls._set_metadata_params(request_params, cli_params)
cls._set_sse_request_params(request_params, cli_params)
cls._set_sse_c_request_params(request_params, cli_params)
@@ -564,6 +562,8 @@
"""Map CLI params to CopyObject request params"""
cls._set_general_object_params(request_params, cli_params)
cls._set_metadata_directive_param(request_params, cli_params)
+ cls._set_metadata_params(request_params, cli_params)
+ cls._auto_populate_metadata_directive(request_params)
cls._set_sse_request_params(request_params, cli_params)
cls._set_sse_c_and_copy_source_request_params(
request_params, cli_params)
@@ -579,6 +579,7 @@
cls._set_general_object_params(request_params, cli_params)
cls._set_sse_request_params(request_params, cli_params)
cls._set_sse_c_request_params(request_params, cli_params)
+ cls._set_metadata_params(request_params, cli_params)
@classmethod
def map_upload_part_params(cls, request_params, cli_params):
@@ -638,6 +639,17 @@
'read|readacl|writeacl|full')
@classmethod
+ def _set_metadata_params(cls, request_params, cli_params):
+ if cli_params.get('metadata'):
+ request_params['Metadata'] = cli_params['metadata']
+
+ @classmethod
+ def _auto_populate_metadata_directive(cls, request_params):
+ if request_params.get('Metadata') and \
+ not request_params.get('MetadataDirective'):
+ request_params['MetadataDirective'] = 'REPLACE'
+
+ @classmethod
def _set_metadata_directive_param(cls, request_params, cli_params):
if cli_params.get('metadata_directive'):
request_params['MetadataDirective'] = cli_params[
diff -Nru awscli-1.9.9/awscli/customizations/utils.py awscli-1.10.1/awscli/customizations/utils.py
--- awscli-1.9.9/awscli/customizations/utils.py 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/customizations/utils.py 2016-01-28 22:38:12.000000000 +0000
@@ -98,3 +98,23 @@
if error_code == 404:
bucket_exists = False
return bucket_exists
+
+
+def create_client_from_parsed_globals(session, service_name, parsed_globals,
+ overrides=None):
+ """Creates a service client, taking parsed_globals into account
+
+ Any values specified in overrides will override the returned dict. Note
+ that this override occurs after 'region' from parsed_globals has been
+ translated into 'region_name' in the resulting dict.
+ """
+ client_args = {}
+ if 'region' in parsed_globals:
+ client_args['region_name'] = parsed_globals.region
+ if 'endpoint_url' in parsed_globals:
+ client_args['endpoint_url'] = parsed_globals.endpoint_url
+ if 'verify_ssl' in parsed_globals:
+ client_args['verify'] = parsed_globals.verify_ssl
+ if overrides:
+ client_args.update(overrides)
+ return session.create_client(service_name, **client_args)
diff -Nru awscli-1.9.9/awscli/data/cli.json awscli-1.10.1/awscli/data/cli.json
--- awscli-1.9.9/awscli/data/cli.json 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/data/cli.json 2016-01-28 22:38:12.000000000 +0000
@@ -58,7 +58,12 @@
"cli-read-timeout": {
"dest": "read_timeout",
"type": "int",
- "help": "The maximum socket read time in seconds.
"
+ "help": "The maximum socket read time in seconds. If the value is set to 0, the socket read will be blocking and not timeout.
"
+ },
+ "cli-connect-timeout": {
+ "dest": "connect_timeout",
+ "type": "int",
+ "help": "The maximum socket connect time in seconds. If the value is set to 0, the socket connect will be blocking and not timeout.
"
}
}
}
diff -Nru awscli-1.9.9/awscli/examples/acm/delete-certificate.rst awscli-1.10.1/awscli/examples/acm/delete-certificate.rst
--- awscli-1.9.9/awscli/examples/acm/delete-certificate.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/acm/delete-certificate.rst 2016-01-28 22:38:13.000000000 +0000
@@ -0,0 +1,5 @@
+**To delete an ACM certificate from your account**
+
+The following ``delete-certificate`` command deletes the certificate with the specified ARN::
+
+ aws acm delete-certificate --certificate-arn arn:aws:acm:us-east-1:123456789012:certificate/12345678-1234-1234-1234-123456789012
\ No newline at end of file
diff -Nru awscli-1.9.9/awscli/examples/acm/describe-certificate.rst awscli-1.10.1/awscli/examples/acm/describe-certificate.rst
--- awscli-1.9.9/awscli/examples/acm/describe-certificate.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/acm/describe-certificate.rst 2016-01-28 22:38:13.000000000 +0000
@@ -0,0 +1,59 @@
+**To retrieve the fields contained in an ACM certificate**
+
+The following ``describe-certificate`` command retrieves all of the fields for the certificate with the specified ARN::
+
+ aws acm describe-certificate --certificate-arn arn:aws:acm:us-east-1:123456789012:certificate/12345678-1234-1234-1234-123456789012
+
+Output similar to the following is displayed::
+
+ {
+ "Certificate": {
+ "CertificateArn": "arn:aws:acm:us-east-1:123456789012:certificate/12345678-1234-1234-1234-123456789012",
+ "CreatedAt": 1446835267.0,
+ "DomainName": "www.example.com",
+ "DomainValidationOptions": [
+ {
+ "DomainName": "www.example.com",
+ "ValidationDomain": "www.example.com",
+ "ValidationEmails": [
+ "hostmaster@example.com",
+ "admin@example.com",
+ "owner@example.com.whoisprivacyservice.org",
+ "tech@example.com.whoisprivacyservice.org",
+ "admin@example.com.whoisprivacyservice.org",
+ "postmaster@example.com",
+ "webmaster@example.com",
+ "administrator@example.com"
+ ]
+ },
+ {
+ "DomainName": "www.example.net",
+ "ValidationDomain": "www.example.net",
+ "ValidationEmails": [
+ "postmaster@example.net",
+ "admin@example.net",
+ "owner@example.net.whoisprivacyservice.org",
+ "tech@example.net.whoisprivacyservice.org",
+ "admin@example.net.whoisprivacyservice.org",
+ "hostmaster@example.net",
+ "administrator@example.net",
+ "webmaster@example.net"
+ ]
+ }
+ ],
+ "InUseBy": [],
+ "IssuedAt": 1446835815.0,
+ "Issuer": "Amazon",
+ "KeyAlgorithm": "RSA-2048",
+ "NotAfter": 1478433600.0,
+ "NotBefore": 1446768000.0,
+ "Serial": "0f:ac:b0:a3:8d:ea:65:52:2d:7d:01:3a:39:36:db:d6",
+ "SignatureAlgorithm": "SHA256WITHRSA",
+ "Status": "ISSUED",
+ "Subject": "CN=www.example.com",
+ "SubjectAlternativeNames": [
+ "www.example.com",
+ "www.example.net"
+ ]
+ }
+ }
diff -Nru awscli-1.9.9/awscli/examples/acm/get-certificate.rst awscli-1.10.1/awscli/examples/acm/get-certificate.rst
--- awscli-1.9.9/awscli/examples/acm/get-certificate.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/acm/get-certificate.rst 2016-01-28 22:38:13.000000000 +0000
@@ -0,0 +1,75 @@
+**To retrieve an ACM certificate**
+
+The following ``get-certificate`` command retrieves the certificate for the specified ARN and the certificate chain::
+
+ aws acm get-certificate --certificate-arn arn:aws:acm:us-east-1:123456789012:certificate/12345678-1234-1234-1234-123456789012
+
+Output similar to the following is displayed::
+
+ {
+ "Certificate": "-----BEGIN CERTIFICATE-----
+ MIICiTCCAfICCQD6m7oRw0uXOjANBgkqhkiG9w0BAQUFADCBiDELMAkGA1UEBhMC
+ VVMxCzAJBgNVBAgTAldBMRAwDgYDVQQHEwdTZWF0dGxlMQ8wDQYDVQQKEwZBbWF6
+ b24xFDASBgNVBAsTC0lBTSBDb25zb2xlMRIwEAYDVQQDEwlUZXN0Q2lsYWMxHzAd
+ BgkqhkiG9w0BCQEWEG5vb25lQGFtYXpvbi5jb20wHhcNMTEwNDI1MjA0NTIxWhcN
+ MTIwNDI0MjA0NTIxWjCBiDELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAldBMRAwDgYD
+ VQQHEwdTZWF0dGxlMQ8wDQYDVQQKEwZBbWF6b24xFDASBgNVBAsTC0lBTSBDb25z
+ b2xlMRIwEAYDVQQDEwlUZXN0Q2lsYWMxHzAdBgkqhkiG9w0BCQEWEG5vb25lQGFt
+ YXpvbi5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMaK0dn+a4GmWIWJ
+ 21uUSfwfEvySWtC2XADZ4nB+BLYgVIk60CpiwsZ3G93vUEIO3IyNoH/f0wYK8m9T
+ rDHudUZg3qX4waLG5M43q7Wgc/MbQITxOUSQv7c7ugFFDzQGBzZswY6786m86gpE
+ Ibb3OhjZnzcvQAaRHhdlQWIMm2nrAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAtCu4
+ nUhVVxYUntneD9+h8Mg9q6q+auNKyExzyLwaxlAoo7TJHidbtS4J5iNmZgXL0Fkb
+ FFBjvSfpJIlJ00zbhNYS5f6GuoEDmFJl0ZxBHjJnyp378OD8uTs7fLvjx79LjSTb
+ NYiytVbZPQUQ5Yaxu2jXnimvw3rrszlaEXAMPLE=
+ -----END CERTIFICATE-----",
+
+ "CertificateChain": "-----BEGIN CERTIFICATE-----
+ MIICiTCCAfICCQD6m7oRw0uXOjANBgkqhkiG9w0BAQUFADCBiDELMAkGA1UEBhMC
+ VVMxCzAJBgNVBAgTAldBMRAwDgYDVQQHEwdTZWF0dGxlMQ8wDQYDVQQKEwZBbWF6
+ b24xFDASBgNVBAsTC0lBTSBDb25zb2xlMRIwEAYDVQQDEwlUZXN0Q2lsYWMxHzAd
+ BgkqhkiG9w0BCQEWEG5vb25lQGFtYXpvbi5jb20wHhcNMTEwNDI1MjA0NTIxWhcN
+ MTIwNDI0MjA0NTIxWjCBiDELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAldBMRAwDgYD
+ VQQHEwdTZWF0dGxlMQ8wDQYDVQQKEwZBbWF6b24xFDASBgNVBAsTC0lBTSBDb25z
+ b2xlMRIwEAYDVQQDEwlUZXN0Q2lsYWMxHzAdBgkqhkiG9w0BCQEWEG5vb25lQGFt
+ YXpvbi5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMaK0dn+a4GmWIWJ
+ 21uUSfwfEvySWtC2XADZ4nB+BLYgVIk60CpiwsZ3G93vUEIO3IyNoH/f0wYK8m9T
+ rDHudUZg3qX4waLG5M43q7Wgc/MbQITxOUSQv7c7ugFFDzQGBzZswY6786m86gpE
+ Ibb3OhjZnzcvQAaRHhdlQWIMm2nrAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAtCu4
+ nUhVVxYUntneD9+h8Mg9q6q+auNKyExzyLwaxlAoo7TJHidbtS4J5iNmZgXL0Fkb
+ FFBjvSfpJIlJ00zbhNYS5f6GuoEDmFJl0ZxBHjJnyp378OD8uTs7fLvjx79LjSTb
+ NYiytVbZPQUQ5Yaxu2jXnimvw3rrszlaEXAMPLE=
+ -----END CERTIFICATE-----",
+ "-----BEGIN CERTIFICATE-----
+ MIICiTCCAfICCQD6m7oRw0uXOjANBgkqhkiG9w0BAQUFADCBiDELMAkGA1UEBhMC
+ VVMxCzAJBgNVBAgTAldBMRAwDgYDVQQHEwdTZWF0dGxlMQ8wDQYDVQQKEwZBbWF6
+ b24xFDASBgNVBAsTC0lBTSBDb25zb2xlMRIwEAYDVQQDEwlUZXN0Q2lsYWMxHzAd
+ BgkqhkiG9w0BCQEWEG5vb25lQGFtYXpvbi5jb20wHhcNMTEwNDI1MjA0NTIxWhcN
+ MTIwNDI0MjA0NTIxWjCBiDELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAldBMRAwDgYD
+ VQQHEwdTZWF0dGxlMQ8wDQYDVQQKEwZBbWF6b24xFDASBgNVBAsTC0lBTSBDb25z
+ b2xlMRIwEAYDVQQDEwlUZXN0Q2lsYWMxHzAdBgkqhkiG9w0BCQEWEG5vb25lQGFt
+ YXpvbi5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMaK0dn+a4GmWIWJ
+ 21uUSfwfEvySWtC2XADZ4nB+BLYgVIk60CpiwsZ3G93vUEIO3IyNoH/f0wYK8m9T
+ rDHudUZg3qX4waLG5M43q7Wgc/MbQITxOUSQv7c7ugFFDzQGBzZswY6786m86gpE
+ Ibb3OhjZnzcvQAaRHhdlQWIMm2nrAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAtCu4
+ nUhVVxYUntneD9+h8Mg9q6q+auNKyExzyLwaxlAoo7TJHidbtS4J5iNmZgXL0Fkb
+ FFBjvSfpJIlJ00zbhNYS5f6GuoEDmFJl0ZxBHjJnyp378OD8uTs7fLvjx79LjSTb
+ NYiytVbZPQUQ5Yaxu2jXnimvw3rrszlaEXAMPLE=
+ -----END CERTIFICATE-----",
+ "-----BEGIN CERTIFICATE-----
+ MIICiTCCAfICCQD6m7oRw0uXOjANBgkqhkiG9w0BAQUFADCBiDELMAkGA1UEBhMC
+ VVMxCzAJBgNVBAgTAldBMRAwDgYDVQQHEwdTZWF0dGxlMQ8wDQYDVQQKEwZBbWF6
+ b24xFDASBgNVBAsTC0lBTSBDb25zb2xlMRIwEAYDVQQDEwlUZXN0Q2lsYWMxHzAd
+ BgkqhkiG9w0BCQEWEG5vb25lQGFtYXpvbi5jb20wHhcNMTEwNDI1MjA0NTIxWhcN
+ MTIwNDI0MjA0NTIxWjCBiDELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAldBMRAwDgYD
+ VQQHEwdTZWF0dGxlMQ8wDQYDVQQKEwZBbWF6b24xFDASBgNVBAsTC0lBTSBDb25z
+ b2xlMRIwEAYDVQQDEwlUZXN0Q2lsYWMxHzAdBgkqhkiG9w0BCQEWEG5vb25lQGFt
+ YXpvbi5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMaK0dn+a4GmWIWJ
+ 21uUSfwfEvySWtC2XADZ4nB+BLYgVIk60CpiwsZ3G93vUEIO3IyNoH/f0wYK8m9T
+ rDHudUZg3qX4waLG5M43q7Wgc/MbQITxOUSQv7c7ugFFDzQGBzZswY6786m86gpE
+ Ibb3OhjZnzcvQAaRHhdlQWIMm2nrAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAtCu4
+ nUhVVxYUntneD9+h8Mg9q6q+auNKyExzyLwaxlAoo7TJHidbtS4J5iNmZgXL0Fkb
+ FFBjvSfpJIlJ00zbhNYS5f6GuoEDmFJl0ZxBHjJnyp378OD8uTs7fLvjx79LjSTb
+ NYiytVbZPQUQ5Yaxu2jXnimvw3rrszlaEXAMPLE=
+ -----END CERTIFICATE-----"
+ }
diff -Nru awscli-1.9.9/awscli/examples/acm/list-certificates.rst awscli-1.10.1/awscli/examples/acm/list-certificates.rst
--- awscli-1.9.9/awscli/examples/acm/list-certificates.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/acm/list-certificates.rst 2016-01-28 22:38:13.000000000 +0000
@@ -0,0 +1,48 @@
+**To list the ACM certificates for an AWS account**
+
+The following ``list-certificates`` command lists the ARNs of the certificates in your account::
+
+ aws acm list-certificates
+
+The preceding command produces the following output::
+
+ {
+ "CertificateSummaryList": [
+ {
+ "CertificateArn": "arn:aws:acm:us-east-1:123456789012:certificate/12345678-1234-1234-1234-123456789012",
+ "DomainName": "www.example.com"
+ },
+ {
+ "CertificateArn": "arn:aws:acm:us-east-1:493619779192:certificate/87654321-4321-4321-4321-210987654321",
+ "DomainName": "www.example.net"
+ }
+ ]
+ }
+
+You can also filter your output by using the "certificate-statuses" argument. The following command displays certificates that have a PENDING_VALIDATION status::
+
+ aws acm list-certificates --certificate-statuses PENDING_VALIDATION
+
+Finally, you can decide how many certificates you want to display each time you call ``list-certificates``. For example, to display no more than two certificates at a time, set the ``max-items`` argument to 2 as in the following example::
+
+ aws acm list-certificates --max-items 2
+
+Two certificate ARNs and a ``NextToken`` value will be displayed::
+
+ {
+ "CertificateSummaryList": [
+ {
+ "CertificateArn": "arn:aws:acm:us-east-1:123456789012:certificate/12345678-1234-1234-1234-123456789012",
+ "DomainName": "www.example.com"
+ },
+ {
+ "CertificateArn": "arn:aws:acm:us-east-1:493619779192:certificate/87654321-4321-4321-4321-210987654321",
+ "DomainName": "www.example.net"
+ }
+ ],
+ "NextToken": "9f4d9f69-275a-41fe-b58e-2b837bd9ba48"
+ }
+
+To display the next two certificates in your account, set this ``NextToken`` value in your next call::
+
+ aws acm list-certificates --max-items 2 --next-token 9f4d9f69-275a-41fe-b58e-2b837bd9ba48
diff -Nru awscli-1.9.9/awscli/examples/acm/request-certificate.rst awscli-1.10.1/awscli/examples/acm/request-certificate.rst
--- awscli-1.9.9/awscli/examples/acm/request-certificate.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/acm/request-certificate.rst 2016-01-28 22:38:13.000000000 +0000
@@ -0,0 +1,21 @@
+**To request a new ACM certificate**
+
+The following ``request-certificate`` command requests a new certificate for the www.example.com domain::
+
+ aws acm request-certificate --domain-name www.example.com
+
+You can enter an idempotency token to distinguish between calls to ``request-certificate``::
+
+ aws acm request-certificate --domain-name www.example.com --idempotency-token 91adc45q
+
+You can enter an alternative name that can be used to reach your website::
+
+ aws acm request-certificate --domain-name www.example.com --idempotency-token 91adc45q --subject-alternative-names www.example.net
+
+You can also enter multiple alternative names::
+
+ aws acm request-certificate --domain-name a.example.com --subject-alternative-names b.example.com c.example.com d.example.com *.e.example.com *.f.example.com
+
+You can also enter domain validation options to specify the domain to which validation email will be sent::
+
+ aws acm request-certificate --domain-name example.com --subject-alternative-names www.example.com --domain-validation-options DomainName=www.example.com,ValidationDomain=example.com
diff -Nru awscli-1.9.9/awscli/examples/acm/resend-validation-email.rst awscli-1.10.1/awscli/examples/acm/resend-validation-email.rst
--- awscli-1.9.9/awscli/examples/acm/resend-validation-email.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/acm/resend-validation-email.rst 2016-01-28 22:38:13.000000000 +0000
@@ -0,0 +1,5 @@
+**To resend validation email for your ACM certificate request**
+
+The following ``resend-validation-email`` command tells the Amazon certificate authority to send validation email to the appropriate addresses::
+
+ aws acm resend-validation-email --certificate-arn arn:aws:acm:us-east-1:123456789012:certificate/12345678-1234-1234-1234-123456789012 --domain www.example.com --validation-domain example.com
diff -Nru awscli-1.9.9/awscli/examples/autoscaling/complete-lifecycle-action.rst awscli-1.10.1/awscli/examples/autoscaling/complete-lifecycle-action.rst
--- awscli-1.9.9/awscli/examples/autoscaling/complete-lifecycle-action.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/autoscaling/complete-lifecycle-action.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,6 +1,6 @@
-**To complete the lifecycle action**
-
-This example lets Auto Scaling know that the specified lifecycle action is complete so that it can finish launching or terminating the instance::
-
- aws autoscaling complete-lifecycle-action --lifecycle-hook-name my-lifecycle-hook --auto-scaling-group-name my-asg --lifecycle-action-result CONTINUE --lifecycle-action-token bcd2f1b8-9a78-44d3-8a7a-4dd07d7cf635
-
+**To complete the lifecycle action**
+
+This example lets Auto Scaling know that the specified lifecycle action is complete so that it can finish launching or terminating the instance::
+
+ aws autoscaling complete-lifecycle-action --lifecycle-hook-name my-lifecycle-hook --auto-scaling-group-name my-asg --lifecycle-action-result CONTINUE --lifecycle-action-token bcd2f1b8-9a78-44d3-8a7a-4dd07d7cf635
+
diff -Nru awscli-1.9.9/awscli/examples/autoscaling/delete-lifecycle-hook.rst awscli-1.10.1/awscli/examples/autoscaling/delete-lifecycle-hook.rst
--- awscli-1.9.9/awscli/examples/autoscaling/delete-lifecycle-hook.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/autoscaling/delete-lifecycle-hook.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,5 +1,5 @@
-**To delete a lifecycle hook**
-
-This example deletes the specified lifecycle hook::
-
- aws autoscaling delete-lifecycle-hook --lifecycle-hook-name my-lifecycle-hook --auto-scaling-group-name my-asg
+**To delete a lifecycle hook**
+
+This example deletes the specified lifecycle hook::
+
+ aws autoscaling delete-lifecycle-hook --lifecycle-hook-name my-lifecycle-hook --auto-scaling-group-name my-asg
diff -Nru awscli-1.9.9/awscli/examples/autoscaling/describe-lifecycle-hooks.rst awscli-1.10.1/awscli/examples/autoscaling/describe-lifecycle-hooks.rst
--- awscli-1.9.9/awscli/examples/autoscaling/describe-lifecycle-hooks.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/autoscaling/describe-lifecycle-hooks.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,22 +1,22 @@
-**To describe your lifecycle hooks**
-
-This example describes the lifecycle hooks for the specified Auto Scaling group::
-
- aws autoscaling describe-lifecycle-hooks --auto-scaling-group-name my-asg
-
-The following is example output::
-
- {
- "LifecycleHooks": [
- {
- "GlobalTimeout": 172800,
- "HeartbeatTimeout": 3600,
- "RoleARN": "arn:aws:iam::123456789012:role/my-auto-scaling-role",
- "AutoScalingGroupName": "my-asg",
- "LifecycleHookName": "my-lifecycle-hook",
- "DefaultResult": "ABANDON",
- "NotificationTargetARN": "arn:aws:sns:us-west-2:123456789012:my-sns-topic",
- "LifecycleTransition": "autoscaling:EC2_INSTANCE_LAUNCHING"
- }
- ]
- }
+**To describe your lifecycle hooks**
+
+This example describes the lifecycle hooks for the specified Auto Scaling group::
+
+ aws autoscaling describe-lifecycle-hooks --auto-scaling-group-name my-asg
+
+The following is example output::
+
+ {
+ "LifecycleHooks": [
+ {
+ "GlobalTimeout": 172800,
+ "HeartbeatTimeout": 3600,
+ "RoleARN": "arn:aws:iam::123456789012:role/my-auto-scaling-role",
+ "AutoScalingGroupName": "my-asg",
+ "LifecycleHookName": "my-lifecycle-hook",
+ "DefaultResult": "ABANDON",
+ "NotificationTargetARN": "arn:aws:sns:us-west-2:123456789012:my-sns-topic",
+ "LifecycleTransition": "autoscaling:EC2_INSTANCE_LAUNCHING"
+ }
+ ]
+ }
diff -Nru awscli-1.9.9/awscli/examples/autoscaling/describe-lifecycle-hook-types.rst awscli-1.10.1/awscli/examples/autoscaling/describe-lifecycle-hook-types.rst
--- awscli-1.9.9/awscli/examples/autoscaling/describe-lifecycle-hook-types.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/autoscaling/describe-lifecycle-hook-types.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,14 +1,14 @@
-**To describe the available types of lifecycle hooks**
-
-This example describes the available types of lifecycle hooks::
-
- aws autoscaling describe-lifecycle-hook-types
-
-The following is example output::
-
- {
- "LifecycleHookTypes": [
- "autoscaling:EC2_INSTANCE_LAUNCHING",
- "autoscaling:EC2_INSTANCE_TERMINATING"
- ]
- }
+**To describe the available types of lifecycle hooks**
+
+This example describes the available types of lifecycle hooks::
+
+ aws autoscaling describe-lifecycle-hook-types
+
+The following is example output::
+
+ {
+ "LifecycleHookTypes": [
+ "autoscaling:EC2_INSTANCE_LAUNCHING",
+ "autoscaling:EC2_INSTANCE_TERMINATING"
+ ]
+ }
diff -Nru awscli-1.9.9/awscli/examples/autoscaling/describe-load-balancers.rst awscli-1.10.1/awscli/examples/autoscaling/describe-load-balancers.rst
--- awscli-1.9.9/awscli/examples/autoscaling/describe-load-balancers.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/autoscaling/describe-load-balancers.rst 2016-01-28 22:38:12.000000000 +0000
@@ -6,11 +6,11 @@
The following is example output for this command::
- {
+ {
"LoadBalancers": [
- {
- "State": "Added",
- "LoadBalancerName": "my-lb"
- }
+ {
+ "State": "Added",
+ "LoadBalancerName": "my-lb"
+ }
]
- }
+ }
diff -Nru awscli-1.9.9/awscli/examples/autoscaling/describe-metric-collection-types.rst awscli-1.10.1/awscli/examples/autoscaling/describe-metric-collection-types.rst
--- awscli-1.9.9/awscli/examples/autoscaling/describe-metric-collection-types.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/autoscaling/describe-metric-collection-types.rst 2016-01-28 22:38:12.000000000 +0000
@@ -6,36 +6,36 @@
The output of this command is a JSON block that describes the metric collection types, similar to the following::
- {
- "Metrics": [
- {
- "Metric": "GroupMinSize"
- },
- {
- "Metric": "GroupMaxSize"
- },
- {
- "Metric": "GroupDesiredCapacity"
- },
- {
- "Metric": "GroupInServiceInstances"
- },
- {
- "Metric": "GroupPendingInstances"
- },
- {
- "Metric": "GroupTerminatingInstances"
- },
- {
- "Metric": "GroupTotalInstances"
- }
- ],
- "Granularities": [
- {
- "Granularity": "1Minute"
- }
- ]
- }
+ {
+ "Metrics": [
+ {
+ "Metric": "GroupMinSize"
+ },
+ {
+ "Metric": "GroupMaxSize"
+ },
+ {
+ "Metric": "GroupDesiredCapacity"
+ },
+ {
+ "Metric": "GroupInServiceInstances"
+ },
+ {
+ "Metric": "GroupPendingInstances"
+ },
+ {
+ "Metric": "GroupTerminatingInstances"
+ },
+ {
+ "Metric": "GroupTotalInstances"
+ }
+ ],
+ "Granularities": [
+ {
+ "Granularity": "1Minute"
+ }
+ ]
+ }
For more information, see the `Auto Scaling Group Metrics`_ section in the Monitoring Your Auto Scaling Instances topic, in the *Auto Scaling Developer Guide*.
diff -Nru awscli-1.9.9/awscli/examples/autoscaling/describe-notification-configurations.rst awscli-1.10.1/awscli/examples/autoscaling/describe-notification-configurations.rst
--- awscli-1.9.9/awscli/examples/autoscaling/describe-notification-configurations.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/autoscaling/describe-notification-configurations.rst 2016-01-28 22:38:12.000000000 +0000
@@ -6,20 +6,20 @@
The output of this command is a JSON block that describes the notification configurations, similar to the following::
- {
- "NotificationConfigurations": [
- {
- "AutoScalingGroupName": "basic-auto-scaling-group",
- "NotificationType": "autoscaling:TEST_NOTIFICATION",
- "TopicARN": "arn:aws:sns:us-west-2:896650972448:second-test-topic"
- },
- {
- "AutoScalingGroupName": "basic-auto-scaling-group",
- "NotificationType": "autoscaling:TEST_NOTIFICATION",
- "TopicARN": "arn:aws:sns:us-west-2:896650972448:test-topic"
- }
- ]
- }
+ {
+ "NotificationConfigurations": [
+ {
+ "AutoScalingGroupName": "basic-auto-scaling-group",
+ "NotificationType": "autoscaling:TEST_NOTIFICATION",
+ "TopicARN": "arn:aws:sns:us-west-2:123456789012:second-test-topic"
+ },
+ {
+ "AutoScalingGroupName": "basic-auto-scaling-group",
+ "NotificationType": "autoscaling:TEST_NOTIFICATION",
+ "TopicARN": "arn:aws:sns:us-west-2:123456789012:test-topic"
+ }
+ ]
+ }
To return a specific number of notification configurations with this command, use the ``max-items`` parameter::
@@ -27,16 +27,16 @@
In this example, the output of this command is a JSON block that describes the first notification configuration::
- {
- "NextToken": "None___1",
- "NotificationConfigurations": [
- {
- "AutoScalingGroupName": "basic-auto-scaling-group",
- "NotificationType": "autoscaling:TEST_NOTIFICATION",
- "TopicARN": "arn:aws:sns:us-west-2:896650972448:second-test-topic"
- }
- ]
- }
+ {
+ "NextToken": "None___1",
+ "NotificationConfigurations": [
+ {
+ "AutoScalingGroupName": "basic-auto-scaling-group",
+ "NotificationType": "autoscaling:TEST_NOTIFICATION",
+ "TopicARN": "arn:aws:sns:us-west-2:123456789012:second-test-topic"
+ }
+ ]
+ }
This JSON block includes a ``NextToken`` field. You can use the value of this field with the ``starting-token`` parameter to return additional notification configurations::
diff -Nru awscli-1.9.9/awscli/examples/autoscaling/describe-policies.rst awscli-1.10.1/awscli/examples/autoscaling/describe-policies.rst
--- awscli-1.9.9/awscli/examples/autoscaling/describe-policies.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/autoscaling/describe-policies.rst 2016-01-28 22:38:12.000000000 +0000
@@ -6,28 +6,28 @@
The output of this command is a JSON block that describes the notification configurations, similar to the following::
- {
- "ScalingPolicies": [
- {
- "PolicyName": "ScaleIn",
- "AutoScalingGroupName": "basic-auto-scaling-group",
- "PolicyARN": "arn:aws:autoscaling:us-west-2:896650972448:scalingPolicy:2233f3d7-6290-403b-b632-93c553560106:autoScalingGroupName/basic-auto-scaling-group:policyName/ScaleIn",
- "AdjustmentType": "ChangeInCapacity",
- "Alarms": [],
- "ScalingAdjustment": -1
- },
- {
- "PolicyName": "ScalePercentChange",
- "MinAdjustmentStep": 2,
- "AutoScalingGroupName": "basic-auto-scaling-group",
- "PolicyARN": "arn:aws:autoscaling:us-west-2:896650972448:scalingPolicy:2b435159-cf77-4e89-8c0e-d63b497baad7:autoScalingGroupName/basic-auto-scaling-group:policyName/ScalePercentChange",
- "Cooldown": 60,
- "AdjustmentType": "PercentChangeInCapacity",
- "Alarms": [],
- "ScalingAdjustment": 25
- }
- ]
- }
+ {
+ "ScalingPolicies": [
+ {
+ "PolicyName": "ScaleIn",
+ "AutoScalingGroupName": "basic-auto-scaling-group",
+ "PolicyARN": "arn:aws:autoscaling:us-west-2:123456789012:scalingPolicy:2233f3d7-6290-403b-b632-93c553560106:autoScalingGroupName/basic-auto-scaling-group:policyName/ScaleIn",
+ "AdjustmentType": "ChangeInCapacity",
+ "Alarms": [],
+ "ScalingAdjustment": -1
+ },
+ {
+ "PolicyName": "ScalePercentChange",
+ "MinAdjustmentStep": 2,
+ "AutoScalingGroupName": "basic-auto-scaling-group",
+ "PolicyARN": "arn:aws:autoscaling:us-west-2:123456789012:scalingPolicy:2b435159-cf77-4e89-8c0e-d63b497baad7:autoScalingGroupName/basic-auto-scaling-group:policyName/ScalePercentChange",
+ "Cooldown": 60,
+ "AdjustmentType": "PercentChangeInCapacity",
+ "Alarms": [],
+ "ScalingAdjustment": 25
+ }
+ ]
+ }
To return specific scaling policies with this command, use the ``policy-names`` parameter::
@@ -39,19 +39,19 @@
In this example, the output of this command is a JSON block that describes the first policy::
- {
- "ScalingPolicies": [
- {
- "PolicyName": "ScaleIn",
- "AutoScalingGroupName": "basic-auto-scaling-group",
- "PolicyARN": "arn:aws:autoscaling:us-west-2:896650972448:scalingPolicy:2233f3d7-6290-403b-b632-93c553560106:autoScalingGroupName/basic-auto-scaling-group:policyName/ScaleIn",
- "AdjustmentType": "ChangeInCapacity",
- "Alarms": [],
- "ScalingAdjustment": -1
- }
- ],
- "NextToken": "None___1"
- }
+ {
+ "ScalingPolicies": [
+ {
+ "PolicyName": "ScaleIn",
+ "AutoScalingGroupName": "basic-auto-scaling-group",
+ "PolicyARN": "arn:aws:autoscaling:us-west-2:123456789012:scalingPolicy:2233f3d7-6290-403b-b632-93c553560106:autoScalingGroupName/basic-auto-scaling-group:policyName/ScaleIn",
+ "AdjustmentType": "ChangeInCapacity",
+ "Alarms": [],
+ "ScalingAdjustment": -1
+ }
+ ],
+ "NextToken": "None___1"
+ }
This JSON block includes a ``NextToken`` field. You can use the value of this field with the ``starting-token`` parameter to return additional policies::
@@ -60,4 +60,3 @@
For more information, see `Dynamic Scaling`_ in the *Auto Scaling Developer Guide*.
.. _`Dynamic Scaling`: http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/as-scale-based-on-demand.html
-
diff -Nru awscli-1.9.9/awscli/examples/autoscaling/describe-scaling-process-types.rst awscli-1.10.1/awscli/examples/autoscaling/describe-scaling-process-types.rst
--- awscli-1.9.9/awscli/examples/autoscaling/describe-scaling-process-types.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/autoscaling/describe-scaling-process-types.rst 2016-01-28 22:38:12.000000000 +0000
@@ -4,36 +4,36 @@
aws autoscaling describe-scaling-process-types
-The output of this command is a JSON block that lists the processes, similar to the following::
+The output of this command lists the processes, similar to the following::
- {
- "Processes": [
- {
- "ProcessName": "AZRebalance"
- },
- {
- "ProcessName": "AddToLoadBalancer"
- },
- {
- "ProcessName": "AlarmNotification"
- },
- {
- "ProcessName": "HealthCheck"
- },
- {
- "ProcessName": "Launch"
- },
- {
- "ProcessName": "ReplaceUnhealthy"
- },
- {
- "ProcessName": "ScheduledActions"
- },
- {
- "ProcessName": "Terminate"
- }
- ]
- }
+ {
+ "Processes": [
+ {
+ "ProcessName": "AZRebalance"
+ },
+ {
+ "ProcessName": "AddToLoadBalancer"
+ },
+ {
+ "ProcessName": "AlarmNotification"
+ },
+ {
+ "ProcessName": "HealthCheck"
+ },
+ {
+ "ProcessName": "Launch"
+ },
+ {
+ "ProcessName": "ReplaceUnhealthy"
+ },
+ {
+ "ProcessName": "ScheduledActions"
+ },
+ {
+ "ProcessName": "Terminate"
+ }
+ ]
+ }
For more information, see `Suspend and Resume Auto Scaling Process`_ in the *Auto Scaling Developer Guide*.
diff -Nru awscli-1.9.9/awscli/examples/autoscaling/describe-scheduled-actions.rst awscli-1.10.1/awscli/examples/autoscaling/describe-scheduled-actions.rst
--- awscli-1.9.9/awscli/examples/autoscaling/describe-scheduled-actions.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/autoscaling/describe-scheduled-actions.rst 2016-01-28 22:38:12.000000000 +0000
@@ -6,25 +6,25 @@
The output of this command is a JSON block that describes the scheduled actions for all Auto Scaling groups, similar to the following::
- {
- "ScheduledUpdateGroupActions": [
- {
- "MinSize": 2,
- "DesiredCapacity": 4,
- "AutoScalingGroupName": "basic-auto-scaling-group",
- "MaxSize": 6,
- "Recurrence": "30 0 1 12 0",
- "ScheduledActionARN": "arn:aws:autoscaling:us-west-2:896650972448:scheduledUpdateGroupAction:8e86b655-b2e6-4410-8f29-b4f094d6871c:autoScalingGroupName/basic-auto-scaling-group:scheduledActionName/sample-scheduled-action",
- "ScheduledActionName": "sample-scheduled-action",
- "StartTime": "2019-12-01T00:30:00Z",
- "Time": "2019-12-01T00:30:00Z"
- }
- ]
- }
+ {
+ "ScheduledUpdateGroupActions": [
+ {
+ "MinSize": 2,
+ "DesiredCapacity": 4,
+ "AutoScalingGroupName": "my-auto-scaling-group",
+ "MaxSize": 6,
+ "Recurrence": "30 0 1 12 0",
+ "ScheduledActionARN": "arn:aws:autoscaling:us-west-2:123456789012:scheduledUpdateGroupAction:8e86b655-b2e6-4410-8f29-b4f094d6871c:autoScalingGroupName/my-auto-scaling-group:scheduledActionName/sample-scheduled-action",
+ "ScheduledActionName": "sample-scheduled-action",
+ "StartTime": "2019-12-01T00:30:00Z",
+ "Time": "2019-12-01T00:30:00Z"
+ }
+ ]
+ }
To return the scheduled actions for a specific Auto Scaling group, use the ``auto-scaling-group-name`` parameter::
- aws autoscaling describe-scheduled-actions --auto-scaling-group-name basic-auto-scaling-group
+ aws autoscaling describe-scheduled-actions --auto-scaling-group-name my-auto-scaling-group
To return a specific scheduled action, use the ``scheduled-action-names`` parameter::
@@ -40,24 +40,24 @@
To return a specific number of scheduled actions with this command, use the ``max-items`` parameter::
- aws autoscaling describe-scheduled-actions --auto-scaling-group-name basic-auto-scaling-group --max-items 1
+ aws autoscaling describe-scheduled-actions --auto-scaling-group-name my-auto-scaling-group --max-items 1
In this example, the output of this command is a JSON block that describes the first scheduled action::
- {
- "NextToken": "None___1",
- "NotificationConfigurations": [
- {
- "AutoScalingGroupName": "basic-auto-scaling-group",
- "NotificationType": "autoscaling:TEST_NOTIFICATION",
- "TopicARN": "arn:aws:sns:us-west-2:896650972448:second-test-topic"
- }
- ]
- }
+ {
+ "NextToken": "None___1",
+ "NotificationConfigurations": [
+ {
+ "AutoScalingGroupName": "my-auto-scaling-group",
+ "NotificationType": "autoscaling:TEST_NOTIFICATION",
+ "TopicARN": "arn:aws:sns:us-west-2:123456789012:second-test-topic"
+ }
+ ]
+ }
This JSON block includes a ``NextToken`` field. You can use the value of this field with the ``starting-token`` parameter to return scheduled actions::
- aws autoscaling describe-scheduled-actions --auto-scaling-group-name basic-auto-scaling-group --starting-token None___1
+ aws autoscaling describe-scheduled-actions --auto-scaling-group-name my-auto-scaling-group --starting-token None___1
For more information, see `Scheduled Scaling`_ in the *Auto Scaling Developer Guide*.
diff -Nru awscli-1.9.9/awscli/examples/autoscaling/describe-tags.rst awscli-1.10.1/awscli/examples/autoscaling/describe-tags.rst
--- awscli-1.9.9/awscli/examples/autoscaling/describe-tags.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/autoscaling/describe-tags.rst 2016-01-28 22:38:12.000000000 +0000
@@ -6,24 +6,24 @@
The output of this command is a JSON block that describes the tags for all Auto Scaling groups, similar to the following::
- {
- "Tags": [
- {
- "ResourceType": "auto-scaling-group",
- "ResourceId": "tags-auto-scaling-group",
- "PropagateAtLaunch": true,
- "Value": "Research",
- "Key": "Dept"
- },
- {
- "ResourceType": "auto-scaling-group",
- "ResourceId": "tags-auto-scaling-group",
- "PropagateAtLaunch": true,
- "Value": "WebServer",
- "Key": "Role"
- }
- ]
- }
+ {
+ "Tags": [
+ {
+ "ResourceType": "auto-scaling-group",
+ "ResourceId": "tags-auto-scaling-group",
+ "PropagateAtLaunch": true,
+ "Value": "Research",
+ "Key": "Dept"
+ },
+ {
+ "ResourceType": "auto-scaling-group",
+ "ResourceId": "tags-auto-scaling-group",
+ "PropagateAtLaunch": true,
+ "Value": "WebServer",
+ "Key": "Role"
+ }
+ ]
+ }
The following example uses the ``filters`` parameter to return tags for a specific Auto Scaling group::
@@ -35,18 +35,18 @@
In this example, the output of this command is a JSON block that describes the first tag::
- {
- "NextToken": "None___1",
- "Tags": [
- {
- "ResourceType": "auto-scaling-group",
- "ResourceId": "tags-auto-scaling-group",
- "PropagateAtLaunch": true,
- "Value": "Research",
- "Key": "Dept"
- }
- ]
- }
+ {
+ "NextToken": "None___1",
+ "Tags": [
+ {
+ "ResourceType": "auto-scaling-group",
+ "ResourceId": "tags-auto-scaling-group",
+ "PropagateAtLaunch": true,
+ "Value": "Research",
+ "Key": "Dept"
+ }
+ ]
+ }
This JSON block includes a ``NextToken`` field. You can use the value of this field with the ``starting-token`` parameter to return additional tags::
diff -Nru awscli-1.9.9/awscli/examples/autoscaling/describe-termination-policy-types.rst awscli-1.10.1/awscli/examples/autoscaling/describe-termination-policy-types.rst
--- awscli-1.9.9/awscli/examples/autoscaling/describe-termination-policy-types.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/autoscaling/describe-termination-policy-types.rst 2016-01-28 22:38:12.000000000 +0000
@@ -6,15 +6,15 @@
The output of this command is a JSON block that lists the types of termination policies, similar to the following::
- {
- "TerminationPolicyTypes": [
- "ClosestToNextInstanceHour",
- "Default",
- "NewestInstance",
- "OldestInstance",
- "OldestLaunchConfiguration"
- ]
- }
+ {
+ "TerminationPolicyTypes": [
+ "ClosestToNextInstanceHour",
+ "Default",
+ "NewestInstance",
+ "OldestInstance",
+ "OldestLaunchConfiguration"
+ ]
+ }
For more information, see the `How Termination Policies Work`_ section in the Configure Instance Termination Policy for Your Auto Scaling Group topic, in the *Auto Scaling Developer Guide*.
diff -Nru awscli-1.9.9/awscli/examples/autoscaling/detach-instances.rst awscli-1.10.1/awscli/examples/autoscaling/detach-instances.rst
--- awscli-1.9.9/awscli/examples/autoscaling/detach-instances.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/autoscaling/detach-instances.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,22 +1,22 @@
-**To detach an instance from an Auto Scaling group**
-
-This example detaches the specified instance from the specified Auto Scaling group::
-
- aws autoscaling detach-instances --instance-ids i-93633f9b --auto-scaling-group-name my-asg --should-decrement-desired-capacity
-
-The following is example output::
-
- {
- "Activities": [
- {
- "Description": "Detaching EC2 instance: i-93633f9b",
- "AutoScalingGroupName": "my-asg",
- "ActivityId": "5091cb52-547a-47ce-a236-c9ccbc2cb2c9",
- "Details": {"Availability Zone": "us-west-2a"},
- "StartTime": "2015-04-12T15:02:16.179Z",
- "Progress": 50,
- "Cause": "At 2015-04-12T15:02:16Z instance i-93633f9b was detached in response to a user request, shrinking the capacity from 2 to 1.",
- "StatusCode": "InProgress"
- }
- ]
- }
+**To detach an instance from an Auto Scaling group**
+
+This example detaches the specified instance from the specified Auto Scaling group::
+
+ aws autoscaling detach-instances --instance-ids i-93633f9b --auto-scaling-group-name my-asg --should-decrement-desired-capacity
+
+The following is example output::
+
+ {
+ "Activities": [
+ {
+ "Description": "Detaching EC2 instance: i-93633f9b",
+ "AutoScalingGroupName": "my-asg",
+ "ActivityId": "5091cb52-547a-47ce-a236-c9ccbc2cb2c9",
+ "Details": {"Availability Zone": "us-west-2a"},
+ "StartTime": "2015-04-12T15:02:16.179Z",
+ "Progress": 50,
+ "Cause": "At 2015-04-12T15:02:16Z instance i-93633f9b was detached in response to a user request, shrinking the capacity from 2 to 1.",
+ "StatusCode": "InProgress"
+ }
+ ]
+ }
diff -Nru awscli-1.9.9/awscli/examples/autoscaling/detach-load-balancers.rst awscli-1.10.1/awscli/examples/autoscaling/detach-load-balancers.rst
--- awscli-1.9.9/awscli/examples/autoscaling/detach-load-balancers.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/autoscaling/detach-load-balancers.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,5 +1,5 @@
-**To detach a load balancer from an Auto Scaling group**
-
-This example detaches the specified load balancer from the specified Auto Scaling group::
-
- aws autoscaling detach-load-balancers --load-balancer-names my-lb --auto-scaling-group-name my-asg
+**To detach a load balancer from an Auto Scaling group**
+
+This example detaches the specified load balancer from the specified Auto Scaling group::
+
+ aws autoscaling detach-load-balancers --load-balancer-names my-lb --auto-scaling-group-name my-asg
diff -Nru awscli-1.9.9/awscli/examples/autoscaling/enter-standby.rst awscli-1.10.1/awscli/examples/autoscaling/enter-standby.rst
--- awscli-1.9.9/awscli/examples/autoscaling/enter-standby.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/autoscaling/enter-standby.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,22 +1,22 @@
-**To move instances into standby mode**
-
-This example puts the specified instance into standby mode::
-
- aws autoscaling enter-standby --instance-ids i-93633f9b --auto-scaling-group-name my-asg --should-decrement-desired-capacity
-
-The following is example output::
-
- {
- "Activities": [
- {
- "Description": "Moving EC2 instance to Standby: i-93633f9b",
- "AutoScalingGroupName": "my-asg",
- "ActivityId": "ffa056b4-6ed3-41ba-ae7c-249dfae6eba1",
- "Details": {"Availability Zone": "us-west-2a"},
- "StartTime": "2015-04-12T15:10:23.640Z",
- "Progress": 50,
- "Cause": "At 2015-04-12T15:10:23Z instance i-93633f9b was moved to standby in response to a user request, shrinking the capacity from 2 to 1.",
- "StatusCode": "InProgress"
- }
- ]
- }
+**To move instances into standby mode**
+
+This example puts the specified instance into standby mode::
+
+ aws autoscaling enter-standby --instance-ids i-93633f9b --auto-scaling-group-name my-asg --should-decrement-desired-capacity
+
+The following is example output::
+
+ {
+ "Activities": [
+ {
+ "Description": "Moving EC2 instance to Standby: i-93633f9b",
+ "AutoScalingGroupName": "my-asg",
+ "ActivityId": "ffa056b4-6ed3-41ba-ae7c-249dfae6eba1",
+ "Details": {"Availability Zone": "us-west-2a"},
+ "StartTime": "2015-04-12T15:10:23.640Z",
+ "Progress": 50,
+ "Cause": "At 2015-04-12T15:10:23Z instance i-93633f9b was moved to standby in response to a user request, shrinking the capacity from 2 to 1.",
+ "StatusCode": "InProgress"
+ }
+ ]
+ }
diff -Nru awscli-1.9.9/awscli/examples/autoscaling/exit-standby.rst awscli-1.10.1/awscli/examples/autoscaling/exit-standby.rst
--- awscli-1.9.9/awscli/examples/autoscaling/exit-standby.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/autoscaling/exit-standby.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,22 +1,22 @@
-**To move instances out of standby mode**
-
-This example moves the specified instance out of standby mode::
-
- aws autoscaling exit-standby --instance-ids i-93633f9b --auto-scaling-group-name my-asg
-
-The following is example output::
-
- {
- "Activities": [
- {
- "Description": "Moving EC2 instance out of Standby: i-93633f9b",
- "AutoScalingGroupName": "my-asg",
- "ActivityId": "142928e1-a2dc-453a-9b24-b85ad6735928",
- "Details": {"Availability Zone": "us-west-2a"},
- "StartTime": "2015-04-12T15:14:29.886Z",
- "Progress": 30,
- "Cause": "At 2015-04-12T15:14:29Z instance i-93633f9b was moved out of standby in response to a user request, increasing the capacity from 1 to 2.",
- "StatusCode": "PreInService"
- }
- ]
- }
+**To move instances out of standby mode**
+
+This example moves the specified instance out of standby mode::
+
+ aws autoscaling exit-standby --instance-ids i-93633f9b --auto-scaling-group-name my-asg
+
+The following is example output::
+
+ {
+ "Activities": [
+ {
+ "Description": "Moving EC2 instance out of Standby: i-93633f9b",
+ "AutoScalingGroupName": "my-asg",
+ "ActivityId": "142928e1-a2dc-453a-9b24-b85ad6735928",
+ "Details": {"Availability Zone": "us-west-2a"},
+ "StartTime": "2015-04-12T15:14:29.886Z",
+ "Progress": 30,
+ "Cause": "At 2015-04-12T15:14:29Z instance i-93633f9b was moved out of standby in response to a user request, increasing the capacity from 1 to 2.",
+ "StatusCode": "PreInService"
+ }
+ ]
+ }
diff -Nru awscli-1.9.9/awscli/examples/autoscaling/put-lifecycle-hook.rst awscli-1.10.1/awscli/examples/autoscaling/put-lifecycle-hook.rst
--- awscli-1.9.9/awscli/examples/autoscaling/put-lifecycle-hook.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/autoscaling/put-lifecycle-hook.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,9 +1,9 @@
-**To create a lifecycle hook**
-
-This example creates a lifecycle hook::
-
- aws autoscaling put-lifecycle-hook --lifecycle-hook-name my-lifecycle-hook --auto-scaling-group-name my-asg --lifecycle-transition autoscaling:EC2_INSTANCE_LAUNCHING --notification-target-arn arn:aws:sns:us-west-2:123456789012:my-sns-topic --role-arn arn:aws:iam::123456789012:role/my-auto-scaling-role
-
-For more information, see `Adding Lifecycle Hooks`_ in the *Auto Scaling Developer Guide*.
-
-.. _`Adding Lifecycle Hooks`: http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/adding-lifecycle-hooks.html
+**To create a lifecycle hook**
+
+This example creates a lifecycle hook::
+
+ aws autoscaling put-lifecycle-hook --lifecycle-hook-name my-lifecycle-hook --auto-scaling-group-name my-asg --lifecycle-transition autoscaling:EC2_INSTANCE_LAUNCHING --notification-target-arn arn:aws:sns:us-west-2:123456789012:my-sns-topic --role-arn arn:aws:iam::123456789012:role/my-auto-scaling-role
+
+For more information, see `Adding Lifecycle Hooks`_ in the *Auto Scaling Developer Guide*.
+
+.. _`Adding Lifecycle Hooks`: http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/adding-lifecycle-hooks.html
diff -Nru awscli-1.9.9/awscli/examples/autoscaling/put-notification-configuration.rst awscli-1.10.1/awscli/examples/autoscaling/put-notification-configuration.rst
--- awscli-1.9.9/awscli/examples/autoscaling/put-notification-configuration.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/autoscaling/put-notification-configuration.rst 2016-01-28 22:38:12.000000000 +0000
@@ -2,7 +2,7 @@
The following ``put-notification-configuration`` command adds a notification to an Auto Scaling group::
- --auto-scaling-group-name basic-auto-scaling-group --topic-arn arn:aws:sns:us-west-2:896650972448:test-topic --notification-type autoscaling:TEST_NOTIFICATION
+ --auto-scaling-group-name my-auto-scaling-group --topic-arn arn:aws:sns:us-west-2:123456789012:test-topic --notification-type autoscaling:TEST_NOTIFICATION
For more information, see the `Configure your Auto Scaling Group to Send Notifications`_ section in the Getting Notifications When Your Auto Scaling Group Changes topic, in the *Auto Scaling Developer Guide*.
diff -Nru awscli-1.9.9/awscli/examples/autoscaling/record-lifecycle-action-heartbeat.rst awscli-1.10.1/awscli/examples/autoscaling/record-lifecycle-action-heartbeat.rst
--- awscli-1.9.9/awscli/examples/autoscaling/record-lifecycle-action-heartbeat.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/autoscaling/record-lifecycle-action-heartbeat.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,5 +1,5 @@
-**To record a lifecycle action heartbeat**
-
-This example records a lifecycle action heartbeat to keep the instance in a pending state::
-
- aws autoscaling record-lifecycle-action-heartbeat --lifecycle-hook-name my-lifecycle-hook --auto-scaling-group-name my-asg --lifecycle-action-token bcd2f1b8-9a78-44d3-8a7a-4dd07d7cf635
+**To record a lifecycle action heartbeat**
+
+This example records a lifecycle action heartbeat to keep the instance in a pending state::
+
+ aws autoscaling record-lifecycle-action-heartbeat --lifecycle-hook-name my-lifecycle-hook --auto-scaling-group-name my-asg --lifecycle-action-token bcd2f1b8-9a78-44d3-8a7a-4dd07d7cf635
diff -Nru awscli-1.9.9/awscli/examples/autoscaling/set-instance-health.rst awscli-1.10.1/awscli/examples/autoscaling/set-instance-health.rst
--- awscli-1.9.9/awscli/examples/autoscaling/set-instance-health.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/autoscaling/set-instance-health.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,5 +1,5 @@
-**To set the health status of an instance**
-
-This example sets the health status of the specified instance to Unhealthy::
-
- aws autoscaling set-instance-health --instance-id i-93633f9b --health-status Unhealthy
+**To set the health status of an instance**
+
+This example sets the health status of the specified instance to Unhealthy::
+
+ aws autoscaling set-instance-health --instance-id i-93633f9b --health-status Unhealthy
diff -Nru awscli-1.9.9/awscli/examples/autoscaling/set-instance-protection.rst awscli-1.10.1/awscli/examples/autoscaling/set-instance-protection.rst
--- awscli-1.9.9/awscli/examples/autoscaling/set-instance-protection.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/autoscaling/set-instance-protection.rst 2016-01-28 22:38:12.000000000 +0000
@@ -0,0 +1,9 @@
+**To change the instance protection setting for an instance**
+
+This example enables instance protection for the specified instance::
+
+ aws autoscaling set-instance-protection --instance-ids i-93633f9b --protected-from-scale-in
+
+This example disables instance protection for the specified instance::
+
+ aws autoscaling set-instance-protection --instance-ids i-93633f9b --no-protected-from-scale-in
diff -Nru awscli-1.9.9/awscli/examples/autoscaling/update-auto-scaling-group.rst awscli-1.10.1/awscli/examples/autoscaling/update-auto-scaling-group.rst
--- awscli-1.9.9/awscli/examples/autoscaling/update-auto-scaling-group.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/autoscaling/update-auto-scaling-group.rst 2016-01-28 22:38:12.000000000 +0000
@@ -2,12 +2,20 @@
This example updates the specified Auto Scaling group to use Elastic Load Balancing health checks::
- aws autoscaling update-auto-scaling-group --auto-scaling-group-name my-test-asg --health-check-type ELB --health-check-grace-period 60
+ aws autoscaling update-auto-scaling-group --auto-scaling-group-name my-asg --health-check-type ELB --health-check-grace-period 60
This example updates the launch configuration, minimum and maximum size of the group, and which subnet to use::
- aws autoscaling update-auto-scaling-group --auto-scaling-group-name basic-auto-scaling-group --launch-configuration-name new-launch-config --min-size 1 --max-size 3 --vpc-zone-identifier subnet-41767929
+ aws autoscaling update-auto-scaling-group --auto-scaling-group-name my-asg --launch-configuration-name new-launch-config --min-size 1 --max-size 3 --vpc-zone-identifier subnet-41767929
This example updates the desired capacity, default cooldown, placement group, termination policy, and which Availability Zone to use::
- aws autoscaling update-auto-scaling-group --auto-scaling-group-name extended-auto-scaling-group-2 --default-cooldown 600 --placement-group sample-placement-group --termination-policies "OldestInstance" --availability-zones us-west-2c
+ aws autoscaling update-auto-scaling-group --auto-scaling-group-name my-asg --default-cooldown 600 --placement-group sample-placement-group --termination-policies "OldestInstance" --availability-zones us-west-2c
+
+This example enables the instance protection setting for the specified Auto Scaling group::
+
+ aws autoscaling update-auto-scaling-group --auto-scaling-group-name my-asg --new-instances-protected-from-scale-in
+
+This example disables the instance protection setting for the specified Auto Scaling group::
+
+ aws autoscaling update-auto-scaling-group --auto-scaling-group-name my-asg --no-new-instances-protected-from-scale-in
diff -Nru awscli-1.9.9/awscli/examples/cloudfront/create-distribution.rst awscli-1.10.1/awscli/examples/cloudfront/create-distribution.rst
--- awscli-1.9.9/awscli/examples/cloudfront/create-distribution.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/cloudfront/create-distribution.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,4 +1,14 @@
-The following command creates a CloudFront web distribution::
+You can create a CloudFront web distribution for an S3 domain (such as
+my-bucket.s3.amazonaws.com) or for a custom domain (such as example.com).
+The following command shows an example for an S3 domain, and optionally also
+specifies a default root object::
+
+ aws cloudfront create-distribution \
+ --origin-domain-name my-bucket.s3.amazonaws.com \
+ --default-root-object index.html
+
+Or you can use the following command together with a JSON document to do the
+same thing::
aws cloudfront create-distribution --distribution-config file://distconfig.json
@@ -9,7 +19,7 @@
"Aliases": {
"Quantity": 0
},
- "DefaultRootObject": "",
+ "DefaultRootObject": "index.html",
"Origins": {
"Quantity": 1,
"Items": [
diff -Nru awscli-1.9.9/awscli/examples/cloudfront/create-invalidation.rst awscli-1.10.1/awscli/examples/cloudfront/create-invalidation.rst
--- awscli-1.9.9/awscli/examples/cloudfront/create-invalidation.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/cloudfront/create-invalidation.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,5 +1,12 @@
The following command creates an invalidation for a CloudFront distribution with the ID ``S11A16G5KZMEQD``::
+ aws cloudfront create-invalidation --distribution-id S11A16G5KZMEQD \
+ --paths /index.html /error.html
+
+The --paths will automatically generate a random ``CallerReference`` every time.
+
+Or you can use the following command to do the same thing, so that you can have a chance to specify your own ``CallerReference`` here::
+
aws cloudfront create-invalidation --invalidation-batch file://invbatch.json --distribution-id S11A16G5KZMEQD
The distribution ID is available in the output of ``create-distribution`` and ``list-distributions``.
@@ -14,7 +21,7 @@
"CallerReference": "my-invalidation-2015-09-01"
}
-Output::
+Output of both commands::
{
"Invalidation": {
diff -Nru awscli-1.9.9/awscli/examples/cloudfront/update-distribution.rst awscli-1.10.1/awscli/examples/cloudfront/update-distribution.rst
--- awscli-1.9.9/awscli/examples/cloudfront/update-distribution.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/cloudfront/update-distribution.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,4 +1,10 @@
-The following command updates a CloudFront distribution with the ID ``S11A16G5KZMEQD``::
+The following command updates the Default Root Object to "index.html"
+for a CloudFront distribution with the ID ``S11A16G5KZMEQD``::
+
+ aws cloudfront update-distribution --id S11A16G5KZMEQD \
+ --default-root-object index.html
+
+The following command disables a CloudFront distribution with the ID ``S11A16G5KZMEQD``::
aws cloudfront update-distribution --id S11A16G5KZMEQD --distribution-config file://distconfig-disabled.json --if-match E37HOT42DHPVYH
diff -Nru awscli-1.9.9/awscli/examples/cloudwatch/describe-alarms.rst awscli-1.10.1/awscli/examples/cloudwatch/describe-alarms.rst
--- awscli-1.9.9/awscli/examples/cloudwatch/describe-alarms.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/cloudwatch/describe-alarms.rst 2016-01-28 22:38:13.000000000 +0000
@@ -1,8 +1,8 @@
**To list information about an alarm**
-The following example uses the ``describe-alarms`` command to provide information about the alarm named "myalarm".::
+The following example uses the ``describe-alarms`` command to provide information about the alarm named "myalarm"::
- aws cloudwatch describe-alarms --alarm-name "myalarm"
+ aws cloudwatch describe-alarms --alarm-names "myalarm"
Output::
diff -Nru awscli-1.9.9/awscli/examples/configservice/delete-config-rule.rst awscli-1.10.1/awscli/examples/configservice/delete-config-rule.rst
--- awscli-1.9.9/awscli/examples/configservice/delete-config-rule.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/configservice/delete-config-rule.rst 2016-01-28 22:38:13.000000000 +0000
@@ -0,0 +1,5 @@
+**To delete an AWS Config rule**
+
+The following command deletes an AWS Config rule named ``MyConfigRule``::
+
+ aws configservice delete-config-rule --config-rule-name MyConfigRule
\ No newline at end of file
diff -Nru awscli-1.9.9/awscli/examples/configservice/delete-delivery-channel.rst awscli-1.10.1/awscli/examples/configservice/delete-delivery-channel.rst
--- awscli-1.9.9/awscli/examples/configservice/delete-delivery-channel.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/configservice/delete-delivery-channel.rst 2016-01-28 22:38:13.000000000 +0000
@@ -0,0 +1,5 @@
+**To delete a delivery channel**
+
+The following command deletes the default delivery channel::
+
+ aws configservice delete-delivery-channel --delivery-channel-name default
\ No newline at end of file
diff -Nru awscli-1.9.9/awscli/examples/configservice/deliver-config-snapshot.rst awscli-1.10.1/awscli/examples/configservice/deliver-config-snapshot.rst
--- awscli-1.9.9/awscli/examples/configservice/deliver-config-snapshot.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/configservice/deliver-config-snapshot.rst 2016-01-28 22:38:13.000000000 +0000
@@ -0,0 +1,11 @@
+**To deliver a configuration snapshot**
+
+The following command delivers a configuration snapshot to the Amazon S3 bucket that belongs to the default delivery channel::
+
+ aws configservice deliver-config-snapshot --delivery-channel-name default
+
+Output::
+
+ {
+ "configSnapshotId": "d0333b00-a683-44af-921e-examplefb794"
+ }
\ No newline at end of file
diff -Nru awscli-1.9.9/awscli/examples/configservice/describe-compliance-by-config-rule.rst awscli-1.10.1/awscli/examples/configservice/describe-compliance-by-config-rule.rst
--- awscli-1.9.9/awscli/examples/configservice/describe-compliance-by-config-rule.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/configservice/describe-compliance-by-config-rule.rst 2016-01-28 22:38:13.000000000 +0000
@@ -0,0 +1,34 @@
+**To get compliance information for your AWS Config rules**
+
+The following command returns compliance information for each AWS Config rule that is violated by one or more AWS resources::
+
+ aws configservice describe-compliance-by-config-rule --compliance-types NON_COMPLIANT
+
+In the output, the value for each ``CappedCount`` attribute indicates how many resources do not comply with the related rule. For example, the following output indicates that 3 resources do not comply with the rule named ``InstanceTypesAreT2micro``.
+
+Output::
+
+ {
+ "ComplianceByConfigRules": [
+ {
+ "Compliance": {
+ "ComplianceContributorCount": {
+ "CappedCount": 3,
+ "CapExceeded": false
+ },
+ "ComplianceType": "NON_COMPLIANT"
+ },
+ "ConfigRuleName": "InstanceTypesAreT2micro"
+ },
+ {
+ "Compliance": {
+ "ComplianceContributorCount": {
+ "CappedCount": 10,
+ "CapExceeded": false
+ },
+ "ComplianceType": "NON_COMPLIANT"
+ },
+ "ConfigRuleName": "RequiredTagsForVolumes"
+ }
+ ]
+ }
\ No newline at end of file
diff -Nru awscli-1.9.9/awscli/examples/configservice/describe-compliance-by-resource.rst awscli-1.10.1/awscli/examples/configservice/describe-compliance-by-resource.rst
--- awscli-1.9.9/awscli/examples/configservice/describe-compliance-by-resource.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/configservice/describe-compliance-by-resource.rst 2016-01-28 22:38:13.000000000 +0000
@@ -0,0 +1,36 @@
+**To get compliance information for your AWS resources**
+
+The following command returns compliance information for each EC2 instance that is recorded by AWS Config and that violates one or more rules::
+
+ aws configservice describe-compliance-by-resource --resource-type AWS::EC2::Instance --compliance-types NON_COMPLIANT
+
+In the output, the value for each ``CappedCount`` attribute indicates how many rules the resource violates. For example, the following output indicates that instance ``i-1a2b3c4d`` violates 2 rules.
+
+Output::
+
+ {
+ "ComplianceByResources": [
+ {
+ "ResourceType": "AWS::EC2::Instance",
+ "ResourceId": "i-1a2b3c4d",
+ "Compliance": {
+ "ComplianceContributorCount": {
+ "CappedCount": 2,
+ "CapExceeded": false
+ },
+ "ComplianceType": "NON_COMPLIANT"
+ }
+ },
+ {
+ "ResourceType": "AWS::EC2::Instance",
+ "ResourceId": "i-2a2b3c4d ",
+ "Compliance": {
+ "ComplianceContributorCount": {
+ "CappedCount": 3,
+ "CapExceeded": false
+ },
+ "ComplianceType": "NON_COMPLIANT"
+ }
+ }
+ ]
+ }
\ No newline at end of file
diff -Nru awscli-1.9.9/awscli/examples/configservice/describe-config-rule-evaluation-status.rst awscli-1.10.1/awscli/examples/configservice/describe-config-rule-evaluation-status.rst
--- awscli-1.9.9/awscli/examples/configservice/describe-config-rule-evaluation-status.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/configservice/describe-config-rule-evaluation-status.rst 2016-01-28 22:38:13.000000000 +0000
@@ -0,0 +1,19 @@
+**To get status information for an AWS Config rule**
+
+The following command returns the status information for an AWS Config rule named ``MyConfigRule``::
+
+ aws configservice describe-config-rule-evaluation-status --config-rule-names MyConfigRule
+
+Output::
+
+ {
+ "ConfigRulesEvaluationStatus": [
+ {
+ "ConfigRuleArn": "arn:aws:config:us-east-1:123456789012:config-rule/config-rule-abcdef",
+ "FirstActivatedTime": 1450311703.844,
+ "ConfigRuleId": "config-rule-abcdef",
+ "LastSuccessfulInvocationTime": 1450314643.156,
+ "ConfigRuleName": "MyConfigRule"
+ }
+ ]
+ }
\ No newline at end of file
diff -Nru awscli-1.9.9/awscli/examples/configservice/describe-config-rules.rst awscli-1.10.1/awscli/examples/configservice/describe-config-rules.rst
--- awscli-1.9.9/awscli/examples/configservice/describe-config-rules.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/configservice/describe-config-rules.rst 2016-01-28 22:38:13.000000000 +0000
@@ -0,0 +1,35 @@
+**To get details for an AWS Config rule**
+
+The following command returns details for an AWS Config rule named ``InstanceTypesAreT2micro``::
+
+ aws configservice describe-config-rules --config-rule-names InstanceTypesAreT2micro
+
+Output::
+
+ {
+ "ConfigRules": [
+ {
+ "ConfigRuleState": "ACTIVE",
+ "Description": "Evaluates whether EC2 instances are the t2.micro type.",
+ "ConfigRuleName": "InstanceTypesAreT2micro",
+ "ConfigRuleArn": "arn:aws:config:us-east-1:123456789012:config-rule/config-rule-abcdef",
+ "Source": {
+ "Owner": "CUSTOM_LAMBDA",
+ "SourceIdentifier": "arn:aws:lambda:us-east-1:123456789012:function:InstanceTypeCheck",
+ "SourceDetails": [
+ {
+ "EventSource": "aws.config",
+ "MessageType": "ConfigurationItemChangeNotification"
+ }
+ ]
+ },
+ "InputParameters": "{\"desiredInstanceType\":\"t2.micro\"}",
+ "Scope": {
+ "ComplianceResourceTypes": [
+ "AWS::EC2::Instance"
+ ]
+ },
+ "ConfigRuleId": "config-rule-abcdef"
+ }
+ ]
+ }
\ No newline at end of file
diff -Nru awscli-1.9.9/awscli/examples/configservice/describe-configuration-recorders.rst awscli-1.10.1/awscli/examples/configservice/describe-configuration-recorders.rst
--- awscli-1.9.9/awscli/examples/configservice/describe-configuration-recorders.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/configservice/describe-configuration-recorders.rst 2016-01-28 22:38:13.000000000 +0000
@@ -0,0 +1,21 @@
+**To get details about the configuration recorder**
+
+The following command returns details about the default configuration recorder::
+
+ aws configservice describe-configuration-recorders
+
+Output::
+
+ {
+ "ConfigurationRecorders": [
+ {
+ "recordingGroup": {
+ "allSupported": true,
+ "resourceTypes": [],
+ "includeGlobalResourceTypes": true
+ },
+ "roleARN": "arn:aws:iam::123456789012:role/config-ConfigRole-A1B2C3D4E5F6",
+ "name": "default"
+ }
+ ]
+ }
\ No newline at end of file
diff -Nru awscli-1.9.9/awscli/examples/configservice/describe-configuration-recorder-status.rst awscli-1.10.1/awscli/examples/configservice/describe-configuration-recorder-status.rst
--- awscli-1.9.9/awscli/examples/configservice/describe-configuration-recorder-status.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/configservice/describe-configuration-recorder-status.rst 2016-01-28 22:38:13.000000000 +0000
@@ -0,0 +1,20 @@
+**To get status information for the configuration recorder**
+
+The following command returns the status of the default configuration recorder::
+
+ aws configservice describe-configuration-recorder-status
+
+Output::
+
+ {
+ "ConfigurationRecordersStatus": [
+ {
+ "name": "default",
+ "lastStatus": "SUCCESS",
+ "recording": true,
+ "lastStatusChangeTime": 1452193834.344,
+ "lastStartTime": 1441039997.819,
+ "lastStopTime": 1441039992.835
+ }
+ ]
+ }
\ No newline at end of file
diff -Nru awscli-1.9.9/awscli/examples/configservice/describe-delivery-channels.rst awscli-1.10.1/awscli/examples/configservice/describe-delivery-channels.rst
--- awscli-1.9.9/awscli/examples/configservice/describe-delivery-channels.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/configservice/describe-delivery-channels.rst 2016-01-28 22:38:13.000000000 +0000
@@ -0,0 +1,17 @@
+**To get details about the delivery channel**
+
+The following command returns details about the delivery channel::
+
+ aws configservice describe-delivery-channels
+
+Output::
+
+ {
+ "DeliveryChannels": [
+ {
+ "snsTopicARN": "arn:aws:sns:us-east-1:123456789012:config-topic",
+ "name": "default",
+ "s3BucketName": "config-bucket-123456789012"
+ }
+ ]
+ }
\ No newline at end of file
diff -Nru awscli-1.9.9/awscli/examples/configservice/describe-delivery-channel-status.rst awscli-1.10.1/awscli/examples/configservice/describe-delivery-channel-status.rst
--- awscli-1.9.9/awscli/examples/configservice/describe-delivery-channel-status.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/configservice/describe-delivery-channel-status.rst 2016-01-28 22:38:13.000000000 +0000
@@ -0,0 +1,29 @@
+**To get status information for the delivery channel**
+
+The following command returns the status of the delivery channel::
+
+ aws configservice describe-delivery-channel-status
+
+Output::
+
+ {
+ "DeliveryChannelsStatus": [
+ {
+ "configStreamDeliveryInfo": {
+ "lastStatusChangeTime": 1452193834.381,
+ "lastStatus": "SUCCESS"
+ },
+ "configHistoryDeliveryInfo": {
+ "lastSuccessfulTime": 1450317838.412,
+ "lastStatus": "SUCCESS",
+ "lastAttemptTime": 1450317838.412
+ },
+ "configSnapshotDeliveryInfo": {
+ "lastSuccessfulTime": 1452185597.094,
+ "lastStatus": "SUCCESS",
+ "lastAttemptTime": 1452185597.094
+ },
+ "name": "default"
+ }
+ ]
+ }
\ No newline at end of file
diff -Nru awscli-1.9.9/awscli/examples/configservice/get-compliance-details-by-config-rule.rst awscli-1.10.1/awscli/examples/configservice/get-compliance-details-by-config-rule.rst
--- awscli-1.9.9/awscli/examples/configservice/get-compliance-details-by-config-rule.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/configservice/get-compliance-details-by-config-rule.rst 2016-01-28 22:38:13.000000000 +0000
@@ -0,0 +1,51 @@
+**To get the evaluation results for an AWS Config rule**
+
+The following command returns the evaluation results for all of the resources that don't comply with an AWS Config rule named ``InstanceTypesAreT2micro``::
+
+ aws configservice get-compliance-details-by-config-rule --config-rule-name InstanceTypesAreT2micro --compliance-types NON_COMPLIANT
+
+Output::
+
+ {
+ "EvaluationResults": [
+ {
+ "EvaluationResultIdentifier": {
+ "OrderingTimestamp": 1450314635.065,
+ "EvaluationResultQualifier": {
+ "ResourceType": "AWS::EC2::Instance",
+ "ResourceId": "i-1a2b3c4d",
+ "ConfigRuleName": "InstanceTypesAreT2micro"
+ }
+ },
+ "ResultRecordedTime": 1450314645.261,
+ "ConfigRuleInvokedTime": 1450314642.948,
+ "ComplianceType": "NON_COMPLIANT"
+ },
+ {
+ "EvaluationResultIdentifier": {
+ "OrderingTimestamp": 1450314635.065,
+ "EvaluationResultQualifier": {
+ "ResourceType": "AWS::EC2::Instance",
+ "ResourceId": "i-2a2b3c4d",
+ "ConfigRuleName": "InstanceTypesAreT2micro"
+ }
+ },
+ "ResultRecordedTime": 1450314645.18,
+ "ConfigRuleInvokedTime": 1450314642.902,
+ "ComplianceType": "NON_COMPLIANT"
+ },
+ {
+ "EvaluationResultIdentifier": {
+ "OrderingTimestamp": 1450314635.065,
+ "EvaluationResultQualifier": {
+ "ResourceType": "AWS::EC2::Instance",
+ "ResourceId": "i-3a2b3c4d",
+ "ConfigRuleName": "InstanceTypesAreT2micro"
+ }
+ },
+ "ResultRecordedTime": 1450314643.346,
+ "ConfigRuleInvokedTime": 1450314643.124,
+ "ComplianceType": "NON_COMPLIANT"
+ }
+ ]
+ }
\ No newline at end of file
diff -Nru awscli-1.9.9/awscli/examples/configservice/get-compliance-details-by-resource.rst awscli-1.10.1/awscli/examples/configservice/get-compliance-details-by-resource.rst
--- awscli-1.9.9/awscli/examples/configservice/get-compliance-details-by-resource.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/configservice/get-compliance-details-by-resource.rst 2016-01-28 22:38:13.000000000 +0000
@@ -0,0 +1,38 @@
+**To get the evaluation results for an AWS resource**
+
+The following command returns the evaluation results for each rule with which the EC2 instance ``i-1a2b3c4d`` does not comply::
+
+ aws configservice get-compliance-details-by-resource --resource-type AWS::EC2::Instance --resource-id i-1a2b3c4d --compliance-types NON_COMPLIANT
+
+Output::
+
+ {
+ "EvaluationResults": [
+ {
+ "EvaluationResultIdentifier": {
+ "OrderingTimestamp": 1450314635.065,
+ "EvaluationResultQualifier": {
+ "ResourceType": "AWS::EC2::Instance",
+ "ResourceId": "i-1a2b3c4d",
+ "ConfigRuleName": "InstanceTypesAreT2micro"
+ }
+ },
+ "ResultRecordedTime": 1450314643.288,
+ "ConfigRuleInvokedTime": 1450314643.034,
+ "ComplianceType": "NON_COMPLIANT"
+ },
+ {
+ "EvaluationResultIdentifier": {
+ "OrderingTimestamp": 1450314635.065,
+ "EvaluationResultQualifier": {
+ "ResourceType": "AWS::EC2::Instance",
+ "ResourceId": "i-1a2b3c4d",
+ "ConfigRuleName": "RequiredTagForEC2Instances"
+ }
+ },
+ "ResultRecordedTime": 1450314645.261,
+ "ConfigRuleInvokedTime": 1450314642.948,
+ "ComplianceType": "NON_COMPLIANT"
+ }
+ ]
+ }
\ No newline at end of file
diff -Nru awscli-1.9.9/awscli/examples/configservice/get-compliance-summary-by-config-rule.rst awscli-1.10.1/awscli/examples/configservice/get-compliance-summary-by-config-rule.rst
--- awscli-1.9.9/awscli/examples/configservice/get-compliance-summary-by-config-rule.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/configservice/get-compliance-summary-by-config-rule.rst 2016-01-28 22:38:13.000000000 +0000
@@ -0,0 +1,23 @@
+**To get the compliance summary for your AWS Config rules**
+
+The following command returns the number of rules that are compliant and the number that are noncompliant::
+
+ aws configservice get-compliance-summary-by-config-rule
+
+In the output, the value for each ``CappedCount`` attribute indicates how many rules are compliant or noncompliant.
+
+Output::
+
+ {
+ "ComplianceSummary": {
+ "NonCompliantResourceCount": {
+ "CappedCount": 3,
+ "CapExceeded": false
+ },
+ "ComplianceSummaryTimestamp": 1452204131.493,
+ "CompliantResourceCount": {
+ "CappedCount": 2,
+ "CapExceeded": false
+ }
+ }
+ }
\ No newline at end of file
diff -Nru awscli-1.9.9/awscli/examples/configservice/get-compliance-summary-by-resource-type.rst awscli-1.10.1/awscli/examples/configservice/get-compliance-summary-by-resource-type.rst
--- awscli-1.9.9/awscli/examples/configservice/get-compliance-summary-by-resource-type.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/configservice/get-compliance-summary-by-resource-type.rst 2016-01-28 22:38:13.000000000 +0000
@@ -0,0 +1,56 @@
+**To get the compliance summary for all resource types**
+
+The following command returns the number of AWS resources that are noncompliant and the number that are compliant::
+
+ aws configservice get-compliance-summary-by-resource-type
+
+In the output, the value for each ``CappedCount`` attribute indicates how many resources are compliant or noncompliant.
+
+Output::
+
+ {
+ "ComplianceSummariesByResourceType": [
+ {
+ "ComplianceSummary": {
+ "NonCompliantResourceCount": {
+ "CappedCount": 16,
+ "CapExceeded": false
+ },
+ "ComplianceSummaryTimestamp": 1453237464.543,
+ "CompliantResourceCount": {
+ "CappedCount": 10,
+ "CapExceeded": false
+ }
+ }
+ }
+ ]
+ }
+
+**To get the compliance summary for a specific resource type**
+
+The following command returns the number of EC2 instances that are noncompliant and the number that are compliant::
+
+ aws configservice get-compliance-summary-by-resource-type --resource-types AWS::EC2::Instance
+
+In the output, the value for each ``CappedCount`` attribute indicates how many resources are compliant or noncompliant.
+
+Output::
+
+ {
+ "ComplianceSummariesByResourceType": [
+ {
+ "ResourceType": "AWS::EC2::Instance",
+ "ComplianceSummary": {
+ "NonCompliantResourceCount": {
+ "CappedCount": 3,
+ "CapExceeded": false
+ },
+ "ComplianceSummaryTimestamp": 1452204923.518,
+ "CompliantResourceCount": {
+ "CappedCount": 7,
+ "CapExceeded": false
+ }
+ }
+ }
+ ]
+ }
\ No newline at end of file
diff -Nru awscli-1.9.9/awscli/examples/configservice/get-resource-config-history.rst awscli-1.10.1/awscli/examples/configservice/get-resource-config-history.rst
--- awscli-1.9.9/awscli/examples/configservice/get-resource-config-history.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/configservice/get-resource-config-history.rst 2016-01-28 22:38:13.000000000 +0000
@@ -0,0 +1,5 @@
+**To get the configuration history of an AWS resource**
+
+The following command returns a list of configuration items for an EC2 instance with an ID of ``i-1a2b3c4d``::
+
+ aws configservice get-resource-config-history --resource-type AWS::EC2::Instance --resource-id i-1a2b3c4d
\ No newline at end of file
diff -Nru awscli-1.9.9/awscli/examples/configservice/get-status.rst awscli-1.10.1/awscli/examples/configservice/get-status.rst
--- awscli-1.9.9/awscli/examples/configservice/get-status.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/configservice/get-status.rst 2016-01-28 22:38:13.000000000 +0000
@@ -0,0 +1,20 @@
+**To get the status for AWS Config**
+
+The following command returns the status of the delivery channel and configuration recorder::
+
+ aws configservice get-status
+
+Output::
+
+ Configuration Recorders:
+
+ name: default
+ recorder: ON
+ last status: SUCCESS
+
+ Delivery Channels:
+
+ name: default
+ last stream delivery status: SUCCESS
+ last history delivery status: SUCCESS
+ last snapshot delivery status: SUCCESS
\ No newline at end of file
diff -Nru awscli-1.9.9/awscli/examples/configservice/list-discovered-resources.rst awscli-1.10.1/awscli/examples/configservice/list-discovered-resources.rst
--- awscli-1.9.9/awscli/examples/configservice/list-discovered-resources.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/configservice/list-discovered-resources.rst 2016-01-28 22:38:13.000000000 +0000
@@ -0,0 +1,24 @@
+**To list resources that AWS Config has discovered**
+
+The following command lists the EC2 instances that AWS Config has discovered::
+
+ aws configservice list-discovered-resources --resource-type AWS::EC2::Instance
+
+Output::
+
+ {
+ "resourceIdentifiers": [
+ {
+ "resourceType": "AWS::EC2::Instance",
+ "resourceId": "i-1a2b3c4d"
+ },
+ {
+ "resourceType": "AWS::EC2::Instance",
+ "resourceId": "i-2a2b3c4d"
+ },
+ {
+ "resourceType": "AWS::EC2::Instance",
+ "resourceId": "i-3a2b3c4d"
+ }
+ ]
+ }
\ No newline at end of file
diff -Nru awscli-1.9.9/awscli/examples/configservice/put-config-rule.rst awscli-1.10.1/awscli/examples/configservice/put-config-rule.rst
--- awscli-1.9.9/awscli/examples/configservice/put-config-rule.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/configservice/put-config-rule.rst 2016-01-28 22:38:13.000000000 +0000
@@ -0,0 +1,64 @@
+**To add an AWS managed Config rule**
+
+The following command provides JSON code to add an AWS managed Config rule::
+
+ aws configservice put-config-rule --config-rule file://RequiredTagsForEC2Instances.json
+
+``RequiredTagsForEC2Instances.json`` is a JSON file that contains the rule configuration::
+
+ {
+ "ConfigRuleName": "RequiredTagsForEC2Instances",
+ "Description": "Checks whether the CostCenter and Owner tags are applied to EC2 instances.",
+ "Scope": {
+ "ComplianceResourceTypes": [
+ "AWS::EC2::Instance"
+ ]
+ },
+ "Source": {
+ "Owner": "AWS",
+ "SourceIdentifier": "REQUIRED_TAGS"
+ },
+ "InputParameters": "{\"tag1Key\":\"CostCenter\",\"tag2Key\":\"Owner\"}"
+ }
+
+For the ``ComplianceResourceTypes`` attribute, this JSON code limits the scope to resources of the ``AWS::EC2::Instance`` type, so AWS Config will evaluate only EC2 instances against the rule. Because the rule is a managed rule, the ``Owner`` attribute is set to ``AWS``, and the ``SourceIdentifier`` attribute is set to the rule identifier, ``REQUIRED_TAGS``. For the ``InputParameters`` attribute, the tag keys that the rule requires, ``CostCenter`` and ``Owner``, are specified.
+
+If the command succeeds, AWS Config returns no output. To verify the rule configuration, run the `describe-config-rules`__ command, and specify the rule name.
+
+.. __: http://docs.aws.amazon.com/cli/latest/reference/configservice/describe-config-rules.html
+
+**To add a customer managed Config rule**
+
+The following command provides JSON code to add a customer managed Config rule::
+
+ aws configservice put-config-rule --config-rule file://InstanceTypesAreT2micro.json
+
+``InstanceTypesAreT2micro.json`` is a JSON file that contains the rule configuration::
+
+ {
+ "ConfigRuleName": "InstanceTypesAreT2micro",
+ "Description": "Evaluates whether EC2 instances are the t2.micro type.",
+ "Scope": {
+ "ComplianceResourceTypes": [
+ "AWS::EC2::Instance"
+ ]
+ },
+ "Source": {
+ "Owner": "CUSTOM_LAMBDA",
+ "SourceIdentifier": "arn:aws:lambda:us-east-1:123456789012:function:InstanceTypeCheck",
+ "SourceDetails": [
+ {
+ "EventSource": "aws.config",
+ "MessageType": "ConfigurationItemChangeNotification"
+ }
+ ]
+ },
+ "InputParameters": "{\"desiredInstanceType\":\"t2.micro\"}"
+ }
+
+For the ``ComplianceResourceTypes`` attribute, this JSON code limits the scope to resources of the ``AWS::EC2::Instance`` type, so AWS Config will evaluate only EC2 instances against the rule. Because this rule is a customer managed rule, the ``Owner`` attribute is set to ``CUSTOM_LAMBDA``, and the ``SourceIdentifier`` attribute is set to the ARN of the AWS Lambda function. The ``SourceDetails`` object is required. The parameters that are specified for the ``InputParameters`` attribute are passed to the AWS Lambda function when AWS Config invokes it to evaluate resources against the rule.
+
+If the command succeeds, AWS Config returns no output. To verify the rule configuration, run the `describe-config-rules`__ command, and specify the rule name.
+
+.. __: http://docs.aws.amazon.com/cli/latest/reference/configservice/describe-config-rules.html
+
diff -Nru awscli-1.9.9/awscli/examples/configservice/put-configuration-recorder.rst awscli-1.10.1/awscli/examples/configservice/put-configuration-recorder.rst
--- awscli-1.9.9/awscli/examples/configservice/put-configuration-recorder.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/configservice/put-configuration-recorder.rst 2016-01-28 22:38:13.000000000 +0000
@@ -0,0 +1,35 @@
+**To record all supported resources**
+
+The following command creates a configuration recorder that tracks changes to all supported resource types, including global resource types::
+
+ aws configservice put-configuration-recorder --configuration-recorder name=default,roleARN=arn:aws:iam::123456789012:role/config-role --recording-group allSupported=true,includeGlobalResourceTypes=true
+
+**To record specific types of resources**
+
+The following command creates a configuration recorder that tracks changes to only those types of resources that are specified in the JSON file for the `--recording-group` option::
+
+ aws configservice put-configuration-recorder --configuration-recorder name=default,roleARN=arn:aws:iam::123456789012:role/config-role --recording-group file://recordingGroup.json
+
+`recordingGroup.json` is a JSON file that specifies the types of resources that AWS Config will record::
+
+ {
+ "allSupported": false,
+ "includeGlobalResourceTypes": false,
+ "resourceTypes": [
+ "AWS::EC2::EIP",
+ "AWS::EC2::Instance",
+ "AWS::EC2::NetworkAcl",
+ "AWS::EC2::SecurityGroup",
+ "AWS::CloudTrail::Trail",
+ "AWS::EC2::Volume",
+ "AWS::EC2::VPC",
+ "AWS::IAM::User",
+ "AWS::IAM::Policy"
+ ]
+ }
+
+Before you can specify resource types for the `resourceTypes` key, you must set the `allSupported` and `includeGlobalResourceTypes` options to false or omit them.
+
+If the command succeeds, AWS Config returns no output. To verify the settings of your configuration recorder, run the `describe-configuration-recorders`__ command.
+
+.. __: http://docs.aws.amazon.com/cli/latest/reference/configservice/describe-configuration-recorders.html
\ No newline at end of file
diff -Nru awscli-1.9.9/awscli/examples/configservice/put-delivery-channel.rst awscli-1.10.1/awscli/examples/configservice/put-delivery-channel.rst
--- awscli-1.9.9/awscli/examples/configservice/put-delivery-channel.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/configservice/put-delivery-channel.rst 2016-01-28 22:38:13.000000000 +0000
@@ -0,0 +1,17 @@
+**To create a delivery channel**
+
+The following command provides the settings for the delivery channel as JSON code::
+
+ aws configservice put-delivery-channel --delivery-channel file://deliveryChannel.json
+
+`deliveryChannel.json` is a JSON file that specifies the Amazon S3 bucket and Amazon SNS topic to which AWS Config will deliver configuration information::
+
+ {
+ "name": "default",
+ "s3BucketName": "config-bucket-123456789012",
+ "snsTopicARN": "arn:aws:sns:us-east-1:123456789012:config-topic"
+ }
+
+If the command succeeds, AWS Config returns no output. To verify the settings of your delivery channel, run the `describe-delivery-channels`__ command.
+
+.. __: http://docs.aws.amazon.com/cli/latest/reference/configservice/describe-delivery-channels.html
\ No newline at end of file
diff -Nru awscli-1.9.9/awscli/examples/configservice/start-configuration-recorder.rst awscli-1.10.1/awscli/examples/configservice/start-configuration-recorder.rst
--- awscli-1.9.9/awscli/examples/configservice/start-configuration-recorder.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/configservice/start-configuration-recorder.rst 2016-01-28 22:38:13.000000000 +0000
@@ -0,0 +1,9 @@
+**To start the configuration recorder**
+
+The following command starts the default configuration recorder::
+
+ aws configservice start-configuration-recorder --configuration-recorder-name default
+
+If the command succeeds, AWS Config returns no output. To verify that AWS Config is recording your resources, run the `get-status`__ command.
+
+.. __: http://docs.aws.amazon.com/cli/latest/reference/configservice/get-status.html
\ No newline at end of file
diff -Nru awscli-1.9.9/awscli/examples/configservice/stop-configuration-recorder.rst awscli-1.10.1/awscli/examples/configservice/stop-configuration-recorder.rst
--- awscli-1.9.9/awscli/examples/configservice/stop-configuration-recorder.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/configservice/stop-configuration-recorder.rst 2016-01-28 22:38:13.000000000 +0000
@@ -0,0 +1,9 @@
+**To stop the configuration recorder**
+
+The following command stops the default configuration recorder::
+
+ aws configservice stop-configuration-recorder --configuration-recorder-name default
+
+If the command succeeds, AWS Config returns no output. To verify that AWS Config is not recording your resources, run the `get-status`__ command.
+
+.. __: http://docs.aws.amazon.com/cli/latest/reference/configservice/get-status.html
\ No newline at end of file
diff -Nru awscli-1.9.9/awscli/examples/configservice/subscribe.rst awscli-1.10.1/awscli/examples/configservice/subscribe.rst
--- awscli-1.9.9/awscli/examples/configservice/subscribe.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/configservice/subscribe.rst 2016-01-28 22:38:13.000000000 +0000
@@ -0,0 +1,31 @@
+**To subscribe to AWS Config**
+
+The following command creates the default delivery channel and configuration recorder. The command also specifies the Amazon S3 bucket and Amazon SNS topic to which AWS Config will deliver configuration information::
+
+ aws configservice subscribe --s3-bucket config-bucket-123456789012 --sns-topic arn:aws:sns:us-east-1:123456789012:config-topic --iam-role arn:aws:iam::123456789012:role/ConfigRole-A1B2C3D4E5F6
+
+Output::
+
+ Using existing S3 bucket: config-bucket-123456789012
+ Using existing SNS topic: arn:aws:sns:us-east-1:123456789012:config-topic
+ Subscribe succeeded:
+
+ Configuration Recorders: [
+ {
+ "recordingGroup": {
+ "allSupported": true,
+ "resourceTypes": [],
+ "includeGlobalResourceTypes": false
+ },
+ "roleARN": "arn:aws:iam::123456789012:role/ConfigRole-A1B2C3D4E5F6",
+ "name": "default"
+ }
+ ]
+
+ Delivery Channels: [
+ {
+ "snsTopicARN": "arn:aws:sns:us-east-1:123456789012:config-topic",
+ "name": "default",
+ "s3BucketName": "config-bucket-123456789012"
+ }
+ ]
\ No newline at end of file
diff -Nru awscli-1.9.9/awscli/examples/datapipeline/activate-pipeline.rst awscli-1.10.1/awscli/examples/datapipeline/activate-pipeline.rst
--- awscli-1.9.9/awscli/examples/datapipeline/activate-pipeline.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/datapipeline/activate-pipeline.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,9 +1,9 @@
-**To activate a pipeline**
-
-This example activates the specified pipeline::
-
- aws datapipeline activate-pipeline --pipeline-id df-00627471SOVYZEXAMPLE
-
-To activate the pipeline at a specific date and time, use the following command::
-
- aws datapipeline activate-pipeline --pipeline-id df-00627471SOVYZEXAMPLE --start-timestamp 2015-04-07T00:00:00Z
+**To activate a pipeline**
+
+This example activates the specified pipeline::
+
+ aws datapipeline activate-pipeline --pipeline-id df-00627471SOVYZEXAMPLE
+
+To activate the pipeline at a specific date and time, use the following command::
+
+ aws datapipeline activate-pipeline --pipeline-id df-00627471SOVYZEXAMPLE --start-timestamp 2015-04-07T00:00:00Z
diff -Nru awscli-1.9.9/awscli/examples/datapipeline/add-tags.rst awscli-1.10.1/awscli/examples/datapipeline/add-tags.rst
--- awscli-1.9.9/awscli/examples/datapipeline/add-tags.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/datapipeline/add-tags.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,22 +1,22 @@
-**To add a tag to a pipeline**
-
-This example adds the specified tag to the specified pipeline::
-
- aws datapipeline add-tags --pipeline-id df-00627471SOVYZEXAMPLE --tags key=environment,value=production key=owner,value=sales
-
-To view the tags, use the describe-pipelines command. For example, the tags added in the example command appear as follows in the output for describe-pipelines::
-
- {
- ...
- "tags": [
- {
- "value": "production",
- "key": "environment"
- },
- {
- "value": "sales",
- "key": "owner"
- }
- ]
- ...
- }
+**To add a tag to a pipeline**
+
+This example adds the specified tag to the specified pipeline::
+
+ aws datapipeline add-tags --pipeline-id df-00627471SOVYZEXAMPLE --tags key=environment,value=production key=owner,value=sales
+
+To view the tags, use the describe-pipelines command. For example, the tags added in the example command appear as follows in the output for describe-pipelines::
+
+ {
+ ...
+ "tags": [
+ {
+ "value": "production",
+ "key": "environment"
+ },
+ {
+ "value": "sales",
+ "key": "owner"
+ }
+ ]
+ ...
+ }
diff -Nru awscli-1.9.9/awscli/examples/datapipeline/create-pipeline.rst awscli-1.10.1/awscli/examples/datapipeline/create-pipeline.rst
--- awscli-1.9.9/awscli/examples/datapipeline/create-pipeline.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/datapipeline/create-pipeline.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,11 +1,11 @@
-**To create a pipeline**
-
-This example creates a pipeline::
-
- aws datapipeline create-pipeline --name my-pipeline --unique-id my-pipeline-token
-
-The following is example output::
-
- {
- "pipelineId": "df-00627471SOVYZEXAMPLE"
- }
+**To create a pipeline**
+
+This example creates a pipeline::
+
+ aws datapipeline create-pipeline --name my-pipeline --unique-id my-pipeline-token
+
+The following is example output::
+
+ {
+ "pipelineId": "df-00627471SOVYZEXAMPLE"
+ }
diff -Nru awscli-1.9.9/awscli/examples/datapipeline/deactivate-pipeline.rst awscli-1.10.1/awscli/examples/datapipeline/deactivate-pipeline.rst
--- awscli-1.9.9/awscli/examples/datapipeline/deactivate-pipeline.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/datapipeline/deactivate-pipeline.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,9 +1,9 @@
-**To deactivate a pipeline**
-
-This example deactivates the specified pipeline::
-
- aws datapipeline deactivate-pipeline --pipeline-id df-00627471SOVYZEXAMPLE
-
-To deactivate the pipeline only after all running activities finish, use the following command::
-
- aws datapipeline deactivate-pipeline --pipeline-id df-00627471SOVYZEXAMPLE --no-cancel-active
+**To deactivate a pipeline**
+
+This example deactivates the specified pipeline::
+
+ aws datapipeline deactivate-pipeline --pipeline-id df-00627471SOVYZEXAMPLE
+
+To deactivate the pipeline only after all running activities finish, use the following command::
+
+ aws datapipeline deactivate-pipeline --pipeline-id df-00627471SOVYZEXAMPLE --no-cancel-active
diff -Nru awscli-1.9.9/awscli/examples/datapipeline/delete-pipeline.rst awscli-1.10.1/awscli/examples/datapipeline/delete-pipeline.rst
--- awscli-1.9.9/awscli/examples/datapipeline/delete-pipeline.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/datapipeline/delete-pipeline.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,5 +1,5 @@
-**To delete a pipeline**
-
-This example deletes the specified pipeline::
-
- aws datapipeline delete-pipeline --pipeline-id df-00627471SOVYZEXAMPLE
+**To delete a pipeline**
+
+This example deletes the specified pipeline::
+
+ aws datapipeline delete-pipeline --pipeline-id df-00627471SOVYZEXAMPLE
diff -Nru awscli-1.9.9/awscli/examples/datapipeline/describe-pipelines.rst awscli-1.10.1/awscli/examples/datapipeline/describe-pipelines.rst
--- awscli-1.9.9/awscli/examples/datapipeline/describe-pipelines.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/datapipeline/describe-pipelines.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,55 +1,55 @@
-**To describe your pipelines**
-
-This example describes the specified pipeline::
-
- aws datapipeline describe-pipelines --pipeline-ids df-00627471SOVYZEXAMPLE
-
-The following is example output::
-
- {
- "pipelineDescriptionList": [
- {
- "fields": [
- {
- "stringValue": "PENDING",
- "key": "@pipelineState"
- },
- {
- "stringValue": "my-pipeline",
- "key": "name"
- },
- {
- "stringValue": "2015-04-07T16:05:58",
- "key": "@creationTime"
- },
- {
- "stringValue": "df-00627471SOVYZEXAMPLE",
- "key": "@id"
- },
- {
- "stringValue": "123456789012",
- "key": "pipelineCreator"
- },
- {
- "stringValue": "PIPELINE",
- "key": "@sphere"
- },
- {
- "stringValue": "123456789012",
- "key": "@userId"
- },
- {
- "stringValue": "123456789012",
- "key": "@accountId"
- },
- {
- "stringValue": "my-pipeline-token",
- "key": "uniqueId"
- }
- ],
- "pipelineId": "df-00627471SOVYZEXAMPLE",
- "name": "my-pipeline",
- "tags": []
- }
- ]
- }
+**To describe your pipelines**
+
+This example describes the specified pipeline::
+
+ aws datapipeline describe-pipelines --pipeline-ids df-00627471SOVYZEXAMPLE
+
+The following is example output::
+
+ {
+ "pipelineDescriptionList": [
+ {
+ "fields": [
+ {
+ "stringValue": "PENDING",
+ "key": "@pipelineState"
+ },
+ {
+ "stringValue": "my-pipeline",
+ "key": "name"
+ },
+ {
+ "stringValue": "2015-04-07T16:05:58",
+ "key": "@creationTime"
+ },
+ {
+ "stringValue": "df-00627471SOVYZEXAMPLE",
+ "key": "@id"
+ },
+ {
+ "stringValue": "123456789012",
+ "key": "pipelineCreator"
+ },
+ {
+ "stringValue": "PIPELINE",
+ "key": "@sphere"
+ },
+ {
+ "stringValue": "123456789012",
+ "key": "@userId"
+ },
+ {
+ "stringValue": "123456789012",
+ "key": "@accountId"
+ },
+ {
+ "stringValue": "my-pipeline-token",
+ "key": "uniqueId"
+ }
+ ],
+ "pipelineId": "df-00627471SOVYZEXAMPLE",
+ "name": "my-pipeline",
+ "tags": []
+ }
+ ]
+ }
diff -Nru awscli-1.9.9/awscli/examples/datapipeline/get-pipeline-definition.rst awscli-1.10.1/awscli/examples/datapipeline/get-pipeline-definition.rst
--- awscli-1.9.9/awscli/examples/datapipeline/get-pipeline-definition.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/datapipeline/get-pipeline-definition.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,90 +1,90 @@
-**To get a pipeline definition**
-
-This example gets the pipeline definition for the specified pipeline::
-
- aws datapipeline get-pipeline-definition --pipeline-id df-00627471SOVYZEXAMPLE
-
-The following is example output::
-
- {
- "parameters": [
- {
- "type": "AWS::S3::ObjectKey",
- "id": "myS3OutputLoc",
- "description": "S3 output folder"
- },
- {
- "default": "s3://us-east-1.elasticmapreduce.samples/pig-apache-logs/data",
- "type": "AWS::S3::ObjectKey",
- "id": "myS3InputLoc",
- "description": "S3 input folder"
- },
- {
- "default": "grep -rc \"GET\" ${INPUT1_STAGING_DIR}/* > ${OUTPUT1_STAGING_DIR}/output.txt",
- "type": "String",
- "id": "myShellCmd",
- "description": "Shell command to run"
- }
- ],
- "objects": [
- {
- "type": "Ec2Resource",
- "terminateAfter": "20 Minutes",
- "instanceType": "t1.micro",
- "id": "EC2ResourceObj",
- "name": "EC2ResourceObj"
- },
- {
- "name": "Default",
- "failureAndRerunMode": "CASCADE",
- "resourceRole": "DataPipelineDefaultResourceRole",
- "schedule": {
- "ref": "DefaultSchedule"
- },
- "role": "DataPipelineDefaultRole",
- "scheduleType": "cron",
- "id": "Default"
- },
- {
- "directoryPath": "#{myS3OutputLoc}/#{format(@scheduledStartTime, 'YYYY-MM-dd-HH-mm-ss')}",
- "type": "S3DataNode",
- "id": "S3OutputLocation",
- "name": "S3OutputLocation"
- },
- {
- "directoryPath": "#{myS3InputLoc}",
- "type": "S3DataNode",
- "id": "S3InputLocation",
- "name": "S3InputLocation"
- },
- {
- "startAt": "FIRST_ACTIVATION_DATE_TIME",
- "name": "Every 15 minutes",
- "period": "15 minutes",
- "occurrences": "4",
- "type": "Schedule",
- "id": "DefaultSchedule"
- },
- {
- "name": "ShellCommandActivityObj",
- "command": "#{myShellCmd}",
- "output": {
- "ref": "S3OutputLocation"
- },
- "input": {
- "ref": "S3InputLocation"
- },
- "stage": "true",
- "type": "ShellCommandActivity",
- "id": "ShellCommandActivityObj",
- "runsOn": {
- "ref": "EC2ResourceObj"
- }
- }
- ],
- "values": {
- "myS3OutputLoc": "s3://my-s3-bucket/",
- "myS3InputLoc": "s3://us-east-1.elasticmapreduce.samples/pig-apache-logs/data",
- "myShellCmd": "grep -rc \"GET\" ${INPUT1_STAGING_DIR}/* > ${OUTPUT1_STAGING_DIR}/output.txt"
- }
- }
+**To get a pipeline definition**
+
+This example gets the pipeline definition for the specified pipeline::
+
+ aws datapipeline get-pipeline-definition --pipeline-id df-00627471SOVYZEXAMPLE
+
+The following is example output::
+
+ {
+ "parameters": [
+ {
+ "type": "AWS::S3::ObjectKey",
+ "id": "myS3OutputLoc",
+ "description": "S3 output folder"
+ },
+ {
+ "default": "s3://us-east-1.elasticmapreduce.samples/pig-apache-logs/data",
+ "type": "AWS::S3::ObjectKey",
+ "id": "myS3InputLoc",
+ "description": "S3 input folder"
+ },
+ {
+ "default": "grep -rc \"GET\" ${INPUT1_STAGING_DIR}/* > ${OUTPUT1_STAGING_DIR}/output.txt",
+ "type": "String",
+ "id": "myShellCmd",
+ "description": "Shell command to run"
+ }
+ ],
+ "objects": [
+ {
+ "type": "Ec2Resource",
+ "terminateAfter": "20 Minutes",
+ "instanceType": "t1.micro",
+ "id": "EC2ResourceObj",
+ "name": "EC2ResourceObj"
+ },
+ {
+ "name": "Default",
+ "failureAndRerunMode": "CASCADE",
+ "resourceRole": "DataPipelineDefaultResourceRole",
+ "schedule": {
+ "ref": "DefaultSchedule"
+ },
+ "role": "DataPipelineDefaultRole",
+ "scheduleType": "cron",
+ "id": "Default"
+ },
+ {
+ "directoryPath": "#{myS3OutputLoc}/#{format(@scheduledStartTime, 'YYYY-MM-dd-HH-mm-ss')}",
+ "type": "S3DataNode",
+ "id": "S3OutputLocation",
+ "name": "S3OutputLocation"
+ },
+ {
+ "directoryPath": "#{myS3InputLoc}",
+ "type": "S3DataNode",
+ "id": "S3InputLocation",
+ "name": "S3InputLocation"
+ },
+ {
+ "startAt": "FIRST_ACTIVATION_DATE_TIME",
+ "name": "Every 15 minutes",
+ "period": "15 minutes",
+ "occurrences": "4",
+ "type": "Schedule",
+ "id": "DefaultSchedule"
+ },
+ {
+ "name": "ShellCommandActivityObj",
+ "command": "#{myShellCmd}",
+ "output": {
+ "ref": "S3OutputLocation"
+ },
+ "input": {
+ "ref": "S3InputLocation"
+ },
+ "stage": "true",
+ "type": "ShellCommandActivity",
+ "id": "ShellCommandActivityObj",
+ "runsOn": {
+ "ref": "EC2ResourceObj"
+ }
+ }
+ ],
+ "values": {
+ "myS3OutputLoc": "s3://my-s3-bucket/",
+ "myS3InputLoc": "s3://us-east-1.elasticmapreduce.samples/pig-apache-logs/data",
+ "myShellCmd": "grep -rc \"GET\" ${INPUT1_STAGING_DIR}/* > ${OUTPUT1_STAGING_DIR}/output.txt"
+ }
+ }
diff -Nru awscli-1.9.9/awscli/examples/datapipeline/list-pipelines.rst awscli-1.10.1/awscli/examples/datapipeline/list-pipelines.rst
--- awscli-1.9.9/awscli/examples/datapipeline/list-pipelines.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/datapipeline/list-pipelines.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,28 +1,28 @@
-**To list your pipelines**
-
-This example lists your pipelines::
-
- aws datapipeline list-pipelines
-
-The following is example output::
-
- {
- "pipelineIdList": [
- {
- "id": "df-00627471SOVYZEXAMPLE",
- "name": "my-pipeline"
- },
- {
- "id": "df-09028963KNVMREXAMPLE",
- "name": "ImportDDB"
- },
- {
- "id": "df-0870198233ZYVEXAMPLE",
- "name": "CrossRegionDDB"
- },
- {
- "id": "df-00189603TB4MZEXAMPLE",
- "name": "CopyRedshift"
- }
- ]
- }
+**To list your pipelines**
+
+This example lists your pipelines::
+
+ aws datapipeline list-pipelines
+
+The following is example output::
+
+ {
+ "pipelineIdList": [
+ {
+ "id": "df-00627471SOVYZEXAMPLE",
+ "name": "my-pipeline"
+ },
+ {
+ "id": "df-09028963KNVMREXAMPLE",
+ "name": "ImportDDB"
+ },
+ {
+ "id": "df-0870198233ZYVEXAMPLE",
+ "name": "CrossRegionDDB"
+ },
+ {
+ "id": "df-00189603TB4MZEXAMPLE",
+ "name": "CopyRedshift"
+ }
+ ]
+ }
diff -Nru awscli-1.9.9/awscli/examples/datapipeline/list-runs.rst awscli-1.10.1/awscli/examples/datapipeline/list-runs.rst
--- awscli-1.9.9/awscli/examples/datapipeline/list-runs.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/datapipeline/list-runs.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,17 +1,17 @@
-**To list your pipeline runs**
-
-This example lists the runs for the specified pipeline::
-
- aws datapipeline list-runs --pipeline-id df-00627471SOVYZEXAMPLE
-
-The following is example output::
-
- Name Scheduled Start Status ID Started Ended
- -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- 1. EC2ResourceObj 2015-04-12T17:33:02 CREATING @EC2ResourceObj_2015-04-12T17:33:02 2015-04-12T17:33:10
-
- 2. S3InputLocation 2015-04-12T17:33:02 FINISHED @S3InputLocation_2015-04-12T17:33:02 2015-04-12T17:33:09 2015-04-12T17:33:09
-
- 3. S3OutputLocation 2015-04-12T17:33:02 WAITING_ON_DEPENDENCIES @S3OutputLocation_2015-04-12T17:33:02 2015-04-12T17:33:09
-
- 4. ShellCommandActivityObj 2015-04-12T17:33:02 WAITING_FOR_RUNNER @ShellCommandActivityObj_2015-04-12T17:33:02 2015-04-12T17:33:09
+**To list your pipeline runs**
+
+This example lists the runs for the specified pipeline::
+
+ aws datapipeline list-runs --pipeline-id df-00627471SOVYZEXAMPLE
+
+The following is example output::
+
+ Name Scheduled Start Status ID Started Ended
+ -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ 1. EC2ResourceObj 2015-04-12T17:33:02 CREATING @EC2ResourceObj_2015-04-12T17:33:02 2015-04-12T17:33:10
+
+ 2. S3InputLocation 2015-04-12T17:33:02 FINISHED @S3InputLocation_2015-04-12T17:33:02 2015-04-12T17:33:09 2015-04-12T17:33:09
+
+ 3. S3OutputLocation 2015-04-12T17:33:02 WAITING_ON_DEPENDENCIES @S3OutputLocation_2015-04-12T17:33:02 2015-04-12T17:33:09
+
+ 4. ShellCommandActivityObj 2015-04-12T17:33:02 WAITING_FOR_RUNNER @ShellCommandActivityObj_2015-04-12T17:33:02 2015-04-12T17:33:09
diff -Nru awscli-1.9.9/awscli/examples/datapipeline/put-pipeline-definition.rst awscli-1.10.1/awscli/examples/datapipeline/put-pipeline-definition.rst
--- awscli-1.9.9/awscli/examples/datapipeline/put-pipeline-definition.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/datapipeline/put-pipeline-definition.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,13 +1,13 @@
-**To upload a pipeline definition**
-
-This example uploads the specified pipeline definition to the specified pipeline::
-
- aws datapipeline put-pipeline-definition --pipeline-id df-00627471SOVYZEXAMPLE --pipeline-definition file://my-pipeline-definition.json
-
-The following is example output::
-
- {
- "validationErrors": [],
- "errored": false,
- "validationWarnings": []
- }
+**To upload a pipeline definition**
+
+This example uploads the specified pipeline definition to the specified pipeline::
+
+ aws datapipeline put-pipeline-definition --pipeline-id df-00627471SOVYZEXAMPLE --pipeline-definition file://my-pipeline-definition.json
+
+The following is example output::
+
+ {
+ "validationErrors": [],
+ "errored": false,
+ "validationWarnings": []
+ }
diff -Nru awscli-1.9.9/awscli/examples/datapipeline/remove-tags.rst awscli-1.10.1/awscli/examples/datapipeline/remove-tags.rst
--- awscli-1.9.9/awscli/examples/datapipeline/remove-tags.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/datapipeline/remove-tags.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,5 +1,5 @@
-**To remove a tag from a pipeline**
-
-This example removes the specified tag from the specified pipeline::
-
- aws datapipeline remove-tags --pipeline-id df-00627471SOVYZEXAMPLE --tag-keys environment
+**To remove a tag from a pipeline**
+
+This example removes the specified tag from the specified pipeline::
+
+ aws datapipeline remove-tags --pipeline-id df-00627471SOVYZEXAMPLE --tag-keys environment
diff -Nru awscli-1.9.9/awscli/examples/ec2/allocate-hosts.rst awscli-1.10.1/awscli/examples/ec2/allocate-hosts.rst
--- awscli-1.9.9/awscli/examples/ec2/allocate-hosts.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ec2/allocate-hosts.rst 2016-01-28 22:38:12.000000000 +0000
@@ -0,0 +1,17 @@
+**To allocate a Dedicated host to your account**
+
+This example allocates a single Dedicated host in a specific Availability Zone, onto which you can launch m3.medium instances, to your account.
+
+Command::
+
+ aws ec2 allocate-hosts --instance-type m3.medium --availability-zone us-east-1b --quantity 1
+
+Output::
+
+ {
+ "HostIds": [
+ "h-029e7409a337631f"
+ ]
+ }
+
+
diff -Nru awscli-1.9.9/awscli/examples/ec2/authorize-security-group-egress.rst awscli-1.10.1/awscli/examples/ec2/authorize-security-group-egress.rst
--- awscli-1.9.9/awscli/examples/ec2/authorize-security-group-egress.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ec2/authorize-security-group-egress.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,15 +1,15 @@
-**To add a rule that allows outbound traffic to a specific address range**
-
-This example command adds a rule that grants access to the specified address ranges on TCP port 80.
-
-Command::
-
- aws ec2 authorize-security-group-egress --group-id sg-1a2b3c4d --protocol tcp --port 80 --cidr 203.0.113.0/24
-
-**To add a rule that allows outbound traffic to a specific security group**
-
-This example command adds a rule that grants access to the specified security group on TCP port 80.
-
-Command::
-
- aws ec2 authorize-security-group-egress --group-id sg-1a2b3c4d --protocol tcp --port 80 --source-group sg-9a8d7f5c
+**To add a rule that allows outbound traffic to a specific address range**
+
+This example command adds a rule that grants access to the specified address ranges on TCP port 80.
+
+Command::
+
+ aws ec2 authorize-security-group-egress --group-id sg-1a2b3c4d --ip-permissions '[{"IpProtocol": "tcp", "FromPort": 80, "ToPort": 80, "IpRanges": [{"CidrIp": "10.0.0.0/16"}]}]'
+
+**To add a rule that allows outbound traffic to a specific security group**
+
+This example command adds a rule that grants access to the specified security group on TCP port 80.
+
+Command::
+
+ aws ec2 authorize-security-group-egress --group-id sg-1a2b3c4d --ip-permissions '[{"IpProtocol": "tcp", "FromPort": 80, "ToPort": 80, "UserIdGroupPairs": [{"GroupId": "sg-4b51a32f"}]}]'
diff -Nru awscli-1.9.9/awscli/examples/ec2/create-nat-gateway.rst awscli-1.10.1/awscli/examples/ec2/create-nat-gateway.rst
--- awscli-1.9.9/awscli/examples/ec2/create-nat-gateway.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ec2/create-nat-gateway.rst 2016-01-28 22:38:12.000000000 +0000
@@ -0,0 +1,24 @@
+**To create a NAT gateway**
+
+This example creates a NAT gateway in subnet ``subnet-1a2b3c4d`` and associates an Elastic IP address with the allocation ID ``eipalloc-37fc1a52`` with the NAT gateway.
+
+Command::
+
+ aws ec2 create-nat-gateway --subnet-id subnet-1a2b3c4d --allocation-id eipalloc-37fc1a52
+
+Output::
+
+ {
+ "NatGateway": {
+ "NatGatewayAddresses": [
+ {
+ "AllocationId": "eipalloc-37fc1a52"
+ }
+ ],
+ "VpcId": "vpc-1122aabb",
+ "State": "pending",
+ "NatGatewayId": "nat-08d48af2a8e83edfd",
+ "SubnetId": "subnet-1a2b3c4d",
+ "CreateTime": "2015-12-17T12:45:26.732Z"
+ }
+ }
\ No newline at end of file
diff -Nru awscli-1.9.9/awscli/examples/ec2/create-placement-group.rst awscli-1.10.1/awscli/examples/ec2/create-placement-group.rst
--- awscli-1.9.9/awscli/examples/ec2/create-placement-group.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ec2/create-placement-group.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,7 +1,7 @@
-**To create a placement group**
-
-This example command creates a placement group with the specified name.
-
-Command::
-
- aws ec2 create-placement-group --group-name my-cluster --strategy cluster
+**To create a placement group**
+
+This example command creates a placement group with the specified name.
+
+Command::
+
+ aws ec2 create-placement-group --group-name my-cluster --strategy cluster
diff -Nru awscli-1.9.9/awscli/examples/ec2/delete-nat-gateway.rst awscli-1.10.1/awscli/examples/ec2/delete-nat-gateway.rst
--- awscli-1.9.9/awscli/examples/ec2/delete-nat-gateway.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ec2/delete-nat-gateway.rst 2016-01-28 22:38:12.000000000 +0000
@@ -0,0 +1,13 @@
+**To delete a NAT gateway**
+
+This example deletes NAT gateway ``nat-04ae55e711cec5680``.
+
+Command::
+
+ aws ec2 delete-nat-gateway --nat-gateway-id nat-04ae55e711cec5680
+
+Output::
+
+ {
+ "NatGatewayId": "nat-04ae55e711cec5680"
+ }
diff -Nru awscli-1.9.9/awscli/examples/ec2/delete-placement-group.rst awscli-1.10.1/awscli/examples/ec2/delete-placement-group.rst
--- awscli-1.9.9/awscli/examples/ec2/delete-placement-group.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ec2/delete-placement-group.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,7 +1,7 @@
-**To delete a placement group**
-
-This example command deletes the specified placement group.
-
-Command::
-
- aws ec2 delete-placement-group --group-name my-cluster
+**To delete a placement group**
+
+This example command deletes the specified placement group.
+
+Command::
+
+ aws ec2 delete-placement-group --group-name my-cluster
diff -Nru awscli-1.9.9/awscli/examples/ec2/describe-hosts.rst awscli-1.10.1/awscli/examples/ec2/describe-hosts.rst
--- awscli-1.9.9/awscli/examples/ec2/describe-hosts.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ec2/describe-hosts.rst 2016-01-28 22:38:12.000000000 +0000
@@ -0,0 +1,61 @@
+**To describe Dedicated hosts in your account and generate a machine-readable list**
+
+To output a list of Dedicated host IDs in JSON (comma separated).
+
+Command::
+
+ aws ec2 describe-hosts --query 'Hosts[].HostId' --output json
+
+Output::
+
+ [
+ "h-085664df5899941c",
+ "h-056c1b0724170dc38"
+ ]
+
+To output a list of Dedicated host IDs in plaintext (comma separated).
+
+Command::
+
+ aws ec2 describe-hosts --query 'Hosts[].HostId' --output text
+
+Output::
+h-085664df5899941c
+h-056c1b0724170dc38
+
+**To describe available Dedicated hosts in your account**
+
+Command::
+
+ aws ec2 describe-hosts --filter "Name=state,Values=available"
+
+Output::
+
+ {
+ "Hosts": [
+ {
+ "HostId": "h-085664df5899941c"
+ "HostProperties: {
+ "Cores": 20,
+ "Sockets": 2,
+ "InstanceType": "m3.medium".
+ "TotalVCpus": 32
+ },
+ "Instances": [],
+ "State": "available",
+ "AvailabilityZone": "us-east-1b",
+ "AvailableCapacity": {
+ "AvailableInstanceCapacity": [
+ {
+ "AvailableCapacity": 32,
+ "InstanceType": "m3.medium",
+ "TotalCapacity": 32
+ }
+ ],
+ "AvailableVCpus": 32
+ },
+ "AutoPlacement": "off"
+ }
+ ]
+ }
+
diff -Nru awscli-1.9.9/awscli/examples/ec2/describe-id-format.rst awscli-1.10.1/awscli/examples/ec2/describe-id-format.rst
--- awscli-1.9.9/awscli/examples/ec2/describe-id-format.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ec2/describe-id-format.rst 2016-01-28 22:38:13.000000000 +0000
@@ -0,0 +1,24 @@
+**To describe the ID format for your resources**
+
+This example describes the ID format for all resource types that support longer IDs. The output indicates that the ``instance`` and ``reservation`` resource types can be enabled or disabled for longer IDs. The ``reservation`` resource is already enabled. The ``Deadline`` field indicates the date (in UTC) at which you're automatically switched over to using longer IDs for that resource type. If a deadline is not yet available for the resource type, this value is not returned.
+
+Command::
+
+ aws ec2 describe-id-format
+
+Output::
+
+ {
+ "Statuses": [
+ {
+ "Deadline": "2016-11-01T13:00:00.000Z",
+ "UseLongIds": false,
+ "Resource": "instance"
+ },
+ {
+ "Deadline": "2016-11-01T13:00:00.000Z",
+ "UseLongIds": true,
+ "Resource": "reservation"
+ }
+ ]
+ }
\ No newline at end of file
diff -Nru awscli-1.9.9/awscli/examples/ec2/describe-nat-gateways.rst awscli-1.10.1/awscli/examples/ec2/describe-nat-gateways.rst
--- awscli-1.9.9/awscli/examples/ec2/describe-nat-gateways.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ec2/describe-nat-gateways.rst 2016-01-28 22:38:12.000000000 +0000
@@ -0,0 +1,45 @@
+**To describe your NAT gateways**
+
+This example describes all of your NAT gateways.
+
+Command::
+
+ aws ec2 describe-nat-gateways
+
+Output::
+
+ {
+ "NatGateways": [
+ {
+ "NatGatewayAddresses": [
+ {
+ "PublicIp": "198.11.222.333",
+ "NetworkInterfaceId": "eni-9dec76cd",
+ "AllocationId": "eipalloc-89c620ec",
+ "PrivateIp": "10.0.0.149"
+ }
+ ],
+ "VpcId": "vpc-1a2b3c4d",
+ "State": "available",
+ "NatGatewayId": "nat-05dba92075d71c408",
+ "SubnetId": "subnet-847e4dc2",
+ "CreateTime": "2015-12-01T12:26:55.983Z"
+ },
+ {
+ "NatGatewayAddresses": [
+ {
+ "PublicIp": "1.2.3.12",
+ "NetworkInterfaceId": "eni-71ec7621",
+ "AllocationId": "eipalloc-5d42583f",
+ "PrivateIp": "10.0.0.77"
+ }
+ ],
+ "VpcId": "vpc-11aa22bb",
+ "State": "deleting",
+ "NatGatewayId": "nat-0a93acc57881d4199",
+ "SubnetId": "subnet-7f7e4d39",
+ "DeleteTime": "2015-12-17T12:26:14.564Z",
+ "CreateTime": "2015-12-01T12:09:22.040Z"
+ }
+ ]
+ }
\ No newline at end of file
diff -Nru awscli-1.9.9/awscli/examples/ec2/describe-network-interface-attribute.rst awscli-1.10.1/awscli/examples/ec2/describe-network-interface-attribute.rst
--- awscli-1.9.9/awscli/examples/ec2/describe-network-interface-attribute.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ec2/describe-network-interface-attribute.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,76 +1,76 @@
-**To describe the attachment attribute of a network interface**
-
-This example command describes the attachment
attribute of the specified network interface.
-
-Command::
-
- aws ec2 describe-network-interface-attribute --network-interface-id eni-686ea200 --attribute attachment
-
-Output::
-
- {
- "NetworkInterfaceId": "eni-686ea200",
- "Attachment": {
- "Status": "attached",
- "DeviceIndex": 0,
- "AttachTime": "2015-05-21T20:02:20.000Z",
- "InstanceId": "i-d5652e23",
- "DeleteOnTermination": true,
- "AttachmentId": "eni-attach-43348162",
- "InstanceOwnerId": "123456789012"
- }
- }
-
-**To describe the description attribute of a network interface**
-
-This example command describes the description
attribute of the specified network interface.
-
-Command::
-
- aws ec2 describe-network-interface-attribute --network-interface-id eni-686ea200 --attribute description
-
-Output::
-
- {
- "NetworkInterfaceId": "eni-686ea200",
- "Description": {
- "Value": "My description"
- }
- }
-
-**To describe the groupSet attribute of a network interface**
-
-This example command describes the groupSet
attribute of the specified network interface.
-
-Command::
-
- aws ec2 describe-network-interface-attribute --network-interface-id eni-686ea200 --attribute groupSet
-
-Output::
-
- {
- "NetworkInterfaceId": "eni-686ea200",
- "Groups": [
- {
- "GroupName": "my-security-group",
- "GroupId": "sg-903004f8"
- }
- ]
- }
-
-**To describe the sourceDestCheck attribute of a network interface**
-
-This example command describes the sourceDestCheck
attribute of the specified network interface.
-
-Command::
-
- aws ec2 describe-network-interface-attribute --network-interface-id eni-686ea200 --attribute sourceDestCheck
-
-Output::
-
- {
- "NetworkInterfaceId": "eni-686ea200",
- "SourceDestCheck": {
- "Value": true
- }
- }
+**To describe the attachment attribute of a network interface**
+
+This example command describes the ``attachment`` attribute of the specified network interface.
+
+Command::
+
+ aws ec2 describe-network-interface-attribute --network-interface-id eni-686ea200 --attribute attachment
+
+Output::
+
+ {
+ "NetworkInterfaceId": "eni-686ea200",
+ "Attachment": {
+ "Status": "attached",
+ "DeviceIndex": 0,
+ "AttachTime": "2015-05-21T20:02:20.000Z",
+ "InstanceId": "i-d5652e23",
+ "DeleteOnTermination": true,
+ "AttachmentId": "eni-attach-43348162",
+ "InstanceOwnerId": "123456789012"
+ }
+ }
+
+**To describe the description attribute of a network interface**
+
+This example command describes the ``description`` attribute of the specified network interface.
+
+Command::
+
+ aws ec2 describe-network-interface-attribute --network-interface-id eni-686ea200 --attribute description
+
+Output::
+
+ {
+ "NetworkInterfaceId": "eni-686ea200",
+ "Description": {
+ "Value": "My description"
+ }
+ }
+
+**To describe the groupSet attribute of a network interface**
+
+This example command describes the ``groupSet`` attribute of the specified network interface.
+
+Command::
+
+ aws ec2 describe-network-interface-attribute --network-interface-id eni-686ea200 --attribute groupSet
+
+Output::
+
+ {
+ "NetworkInterfaceId": "eni-686ea200",
+ "Groups": [
+ {
+ "GroupName": "my-security-group",
+ "GroupId": "sg-903004f8"
+ }
+ ]
+ }
+
+**To describe the sourceDestCheck attribute of a network interface**
+
+This example command describes the ``sourceDestCheck`` attribute of the specified network interface.
+
+Command::
+
+ aws ec2 describe-network-interface-attribute --network-interface-id eni-686ea200 --attribute sourceDestCheck
+
+Output::
+
+ {
+ "NetworkInterfaceId": "eni-686ea200",
+ "SourceDestCheck": {
+ "Value": true
+ }
+ }
diff -Nru awscli-1.9.9/awscli/examples/ec2/describe-regions.rst awscli-1.10.1/awscli/examples/ec2/describe-regions.rst
--- awscli-1.9.9/awscli/examples/ec2/describe-regions.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ec2/describe-regions.rst 2016-01-28 22:38:12.000000000 +0000
@@ -15,36 +15,40 @@
"RegionName": "eu-west-1"
},
{
- "Endpoint": "ec2.eu-central-1.amazonaws.com",
- "RegionName": "eu-central-1"
+ "Endpoint": "ec2.ap-southeast-1.amazonaws.com",
+ "RegionName": "ap-southeast-1"
},
{
- "Endpoint": "ec2.sa-east-1.amazonaws.com",
- "RegionName": "sa-east-1"
+ "Endpoint": "ec2.ap-southeast-2.amazonaws.com",
+ "RegionName": "ap-southeast-2"
},
{
- "Endpoint": "ec2.us-east-1.amazonaws.com",
- "RegionName": "us-east-1"
+ "Endpoint": "ec2.eu-central-1.amazonaws.com",
+ "RegionName": "eu-central-1"
+ },
+ {
+ "Endpoint": "ec2.ap-northeast-2.amazonaws.com",
+ "RegionName": "ap-northeast-2"
},
{
"Endpoint": "ec2.ap-northeast-1.amazonaws.com",
"RegionName": "ap-northeast-1"
},
{
- "Endpoint": "ec2.us-west-2.amazonaws.com",
- "RegionName": "us-west-2"
+ "Endpoint": "ec2.us-east-1.amazonaws.com",
+ "RegionName": "us-east-1"
},
{
- "Endpoint": "ec2.us-west-1.amazonaws.com",
- "RegionName": "us-west-1"
+ "Endpoint": "ec2.sa-east-1.amazonaws.com",
+ "RegionName": "sa-east-1"
},
{
- "Endpoint": "ec2.ap-southeast-1.amazonaws.com",
- "RegionName": "ap-southeast-1"
+ "Endpoint": "ec2.us-west-1.amazonaws.com",
+ "RegionName": "us-west-1"
},
{
- "Endpoint": "ec2.ap-southeast-2.amazonaws.com",
- "RegionName": "ap-southeast-2"
+ "Endpoint": "ec2.us-west-2.amazonaws.com",
+ "RegionName": "us-west-2"
}
]
}
diff -Nru awscli-1.9.9/awscli/examples/ec2/describe-spot-fleet-instances.rst awscli-1.10.1/awscli/examples/ec2/describe-spot-fleet-instances.rst
--- awscli-1.9.9/awscli/examples/ec2/describe-spot-fleet-instances.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ec2/describe-spot-fleet-instances.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,21 +1,21 @@
-**To describe the Spot Instances associated with a Spot fleet**
-
-This example command lists the Spot instances associated with the specified Spot fleet.
-
-Command::
-
- aws ec2 describe-spot-fleet-instances --spot-fleet-request-id sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE
-
-Output::
-
- {
- "ActiveInstances": [
- {
- "InstanceId": "i-3852c1cf",
- "InstanceType": "m3.medium",
- "SpotInstanceRequestId": "sir-08b93456"
- },
- ...
- ],
- "SpotFleetRequestId": "sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE"
- }
+**To describe the Spot Instances associated with a Spot fleet**
+
+This example command lists the Spot instances associated with the specified Spot fleet.
+
+Command::
+
+ aws ec2 describe-spot-fleet-instances --spot-fleet-request-id sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE
+
+Output::
+
+ {
+ "ActiveInstances": [
+ {
+ "InstanceId": "i-3852c1cf",
+ "InstanceType": "m3.medium",
+ "SpotInstanceRequestId": "sir-08b93456"
+ },
+ ...
+ ],
+ "SpotFleetRequestId": "sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE"
+ }
diff -Nru awscli-1.9.9/awscli/examples/ec2/describe-spot-fleet-request-history.rst awscli-1.10.1/awscli/examples/ec2/describe-spot-fleet-request-history.rst
--- awscli-1.9.9/awscli/examples/ec2/describe-spot-fleet-request-history.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ec2/describe-spot-fleet-request-history.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,49 +1,49 @@
-**To describe Spot fleet history**
-
-This example command returns the history for the specified Spot fleet starting at the specified time.
-
-Command::
-
- aws ec2 describe-spot-fleet-request-history --spot-fleet-request-id sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE --start-time 2015-05-26T00:00:00Z
-
-The following example output shows the successful launches of two Spot Instances for the Spot fleet.
-
-Output::
-
- {
- "HistoryRecords": [
- {
- "Timestamp": "2015-05-26T23:17:20.697Z",
- "EventInformation": {
- "EventSubType": "submitted"
- },
- "EventType": "fleetRequestChange"
- },
- {
- "Timestamp": "2015-05-26T23:17:20.873Z",
- "EventInformation": {
- "EventSubType": "active"
- },
- "EventType": "fleetRequestChange"
- },
- {
- "Timestamp": "2015-05-26T23:21:21.712Z",
- "EventInformation": {
- "InstanceId": "i-3a52c1cd",
- "EventSubType": "launched"
- },
- "EventType": "instanceChange"
- },
- {
- "Timestamp": "2015-05-26T23:21:21.816Z",
- "EventInformation": {
- "InstanceId": "i-3852c1cf",
- "EventSubType": "launched"
- },
- "EventType": "instanceChange"
- }
- ],
- "SpotFleetRequestId": "sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE",
- "NextToken": "CpHNsscimcV5oH7bSbub03CI2Qms5+ypNpNm+53MNlR0YcXAkp0xFlfKf91yVxSExmbtma3awYxMFzNA663ZskT0AHtJ6TCb2Z8bQC2EnZgyELbymtWPfpZ1ZbauVg+P+TfGlWxWWB/Vr5dk5d4LfdgA/DRAHUrYgxzrEXAMPLE=",
- "StartTime": "2015-05-26T00:00:00Z"
- }
+**To describe Spot fleet history**
+
+This example command returns the history for the specified Spot fleet starting at the specified time.
+
+Command::
+
+ aws ec2 describe-spot-fleet-request-history --spot-fleet-request-id sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE --start-time 2015-05-26T00:00:00Z
+
+The following example output shows the successful launches of two Spot Instances for the Spot fleet.
+
+Output::
+
+ {
+ "HistoryRecords": [
+ {
+ "Timestamp": "2015-05-26T23:17:20.697Z",
+ "EventInformation": {
+ "EventSubType": "submitted"
+ },
+ "EventType": "fleetRequestChange"
+ },
+ {
+ "Timestamp": "2015-05-26T23:17:20.873Z",
+ "EventInformation": {
+ "EventSubType": "active"
+ },
+ "EventType": "fleetRequestChange"
+ },
+ {
+ "Timestamp": "2015-05-26T23:21:21.712Z",
+ "EventInformation": {
+ "InstanceId": "i-3a52c1cd",
+ "EventSubType": "launched"
+ },
+ "EventType": "instanceChange"
+ },
+ {
+ "Timestamp": "2015-05-26T23:21:21.816Z",
+ "EventInformation": {
+ "InstanceId": "i-3852c1cf",
+ "EventSubType": "launched"
+ },
+ "EventType": "instanceChange"
+ }
+ ],
+ "SpotFleetRequestId": "sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE",
+ "NextToken": "CpHNsscimcV5oH7bSbub03CI2Qms5+ypNpNm+53MNlR0YcXAkp0xFlfKf91yVxSExmbtma3awYxMFzNA663ZskT0AHtJ6TCb2Z8bQC2EnZgyELbymtWPfpZ1ZbauVg+P+TfGlWxWWB/Vr5dk5d4LfdgA/DRAHUrYgxzrEXAMPLE=",
+ "StartTime": "2015-05-26T00:00:00Z"
+ }
diff -Nru awscli-1.9.9/awscli/examples/ec2/describe-subnets.rst awscli-1.10.1/awscli/examples/ec2/describe-subnets.rst
--- awscli-1.9.9/awscli/examples/ec2/describe-subnets.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ec2/describe-subnets.rst 2016-01-28 22:38:12.000000000 +0000
@@ -57,3 +57,16 @@
}
]
}
+
+**To describe subnets with a specific tag**
+
+This example lists subnets with the tag ``Name=MySubnet`` and returns the output in text format.
+
+Command::
+
+ aws ec2 describe-subnets --filters Name=tag:Name,Values=MySubnet --output text
+
+Output::
+
+ SUBNETS us-east-1a 251 10.0.1.0/24 False False available subnet-1a2b3c4d vpc-11223344
+ TAGS Name MySubnet
\ No newline at end of file
diff -Nru awscli-1.9.9/awscli/examples/ec2/describe-vpc-classic-link-dns-support.rst awscli-1.10.1/awscli/examples/ec2/describe-vpc-classic-link-dns-support.rst
--- awscli-1.9.9/awscli/examples/ec2/describe-vpc-classic-link-dns-support.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ec2/describe-vpc-classic-link-dns-support.rst 2016-01-28 22:38:13.000000000 +0000
@@ -0,0 +1,22 @@
+**To describe ClassicLink DNS support for your VPCs**
+
+This example describes the ClassicLink DNS support status of all of your VPCs.
+
+Command::
+
+ aws ec2 describe-vpc-classic-link-dns-support
+
+Output::
+
+ {
+ "Vpcs": [
+ {
+ "VpcId": "vpc-88888888",
+ "ClassicLinkDnsSupported": true
+ },
+ {
+ "VpcId": "vpc-1a2b3c4d",
+ "ClassicLinkDnsSupported": false
+ }
+ ]
+ }
\ No newline at end of file
diff -Nru awscli-1.9.9/awscli/examples/ec2/describe-vpn-gateways.rst awscli-1.10.1/awscli/examples/ec2/describe-vpn-gateways.rst
--- awscli-1.9.9/awscli/examples/ec2/describe-vpn-gateways.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ec2/describe-vpn-gateways.rst 2016-01-28 22:38:13.000000000 +0000
@@ -4,7 +4,7 @@
Command::
- aws ec2 describe-virtual-private-gateways
+ aws ec2 describe-vpn-gateways
Output::
diff -Nru awscli-1.9.9/awscli/examples/ec2/detach-vpn-gateway.rst awscli-1.10.1/awscli/examples/ec2/detach-vpn-gateway.rst
--- awscli-1.9.9/awscli/examples/ec2/detach-vpn-gateway.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ec2/detach-vpn-gateway.rst 2016-01-28 22:38:13.000000000 +0000
@@ -4,4 +4,4 @@
Command::
- aws ec2 detach-internet-gateway --vpn-gateway-id vgw-9a4cacf3 --vpc-id vpc-a01106c2
+ aws ec2 detach-vpn-gateway --vpn-gateway-id vgw-9a4cacf3 --vpc-id vpc-a01106c2
diff -Nru awscli-1.9.9/awscli/examples/ec2/disable-vpc-classic-link-dns-support.rst awscli-1.10.1/awscli/examples/ec2/disable-vpc-classic-link-dns-support.rst
--- awscli-1.9.9/awscli/examples/ec2/disable-vpc-classic-link-dns-support.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ec2/disable-vpc-classic-link-dns-support.rst 2016-01-28 22:38:12.000000000 +0000
@@ -0,0 +1,13 @@
+**To disable ClassicLink DNS support for a VPC**
+
+This example disables ClassicLink DNS support for ``vpc-88888888``.
+
+Command::
+
+ aws ec2 disable-vpc-classic-link-dns-support --vpc-id vpc-88888888
+
+Output::
+
+ {
+ "Return": true
+ }
\ No newline at end of file
diff -Nru awscli-1.9.9/awscli/examples/ec2/enable-vpc-classic-link-dns-support.rst awscli-1.10.1/awscli/examples/ec2/enable-vpc-classic-link-dns-support.rst
--- awscli-1.9.9/awscli/examples/ec2/enable-vpc-classic-link-dns-support.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ec2/enable-vpc-classic-link-dns-support.rst 2016-01-28 22:38:12.000000000 +0000
@@ -0,0 +1,13 @@
+**To enable ClassicLink DNS support for a VPC**
+
+This example enables ClassicLink DNS support for ``vpc-88888888``.
+
+Command::
+
+ aws ec2 enable-vpc-classic-link-dns-support --vpc-id vpc-88888888
+
+Output::
+
+ {
+ "Return": true
+ }
\ No newline at end of file
diff -Nru awscli-1.9.9/awscli/examples/ec2/import-key-pair.rst awscli-1.10.1/awscli/examples/ec2/import-key-pair.rst
--- awscli-1.9.9/awscli/examples/ec2/import-key-pair.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ec2/import-key-pair.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,26 +1,26 @@
-**To import a public key**
-
-First, generate a key pair with the tool of your choice. For example, use this OpenSSL command:
-
-Command::
-
- openssl genrsa -out my-key.pem 2048
-
-Next, save the public key to a local file. For example, use this OpenSSL command:
-
-Command::
-
- openssl rsa -in my-key.pem -pubout > my-key.pub
-
-Finally, this example command imports the specified public key. The public key is the text in the .pub file that is between -----BEGIN PUBLIC KEY-----
and -----END PUBLIC KEY-----
.
-
-Command::
-
- aws ec2 import-key-pair --key-name my-key --public-key-material MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuhrGNglwb2Zz/Qcz1zV+l12fJOnWmJxC2GMwQOjAX/L7p01o9vcLRoHXxOtcHBx0TmwMo+i85HWMUE7aJtYclVWPMOeepFmDqR1AxFhaIc9jDe88iLA07VK96wY4oNpp8+lICtgCFkuXyunsk4+KhuasN6kOpk7B2w5cUWveooVrhmJprR90FOHQB2Uhe9MkRkFjnbsA/hvZ/Ay0Cflc2CRZm/NG00lbLrV4l/SQnZmP63DJx194T6pI3vAev2+6UMWSwptNmtRZPMNADjmo50KiG2c3uiUIltiQtqdbSBMh9ztL/98AHtn88JG0s8u2uSRTNEHjG55tyuMbLD40QEXAMPLE
-
-Output::
-
- {
- "KeyName": "my-key",
- "KeyFingerprint": "1f:51:ae:28:bf:89:e9:d8:1f:25:5d:37:2d:7d:b8:ca"
+**To import a public key**
+
+First, generate a key pair with the tool of your choice. For example, use this OpenSSL command:
+
+Command::
+
+ openssl genrsa -out my-key.pem 2048
+
+Next, save the public key to a local file. For example, use this OpenSSL command:
+
+Command::
+
+ openssl rsa -in my-key.pem -pubout > my-key.pub
+
+Finally, this example command imports the specified public key. The public key is the text in the .pub file that is between ``-----BEGIN PUBLIC KEY-----`` and ``-----END PUBLIC KEY-----``.
+
+Command::
+
+ aws ec2 import-key-pair --key-name my-key --public-key-material MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuhrGNglwb2Zz/Qcz1zV+l12fJOnWmJxC2GMwQOjAX/L7p01o9vcLRoHXxOtcHBx0TmwMo+i85HWMUE7aJtYclVWPMOeepFmDqR1AxFhaIc9jDe88iLA07VK96wY4oNpp8+lICtgCFkuXyunsk4+KhuasN6kOpk7B2w5cUWveooVrhmJprR90FOHQB2Uhe9MkRkFjnbsA/hvZ/Ay0Cflc2CRZm/NG00lbLrV4l/SQnZmP63DJx194T6pI3vAev2+6UMWSwptNmtRZPMNADjmo50KiG2c3uiUIltiQtqdbSBMh9ztL/98AHtn88JG0s8u2uSRTNEHjG55tyuMbLD40QEXAMPLE
+
+Output::
+
+ {
+ "KeyName": "my-key",
+ "KeyFingerprint": "1f:51:ae:28:bf:89:e9:d8:1f:25:5d:37:2d:7d:b8:ca"
}
\ No newline at end of file
diff -Nru awscli-1.9.9/awscli/examples/ec2/modify-hosts.rst awscli-1.10.1/awscli/examples/ec2/modify-hosts.rst
--- awscli-1.9.9/awscli/examples/ec2/modify-hosts.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ec2/modify-hosts.rst 2016-01-28 22:38:12.000000000 +0000
@@ -0,0 +1,61 @@
+**To describe Dedicated hosts in your account and generate a machine-readable list**
+
+To output a list of Dedicated host IDs in JSON (comma separated).
+
+Command::
+
+ aws ec2 describe-hosts --query 'Hosts[].HostId' --output json
+
+Output::
+
+ [
+ "h-085664df5899941c",
+ "h-056c1b0724170dc38"
+ ]
+
+To output a list of Dedicated host IDs in plaintext (comma separated).
+
+Command::
+
+ aws ec2 describe-hosts --query 'Hosts[].HostId' --output text
+
+Output::
+h-085664df5899941c
+h-056c1b0724170dc38
+
+**To describe available Dedicated hosts in your account**
+
+Command::
+
+ aws ec2 describe-hosts --filter "Name=state,Values=available"
+
+Output::
+
+ {
+ "Hosts": [
+ {
+ "HostId": "h-085664df5899941c"
+ "HostProperties: {
+ "Cores": 20,
+ "Sockets": 2,
+ "InstanceType": "m3.medium".
+ "TotalVCpus": 32
+ },
+ "Instances": [],
+ "State": "available",
+ "AvailabilityZone": "us-east-1b",
+ "AvailableCapacity": {
+ "AvailableInstanceCapacity": [
+ {
+ "AvailableCapacity": 32,
+ "InstanceType": "m3.medium",
+ "TotalCapacity": 32
+ }
+ ],
+ "AvailableVCpus": 32
+ },
+ "AutoPlacement": "off"
+ }
+ ]
+ }
+
diff -Nru awscli-1.9.9/awscli/examples/ec2/modify-id-format.rst awscli-1.10.1/awscli/examples/ec2/modify-id-format.rst
--- awscli-1.9.9/awscli/examples/ec2/modify-id-format.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ec2/modify-id-format.rst 2016-01-28 22:38:13.000000000 +0000
@@ -0,0 +1,15 @@
+**To enable the longer ID format for a resource**
+
+This example enables the longer ID format for the ``instance`` resource type. If the request is successful, no output is returned.
+
+Command::
+
+ aws ec2 modify-id-format --resource instance --use-long-ids
+
+**To disable the longer ID format for a resource**
+
+This example disables the longer ID format for the ``instance`` resource type.
+
+Command::
+
+ aws ec2 modify-id-format --resource instance --no-use-long-ids
diff -Nru awscli-1.9.9/awscli/examples/ec2/modify-instance-placement.rst awscli-1.10.1/awscli/examples/ec2/modify-instance-placement.rst
--- awscli-1.9.9/awscli/examples/ec2/modify-instance-placement.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ec2/modify-instance-placement.rst 2016-01-28 22:38:12.000000000 +0000
@@ -0,0 +1,13 @@
+**To set the instance affinity value for a specific stopped Dedicated host**
+
+To modify the affinity of an instance so it always has affinity with the specified Dedicated host .
+
+Command::
+
+ aws ec2 modify-instance-placement --instance-id=i-f0d45a40 --host-id h-029e7409a3350a31f
+
+Output::
+
+ {
+ "Return": true
+ }
diff -Nru awscli-1.9.9/awscli/examples/ec2/modify-network-interface-attribute.rst awscli-1.10.1/awscli/examples/ec2/modify-network-interface-attribute.rst
--- awscli-1.9.9/awscli/examples/ec2/modify-network-interface-attribute.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ec2/modify-network-interface-attribute.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,34 +1,34 @@
-**To modify the attachment attribute of a network interface**
-
-This example command modifies the attachment
attribute of the specified network interface.
-
-Command::
-
- aws ec2 modify-network-interface-attribute --network-interface-id eni-686ea200 --attachment AttachmentId=eni-attach-43348162,DeleteOnTermination=false
-
-
-**To modify the description attribute of a network interface**
-
-This example command modifies the description
attribute of the specified network interface.
-
-Command::
-
- aws ec2 modify-network-interface-attribute --network-interface-id eni-686ea200 --description "My description"
-
-
-**To modify the groupSet attribute of a network interface**
-
-This example command modifies the groupSet
attribute of the specified network interface.
-
-Command::
-
- aws ec2 modify-network-interface-attribute --network-interface-id eni-686ea200 --groups sg-903004f8 sg-1a2b3c4d
-
-
-**To modify the sourceDestCheck attribute of a network interface**
-
-This example command modifies the sourceDestCheck
attribute of the specified network interface.
-
-Command::
-
- aws ec2 modify-network-interface-attribute --network-interface-id eni-686ea200 --no-source-dest-check
+**To modify the attachment attribute of a network interface**
+
+This example command modifies the ``attachment`` attribute of the specified network interface.
+
+Command::
+
+ aws ec2 modify-network-interface-attribute --network-interface-id eni-686ea200 --attachment AttachmentId=eni-attach-43348162,DeleteOnTermination=false
+
+
+**To modify the description attribute of a network interface**
+
+This example command modifies the ``description`` attribute of the specified network interface.
+
+Command::
+
+ aws ec2 modify-network-interface-attribute --network-interface-id eni-686ea200 --description "My description"
+
+
+**To modify the groupSet attribute of a network interface**
+
+This example command modifies the ``groupSet`` attribute of the specified network interface.
+
+Command::
+
+ aws ec2 modify-network-interface-attribute --network-interface-id eni-686ea200 --groups sg-903004f8 sg-1a2b3c4d
+
+
+**To modify the sourceDestCheck attribute of a network interface**
+
+This example command modifies the ``sourceDestCheck`` attribute of the specified network interface.
+
+Command::
+
+ aws ec2 modify-network-interface-attribute --network-interface-id eni-686ea200 --no-source-dest-check
diff -Nru awscli-1.9.9/awscli/examples/ec2/modify-spot-fleet-request.rst awscli-1.10.1/awscli/examples/ec2/modify-spot-fleet-request.rst
--- awscli-1.9.9/awscli/examples/ec2/modify-spot-fleet-request.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ec2/modify-spot-fleet-request.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,25 +1,25 @@
-**To modify a Spot fleet request**
-
-This example command updates the target capacity of the specified Spot fleet request.
-
-Command::
-
- aws ec2 modify-spot-fleet-request --target-capacity 20 --spot-fleet-request-id sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE
-
-Output::
-
- {
- "Return": true
- }
-
-This example command decreases the target capacity of the specified Spot fleet request without terminating any Spot Instances as a result.
-
-Command::
-
- aws ec2 modify-spot-fleet-request --target-capacity 10 --excess-capacity-termination-policy NoTermination --spot-fleet-request-ids sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE
-
-Output::
-
- {
- "Return": true
- }
+**To modify a Spot fleet request**
+
+This example command updates the target capacity of the specified Spot fleet request.
+
+Command::
+
+ aws ec2 modify-spot-fleet-request --target-capacity 20 --spot-fleet-request-id sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE
+
+Output::
+
+ {
+ "Return": true
+ }
+
+This example command decreases the target capacity of the specified Spot fleet request without terminating any Spot Instances as a result.
+
+Command::
+
+ aws ec2 modify-spot-fleet-request --target-capacity 10 --excess-capacity-termination-policy NoTermination --spot-fleet-request-ids sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE
+
+Output::
+
+ {
+ "Return": true
+ }
diff -Nru awscli-1.9.9/awscli/examples/ec2/monitor-instances.rst awscli-1.10.1/awscli/examples/ec2/monitor-instances.rst
--- awscli-1.9.9/awscli/examples/ec2/monitor-instances.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ec2/monitor-instances.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,20 +1,20 @@
-**To enable detailed monitoring for an instance**
-
-This example command enables detailed monitoring for the specified instance.
-
-Command::
-
- aws ec2 monitor-instances --instance-ids i-570e5a28
-
-Output::
-
- {
- "InstanceMonitorings": [
- {
- "InstanceId": "i-570e5a28",
- "Monitoring": {
- "State": "pending"
- }
- }
- ]
- }
+**To enable detailed monitoring for an instance**
+
+This example command enables detailed monitoring for the specified instance.
+
+Command::
+
+ aws ec2 monitor-instances --instance-ids i-570e5a28
+
+Output::
+
+ {
+ "InstanceMonitorings": [
+ {
+ "InstanceId": "i-570e5a28",
+ "Monitoring": {
+ "State": "pending"
+ }
+ }
+ ]
+ }
diff -Nru awscli-1.9.9/awscli/examples/ec2/release-hosts.rst awscli-1.10.1/awscli/examples/ec2/release-hosts.rst
--- awscli-1.9.9/awscli/examples/ec2/release-hosts.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ec2/release-hosts.rst 2016-01-28 22:38:12.000000000 +0000
@@ -0,0 +1,17 @@
+**To release a Dedicated host from your account**
+
+To release a Dedicated host from your account. Instances that are on the host must be stopped or terminated before the host can be released.
+
+Command::
+
+ aws ec2 release-hosts --host-id=h-0029d6e3cacf1b3da
+
+Output::
+
+ {
+ "Successful": [
+ "h-0029d6e3cacf1b3da"
+ ],
+ "Unsuccessful": []
+
+ }
diff -Nru awscli-1.9.9/awscli/examples/ec2/report-instance-status.rst awscli-1.10.1/awscli/examples/ec2/report-instance-status.rst
--- awscli-1.9.9/awscli/examples/ec2/report-instance-status.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ec2/report-instance-status.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,7 +1,7 @@
-**To report status feedback for an instance**
-
-This example command reports status feedback for the specified instance.
-
-Command::
-
- aws ec2 report-instance-status --instances i-570e5a28 --status impaired --reason-codes unresponsive
+**To report status feedback for an instance**
+
+This example command reports status feedback for the specified instance.
+
+Command::
+
+ aws ec2 report-instance-status --instances i-570e5a28 --status impaired --reason-codes unresponsive
diff -Nru awscli-1.9.9/awscli/examples/ec2/request-spot-fleet.rst awscli-1.10.1/awscli/examples/ec2/request-spot-fleet.rst
--- awscli-1.9.9/awscli/examples/ec2/request-spot-fleet.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ec2/request-spot-fleet.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,187 +1,187 @@
-**To request a Spot fleet in the subnet with the lowest price**
-
-This example command creates a Spot fleet request with two launch specifications that differ only by subnet.
-The Spot fleet launches the instances in the specified subnet with the lowest price.
-If the instances are launched in a default VPC, they receive a public IP address by default.
-If the instances are launched in a nondefault VPC, they do not receive a public IP address by default.
-
-Note that you can't specify different subnets from the same Availability Zone in a Spot fleet request.
-
-Command::
-
- aws ec2 request-spot-fleet --spot-fleet-request-config file://config.json
-
-Config.json::
-
- {
- "SpotPrice": "0.04",
- "TargetCapacity": 2,
- "IamFleetRole": "arn:aws:iam::123456789012:role/my-spot-fleet-role",
- "LaunchSpecifications": [
- {
- "ImageId": "ami-1a2b3c4d",
- "KeyName": "my-key-pair",
- "SecurityGroups": [
- {
- "GroupId": "sg-1a2b3c4d"
- }
- ],
- "InstanceType": "m3.medium",
- "SubnetId": "subnet-1a2b3c4d",
- "IamInstanceProfile": {
- "Arn": "arn:aws:iam::123456789012:instance-profile/my-iam-role"
- }
- },
- {
- "ImageId": "ami-1a2b3c4d",
- "KeyName": "my-key-pair",
- "SecurityGroups": [
- {
- "GroupId": "sg-1a2b3c4d"
- }
- ],
- "InstanceType": "m3.medium",
- "SubnetId": "subnet-3c4d5e6f",
- "IamInstanceProfile": {
- "Arn": "arn:aws:iam::123456789012:instance-profile/my-iam-role"
- }
- }
- ]
- }
-
-Output::
-
- {
- "SpotFleetRequestId": "sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE"
- }
-
-
-**To request a Spot fleet in the Availability Zone with the lowest price**
-
-This example command creates a Spot fleet request with two launch specifications that differ only by Availability Zone.
-The Spot fleet launches the instances in the specified Availability Zone with the lowest price.
-If your account supports EC2-VPC only, Amazon EC2 launches the Spot instances in the default subnet of the Availability Zone.
-If your account supports EC2-Classic, Amazon EC2 launches the instances in EC2-Classic in the Availability Zone.
-
-Command::
-
- aws ec2 request-spot-fleet --spot-fleet-request-config file://config.json
-
-Config.json::
-
- {
- "SpotPrice": "0.04",
- "TargetCapacity": 2,
- "IamFleetRole": "arn:aws:iam::123456789012:role/my-spot-fleet-role",
- "LaunchSpecifications": [
- {
- "ImageId": "ami-1a2b3c4d",
- "KeyName": "my-key-pair",
- "SecurityGroups": [
- {
- "GroupId": "sg-1a2b3c4d"
- }
- ],
- "InstanceType": "m3.medium",
- "Placement": {
- "AvailabilityZone": "us-west-2a"
- },
- "IamInstanceProfile": {
- "Arn": "arn:aws:iam::123456789012:instance-profile/my-iam-role"
- }
- },
- {
- "ImageId": "ami-1a2b3c4d",
- "KeyName": "my-key-pair",
- "SecurityGroups": [
- {
- "GroupId": "sg-1a2b3c4d"
- }
- ],
- "InstanceType": "m3.medium",
- "Placement": {
- "AvailabilityZone": "us-west-2b"
- },
- "IamInstanceProfile": {
- "Arn": "arn:aws:iam::123456789012:instance-profile/my-iam-role"
- }
- }
- ]
- }
-
-**To launch Spot instances in a subnet and assign them public IP addresses**
-
-This example command assigns public addresses to instances launched in a nondefault VPC.
-Note that when you specify a network interface, you must include the subnet ID and security group ID
-using the network interface.
-
-Command::
-
- aws ec2 request-spot-fleet --spot-fleet-request-config file://config.json
-
-Config.json::
-
- {
- "SpotPrice": "0.04",
- "TargetCapacity": 2,
- "IamFleetRole": "arn:aws:iam::123456789012:role/my-spot-fleet-role",
- "LaunchSpecifications": [
- {
- "ImageId": "ami-1a2b3c4d",
- "KeyName": "my-key-pair",
- "InstanceType": "m3.medium",
- "NetworkInterfaces": [
- {
- "DeviceIndex": 0,
- "SubnetId": "subnet-1a2b3c4d",
- "Groups": [ "sg-1a2b3c4d" ],
- "AssociatePublicIpAddress": true
- }
- ],
- "IamInstanceProfile": {
- "Arn": "arn:aws:iam::880185128111:instance-profile/my-iam-role"
- }
- }
- ]
- }
-
-**To request a Spot fleet using the diversified allocation strategy**
-
-This example command creates a Spot fleet request that launches 30 instances using the diversified allocation strategy.
-The launch specifications differ by instance type. The Spot fleet distributes the instances
-across the launch specifications such that there are 10 instances of each type.
-
-Command::
-
- aws ec2 request-spot-fleet --spot-fleet-request-config file://config.json
-
-Config.json::
-
- {
- "SpotPrice": "0.70",
- "TargetCapacity": 30,
- "AllocationStrategy": "diversified",
- "IamFleetRole": "arn:aws:iam::123456789012:role/my-spot-fleet-role",
- "LaunchSpecifications": [
- {
- "ImageId": "ami-1a2b3c4d",
- "InstanceType": "c4.2xlarge",
- "SubnetId": "subnet-1a2b3c4d"
- },
- {
- "ImageId": "ami-1a2b3c4d",
- "InstanceType": "m3.2xlarge",
- "SubnetId": "subnet-1a2b3c4d"
- },
- {
- "ImageId": "ami-1a2b3c4d",
- "InstanceType": "r3.2xlarge",
- "SubnetId": "subnet-1a2b3c4d"
- }
- ]
- }
-
-For more information, see `Spot Fleet Requests`_ in the *Amazon Elastic Compute Cloud User Guide*.
-
-.. _`Spot Fleets`: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-fleet-requests.html
-
+**To request a Spot fleet in the subnet with the lowest price**
+
+This example command creates a Spot fleet request with two launch specifications that differ only by subnet.
+The Spot fleet launches the instances in the specified subnet with the lowest price.
+If the instances are launched in a default VPC, they receive a public IP address by default.
+If the instances are launched in a nondefault VPC, they do not receive a public IP address by default.
+
+Note that you can't specify different subnets from the same Availability Zone in a Spot fleet request.
+
+Command::
+
+ aws ec2 request-spot-fleet --spot-fleet-request-config file://config.json
+
+Config.json::
+
+ {
+ "SpotPrice": "0.04",
+ "TargetCapacity": 2,
+ "IamFleetRole": "arn:aws:iam::123456789012:role/my-spot-fleet-role",
+ "LaunchSpecifications": [
+ {
+ "ImageId": "ami-1a2b3c4d",
+ "KeyName": "my-key-pair",
+ "SecurityGroups": [
+ {
+ "GroupId": "sg-1a2b3c4d"
+ }
+ ],
+ "InstanceType": "m3.medium",
+ "SubnetId": "subnet-1a2b3c4d",
+ "IamInstanceProfile": {
+ "Arn": "arn:aws:iam::123456789012:instance-profile/my-iam-role"
+ }
+ },
+ {
+ "ImageId": "ami-1a2b3c4d",
+ "KeyName": "my-key-pair",
+ "SecurityGroups": [
+ {
+ "GroupId": "sg-1a2b3c4d"
+ }
+ ],
+ "InstanceType": "m3.medium",
+ "SubnetId": "subnet-3c4d5e6f",
+ "IamInstanceProfile": {
+ "Arn": "arn:aws:iam::123456789012:instance-profile/my-iam-role"
+ }
+ }
+ ]
+ }
+
+Output::
+
+ {
+ "SpotFleetRequestId": "sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE"
+ }
+
+
+**To request a Spot fleet in the Availability Zone with the lowest price**
+
+This example command creates a Spot fleet request with two launch specifications that differ only by Availability Zone.
+The Spot fleet launches the instances in the specified Availability Zone with the lowest price.
+If your account supports EC2-VPC only, Amazon EC2 launches the Spot instances in the default subnet of the Availability Zone.
+If your account supports EC2-Classic, Amazon EC2 launches the instances in EC2-Classic in the Availability Zone.
+
+Command::
+
+ aws ec2 request-spot-fleet --spot-fleet-request-config file://config.json
+
+Config.json::
+
+ {
+ "SpotPrice": "0.04",
+ "TargetCapacity": 2,
+ "IamFleetRole": "arn:aws:iam::123456789012:role/my-spot-fleet-role",
+ "LaunchSpecifications": [
+ {
+ "ImageId": "ami-1a2b3c4d",
+ "KeyName": "my-key-pair",
+ "SecurityGroups": [
+ {
+ "GroupId": "sg-1a2b3c4d"
+ }
+ ],
+ "InstanceType": "m3.medium",
+ "Placement": {
+ "AvailabilityZone": "us-west-2a"
+ },
+ "IamInstanceProfile": {
+ "Arn": "arn:aws:iam::123456789012:instance-profile/my-iam-role"
+ }
+ },
+ {
+ "ImageId": "ami-1a2b3c4d",
+ "KeyName": "my-key-pair",
+ "SecurityGroups": [
+ {
+ "GroupId": "sg-1a2b3c4d"
+ }
+ ],
+ "InstanceType": "m3.medium",
+ "Placement": {
+ "AvailabilityZone": "us-west-2b"
+ },
+ "IamInstanceProfile": {
+ "Arn": "arn:aws:iam::123456789012:instance-profile/my-iam-role"
+ }
+ }
+ ]
+ }
+
+**To launch Spot instances in a subnet and assign them public IP addresses**
+
+This example command assigns public addresses to instances launched in a nondefault VPC.
+Note that when you specify a network interface, you must include the subnet ID and security group ID
+using the network interface.
+
+Command::
+
+ aws ec2 request-spot-fleet --spot-fleet-request-config file://config.json
+
+Config.json::
+
+ {
+ "SpotPrice": "0.04",
+ "TargetCapacity": 2,
+ "IamFleetRole": "arn:aws:iam::123456789012:role/my-spot-fleet-role",
+ "LaunchSpecifications": [
+ {
+ "ImageId": "ami-1a2b3c4d",
+ "KeyName": "my-key-pair",
+ "InstanceType": "m3.medium",
+ "NetworkInterfaces": [
+ {
+ "DeviceIndex": 0,
+ "SubnetId": "subnet-1a2b3c4d",
+ "Groups": [ "sg-1a2b3c4d" ],
+ "AssociatePublicIpAddress": true
+ }
+ ],
+ "IamInstanceProfile": {
+ "Arn": "arn:aws:iam::880185128111:instance-profile/my-iam-role"
+ }
+ }
+ ]
+ }
+
+**To request a Spot fleet using the diversified allocation strategy**
+
+This example command creates a Spot fleet request that launches 30 instances using the diversified allocation strategy.
+The launch specifications differ by instance type. The Spot fleet distributes the instances
+across the launch specifications such that there are 10 instances of each type.
+
+Command::
+
+ aws ec2 request-spot-fleet --spot-fleet-request-config file://config.json
+
+Config.json::
+
+ {
+ "SpotPrice": "0.70",
+ "TargetCapacity": 30,
+ "AllocationStrategy": "diversified",
+ "IamFleetRole": "arn:aws:iam::123456789012:role/my-spot-fleet-role",
+ "LaunchSpecifications": [
+ {
+ "ImageId": "ami-1a2b3c4d",
+ "InstanceType": "c4.2xlarge",
+ "SubnetId": "subnet-1a2b3c4d"
+ },
+ {
+ "ImageId": "ami-1a2b3c4d",
+ "InstanceType": "m3.2xlarge",
+ "SubnetId": "subnet-1a2b3c4d"
+ },
+ {
+ "ImageId": "ami-1a2b3c4d",
+ "InstanceType": "r3.2xlarge",
+ "SubnetId": "subnet-1a2b3c4d"
+ }
+ ]
+ }
+
+For more information, see `Spot Fleet Requests`_ in the *Amazon Elastic Compute Cloud User Guide*.
+
+.. _`Spot Fleet Requests`: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-fleet-requests.html
+
diff -Nru awscli-1.9.9/awscli/examples/ec2/revoke-security-group-egress.rst awscli-1.10.1/awscli/examples/ec2/revoke-security-group-egress.rst
--- awscli-1.9.9/awscli/examples/ec2/revoke-security-group-egress.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ec2/revoke-security-group-egress.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,15 +1,15 @@
-**To remove the rule that allows outbound traffic to a specific address range**
-
-This example command removes the rule that grants access to the specified address ranges on TCP port 80.
-
-Command::
-
- aws ec2 revoke-security-group-egress --group-id sg-1a2b3c4d --protocol tcp --port 80 --cidr 203.0.113.0/24
-
-**To remove the rule that allows outbound traffic to a specific security group**
-
-This example command removes the rule that grants access to the specified security group on TCP port 80.
-
-Command::
-
- aws ec2 revoke-security-group-egress --group-id sg-1a2b3c4d --protocol tcp --port 80 --source-group sg-9a8d7f5c
+**To remove the rule that allows outbound traffic to a specific address range**
+
+This example command removes the rule that grants access to the specified address ranges on TCP port 80.
+
+Command::
+
+ aws ec2 revoke-security-group-egress --group-id sg-1a2b3c4d --ip-permissions '[{"IpProtocol": "tcp", "FromPort": 80, "ToPort": 80, "IpRanges": [{"CidrIp": "10.0.0.0/16"}]}]'
+
+**To remove the rule that allows outbound traffic to a specific security group**
+
+This example command removes the rule that grants access to the specified security group on TCP port 80.
+
+Command::
+
+ aws ec2 revoke-security-group-egress --group-id sg-1a2b3c4d --ip-permissions '[{"IpProtocol": "tcp", "FromPort": 80, "ToPort": 80, "UserIdGroupPairs": [{"GroupId": "sg-4b51a32f"}]}]'
diff -Nru awscli-1.9.9/awscli/examples/ec2/run-instances.rst awscli-1.10.1/awscli/examples/ec2/run-instances.rst
--- awscli-1.9.9/awscli/examples/ec2/run-instances.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ec2/run-instances.rst 2016-01-28 22:38:13.000000000 +0000
@@ -262,6 +262,14 @@
}
]
+**To launch an instance with user data**
+
+You can launch an instance and specify user data that performs instance configuration, or that runs a script. The user data needs to be passed as normal string, base64 encoding is handled internally. The following example passes user data in a file called ``my_script.txt`` that contains a configuration script for your instance. The script runs at launch.
+
+Command::
+
+ aws ec2 run-instances --image-id ami-abc1234 --count 1 --instance-type m4.large --key-name keypair --user-data file://my_script.txt --subnet-id subnet-abcd1234 --security-group-ids sg-abcd1234
+
For more information about launching instances, see `Using Amazon EC2 Instances`_ in the *AWS Command Line Interface User Guide*.
.. _`Using Amazon EC2 Instances`: http://docs.aws.amazon.com/cli/latest/userguide/cli-ec2-launch.html
diff -Nru awscli-1.9.9/awscli/examples/ec2/unmonitor-instances.rst awscli-1.10.1/awscli/examples/ec2/unmonitor-instances.rst
--- awscli-1.9.9/awscli/examples/ec2/unmonitor-instances.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ec2/unmonitor-instances.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,20 +1,20 @@
-**To disable detailed monitoring for an instance**
-
-This example command disables detailed monitoring for the specified instance.
-
-Command::
-
- aws ec2 unmonitor-instances --instance-ids i-570e5a28
-
-Output::
-
- {
- "InstanceMonitorings": [
- {
- "InstanceId": "i-570e5a28",
- "Monitoring": {
- "State": "disabling"
- }
- }
- ]
- }
+**To disable detailed monitoring for an instance**
+
+This example command disables detailed monitoring for the specified instance.
+
+Command::
+
+ aws ec2 unmonitor-instances --instance-ids i-570e5a28
+
+Output::
+
+ {
+ "InstanceMonitorings": [
+ {
+ "InstanceId": "i-570e5a28",
+ "Monitoring": {
+ "State": "disabling"
+ }
+ }
+ ]
+ }
diff -Nru awscli-1.9.9/awscli/examples/ecr/batch-delete-image.rst awscli-1.10.1/awscli/examples/ecr/batch-delete-image.rst
--- awscli-1.9.9/awscli/examples/ecr/batch-delete-image.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ecr/batch-delete-image.rst 2016-01-28 22:38:12.000000000 +0000
@@ -0,0 +1,20 @@
+**To delete an image**
+
+This example deletes an image with the tag ``precise`` in a repository called
+``ubuntu`` in the default registry for an account.
+
+Command::
+
+ aws ecr batch-delete-image --repository-name ubuntu --image-ids imageTag=precise
+
+Output::
+
+ {
+ "failures": [],
+ "imageIds": [
+ {
+ "imageTag": "precise",
+ "imageDigest": "sha256:19665f1e6d1e504117a1743c0a3d3753086354a38375961f2e665416ef4b1b2f"
+ }
+ ]
+ }
diff -Nru awscli-1.9.9/awscli/examples/ecr/batch-get-image.rst awscli-1.10.1/awscli/examples/ecr/batch-get-image.rst
--- awscli-1.9.9/awscli/examples/ecr/batch-get-image.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ecr/batch-get-image.rst 2016-01-28 22:38:12.000000000 +0000
@@ -0,0 +1,8 @@
+**To describe an image**
+
+This example describes an image with the tag ``precise`` in a repository called
+``ubuntu`` in the default registry for an account.
+
+Command::
+
+ aws ecr batch-get-image --repository-name ubuntu --image-ids imageTag=precise
diff -Nru awscli-1.9.9/awscli/examples/ecr/create-repository.rst awscli-1.10.1/awscli/examples/ecr/create-repository.rst
--- awscli-1.9.9/awscli/examples/ecr/create-repository.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ecr/create-repository.rst 2016-01-28 22:38:12.000000000 +0000
@@ -0,0 +1,18 @@
+**To create a repository**
+
+This example creates a repository called ``nginx-web-app`` inside the
+``project-a`` namespace in the default registry for an account.
+
+Command::
+
+ aws ecr create-repository --repository-name project-a/nginx-web-app
+
+Output::
+
+ {
+ "repository": {
+ "registryId": "",
+ "repositoryName": "project-a/nginx-web-app",
+ "repositoryArn": "arn:aws:ecr:us-west-2::repository/project-a/nginx-web-app"
+ }
+ }
diff -Nru awscli-1.9.9/awscli/examples/ecr/delete-repository.rst awscli-1.10.1/awscli/examples/ecr/delete-repository.rst
--- awscli-1.9.9/awscli/examples/ecr/delete-repository.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ecr/delete-repository.rst 2016-01-28 22:38:12.000000000 +0000
@@ -0,0 +1,19 @@
+**To delete a repository**
+
+This example command force deletes a repository named ``ubuntu`` in the default
+registry for an account. The ``--force`` flag is required if the repository
+contains images.
+
+Command::
+
+ aws ecr delete-repository --force --repository-name ubuntu
+
+Output::
+
+ {
+ "repository": {
+ "registryId": "",
+ "repositoryName": "ubuntu",
+ "repositoryArn": "arn:aws:ecr:us-west-2::repository/ubuntu"
+ }
+ }
diff -Nru awscli-1.9.9/awscli/examples/ecr/describe-repositories.rst awscli-1.10.1/awscli/examples/ecr/describe-repositories.rst
--- awscli-1.9.9/awscli/examples/ecr/describe-repositories.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ecr/describe-repositories.rst 2016-01-28 22:38:12.000000000 +0000
@@ -0,0 +1,24 @@
+**To describe the repositories in a registry**
+
+This example describes the repositories in the default registry for an account.
+
+Command::
+
+ aws ecr describe-repositories
+
+Output::
+
+ {
+ "repositories": [
+ {
+ "registryId": "012345678910",
+ "repositoryName": "ubuntu",
+ "repositoryArn": "arn:aws:ecr:us-west-2:012345678910:repository/ubuntu"
+ },
+ {
+ "registryId": "012345678910",
+ "repositoryName": "test",
+ "repositoryArn": "arn:aws:ecr:us-west-2:012345678910:repository/test"
+ }
+ ]
+ }
diff -Nru awscli-1.9.9/awscli/examples/ecr/get-authorization-token.rst awscli-1.10.1/awscli/examples/ecr/get-authorization-token.rst
--- awscli-1.9.9/awscli/examples/ecr/get-authorization-token.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ecr/get-authorization-token.rst 2016-01-28 22:38:12.000000000 +0000
@@ -0,0 +1,58 @@
+**To get an authorization token for your default registry**
+
+This example command gets an authorization token for your default registry.
+
+Command::
+
+ aws ecr get-authorization-token
+
+Output::
+
+ {
+ "authorizationData": [
+ {
+ "authorizationToken": "QVdTOkN...",
+ "expiresAt": 1448875853.241,
+ "proxyEndpoint": "https://.dkr.ecr.us-west-2.amazonaws.com"
+ }
+ ]
+ }
+
+
+**To get the decoded password for your default registry**
+
+This example command gets an authorization token for your default registry and
+returns the decoded password for you to use in a ``docker login`` command.
+
+.. note::
+
+ Mac OSX users should use the ``-D`` option to ``base64`` to decode the
+ token data.
+
+Command::
+
+ aws ecr get-authorization-token --output text \
+ --query authorizationData[].authorizationToken \
+ | base64 -d | cut -d: -f2
+
+
+**To `docker login` with your decoded password**
+
+This example command uses your decoded password to add authentication
+information to your Docker installation by using the ``docker login`` command.
+The user name is ``AWS``, and you can use any email you want (Amazon ECR does
+nothing with this information, but ``docker login`` required the email field).
+
+.. note::
+
+ The final argument is the ``proxyEndpoint`` returned from
+ ``get-authorization-token`` without the ``https://`` prefix.
+
+Command::
+
+ docker login -u AWS -p -e .dkr.ecr.us-west-2.amazonaws.com
+
+Output::
+
+ WARNING: login credentials saved in $HOME/.docker/config.json
+ Login Succeeded
diff -Nru awscli-1.9.9/awscli/examples/ecr/get-login_description.rst awscli-1.10.1/awscli/examples/ecr/get-login_description.rst
--- awscli-1.9.9/awscli/examples/ecr/get-login_description.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ecr/get-login_description.rst 2016-01-28 22:38:12.000000000 +0000
@@ -0,0 +1,16 @@
+Log in to an Amazon ECR registry.
+
+This command retrieves a token that is valid for a specified registry for 12
+hours, and then it prints a ``docker login`` command with that authorization
+token. You can execute the printed command to log in to your registry with
+Docker. After you have logged in to an Amazon ECR registry with this command,
+you can use the Docker CLI to push and pull images from that registry until the
+token expires.
+
+.. note::
+
+ This command writes displays ``docker login`` commands to stdout with
+ authentication credentials. Your credentials could be visible by other
+ users on your system in a process list display or a command history. If you
+ are not on a secure system, you should consider this risk and login
+ interactively. For more information, see ``get-authorization-token``.
diff -Nru awscli-1.9.9/awscli/examples/ecr/get-login.rst awscli-1.10.1/awscli/examples/ecr/get-login.rst
--- awscli-1.9.9/awscli/examples/ecr/get-login.rst 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/awscli/examples/ecr/get-login.rst 2016-01-28 22:38:12.000000000 +0000
@@ -0,0 +1,26 @@
+**To retrieve a Docker login command to your default registry**
+
+This example prints a command that you can use to log in to your default Amazon
+ECR registry.
+
+Command::
+
+ aws ecr get-login
+
+Output::
+
+ docker login -u AWS -p -e none https://.dkr.ecr..amazonaws.com
+
+**To log in to another account's registry**
+
+This example prints one or more commands that you can use to log in to
+Amazon ECR registries associated with other accounts.
+
+Command::
+
+ aws ecr get-login --registry-ids 012345678910 023456789012
+
+Output::
+
+ docker login -u -p -e none
+ docker login -u -p -e none
diff -Nru awscli-1.9.9/awscli/examples/emr/create-cluster-examples.rst awscli-1.10.1/awscli/examples/emr/create-cluster-examples.rst
--- awscli-1.9.9/awscli/examples/emr/create-cluster-examples.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/emr/create-cluster-examples.rst 2016-01-28 22:38:12.000000000 +0000
@@ -55,7 +55,12 @@
- Create an Amazon EMR cluster specifying only the additional Amazon EC2 security groups::
- aws emr create-cluster --release-label emr-4.0.0 --service-role myServiceRole --ec2-attributes InstanceProfile=myRole,AdditionalMasterSecurityGroups=[sg-addMaster1,sg-addMaster2,sg-addMaster3,sg-addMaster4],AdditionalSlaveSecurityGroups=[sg-addSlave1,sg-addSlave2,sg-addSlave3,sg-addSlave4] --instance-groups InstanceGroupType=MASTER,InstanceCount=1,InstanceType=m3.xlarge InstanceGroupType=CORE,InstanceCount=2,InstanceType=m3.xlarge
+ aws emr create-cluster --release-label emr-4.0.0 --service-role myServiceRole --ec2-attributes InstanceProfile=myRole,AdditionalMasterSecurityGroups=[sg-addMaster1,sg-addMaster2,sg-addMaster3,sg-addMaster4],AdditionalSlaveSecurityGroups=[sg-addSlave1,sg-addSlave2,sg-addSlave3,sg-addSlave4] --instance-groups InstanceGroupType=MASTER,InstanceCount=1,InstanceType=m3.xlarge InstanceGroupType=CORE,InstanceCount=2,InstanceType=m3.xlarge
+
+- Create an Amazon EMR cluster in a VPC private subnet and use a specific Amazon EC2 security group to enable the Amazon EMR service access (required for clusters in private subnets)::
+
+ aws emr create-cluster --release-label emr-4.2.0 --service-role myServiceRole --ec2-attributes InstanceProfile=myRole,ServiceAccessSecurityGroup=sg-service-access,EmrManagedMasterSecurityGroup=sg-master,EmrManagedSlaveSecurityGroup=sg-slave --instance-groups InstanceGroupType=MASTER,InstanceCount=1,InstanceType=m3.xlarge InstanceGroupType=CORE,InstanceCount=2,InstanceType=m3.xlarge
+
- JSON equivalent (contents of ec2_attributes.json)::
@@ -66,6 +71,7 @@
"InstanceProfile":"myRole",
"EmrManagedMasterSecurityGroup": "sg-master1",
"EmrManagedSlaveSecurityGroup": "sg-slave1",
+ "ServiceAccessSecurityGroup": "sg-service-access"
"AdditionalMasterSecurityGroups": ["sg-addMaster1","sg-addMaster2","sg-addMaster3","sg-addMaster4"],
"AdditionalSlaveSecurityGroups": ["sg-addSlave1","sg-addSlave2","sg-addSlave3","sg-addSlave4"]
}
diff -Nru awscli-1.9.9/awscli/examples/emr/describe-cluster.rst awscli-1.10.1/awscli/examples/emr/describe-cluster.rst
--- awscli-1.9.9/awscli/examples/emr/describe-cluster.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/emr/describe-cluster.rst 2016-01-28 22:38:12.000000000 +0000
@@ -19,6 +19,7 @@
}
},
"Ec2InstanceAttributes": {
+ "ServiceAccessSecurityGroup": "sg-xxxxxxxx",
"EmrManagedMasterSecurityGroup": "sg-xxxxxxxx",
"IamInstanceProfile": "EMR_EC2_DefaultRole",
"Ec2KeyName": "myKey",
diff -Nru awscli-1.9.9/awscli/examples/glacier/upload-archive.rst awscli-1.10.1/awscli/examples/glacier/upload-archive.rst
--- awscli-1.9.9/awscli/examples/glacier/upload-archive.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/glacier/upload-archive.rst 2016-01-28 22:38:12.000000000 +0000
@@ -10,4 +10,8 @@
"location": "/0123456789012/vaults/my-vault/archives/kKB7ymWJVpPSwhGP6ycSOAekp9ZYe_--zM_mw6k76ZFGEIWQX-ybtRDvc2VkPSDtfKmQrj0IRQLSGsNuDp-AJVlu2ccmDSyDUmZwKbwbpAdGATGDiB3hHO0bjbGehXTcApVud_wyDw"
}
-Amazon Glacier requires an account ID argument when performing operations, but you can use a hyphen to specify the in-use account.
\ No newline at end of file
+Amazon Glacier requires an account ID argument when performing operations, but you can use a hyphen to specify the in-use account.
+
+To retrieve an uploaded archive, initiate a retrieval job with the `aws glacier initiate-job`_ command.
+
+.. _`aws glacier initiate-job`: http://docs.aws.amazon.com/cli/latest/reference/glacier/initiate-job.html
\ No newline at end of file
diff -Nru awscli-1.9.9/awscli/examples/iam/create-policy.rst awscli-1.10.1/awscli/examples/iam/create-policy.rst
--- awscli-1.9.9/awscli/examples/iam/create-policy.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/iam/create-policy.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,41 +1,41 @@
-The following command creates a customer managed policy named ``my-policy``::
-
- aws create-policy --policy-name my-policy --policy-document file://policy
-
-Output::
-
- {
- "Policy": {
- "PolicyName": "my-policy",
- "CreateDate": "2015-06-01T19:31:18.620Z",
- "AttachmentCount": 0,
- "IsAttachable": true,
- "PolicyId": "ZXR6A36LTYANPAI7NJ5UV",
- "DefaultVersionId": "v1",
- "Path": "/",
- "Arn": "arn:aws:iam::0123456789012:policy/my-policy",
- "UpdateDate": "2015-06-01T19:31:18.620Z"
- }
- }
-
-The file ``policy`` is a JSON document in the current folder that grants read only access to the ``shared`` folder in an Amazon S3 bucket named ``my-bucket``::
-
- {
- "Version": "2012-10-17",
- "Statement": [
- {
- "Effect": "Allow",
- "Action": [
- "s3:Get*",
- "s3:List*"
- ],
- "Resource": [
- "arn:aws:s3:::my-bucket/shared/*"
- ]
- },
- ]
- }
-
-For more information on using files as input for string parameters, see `Specifying Parameter Values`_ in the *AWS CLI User Guide*.
-
-.. _`Specifying Parameter Values`: http://docs.aws.amazon.com/cli/latest/userguide/cli-using-param.html
\ No newline at end of file
+The following command creates a customer managed policy named ``my-policy``::
+
+ aws iam create-policy --policy-name my-policy --policy-document file://policy
+
+Output::
+
+ {
+ "Policy": {
+ "PolicyName": "my-policy",
+ "CreateDate": "2015-06-01T19:31:18.620Z",
+ "AttachmentCount": 0,
+ "IsAttachable": true,
+ "PolicyId": "ZXR6A36LTYANPAI7NJ5UV",
+ "DefaultVersionId": "v1",
+ "Path": "/",
+ "Arn": "arn:aws:iam::0123456789012:policy/my-policy",
+ "UpdateDate": "2015-06-01T19:31:18.620Z"
+ }
+ }
+
+The file ``policy`` is a JSON document in the current folder that grants read only access to the ``shared`` folder in an Amazon S3 bucket named ``my-bucket``::
+
+ {
+ "Version": "2012-10-17",
+ "Statement": [
+ {
+ "Effect": "Allow",
+ "Action": [
+ "s3:Get*",
+ "s3:List*"
+ ],
+ "Resource": [
+ "arn:aws:s3:::my-bucket/shared/*"
+ ]
+ },
+ ]
+ }
+
+For more information on using files as input for string parameters, see `Specifying Parameter Values`_ in the *AWS CLI User Guide*.
+
+.. _`Specifying Parameter Values`: http://docs.aws.amazon.com/cli/latest/userguide/cli-using-param.html
diff -Nru awscli-1.9.9/awscli/examples/iam/get-account-authorization-details.rst awscli-1.10.1/awscli/examples/iam/get-account-authorization-details.rst
--- awscli-1.9.9/awscli/examples/iam/get-account-authorization-details.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/iam/get-account-authorization-details.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,288 +1,288 @@
-The following ``get-account-authorization-details`` command returns information about all IAM users, groups, roles, and policies in the AWS account::
-
- aws iam get-account-authorization-details
-
-Output::
-
- {
- "RoleDetailList": [
- {
- "AssumeRolePolicyDocument": {
- "Version": "2012-10-17",
- "Statement": [
- {
- "Sid": "",
- "Effect": "Allow",
- "Principal": {
- "Service": "ec2.amazonaws.com"
- },
- "Action": "sts:AssumeRole"
- }
- ]
- },
- "RoleId": "AROAFP4BKI7Y7TEXAMPLE",
- "CreateDate": "2014-07-30T17:09:20Z",
- "InstanceProfileList": [
- {
- "InstanceProfileId": "AIPAFFYRBHWXW2EXAMPLE",
- "Roles": [
- {
- "AssumeRolePolicyDocument": {
- "Version":"2012-10-17",
- "Statement": [
- {
- "Sid":"",
- "Effect":"Allow",
- "Principal": {
- "Service":"ec2.amazonaws.com"
- },
- "Action":"sts:AssumeRole"
- }
- ]
- },
- "RoleId": "AROAFP4BKI7Y7TEXAMPLE",
- "CreateDate": "2014-07-30T17:09:20Z",
- "RoleName": "EC2role",
- "Path": "/",
- "Arn": "arn:aws:iam::123456789012:role/EC2role"
- }
- ],
- "CreateDate": "2014-07-30T17:09:20Z",
- "InstanceProfileName": "EC2role",
- "Path": "/",
- "Arn": "arn:aws:iam::123456789012:instance-profile/EC2role"
- }
- ],
- "RoleName": "EC2role",
- "Path": "/",
- "AttachedManagedPolicies": [
- {
- "PolicyName": "AmazonS3FullAccess",
- "PolicyArn": "arn:aws:iam::aws:policy/AmazonS3FullAccess"
- },
- {
- "PolicyName": "AmazonDynamoDBFullAccess",
- "PolicyArn": "arn:aws:iam::aws:policy/AmazonDynamoDBFullAccess"
- }
- ],
- "RolePolicyList": [],
- "Arn": "arn:aws:iam::123456789012:role/EC2role"
- }],
- "GroupDetailList": [
- {
- "GroupId": "AIDACKCEVSQ6C7EXAMPLE",
- "AttachedManagedPolicies": {
- "PolicyName": "AdministratorAccess",
- "PolicyArn": "arn:aws:iam::aws:policy/AdministratorAccess"
- },
- "GroupName": "Admins",
- "Path": "/",
- "Arn": "arn:aws:iam::123456789012:group/Admins",
- "CreateDate": "2013-10-14T18:32:24Z",
- "GroupPolicyList": []
- },
- {
- "GroupId": "AIDACKCEVSQ6C8EXAMPLE",
- "AttachedManagedPolicies": {
- "PolicyName": "PowerUserAccess",
- "PolicyArn": "arn:aws:iam::aws:policy/PowerUserAccess"
- },
- "GroupName": "Dev",
- "Path": "/",
- "Arn": "arn:aws:iam::123456789012:group/Dev",
- "CreateDate": "2013-10-14T18:33:55Z",
- "GroupPolicyList": []
- },
- {
- "GroupId": "AIDACKCEVSQ6C9EXAMPLE",
- "AttachedManagedPolicies": [],
- "GroupName": "Finance",
- "Path": "/",
- "Arn": "arn:aws:iam::123456789012:group/Finance",
- "CreateDate": "2013-10-14T18:57:48Z",
- "GroupPolicyList": [
- {
- "PolicyName": "policygen-201310141157",
- "PolicyDocument": {
- "Version":"2012-10-17",
- "Statement": [
- {
- "Action": "aws-portal:*",
- "Sid":"Stmt1381777017000",
- "Resource": "*",
- "Effect":"Allow"
- }
- ]
- }
- }
- ]
- }],
- "UserDetailList": [
- {
- "UserName": "Alice",
- "GroupList": [
- "Admins"
- ],
- "CreateDate": "2013-10-14T18:32:24Z",
- "UserId": "AIDACKCEVSQ6C2EXAMPLE",
- "UserPolicyList": [],
- "Path": "/",
- "AttachedManagedPolicies": [],
- "Arn": "arn:aws:iam::123456789012:user/Alice"
- },
- {
- "UserName": "Bob",
- "GroupList": [
- "Admins"
- ],
- "CreateDate": "2013-10-14T18:32:25Z",
- "UserId": "AIDACKCEVSQ6C3EXAMPLE",
- "UserPolicyList": [
- {
- "PolicyName": "DenyBillingAndIAMPolicy",
- "PolicyDocument": {
- "Version":"2012-10-17",
- "Statement": {
- "Effect":"Deny",
- "Action": [
- "aws-portal:*",
- "iam:*"
- ],
- "Resource":"*"
- }
- }
- }
- ],
- "Path": "/",
- "AttachedManagedPolicies": [],
- "Arn": "arn:aws:iam::123456789012:user/Bob"
- },
- {
- "UserName": "Charlie",
- "GroupList": [
- "Dev"
- ],
- "CreateDate": "2013-10-14T18:33:56Z",
- "UserId": "AIDACKCEVSQ6C4EXAMPLE",
- "UserPolicyList": [],
- "Path": "/",
- "AttachedManagedPolicies": [],
- "Arn": "arn:aws:iam::123456789012:user/Charlie"
- }],
- "Policies": [
- {
- "PolicyName": "create-update-delete-set-managed-policies",
- "CreateDate": "2015-02-06T19:58:34Z",
- "AttachmentCount": 1,
- "IsAttachable": true,
- "PolicyId": "ANPAJ2UCCR6DPCEXAMPLE",
- "DefaultVersionId": "v1",
- "PolicyVersionList": [
- {
- "CreateDate": "2015-02-06T19:58:34Z",
- "VersionId": "v1",
- "Document": {
- "Version":"2012-10-17",
- "Statement": {
- "Effect":"Allow",
- "Action": [
- "iam:CreatePolicy",
- "iam:CreatePolicyVersion",
- "iam:DeletePolicy",
- "iam:DeletePolicyVersion",
- "iam:GetPolicy",
- "iam:GetPolicyVersion",
- "iam:ListPolicies",
- "iam:ListPolicyVersions",
- "iam:SetDefaultPolicyVersion"
- ],
- "Resource": "*"
- }
- },
- "IsDefaultVersion": true
- }
- ],
- "Path": "/",
- "Arn": "arn:aws:iam::123456789012:policy/create-update-delete-set-managed-policies",
- "UpdateDate": "2015-02-06T19:58:34Z"
- },
- {
- "PolicyName": "S3-read-only-specific-bucket",
- "CreateDate": "2015-01-21T21:39:41Z",
- "AttachmentCount": 1,
- "IsAttachable": true,
- "PolicyId": "ANPAJ4AE5446DAEXAMPLE",
- "DefaultVersionId": "v1",
- "PolicyVersionList": [
- {
- "CreateDate": "2015-01-21T21:39:41Z",
- "VersionId": "v1",
- "Document": {
- "Version":"2012-10-17",
- "Statement": [
- {
- "Effect":"Allow",
- "Action": [
- "s3:Get*",
- "s3:List*"
- ],
- "Resource": [
- "arn:aws:s3:::example-bucket",
- "arn:aws:s3:::example-bucket/*"
- ]
- }
- ]
- },
- "IsDefaultVersion": true
- }
- ],
- "Path": "/",
- "Arn": "arn:aws:iam::123456789012:policy/S3-read-only-specific-bucket",
- "UpdateDate": "2015-01-21T23:39:41Z"
- },
- {
- "PolicyName": "AmazonEC2FullAccess",
- "CreateDate": "2015-02-06T18:40:15Z",
- "AttachmentCount": 1,
- "IsAttachable": true,
- "PolicyId": "ANPAE3QWE5YT46TQ34WLG",
- "DefaultVersionId": "v1",
- "PolicyVersionList": [
- {
- "CreateDate": "2014-10-30T20:59:46Z",
- "VersionId": "v1",
- "Document": {
- "Version":"2012-10-17",
- "Statement": [
- {
- "Action":"ec2:*",
- "Effect":"Allow",
- "Resource":"*"
- },
- {
- "Effect":"Allow",
- "Action":"elasticloadbalancing:*",
- "Resource":"*"
- },
- {
- "Effect":"Allow",
- "Action":"cloudwatch:*",
- "Resource":"*"
- },
- {
- "Effect":"Allow",
- "Action":"autoscaling:*",
- "Resource":"*"
- }
- ]
- },
- "IsDefaultVersion": true
- }
- ],
- "Path": "/",
- "Arn": "arn:aws:iam::aws:policy/AmazonEC2FullAccess",
- "UpdateDate": "2015-02-06T18:40:15Z"
- }],
- "Marker": "EXAMPLEkakv9BCuUNFDtxWSyfzetYwEx2ADc8dnzfvERF5S6YMvXKx41t6gCl/eeaCX3Jo94/bKqezEAg8TEVS99EKFLxm3jtbpl25FDWEXAMPLE",
- "IsTruncated": true
+The following ``get-account-authorization-details`` command returns information about all IAM users, groups, roles, and policies in the AWS account::
+
+ aws iam get-account-authorization-details
+
+Output::
+
+ {
+ "RoleDetailList": [
+ {
+ "AssumeRolePolicyDocument": {
+ "Version": "2012-10-17",
+ "Statement": [
+ {
+ "Sid": "",
+ "Effect": "Allow",
+ "Principal": {
+ "Service": "ec2.amazonaws.com"
+ },
+ "Action": "sts:AssumeRole"
+ }
+ ]
+ },
+ "RoleId": "AROAFP4BKI7Y7TEXAMPLE",
+ "CreateDate": "2014-07-30T17:09:20Z",
+ "InstanceProfileList": [
+ {
+ "InstanceProfileId": "AIPAFFYRBHWXW2EXAMPLE",
+ "Roles": [
+ {
+ "AssumeRolePolicyDocument": {
+ "Version":"2012-10-17",
+ "Statement": [
+ {
+ "Sid":"",
+ "Effect":"Allow",
+ "Principal": {
+ "Service":"ec2.amazonaws.com"
+ },
+ "Action":"sts:AssumeRole"
+ }
+ ]
+ },
+ "RoleId": "AROAFP4BKI7Y7TEXAMPLE",
+ "CreateDate": "2014-07-30T17:09:20Z",
+ "RoleName": "EC2role",
+ "Path": "/",
+ "Arn": "arn:aws:iam::123456789012:role/EC2role"
+ }
+ ],
+ "CreateDate": "2014-07-30T17:09:20Z",
+ "InstanceProfileName": "EC2role",
+ "Path": "/",
+ "Arn": "arn:aws:iam::123456789012:instance-profile/EC2role"
+ }
+ ],
+ "RoleName": "EC2role",
+ "Path": "/",
+ "AttachedManagedPolicies": [
+ {
+ "PolicyName": "AmazonS3FullAccess",
+ "PolicyArn": "arn:aws:iam::aws:policy/AmazonS3FullAccess"
+ },
+ {
+ "PolicyName": "AmazonDynamoDBFullAccess",
+ "PolicyArn": "arn:aws:iam::aws:policy/AmazonDynamoDBFullAccess"
+ }
+ ],
+ "RolePolicyList": [],
+ "Arn": "arn:aws:iam::123456789012:role/EC2role"
+ }],
+ "GroupDetailList": [
+ {
+ "GroupId": "AIDACKCEVSQ6C7EXAMPLE",
+ "AttachedManagedPolicies": {
+ "PolicyName": "AdministratorAccess",
+ "PolicyArn": "arn:aws:iam::aws:policy/AdministratorAccess"
+ },
+ "GroupName": "Admins",
+ "Path": "/",
+ "Arn": "arn:aws:iam::123456789012:group/Admins",
+ "CreateDate": "2013-10-14T18:32:24Z",
+ "GroupPolicyList": []
+ },
+ {
+ "GroupId": "AIDACKCEVSQ6C8EXAMPLE",
+ "AttachedManagedPolicies": {
+ "PolicyName": "PowerUserAccess",
+ "PolicyArn": "arn:aws:iam::aws:policy/PowerUserAccess"
+ },
+ "GroupName": "Dev",
+ "Path": "/",
+ "Arn": "arn:aws:iam::123456789012:group/Dev",
+ "CreateDate": "2013-10-14T18:33:55Z",
+ "GroupPolicyList": []
+ },
+ {
+ "GroupId": "AIDACKCEVSQ6C9EXAMPLE",
+ "AttachedManagedPolicies": [],
+ "GroupName": "Finance",
+ "Path": "/",
+ "Arn": "arn:aws:iam::123456789012:group/Finance",
+ "CreateDate": "2013-10-14T18:57:48Z",
+ "GroupPolicyList": [
+ {
+ "PolicyName": "policygen-201310141157",
+ "PolicyDocument": {
+ "Version":"2012-10-17",
+ "Statement": [
+ {
+ "Action": "aws-portal:*",
+ "Sid":"Stmt1381777017000",
+ "Resource": "*",
+ "Effect":"Allow"
+ }
+ ]
+ }
+ }
+ ]
+ }],
+ "UserDetailList": [
+ {
+ "UserName": "Alice",
+ "GroupList": [
+ "Admins"
+ ],
+ "CreateDate": "2013-10-14T18:32:24Z",
+ "UserId": "AIDACKCEVSQ6C2EXAMPLE",
+ "UserPolicyList": [],
+ "Path": "/",
+ "AttachedManagedPolicies": [],
+ "Arn": "arn:aws:iam::123456789012:user/Alice"
+ },
+ {
+ "UserName": "Bob",
+ "GroupList": [
+ "Admins"
+ ],
+ "CreateDate": "2013-10-14T18:32:25Z",
+ "UserId": "AIDACKCEVSQ6C3EXAMPLE",
+ "UserPolicyList": [
+ {
+ "PolicyName": "DenyBillingAndIAMPolicy",
+ "PolicyDocument": {
+ "Version":"2012-10-17",
+ "Statement": {
+ "Effect":"Deny",
+ "Action": [
+ "aws-portal:*",
+ "iam:*"
+ ],
+ "Resource":"*"
+ }
+ }
+ }
+ ],
+ "Path": "/",
+ "AttachedManagedPolicies": [],
+ "Arn": "arn:aws:iam::123456789012:user/Bob"
+ },
+ {
+ "UserName": "Charlie",
+ "GroupList": [
+ "Dev"
+ ],
+ "CreateDate": "2013-10-14T18:33:56Z",
+ "UserId": "AIDACKCEVSQ6C4EXAMPLE",
+ "UserPolicyList": [],
+ "Path": "/",
+ "AttachedManagedPolicies": [],
+ "Arn": "arn:aws:iam::123456789012:user/Charlie"
+ }],
+ "Policies": [
+ {
+ "PolicyName": "create-update-delete-set-managed-policies",
+ "CreateDate": "2015-02-06T19:58:34Z",
+ "AttachmentCount": 1,
+ "IsAttachable": true,
+ "PolicyId": "ANPAJ2UCCR6DPCEXAMPLE",
+ "DefaultVersionId": "v1",
+ "PolicyVersionList": [
+ {
+ "CreateDate": "2015-02-06T19:58:34Z",
+ "VersionId": "v1",
+ "Document": {
+ "Version":"2012-10-17",
+ "Statement": {
+ "Effect":"Allow",
+ "Action": [
+ "iam:CreatePolicy",
+ "iam:CreatePolicyVersion",
+ "iam:DeletePolicy",
+ "iam:DeletePolicyVersion",
+ "iam:GetPolicy",
+ "iam:GetPolicyVersion",
+ "iam:ListPolicies",
+ "iam:ListPolicyVersions",
+ "iam:SetDefaultPolicyVersion"
+ ],
+ "Resource": "*"
+ }
+ },
+ "IsDefaultVersion": true
+ }
+ ],
+ "Path": "/",
+ "Arn": "arn:aws:iam::123456789012:policy/create-update-delete-set-managed-policies",
+ "UpdateDate": "2015-02-06T19:58:34Z"
+ },
+ {
+ "PolicyName": "S3-read-only-specific-bucket",
+ "CreateDate": "2015-01-21T21:39:41Z",
+ "AttachmentCount": 1,
+ "IsAttachable": true,
+ "PolicyId": "ANPAJ4AE5446DAEXAMPLE",
+ "DefaultVersionId": "v1",
+ "PolicyVersionList": [
+ {
+ "CreateDate": "2015-01-21T21:39:41Z",
+ "VersionId": "v1",
+ "Document": {
+ "Version":"2012-10-17",
+ "Statement": [
+ {
+ "Effect":"Allow",
+ "Action": [
+ "s3:Get*",
+ "s3:List*"
+ ],
+ "Resource": [
+ "arn:aws:s3:::example-bucket",
+ "arn:aws:s3:::example-bucket/*"
+ ]
+ }
+ ]
+ },
+ "IsDefaultVersion": true
+ }
+ ],
+ "Path": "/",
+ "Arn": "arn:aws:iam::123456789012:policy/S3-read-only-specific-bucket",
+ "UpdateDate": "2015-01-21T23:39:41Z"
+ },
+ {
+ "PolicyName": "AmazonEC2FullAccess",
+ "CreateDate": "2015-02-06T18:40:15Z",
+ "AttachmentCount": 1,
+ "IsAttachable": true,
+ "PolicyId": "ANPAE3QWE5YT46TQ34WLG",
+ "DefaultVersionId": "v1",
+ "PolicyVersionList": [
+ {
+ "CreateDate": "2014-10-30T20:59:46Z",
+ "VersionId": "v1",
+ "Document": {
+ "Version":"2012-10-17",
+ "Statement": [
+ {
+ "Action":"ec2:*",
+ "Effect":"Allow",
+ "Resource":"*"
+ },
+ {
+ "Effect":"Allow",
+ "Action":"elasticloadbalancing:*",
+ "Resource":"*"
+ },
+ {
+ "Effect":"Allow",
+ "Action":"cloudwatch:*",
+ "Resource":"*"
+ },
+ {
+ "Effect":"Allow",
+ "Action":"autoscaling:*",
+ "Resource":"*"
+ }
+ ]
+ },
+ "IsDefaultVersion": true
+ }
+ ],
+ "Path": "/",
+ "Arn": "arn:aws:iam::aws:policy/AmazonEC2FullAccess",
+ "UpdateDate": "2015-02-06T18:40:15Z"
+ }],
+ "Marker": "EXAMPLEkakv9BCuUNFDtxWSyfzetYwEx2ADc8dnzfvERF5S6YMvXKx41t6gCl/eeaCX3Jo94/bKqezEAg8TEVS99EKFLxm3jtbpl25FDWEXAMPLE",
+ "IsTruncated": true
}
\ No newline at end of file
diff -Nru awscli-1.9.9/awscli/examples/iam/list-group-policies.rst awscli-1.10.1/awscli/examples/iam/list-group-policies.rst
--- awscli-1.9.9/awscli/examples/iam/list-group-policies.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/iam/list-group-policies.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,16 +1,18 @@
-**To list the policies for IAM groups in the current account**
+**To list all inline policies that are attached to the specified group**
-The following ``list-group-policies`` command lists the names of policies that are attached to the IAM group named
+The following ``list-group-policies`` command lists the names of inline policies that are attached to the IAM group named
``Admins`` in the current account::
aws iam list-group-policies --group-name Admins
Output::
- "PolicyNames": [
- "ExamplepPolicy",
- "AdminPolicy"
- ]
+ {
+ "PolicyNames": [
+ "AdminRoot",
+ "ExamplepPolicy"
+ ]
+ }
For more information, see `Managing IAM Policies`_ in the *Using IAM* guide.
diff -Nru awscli-1.9.9/awscli/examples/iot/create-certificate-from-csr.rst awscli-1.10.1/awscli/examples/iot/create-certificate-from-csr.rst
--- awscli-1.9.9/awscli/examples/iot/create-certificate-from-csr.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/iot/create-certificate-from-csr.rst 2016-01-28 22:38:12.000000000 +0000
@@ -16,7 +16,7 @@
This command lists all of the CSRs in ``my-csr-directory`` and
pipes each CSR filename to the ``aws iot create-certificate-from-csr`` AWS CLI
-command to create a certficiate for the corresponding CSR.
+command to create a certificate for the corresponding CSR.
The ``aws iot create-certificate-from-csr`` part of the command can also be
ran in parallel to speed up the certificate creation process::
diff -Nru awscli-1.9.9/awscli/examples/logs/describe-log-streams.rst awscli-1.10.1/awscli/examples/logs/describe-log-streams.rst
--- awscli-1.9.9/awscli/examples/logs/describe-log-streams.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/logs/describe-log-streams.rst 2016-01-28 22:38:12.000000000 +0000
@@ -1,4 +1,4 @@
-The following command shows all log streams starting wtih the prefix ``2015`` in the log group ``my-logs``::
+The following command shows all log streams starting with the prefix ``2015`` in the log group ``my-logs``::
aws logs describe-log-streams --log-group-name my-logs --log-stream-name-prefix 2015
diff -Nru awscli-1.9.9/awscli/examples/s3/_concepts.rst awscli-1.10.1/awscli/examples/s3/_concepts.rst
--- awscli-1.9.9/awscli/examples/s3/_concepts.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/s3/_concepts.rst 2016-01-28 22:38:12.000000000 +0000
@@ -85,7 +85,7 @@
* ``*``: Matches everything
* ``?``: Matches any single character
* ``[sequence]``: Matches any character in ``sequence``
- * ``[!sequence]``: Matches any charater not in ``sequence``
+ * ``[!sequence]``: Matches any character not in ``sequence``
Any number of these parameters can be passed to a command. You can do this by
providing an ``--exclude`` or ``--include`` argument multiple times, e.g.
diff -Nru awscli-1.9.9/awscli/examples/s3/ls.rst awscli-1.10.1/awscli/examples/s3/ls.rst
--- awscli-1.9.9/awscli/examples/s3/ls.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/s3/ls.rst 2016-01-28 22:38:12.000000000 +0000
@@ -9,7 +9,7 @@
2013-07-11 17:08:50 mybucket
2013-07-24 14:55:44 mybucket2
-The following ``ls`` command lists objects and common prefixes under a spcified bucket and prefix. In this example, the
+The following ``ls`` command lists objects and common prefixes under a specified bucket and prefix. In this example, the
user owns the bucket ``mybucket`` with the objects ``test.txt`` and ``somePrefix/test.txt``. The ``LastWriteTime`` and
``Length`` are arbitrary. Note that since the ``ls`` command has no interaction with the local filesystem, the ``s3://``
URI scheme is not required to resolve ambiguity and may be ommited::
diff -Nru awscli-1.9.9/awscli/examples/s3/sync.rst awscli-1.10.1/awscli/examples/s3/sync.rst
--- awscli-1.9.9/awscli/examples/s3/sync.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/s3/sync.rst 2016-01-28 22:38:12.000000000 +0000
@@ -68,7 +68,7 @@
upload: test2.txt to s3://mybucket/test2.txt
The following ``sync`` command syncs files under a local directory to objects under a specified prefix and bucket by
-downloading the local files to s3. This example uses the ``--exclude`` parameter flag to exclude a specified directory
+downloading s3 objects. This example uses the ``--exclude`` parameter flag to exclude a specified directory
and s3 prefix from the ``sync`` command. In this example, the user syncs the local current directory to the bucket
``mybucket``. The local current directory contains the files ``test.txt`` and ``another/test2.txt``. The bucket
``mybucket`` contains the objects ``another/test5.txt`` and ``test1.txt``::
diff -Nru awscli-1.9.9/awscli/examples/s3api/create-bucket.rst awscli-1.10.1/awscli/examples/s3api/create-bucket.rst
--- awscli-1.9.9/awscli/examples/s3api/create-bucket.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/s3api/create-bucket.rst 2016-01-28 22:38:12.000000000 +0000
@@ -7,3 +7,18 @@
{
"Location": "/my-bucket"
}
+
+
+The following command creates a bucket named ``my-bucket`` in the
+``eu-west-1`` region. Regions outside of ``us-east-1`` require the appropriate
+``LocationConstraint`` to be specified in order to create the bucket in the
+desired region::
+
+ $ aws s3api create-bucket --bucket my-bucket --region eu-west-1 --create-bucket-configuration LocationConstraint=eu-west-1
+
+
+Output::
+
+ {
+ "Location": "http://my-bucket.s3.amazonaws.com/"
+ }
diff -Nru awscli-1.9.9/awscli/examples/s3api/put-bucket-lifecycle.rst awscli-1.10.1/awscli/examples/s3api/put-bucket-lifecycle.rst
--- awscli-1.9.9/awscli/examples/s3api/put-bucket-lifecycle.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/s3api/put-bucket-lifecycle.rst 2016-01-28 22:38:12.000000000 +0000
@@ -28,7 +28,7 @@
The first rule moves files to Amazon Glacier after sixty days. The second rule deletes files from Amazon S3 on the specified date. For information on acceptable timestamp formats, see `Specifying Parameter Values`_ in the *AWS CLI User Guide*.
-Each rule in the above example specifies a policy (``Transition`` or ``Experation``) and file prefix (folder name) to which it applies. You can also create a rule that applies to an entire bucket by specifying a blank prefix::
+Each rule in the above example specifies a policy (``Transition`` or ``Expiration``) and file prefix (folder name) to which it applies. You can also create a rule that applies to an entire bucket by specifying a blank prefix::
{
"Rules": [
diff -Nru awscli-1.9.9/awscli/examples/storagegateway/describe-gateway-information.rst awscli-1.10.1/awscli/examples/storagegateway/describe-gateway-information.rst
--- awscli-1.9.9/awscli/examples/storagegateway/describe-gateway-information.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/storagegateway/describe-gateway-information.rst 2016-01-28 22:38:12.000000000 +0000
@@ -2,11 +2,10 @@
The following ``describe-gateway-information`` command returns metadata about the specified gateway.
To specify which gateway to describe, use the Amazon Resource Name (ARN) of the gateway in the command.
-This examples specifies the gateway named "ExampleGateway".
-::
+This examples specifies a gateway with the id ``sgw-12A3456B`` in account ``123456789012``::
- aws storagegateway describe-gateway-information --gateway-arn "arn:aws:storagegateway:us-east-1:111122223333:gateway/ExampleGateway"
+ aws storagegateway describe-gateway-information --gateway-arn "arn:aws:storagegateway:us-west-2:123456789012:gateway/sgw-12A3456B"
This command outputs a JSON block that contains metadata about about the gateway such as its name,
network interfaces, configured time zone, and the state (whether the gateway is running or not).
diff -Nru awscli-1.9.9/awscli/examples/storagegateway/list-volumes.rst awscli-1.10.1/awscli/examples/storagegateway/list-volumes.rst
--- awscli-1.9.9/awscli/examples/storagegateway/list-volumes.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/examples/storagegateway/list-volumes.rst 2016-01-28 22:38:12.000000000 +0000
@@ -3,8 +3,8 @@
The following ``list-volumes`` command returns a list of volumes configured for the specified gateway.
To specify which gateway to describe, use the Amazon Resource Name (ARN) of the gateway in the command.
-This examples specifies the gateway named "ExampleGateway"::
+This examples specifies a gateway with the id ``sgw-12A3456B`` in account ``123456789012``::
- aws storagegateway list-volumes --gateway-arn "arn:aws:storagegateway:us-east-1:100447751468:gateway/ExampleGateway"
+ aws storagegateway list-volumes --gateway-arn "arn:aws:storagegateway:us-west-2:123456789012:gateway/sgw-12A3456B"
This command outputs a JSON block that a list of volumes that includes the type and ARN for each volume.
diff -Nru awscli-1.9.9/awscli/handlers.py awscli-1.10.1/awscli/handlers.py
--- awscli-1.9.9/awscli/handlers.py 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/handlers.py 2016-01-28 22:38:12.000000000 +0000
@@ -33,10 +33,12 @@
from awscli.customizations.rds import register_rds_modify_split
from awscli.customizations.putmetricdata import register_put_metric_data
from awscli.customizations.sessendemail import register_ses_send_email
+from awscli.customizations.cloudfront import register as register_cloudfront
from awscli.customizations.iamvirtmfa import IAMVMFAWrapper
from awscli.customizations.argrename import register_arg_renames
from awscli.customizations.configure import register_configure_cmd
from awscli.customizations.cloudtrail import initialize as cloudtrail_init
+from awscli.customizations.ecr import register_ecr_commands
from awscli.customizations.toplevelbool import register_bool_params
from awscli.customizations.ec2protocolarg import register_protocol_args
from awscli.customizations import datapipeline
@@ -112,6 +114,7 @@
register_arg_renames(event_handlers)
register_configure_cmd(event_handlers)
cloudtrail_init(event_handlers)
+ register_ecr_commands(event_handlers)
register_bool_params(event_handlers)
register_protocol_args(event_handlers)
datapipeline.register_customizations(event_handlers)
@@ -140,3 +143,4 @@
event_handlers.register(
'building-argument-table.iot.create-certificate-from-csr',
register_create_keys_from_csr_arguments)
+ register_cloudfront(event_handlers)
diff -Nru awscli-1.9.9/awscli/__init__.py awscli-1.10.1/awscli/__init__.py
--- awscli-1.9.9/awscli/__init__.py 2015-11-24 01:59:33.000000000 +0000
+++ awscli-1.10.1/awscli/__init__.py 2016-01-28 22:38:13.000000000 +0000
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.9.9'
+__version__ = '1.10.1'
#
# Get our data path to be added to botocore's search path
diff -Nru awscli-1.9.9/awscli/paramfile.py awscli-1.10.1/awscli/paramfile.py
--- awscli-1.9.9/awscli/paramfile.py 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/paramfile.py 2016-01-28 22:38:12.000000000 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# Copyright 2012-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"). You
diff -Nru awscli-1.9.9/awscli/schema.py awscli-1.10.1/awscli/schema.py
--- awscli-1.9.9/awscli/schema.py 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/schema.py 2016-01-28 22:38:12.000000000 +0000
@@ -96,6 +96,8 @@
shapes[shape_name] = self._transform_structure(schema, shapes)
elif schema['type'] == 'array':
shapes[shape_name] = self._transform_list(schema, shapes)
+ elif schema['type'] == 'map':
+ shapes[shape_name] = self._transform_map(schema, shapes)
else:
shapes[shape_name] = self._transform_scalar(schema)
return shapes
@@ -124,6 +126,15 @@
structure_shape['required'] = required_members
return structure_shape
+ def _transform_map(self, schema, shapes):
+ structure_shape = self._populate_initial_shape(schema)
+ for attribute in ['key', 'value']:
+ type_name = self._json_schema_to_aws_type(schema[attribute])
+ shape_name = self._shape_namer.new_shape_name(type_name)
+ structure_shape[attribute] = {'shape': shape_name}
+ self._transform(schema[attribute], shapes, shape_name)
+ return structure_shape
+
def _transform_list(self, schema, shapes):
# Transforming a structure involves:
# 1. Generating the shape definition for the structure
diff -Nru awscli-1.9.9/awscli/shorthand.py awscli-1.10.1/awscli/shorthand.py
--- awscli-1.9.9/awscli/shorthand.py 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/awscli/shorthand.py 2016-01-28 22:38:12.000000000 +0000
@@ -373,8 +373,8 @@
def _visit_list(self, parent, shape, name, value):
if not isinstance(value, list):
return
- for element in value:
- self._visit(value, shape.member, '', element)
+ for i, element in enumerate(value):
+ self._visit(value, shape.member, i, element)
def _visit_map(self, parent, shape, name, value):
if not isinstance(value, dict):
diff -Nru awscli-1.9.9/awscli.egg-info/PKG-INFO awscli-1.10.1/awscli.egg-info/PKG-INFO
--- awscli-1.9.9/awscli.egg-info/PKG-INFO 2015-11-24 01:59:33.000000000 +0000
+++ awscli-1.10.1/awscli.egg-info/PKG-INFO 2016-01-28 22:38:13.000000000 +0000
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: awscli
-Version: 1.9.9
+Version: 1.10.1
Summary: Universal Command Line Environment for AWS.
Home-page: http://aws.amazon.com/cli/
Author: Amazon Web Services
@@ -77,10 +77,13 @@
The aws-cli package includes a very useful command completion feature.
This feature is not automatically installed so you need to configure it manually.
- To enable tab completion for bash use the built-in command ``complete``::
+ To enable tab completion for bash either use the built-in command ``complete``::
$ complete -C aws_completer aws
+ Or add ``bin/aws_bash_completer`` file under ``/etc/bash_completion.d``,
+ ``/usr/local/etc/bash_completion.d`` or any other ``bash_completion.d`` location.
+
For tcsh::
$ complete aws 'p/*/`aws_completer`/'
diff -Nru awscli-1.9.9/awscli.egg-info/requires.txt awscli-1.10.1/awscli.egg-info/requires.txt
--- awscli-1.9.9/awscli.egg-info/requires.txt 2015-11-24 01:59:33.000000000 +0000
+++ awscli-1.10.1/awscli.egg-info/requires.txt 2016-01-28 22:38:13.000000000 +0000
@@ -1,4 +1,4 @@
-botocore==1.3.9
+botocore==1.3.23
colorama>=0.2.5,<=0.3.3
docutils>=0.10
rsa>=3.1.2,<=3.3.0
diff -Nru awscli-1.9.9/awscli.egg-info/SOURCES.txt awscli-1.10.1/awscli.egg-info/SOURCES.txt
--- awscli-1.9.9/awscli.egg-info/SOURCES.txt 2015-11-24 01:59:34.000000000 +0000
+++ awscli-1.10.1/awscli.egg-info/SOURCES.txt 2016-01-28 22:38:14.000000000 +0000
@@ -37,17 +37,18 @@
awscli/customizations/assumerole.py
awscli/customizations/awslambda.py
awscli/customizations/cliinputjson.py
+awscli/customizations/cloudfront.py
awscli/customizations/cloudsearch.py
awscli/customizations/cloudsearchdomain.py
awscli/customizations/codecommit.py
awscli/customizations/commands.py
-awscli/customizations/configure.py
awscli/customizations/ec2addcount.py
awscli/customizations/ec2bundleinstance.py
awscli/customizations/ec2decryptpassword.py
awscli/customizations/ec2protocolarg.py
awscli/customizations/ec2runinstances.py
awscli/customizations/ec2secgroupsimplify.py
+awscli/customizations/ecr.py
awscli/customizations/flatten.py
awscli/customizations/generatecliskeleton.py
awscli/customizations/globalargs.py
@@ -89,9 +90,12 @@
awscli/customizations/configservice/putconfigurationrecorder.py
awscli/customizations/configservice/rename_cmd.py
awscli/customizations/configservice/subscribe.py
+awscli/customizations/configure/__init__.py
+awscli/customizations/configure/addmodel.py
awscli/customizations/datapipeline/__init__.py
awscli/customizations/datapipeline/constants.py
awscli/customizations/datapipeline/createdefaultroles.py
+awscli/customizations/datapipeline/listrunsformatter.py
awscli/customizations/datapipeline/translator.py
awscli/customizations/emr/__init__.py
awscli/customizations/emr/addinstancegroups.py
@@ -142,6 +146,12 @@
awscli/customizations/s3/syncstrategy/register.py
awscli/customizations/s3/syncstrategy/sizeonly.py
awscli/data/cli.json
+awscli/examples/acm/delete-certificate.rst
+awscli/examples/acm/describe-certificate.rst
+awscli/examples/acm/get-certificate.rst
+awscli/examples/acm/list-certificates.rst
+awscli/examples/acm/request-certificate.rst
+awscli/examples/acm/resend-validation-email.rst
awscli/examples/autoscaling/attach-instances.rst
awscli/examples/autoscaling/attach-load-balancers.rst
awscli/examples/autoscaling/complete-lifecycle-action.rst
@@ -187,6 +197,7 @@
awscli/examples/autoscaling/resume-processes.rst
awscli/examples/autoscaling/set-desired-capacity.rst
awscli/examples/autoscaling/set-instance-health.rst
+awscli/examples/autoscaling/set-instance-protection.rst
awscli/examples/autoscaling/suspend-processes.rst
awscli/examples/autoscaling/terminate-instance-in-auto-scaling-group.rst
awscli/examples/autoscaling/update-auto-scaling-group.rst
@@ -244,6 +255,30 @@
awscli/examples/codepipeline/poll-for-jobs.rst
awscli/examples/codepipeline/start-pipeline-execution.rst
awscli/examples/codepipeline/update-pipeline.rst
+awscli/examples/configservice/delete-config-rule.rst
+awscli/examples/configservice/delete-delivery-channel.rst
+awscli/examples/configservice/deliver-config-snapshot.rst
+awscli/examples/configservice/describe-compliance-by-config-rule.rst
+awscli/examples/configservice/describe-compliance-by-resource.rst
+awscli/examples/configservice/describe-config-rule-evaluation-status.rst
+awscli/examples/configservice/describe-config-rules.rst
+awscli/examples/configservice/describe-configuration-recorder-status.rst
+awscli/examples/configservice/describe-configuration-recorders.rst
+awscli/examples/configservice/describe-delivery-channel-status.rst
+awscli/examples/configservice/describe-delivery-channels.rst
+awscli/examples/configservice/get-compliance-details-by-config-rule.rst
+awscli/examples/configservice/get-compliance-details-by-resource.rst
+awscli/examples/configservice/get-compliance-summary-by-config-rule.rst
+awscli/examples/configservice/get-compliance-summary-by-resource-type.rst
+awscli/examples/configservice/get-resource-config-history.rst
+awscli/examples/configservice/get-status.rst
+awscli/examples/configservice/list-discovered-resources.rst
+awscli/examples/configservice/put-config-rule.rst
+awscli/examples/configservice/put-configuration-recorder.rst
+awscli/examples/configservice/put-delivery-channel.rst
+awscli/examples/configservice/start-configuration-recorder.rst
+awscli/examples/configservice/stop-configuration-recorder.rst
+awscli/examples/configservice/subscribe.rst
awscli/examples/configure/_description.rst
awscli/examples/configure/get/_description.rst
awscli/examples/configure/get/_examples.rst
@@ -312,6 +347,7 @@
awscli/examples/dynamodb/update-table.rst
awscli/examples/ec2/accept-vpc-peering-connection.rst
awscli/examples/ec2/allocate-address.rst
+awscli/examples/ec2/allocate-hosts.rst
awscli/examples/ec2/assign-private-ip-addresses.rst
awscli/examples/ec2/associate-address.rst
awscli/examples/ec2/associate-dhcp-options.rst
@@ -339,6 +375,7 @@
awscli/examples/ec2/create-instance-export-task.rst
awscli/examples/ec2/create-internet-gateway.rst
awscli/examples/ec2/create-key-pair.rst
+awscli/examples/ec2/create-nat-gateway.rst
awscli/examples/ec2/create-network-acl-entry.rst
awscli/examples/ec2/create-network-acl.rst
awscli/examples/ec2/create-network-interface.rst
@@ -362,6 +399,7 @@
awscli/examples/ec2/delete-flow-logs.rst
awscli/examples/ec2/delete-internet-gateway.rst
awscli/examples/ec2/delete-key-pair.rst
+awscli/examples/ec2/delete-nat-gateway.rst
awscli/examples/ec2/delete-network-acl-entry.rst
awscli/examples/ec2/delete-network-acl.rst
awscli/examples/ec2/delete-network-interface.rst
@@ -391,6 +429,8 @@
awscli/examples/ec2/describe-dhcp-options.rst
awscli/examples/ec2/describe-export-tasks.rst
awscli/examples/ec2/describe-flow-logs.rst
+awscli/examples/ec2/describe-hosts.rst
+awscli/examples/ec2/describe-id-format.rst
awscli/examples/ec2/describe-image-attribute.rst
awscli/examples/ec2/describe-images.rst
awscli/examples/ec2/describe-instance-attribute.rst
@@ -399,6 +439,7 @@
awscli/examples/ec2/describe-internet-gateways.rst
awscli/examples/ec2/describe-key-pairs.rst
awscli/examples/ec2/describe-moving-addresses.rst
+awscli/examples/ec2/describe-nat-gateways.rst
awscli/examples/ec2/describe-network-acls.rst
awscli/examples/ec2/describe-network-interface-attribute.rst
awscli/examples/ec2/describe-network-interfaces.rst
@@ -424,6 +465,7 @@
awscli/examples/ec2/describe-volume-status.rst
awscli/examples/ec2/describe-volumes.rst
awscli/examples/ec2/describe-vpc-attribute.rst
+awscli/examples/ec2/describe-vpc-classic-link-dns-support.rst
awscli/examples/ec2/describe-vpc-classic-link.rst
awscli/examples/ec2/describe-vpc-endpoint-services.rst
awscli/examples/ec2/describe-vpc-endpoints.rst
@@ -437,16 +479,21 @@
awscli/examples/ec2/detach-volume.rst
awscli/examples/ec2/detach-vpn-gateway.rst
awscli/examples/ec2/disable-vgw-route-propagation.rst
+awscli/examples/ec2/disable-vpc-classic-link-dns-support.rst
awscli/examples/ec2/disable-vpc-classic-link.rst
awscli/examples/ec2/disassociate-address.rst
awscli/examples/ec2/disassociate-route-table.rst
awscli/examples/ec2/enable-vgw-route-propagation.rst
+awscli/examples/ec2/enable-vpc-classic-link-dns-support.rst
awscli/examples/ec2/enable-vpc-classic-link.rst
awscli/examples/ec2/get-console-output.rst
awscli/examples/ec2/get-password-data.rst
awscli/examples/ec2/import-key-pair.rst
+awscli/examples/ec2/modify-hosts.rst
+awscli/examples/ec2/modify-id-format.rst
awscli/examples/ec2/modify-image-attribute.rst
awscli/examples/ec2/modify-instance-attribute.rst
+awscli/examples/ec2/modify-instance-placement.rst
awscli/examples/ec2/modify-network-interface-attribute.rst
awscli/examples/ec2/modify-reserved-instances.rst
awscli/examples/ec2/modify-snapshot-attribute.rst
@@ -462,6 +509,7 @@
awscli/examples/ec2/register-image.rst
awscli/examples/ec2/reject-vpc-peering-connection.rst
awscli/examples/ec2/release-address.rst
+awscli/examples/ec2/release-hosts.rst
awscli/examples/ec2/replace-network-acl-association.rst
awscli/examples/ec2/replace-network-acl-entry.rst
awscli/examples/ec2/replace-route-table-association.rst
@@ -481,6 +529,14 @@
awscli/examples/ec2/terminate-instances.rst
awscli/examples/ec2/unassign-private-ip-addresses.rst
awscli/examples/ec2/unmonitor-instances.rst
+awscli/examples/ecr/batch-delete-image.rst
+awscli/examples/ecr/batch-get-image.rst
+awscli/examples/ecr/create-repository.rst
+awscli/examples/ecr/delete-repository.rst
+awscli/examples/ecr/describe-repositories.rst
+awscli/examples/ecr/get-authorization-token.rst
+awscli/examples/ecr/get-login.rst
+awscli/examples/ecr/get-login_description.rst
awscli/examples/ecs/create-cluster.rst
awscli/examples/ecs/create-service.rst
awscli/examples/ecs/delete-cluster.rst
@@ -972,5 +1028,6 @@
awscli/topics/topic-tags.json
bin/aws
bin/aws.cmd
+bin/aws_bash_completer
bin/aws_completer
bin/aws_zsh_completer.sh
\ No newline at end of file
diff -Nru awscli-1.9.9/bin/aws_bash_completer awscli-1.10.1/bin/aws_bash_completer
--- awscli-1.9.9/bin/aws_bash_completer 1970-01-01 00:00:00.000000000 +0000
+++ awscli-1.10.1/bin/aws_bash_completer 2016-01-28 22:38:12.000000000 +0000
@@ -0,0 +1,6 @@
+# Typically that would be added under one of the following paths:
+# - /etc/bash_completion.d
+# - /usr/local/etc/bash_completion.d
+# - /usr/share/bash-completion/completions
+
+complete -C aws_completer aws
diff -Nru awscli-1.9.9/debian/changelog awscli-1.10.1/debian/changelog
--- awscli-1.9.9/debian/changelog 2015-11-25 04:53:45.000000000 +0000
+++ awscli-1.10.1/debian/changelog 2016-02-02 10:30:22.000000000 +0000
@@ -1,8 +1,11 @@
-awscli (1.9.9-2ubuntu1) xenial; urgency=medium
+awscli (1.10.1-1) unstable; urgency=medium
- * Add python3-{pyasn1,rsa} to Build-Depends-Indep to fix ImportError in tests.
+ * debian/control
+ - add python3-pyasn1, python3-rsa to fix FTBFS (Closes: #811258)
+ - Depend on python3's botocore. (Closes: #811396)
+ * New upstream release
- -- Logan Rosen Tue, 24 Nov 2015 23:49:04 -0500
+ -- TANIGUCHI Takaki Tue, 02 Feb 2016 19:30:21 +0900
awscli (1.9.9-2) unstable; urgency=medium
diff -Nru awscli-1.9.9/debian/control awscli-1.10.1/debian/control
--- awscli-1.9.9/debian/control 2015-11-25 04:53:30.000000000 +0000
+++ awscli-1.10.1/debian/control 2016-02-02 10:28:58.000000000 +0000
@@ -1,8 +1,7 @@
Source: awscli
Section: admin
Priority: optional
-Maintainer: Ubuntu Developers
-XSBC-Original-Maintainer: Python Applications Packaging Team
+Maintainer: Python Applications Packaging Team
Uploaders: TANIGUCHI Takaki
Build-Depends: debhelper (>= 9)
, python3
@@ -22,7 +21,7 @@
Package: awscli
Architecture: all
-Depends: python3, python-botocore(>=1.3.9), ${python3:Depends}, ${misc:Depends}
+Depends: python3, python3-botocore(>=1.3.9), ${python3:Depends}, ${misc:Depends}
Description: Universal Command Line Environment for AWS
This package provides a unified command line interface to many
Amazon Web Services.
diff -Nru awscli-1.9.9/LICENSE.txt awscli-1.10.1/LICENSE.txt
--- awscli-1.9.9/LICENSE.txt 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/LICENSE.txt 2016-01-28 22:38:13.000000000 +0000
@@ -1,4 +1,4 @@
-Copyright 2012-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License"). You
may not use this file except in compliance with the License. A copy of
diff -Nru awscli-1.9.9/PKG-INFO awscli-1.10.1/PKG-INFO
--- awscli-1.9.9/PKG-INFO 2015-11-24 01:59:34.000000000 +0000
+++ awscli-1.10.1/PKG-INFO 2016-01-28 22:38:14.000000000 +0000
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: awscli
-Version: 1.9.9
+Version: 1.10.1
Summary: Universal Command Line Environment for AWS.
Home-page: http://aws.amazon.com/cli/
Author: Amazon Web Services
@@ -77,10 +77,13 @@
The aws-cli package includes a very useful command completion feature.
This feature is not automatically installed so you need to configure it manually.
- To enable tab completion for bash use the built-in command ``complete``::
+ To enable tab completion for bash either use the built-in command ``complete``::
$ complete -C aws_completer aws
+ Or add ``bin/aws_bash_completer`` file under ``/etc/bash_completion.d``,
+ ``/usr/local/etc/bash_completion.d`` or any other ``bash_completion.d`` location.
+
For tcsh::
$ complete aws 'p/*/`aws_completer`/'
diff -Nru awscli-1.9.9/README.rst awscli-1.10.1/README.rst
--- awscli-1.9.9/README.rst 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/README.rst 2016-01-28 22:38:12.000000000 +0000
@@ -69,10 +69,13 @@
The aws-cli package includes a very useful command completion feature.
This feature is not automatically installed so you need to configure it manually.
-To enable tab completion for bash use the built-in command ``complete``::
+To enable tab completion for bash either use the built-in command ``complete``::
$ complete -C aws_completer aws
+Or add ``bin/aws_bash_completer`` file under ``/etc/bash_completion.d``,
+``/usr/local/etc/bash_completion.d`` or any other ``bash_completion.d`` location.
+
For tcsh::
$ complete aws 'p/*/`aws_completer`/'
diff -Nru awscli-1.9.9/requirements.txt awscli-1.10.1/requirements.txt
--- awscli-1.9.9/requirements.txt 2015-11-24 01:59:32.000000000 +0000
+++ awscli-1.10.1/requirements.txt 2016-01-28 22:38:12.000000000 +0000
@@ -9,5 +9,5 @@
nose==1.3.0
colorama>=0.2.5,<=0.3.3
mock==1.0.1
-rsa>=3.1.2,<=3.1.4
+rsa>=3.1.2,<=3.3.0
wheel==0.24.0
diff -Nru awscli-1.9.9/setup.cfg awscli-1.10.1/setup.cfg
--- awscli-1.9.9/setup.cfg 2015-11-24 01:59:34.000000000 +0000
+++ awscli-1.10.1/setup.cfg 2016-01-28 22:38:14.000000000 +0000
@@ -3,7 +3,7 @@
[metadata]
requires-dist =
- botocore==1.3.9
+ botocore==1.3.23
colorama>=0.2.5,<=0.3.3
docutils>=0.10
rsa>=3.1.2,<=3.3.0
diff -Nru awscli-1.9.9/setup.py awscli-1.10.1/setup.py
--- awscli-1.9.9/setup.py 2015-11-24 01:59:33.000000000 +0000
+++ awscli-1.10.1/setup.py 2016-01-28 22:38:13.000000000 +0000
@@ -6,7 +6,7 @@
import awscli
-requires = ['botocore==1.3.9',
+requires = ['botocore==1.3.23',
'colorama>=0.2.5,<=0.3.3',
'docutils>=0.10',
'rsa>=3.1.2,<=3.3.0']
@@ -26,7 +26,8 @@
author='Amazon Web Services',
url='http://aws.amazon.com/cli/',
scripts=['bin/aws', 'bin/aws.cmd',
- 'bin/aws_completer', 'bin/aws_zsh_completer.sh'],
+ 'bin/aws_completer', 'bin/aws_zsh_completer.sh',
+ 'bin/aws_bash_completer'],
packages=find_packages(exclude=['tests*']),
package_data={'awscli': ['data/*.json', 'examples/*/*.rst',
'examples/*/*/*.rst', 'topics/*.rst',