Merge pull request #208 from mirkogolze/feature/cli-env-vars

#199 bring feature cli overridable env vars to main
This commit is contained in:
Anoop M D 2023-09-24 23:05:19 +05:30 committed by GitHub
commit c4fd9d38a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,7 +1,7 @@
const fs = require('fs');
const chalk = require('chalk');
const path = require('path');
const { exists, isFile, isDirectory, getSubDirectories } = require('../utils/filesystem');
const { exists, isFile, isDirectory } = require('../utils/filesystem');
const { runSingleRequest } = require('../runner/run-single-request');
const { bruToEnvJson, getEnvVars } = require('../utils/bru');
const { rpad } = require('../utils/common');
@ -103,8 +103,7 @@ const getBruFilesRecursively = (dir) => {
return bruJsons;
};
const bruJsons = getFilesInOrder(dir);
return bruJsons;
return getFilesInOrder(dir);
};
const builder = async (yargs) => {
@ -122,6 +121,10 @@ const builder = async (yargs) => {
describe: 'Environment variables',
type: 'string'
})
.option('env-var', {
describe: 'Overwrite a single environment variable, multiple usages possible',
type: 'string'
})
.option('insecure', {
type: 'boolean',
description: 'Allow insecure server connections'
@ -129,12 +132,16 @@ const builder = async (yargs) => {
.example('$0 run request.bru', 'Run a request')
.example('$0 run request.bru --env local', 'Run a request with the environment set to local')
.example('$0 run folder', 'Run all requests in a folder')
.example('$0 run folder -r', 'Run all requests in a folder recursively');
.example('$0 run folder -r', 'Run all requests in a folder recursively')
.example(
'$0 run request.bru --env local --env-var secret=xxx',
'Run a request with the environment set to local and overwrite the variable secret with value xxx'
);
};
const handler = async function (argv) {
try {
let { filename, cacert, env, insecure, r: recursive } = argv;
let { filename, cacert, env, envVar, insecure, r: recursive } = argv;
const collectionPath = process.cwd();
// todo
@ -175,6 +182,32 @@ const handler = async function (argv) {
envVars = getEnvVars(envJson);
}
if (envVar) {
let processVars;
if (typeof envVar === 'string') {
processVars = [envVar];
} else if (typeof envVar === 'object' && Array.isArray(envVar)) {
processVars = envVar;
} else {
console.error(chalk.red(`overridable environment variables not parsable: use name=value`));
return;
}
if (processVars && Array.isArray(processVars)) {
for (const value of processVars.values()) {
// split the string at the first equals sign
const match = value.match(/^([^=]+)=(.*)$/);
if (!match) {
console.error(
chalk.red(`Overridable environment variable not correct: use name=value - presented: `) +
chalk.dim(`${value}`)
);
return;
}
envVars[match[1]] = match[2];
}
}
}
const options = getOptions();
if (insecure) {
options['insecure'] = true;
@ -240,7 +273,7 @@ const handler = async function (argv) {
} else {
console.log(chalk.yellow('Running Folder Recursively \n'));
bruJsons = await getBruFilesRecursively(filename);
bruJsons = getBruFilesRecursively(filename);
}
let assertionResults = [];