From 8e832f9f03d40133f82f9abcb76265ca676e988a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Se=CC=81rgio=20Ramos?= Date: Thu, 20 Oct 2016 02:13:04 +0100 Subject: [PATCH] enable triton credentials from credentials.json credentials can be set not only using ENV variables, but also with credentials.json (if it is found) --- cloudapi-graphql/src/api/request.js | 8 +------- cloudapi-graphql/src/credentials.js | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 cloudapi-graphql/src/credentials.js diff --git a/cloudapi-graphql/src/api/request.js b/cloudapi-graphql/src/api/request.js index 68a0d3be..0a022702 100644 --- a/cloudapi-graphql/src/api/request.js +++ b/cloudapi-graphql/src/api/request.js @@ -1,10 +1,4 @@ -const credentials = { - url: process.env.SDC_URL, - account: process.env.SDC_ACCOUNT, - user: process.env.SDC_USER || '', - keyId: process.env.SDC_KEY_ID, -}; - +const credentials = require('../credentials'); const auth = require('smartdc-auth'); const cloudapi = require('triton/lib/cloudapi2'); const bunyan = require('bunyan'); diff --git a/cloudapi-graphql/src/credentials.js b/cloudapi-graphql/src/credentials.js new file mode 100644 index 00000000..39787fd6 --- /dev/null +++ b/cloudapi-graphql/src/credentials.js @@ -0,0 +1,14 @@ +const json = (() => { + try { + return require('../credentials.json'); + } catch (err) { + return {}; + } +})(); + +module.exports = { + url: process.env.SDC_URL || json.url || '', + account: process.env.SDC_ACCOUNT || json.account || '', + user: process.env.SDC_USER || json.user || '', + keyId: process.env.SDC_KEY_ID || json.keyId || '' +};