feat/rename collectionVariables variable name to runtimeVariables (#2638)

* pr review changes

* collection root object in export json

* import environment updates

* tests run execution order fix for collection runs

* updated validations

* collectionVariables -> runtimeVariables

* removed husky, adjusted indentation

---------

Co-authored-by: Anoop M D <anoop.md1421@gmail.com>
This commit is contained in:
lohit
2024-07-17 17:21:03 +05:30
committed by GitHub
parent e60aaf2ea9
commit ab9bcbe5ed
24 changed files with 128 additions and 132 deletions

View File

@@ -312,7 +312,7 @@ const handler = async function (argv) {
recursive = true;
}
const collectionVariables = {};
const runtimeVariables = {};
let envVars = {};
if (env) {
@@ -462,7 +462,7 @@ const handler = async function (argv) {
bruFilepath,
bruJson,
collectionPath,
collectionVariables,
runtimeVariables,
envVars,
processEnvVars,
brunoConfig,

View File

@@ -1,13 +1,13 @@
const { forOwn, cloneDeep } = require('lodash');
const { interpolate } = require('@usebruno/common');
const interpolateString = (str, { envVars, collectionVariables, processEnvVars }) => {
const interpolateString = (str, { envVars, runtimeVariables, processEnvVars }) => {
if (!str || !str.length || typeof str !== 'string') {
return str;
}
processEnvVars = processEnvVars || {};
collectionVariables = collectionVariables || {};
runtimeVariables = runtimeVariables || {};
// we clone envVars because we don't want to modify the original object
envVars = envVars ? cloneDeep(envVars) : {};
@@ -24,10 +24,10 @@ const interpolateString = (str, { envVars, collectionVariables, processEnvVars }
});
});
// collectionVariables take precedence over envVars
// runtimeVariables take precedence over envVars
const combinedVars = {
...envVars,
...collectionVariables,
...runtimeVariables,
process: {
env: {
...processEnvVars

View File

@@ -12,7 +12,7 @@ const getContentType = (headers = {}) => {
return contentType;
};
const interpolateVars = (request, envVars = {}, collectionVariables = {}, processEnvVars = {}) => {
const interpolateVars = (request, envVars = {}, runtimeVariables = {}, processEnvVars = {}) => {
// we clone envVars because we don't want to modify the original object
envVars = cloneDeep(envVars);
@@ -33,10 +33,10 @@ const interpolateVars = (request, envVars = {}, collectionVariables = {}, proces
return str;
}
// collectionVariables take precedence over envVars
// runtimeVariables take precedence over envVars
const combinedVars = {
...envVars,
...collectionVariables,
...runtimeVariables,
process: {
env: {
...processEnvVars

View File

@@ -25,7 +25,7 @@ const runSingleRequest = async function (
filename,
bruJson,
collectionPath,
collectionVariables,
runtimeVariables,
envVariables,
processEnvVars,
brunoConfig,
@@ -62,7 +62,7 @@ const runSingleRequest = async function (
preRequestVars,
request,
envVariables,
collectionVariables,
runtimeVariables,
collectionPath,
processEnvVars
);
@@ -79,7 +79,7 @@ const runSingleRequest = async function (
decomment(requestScriptFile),
request,
envVariables,
collectionVariables,
runtimeVariables,
collectionPath,
null,
processEnvVars,
@@ -91,7 +91,7 @@ const runSingleRequest = async function (
}
// interpolate variables inside request
interpolateVars(request, envVariables, collectionVariables, processEnvVars);
interpolateVars(request, envVariables, runtimeVariables, processEnvVars);
if (!protocolRegex.test(request.url)) {
request.url = `http://${request.url}`;
@@ -120,7 +120,7 @@ const runSingleRequest = async function (
const interpolationOptions = {
envVars: envVariables,
collectionVariables,
runtimeVariables,
processEnvVars
};
@@ -282,7 +282,7 @@ const runSingleRequest = async function (
request,
response,
envVariables,
collectionVariables,
runtimeVariables,
collectionPath,
processEnvVars
);
@@ -300,7 +300,7 @@ const runSingleRequest = async function (
request,
response,
envVariables,
collectionVariables,
runtimeVariables,
collectionPath,
null,
processEnvVars,
@@ -321,7 +321,7 @@ const runSingleRequest = async function (
request,
response,
envVariables,
collectionVariables,
runtimeVariables,
processEnvVars
);
@@ -345,7 +345,7 @@ const runSingleRequest = async function (
request,
response,
envVariables,
collectionVariables,
runtimeVariables,
collectionPath,
null,
processEnvVars,