Merge branch 'release-1.7.9'

* release-1.7.9: Bumping version to 1.7.9 Update changelog with new features Update unit test for SSM Changed region to us-east-1, since that is the region avail during preview. add warning to cloudwatch put-metric-alarm new elasticbeanstalk examples Fixed revision number in example. Fix service scope in arn. Fixed entry point example. Clarify pronouns
aws · Feb 17, 2015 · 445e5d6 · 445e5d6
2 parents 11a0ed4 + 9efa1b6
commit 445e5d6
Show file tree

Hide file tree

Showing 21 changed files with 172 additions and 65 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,14 @@
 CHANGELOG
 =========
 
+1.7.9
+=====
+
+* feature:``aws cloudfront``: Update to latest API
+* feature:``aws sts``: Add support for STS regionalized calls
+* feature:``aws ssm``: Add support for Amazon Simple Systems Management Service (SSM)
+
+
 1.7.8
 =====
 

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

diff --git a/awscli/customizations/cliinputjson.py b/awscli/customizations/cliinputjson.py
@@ -41,8 +41,8 @@ class CliInputJSONArgument(OverrideRequiredArgsArgument):
         'help_text': 'Performs service operation based on the JSON string '
                      'provided. The JSON string follows the format provided '
                      'by ``--generate-cli-skeleton``. If other arguments are '
-                     'provided on the command line, it will not clobber their '
-                     'values.'
+                     'provided on the command line, the CLI values will override '
+                     'the JSON-provided values.'
     }
 
     def __init__(self, operation_object):

diff --git a/awscli/examples/cloudwatch/put-metric-alarm.rst b/awscli/examples/cloudwatch/put-metric-alarm.rst
@@ -4,4 +4,4 @@ The following example uses the ``put-metric-alarm`` command to send an Amazon Si
 
   aws cloudwatch put-metric-alarm --alarm-name cpu-mon --alarm-description "Alarm when CPU exceeds 70 percent" --metric-name CPUUtilization --namespace AWS/EC2 --statistic Average --period 300 --threshold 70 --comparison-operator GreaterThanThreshold  --dimensions  Name=InstanceId,Value=i-12345678 --evaluation-periods 2 --alarm-actions arn:aws:sns:us-east-1:111122223333:MyTopic --unit Percent
 
-This command returns to the prompt if successful.
+This command returns to the prompt if successful. If an alarm with the same name already exists, it will be overwritten by the new alarm.
diff --git a/awscli/examples/ecs/create-cluster.rst b/awscli/examples/ecs/create-cluster.rst
@@ -12,6 +12,6 @@ Output::
 	    "cluster": {
 	        "clusterName": "my_cluster",
 	        "status": "ACTIVE",
-	        "clusterArn": "arn:aws:ecs:us-west-2:<aws_account_id>:cluster/my_cluster"
+	        "clusterArn": "arn:aws:ecs:us-east-1:<aws_account_id>:cluster/my_cluster"
 	    }
 	}
diff --git a/awscli/examples/ecs/describe-clusters.rst b/awscli/examples/ecs/describe-clusters.rst
@@ -13,7 +13,7 @@ Output::
 	        {
 	            "clusterName": "default",
 	            "status": "ACTIVE",
-	            "clusterArn": "arn:aws:ecs:us-west-2:<aws_account_id>:cluster/default"
+	            "clusterArn": "arn:aws:ecs:us-east-1:<aws_account_id>:cluster/default"
 	        }
 	    ],
 	    "failures": []

diff --git a/awscli/examples/ecs/describe-container-instances.rst b/awscli/examples/ecs/describe-container-instances.rst
@@ -45,8 +45,8 @@ Output::
 	                    "doubleValue": 0.0
 	                }
 	            ],
-	            "containerInstanceArn": "arn:aws:ecs:us-west-2:<aws_account_id>:container-instance/f6bbb147-5370-4ace-8c73-c7181ded911f",
+	            "containerInstanceArn": "arn:aws:ecs:us-east-1:<aws_account_id>:container-instance/f6bbb147-5370-4ace-8c73-c7181ded911f",
 	            "ec2InstanceId": "i-0f51df05"
 	        }
 	    ]
