Merge branch 'release-1.15.31'

* release-1.15.31: Bumping version to 1.15.31 Update changelog based on model updates Update create-snapshot.rst Update import-key-pair.rst Update describe-volumes.rst
harshamudunuru · Jun 1, 2018 · ead58f0 · ead58f0
2 parents 64f7c10 + 5c40ed1
commit ead58f0
Show file tree

Hide file tree

Showing 9 changed files with 126 additions and 22 deletions.
diff --git a/.changes/1.15.31.json b/.changes/1.15.31.json
@@ -0,0 +1,27 @@
+[
+  {
+    "category": "``sns``", 
+    "description": "Update sns command to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``iot``", 
+    "description": "Update iot command to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``ds``", 
+    "description": "Update ds command to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``mediatailor``", 
+    "description": "Update mediatailor command to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``redshift``", 
+    "description": "Update redshift command to latest version", 
+    "type": "api-change"
+  }
+]
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,16 @@
 CHANGELOG
 =========
 
+1.15.31
+=======
+
+* api-change:``sns``: Update sns command to latest version
+* api-change:``iot``: Update iot command to latest version
+* api-change:``ds``: Update ds command to latest version
+* api-change:``mediatailor``: Update mediatailor command to latest version
+* api-change:``redshift``: Update redshift command to latest version
+
+
 1.15.30
 =======
 

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

diff --git a/awscli/examples/ec2/create-snapshot.rst b/awscli/examples/ec2/create-snapshot.rst
@@ -4,17 +4,51 @@ This example command creates a snapshot of the volume with a volume ID of ``vol-
 
 Command::
 
-  aws ec2 create-snapshot --volume-id vol-1234567890abcdef0 --description "This is my root volume snapshot."
+  aws ec2 create-snapshot --volume-id vol-1234567890abcdef0 --description "This is my root volume snapshot"
 
 Output::
 
    {
-       "Description": "This is my root volume snapshot.",
+       "Description": "This is my root volume snapshot",
        "Tags": [],
+       "Encrypted": false,
        "VolumeId": "vol-1234567890abcdef0",
        "State": "pending",
        "VolumeSize": 8,
-       "StartTime": "2014-02-28T21:06:01.000Z",
+       "StartTime": "2018-02-28T21:06:01.000Z",
+       "Progress": "",
        "OwnerId": "012345678910",
        "SnapshotId": "snap-066877671789bd71b"
-   }
+   }
+
+**To create a snapshot with tags**
+
+This example command creates a snapshot and applies two tags: purpose=prod and costcenter=123.
+
+Command::
+
+  aws ec2 create-snapshot --volume-id vol-1234567890abcdef0 --description 'Prod backup' --tag-specifications 'ResourceType=snapshot,Tags=[{Key=purpose,Value=prod},{Key=costcenter,Value=123}]'
+
+Output::
+
+  {
+      "Description": "Prod backup",
+      "Tags": [
+          {
+              "Value": "prod",
+              "Key": "purpose"
+          },
+          {
+              "Value": "123",
+              "Key": "costcenter"
+          }
+       ],
+       "Encrypted": false,
+       "VolumeId": "vol-1234567890abcdef0",
+       "State": "pending",
+       "VolumeSize": 8,
+       "StartTime": "2018-02-28T21:06:06.000Z",
+       "Progress": "",
+       "OwnerId": "012345678910",
+       "SnapshotId": "snap-09ed24a70bc19bbe4"
+   }
diff --git a/awscli/examples/ec2/describe-volumes.rst b/awscli/examples/ec2/describe-volumes.rst
@@ -22,7 +22,8 @@ Output::
                        "Device": "/dev/sda1"
                    }
                ],
-               "VolumeType": "standard",
+               "Encrypted": false,
+               "VolumeType": "gp2",
                "VolumeId": "vol-049df61146c4d7901",
                "State": "in-use",
                "SnapshotId": "snap-1234567890abcdef0",
@@ -32,7 +33,8 @@ Output::
            {
                "AvailabilityZone": "us-east-1a",
                "Attachments": [],
-               "VolumeType": "io1",
+               "Encrypted": false,
+               "VolumeType": "gp2",
                "VolumeId": "vol-1234567890abcdef0",
                "State": "available",
                "Iops": 1000,
@@ -67,7 +69,8 @@ Output::
                        "Device": "/dev/sda1"
                    }
                ],
-               "VolumeType": "standard",
+               "Encrypted": false,
+               "VolumeType": "gp2",
                "VolumeId": "vol-049df61146c4d7901",
                "State": "in-use",
                "SnapshotId": "snap-1234567890abcdef0",
