Merge branch 'release-1.10.13'

* release-1.10.13: Bumping version to 1.10.13 Update CHANGELOG Update CHANGELOG examples for route53 change-tags-for-resource Allow pound sign for key in short hand Change groff command update dynamodb query example to use --expression-attribute-values fix file mode remove output:none from examples updated autoscaling set-instance-protection example updated ec2 authorize-security-group-ingress example New examples for CloudTrail
aws · Mar 16, 2016 · 94587bd · 94587bd
2 parents 3987ddf + 6f25448
commit 94587bd
Show file tree

Hide file tree

Showing 27 changed files with 308 additions and 27 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,17 @@
 CHANGELOG
 =========
 
+1.10.13
+=======
+
+* feature:``DMS``: Added support for AWS Database Migration Service
+* feature:``SES``: Added support for white-labeling
+* feature:``CodeDeploy``: Added support for BatchGetDeploymentGroups
+* feature:``endpoints``: Updated endpoints to latest version
+* bugfix:``groff``: Fix groff command which was causing issues on some systems
+* bugfix:``shorthand``: Allow ``#`` in keys in the shorthand parser
+
+
 1.10.12
 =======
 

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

diff --git a/awscli/examples/autoscaling/set-instance-protection.rst b/awscli/examples/autoscaling/set-instance-protection.rst
@@ -2,8 +2,8 @@
 
 This example enables instance protection for the specified instance::
 
-   aws autoscaling set-instance-protection --instance-ids i-93633f9b --protected-from-scale-in
+   aws autoscaling set-instance-protection --auto-scaling-group-name my-asg --instance-ids i-93633f9b --protected-from-scale-in
 
 This example disables instance protection for the specified instance::
 