-	}
+	}
diff --git a/awscli/examples/ecs/describe-tasks.rst b/awscli/examples/ecs/describe-tasks.rst
@@ -12,7 +12,7 @@ Output::
 	    "failures": [],
 	    "tasks": [
 	        {
-	            "taskArn": "arn:aws:ecs:us-west-2:<aws_account_id>:task/0cc43cdb-3bee-4407-9c26-c0e6ea5bee84",
+	            "taskArn": "arn:aws:ecs:us-east-1:<aws_account_id>:task/0cc43cdb-3bee-4407-9c26-c0e6ea5bee84",
 	            "overrides": {
 	                "containerOverrides": [
 	                    {
@@ -21,17 +21,17 @@ Output::
 	                ]
 	            },
 	            "lastStatus": "PENDING",
-	            "containerInstanceArn": "arn:aws:ecs:us-west-2:<aws_account_id>:container-instance/f6bbb147-5370-4ace-8c73-c7181ded911f",
+	            "containerInstanceArn": "arn:aws:ecs:us-east-1:<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",
+	            "taskDefinitionArn": "arn:aws:ecs:us-east-1:<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",
+	                    "containerArn": "arn:aws:ecs:us-east-1:<aws_account_id>:container/291bb057-f49c-4bd7-9b50-9c891359083b",
+	                    "taskArn": "arn:aws:ecs:us-east-1:<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
@@ -10,8 +10,8 @@ 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"
+	        "arn:aws:ecs:us-east-1:<aws_account_id>:cluster/test",
+	        "arn:aws:ecs:us-east-1:<aws_account_id>:cluster/default",
+	        "arn:aws:ecs:us-east-1:<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
@@ -10,7 +10,7 @@ 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"
+	        "arn:aws:ecs:us-east-1:<aws_account_id>:container-instance/f6bbb147-5370-4ace-8c73-c7181ded911f",
+	        "arn:aws:ecs:us-east-1:<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
@@ -10,12 +10,12 @@ 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"
+	        "arn:aws:ecs:us-east-1:<aws_account_id>:task-definition/sleep300:2",
+	        "arn:aws:ecs:us-east-1:<aws_account_id>:task-definition/sleep360:1",
+	        "arn:aws:ecs:us-east-1:<aws_account_id>:task-definition/wordpress:3",
+	        "arn:aws:ecs:us-east-1:<aws_account_id>:task-definition/wordpress:4",
+	        "arn:aws:ecs:us-east-1:<aws_account_id>:task-definition/wordpress:5",
+	        "arn:aws:ecs:us-east-1:<aws_account_id>:task-definition/wordpress:6"
 	    ]
 	}
 
@@ -31,9 +31,9 @@ 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"
+	        "arn:aws:ecs:us-east-1:<aws_account_id>:task-definition/wordpress:3",
+	        "arn:aws:ecs:us-east-1:<aws_account_id>:task-definition/wordpress:4",
+	        "arn:aws:ecs:us-east-1:<aws_account_id>:task-definition/wordpress:5",
+	        "arn:aws:ecs:us-east-1:<aws_account_id>:task-definition/wordpress:6"
 	    ]
-	}
+	}
diff --git a/awscli/examples/ecs/list-tasks.rst b/awscli/examples/ecs/list-tasks.rst
@@ -10,8 +10,8 @@ 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"
+	        "arn:aws:ecs:us-east-1:<aws_account_id>:task/0cc43cdb-3bee-4407-9c26-c0e6ea5bee84",
+	        "arn:aws:ecs:us-east-1:<aws_account_id>:task/6b809ef6-c67e-4467-921f-ee261c15a0a1"
 	    ]
 	}
 
@@ -27,6 +27,6 @@ Output::
 
 	{
 	    "taskArns": [
-	        "arn:aws:ecs:us-west-2:<aws_account_id>:task/0cc43cdb-3bee-4407-9c26-c0e6ea5bee84"
+	        "arn:aws:ecs:us-east-1:<aws_account_id>:task/0cc43cdb-3bee-4407-9c26-c0e6ea5bee84"
 	    ]
-	}
+	}
diff --git a/awscli/examples/ecs/register-task-definition.rst b/awscli/examples/ecs/register-task-definition.rst
@@ -15,13 +15,10 @@ JSON file format::
       "image": "busybox",
       "cpu": 10,
       "portMappings": [],
-      "entryPoint": [
-        "/bin/sh",
-        "-c"
-      ],
       "memory": 10,
       "command": [
-        "sleep 360"
+        "sleep",
+        "360"
       ],
       "essential": true
     }
