[Python-modules-commits] [awscli] 01/04: New upstream version 1.11.139
Takaki Taniguchi
takaki at moszumanska.debian.org
Thu Aug 24 02:57:20 UTC 2017
This is an automated email from the git hooks/post-receive script.
takaki pushed a commit to branch master
in repository awscli.
commit 9bdb595aa4990abddcc1ae90325a37ed96745bc2
Author: TANIGUCHI Takaki <takaki at asis.media-as.org>
Date: Thu Aug 24 11:52:10 2017 +0900
New upstream version 1.11.139
---
PKG-INFO | 2 +-
awscli.egg-info/PKG-INFO | 2 +-
awscli.egg-info/SOURCES.txt | 5 +
awscli.egg-info/requires.txt | 2 +-
awscli/__init__.py | 2 +-
awscli/customizations/cloudformation/deploy.py | 33 +++-
awscli/customizations/cloudformation/deployer.py | 33 ++--
awscli/customizations/cloudformation/yamlhelper.py | 4 +-
awscli/customizations/emr/createcluster.py | 24 ++-
awscli/customizations/emr/helptext.py | 11 ++
awscli/customizations/paginate.py | 32 +++-
awscli/customizations/s3/results.py | 23 +--
awscli/customizations/s3/subcommands.py | 9 +-
awscli/examples/cloudfront/update-distribution.rst | 4 +-
awscli/examples/cloudwatch/delete-alarms.rst | 2 +-
awscli/examples/codepipeline/acknowledge-job.rst | 2 +-
awscli/examples/configure/get/_examples.rst | 2 +-
awscli/examples/ec2/create-default-vpc.rst | 22 +++
.../ec2/create-network-interface-permission.rst | 21 +++
.../ec2/delete-network-interface-permission.rst | 13 ++
.../ec2/describe-network-interface-permissions.rst | 23 +++
.../examples/ec2/replace-iam-instance-profile.rst | 2 +-
awscli/examples/ecr/get-authorization-token.rst | 4 +-
awscli/examples/emr/create-cluster-examples.rst | 17 ++
awscli/examples/emr/create-cluster-synopsis.rst | 3 +
awscli/examples/events/put-targets.rst | 2 +-
awscli/examples/opsworks/describe-instances.rst | 4 +-
awscli/examples/organizations/accept-handshake.rst | 100 +++++------
awscli/examples/organizations/attach-policy.rst | 22 +--
awscli/examples/organizations/cancel-handshake.rst | 110 ++++++------
awscli/examples/organizations/create-account.rst | 30 ++--
.../examples/organizations/create-organization.rst | 84 ++++-----
.../organizations/create-organizational-unit.rst | 28 ++-
awscli/examples/organizations/create-policy.rst | 48 +++--
.../examples/organizations/decline-handshake.rst | 102 ++++++-----
.../examples/organizations/delete-organization.rst | 6 +-
.../organizations/delete-organizational-unit.rst | 6 +-
awscli/examples/organizations/delete-policy.rst | 6 +-
awscli/examples/organizations/describe-account.rst | 34 ++--
.../describe-create-account-status.rst | 2 +-
.../examples/organizations/describe-handshake.rst | 92 +++++-----
.../organizations/describe-organization.rst | 43 +++--
.../organizations/describe-organizational-unit.rst | 26 ++-
awscli/examples/organizations/describe-policy.rst | 38 ++--
awscli/examples/organizations/detach-policy.rst | 8 +-
.../examples/organizations/disable-policy-type.rst | 26 ++-
.../examples/organizations/enable-all-features.rst | 54 +++---
.../examples/organizations/enable-policy-type.rst | 40 ++---
.../invite-account-to-organization.rst | 100 ++++++-----
.../examples/organizations/leave-organization.rst | 7 +-
.../organizations/list-accounts-for-parent.rst | 54 +++---
awscli/examples/organizations/list-accounts.rst | 90 +++++-----
awscli/examples/organizations/list-children.rst | 35 ++--
.../organizations/list-create-account-status.rst | 39 ++++
.../organizations/list-handshakes-for-account.rst | 98 +++++------
.../list-handshakes-for-organization.rst | 196 ++++++++++-----------
.../list-organizational-units-for-parent.rst | 36 ++--
awscli/examples/organizations/list-parents.rst | 27 ++-
.../organizations/list-policies-for-target.rst | 52 ++----
awscli/examples/organizations/list-policies.rst | 68 ++++---
awscli/examples/organizations/list-roots.rst | 42 +++--
.../organizations/list-targets-for-policy.rst | 56 +++---
awscli/examples/organizations/move-account.rst | 8 +-
.../remove-account-from-organization.rst | 8 +-
.../organizations/update-organizational-unit.rst | 24 ++-
awscli/examples/organizations/update-policy.rst | 104 +++++------
awscli/examples/rds/describe-db-instances.rst | 186 +++++++++----------
awscli/examples/s3/rm.rst | 2 +-
awscli/paramfile.py | 2 +
awscli/topics/s3-config.rst | 3 +-
setup.cfg | 2 +-
setup.py | 2 +-
72 files changed, 1280 insertions(+), 1169 deletions(-)
diff --git a/PKG-INFO b/PKG-INFO
index 2ccee69..6445b80 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: awscli
-Version: 1.11.121
+Version: 1.11.139
Summary: Universal Command Line Environment for AWS.
Home-page: http://aws.amazon.com/cli/
Author: Amazon Web Services
diff --git a/awscli.egg-info/PKG-INFO b/awscli.egg-info/PKG-INFO
index 2ccee69..6445b80 100644
--- a/awscli.egg-info/PKG-INFO
+++ b/awscli.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: awscli
-Version: 1.11.121
+Version: 1.11.139
Summary: Universal Command Line Environment for AWS.
Home-page: http://aws.amazon.com/cli/
Author: Amazon Web Services
diff --git a/awscli.egg-info/SOURCES.txt b/awscli.egg-info/SOURCES.txt
index 5f02e52..ac4d31a 100644
--- a/awscli.egg-info/SOURCES.txt
+++ b/awscli.egg-info/SOURCES.txt
@@ -581,6 +581,7 @@ awscli/examples/ec2/confirm-product-instance.rst
awscli/examples/ec2/copy-image.rst
awscli/examples/ec2/copy-snapshot.rst
awscli/examples/ec2/create-customer-gateway.rst
+awscli/examples/ec2/create-default-vpc.rst
awscli/examples/ec2/create-dhcp-options.rst
awscli/examples/ec2/create-egress-only-internet-gateway.rst
awscli/examples/ec2/create-flow-logs.rst
@@ -591,6 +592,7 @@ 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-permission.rst
awscli/examples/ec2/create-network-interface.rst
awscli/examples/ec2/create-placement-group.rst
awscli/examples/ec2/create-route-table.rst
@@ -616,6 +618,7 @@ 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-permission.rst
awscli/examples/ec2/delete-network-interface.rst
awscli/examples/ec2/delete-placement-group.rst
awscli/examples/ec2/delete-route-table.rst
@@ -659,6 +662,7 @@ 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-interface-permissions.rst
awscli/examples/ec2/describe-network-interfaces.rst
awscli/examples/ec2/describe-placement-groups.rst
awscli/examples/ec2/describe-prefix-lists.rst
@@ -1192,6 +1196,7 @@ awscli/examples/organizations/leave-organization.rst
awscli/examples/organizations/list-accounts-for-parent.rst
awscli/examples/organizations/list-accounts.rst
awscli/examples/organizations/list-children.rst
+awscli/examples/organizations/list-create-account-status.rst
awscli/examples/organizations/list-handshakes-for-account.rst
awscli/examples/organizations/list-handshakes-for-organization.rst
awscli/examples/organizations/list-organizational-units-for-parent.rst
diff --git a/awscli.egg-info/requires.txt b/awscli.egg-info/requires.txt
index f240b84..b39912f 100644
--- a/awscli.egg-info/requires.txt
+++ b/awscli.egg-info/requires.txt
@@ -1,4 +1,4 @@
-botocore==1.5.84
+botocore==1.6.6
colorama<=0.3.7,>=0.2.5
docutils>=0.10
rsa<=3.5.0,>=3.1.2
diff --git a/awscli/__init__.py b/awscli/__init__.py
index e585d61..63c1c1b 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@ A Universal Command Line Environment for Amazon Web Services.
"""
import os
-__version__ = '1.11.121'
+__version__ = '1.11.139'
#
# Get our data path to be added to botocore's search path
diff --git a/awscli/customizations/cloudformation/deploy.py b/awscli/customizations/cloudformation/deploy.py
index a31156e..95e0ced 100644
--- a/awscli/customizations/cloudformation/deploy.py
+++ b/awscli/customizations/cloudformation/deploy.py
@@ -127,6 +127,29 @@ class DeployCommand(BasicCommand):
' executing the change set. After you view the change set,'
' execute it to implement your changes.'
)
+ },
+ {
+ 'name': 'role-arn',
+ 'required': False,
+ 'help_text': (
+ 'The Amazon Resource Name (ARN) of an AWS Identity and Access '
+ 'Management (IAM) role that AWS CloudFormation assumes when '
+ 'executing the change set.'
+ )
+ },
+ {
+ 'name': 'notification-arns',
+ 'required': False,
+ 'schema': {
+ 'type': 'array',
+ 'items': {
+ 'type': 'string'
+ }
+ },
+ 'help_text': (
+ 'Amazon Simple Notification Service topic Amazon Resource Names'
+ ' (ARNs) that AWS CloudFormation associates with the stack.'
+ )
}
]
@@ -157,15 +180,19 @@ class DeployCommand(BasicCommand):
deployer = Deployer(cloudformation_client)
return self.deploy(deployer, stack_name, template_str,
parameters, parsed_args.capabilities,
- parsed_args.execute_changeset)
+ parsed_args.execute_changeset, parsed_args.role_arn,
+ parsed_args.notification_arns)
def deploy(self, deployer, stack_name, template_str,
- parameters, capabilities, execute_changeset):
+ parameters, capabilities, execute_changeset, role_arn,
+ notification_arns):
result = deployer.create_and_wait_for_changeset(
stack_name=stack_name,
cfn_template=template_str,
parameter_values=parameters,
- capabilities=capabilities)
+ capabilities=capabilities,
+ role_arn=role_arn,
+ notification_arns=notification_arns)
if execute_changeset:
deployer.execute_changeset(result.changeset_id, stack_name)
diff --git a/awscli/customizations/cloudformation/deployer.py b/awscli/customizations/cloudformation/deployer.py
index 2cf69c2..b918961 100644
--- a/awscli/customizations/cloudformation/deployer.py
+++ b/awscli/customizations/cloudformation/deployer.py
@@ -70,7 +70,8 @@ class Deployer(object):
raise e
def create_changeset(self, stack_name, cfn_template,
- parameter_values, capabilities):
+ parameter_values, capabilities, role_arn,
+ notification_arns):
"""
Call Cloudformation to create a changeset and wait for it to complete
@@ -96,16 +97,22 @@ class Deployer(object):
parameter_values = [x for x in parameter_values
if not x.get("UsePreviousValue", False)]
+ kwargs = {
+ 'ChangeSetName': changeset_name,
+ 'StackName': stack_name,
+ 'TemplateBody': cfn_template,
+ 'ChangeSetType': changeset_type,
+ 'Parameters': parameter_values,
+ 'Capabilities': capabilities,
+ 'Description': description,
+ }
+ # don't set these arguments if not specified to use existing values
+ if role_arn is not None:
+ kwargs['RoleARN'] = role_arn
+ if notification_arns is not None:
+ kwargs['NotificationARNs'] = notification_arns
try:
- resp = self._client.create_change_set(
- ChangeSetName=changeset_name,
- StackName=stack_name,
- TemplateBody=cfn_template,
- ChangeSetType=changeset_type,
- Parameters=parameter_values,
- Capabilities=capabilities,
- Description=description
- )
+ resp = self._client.create_change_set(**kwargs)
return ChangeSetResult(resp["Id"], changeset_type)
except Exception as ex:
LOG.debug("Unable to create changeset", exc_info=ex)
@@ -181,10 +188,12 @@ class Deployer(object):
raise exceptions.DeployFailedError(stack_name=stack_name)
def create_and_wait_for_changeset(self, stack_name, cfn_template,
- parameter_values, capabilities):
+ parameter_values, capabilities, role_arn,
+ notification_arns):
result = self.create_changeset(
- stack_name, cfn_template, parameter_values, capabilities)
+ stack_name, cfn_template, parameter_values, capabilities,
+ role_arn, notification_arns)
self.wait_for_changeset(result.changeset_id, stack_name)
diff --git a/awscli/customizations/cloudformation/yamlhelper.py b/awscli/customizations/cloudformation/yamlhelper.py
index 84d6044..41bbd7b 100644
--- a/awscli/customizations/cloudformation/yamlhelper.py
+++ b/awscli/customizations/cloudformation/yamlhelper.py
@@ -26,9 +26,9 @@ def intrinsics_multi_constructor(loader, tag_prefix, node):
# Get the actual tag name excluding the first exclamation
tag = node.tag[1:]
- # All CloudFormation intrinsics have prefix Fn:: except Ref
+ # Some intrinsic functions doesn't support prefix "Fn::"
prefix = "Fn::"
- if tag == "Ref":
+ if tag in ["Ref", "Condition"]:
prefix = ""
cfntag = prefix + tag
diff --git a/awscli/customizations/emr/createcluster.py b/awscli/customizations/emr/createcluster.py
index c4f6436..0592a2b 100644
--- a/awscli/customizations/emr/createcluster.py
+++ b/awscli/customizations/emr/createcluster.py
@@ -108,7 +108,14 @@ class CreateCluster(Command):
'schema': argumentschema.HBASE_RESTORE_FROM_BACKUP_SCHEMA,
'help_text': helptext.RESTORE_FROM_HBASE},
{'name': 'security-configuration',
- 'help_text': helptext.SECURITY_CONFIG}
+ 'help_text': helptext.SECURITY_CONFIG},
+ {'name': 'custom-ami-id',
+ 'help_text' : helptext.CUSTOM_AMI_ID},
+ {'name': 'ebs-root-volume-size',
+ 'help_text' : helptext.EBS_ROOT_VOLUME_SIZE},
+ {'name': 'repo-upgrade-on-boot',
+ 'help_text' : helptext.REPO_UPGRADE_ON_BOOT}
+
]
SYNOPSIS = BasicCommand.FROM_FILE('emr', 'create-cluster-synopsis.rst')
EXAMPLES = BasicCommand.FROM_FILE('emr', 'create-cluster-examples.rst')
@@ -303,6 +310,21 @@ class CreateCluster(Command):
emrutils.apply_dict(
params, 'SecurityConfiguration', parsed_args.security_configuration)
+ if parsed_args.custom_ami_id is not None:
+ emrutils.apply_dict(
+ params, 'CustomAmiId', parsed_args.custom_ami_id
+ )
+ if parsed_args.ebs_root_volume_size is not None:
+ emrutils.apply_dict(
+ params, 'EbsRootVolumeSize', int(parsed_args.ebs_root_volume_size)
+ )
+
+ if parsed_args.repo_upgrade_on_boot is not None:
+ emrutils.apply_dict(
+ params, 'RepoUpgradeOnBoot', parsed_args.repo_upgrade_on_boot
+ )
+
+
self._validate_required_applications(parsed_args)
run_job_flow_response = emrutils.call(
diff --git a/awscli/customizations/emr/helptext.py b/awscli/customizations/emr/helptext.py
index 22dd558..54c13b5 100644
--- a/awscli/customizations/emr/helptext.py
+++ b/awscli/customizations/emr/helptext.py
@@ -370,3 +370,14 @@ SECURITY_CONFIG = (
'<p>The name of a security configuration in the AWS account. '
'Use <code>list-security-configurations</code> to get a list of available '
'security configurations.</p>')
+
+CUSTOM_AMI_ID = (
+ '<p>Use custom AMI ID to launch cluster</p>')
+
+EBS_ROOT_VOLUME_SIZE = (
+ '<p>Customize EBS root volume size.</p>'
+)
+
+REPO_UPGRADE_ON_BOOT = (
+ '<p>Repo upgrade option on instance boot. This can be used only with custom AMIs</p>'
+)
diff --git a/awscli/customizations/paginate.py b/awscli/customizations/paginate.py
index 7eab614..35e3bef 100644
--- a/awscli/customizations/paginate.py
+++ b/awscli/customizations/paginate.py
@@ -39,19 +39,37 @@ logger = logging.getLogger(__name__)
STARTING_TOKEN_HELP = """
<p>A token to specify where to start paginating. This is the
<code>NextToken</code> from a previously truncated response.</p>
+<p>For usage examples, see <a
+href="https://docs.aws.amazon.com/cli/latest/userguide/pagination.html"
+>Pagination</a> in the <i>AWS Command Line Interface User
+Guide</i>.</p>
"""
MAX_ITEMS_HELP = """
-<p>The total number of items to return. If the total number
-of items available is more than the value specified in
-max-items then a <code>NextToken</code> will
-be provided in the output that you can use to resume pagination.
-This <code>NextToken</code> response element should <b>not</b> be
-used directly outside of the AWS CLI.</p>
+<p>The total number of items to return in the command's output.
+If the total number of items available is more than the value
+specified, a <code>NextToken</code> is provided in the command's
+output. To resume pagination, provide the
+<code>NextToken</code> value in the <code>starting-token</code>
+argument of a subsequent command. <b>Do not</b> use the
+<code>NextToken</code> response element directly outside of the
+AWS CLI.</p>
+<p>For usage examples, see <a
+href="https://docs.aws.amazon.com/cli/latest/userguide/pagination.html"
+>Pagination</a> in the <i>AWS Command Line Interface User
+Guide</i>.</p>
"""
PAGE_SIZE_HELP = """
-<p>The size of each page.<p>
+<p>The size of each page to get in the AWS service call. This
+does not affect the number of items returned in the command's
+output. Setting a smaller page size results in more calls to
+the AWS service, retrieving fewer items in each call. This can
+help prevent the AWS service calls from timing out.</p>
+<p>For usage examples, see <a
+href="https://docs.aws.amazon.com/cli/latest/userguide/pagination.html"
+>Pagination</a> in the <i>AWS Command Line Interface User
+Guide</i>.</p>
"""
diff --git a/awscli/customizations/s3/results.py b/awscli/customizations/s3/results.py
index eb22c8b..b80fcf6 100644
--- a/awscli/customizations/s3/results.py
+++ b/awscli/customizations/s3/results.py
@@ -22,7 +22,7 @@ from s3transfer.exceptions import CancelledError
from s3transfer.exceptions import FatalError
from s3transfer.subscribers import BaseSubscriber
-from awscli.compat import queue
+from awscli.compat import queue, ensure_text_type
from awscli.customizations.s3.utils import relative_path
from awscli.customizations.s3.utils import human_readable_size
from awscli.customizations.utils import uni_print
@@ -246,8 +246,11 @@ class ResultRecorder(BaseResultHandler):
'Any result using _get_ongoing_dict_key must subclass from '
'BaseResult. Provided result is of type: %s' % type(result)
)
- return ':'.join(
- str(el) for el in [result.transfer_type, result.src, result.dest])
+ key_parts = []
+ for result_property in [result.transfer_type, result.src, result.dest]:
+ if result_property is not None:
+ key_parts.append(ensure_text_type(result_property))
+ return u':'.join(key_parts)
def _pop_result_from_ongoing_dicts(self, result):
ongoing_key = self._get_ongoing_dict_key(result)
@@ -353,24 +356,24 @@ class ResultPrinter(BaseResultHandler):
'Completed {files_completed} file(s) with ' + _FILES_REMAINING
)
SUCCESS_FORMAT = (
- '{transfer_type}: {transfer_location}'
+ u'{transfer_type}: {transfer_location}'
)
- DRY_RUN_FORMAT = '(dryrun) ' + SUCCESS_FORMAT
+ DRY_RUN_FORMAT = u'(dryrun) ' + SUCCESS_FORMAT
FAILURE_FORMAT = (
- '{transfer_type} failed: {transfer_location} {exception}'
+ u'{transfer_type} failed: {transfer_location} {exception}'
)
# TODO: Add "warning: " prefix once all commands are converted to using
# result printer and remove "warning: " prefix from ``create_warning``.
WARNING_FORMAT = (
- '{message}'
+ u'{message}'
)
ERROR_FORMAT = (
- 'fatal error: {exception}'
+ u'fatal error: {exception}'
)
CTRL_C_MSG = 'cancelled: ctrl-c received'
- SRC_DEST_TRANSFER_LOCATION_FORMAT = '{src} to {dest}'
- SRC_TRANSFER_LOCATION_FORMAT = '{src}'
+ SRC_DEST_TRANSFER_LOCATION_FORMAT = u'{src} to {dest}'
+ SRC_TRANSFER_LOCATION_FORMAT = u'{src}'
def __init__(self, result_recorder, out_file=None, error_file=None):
"""Prints status of ongoing transfer
diff --git a/awscli/customizations/s3/subcommands.py b/awscli/customizations/s3/subcommands.py
index 02d591e..effcd4d 100644
--- a/awscli/customizations/s3/subcommands.py
+++ b/awscli/customizations/s3/subcommands.py
@@ -634,9 +634,12 @@ class WebsiteCommand(S3Command):
class PresignCommand(S3Command):
NAME = 'presign'
- DESCRIPTION = ("Generate a pre-signed URL for an Amazon S3 object. "
- "This allows anyone who receives the pre-signed URL "
- "to retrieve the S3 object with an HTTP GET request.")
+ DESCRIPTION = (
+ "Generate a pre-signed URL for an Amazon S3 object. This allows "
+ "anyone who receives the pre-signed URL to retrieve the S3 object "
+ "with an HTTP GET request. For sigv4 requests the region needs to be "
+ "configured explicitly."
+ )
USAGE = "<S3Uri>"
ARG_TABLE = [{'name': 'path',
'positional_arg': True, 'synopsis': USAGE},
diff --git a/awscli/examples/cloudfront/update-distribution.rst b/awscli/examples/cloudfront/update-distribution.rst
index 999cdb0..b984f9e 100644
--- a/awscli/examples/cloudfront/update-distribution.rst
+++ b/awscli/examples/cloudfront/update-distribution.rst
@@ -10,7 +10,7 @@ The following command disables a CloudFront distribution with the ID ``S11A16G5K
The distribution ID is available in the output of ``create-distribution`` and ``list-distributions``. The ETag value ``E37HOT42DHPVYH`` for the ``if-match`` parameter is available in the output of ``create-distribution``, ``get-distribution`` or ``get-distribution-config``.
-The file ``distconfig-disabled.json`` is a JSON document in the current folder that modifies the existing distribution config for ``S11A16G5KZMEQD`` to disable the distribution. This file was created by taking the existing config from the output of ``get-distribution-config`` and changing the ``Enabled`` key's value to ``false``::
+The file ``distconfig-disabled.json`` is a JSON document in the current folder that modifies the existing distribution config for ``S11A16G5KZMEQD`` to disable the distribution. This file was created by taking the existing config from the ``DistributionConfig`` key in the output of ``get-distribution-config`` and changing the ``Enabled`` key's value to ``false``::
{
"Comment": "",
@@ -190,4 +190,4 @@ The output includes the updated distribution config. Note that the ``ETag`` valu
"Id": "S11A16G5KZMEQD"
},
"ETag": "8UBQECEJX24ST"
- }
\ No newline at end of file
+ }
diff --git a/awscli/examples/cloudwatch/delete-alarms.rst b/awscli/examples/cloudwatch/delete-alarms.rst
index 65a9d10..5ba5f2e 100644
--- a/awscli/examples/cloudwatch/delete-alarms.rst
+++ b/awscli/examples/cloudwatch/delete-alarms.rst
@@ -3,7 +3,7 @@
The following example uses the ``delete-alarms`` command to delete the Amazon CloudWatch alarm
named "myalarm"::
- aws cloudwatch delete-alarms --alarm-name myalarm
+ aws cloudwatch delete-alarms --alarm-names myalarm
Output::
diff --git a/awscli/examples/codepipeline/acknowledge-job.rst b/awscli/examples/codepipeline/acknowledge-job.rst
index e51a874..15829f7 100644
--- a/awscli/examples/codepipeline/acknowledge-job.rst
+++ b/awscli/examples/codepipeline/acknowledge-job.rst
@@ -4,7 +4,7 @@ This example returns information about a specified job, including the status of
Command::
- aws codecommit acknowledge-job --job-id f4f4ff82-2d11-EXAMPLE --nonce 3
+ aws codepipeline acknowledge-job --job-id f4f4ff82-2d11-EXAMPLE --nonce 3
Output::
diff --git a/awscli/examples/configure/get/_examples.rst b/awscli/examples/configure/get/_examples.rst
index 8df566f..c857da5 100644
--- a/awscli/examples/configure/get/_examples.rst
+++ b/awscli/examples/configure/get/_examples.rst
@@ -24,7 +24,7 @@ The following commands would have the corresponding output::
testing_access_key
$ aws configure get profile.testing.aws_access_key_id
- default_access_key
+ testing_access_key
$ aws configure get preview.cloudsearch
true
diff --git a/awscli/examples/ec2/create-default-vpc.rst b/awscli/examples/ec2/create-default-vpc.rst
new file mode 100644
index 0000000..02d1e94
--- /dev/null
+++ b/awscli/examples/ec2/create-default-vpc.rst
@@ -0,0 +1,22 @@
+**To create a default VPC**
+
+This example creates a default VPC.
+
+Command::
+
+ aws ec2 create-default-vpc
+
+Output::
+
+ {
+ "Vpc": {
+ "VpcId": "vpc-8eaae5ea",
+ "InstanceTenancy": "default",
+ "Tags": [],
+ "Ipv6CidrBlockAssociationSet": [],
+ "State": "pending",
+ "DhcpOptionsId": "dopt-af0c32c6",
+ "CidrBlock": "172.31.0.0/16",
+ "IsDefault": true
+ }
+ }
\ No newline at end of file
diff --git a/awscli/examples/ec2/create-network-interface-permission.rst b/awscli/examples/ec2/create-network-interface-permission.rst
new file mode 100644
index 0000000..4847cb8
--- /dev/null
+++ b/awscli/examples/ec2/create-network-interface-permission.rst
@@ -0,0 +1,21 @@
+**To create a network interface permission**
+
+This example grants permission to account ``123456789012`` to attach network interface ``eni-1a2b3c4d`` to an instance.
+
+Command::
+
+ aws ec2 create-network-interface-permission --network-interface-id eni-1a2b3c4d --aws-account-id 123456789012 --permission INSTANCE-ATTACH
+
+Output::
+
+ {
+ "InterfacePermission": {
+ "PermissionState": {
+ "State": "GRANTED"
+ },
+ "NetworkInterfacePermissionId": "eni-perm-06fd19020ede149ea",
+ "NetworkInterfaceId": "eni-1a2b3c4d",
+ "Permission": "INSTANCE-ATTACH",
+ "AwsAccountId": "123456789012"
+ }
+ }
\ No newline at end of file
diff --git a/awscli/examples/ec2/delete-network-interface-permission.rst b/awscli/examples/ec2/delete-network-interface-permission.rst
new file mode 100644
index 0000000..31b9b6c
--- /dev/null
+++ b/awscli/examples/ec2/delete-network-interface-permission.rst
@@ -0,0 +1,13 @@
+**To delete a network interface permission**
+
+This example deletes the specified network interface permission.
+
+Command::
+
+ aws ec2 delete-network-interface-permission --network-interface-permission-id eni-perm-06fd19020ede149ea
+
+Output::
+
+ {
+ "Return": true
+ }
\ No newline at end of file
diff --git a/awscli/examples/ec2/describe-network-interface-permissions.rst b/awscli/examples/ec2/describe-network-interface-permissions.rst
new file mode 100644
index 0000000..f11fb7b
--- /dev/null
+++ b/awscli/examples/ec2/describe-network-interface-permissions.rst
@@ -0,0 +1,23 @@
+**To describe your network interface permissions**
+
+This example describes all of your network interface permissions.
+
+Command::
+
+ aws ec2 describe-network-interface-permissions
+
+Output::
+
+ {
+ "NetworkInterfacePermissions": [
+ {
+ "PermissionState": {
+ "State": "GRANTED"
+ },
+ "NetworkInterfacePermissionId": "eni-perm-06fd19020ede149ea",
+ "NetworkInterfaceId": "eni-b909511a",
+ "Permission": "INSTANCE-ATTACH",
+ "AwsAccountId": "123456789012"
+ }
+ ]
+ }
\ No newline at end of file
diff --git a/awscli/examples/ec2/replace-iam-instance-profile.rst b/awscli/examples/ec2/replace-iam-instance-profile.rst
index 81ec294..0e1bb20 100644
--- a/awscli/examples/ec2/replace-iam-instance-profile.rst
+++ b/awscli/examples/ec2/replace-iam-instance-profile.rst
@@ -18,4 +18,4 @@ Output::
"Arn": "arn:aws:iam::123456789012:instance-profile/AdminRole"
}
}
-}
\ No newline at end of file
+ }
\ No newline at end of file
diff --git a/awscli/examples/ecr/get-authorization-token.rst b/awscli/examples/ecr/get-authorization-token.rst
index 6f59898..69ad912 100644
--- a/awscli/examples/ecr/get-authorization-token.rst
+++ b/awscli/examples/ecr/get-authorization-token.rst
@@ -32,8 +32,8 @@ returns the decoded password for you to use in a ``docker login`` command.
Command::
aws ecr get-authorization-token --output text \
- --query authorizationData[].authorizationToken \
- | base64 -d | cut -d: -f2
+ --query 'authorizationData[].authorizationToken' \
+ | base64 -D | cut -d: -f2
**To `docker login` with your decoded password**
diff --git a/awscli/examples/emr/create-cluster-examples.rst b/awscli/examples/emr/create-cluster-examples.rst
index 10793b8..7ab3826 100644
--- a/awscli/examples/emr/create-cluster-examples.rst
+++ b/awscli/examples/emr/create-cluster-examples.rst
@@ -330,3 +330,20 @@ NOTE: JSON arguments must include options and values as their own items in the l
- Command (Using emrfs.json)::
aws emr create-cluster --instance-type m3.xlarge --release-label emr-5.3.1 --emrfs file://emrfs.json
+
+- Command (Using custom ami id)::
+
+ aws emr create-cluster --instance-type m3.xlarge --release-label emr-5.3.1 --custom-ami-id ami-9be6f38c
+
+- Command (Using custom EBS root volume)::
+
+ aws emr create-cluster --instance-type m3.xlarge --release-label emr-5.3.1 --ebs-root-volume-size 20
+
+- Command (Repo upgrade option on instance boot. This can be used only with custom AMIs)::
+
+ aws emr create-cluster --instance-type m3.xlarge --release-label emr-5.3.1 --repo-upgrade-on-boot ${RepoUpgrade}
+
+ RepoUpgrade {
+ SECURITY,
+ NONE
+ }
diff --git a/awscli/examples/emr/create-cluster-synopsis.rst b/awscli/examples/emr/create-cluster-synopsis.rst
index c97a1ff..6b6130c 100644
--- a/awscli/examples/emr/create-cluster-synopsis.rst
+++ b/awscli/examples/emr/create-cluster-synopsis.rst
@@ -19,3 +19,6 @@
[--steps <value>]
[--restore-from-hbase-backup <value>]
[--security-configuration <value>]
+ [--custom-ami-id <value>]
+ [--ebs-root-volume-size <value>]
+ [--repo-upgrade-on-boot <value>]
diff --git a/awscli/examples/events/put-targets.rst b/awscli/examples/events/put-targets.rst
index f5d4087..d233fad 100644
--- a/awscli/examples/events/put-targets.rst
+++ b/awscli/examples/events/put-targets.rst
@@ -10,4 +10,4 @@ This example sets an Amazon Kinesis stream as the target, so that events caught
This example sets two Amazon Kinesis streams as targets for one rule::
- aws events put-targets --rule DailyLambdaFunction --targets "Id"="Target1","Arn"="arn:aws:kinesis:us-east-1:379642911888:stream/MyStream1","RoleArn"="arn:aws:iam::379642911888:role/ MyRoleToAccessLambda" "Id"="Target2"," Arn"="arn:aws:kinesis:us-east-1:379642911888:stream/MyStream2","RoleArn"="arn:aws:iam::379642911888:role/MyRoleToAccessLambda
+ aws events put-targets --rule DailyLambdaFunction --targets "Id"="Target1","Arn"="arn:aws:kinesis:us-east-1:379642911888:stream/MyStream1","RoleArn"="arn:aws:iam::379642911888:role/ MyRoleToAccessLambda" "Id"="Target2"," Arn"="arn:aws:kinesis:us-east-1:379642911888:stream/MyStream2","RoleArn"="arn:aws:iam::379642911888:role/MyRoleToAccessLambda"
diff --git a/awscli/examples/opsworks/describe-instances.rst b/awscli/examples/opsworks/describe-instances.rst
index 7b61136..213e135 100644
--- a/awscli/examples/opsworks/describe-instances.rst
+++ b/awscli/examples/opsworks/describe-instances.rst
@@ -89,7 +89,7 @@ EC2 instance, and the second was created by AWS OpsWorks.
**More Information**
-For more information, see Instances_ in the *AWS OpsWorks User Guide*.
+For more information, see `Instances`_ in the *AWS OpsWorks User Guide*.
-.. _Instances: http://docs.aws.amazon.com/opsworks/latest/userguide/workinginstances.html
+.. _`Instances`: http://docs.aws.amazon.com/opsworks/latest/userguide/workinginstances.html
diff --git a/awscli/examples/organizations/accept-handshake.rst b/awscli/examples/organizations/accept-handshake.rst
index 079975f..0877352 100755
--- a/awscli/examples/organizations/accept-handshake.rst
+++ b/awscli/examples/organizations/accept-handshake.rst
@@ -1,56 +1,52 @@
-**To accept a handshake**
+**To accept a handshake from another account**
-Bill, the owner of an organization, has previously invited Juan's account to join his organization. The following example shows Juan's account accepting the handshake and thus agreeing to the invitation.
+Bill, the owner of an organization, has previously invited Juan's account to join his organization. The following example shows Juan's account accepting the handshake and thus agreeing to the invitation. ::
-Command::
+ aws organizations accept-handshake --handshake-id h-examplehandshakeid111
- aws organizations accept-handshake --handshake-id h-examplehandshakeid111
+The output shows the following: ::
-The output displays that the handshake is now in the ACCEPTED state.
-
-Output::
-
- {
- "Handshake": {
- "Action": "INVITE",
- "Arn": "arn:aws:organizations::111111111111:handshake/o-exampleorgid/invite/h-examplehandshakeid111",
- "RequestedTimestamp": 1481656459.257,
- "ExpirationTimestamp": 1482952459.257,
- "Id": "h-examplehandshakeid111",
- "Parties": [
- {
- "Id": "o-exampleorgid",
- "Type": "ORGANIZATION"
- },
- {
- "Id": "juan at example.com",
- "Type": "EMAIL"
- }
- ],
- "Resources": [
- {
- "Resources": [
- {
- "Type": "MASTER_EMAIL",
- "Value": "bill at amazon.com"
- },
- {
- "Type": "MASTER_NAME",
- "Value": "Org Master Account"
- },
- {
- "Type": "ORGANIZATION_FEATURE_SET",
- "Value": "ALL"
- }
- ],
- "Type": "ORGANIZATION",
- "Value": "o-exampleorgid"
- },
- {
- "Type": "EMAIL",
- "Value": "juan at example.com"
- }
- ],
- "State": "ACCEPTED"
- }
- }
\ No newline at end of file
+ {
+ "Handshake": {
+ "Action": "INVITE",
+ "Arn": "arn:aws:organizations::111111111111:handshake/o-exampleorgid/invite/h-examplehandshakeid111",
+ "RequestedTimestamp": 1481656459.257,
+ "ExpirationTimestamp": 1482952459.257,
+ "Id": "h-examplehandshakeid111",
+ "Parties": [
+ {
+ "Id": "o-exampleorgid",
+ "Type": "ORGANIZATION"
+ },
+ {
+ "Id": "juan at example.com",
+ "Type": "EMAIL"
+ }
+ ],
+ "Resources": [
+ {
+ "Resources": [
+ {
+ "Type": "MASTER_EMAIL",
+ "Value": "bill at amazon.com"
+ },
+ {
+ "Type": "MASTER_NAME",
+ "Value": "Org Master Account"
+ },
+ {
+ "Type": "ORGANIZATION_FEATURE_SET",
+ "Value": "ALL"
+ }
+ ],
+ "Type": "ORGANIZATION",
+ "Value": "o-exampleorgid"
+ },
+ {
+ "Type": "EMAIL",
+ "Value": "juan at example.com"
+ }
+ ],
+ "State": "ACCEPTED"
+ }
+ }
\ No newline at end of file
diff --git a/awscli/examples/organizations/attach-policy.rst b/awscli/examples/organizations/attach-policy.rst
index ac17596..8de5f4d 100755
--- a/awscli/examples/organizations/attach-policy.rst
+++ b/awscli/examples/organizations/attach-policy.rst
@@ -1,15 +1,17 @@
-**To attach a policy to an OU**
+**To attach a policy to a root, OU, or account**
-The following example shows how to attach a service control policy (SCP) to an OU.
+**Example 1**
-Command::
+The following example shows how to attach a service control policy (SCP) to an OU: ::
- aws organizations attach-policy --target-id ou-examplerootid111-exampleouid111 --policy-id p-examplepolicyid111
+ aws organizations attach-policy
+ --policy-id p-examplepolicyid111
+ --target-id ou-examplerootid111-exampleouid111
+
+**Example 2**
-**To attach a policy directly to an AWS account**
-
-The following example shows how to attach a service control policy directly to an account.
+The following example shows how to attach a service control policy directly to an account: ::
-Command::
-
- aws organizations attach-policy --target-id 333333333333 --policy-id p-examplepolicyid111
\ No newline at end of file
+ aws organizations attach-policy
+ --policy-id p-examplepolicyid111
+ --target-id = 333333333333
\ No newline at end of file
diff --git a/awscli/examples/organizations/cancel-handshake.rst b/awscli/examples/organizations/cancel-handshake.rst
index 36b5146..e2a83da 100755
--- a/awscli/examples/organizations/cancel-handshake.rst
+++ b/awscli/examples/organizations/cancel-handshake.rst
@@ -1,60 +1,56 @@
-**To cancel a handshake**
+**To cancel a handshake sent from another account**
-Bill, the admin of an organization, previously sent an invitation to Susan's account to join the organization. Bill later changes his mind and decides to cancel the invitation before Susan accepts it. The following example shows Bill cancelling the handshake (and the invitation it represents)::
+Bill previously sent an invitation to Susan's account to join his organization. He changes his mind and decides to cancel the invitation before Susan accepts it. The following example shows Bill's cancellation: ::
-Command::
+ aws organizations cancel-handshake --handshake-id h-examplehandshakeid111
+
+The output includes a handshake object that shows that the state is now ``CANCELED``: ::
- aws organizations cancel-handshake --handshake-id h-examplehandshakeid111
-
-The output includes a handshake object that shows that the state is now CANCELED.
-
-Output::
-
- {
- "Handshake": {
- "Id": "h-examplehandshakeid111",
- "State":"CANCELED",
- "Action": "INVITE",
- "Arn": "arn:aws:organizations::111111111111:handshake/o-exampleorgid/invite/h-examplehandshakeid111",
- "Parties": [
- {
- "Id": "o-exampleorgid",
- "Type": "ORGANIZATION"
- },
- {
- "Id": "susan at example.com",
- "Type": "EMAIL"
- }
- ],
- "Resources": [
- {
- "Type": "ORGANIZATION",
- "Value": "o-exampleorgid",
- "Resources": [
- {
- "Type": "MASTER_EMAIL",
- "Value": "bill at example.com"
- },
- {
- "Type": "MASTER_NAME",
- "Value": "Master Account"
- },
- {
- "Type": "ORGANIZATION_FEATURE_SET",
- "Value": "CONSOLIDATED_BILLING"
- }
- ]
- },
- {
- "Type": "EMAIL",
- "Value": "anika at example.com"
- },
- {
- "Type": "NOTES",
- "Value": "This is a request for Susan's account to join Bob's organization."
- }
- ],
- "RequestedTimestamp": 1.47008383521E9,
- "ExpirationTimestamp": 1.47137983521E9
- }
- }
\ No newline at end of file
+ {
+ "Handshake": {
+ "Id": "h-examplehandshakeid111",
+ "State":"CANCELED",
+ "Action": "INVITE",
+ "Arn": "arn:aws:organizations::111111111111:handshake/o-exampleorgid/invite/h-examplehandshakeid111",
+ "Parties": [
+ {
+ "Id": "o-exampleorgid",
+ "Type": "ORGANIZATION"
+ },
+ {
+ "Id": "susan at example.com",
+ "Type": "EMAIL"
+ }
+ ],
+ "Resources": [
+ {
+ "Type": "ORGANIZATION",
+ "Value": "o-exampleorgid",
+ "Resources": [
+ {
+ "Type": "MASTER_EMAIL",
+ "Value": "bill at example.com"
+ },
+ {
+ "Type": "MASTER_NAME",
+ "Value": "Master Account"
+ },
+ {
+ "Type": "ORGANIZATION_FEATURE_SET",
+ "Value": "CONSOLIDATED_BILLING"
+ }
+ ]
+ },
+ {
+ "Type": "EMAIL",
... 2364 lines suppressed ...
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/awscli.git
More information about the Python-modules-commits
mailing list