service/ec2: Add support for encrypted EBS volumes

Amazon Elastic Compute Cloud Now launch EC2 instances with EBS encrypted boot volumes
xoraes · Dec 15, 2015 · fe647e0 · fe647e0
1 parent 57f8e03
commit fe647e0
Show file tree

Hide file tree

Showing 4 changed files with 151 additions and 109 deletions.
diff --git a/models/apis/ec2/2015-10-01/api-2.json b/models/apis/ec2/2015-10-01/api-2.json
@@ -2880,7 +2880,15 @@
         "SourceImageId":{"shape":"String"},
         "Name":{"shape":"String"},
         "Description":{"shape":"String"},
-        "ClientToken":{"shape":"String"}
+        "ClientToken":{"shape":"String"},
+        "Encrypted":{
+          "shape":"Boolean",
+          "locationName":"encrypted"
+        },
+        "KmsKeyId":{
+          "shape":"String",
+          "locationName":"kmsKeyId"
+        }
       }
     },
     "CopyImageResult":{
@@ -5515,7 +5523,10 @@
     },
     "DescribeVpcAttributeRequest":{
       "type":"structure",
-      "required":["VpcId"],
+      "required":[
+        "VpcId",
+        "Attribute"
+      ],
       "members":{
         "DryRun":{
           "shape":"Boolean",
@@ -11733,13 +11744,13 @@
       "type":"structure",
       "required":["Error"],
       "members":{
-        "Error":{
-          "shape":"UnsuccessfulItemError",
-          "locationName":"error"
-        },
         "ResourceId":{
           "shape":"String",
           "locationName":"resourceId"
+        },
+        "Error":{
+          "shape":"UnsuccessfulItemError",
+          "locationName":"error"
         }
       }
     },