@@ -31,27 +28,24 @@ Output::
 
 	{
 	    "taskDefinition": {
-	        "taskDefinitionArn": "arn:aws:ecs:us-east-1:<aws_account_id>:task-definition/sleep360:10",
+	        "taskDefinitionArn": "arn:aws:ecs:us-east-1:<aws_account_id>:task-definition/sleep360:1",
 	        "containerDefinitions": [
 	            {
 	                "environment": [],
 	                "name": "sleep",
 	                "image": "busybox",
 	                "cpu": 10,
 	                "portMappings": [],
-	                "entryPoint": [
-	                    "/bin/sh",
-	                    "-c"
-	                ],
-	                "memory": 10,
 	                "command": [
-	                    "sleep 360"
+	                    "sleep",
+	                    "360"
 	                ],
+	                "memory": 10,
 	                "essential": true
 	            }
 	        ],
 	        "family": "sleep360",
-	        "revision": 10
+	        "revision": 15
 	    }
 	}
 
@@ -61,32 +55,29 @@ This example registers a the same task definition from the previous example, but
 
 Command::
 
-  aws ecs register-task-definition --family sleep360 --container-definitions "[{\"environment\":[],\"name\":\"sleep\",\"image\":\"busybox\",\"cpu\":10,\"portMappings\":[],\"entryPoint\":[\"/bin/sh\",\"-c\"],\"memory\":10,\"command\":[\"sleep 360\"],\"essential\":true}]"
+  aws ecs register-task-definition --family sleep360 --container-definitions "[{\"environment\":[],\"name\":\"sleep\",\"image\":\"busybox\",\"cpu\":10,\"portMappings\":[],\"memory\":10,\"command\":[\"sleep\",\"360\"],\"essential\":true}]"
 
 Output::
 
 	{
 	    "taskDefinition": {
-	        "taskDefinitionArn": "arn:aws:ecs:us-east-1:<aws_account_id>:task-definition/sleep360:11",
+	        "taskDefinitionArn": "arn:aws:ecs:us-east-1:<aws_account_id>:task-definition/sleep360:15",
 	        "containerDefinitions": [
 	            {
 	                "environment": [],
 	                "name": "sleep",
 	                "image": "busybox",
 	                "cpu": 10,
 	                "portMappings": [],
-	                "entryPoint": [
-	                    "/bin/sh",
-	                    "-c"
-	                ],
-	                "memory": 10,
 	                "command": [
-	                    "sleep 360"
+	                    "sleep",
+	                    "360"
 	                ],
+	                "memory": 10,
 	                "essential": true
 	            }
 	        ],
 	        "family": "sleep360",
-	        "revision": 11
+	        "revision": 15
 	    }
 	}
