update edge.js to fix minor bugs and refactor

  - KVM put was not working properly
  - import of zip was not working - AdmZip had changed?
  - added defaults to a bunch of arguments

Author: DinoChiesa

examples/package.json

@@ -9,7 +9,7 @@
   "author": "dchiesa@google.com",
   "license": "Apache-2.0",
   "dependencies": {
-    "apigee-edge-js": "^0.2.24",
+    "apigee-edge-js": "^0.2.26",
     "async": "^2.2.0",
     "merge": "^1.2.0",
     "mkdirp": "^0.5.1",

lib/edge.js

@@ -18,7 +18,7 @@
 // limitations under the License.
 //
 // created: Mon Jun  6 17:32:20 2016
-// last saved: <2018-February-18 11:00:16>
+// last saved: <2018-February-27 14:51:13>
 
 (function (){
   var path = require('path'),
@@ -104,6 +104,7 @@
   }
 
   Organization.prototype.get = function(url, cb) {
+    if ( ! cb) { cb = url; url = ''; }
     var conn = this.conn;
     url = urljoin(conn.urlBase, url);
     if (conn.verbosity>0) {
@@ -112,6 +113,16 @@
     request.get(url, {headers: conn.requestHeaders}, commonCallback(conn, [200], cb));
   };
 
+  Organization.prototype.getProperties = function(cb) {
+    var conn = this.conn;
+    this.get(function(e, result) {
+      if (e) { return cb(e, result); }
+      conn.orgProperties = arrayOfKeyValuePairsToHash(result.properties.property);
+      result.properties = conn.orgProperties;
+      cb(null, result);
+    });
+  };
+
   function Environment(conn) {this.conn = conn;}
 
   function internalGetEnvironments(conn, options, cb) {
@@ -623,15 +634,19 @@
 
   function inferAssetNameFromZip(conn, source, cb) {
     // temporarily unzip the file and then scan the dir
-    var toplevelXmlRe = new RegExp('^apiproxy/[^/]+\\.zip$');
+    var toplevelXmlRe = new RegExp('^apiproxy/[^/]+\\.xml$');
     var zip = new AdmZip(source);
     var zipEntries = zip.getEntries();
-    for (var i = 0; i< zipEntries.length; i++) {
-      if (toplevelXmlRe.test(entry.entryName)) {
-        i = zipEntries.length; // stop the loop
-        doParseForName(conn, entry.data.toString('utf8'), cb);
+    var foundit = false;
+    zipEntries.forEach(function(entry){
+      if ( ! foundit) {
+        if (toplevelXmlRe.test(entry.entryName)) {
+          let data = entry.getData();
+          doParseForName(conn, data.toString('utf8'), cb);
+          foundit = true;
+        }
       }
-    }
+    });
   }
 
   /*
@@ -649,7 +664,15 @@
     return -1;
   }
 
-  function uglifyAttrs(hash) {
+  function arrayOfKeyValuePairsToHash(properties) {
+    var hash = {};
+    properties.forEach(function(item) {
+      hash[item.name] = item.value;
+    });
+    return hash;
+  }
+
+  function hashToArrayOfKeyValuePairs(hash) {
     return Object.keys(hash).map(function(key){
       return { name : key, value : hash[key]};
     });
@@ -1024,7 +1047,7 @@
     mergeRequestOptions(conn, function(requestOptions) {
       requestOptions.headers['content-type'] = 'application/json';
       requestOptions.url = urljoin(conn.urlBase, 'developers');
-      var devAttributes = uglifyAttrs(merge(options.attributes, {
+      var devAttributes = hashToArrayOfKeyValuePairs(merge(options.attributes, {
             "tool": "nodejs " + path.basename(process.argv[1])
           }));
       requestOptions.body = JSON.stringify({
@@ -1155,7 +1178,7 @@
           utility.logWrite(sprintf('Using default expiry of %d', keyExpiresIn));
         }
       }
-      var appAttributes = uglifyAttrs(merge(options.attributes || {}, {
+      var appAttributes = hashToArrayOfKeyValuePairs(merge(options.attributes || {}, {
             "tool": "nodejs " + path.basename(process.argv[1])
           }));
       requestOptions.body = JSON.stringify({
@@ -1304,7 +1327,7 @@
     mergeRequestOptions(conn, function(requestOptions) {
       requestOptions.headers['content-type'] = 'application/json';
       requestOptions.url = urljoin(conn.urlBase, 'apiproducts');
-      var prodAttributes = uglifyAttrs(merge(options.attributes || {}, {
+      var prodAttributes = hashToArrayOfKeyValuePairs(merge(options.attributes || {}, {
             "tool": "nodejs " + path.basename(process.argv[1])
           }));
       var rOptions = {
@@ -1544,6 +1567,9 @@
       requestOptions.url = resolveKvmPath(conn, options);
 
       if (conn.orgProperties['features.isCpsEnabled']) {
+        if (!options.key || !options.value) {
+          throw new Error("missing key or value");
+        }
         requestOptions.url = urljoin(requestOptions.url, options.kvm, 'entries', options.key);
         if (conn.verbosity>0) {
           utility.logWrite(sprintf('GET %s', requestOptions.url));
@@ -1559,13 +1585,13 @@
           if (response.statusCode == 200) {
             // Update is required if the key already exists.
             if (conn.verbosity>0) {
-              utility.logWrite('KVM update');
+              utility.logWrite('KVM entry update');
             }
             requestOptions.url = urljoin(requestOptions.url, options.key);
           }
           else if (response.statusCode == 404) {
             if (conn.verbosity>0) {
-              utility.logWrite('KVM create');
+              utility.logWrite('KVM entry create');
             }
           }
 
@@ -1595,6 +1621,9 @@
         });
       }
       else {
+        if (!options.entries && (!options.key || !options.value)) {
+          throw new Error("missing entries or key/value");
+        }
         // for non-CPS KVM, use a different model to add/update an entry.
         //
         // POST :mgmtserver/v1/o/:orgname/e/:env/keyvaluemaps/:mapname
@@ -1607,7 +1636,11 @@
         // }
         requestOptions.url = urljoin(requestOptions.url, options.kvm);
         requestOptions.headers['content-type'] = 'application/json';
-        requestOptions.body = JSON.stringify({ name: options.kvm, entry: [{ name: options.key, value : options.value }] });
+        var entry = options.entries ?
+          hashToArrayOfKeyValuePairs(options.entries) :
+          [{ name: options.key, value : options.value }] ;
+
+        requestOptions.body = JSON.stringify({ name: options.kvm, entry: entry });
         if (conn.verbosity>0) {
           utility.logWrite(sprintf('POST %s', requestOptions.url));
         }
@@ -1653,7 +1686,7 @@
       requestOptions.body = JSON.stringify({
         encrypted : options.encrypted ? "true" : "false",
         name : options.name,
-        entry : options.entries ? uglifyAttrs(options.entries) : []
+        entry : options.entries ? hashToArrayOfKeyValuePairs(options.entries) : []
       });
       if (conn.verbosity>0) {
         utility.logWrite(sprintf('POST %s', requestOptions.url));
@@ -1662,29 +1695,13 @@
     });
   };
 
-  function transformToHash(properties) {
-    var hash = {};
-    properties.forEach(function(item) {
-      hash[item.name] = item.value;
-    });
-    return hash;
-  }
-
-  function checkOrgProperties(conn, cb) {
-    var org = new Organization(conn);
-    return org.get('', cb);
-  }
-
   Kvm.prototype.put = function(options, cb) {
     var conn = this.conn;
     if ( ! conn.orgProperties) {
-      return checkOrgProperties(conn, function(e, result) {
-        if (e) {
-          console.log(e);
-          return cb(e, result);
-        }
-        conn.orgProperties = transformToHash(result.properties.property);
-        return putKvm0(conn, options, cb);
+      var org = new Organization(conn);
+      org.getProperties(function(e, result) {
+        if (e) { return cb(e, result); }
+        putKvm0(conn, options, cb);
       });
     }
     else {
@@ -1711,7 +1728,6 @@
   };
 
 
-
   function ApiProxy(conn) {
     this.conn = conn;
   }
@@ -1820,7 +1836,6 @@
     return import0(conn, options, 'apiproxy', cb);
   };
 
-
   // Connection properties:
   //   get
   //   refreshToken

package.json

@@ -1,6 +1,6 @@
 {
   "name": "apigee-edge-js",
-  "version": "0.2.24",
+  "version": "0.2.26",
   "description": "Dino's nodejs library for the administration API for Apigee Edge.",
   "main" : "index.js",
   "scripts": {