[Python-modules-commits] [awscli] 01/07: New upstream version 1.11.44
Takaki Taniguchi
takaki at moszumanska.debian.org
Thu Feb 2 09:14:18 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 1879731452bf3ebbeeeb9da67de846146afb8cb1
Author: TANIGUCHI Takaki <takaki at asis.media-as.org>
Date: Thu Feb 2 17:48:40 2017 +0900
New upstream version 1.11.44
---
LICENSE.txt | 2 +-
PKG-INFO | 46 +--
README.rst | 43 ++-
awscli.egg-info/PKG-INFO | 46 +--
awscli.egg-info/SOURCES.txt | 65 ++++
awscli.egg-info/requires.txt | 5 +-
awscli/__init__.py | 2 +-
awscli/alias.py | 282 ++++++++++++++
awscli/argparser.py | 39 +-
awscli/clidocs.py | 20 +
awscli/clidriver.py | 88 ++---
awscli/commands.py | 70 ++++
awscli/compat.py | 6 +
awscli/customizations/argrename.py | 5 +
awscli/customizations/cloudformation/__init__.py | 31 ++
.../cloudformation/artifact_exporter.py | 418 +++++++++++++++++++++
awscli/customizations/cloudformation/deploy.py | 232 ++++++++++++
awscli/customizations/cloudformation/deployer.py | 182 +++++++++
awscli/customizations/cloudformation/exceptions.py | 55 +++
awscli/customizations/cloudformation/package.py | 152 ++++++++
awscli/customizations/cloudformation/s3uploader.py | 202 ++++++++++
awscli/customizations/cloudformation/yamlhelper.py | 68 ++++
awscli/customizations/cloudfront.py | 3 +-
awscli/customizations/ec2/runinstances.py | 60 +--
awscli/customizations/emr/argumentschema.py | 143 +++++++
awscli/customizations/emr/constants.py | 11 +-
awscli/customizations/emr/createcluster.py | 14 +
awscli/customizations/emr/createdefaultroles.py | 111 +++---
awscli/customizations/emr/exceptions.py | 5 +
awscli/customizations/emr/helptext.py | 23 +-
awscli/customizations/emr/instancegroupsutils.py | 4 +
awscli/customizations/generatecliskeleton.py | 108 ++++--
awscli/customizations/globalargs.py | 18 +-
awscli/customizations/opsworks.py | 5 +-
awscli/customizations/opsworkscm.py | 21 ++
awscli/customizations/s3/results.py | 30 +-
awscli/customizations/s3/utils.py | 10 +-
awscli/customizations/s3endpoint.py | 3 +-
awscli/customizations/scalarparse.py | 47 ++-
awscli/customizations/utils.py | 19 +-
awscli/examples/batch/cancel-job.rst | 7 +
.../examples/batch/create-compute-environment.rst | 97 +++++
awscli/examples/batch/create-job-queue.rst | 61 +++
.../examples/batch/delete-compute-environment.rst | 7 +
awscli/examples/batch/delete-job-queue.rst | 7 +
.../examples/batch/deregister-job-definition.rst | 8 +
.../batch/describe-compute-environments.rst | 46 +++
awscli/examples/batch/describe-job-definitions.rst | 35 ++
awscli/examples/batch/describe-job-queues.rst | 28 ++
awscli/examples/batch/describe-jobs.rst | 37 ++
awscli/examples/batch/list-jobs.rst | 39 ++
awscli/examples/batch/register-job-definition.rst | 15 +
awscli/examples/batch/submit-job.rst | 14 +
awscli/examples/batch/terminate-job.rst | 7 +
.../examples/batch/update-compute-environment.rst | 14 +
awscli/examples/batch/update-job-queue.rst | 14 +
.../cloudformation/_deploy_description.rst | 8 +
.../cloudformation/_package_description.rst | 43 +++
awscli/examples/cloudformation/create-stack.rst | 2 +-
awscli/examples/cloudformation/deploy.rst | 6 +
awscli/examples/cloudformation/package.rst | 6 +
awscli/examples/cloudtrail/get-event-selectors.rst | 18 +
awscli/examples/cloudtrail/put-event-selectors.rst | 25 ++
awscli/examples/codecommit/get-repository.rst | 4 +-
.../configservice/delete-evaluation-results.rst | 5 +
.../start-config-rules-evaluation.rst | 5 +
awscli/examples/directconnect/describe-tags.rst | 23 ++
awscli/examples/directconnect/tag-resource.rst | 8 +
awscli/examples/directconnect/untag-resource.rst | 8 +
awscli/examples/discovery/describe-agents.rst | 46 +++
.../examples/discovery/describe-configurations.rst | 122 ++++++
awscli/examples/discovery/list-configurations.rst | 32 ++
awscli/examples/ec2/assign-ipv6-addresses.rst | 35 ++
.../examples/ec2/associate-subnet-cidr-block.rst | 20 +
awscli/examples/ec2/associate-vpc-cidr-block.rst | 19 +
.../ec2/authorize-security-group-ingress.rst | 8 +
.../ec2/create-egress-only-internet-gateway.rst | 21 ++
awscli/examples/ec2/create-network-acl-entry.rst | 9 +-
awscli/examples/ec2/create-network-interface.rst | 1 +
awscli/examples/ec2/create-route.rst | 10 +-
awscli/examples/ec2/create-subnet.rst | 51 ++-
awscli/examples/ec2/create-vpc.rst | 63 +++-
.../ec2/delete-egress-only-internet-gateway.rst | 13 +
.../ec2/describe-egress-only-internet-gateways.rst | 23 ++
awscli/examples/ec2/describe-network-acls.rst | 53 ++-
.../examples/ec2/describe-network-interfaces.rst | 55 +++
awscli/examples/ec2/describe-route-tables.rst | 55 ++-
awscli/examples/ec2/describe-subnets.rst | 53 ++-
awscli/examples/ec2/describe-vpcs.rst | 19 +-
.../ec2/disassociate-subnet-cidr-block.rst | 20 +
.../examples/ec2/disassociate-vpc-cidr-block.rst | 20 +
awscli/examples/ec2/modify-subnet-attribute.rst | 12 +-
awscli/examples/ec2/run-instances.rst | 9 +-
awscli/examples/ec2/unassign-ipv6-addresses.rst | 16 +
awscli/examples/elbv2/deregister-targets.rst | 8 +
awscli/examples/emr/create-cluster-examples.rst | 6 +
awscli/examples/opsworks-cm/associate-node.rst | 22 ++
awscli/examples/opsworks-cm/create-backup.rst | 46 +++
awscli/examples/opsworks-cm/create-server.rst | 51 +++
awscli/examples/opsworks-cm/delete-backup.rst | 17 +
awscli/examples/opsworks-cm/delete-server.rst | 16 +
.../opsworks-cm/describe-account-attributes.rst | 26 ++
awscli/examples/opsworks-cm/describe-backups.rst | 45 +++
awscli/examples/opsworks-cm/describe-events.rst | 27 ++
.../describe-node-association-status.rst | 20 +
awscli/examples/opsworks-cm/describe-servers.rst | 48 +++
awscli/examples/opsworks-cm/disassociate-node.rst | 19 +
awscli/examples/opsworks-cm/restore-server.rst | 20 +
awscli/examples/opsworks-cm/start-maintenance.rst | 48 +++
.../update-server-engine-attributes.rst | 48 +++
awscli/examples/opsworks-cm/update-server.rst | 48 +++
awscli/examples/swf/register-domain.rst | 3 +-
awscli/handlers.py | 4 +
awscli/paramfile.py | 4 +
awscli/testutils.py | 66 ++++
awscli/topics/config-vars.rst | 26 +-
awscli/utils.py | 5 +
bin/aws.cmd | 1 +
requirements.txt | 1 +
setup.cfg | 4 +-
setup.py | 6 +-
121 files changed, 4342 insertions(+), 369 deletions(-)
diff --git a/LICENSE.txt b/LICENSE.txt
index 0486b70..4c00dd5 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+Copyright 2012-2017 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 --git a/PKG-INFO b/PKG-INFO
index 2463d01..aa6f34c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: awscli
-Version: 1.11.13
+Version: 1.11.44
Summary: Universal Command Line Environment for AWS.
Home-page: http://aws.amazon.com/cli/
Author: Amazon Web Services
@@ -13,7 +13,7 @@ Description: =======
.. image:: https://travis-ci.org/aws/aws-cli.svg?branch=develop
:target: https://travis-ci.org/aws/aws-cli
:alt: Build Status
-
+
.. image:: https://badges.gitter.im/aws/aws-cli.svg
:target: https://gitter.im/aws/aws-cli
:alt: Gitter
@@ -28,6 +28,7 @@ Description: =======
* 3.3.x and greater
* 3.4.x and greater
* 3.5.x and greater
+ * 3.6.x and greater
.. attention::
We recommend that all customers regularly monitor the
@@ -193,25 +194,27 @@ Description: =======
configured either with environment variables, configuration file
entries or both. The following table documents these.
- =========== =========== ===================== ===================== ============================
- Variable Option Config Entry Environment Variable Description
- =========== =========== ===================== ===================== ============================
- profile --profile profile AWS_DEFAULT_PROFILE Default profile name
- ----------- ----------- --------------------- --------------------- ----------------------------
- region --region region AWS_DEFAULT_REGION Default AWS Region
- ----------- ----------- --------------------- --------------------- ----------------------------
- config_file AWS_CONFIG_FILE Alternate location of config
- ----------- ----------- --------------------- --------------------- ----------------------------
- output --output output AWS_DEFAULT_OUTPUT Default output style
- ----------- ----------- --------------------- --------------------- ----------------------------
- ca_bundle --ca-bundle ca_bundle AWS_CA_BUNDLE CA Certificate Bundle
- ----------- ----------- --------------------- --------------------- ----------------------------
- access_key aws_access_key_id AWS_ACCESS_KEY_ID AWS Access Key
- ----------- ----------- --------------------- --------------------- ----------------------------
- secret_key aws_secret_access_key AWS_SECRET_ACCESS_KEY AWS Secret Key
- ----------- ----------- --------------------- --------------------- ----------------------------
- token aws_session_token AWS_SESSION_TOKEN AWS Token (temp credentials)
- =========== =========== ===================== ===================== ============================
+ ==================== =========== ===================== ===================== ============================
+ Variable Option Config Entry Environment Variable Description
+ ==================== =========== ===================== ===================== ============================
+ profile --profile profile AWS_DEFAULT_PROFILE Default profile name
+ -------------------- ----------- --------------------- --------------------- ----------------------------
+ region --region region AWS_DEFAULT_REGION Default AWS Region
+ -------------------- ----------- --------------------- --------------------- ----------------------------
+ config_file AWS_CONFIG_FILE Alternate location of config
+ -------------------- ----------- --------------------- --------------------- ----------------------------
+ output --output output AWS_DEFAULT_OUTPUT Default output style
+ -------------------- ----------- --------------------- --------------------- ----------------------------
+ ca_bundle --ca-bundle ca_bundle AWS_CA_BUNDLE CA Certificate Bundle
+ -------------------- ----------- --------------------- --------------------- ----------------------------
+ access_key aws_access_key_id AWS_ACCESS_KEY_ID AWS Access Key
+ -------------------- ----------- --------------------- --------------------- ----------------------------
+ secret_key aws_secret_access_key AWS_SECRET_ACCESS_KEY AWS Secret Key
+ -------------------- ----------- --------------------- --------------------- ----------------------------
+ token aws_session_token AWS_SESSION_TOKEN AWS Token (temp credentials)
+ -------------------- ----------- --------------------- --------------------- ----------------------------
+ cli_timestamp_format cli_timestamp_format Ouput format of timestamps
+ ==================== =========== ===================== ===================== ============================
^^^^^^^^
Examples
@@ -429,3 +432,4 @@ Classifier: Programming Language :: Python :: 3
Classifier: Programming Language :: Python :: 3.3
Classifier: Programming Language :: Python :: 3.4
Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
diff --git a/README.rst b/README.rst
index 6e15a99..6c72ab8 100644
--- a/README.rst
+++ b/README.rst
@@ -5,7 +5,7 @@ aws-cli
.. image:: https://travis-ci.org/aws/aws-cli.svg?branch=develop
:target: https://travis-ci.org/aws/aws-cli
:alt: Build Status
-
+
.. image:: https://badges.gitter.im/aws/aws-cli.svg
:target: https://gitter.im/aws/aws-cli
:alt: Gitter
@@ -20,6 +20,7 @@ The aws-cli package works on Python versions:
* 3.3.x and greater
* 3.4.x and greater
* 3.5.x and greater
+* 3.6.x and greater
.. attention::
We recommend that all customers regularly monitor the
@@ -185,25 +186,27 @@ In addition to credentials, a number of other variables can be
configured either with environment variables, configuration file
entries or both. The following table documents these.
-=========== =========== ===================== ===================== ============================
-Variable Option Config Entry Environment Variable Description
-=========== =========== ===================== ===================== ============================
-profile --profile profile AWS_DEFAULT_PROFILE Default profile name
------------ ----------- --------------------- --------------------- ----------------------------
-region --region region AWS_DEFAULT_REGION Default AWS Region
------------ ----------- --------------------- --------------------- ----------------------------
-config_file AWS_CONFIG_FILE Alternate location of config
------------ ----------- --------------------- --------------------- ----------------------------
-output --output output AWS_DEFAULT_OUTPUT Default output style
------------ ----------- --------------------- --------------------- ----------------------------
-ca_bundle --ca-bundle ca_bundle AWS_CA_BUNDLE CA Certificate Bundle
------------ ----------- --------------------- --------------------- ----------------------------
-access_key aws_access_key_id AWS_ACCESS_KEY_ID AWS Access Key
------------ ----------- --------------------- --------------------- ----------------------------
-secret_key aws_secret_access_key AWS_SECRET_ACCESS_KEY AWS Secret Key
------------ ----------- --------------------- --------------------- ----------------------------
-token aws_session_token AWS_SESSION_TOKEN AWS Token (temp credentials)
-=========== =========== ===================== ===================== ============================
+==================== =========== ===================== ===================== ============================
+Variable Option Config Entry Environment Variable Description
+==================== =========== ===================== ===================== ============================
+profile --profile profile AWS_DEFAULT_PROFILE Default profile name
+-------------------- ----------- --------------------- --------------------- ----------------------------
+region --region region AWS_DEFAULT_REGION Default AWS Region
+-------------------- ----------- --------------------- --------------------- ----------------------------
+config_file AWS_CONFIG_FILE Alternate location of config
+-------------------- ----------- --------------------- --------------------- ----------------------------
+output --output output AWS_DEFAULT_OUTPUT Default output style
+-------------------- ----------- --------------------- --------------------- ----------------------------
+ca_bundle --ca-bundle ca_bundle AWS_CA_BUNDLE CA Certificate Bundle
+-------------------- ----------- --------------------- --------------------- ----------------------------
+access_key aws_access_key_id AWS_ACCESS_KEY_ID AWS Access Key
+-------------------- ----------- --------------------- --------------------- ----------------------------
+secret_key aws_secret_access_key AWS_SECRET_ACCESS_KEY AWS Secret Key
+-------------------- ----------- --------------------- --------------------- ----------------------------
+token aws_session_token AWS_SESSION_TOKEN AWS Token (temp credentials)
+-------------------- ----------- --------------------- --------------------- ----------------------------
+cli_timestamp_format cli_timestamp_format Ouput format of timestamps
+==================== =========== ===================== ===================== ============================
^^^^^^^^
Examples
diff --git a/awscli.egg-info/PKG-INFO b/awscli.egg-info/PKG-INFO
index 2463d01..aa6f34c 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.13
+Version: 1.11.44
Summary: Universal Command Line Environment for AWS.
Home-page: http://aws.amazon.com/cli/
Author: Amazon Web Services
@@ -13,7 +13,7 @@ Description: =======
.. image:: https://travis-ci.org/aws/aws-cli.svg?branch=develop
:target: https://travis-ci.org/aws/aws-cli
:alt: Build Status
-
+
.. image:: https://badges.gitter.im/aws/aws-cli.svg
:target: https://gitter.im/aws/aws-cli
:alt: Gitter
@@ -28,6 +28,7 @@ Description: =======
* 3.3.x and greater
* 3.4.x and greater
* 3.5.x and greater
+ * 3.6.x and greater
.. attention::
We recommend that all customers regularly monitor the
@@ -193,25 +194,27 @@ Description: =======
configured either with environment variables, configuration file
entries or both. The following table documents these.
- =========== =========== ===================== ===================== ============================
- Variable Option Config Entry Environment Variable Description
- =========== =========== ===================== ===================== ============================
- profile --profile profile AWS_DEFAULT_PROFILE Default profile name
- ----------- ----------- --------------------- --------------------- ----------------------------
- region --region region AWS_DEFAULT_REGION Default AWS Region
- ----------- ----------- --------------------- --------------------- ----------------------------
- config_file AWS_CONFIG_FILE Alternate location of config
- ----------- ----------- --------------------- --------------------- ----------------------------
- output --output output AWS_DEFAULT_OUTPUT Default output style
- ----------- ----------- --------------------- --------------------- ----------------------------
- ca_bundle --ca-bundle ca_bundle AWS_CA_BUNDLE CA Certificate Bundle
- ----------- ----------- --------------------- --------------------- ----------------------------
- access_key aws_access_key_id AWS_ACCESS_KEY_ID AWS Access Key
- ----------- ----------- --------------------- --------------------- ----------------------------
- secret_key aws_secret_access_key AWS_SECRET_ACCESS_KEY AWS Secret Key
- ----------- ----------- --------------------- --------------------- ----------------------------
- token aws_session_token AWS_SESSION_TOKEN AWS Token (temp credentials)
- =========== =========== ===================== ===================== ============================
+ ==================== =========== ===================== ===================== ============================
+ Variable Option Config Entry Environment Variable Description
+ ==================== =========== ===================== ===================== ============================
+ profile --profile profile AWS_DEFAULT_PROFILE Default profile name
+ -------------------- ----------- --------------------- --------------------- ----------------------------
+ region --region region AWS_DEFAULT_REGION Default AWS Region
+ -------------------- ----------- --------------------- --------------------- ----------------------------
+ config_file AWS_CONFIG_FILE Alternate location of config
+ -------------------- ----------- --------------------- --------------------- ----------------------------
+ output --output output AWS_DEFAULT_OUTPUT Default output style
+ -------------------- ----------- --------------------- --------------------- ----------------------------
+ ca_bundle --ca-bundle ca_bundle AWS_CA_BUNDLE CA Certificate Bundle
+ -------------------- ----------- --------------------- --------------------- ----------------------------
+ access_key aws_access_key_id AWS_ACCESS_KEY_ID AWS Access Key
+ -------------------- ----------- --------------------- --------------------- ----------------------------
+ secret_key aws_secret_access_key AWS_SECRET_ACCESS_KEY AWS Secret Key
+ -------------------- ----------- --------------------- --------------------- ----------------------------
+ token aws_session_token AWS_SESSION_TOKEN AWS Token (temp credentials)
+ -------------------- ----------- --------------------- --------------------- ----------------------------
+ cli_timestamp_format cli_timestamp_format Ouput format of timestamps
+ ==================== =========== ===================== ===================== ============================
^^^^^^^^
Examples
@@ -429,3 +432,4 @@ Classifier: Programming Language :: Python :: 3
Classifier: Programming Language :: Python :: 3.3
Classifier: Programming Language :: Python :: 3.4
Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
diff --git a/awscli.egg-info/SOURCES.txt b/awscli.egg-info/SOURCES.txt
index 0fa0ff7..252c8fb 100644
--- a/awscli.egg-info/SOURCES.txt
+++ b/awscli.egg-info/SOURCES.txt
@@ -5,11 +5,13 @@ requirements.txt
setup.cfg
setup.py
awscli/__init__.py
+awscli/alias.py
awscli/argparser.py
awscli/argprocess.py
awscli/arguments.py
awscli/clidocs.py
awscli/clidriver.py
+awscli/commands.py
awscli/compat.py
awscli/completer.py
awscli/errorhandler.py
@@ -51,6 +53,7 @@ awscli/customizations/iot.py
awscli/customizations/iot_data.py
awscli/customizations/kms.py
awscli/customizations/opsworks.py
+awscli/customizations/opsworkscm.py
awscli/customizations/paginate.py
awscli/customizations/preview.py
awscli/customizations/putmetricdata.py
@@ -65,6 +68,14 @@ awscli/customizations/streamingoutputarg.py
awscli/customizations/toplevelbool.py
awscli/customizations/utils.py
awscli/customizations/waiters.py
+awscli/customizations/cloudformation/__init__.py
+awscli/customizations/cloudformation/artifact_exporter.py
+awscli/customizations/cloudformation/deploy.py
+awscli/customizations/cloudformation/deployer.py
+awscli/customizations/cloudformation/exceptions.py
+awscli/customizations/cloudformation/package.py
+awscli/customizations/cloudformation/s3uploader.py
+awscli/customizations/cloudformation/yamlhelper.py
awscli/customizations/cloudtrail/__init__.py
awscli/customizations/cloudtrail/subscribe.py
awscli/customizations/cloudtrail/utils.py
@@ -311,11 +322,31 @@ 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
+awscli/examples/batch/cancel-job.rst
+awscli/examples/batch/create-compute-environment.rst
+awscli/examples/batch/create-job-queue.rst
+awscli/examples/batch/delete-compute-environment.rst
+awscli/examples/batch/delete-job-queue.rst
+awscli/examples/batch/deregister-job-definition.rst
+awscli/examples/batch/describe-compute-environments.rst
+awscli/examples/batch/describe-job-definitions.rst
+awscli/examples/batch/describe-job-queues.rst
+awscli/examples/batch/describe-jobs.rst
+awscli/examples/batch/list-jobs.rst
+awscli/examples/batch/register-job-definition.rst
+awscli/examples/batch/submit-job.rst
+awscli/examples/batch/terminate-job.rst
+awscli/examples/batch/update-compute-environment.rst
+awscli/examples/batch/update-job-queue.rst
+awscli/examples/cloudformation/_deploy_description.rst
+awscli/examples/cloudformation/_package_description.rst
awscli/examples/cloudformation/cancel-update-stack.rst
awscli/examples/cloudformation/create-stack.rst
+awscli/examples/cloudformation/deploy.rst
awscli/examples/cloudformation/describe-stacks.rst
awscli/examples/cloudformation/get-template.rst
awscli/examples/cloudformation/list-stacks.rst
+awscli/examples/cloudformation/package.rst
awscli/examples/cloudformation/update-stack.rst
awscli/examples/cloudformation/validate-template.rst
awscli/examples/cloudfront/create-distribution.rst
@@ -332,10 +363,12 @@ awscli/examples/cloudtrail/create-subscription.rst
awscli/examples/cloudtrail/create-trail.rst
awscli/examples/cloudtrail/delete-trail.rst
awscli/examples/cloudtrail/describe-trails.rst
+awscli/examples/cloudtrail/get-event-selectors.rst
awscli/examples/cloudtrail/get-trail-status.rst
awscli/examples/cloudtrail/list-public-keys.rst
awscli/examples/cloudtrail/list-tags.rst
awscli/examples/cloudtrail/lookup-events.rst
+awscli/examples/cloudtrail/put-event-selectors.rst
awscli/examples/cloudtrail/remove-tags.rst
awscli/examples/cloudtrail/start-logging.rst
awscli/examples/cloudtrail/stop-logging.rst
@@ -382,6 +415,7 @@ 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/delete-evaluation-results.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
@@ -401,6 +435,7 @@ 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-config-rules-evaluation.rst
awscli/examples/configservice/start-configuration-recorder.rst
awscli/examples/configservice/stop-configuration-recorder.rst
awscli/examples/configservice/subscribe.rst
@@ -476,8 +511,14 @@ awscli/examples/directconnect/describe-connections.rst
awscli/examples/directconnect/describe-interconnect-loa.rst
awscli/examples/directconnect/describe-interconnects.rst
awscli/examples/directconnect/describe-locations.rst
+awscli/examples/directconnect/describe-tags.rst
awscli/examples/directconnect/describe-virtual-gateways.rst
awscli/examples/directconnect/describe-virtual-interfaces.rst
+awscli/examples/directconnect/tag-resource.rst
+awscli/examples/directconnect/untag-resource.rst
+awscli/examples/discovery/describe-agents.rst
+awscli/examples/discovery/describe-configurations.rst
+awscli/examples/discovery/list-configurations.rst
awscli/examples/dms/create-endpoint.rst
awscli/examples/dms/create-replication-instance.rst
awscli/examples/dms/create-replication-task.rst
@@ -499,10 +540,13 @@ 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-ipv6-addresses.rst
awscli/examples/ec2/assign-private-ip-addresses.rst
awscli/examples/ec2/associate-address.rst
awscli/examples/ec2/associate-dhcp-options.rst
awscli/examples/ec2/associate-route-table.rst
+awscli/examples/ec2/associate-subnet-cidr-block.rst
+awscli/examples/ec2/associate-vpc-cidr-block.rst
awscli/examples/ec2/attach-classic-link-vpc.rst
awscli/examples/ec2/attach-internet-gateway.rst
awscli/examples/ec2/attach-network-interface.rst
@@ -521,6 +565,7 @@ awscli/examples/ec2/copy-image.rst
awscli/examples/ec2/copy-snapshot.rst
awscli/examples/ec2/create-customer-gateway.rst
awscli/examples/ec2/create-dhcp-options.rst
+awscli/examples/ec2/create-egress-only-internet-gateway.rst
awscli/examples/ec2/create-flow-logs.rst
awscli/examples/ec2/create-image.rst
awscli/examples/ec2/create-instance-export-task.rst
@@ -547,6 +592,7 @@ awscli/examples/ec2/create-vpn-connection.rst
awscli/examples/ec2/create-vpn-gateway.rst
awscli/examples/ec2/delete-customer-gateway.rst
awscli/examples/ec2/delete-dhcp-options.rst
+awscli/examples/ec2/delete-egress-only-internet-gateway.rst
awscli/examples/ec2/delete-flow-logs.rst
awscli/examples/ec2/delete-internet-gateway.rst
awscli/examples/ec2/delete-key-pair.rst
@@ -578,6 +624,7 @@ awscli/examples/ec2/describe-classic-link-instances.rst
awscli/examples/ec2/describe-conversion-tasks.rst
awscli/examples/ec2/describe-customer-gateways.rst
awscli/examples/ec2/describe-dhcp-options.rst
+awscli/examples/ec2/describe-egress-only-internet-gateways.rst
awscli/examples/ec2/describe-export-tasks.rst
awscli/examples/ec2/describe-flow-logs.rst
awscli/examples/ec2/describe-hosts.rst
@@ -639,6 +686,8 @@ 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/disassociate-subnet-cidr-block.rst
+awscli/examples/ec2/disassociate-vpc-cidr-block.rst
awscli/examples/ec2/enable-vgw-route-propagation.rst
awscli/examples/ec2/enable-volume-io.rst
awscli/examples/ec2/enable-vpc-classic-link-dns-support.rst
@@ -688,6 +737,7 @@ awscli/examples/ec2/run-scheduled-instances.rst
awscli/examples/ec2/start-instances.rst
awscli/examples/ec2/stop-instances.rst
awscli/examples/ec2/terminate-instances.rst
+awscli/examples/ec2/unassign-ipv6-addresses.rst
awscli/examples/ec2/unassign-private-ip-addresses.rst
awscli/examples/ec2/unmonitor-instances.rst
awscli/examples/ecr/batch-delete-image.rst
@@ -1066,6 +1116,21 @@ awscli/examples/opsworks/update-layer.rst
awscli/examples/opsworks/update-my-user-profile.rst
awscli/examples/opsworks/update-rds-db-instance.rst
awscli/examples/opsworks/update-volume.rst
+awscli/examples/opsworks-cm/associate-node.rst
+awscli/examples/opsworks-cm/create-backup.rst
+awscli/examples/opsworks-cm/create-server.rst
+awscli/examples/opsworks-cm/delete-backup.rst
+awscli/examples/opsworks-cm/delete-server.rst
+awscli/examples/opsworks-cm/describe-account-attributes.rst
+awscli/examples/opsworks-cm/describe-backups.rst
+awscli/examples/opsworks-cm/describe-events.rst
+awscli/examples/opsworks-cm/describe-node-association-status.rst
+awscli/examples/opsworks-cm/describe-servers.rst
+awscli/examples/opsworks-cm/disassociate-node.rst
+awscli/examples/opsworks-cm/restore-server.rst
+awscli/examples/opsworks-cm/start-maintenance.rst
+awscli/examples/opsworks-cm/update-server-engine-attributes.rst
+awscli/examples/opsworks-cm/update-server.rst
awscli/examples/rds/add-tag-to-resource.rst
awscli/examples/rds/create-db-instance.rst
awscli/examples/rds/create-db-security-group.rst
diff --git a/awscli.egg-info/requires.txt b/awscli.egg-info/requires.txt
index 9221e08..4074857 100644
--- a/awscli.egg-info/requires.txt
+++ b/awscli.egg-info/requires.txt
@@ -1,8 +1,9 @@
-botocore==1.4.70
+botocore==1.5.7
colorama>=0.2.5,<=0.3.7
docutils>=0.10
rsa>=3.1.2,<=3.5.0
s3transfer>=0.1.9,<0.2.0
+PyYAML>=3.10,<=3.12
[:python_version=="2.6"]
-argparse>=1.1
\ No newline at end of file
+argparse>=1.1
diff --git a/awscli/__init__.py b/awscli/__init__.py
index cd86c03..8a0746f 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.13'
+__version__ = '1.11.44'
#
# Get our data path to be added to botocore's search path
diff --git a/awscli/alias.py b/awscli/alias.py
new file mode 100644
index 0000000..90feb6d
--- /dev/null
+++ b/awscli/alias.py
@@ -0,0 +1,282 @@
+# Copyright 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
+# the License is located at
+#
+# http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+import logging
+import os
+import shlex
+import subprocess
+
+from botocore.configloader import raw_config_parse
+
+from awscli.commands import CLICommand
+from awscli.utils import emit_top_level_args_parsed_event
+
+
+LOG = logging.getLogger(__name__)
+
+
+class InvalidAliasException(Exception):
+ pass
+
+
+class AliasLoader(object):
+ def __init__(self,
+ alias_filename=os.path.expanduser(
+ os.path.join('~', '.aws', 'cli', 'alias'))):
+ """Interface for loading and interacting with alias file
+
+ :param alias_filename: The name of the file to load aliases from.
+ This file must be an INI file.
+ """
+ self._filename = alias_filename
+ self._aliases = None
+
+ def _build_aliases(self):
+ self._aliases = self._load_aliases()
+ self._cleanup_alias_values(self._aliases.get('toplevel', {}))
+
+ def _load_aliases(self):
+ if os.path.exists(self._filename):
+ return raw_config_parse(
+ self._filename, parse_subsections=False)
+ return {'toplevel': {}}
+
+ def _cleanup_alias_values(self, aliases):
+ for alias in aliases:
+ # Beginning and end line separators should not be included
+ # in the internal representation of the alias value.
+ aliases[alias] = aliases[alias].strip()
+
+ def get_aliases(self):
+ if self._aliases is None:
+ self._build_aliases()
+ return self._aliases.get('toplevel', {})
+
+
+class AliasCommandInjector(object):
+ def __init__(self, session, alias_loader):
+ """Injects alias commands for a command table
+
+ :type session: botocore.session.Session
+ :param session: The botocore session
+
+ :type alias_loader: awscli.alias.AliasLoader
+ :param alias_loader: The alias loader to use
+ """
+ self._session = session
+ self._alias_loader = alias_loader
+
+ def inject_aliases(self, command_table, parser):
+ for alias_name, alias_value in \
+ self._alias_loader.get_aliases().items():
+ if alias_value.startswith('!'):
+ alias_cmd = ExternalAliasCommand(alias_name, alias_value)
+ else:
+ service_alias_cmd_args = [
+ alias_name, alias_value, self._session, command_table,
+ parser
+ ]
+ # If the alias name matches something already in the
+ # command table provide the command it is about
+ # to clobber as a possible reference that it will
+ # need to proxy to.
+ if alias_name in command_table:
+ service_alias_cmd_args.append(
+ command_table[alias_name])
+ alias_cmd = ServiceAliasCommand(*service_alias_cmd_args)
+ command_table[alias_name] = alias_cmd
+
+
+class BaseAliasCommand(CLICommand):
+ _UNDOCUMENTED = True
+
+ def __init__(self, alias_name, alias_value):
+ """Base class for alias command
+
+ :type alias_name: string
+ :param alias_name: The name of the alias
+
+ :type alias_value: string
+ :param alias_value: The parsed value of the alias. This can be
+ retrieved from `AliasLoader.get_aliases()[alias_name]`
+ """
+ self._alias_name = alias_name
+ self._alias_value = alias_value
+
+ def __call__(self, args, parsed_args):
+ raise NotImplementedError('__call__')
+
+ @property
+ def name(self):
+ return self._alias_name
+
+ @name.setter
+ def name(self, value):
+ self._alias_name = value
+
+
+class ServiceAliasCommand(BaseAliasCommand):
+ UNSUPPORTED_GLOBAL_PARAMETERS = [
+ 'debug',
+ 'profile'
+ ]
+
+ def __init__(self, alias_name, alias_value, session, command_table,
+ parser, shadow_proxy_command=None):
+ """Command for a `toplevel` subcommand alias
+
+ :type alias_name: string
+ :param alias_name: The name of the alias
+
+ :type alias_value: string
+ :param alias_value: The parsed value of the alias. This can be
+ retrieved from `AliasLoader.get_aliases()[alias_name]`
+
+ :type session: botocore.session.Session
+ :param session: The botocore session
+
+ :type command_table: dict
+ :param command_table: The command table containing all of the
+ possible service command objects that a particular alias could
+ redirect to.
+
+ :type parser: awscli.argparser.MainArgParser
+ :param parser: The parser to parse commands provided at the top level
+ of a CLI command which includes service commands and global
+ parameters. This is used to parse the service commmand and any
+ global parameters from the alias's value.
+
+ :type shadow_proxy_command: CLICommand
+ :param shadow_proxy_command: A built-in command that
+ potentially shadows the alias in name. If the alias
+ references this command in its value, the alias should proxy
+ to this command as oppposed to proxy to itself in the command
+ table
+ """
+ super(ServiceAliasCommand, self).__init__(alias_name, alias_value)
+ self._session = session
+ self._command_table = command_table
+ self._parser = parser
+ self._shadow_proxy_command = shadow_proxy_command
+
+ def __call__(self, args, parsed_globals):
+ alias_args = self._get_alias_args()
+ parsed_alias_args, remaining = self._parser.parse_known_args(
+ alias_args)
+ self._update_parsed_globals(parsed_alias_args, parsed_globals)
+ # Take any of the remaining arguments that were not parsed out and
+ # prepend them to the remaining args provided to the alias.
+ remaining.extend(args)
+ LOG.debug(
+ 'Alias %r passing on arguments: %r to %r command',
+ self._alias_name, remaining, parsed_alias_args.command)
+ # Pass the update remaing args and global args to the service command
+ # the alias proxied to.
+ command = self._command_table[parsed_alias_args.command]
+ if self._shadow_proxy_command:
+ shadow_name = self._shadow_proxy_command.name
+ # Use the shadow command only if the aliases value
+ # uses that command indicating it needs to proxy over to
+ # a built-in command.
+ if shadow_name == parsed_alias_args.command:
+ LOG.debug(
+ 'Using shadowed command object: %s '
+ 'for alias: %s', self._shadow_proxy_command,
+ self._alias_name
+ )
+ command = self._shadow_proxy_command
+ return command(remaining, parsed_globals)
+
+ def _get_alias_args(self):
+ try:
+ alias_args = shlex.split(self._alias_value)
+ except ValueError as e:
+ raise InvalidAliasException(
+ 'Value of alias "%s" could not be parsed. '
+ 'Received error: %s when parsing:\n%s' % (
+ self._alias_name, e, self._alias_value)
+ )
+
+ alias_args = [arg.strip(os.linesep) for arg in alias_args]
+ LOG.debug(
+ 'Expanded subcommand alias %r with value: %r to: %r',
+ self._alias_name, self._alias_value, alias_args
+ )
+ return alias_args
+
+ def _update_parsed_globals(self, parsed_alias_args, parsed_globals):
+ global_params_to_update = self._get_global_parameters_to_update(
+ parsed_alias_args)
+ # Emit the top level args parsed event to ensure all possible
+ # customizations that typically get applied are applied to the
+ # global parameters provided in the alias before updating
+ # the original provided global parameter values
+ # and passing those onto subsequent commands.
+ emit_top_level_args_parsed_event(self._session, parsed_alias_args)
+ for param_name in global_params_to_update:
+ updated_param_value = getattr(parsed_alias_args, param_name)
+ setattr(parsed_globals, param_name, updated_param_value)
+
+ def _get_global_parameters_to_update(self, parsed_alias_args):
+ # Retrieve a list of global parameters that the newly parsed args
+ # from the alias will have to clobber from the originally provided
+ # parsed globals.
+ global_params_to_update = []
+ for parsed_param, value in vars(parsed_alias_args).items():
+ # To determine which parameters in the alias were global values
+ # compare the parsed alias parameters to the default as
+ # specified by the parser. If the parsed values from the alias
+ # differs from the default value in the parser,
+ # that global parameter must have been provided in the alias.
+ if self._parser.get_default(parsed_param) != value:
+ if parsed_param in self.UNSUPPORTED_GLOBAL_PARAMETERS:
+ raise InvalidAliasException(
+ 'Global parameter "--%s" detected in alias "%s" '
+ 'which is not support in subcommand aliases.' % (
+ parsed_param, self._alias_name))
+ else:
+ global_params_to_update.append(parsed_param)
+ return global_params_to_update
+
+
+class ExternalAliasCommand(BaseAliasCommand):
+ def __init__(self, alias_name, alias_value, invoker=subprocess.call):
+ """Command for external aliases
+
+ Executes command external of CLI as opposed to being a proxy
+ to another command.
+
+ :type alias_name: string
+ :param alias_name: The name of the alias
+
+ :type alias_value: string
+ :param alias_value: The parsed value of the alias. This can be
+ retrieved from `AliasLoader.get_aliases()[alias_name]`
+
+ :type invoker: callable
+ :param invoker: Callable to run arguments of external alias. The
+ signature should match that of ``subprocess.call``
+ """
+ self._alias_name = alias_name
+ self._alias_value = alias_value
+ self._invoker = invoker
+
+ def __call__(self, args, parsed_globals):
+ command_components = [
+ self._alias_value[1:]
+ ]
+ command_components.extend(args)
+ command = ' '.join(command_components)
+ LOG.debug(
+ 'Using external alias %r with value: %r to run: %r',
+ self._alias_name, self._alias_value, command)
+ return self._invoker(command, shell=True)
diff --git a/awscli/argparser.py b/awscli/argparser.py
index 03cbe86..0aebf37 100644
--- a/awscli/argparser.py
+++ b/awscli/argparser.py
@@ -29,6 +29,35 @@ USAGE = (
)
+class CommandAction(argparse.Action):
+ """Custom action for CLI command arguments
+
+ Allows the choices for the argument to be mutable. The choices
+ are dynamically retrieved from the keys of the referenced command
+ table
+ """
+ def __init__(self, option_strings, dest, command_table, **kwargs):
+ self.command_table = command_table
+ super(CommandAction, self).__init__(
+ option_strings, dest, choices=self.choices, **kwargs
+ )
+
+ def __call__(self, parser, namespace, values, option_string=None):
+ setattr(namespace, self.dest, values)
+
+ @property
+ def choices(self):
+ return list(self.command_table.keys())
+
+ @choices.setter
+ def choices(self, val):
+ # argparse.Action will always try to set this value upon
+ # instantiation, but this value should be dynamically
+ # generated from the command table keys. So make this a
+ # NOOP if argparse.Action tries to set this value.
+ pass
+
+
class CLIArgParser(argparse.ArgumentParser):
Formatter = argparse.RawTextHelpFormatter
@@ -106,7 +135,8 @@ class MainArgParser(CLIArgParser):
self.add_argument('--version', action="version",
version=version_string,
help='Display the version of this tool')
- self.add_argument('command', choices=list(command_table.keys()))
+ self.add_argument('command', action=CommandAction,
+ command_table=command_table)
class ServiceArgParser(CLIArgParser):
@@ -121,7 +151,8 @@ class ServiceArgParser(CLIArgParser):
self._service_name = service_name
def _build(self, operations_table):
- self.add_argument('operation', choices=list(operations_table.keys()))
+ self.add_argument('operation', action=CommandAction,
+ command_table=operations_table)
class ArgTableArgParser(CLIArgParser):
@@ -145,8 +176,8 @@ class ArgTableArgParser(CLIArgParser):
argument = argument_table[arg_name]
argument.add_to_parser(self)
if command_table:
- self.add_argument('subcommand', choices=list(command_table.keys()),
- nargs='?')
+ self.add_argument('subcommand', action=CommandAction,
+ command_table=command_table, nargs='?')
def parse_known_args(self, args, namespace=None):
if len(args) == 1 and args[0] == 'help':
diff --git a/awscli/clidocs.py b/awscli/clidocs.py
index 0da4a76..e7b6e89 100644
--- a/awscli/clidocs.py
+++ b/awscli/clidocs.py
@@ -300,6 +300,8 @@ class ServiceDocumentEventHandler(CLIDocumentEventHandler):
class OperationDocumentEventHandler(CLIDocumentEventHandler):
+ AWS_DOC_BASE = 'https://docs.aws.amazon.com/goto/WebAPI'
+
def build_translation_map(self):
operation_model = self.help_command.obj
d = {}
@@ -330,6 +332,24 @@ class OperationDocumentEventHandler(CLIDocumentEventHandler):
operation_model = help_command.obj
doc.style.h2('Description')
doc.include_doc_string(operation_model.documentation)
+ self._add_webapi_crosslink(help_command)
+
+ def _add_webapi_crosslink(self, help_command):
+ doc = help_command.doc
+ operation_model = help_command.obj
+ service_model = operation_model.service_model
+ service_uid = service_model.metadata.get('uid')
+ if service_uid is None:
+ # If there's no service_uid in the model, we can't
+ # be certain if the generated cross link will work
+ # so we don't generate any crosslink info.
+ return
+ doc.style.new_paragraph()
+ doc.write("See also: ")
+ link = '%s/%s/%s' % (self.AWS_DOC_BASE, service_uid,
+ operation_model.name)
+ doc.style.external_link(title="AWS API Documentation", link=link)
+ doc.writeln('')
def _json_example_value_name(self, argument_model, include_enum_values=True):
# If include_enum_values is True, then the valid enum values
diff --git a/awscli/clidriver.py b/awscli/clidriver.py
index abfcd7c..5c1b3d9 100644
--- a/awscli/clidriver.py
+++ b/awscli/clidriver.py
@@ -25,6 +25,7 @@ from botocore.exceptions import NoRegionError
from awscli import EnvironmentVariables, __version__
from awscli.formatter import get_formatter
from awscli.plugin import load_plugins
+from awscli.commands import CLICommand
from awscli.argparser import MainArgParser
... 5561 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