mirror of
https://github.com/usebruno/bruno.git
synced 2026-07-08 14:35:03 +00:00
fix: global environment flag for cli (#6969)
* fix: global environment flag for cli * fixes
This commit is contained in:
@@ -44,9 +44,10 @@ const getCACertHostRegex = (domain) => {
|
||||
* @returns {string[]} An array of extracted prompt variables
|
||||
*/
|
||||
const extractPromptVariablesForRequest = ({ request, collection, envVariables, runtimeVariables, processEnvVars, brunoConfig }) => {
|
||||
const { vars, collectionVariables, folderVariables, requestVariables, ...requestObj } = request;
|
||||
const { vars, collectionVariables, folderVariables, requestVariables, globalEnvironmentVariables, ...requestObj } = request;
|
||||
|
||||
const allVariables = {
|
||||
...globalEnvironmentVariables,
|
||||
...envVariables,
|
||||
...collectionVariables,
|
||||
...folderVariables,
|
||||
@@ -63,6 +64,7 @@ const extractPromptVariablesForRequest = ({ request, collection, envVariables, r
|
||||
prompts.push(...extractPromptVariables(allVariables));
|
||||
|
||||
const interpolationOptions = {
|
||||
globalEnvVars: globalEnvironmentVariables,
|
||||
envVars: envVariables,
|
||||
runtimeVariables,
|
||||
processEnvVars
|
||||
@@ -94,7 +96,8 @@ const runSingleRequest = async function (
|
||||
collectionRoot,
|
||||
runtime,
|
||||
collection,
|
||||
runSingleRequestByPathname
|
||||
runSingleRequestByPathname,
|
||||
globalEnvVars = {}
|
||||
) {
|
||||
const { pathname: itemPathname } = item;
|
||||
const relativeItemPathname = path.relative(collectionPath, itemPathname);
|
||||
@@ -127,6 +130,9 @@ const runSingleRequest = async function (
|
||||
|
||||
request = await prepareRequest(item, collection);
|
||||
|
||||
// Set global environment variables on the request for scripts to access via bru.getGlobalEnvVar()
|
||||
request.globalEnvironmentVariables = globalEnvVars;
|
||||
|
||||
// Detect prompt variables before proceeding
|
||||
const promptVars = extractPromptVariablesForRequest({ request, collection, envVariables, runtimeVariables, processEnvVars, brunoConfig });
|
||||
|
||||
@@ -247,6 +253,7 @@ const runSingleRequest = async function (
|
||||
}
|
||||
|
||||
const interpolationOptions = {
|
||||
globalEnvVars: request.globalEnvironmentVariables || {},
|
||||
envVars: envVariables,
|
||||
runtimeVariables,
|
||||
processEnvVars
|
||||
@@ -471,6 +478,7 @@ const runSingleRequest = async function (
|
||||
try {
|
||||
// Prepare interpolation options with all available variables
|
||||
const oauth2InterpolationOptions = {
|
||||
globalEnvVars: request.globalEnvironmentVariables || {},
|
||||
envVars: envVariables,
|
||||
runtimeVariables,
|
||||
processEnvVars,
|
||||
|
||||
Reference in New Issue
Block a user