Merge pull request #1361 from jeskew/chore/sync-protocol-tests

Sync protocol tests

Author: jeskew

lib/event_listeners.js

@@ -1,6 +1,5 @@
 var AWS = require('./core');
 var SequentialExecutor = require('./sequential_executor');
-var uuid = require('uuid');
 /**
  * The namespace used to register global event listeners for request building
  * and sending.
@@ -97,7 +96,7 @@ AWS.EventListeners = {
       for (var i = 0, iLen = idempotentMembers.length; i < iLen; i++) {
         if (!params[idempotentMembers[i]]) {
           // add the member
-          params[idempotentMembers[i]] = uuid.v4();
+          params[idempotentMembers[i]] = AWS.util.uuid.v4();
         }
       }
       req.params = params;

lib/query/query_param_serializer.js

@@ -59,7 +59,7 @@ function serializeList(name, list, rules, fn) {
         name = parts.join('.');
       }
     } else {
-      suffix = '.member' + suffix;
+      suffix = '.' + (memberRules.name ? memberRules.name : 'member') + suffix;
     }
     serializeMember(name + suffix, v, memberRules, fn);
   });

lib/util.js

@@ -871,6 +871,15 @@ var util = {
     };
 
     process.nextTick(sendRequest);
+  },
+
+  /**
+   * @api private
+   */
+  uuid: {
+    v4: function uuidV4() {
+      return require('uuid').v4();
+    }
   }
 
 };

test/fixtures/protocol/input/ec2.json

@@ -356,5 +356,59 @@
         }
       }
     ]
+  },
+  {
+    "description": "Idempotency token auto fill",
+    "metadata": {
+      "protocol": "ec2",
+      "apiVersion": "2014-01-01"
+    },
+    "shapes": {
+      "InputShape": {
+        "type": "structure",
+        "members": {
+          "Token": {
+            "shape": "StringType",
+              "idempotencyToken": true
+          }
+        }
+      },
+      "StringType": {
+        "type": "string"
+      }
+    },
+    "cases": [
+      {
+        "given": {
+          "input": {
+            "shape": "InputShape"
+          },
+          "name": "OperationName"
+        },
+        "params": {
+          "Token": "abc123"
+        },
+        "serialized": {
+          "uri": "/",
+          "headers": {},
+          "body": "Action=OperationName&Version=2014-01-01&Token=abc123"
+        }
+      },
+      {
+        "given": {
+          "input": {
+            "shape": "InputShape"
+          },
+          "name": "OperationName"
+        },
+        "params": {
+        },
+        "serialized": {
+          "uri": "/",
+          "headers": {},
+          "body": "Action=OperationName&Version=2014-01-01&Token=00000000-0000-4000-8000-000000000000"
+        }
+      }
+    ]
   }
 ]

test/fixtures/protocol/input/json.json

@@ -426,7 +426,7 @@
     "description": "Empty maps",
     "metadata": {
       "protocol": "json",
-      "jsonVersion": 1.1,
+      "jsonVersion": "1.1",
       "targetPrefix": "com.amazonaws.foo"
     },
     "shapes": {
@@ -475,5 +475,65 @@
         }
       }
     ]
+  },
+  {
+    "description": "Idempotency token auto fill",
+    "metadata": {
+      "protocol": "json",
+      "apiVersion": "2014-01-01"
+    },
+    "shapes": {
+      "InputShape": {
+        "type": "structure",
+        "members": {
+          "Token": {
+            "shape": "StringType",
+              "idempotencyToken": true
+          }
+        }
+      },
+      "StringType": {
+        "type": "string"
+      }
+    },
+    "cases": [
+      {
+        "given": {
+          "input": {
+            "shape": "InputShape"
+          },
+          "http": {
+            "method": "POST"
+          },
+          "name": "OperationName"
+        },
+        "params": {
+          "Token": "abc123"
+        },
+        "serialized": {
+          "uri": "/",
+          "headers": {},
+          "body": "{\"Token\": \"abc123\"}"
+        }
+      },
+      {
+        "given": {
+          "input": {
+            "shape": "InputShape"
+          },
+          "http": {
+            "method": "POST"
+          },
+          "name": "OperationName"
+        },
+        "params": {
+        },
+        "serialized": {
+          "uri": "/",
+          "headers": {},
+          "body": "{\"Token\": \"00000000-0000-4000-8000-000000000000\"}"
+        }
+      }
+    ]
   }
 ]