From 66a770c091b2ce4c962cdbce32c079eaafd05c88 Mon Sep 17 00:00:00 2001
From: Henrique Dias <hacdias@gmail.com>
Date: Wed, 3 Jan 2018 13:35:36 +0000
Subject: [PATCH 1/5] normalize key api

---
 src/key/gen.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/key/gen.js b/src/key/gen.js
index 1523adc33..38612d9af 100644
--- a/src/key/gen.js
+++ b/src/key/gen.js
@@ -2,16 +2,24 @@
 
 const promisify = require('promisify-es6')
 
+const transform = function (res, callback) {
+  callback(null, {
+    id: res.Id,
+    name: res.Name
+  })
+}
+
 module.exports = (send) => {
   return promisify((args, opts, callback) => {
     if (typeof (opts) === 'function') {
       callback = opts
       opts = {}
     }
-    send({
+
+    send.andTransform({
       path: 'key/gen',
       args: args,
       qs: opts
-    }, callback)
+    }, transform, callback)
   })
 }

From d0d769a6dd371db4aaaace24f363bfdc090b2503 Mon Sep 17 00:00:00 2001
From: Henrique Dias <hacdias@gmail.com>
Date: Wed, 3 Jan 2018 13:39:56 +0000
Subject: [PATCH 2/5] normalize list api

---
 src/key/list.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/key/list.js b/src/key/list.js
index 7b58c2a6d..bcd9bc8e2 100644
--- a/src/key/list.js
+++ b/src/key/list.js
@@ -2,15 +2,25 @@
 
 const promisify = require('promisify-es6')
 
+const transform = function (res, callback) {
+  callback(null, res.Keys.map(key => {
+    return {
+      id: key.Id,
+      name: key.Name
+    }
+  }))
+}
+
 module.exports = (send) => {
   return promisify((opts, callback) => {
     if (typeof (opts) === 'function') {
       callback = opts
       opts = {}
     }
-    send({
+
+    send.andTransform({
       path: 'key/list',
       qs: opts
-    }, callback)
+    }, transform, callback)
   })
 }

From 78a4255e6eeb38c1d2c64a31b5c2720ad50d4334 Mon Sep 17 00:00:00 2001
From: Henrique Dias <hacdias@gmail.com>
Date: Wed, 3 Jan 2018 13:48:12 +0000
Subject: [PATCH 3/5] normalize rm

---
 src/key/rm.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/key/rm.js b/src/key/rm.js
index 7388dff61..7e4e98500 100644
--- a/src/key/rm.js
+++ b/src/key/rm.js
@@ -2,11 +2,18 @@
 
 const promisify = require('promisify-es6')
 
+const transform = function (res, callback) {
+  callback(null, {
+    id: res.Keys[0].Id,
+    name: res.Keys[0].Name
+  })
+}
+
 module.exports = (send) => {
   return promisify((args, callback) => {
-    send({
+    send.andTransform({
       path: 'key/rm',
       args: args
-    }, callback)
+    }, transform, callback)
   })
 }

From 8890d35e3bb3c8746d784cdb2e288feed00cc2e9 Mon Sep 17 00:00:00 2001
From: Henrique Dias <hacdias@gmail.com>
Date: Wed, 3 Jan 2018 13:56:26 +0000
Subject: [PATCH 4/5] normalize key.rename

---
 src/key/rename.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/key/rename.js b/src/key/rename.js
index 9fa9dda7e..68b45f010 100644
--- a/src/key/rename.js
+++ b/src/key/rename.js
@@ -2,11 +2,20 @@
 
 const promisify = require('promisify-es6')
 
+const transform = function (res, callback) {
+  callback(null, {
+    id: res.Id,
+    was: res.Was,
+    now: res.Now,
+    overwrite: res.Overwrite
+  })
+}
+
 module.exports = (send) => {
   return promisify((oldName, newName, callback) => {
-    send({
+    send.andTransform({
       path: 'key/rename',
       args: [oldName, newName]
-    }, callback)
+    }, transform, callback)
   })
 }

From c59f11540fac1bddc681d2bfb2bd86c0bdaf6b94 Mon Sep 17 00:00:00 2001
From: Henrique Dias <hacdias@gmail.com>
Date: Wed, 3 Jan 2018 14:04:17 +0000
Subject: [PATCH 5/5] clean import

---
 src/key/import.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/key/import.js b/src/key/import.js
index aec92081a..9cea80e27 100644
--- a/src/key/import.js
+++ b/src/key/import.js
@@ -2,15 +2,22 @@
 
 const promisify = require('promisify-es6')
 
+const transform = function (res, callback) {
+  callback(null, {
+    id: res.Id,
+    name: res.Name
+  })
+}
+
 module.exports = (send) => {
   return promisify((name, pem, password, callback) => {
-    send({
+    send.andTransform({
       path: 'key/import',
       args: name,
       qs: {
         pem: pem,
         password: password
       }
-    }, callback)
+    }, transform, callback)
   })
 }