merge 1.6.x to master

.travis.yml

@@ -1,8 +1,6 @@
 language: node_js
 node_js:
-- '0.12'
-- '4'
-- '5.8'
+- '6'
 before_install:
 - npm config set registry=http://apim-ci1.rtp.raleigh.ibm.com:4873/
 

CHANGES.md

@@ -1,3 +1,40 @@
+2018-06-12, Version 1.6.8
+=========================
+
+ * Update node engine to 6 at minimal
+
+2018-03-07, Version 1.6.7
+=========================
+
+ * Check existence of the env.yaml file
+
+2017-10-26, Version 1.6.6
+=========================
+
+ * Update shrinkwrap (Ryan Graham)
+
+2017-10-26, Version 1.6.5
+=========================
+
+ * Update shrinkwrap (Gary Tu)
+
+2017-10-12, Version 1.6.4
+=========================
+
+ * Add sub-type for the loopback model (Gary Tu)
+
+2017-04-03, Version 1.6.3
+=========================
+
+ * Fix DBCS issue (#63) (Jeremy Geddes)
+
+
+2016-12-13, Version 1.6.2
+=========================
+
+ * add shrinkwrap (Joseph Tary)
+
+
 2016-12-06, Version 1.6.1
 =========================
 

datastore/common/models/optimizedData.json

@@ -18,13 +18,13 @@
     "catalog-name": "string",
     "organization-id": "string",
     "organization-name": "string",
-    "space-ids": [],
+    "space-ids": ["string"],
     "product-id": "string",
     "product-name": "string",
     "plan-id": "string",
     "plan-name": "string",
     "plan-version": "string",
-    "plan-rate-limit": [],
+    "plan-rate-limit": [{}],
     "api-id": "string",
     "api-document": {},
     "api-document-resolved": {},
@@ -39,23 +39,23 @@
       "path-regex": "string",
       "matching-score": "number",
       "path-methods": [{
-        "consumes": [],
+        "consumes": ["string"],
         "method": "string",
         "operationId": "string",
-        "parameters": [],
-        "produces": [],
+        "parameters": [{}],
+        "produces": ["string"],
         "responses": {},
         "securityDefs": {},
-        "securityReqs": [],
-        "observed-rate-limit": [],
+        "securityReqs": [{}],
+        "observed-rate-limit": [{}],
         "rate-limit-scope": "string"
       }]
     }],
     "api-state": "string",
     "snapshot-id": "string"
   },
-  "validations": [],
+  "validations": [{}],
   "relations": {},
-  "acls": [],
+  "acls": [{}],
   "methods": {}
 }

index.js

@@ -3,6 +3,7 @@
 // US Government Users Restricted Rights - Use, duplication or disclosure
 // restricted by GSA ADP Schedule Contract with IBM Corp.
 
+var fs = require('fs');
 var path = require('path');
 var YAML = require('yamljs');
 var logger = require('apiconnect-cli-logger/logger.js')
@@ -15,10 +16,15 @@ var env = {
   APIMANAGER_REFRESH_INTERVAL: 15 * 1000 * 60 };
 
 try {
-  var envjson = YAML.load(path.join(__dirname, '/env.yaml'));
-  Object.keys(envjson).forEach(function(k) {
-    env[k] = envjson[k];
-  });
+  var envPath = path.join(__dirname, '/env.yaml');
+  if (!fs.existsSync(envPath)) {
+    logger.warn('File not exist: env.yaml');
+  } else {
+    var envjson = YAML.load(envPath);
+    Object.keys(envjson).forEach(function(k) {
+      env[k] = envjson[k];
+    });
+  }
 } catch (e) {
   logger.error('Fail to load environment variables: ', e);
 }

lib/postflow/index.js

@@ -60,7 +60,8 @@ module.exports = function createPostFlowMiddleware(options) {
         // Check if chunked mode is set
         if (transferEncoding !== 'chunked') {
           if (body) {
-            res.set('Content-Length', body.length);
+            // need to get buffer length, not just length (DBCS consideration)
+            res.set('Content-Length', Buffer.byteLength(body, 'utf8'));
           } else {
             res.set('Content-Length', 0);
           }
@@ -81,4 +82,3 @@ module.exports = function createPostFlowMiddleware(options) {
     });
   };
 };
-