Merge branch 'release-1.7.0' into develop

* release-1.7.0: Bumping version to 1.7.0 Update completer test for new services Update changelog with new features Adding Amazon ECS examples.
aws · Jan 8, 2015 · 6afb7c5 · 6afb7c5
2 parents 906a234 + a7656a6
commit 6afb7c5
Show file tree

Hide file tree

Showing 17 changed files with 451 additions and 12 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,9 +2,16 @@
 CHANGELOG
 =========
 
-Next Release (TBD)
-==================
+1.7.0
+=====
 
+* feature:``aws cloudhsm``: Add support for AWS CloudHSM. 
+* feature:``aws ecs``: Add support for ``aws ecs``, the Amazon EC2
+  Container Service (ECS)
+* feature:``aws rds``: Add Encryption at Rest and CloudHSM Support.
+* feature:``aws ec2``: Add Classic Link support
+* feature:``aws cloudsearch``: Update ``aws cloudsearch`` command
+  to latest version
 * bugfix:``aws cloudfront wait``: Fix issue where wait commands did not
   stop waiting when a success state was reached.
   (`botocore issue 426 <https://github.com/boto/botocore/pull/426>`_)

diff --git a/awscli/__init__.py b/awscli/__init__.py
@@ -17,7 +17,7 @@
 """
 import os
 
-__version__ = '1.6.10'
+__version__ = '1.7.0'
 
 #
 # Get our data path to be added to botocore's search path

diff --git a/awscli/examples/ecs/create-cluster.rst b/awscli/examples/ecs/create-cluster.rst
@@ -0,0 +1,17 @@
+**To create a new cluster**
+
+This example command creates a cluster in your default region.
+
+Command::
+
+  aws ecs create-cluster --cluster-name "dev_preview"
+
+Output::
+
+	{
+	    "cluster": {
+	        "clusterName": "dev_preview",
+	        "status": "ACTIVE",
+	        "clusterArn": "arn:aws:ecs:us-west-2:<aws_account_id>:cluster/dev_preview"
+	    }
+	}
diff --git a/awscli/examples/ecs/deregister-container-instance.rst b/awscli/examples/ecs/deregister-container-instance.rst
@@ -0,0 +1,7 @@
+**To deregister a container instance from a cluster**
+
+This example deregisters a container instance from the specified cluster in your default region. If there are still tasks running on the container instance, you must either stop those tasks before deregistering, or use the force option.
+
+Command::
+
+  aws ecs deregister-container-instance --cluster default --container-instance <container_instance_UUID> --force
diff --git a/awscli/examples/ecs/describe-cluster.rst b/awscli/examples/ecs/describe-cluster.rst
@@ -0,0 +1,20 @@
+**To describe a cluster**
+
+This example command provides a description of the specified cluster in your default region.
+
+Command::
+
+  aws ecs describe-cluster --cluster default
+
+Output::
+
+	{
+	    "clusters": [
+	        {
+	            "clusterName": "default",
+	            "status": "ACTIVE",
+	            "clusterArn": "arn:aws:ecs:us-west-2:<aws_account_id>:cluster/default"
+	        }
+	    ],
+	    "failures": []
+	}
diff --git a/awscli/examples/ecs/describe-container-instance.rst b/awscli/examples/ecs/describe-container-instance.rst
@@ -0,0 +1,52 @@
+**To describe container instance**
+
+This example command provides a description of the specified container instance in your default region, using the container instance UUID as an identifier.
+
+Command::
+
+  aws ecs describe-container-instance --cluster default --container-instance f6bbb147-5370-4ace-8c73-c7181ded911f
+
+Output::
+
+	{
+	    "failures": [],
+	    "containerInstances": [
+	        {
+	            "status": "ACTIVE",
+	            "remainingResources": [
+	                {
+	                    "integerValue": 32748,
+	                    "longValue": 0,
+	                    "type": "INTEGER",
+	                    "name": "CPU",
+	                    "doubleValue": 0.0
+	                },
+	                {
+	                    "integerValue": 60377,
+	                    "longValue": 0,
+	                    "type": "INTEGER",
+	                    "name": "MEMORY",
+	                    "doubleValue": 0.0
+	                }
+	            ],
+	            "registeredResources": [
+	                {
+	                    "integerValue": 32768,
+	                    "longValue": 0,
+	                    "type": "INTEGER",
+	                    "name": "CPU",
+	                    "doubleValue": 0.0
+	                },
+	                {
+	                    "integerValue": 60397,
+	                    "longValue": 0,
+	                    "type": "INTEGER",
+	                    "name": "MEMORY",
+	                    "doubleValue": 0.0
+	                }
+	            ],
+	            "containerInstanceArn": "arn:aws:ecs:us-west-2:<aws_account_id>:container-instance/f6bbb147-5370-4ace-8c73-c7181ded911f",
+	            "ec2InstanceId": "i-0f51df05"
+	        }
+	    ]
+	}
diff --git a/awscli/examples/ecs/describe-task-definition.rst b/awscli/examples/ecs/describe-task-definition.rst
@@ -0,0 +1,66 @@
+**To describe a task definition**
+
+This example command provides a description of the specified task definition.
+
+Command::
+
+  aws ecs describe-task-definition --task-definition wordpress:6
+
+Output::
+
+	{
+	    "taskDefinition": {
+	        "taskDefinitionArn": "arn:aws:ecs:us-west-2:<aws_account_id>:task-definition/wordpress:6",
+	        "containerDefinitions": [
+	            {
+	                "environment": [
+	                    {
+	                        "name": "DB_USER",
+	                        "value": "root"
+	                    },
+	                    {
+	                        "name": "DB_PASS",
+	                        "value": "pass"
+	                    }
+	                ],
+	                "name": "wordpress",
+	                "links": [
+	                    "db"
+	                ],
+	                "image": "tutum/wordpress-stackable",
+	                "essential": true,
+	                "portMappings": [
+	                    {
+	                        "containerPort": 80,
+	                        "hostPort": 80
+	                    }
+	                ],
+	                "entryPoint": [
+	                    "/bin/sh",
+	                    "-c"
+	                ],
+	                "memory": 500,
+	                "cpu": 10
+	            },
+	            {
+	                "environment": [
+	                    {
+	                        "name": "MYSQL_ROOT_PASSWORD",
+	                        "value": "pass"
+	                    }
+	                ],
+	                "name": "db",
+	                "image": "mysql",
+	                "cpu": 10,
+	                "portMappings": [],
+	                "entryPoint": [
+	                    "/entrypoint.sh"
+	                ],
+	                "memory": 500,
+	                "essential": true
+	            }
+	        ],
+	        "family": "wordpress",
+	        "revision": 6
+	    }
+	}
diff --git a/awscli/examples/ecs/describe-task.rst b/awscli/examples/ecs/describe-task.rst
@@ -0,0 +1,37 @@
+**To describe a task**
+
+This example command provides a description of the specified task, using the task UUID as an identifier.
+
+Command::
+
+  aws ecs describe-task --cluster default --task 0cc43cdb-3bee-4407-9c26-c0e6ea5bee84
+
+Output::
+
+	{
+	    "failures": [],
+	    "tasks": [
+	        {
+	            "taskArn": "arn:aws:ecs:us-west-2:<aws_account_id>:task/0cc43cdb-3bee-4407-9c26-c0e6ea5bee84",
+	            "overrides": {
+	                "containerOverrides": [
+	                    {
+	                        "name": "sleep"
+	                    }
+	                ]
+	            },
+	            "lastStatus": "PENDING",
+	            "containerInstanceArn": "arn:aws:ecs:us-west-2:<aws_account_id>:container-instance/f6bbb147-5370-4ace-8c73-c7181ded911f",
+	            "desiredStatus": "RUNNING",
+	            "taskDefinitionArn": "arn:aws:ecs:us-west-2:<aws_account_id>:task-definition/sleep360:1",
+	            "containers": [
+	                {
+	                    "containerArn": "arn:aws:ecs:us-west-2:<aws_account_id>:container/291bb057-f49c-4bd7-9b50-9c891359083b",
+	                    "taskArn": "arn:aws:ecs:us-west-2:<aws_account_id>:task/0cc43cdb-3bee-4407-9c26-c0e6ea5bee84",
+	                    "lastStatus": "PENDING",
+	                    "name": "sleep"
+	                }
+	            ]
+	        }
+	    ]
+	}
diff --git a/awscli/examples/ecs/list-clusters.rst b/awscli/examples/ecs/list-clusters.rst
@@ -0,0 +1,17 @@
+**To list your available clusters**
+
+This example command lists all of your available clusters in your default region.
+
+Command::
+
+  aws ecs list-clusters
+
+Output::
+
+	{
+	    "clusterArns": [
+	        "arn:aws:ecs:us-west-2:<aws_account_id>:cluster/test",
+	        "arn:aws:ecs:us-west-2:<aws_account_id>:cluster/default",
+	        "arn:aws:ecs:us-west-2:<aws_account_id>:cluster/My test cluster"
+	    ]
+	}
diff --git a/awscli/examples/ecs/list-container-instances.rst b/awscli/examples/ecs/list-container-instances.rst
@@ -0,0 +1,16 @@
+**To list your available container instances in a cluster**
+
+This example command lists all of your available container instances in the specified cluster in your default region.
+
+Command::
+
+  aws ecs list-container-instances --cluster default
+
+Output::
+
+	{
+	    "containerInstanceArns": [
+	        "arn:aws:ecs:us-west-2:<aws_account_id>:container-instance/f6bbb147-5370-4ace-8c73-c7181ded911f",
+	        "arn:aws:ecs:us-west-2:<aws_account_id>:container-instance/ffe3d344-77e2-476c-a4d0-bf560ad50acb"
+	    ]
+	}
diff --git a/awscli/examples/ecs/list-task-definitions.rst b/awscli/examples/ecs/list-task-definitions.rst
@@ -0,0 +1,39 @@
+**To list your registered task definitions**
+
+This example command lists all of your registered task definitions.
+
+Command::
+
+  aws ecs list-task-definitions
+
+Output::
+
+	{
+	    "taskDefinitionArns": [
+	        "arn:aws:ecs:us-west-2:<aws_account_id>:task-definition/sleep300:2",
+	        "arn:aws:ecs:us-west-2:<aws_account_id>:task-definition/sleep360:1",
+	        "arn:aws:ecs:us-west-2:<aws_account_id>:task-definition/wordpress:3",
+	        "arn:aws:ecs:us-west-2:<aws_account_id>:task-definition/wordpress:4",
+	        "arn:aws:ecs:us-west-2:<aws_account_id>:task-definition/wordpress:5",
+	        "arn:aws:ecs:us-west-2:<aws_account_id>:task-definition/wordpress:6"
+	    ]
+	}
+
+**To list the registered task definitions in a family**
+
+This example command lists the task definition revisions of a specified family.
+
+Command::
+
+  aws ecs list-task-definitions --family-prefix wordpress
+
+Output::
+
+	{
+	    "taskDefinitionArns": [
+	        "arn:aws:ecs:us-west-2:<aws_account_id>:task-definition/wordpress:3",
+	        "arn:aws:ecs:us-west-2:<aws_account_id>:task-definition/wordpress:4",
+	        "arn:aws:ecs:us-west-2:<aws_account_id>:task-definition/wordpress:5",
+	        "arn:aws:ecs:us-west-2:<aws_account_id>:task-definition/wordpress:6"
+	    ]
+	}
diff --git a/awscli/examples/ecs/list-tasks.rst b/awscli/examples/ecs/list-tasks.rst
@@ -0,0 +1,32 @@
+**To list the tasks in a cluster**
+
+This example command lists all of the tasks in a cluster.
+
+Command::
+
+  aws ecs list-tasks --cluster default
+
+Output::
+
+	{
+	    "taskArns": [
+	        "arn:aws:ecs:us-west-2:<aws_account_id>:task/0cc43cdb-3bee-4407-9c26-c0e6ea5bee84",
+	        "arn:aws:ecs:us-west-2:<aws_account_id>:task/6b809ef6-c67e-4467-921f-ee261c15a0a1"
+	    ]
+	}
+
+**To list the tasks on a particular container instance**
+
+This example command lists the tasks of a specified container instance, using the container instance UUID as a filter.
+
+Command::
+
+  aws ecs list-tasks --cluster default --container-instance f6bbb147-5370-4ace-8c73-c7181ded911f
+
+Output::
+
+	{
+	    "taskArns": [
+	        "arn:aws:ecs:us-west-2:<aws_account_id>:task/0cc43cdb-3bee-4407-9c26-c0e6ea5bee84"
+	    ]
+	}