@@ -76,7 +79,34 @@ Output::
            }
        ]
    }
- 
+
+**To describe available volumes in a specific Availability Zone**
+
+This example command describes all volumes that have a status of ``available`` and are in the ``us-east-1a`` Availability Zone.
+
+Command::
+
+  aws ec2 describe-volumes --filters Name=status,Values=available Name=availability-zone,Values=us-east-1a
+  
+Output::
+
+   {
+       "Volumes": [
+           {
+               "AvailabilityZone": "us-east-1a",
+               "Attachments": [],
+               "Encrypted": false,
+               "VolumeType": "gp2",
+               "VolumeId": "vol-1234567890abcdef0",
+               "State": "available",
+               "Iops": 1000,
+               "SnapshotId": null,
+               "CreateTime": "2014-02-27T00:02:41.791Z",
+               "Size": 100
+           }
+       ]
+   }
+
 **To describe tagged volumes and filter the output**
 
 This example command describes all volumes that have the tag key ``Name`` and a value that begins with ``Test``. The output is filtered to display only the tags and IDs of the volumes. 

diff --git a/awscli/examples/ec2/import-key-pair.rst b/awscli/examples/ec2/import-key-pair.rst
@@ -1,26 +1,29 @@
 **To import a public key**
 
-First, generate a key pair with the tool of your choice. For example, use this OpenSSL command:
+First, generate a key pair with the tool of your choice. For example, use this ssh-keygen command:
 
 Command::
 
-  openssl genrsa -out my-key.pem 2048
-  
-Next, save the public key to a local file. For example, use this OpenSSL command:
+  ssh-keygen -t rsa -C "my-key" -f ~/.ssh/my-key
 
-Command::
+Output::
 
-  openssl rsa -in my-key.pem -pubout > my-key.pub
-  
-Finally, this example command imports the specified public key. The public key is the text in the .pub file that is between ``-----BEGIN PUBLIC KEY-----`` and ``-----END PUBLIC KEY-----``.
+  Generating public/private rsa key pair.
+  Enter passphrase (empty for no passphrase):
+  Enter same passphrase again:
+  Your identification has been saved in /home/ec2-user/.ssh/my-key.
+  Your public key has been saved in /home/ec2-user/.ssh/my-key.pub.
+  ...
+
+This example command imports the specified public key.
 
 Command::
 
-  aws ec2 import-key-pair --key-name my-key --public-key-material MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuhrGNglwb2Zz/Qcz1zV+l12fJOnWmJxC2GMwQOjAX/L7p01o9vcLRoHXxOtcHBx0TmwMo+i85HWMUE7aJtYclVWPMOeepFmDqR1AxFhaIc9jDe88iLA07VK96wY4oNpp8+lICtgCFkuXyunsk4+KhuasN6kOpk7B2w5cUWveooVrhmJprR90FOHQB2Uhe9MkRkFjnbsA/hvZ/Ay0Cflc2CRZm/NG00lbLrV4l/SQnZmP63DJx194T6pI3vAev2+6UMWSwptNmtRZPMNADjmo50KiG2c3uiUIltiQtqdbSBMh9ztL/98AHtn88JG0s8u2uSRTNEHjG55tyuMbLD40QEXAMPLE
+  aws ec2 import-key-pair --key-name "my-key" --public-key-material file://~/.ssh/my-key.pub
   
 Output::
 
   {
     "KeyName": "my-key",
     "KeyFingerprint": "1f:51:ae:28:bf:89:e9:d8:1f:25:5d:37:2d:7d:b8:ca"
-  }
+  }
diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -52,7 +52,7 @@
 # The short X.Y version.
 version = '1.15.'
 # The full version, including alpha/beta/rc tags.
-release = '1.15.30'
+release = '1.15.31'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/setup.cfg b/setup.cfg
@@ -4,7 +4,7 @@ universal = 1
 
 [metadata]
 requires-dist =
-        botocore==1.10.30
+        botocore==1.10.31
         colorama>=0.2.5,<=0.3.9
         docutils>=0.10
         rsa>=3.1.2,<=3.5.0

diff --git a/setup.py b/setup.py
@@ -23,7 +23,7 @@ def find_version(*file_paths):
     raise RuntimeError("Unable to find version string.")
 
 
-requires = ['botocore==1.10.30',
+requires = ['botocore==1.10.31',
             'colorama>=0.2.5,<=0.3.9',
             'docutils>=0.10',
             'rsa>=3.1.2,<=3.5.0',