EC2 paginator and resource updates.

aws · Oct 26, 2015 · f3f2394 · f3f2394
1 parent effb296
commit f3f2394
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 6 deletions.
diff --git a/aws-sdk-core/apis/ec2/2015-10-01/paginators-1.json b/aws-sdk-core/apis/ec2/2015-10-01/paginators-1.json
@@ -83,6 +83,7 @@
     "DescribeSnapshots": {
       "input_token": "NextToken",
       "output_token": "NextToken",
+      "limit_key": "MaxResults",
       "result_key": "Snapshots"
     },
     "DescribeSpotInstanceRequests": {
@@ -98,6 +99,9 @@
       "result_key": "Subnets"
     },
     "DescribeTags": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
       "result_key": "Tags"
     },
     "DescribeVolumeStatus": {

diff --git a/aws-sdk-core/apis/ec2/2015-10-01/resources-1.json b/aws-sdk-core/apis/ec2/2015-10-01/resources-1.json
@@ -37,7 +37,8 @@
           "type": "KeyPair",
           "identifiers": [
             { "target": "Name", "source": "response", "path": "KeyName" }
-          ]
+          ],
+          "path": "@"
         }
       },
       "CreateNetworkAcl": {
@@ -147,7 +148,7 @@
       "ImportKeyPair": {
         "request": { "operation": "ImportKeyPair" },
         "resource": {
-          "type": "KeyPair",
+          "type": "KeyPairInfo",
           "identifiers": [
             { "target": "Name", "source": "response", "path": "KeyName" }
           ]
@@ -198,7 +199,7 @@
       },
       "KeyPair": {
         "resource": {
-          "type": "KeyPair",
+          "type": "KeyPairInfo",
           "identifiers": [
             { "target": "Name", "source": "input" }
           ]
@@ -353,7 +354,7 @@
       "KeyPairs": {
         "request": { "operation": "DescribeKeyPairs" },
         "resource": {
-          "type": "KeyPair",
+          "type": "KeyPairInfo",
           "identifiers": [
             { "target": "Name", "source": "response", "path": "KeyPairs[].KeyName" }
           ],
@@ -490,7 +491,7 @@
         "request": {
           "operation": "DescribeAddresses",
           "params": [
-            { "target": "PublicIp", "source": "identifier", "name": "PublicIp" }
+            { "target": "PublicIps[]", "source": "identifier", "name": "PublicIp" }
           ]
         },
         "path": "Addresses[0]"
@@ -953,7 +954,7 @@
         },
         "KeyPair": {
           "resource": {
-            "type": "KeyPair",
+            "type": "KeyPairInfo",
             "identifiers": [
               { "target": "Name", "source": "data", "path": "KeyName" }
             ]
@@ -1089,6 +1090,25 @@
       }
     },
     "KeyPair": {
+      "identifiers": [
+        {
+          "name": "Name",
+          "memberName": "KeyName"
+        }
+      ],
+      "shape": "KeyPair",
+      "actions": {
+        "Delete": {
+          "request": {
+            "operation": "DeleteKeyPair",
+            "params": [
+              { "target": "KeyName", "source": "identifier", "name": "Name" }
+            ]
+          }
+        }
+      }
+    },
+    "KeyPairInfo": {
       "identifiers": [
         {
           "name": "Name",