-   aws autoscaling set-instance-protection --instance-ids i-93633f9b --no-protected-from-scale-in
+   aws autoscaling set-instance-protection --auto-scaling-group-name my-asg --instance-ids i-93633f9b --no-protected-from-scale-in
diff --git a/awscli/examples/cloudtrail/add-tags.rst b/awscli/examples/cloudtrail/add-tags.rst
@@ -0,0 +1,5 @@
+**To add tags to trail**
+
+The following ``add-tags`` command adds tags for ``Trail1``::
+
+  aws cloudtrail add-tags --resource-id arn:aws:cloudtrail:us-east-1:123456789012:trail/Trail1 --tags-list Key=name,Value=Alice Key=location,Value=us
diff --git a/awscli/examples/cloudtrail/create-subscription.rst b/awscli/examples/cloudtrail/create-subscription.rst
@@ -0,0 +1,32 @@
+**To create and configure AWS resources for a trail**
+
+The following ``create-subscription`` command creates a new S3 bucket and SNS topic for ``Trail1``::
+
+  aws cloudtrail create-subscription --name Trail1 --s3-new-bucket my-bucket --sns-new-topic my-topic
+
+Output::
+
+  Setting up new S3 bucket my-bucket...
+  Setting up new SNS topic my-topic...
+  Creating/updating CloudTrail configuration...
+  CloudTrail configuration:
+  {
+  "trailList": [ 
+    {
+      "IncludeGlobalServiceEvents": true, 
+      "Name": "Trail1", 
+      "TrailARN": "arn:aws:cloudtrail:us-east-1:123456789012:trail/Trail1", 
+      "LogFileValidationEnabled": false, 
+      "IsMultiRegionTrail": false, 
+      "S3BucketName": "my-bucket", 
+      "SnsTopicName": "my-topic", 
+      "HomeRegion": "us-east-1"
+    }
+  ], 
+  "ResponseMetadata": {
+  "HTTPStatusCode": 200, 
+  "RequestId": "f39e51f6-c615-11e5-85bd-d35ca21ee3e2"
+  }
+  }
+  Starting CloudTrail service...
+  Logs will be delivered to my-bucket
diff --git a/awscli/examples/cloudtrail/create-trail.rst b/awscli/examples/cloudtrail/create-trail.rst
@@ -0,0 +1,17 @@
+**To create a trail**
+
+The following ``create-trail`` command creates a multi-region trail named ``Trail1`` and specifies an S3 bucket::
+
+  aws cloudtrail create-trail --name Trail1 --s3-bucket-name my-bucket --is-multi-region-trail
+
+Output::
+
+  {
+    "IncludeGlobalServiceEvents": true, 
+    "Name": "Trail1", 
+    "TrailARN": "arn:aws:cloudtrail:us-west-2:123456789012:trail/Trail1", 
+    "LogFileValidationEnabled": false, 
+    "IsMultiRegionTrail": true, 
+    "S3BucketName": "my-bucket"
+  }
+ 
diff --git a/awscli/examples/cloudtrail/delete-trail.rst b/awscli/examples/cloudtrail/delete-trail.rst
@@ -0,0 +1,6 @@
+**To delete a trail**
+
+The following ``delete-trail`` command deletes a trail named ``Trail1``::
+
+  aws cloudtrail delete-trail --name Trail1
+  
diff --git a/awscli/examples/cloudtrail/describe-trails.rst b/awscli/examples/cloudtrail/describe-trails.rst
@@ -0,0 +1,35 @@
+**To describe a trail**
+
+The following ``describe-trails`` command returns the settings for ``Trail1`` and ``Trail2``::
+
+  aws cloudtrail describe-trails --trail-name-list Trail1 Trail2
+
+Output::
+
+  {
+   "trailList": [
+       {
+           "IncludeGlobalServiceEvents": true, 
+           "Name": "Trail1", 
+           "TrailARN": "arn:aws:cloudtrail:us-east-1:123456789012:trail/Trail1", 
+           "LogFileValidationEnabled": false, 
+           "IsMultiRegionTrail": false, 
+           "S3BucketName": "my-bucket", 
+           "CloudWatchLogsRoleArn": "arn:aws:iam::123456789012:role/CloudTrail_CloudWatchLogs_Role", 
+           "CloudWatchLogsLogGroupArn": "arn:aws:logs:us-east-1:123456789012:log-group:CloudTrail:*", 
+           "SnsTopicName": "my-topic", 
+           "HomeRegion": "us-east-1"
+       }, 
+       {
+           "IncludeGlobalServiceEvents": true, 
+           "Name": "Trail2", 
+           "S3KeyPrefix": "my-prefix", 
+           "TrailARN": "arn:aws:cloudtrail:us-east-1:123456789012:trail/Trail2", 
+           "LogFileValidationEnabled": false, 
+           "IsMultiRegionTrail": false, 
+           "S3BucketName": "my-bucket", 
+           "KmsKeyId": "arn:aws:kms:us-east-1:123456789012:key/4c5ae5ac-3c13-421e-8335-c7868ef6a769", 
+           "HomeRegion": "us-east-1"
+       }
+    ]
+  }
diff --git a/awscli/examples/cloudtrail/get-trail-status.rst b/awscli/examples/cloudtrail/get-trail-status.rst
@@ -0,0 +1,22 @@
+**To get the status of a trail**
+
+The following ``get-trail-status`` command returns the delivery and logging details for ``Trail1``::
+
+  aws cloudtrail get-trail-status --name Trail1
+
+Output::
+
+  {
+    "LatestNotificationTime": 1454022144.869, 
+    "LatestNotificationAttemptSucceeded": "2016-01-28T23:02:24Z", 
+    "LatestDeliveryAttemptTime": "2016-01-28T23:02:24Z", 
+    "LatestDeliveryTime": 1454022144.869, 
+    "TimeLoggingStarted": "2015-11-06T18:36:38Z", 
+    "LatestDeliveryAttemptSucceeded": "2016-01-28T23:02:24Z", 
+    "IsLogging": true, 
+    "LatestCloudWatchLogsDeliveryTime": 1454022144.918, 
+    "StartLoggingTime": 1446834998.695, 
+    "StopLoggingTime": 1446834996.933, 
+    "LatestNotificationAttemptTime": "2016-01-28T23:02:24Z", 
+    "TimeLoggingStopped": "2015-11-06T18:36:36Z"
+  }
diff --git a/awscli/examples/cloudtrail/list-public-keys.rst b/awscli/examples/cloudtrail/list-public-keys.rst
@@ -0,0 +1,18 @@
+**To list all public keys for a trail**
+
+The following ``list-public-keys`` command returns all public keys whose private keys were used to sign the digest files within the specified time range::
+
+  aws cloudtrail list-public-keys --start-time 2016-01-01T20:30:00.000Z
+
+Output::
+
+  {
+    "PublicKeyList": [
+        {
+           "ValidityStartTime": 1453076702.0, 
+           "ValidityEndTime": 1455668702.0, 
+           "Value": "MIIBCgKCAQEAlSS3cl92HDycr/MTj0moOhas8habjrraXw+KzlWF0axSI2tcF+3iJ9BKQAVSKxGwxwu3m0wG3J+kUl1xboEcEPHYoIYMbgfSw7KGnuDKwkLzsQWhUJ0cIbOHASox1vv/5fNXkrHhGbDCHeVXm804c83nvHUEFYThr1PfyP/8HwrCtR3FX5OANtQCP61C1nJtSSkC8JSQUOrIP4CuwJjc+4WGDk+BGH5m9iuiAKkipEHWmUl8/P7XpfpWQuk4h8g3pXZOrNXr08lbh4d39svj7UqdhvOXoBISp9t/EXYuePGEtBdrKD9Dz+VHwyUPtBQvYr9BnkF88qBnaPNhS44rzwIDAQAB", 
+           "Fingerprint": "7f3f401420072e50a65a141430817ab3"
+       }
+    ]
+  }
diff --git a/awscli/examples/cloudtrail/list-tags.rst b/awscli/examples/cloudtrail/list-tags.rst
@@ -0,0 +1,34 @@
+**To list the tags for a trail**
+
+The following ``list-tags`` command lists the tags for ``Trail1`` and ``Trail2``::
+
+  aws cloudtrail list-tags --resource-id-list arn:aws:cloudtrail:us-east-1:123456789012:trail/Trail1 arn:aws:cloudtrail:us-east-1:123456789012:trail/Trail2
+
+Output::
+
+  {
+   "ResourceTagList": [
+       {
+           "ResourceId": "arn:aws:cloudtrail:us-east-1:123456789012:trail/Trail1", 
+           "TagsList": [
+               {
+                   "Value": "Alice", 
+                   "Key": "name"
+               }, 
+               {
+                   "Value": "us", 
+                   "Key": "location"
+               }
+           ]
+       }, 
+       {
+           "ResourceId": "arn:aws:cloudtrail:us-east-1:123456789012:trail/Trail2", 
+           "TagsList": [
+               {
+                   "Value": "Bob", 
+                   "Key": "name"
+               }
+           ]
+       }
+    ]
+  }
diff --git a/awscli/examples/cloudtrail/lookup-events.rst b/awscli/examples/cloudtrail/lookup-events.rst
@@ -0,0 +1,20 @@
+**To look up events for a trail**
+
+The following ``lookup-events`` command looks up API activity events by the attribute ``EventName``::
+
+  aws cloudtrail lookup-events --lookup-attributes AttributeKey=EventName,AttributeValue=ConsoleLogin
+
+Output::
+
+  {
+    "Events": [
+       {
+           "EventId": "654ccbc0-ba0d-486a-9076-dbf7274677a7", 
+           "Username": "my-session-name", 
+           "EventTime": 1453844532.0, 
+           "CloudTrailEvent": "{\"eventVersion\":\"1.02\",\"userIdentity\":{\"type\":\"AssumedRole\",\"principalId\":\"AROAJIKPFTA72SWU4L7T4:my-session-name\",\"arn\":\"arn:aws:sts::123456789012:assumed-role/my-role/my-session-name\",\"accountId\":\"123456789012\",\"sessionContext\":{\"attributes\":{\"mfaAuthenticated\":\"false\",\"creationDate\":\"2016-01-26T21:42:12Z\"},\"sessionIssuer\":{\"type\":\"Role\",\"principalId\":\"AROAJIKPFTA72SWU4L7T4\",\"arn\":\"arn:aws:iam::123456789012:role/my-role\",\"accountId\":\"123456789012\",\"userName\":\"my-role\"}}},\"eventTime\":\"2016-01-26T21:42:12Z\",\"eventSource\":\"signin.amazonaws.com\",\"eventName\":\"ConsoleLogin\",\"awsRegion\":\"us-east-1\",\"sourceIPAddress\":\"72.21.198.70\",\"userAgent\":\"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.111 Safari/537.36\",\"requestParameters\":null,\"responseElements\":{\"ConsoleLogin\":\"Success\"},\"additionalEventData\":{\"MobileVersion\":\"No\",\"MFAUsed\":\"No\"},\"eventID\":\"654ccbc0-ba0d-486a-9076-dbf7274677a7\",\"eventType\":\"AwsConsoleSignIn\",\"recipientAccountId\":\"123456789012\"}", 
+           "EventName": "ConsoleLogin", 
+           "Resources": []
+       }
+    ]
+  }
diff --git a/awscli/examples/cloudtrail/remove-tags.rst b/awscli/examples/cloudtrail/remove-tags.rst
@@ -0,0 +1,5 @@
+**To remove tags for a trail**
+
+The following ``remove-tags`` command removes the specified tags for ``Trail1``::
+
+  aws cloudtrail remove-tags --resource-id arn:aws:cloudtrail:us-east-1:123456789012:trail/Trail1 --tags-list Key=name Key=location
diff --git a/awscli/examples/cloudtrail/start-logging.rst b/awscli/examples/cloudtrail/start-logging.rst
@@ -0,0 +1,5 @@
+**To start logging for a trail**
+
+The following ``start-logging`` command turns on logging for ``Trail1``::
+
+  aws cloudtrail start-logging --name Trail1
diff --git a/awscli/examples/cloudtrail/stop-logging.rst b/awscli/examples/cloudtrail/stop-logging.rst
@@ -0,0 +1,5 @@
+**To stop logging a trail**
+
+The following ``stop-logging`` command turns off logging for ``Trail1``::
+
+  aws cloudtrail stop-logging --name Trail1
diff --git a/awscli/examples/cloudtrail/update-subscription.rst b/awscli/examples/cloudtrail/update-subscription.rst
@@ -0,0 +1,30 @@
+**To update the configuration settings for a trail**
+
+The following ``update-subscription`` command updates the trail to specify a new S3 bucket and SNS topic::
+
+  aws cloudtrail update-subscription --name Trail1 --s3-new-bucket my-bucket-new --sns-new-topic my-topic-new
+
+Output::
+
+  Setting up new S3 bucket my-bucket-new...
+  Setting up new SNS topic my-topic-new...
+  Creating/updating CloudTrail configuration...
+  CloudTrail configuration:
+  {
+  "trailList": [
+    {
+      "IncludeGlobalServiceEvents": true, 
+      "Name": "Trail1", 
+      "TrailARN": "arn:aws:cloudtrail:us-east-1:123456789012:trail/Trail1", 
+      "LogFileValidationEnabled": false, 
+      "IsMultiRegionTrail": false, 
+      "S3BucketName": "my-bucket-new", 
+      "SnsTopicName": "my-topic-new", 
+      "HomeRegion": "us-east-1"
+    }
+  ], 
+  "ResponseMetadata": {
+  "HTTPStatusCode": 200, 
+  "RequestId": "31126f8a-c616-11e5-9cc6-2fd637936879"
+  }
+  }
diff --git a/awscli/examples/cloudtrail/update-trail.rst b/awscli/examples/cloudtrail/update-trail.rst
@@ -0,0 +1,16 @@
+**To update a trail**
+
+The following ``update-trail`` command updates a trail to use an existing bucket for log delivery::
+
+  aws cloudtrail update-trail --name Trail1 --s3-bucket-name my-bucket
+
+Output::
+
+  {
+    "IncludeGlobalServiceEvents": true, 
+    "Name": "Trail1", 
+    "TrailARN": "arn:aws:cloudtrail:us-west-2:123456789012:trail/Trail1", 
+    "LogFileValidationEnabled": false, 
+    "IsMultiRegionTrail": true, 
+    "S3BucketName": "my-bucket"
+  }
diff --git a/awscli/examples/cloudtrail/validate-logs.rst b/awscli/examples/cloudtrail/validate-logs.rst
@@ -0,0 +1,13 @@
+**To validate a log file**
+
+The following ``validate-logs`` command validates the logs for ``Trail1``::
+
+  aws cloudtrail validate-logs --trail-arn arn:aws:cloudtrail:us-east-1:123456789012:trail/Trail1 --start-time 20160129T19:00:00Z
+
+Output::
+
+  Validating log files for trail arn:aws:cloudtrail:us-east-1:123456789012:trail/Trail1 between 2016-01-29T19:00:00Z and 2016-01-29T22:15:43Z
+  Results requested for 2016-01-29T19:00:00Z to 2016-01-29T22:15:43Z
+  Results found for 2016-01-29T19:24:57Z to 2016-01-29T21:24:57Z:
+  3/3 digest files valid
+  15/15 log files valid
diff --git a/awscli/examples/dynamodb/query.rst b/awscli/examples/dynamodb/query.rst
@@ -4,35 +4,32 @@ This example queries items in the *MusicCollection* table. The table has a hash-
 
 Command::
 
