Merge 019b120 into 3a45f12

.travis.yml

@@ -3,8 +3,7 @@ dist: trusty
 language: node_js
 node_js:
   - "8"
-  - "7"
-  - "6"
+  - "9"
 before_install:
   - npm install -g npm
   - npm install -g greenkeeper-lockfile@1

lib/config-loader.js

@@ -19,21 +19,26 @@
  */
 
 const privates = require('./private-map');
+const openshiftConfigLoader = require('openshift-config-loader');
+
+function load (settings) {
+  if (settings.config) {
+    return Promise.resolve(settings.config);
+  }
+
+  return openshiftConfigLoader(settings.openshiftConfigLoader);
+}
 
 // Takes a config object as JSON
 // Returns a promise
-function loadConfig (client, config) {
-  return new Promise((resolve, reject) => {
-    if (!config) {
-      return reject(new Error('Config object is require'));
-    }
-
+function loadConfig (client) {
+  return load(client.settings).then((config) => {
     client.apiUrl = `${config.cluster}/oapi/${config.apiVersion}`;
     client.kubeUrl = `${config.cluster}/api/${config.apiVersion}`;
 
     privates.get(client).config = config;
 
-    resolve(client);
+    return client;
   });
 }
 

lib/openshift-rest-client.js

@@ -51,9 +51,7 @@ function bindModule (client, input) {
   }
 }
 
-function openshiftClient (config, settings) {
-  settings = settings || {};
-
+function openshiftClient (settings = {}) {
   const data = {};
   const client = {};
 
@@ -82,7 +80,7 @@ function openshiftClient (config, settings) {
   privates.set(client, data);
 
   // Maybe load the config here?
-  return loadConfig(client, config);
+  return loadConfig(client);
 }
 
 module.exports = exports = openshiftClient;

package.json

@@ -30,7 +30,7 @@
     "email": "lholmqui@redhat.com"
   },
   "engines": {
-    "node": ">= 4.0.0"
+    "node": ">= 8.0.0"
   },
   "repository": {
     "type": "git",
@@ -39,6 +39,7 @@
   "bugs": "https://github.com/bucharest-gold/openshift-rest-client/issues",
   "license": "Apache-2.0",
   "dependencies": {
+    "openshift-config-loader": "^0.4.0",
     "request": "^2.83.0"
   },
   "devDependencies": {
@@ -55,7 +56,6 @@
     "nock": "^9.0.14",
     "nsp": "^3.1.0",
     "nyc": "^11.1.0",
-    "openshift-config-loader": "^0.3.0",
     "proxyquire": "^1.8.0",
     "tap-spec": "^4.1.1",
     "tape": "^4.6.3"