Spearhead/node-spearhead
Archived
3
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

document destructiveAllowed, use TRITON_* vars for tests

Browse Source
This commit is contained in:
Dave Eddy 2015-09-25 13:24:12 -04:00
parent f38bfb68f1
commit 2eeb68cba5
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/cli.js
View File

@ -216,10 +216,7 @@ CLI.prototype.init = function (opts, args, callback) {
}); });
self.log.trace({config: config}, 'loaded config'); self.log.trace({config: config}, 'loaded config');
var profileName = opts.profile || var profileName = opts.profile || config.profile || 'env';
config.profile ||
process.env.TRITON_PROFILE ||
'env';
var profile = mod_config.loadProfile({ var profile = mod_config.loadProfile({
configDir: self.configDir, configDir: self.configDir,
name: profileName name: profileName

11
test/integration/helpers.js
View File

@ -41,7 +41,8 @@ try {
error(' "url": "<CloudAPI URL>",'); error(' "url": "<CloudAPI URL>",');
error(' "account": "<account>",'); error(' "account": "<account>",');
error(' "keyId": "<ssh key fingerprint>",'); error(' "keyId": "<ssh key fingerprint>",');
error(' "insecure": true|false // optional'); error(' "insecure": true|false, // optional');
error(' "destructiveAllowed": true|false // optional');
error(' }'); error(' }');
error(''); error('');
error('Note: This test suite with create machines, images, et al using'); error('Note: This test suite with create machines, images, et al using');
@ -76,10 +77,10 @@ function triton(args, cb) {
HOME: process.env.HOME, HOME: process.env.HOME,
SSH_AUTH_SOCK: process.env.SSH_AUTH_SOCK, SSH_AUTH_SOCK: process.env.SSH_AUTH_SOCK,
TRITON_PROFILE: 'env', TRITON_PROFILE: 'env',
SDC_URL: CONFIG.url, TRITON_URL: CONFIG.url,
SDC_ACCOUNT: CONFIG.account, TRITON_ACCOUNT: CONFIG.account,
SDC_KEY_ID: CONFIG.keyId, TRITON_KEY_ID: CONFIG.keyId,
SDC_TLS_INSECURE: CONFIG.insecure TRITON_TLS_INSECURE: CONFIG.insecure
} }
}, },
log: LOG log: LOG