-  aws dynamodb query --table-name MusicCollection --key-conditions file://key-conditions.json --projection-expression "SongTitle"
+  aws dynamodb query --table-name MusicCollection --key-condition-expression "Artist = :v1 AND SongTitle = :v2" --expression-attribute-values file://expression-attributes.json
 
-The arguments for ``--key-conditions`` are stored in a JSON file, ``key-conditions.json``.  Here are the contents of that file::
+The arguments for ``--expression-attribute-values`` are stored in a JSON file named ``expression-attributes.json``::
 
-  { 
-      "Artist": { 
-          "AttributeValueList": [ 
-              {"S": "No One You Know"}
-          ],  
-          "ComparisonOperator": "EQ" 
-      } 
+  {
+    ":v1": {"S": "No One You Know"},
+    ":v2": {"S": "Call Me Today"}
   }
 
 Output::
 
   {
-      "Count": 2, 
+      "Count": 1,
       "Items": [
           {
+              "AlbumTitle": {
+                  "S": "Somewhat Famous"
+              },
               "SongTitle": {
                   "S": "Call Me Today"
-              }
-          }, 
-          {
-              "SongTitle": {
-                  "S": "Scared of My Shadow"
+              },
+              "Artist": {
+                  "S": "No One You Know"
               }
           }
-      ], 
-      "ScannedCount": 2, 
+      ],
+      "ScannedCount": 1,
       "ConsumedCapacity": null
   }