diff --git a/awscli/examples/ecs/run-task.rst b/awscli/examples/ecs/run-task.rst
@@ -11,7 +11,7 @@ Output::
 	{
 	    "tasks": [
 	        {
-	            "taskArn": "arn:aws:ecs:us-west-2:<aws_account_id>:task/a9f21ea7-c9f5-44b1-b8e6-b31f50ed33c0",
+	            "taskArn": "arn:aws:ecs:us-east-1:<aws_account_id>:task/a9f21ea7-c9f5-44b1-b8e6-b31f50ed33c0",
 	            "overrides": {
 	                "containerOverrides": [
 	                    {
@@ -20,13 +20,13 @@ Output::
 	                ]
 	            },
 	            "lastStatus": "PENDING",
-	            "containerInstanceArn": "arn:aws:ecs:us-west-2:<aws_account_id>:container-instance/ffe3d344-77e2-476c-a4d0-bf560ad50acb",
+	            "containerInstanceArn": "arn:aws:ecs:us-east-1:<aws_account_id>:container-instance/ffe3d344-77e2-476c-a4d0-bf560ad50acb",
 	            "desiredStatus": "RUNNING",
-	            "taskDefinitionArn": "arn:aws:ecs:us-west-2:<aws_account_id>:task-definition/sleep360:1",
+	            "taskDefinitionArn": "arn:aws:ecs:us-east-1:<aws_account_id>:task-definition/sleep360:1",
 	            "containers": [
 	                {
-	                    "containerArn": "arn:aws:ecs:us-west-2:<aws_account_id>:container/58591c8e-be29-4ddf-95aa-ee459d4c59fd",
-	                    "taskArn": "arn:aws:ecs:us-west-2:<aws_account_id>:task/a9f21ea7-c9f5-44b1-b8e6-b31f50ed33c0",
+	                    "containerArn": "arn:aws:ecs:us-east-1:<aws_account_id>:container/58591c8e-be29-4ddf-95aa-ee459d4c59fd",
+	                    "taskArn": "arn:aws:ecs:us-east-1:<aws_account_id>:task/a9f21ea7-c9f5-44b1-b8e6-b31f50ed33c0",
 	                    "lastStatus": "PENDING",
 	                    "name": "sleep"
 	                }

diff --git a/awscli/examples/elasticbeanstalk/create-application-version.rst b/awscli/examples/elasticbeanstalk/create-application-version.rst
@@ -0,0 +1,23 @@
+**To create a new application version**
+
+The following command creates a new version, "v1" of an application named "MyApp"::
+
+  aws elasticbeanstalk create-application-version --application-name MyApp --version-label v1 --description MyAppv1 --source-bundle S3Bucket="my-bucket",S3Key="sample.war" --auto-create-application
+
+The application will be created automatically if it does not already exist, due to the auto-create-application option. The source bundle is a .war file stored in an s3 bucket named "my-bucket" that contains the Apache Tomcat sample application.
+
+Output::
+
+  {
+    "ApplicationVersion": {
+        "ApplicationName": "MyApp",
+        "VersionLabel": "v1",
+        "Description": "MyAppv1",
+        "DateCreated": "2015-02-03T23:01:25.412Z",
+        "DateUpdated": "2015-02-03T23:01:25.412Z",
+        "SourceBundle": {
+            "S3Bucket": "my-bucket",
+            "S3Key": "sample.war"
+        }
+    }
+  }
diff --git a/awscli/examples/elasticbeanstalk/create-application.rst b/awscli/examples/elasticbeanstalk/create-application.rst
@@ -0,0 +1,19 @@
+**To create a new application**
+
+The following command creates a new application named "MyApp"::
+
+  aws elasticbeanstalk create-application --application-name MyApp --description "my application"
+
+The ``create-application`` command only configures the application's name and description. To upload source code for the application, create an initial version of the application using ``create-application-version``. ``create-application-version`` also has an ``auto-create-application`` option that lets you create the application and the application version in one step.
+
+Output::
+
+  {
+    "Application": {
+        "ApplicationName": "MyApp",
+        "ConfigurationTemplates": [],
+        "DateUpdated": "2015-02-12T18:32:21.181Z",
+        "Description": "my application",
+        "DateCreated": "2015-02-12T18:32:21.181Z"
+    }
+  }
diff --git a/awscli/examples/elasticbeanstalk/create-environment.rst b/awscli/examples/elasticbeanstalk/create-environment.rst
@@ -1,3 +1,29 @@
+**To create a new environment for an application**
+
+The following command creates a new environment for version "v1" of a java application named "myApp"::
+
+  $ aws elasticbeanstalk create-environment --application-name myApp --environment-name myAppEnv --cname-prefix myApp --version-label v1 --solution-stack-name "64bit Amazon Linux running Tomcat 7"
+
+Output::
+
+  {
+    "ApplicationName": "myApp",
+    "EnvironmentName": "myAppEnv",
+    "VersionLabel": "v1",
+    "Status": "Launching",
+    "EnvironmentId": "e-izqpassy4h",
+    "SolutionStackName": "64bit Amazon Linux running Tomcat 7",
+    "CNAME": "myApp.elasticbeanstalk.com",
+    "Health": "Grey",
+    "Tier": {
+        "Version": " ",
+        "Type": "Standard",
+        "Name": "WebServer"
+    },
+    "DateUpdated": "2015-02-03T23:04:54.479Z",
+    "DateCreated": "2015-02-03T23:04:54.479Z"
+  }
+
 **To specify a JSON file to define environment configuration options**
 
 The following ``create-environment`` command specifies that a JSON file with the name ``myoptions.json`` should be used to override values obtained from the solution stack or the configuration template::
@@ -6,4 +32,4 @@ The following ``create-environment`` command specifies that a JSON file with the
 
 For more information, see `Option Values`_ in the *AWS Elastic Beanstalk Developer Guide*.
 
-.. _`Option Values`: http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/command-options.html
+.. _`Option Values`: http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/command-options.html