diff --git a/awscli/examples/ec2/authorize-security-group-ingress.rst b/awscli/examples/ec2/authorize-security-group-ingress.rst
@@ -32,7 +32,7 @@ Command::
 
 **[EC2-VPC] To add a rule that allows inbound HTTP traffic from another security group**
 
-This example enables inbound access on TCP port 80 from the source security group sg-1a2b3c4d. Note that for EC2-VPC, the source group must be in the same VPC. If the command succeeds, no output is returned.
+This example enables inbound access on TCP port 80 from the source security group sg-1a2b3c4d. Note that for EC2-VPC, the source group must be in the same VPC or in a peer VPC (requires a VPC peering connection). If the command succeeds, no output is returned.
 
 Command::
 

diff --git a/awscli/examples/route53/change-tags-for-resource.rst b/awscli/examples/route53/change-tags-for-resource.rst
@@ -0,0 +1,7 @@
+The following command adds a tag named ``owner`` to a healthcheck resource specified by ID::
+
+  aws route53 change-tags-for-resource --resource-type healthcheck --resource-id 6233434j-18c1-34433-ba8e-3443434 --add-tags Key=owner,Value=myboss
+
+The following command removes a tag named ``owner`` from a hosted zone resource specified by ID::
+
+  aws route53 change-tags-for-resource --resource-type hostedzone --resource-id Z1523434445 --remove-tag-keys owner