diff --git a/brownie/package-lock.json b/brownie/package-lock.json index ef0f22a..7abac53 100644 --- a/brownie/package-lock.json +++ b/brownie/package-lock.json @@ -1,12 +1,12 @@ { "name": "brownie", - "version": "1.4.2-dev", + "version": "1.5.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "brownie", - "version": "1.4.2-dev", + "version": "1.5.0", "license": "MIT", "dependencies": { "@elastic/elasticsearch": "^8.5.0", diff --git a/brownie/package.json b/brownie/package.json index 86fa1f5..71477ed 100644 --- a/brownie/package.json +++ b/brownie/package.json @@ -1,6 +1,6 @@ { "name": "brownie", - "version": "1.4.2-dev", + "version": "1.5.0", "description": "The resource cleanup application of PIT toolkit", "type": "module", "main": "dist/index.js", diff --git a/k8s-deployer/src/deployer.ts b/k8s-deployer/src/deployer.ts index 07d3f84..83d9de0 100644 --- a/k8s-deployer/src/deployer.ts +++ b/k8s-deployer/src/deployer.ts @@ -90,29 +90,29 @@ export const deployApplication = async ( options?: DeployOptions) => { await isExecutable(`${ appDirectory }/${ instructions.command }`) + const fnCmdWithParams = (cmd: string, pitfileParams?: Array, deployOptions?: DeployOptions) => { + let result = cmd + const allParams = new Array() + // first pass params delcared in the pitfile + if (pitfileParams) { + pitfileParams.forEach(v => allParams.push(v)) + } + // then pass additional params computed by deployer + if (deployOptions?.deployerParams) { + deployOptions.deployerParams.forEach(v => allParams.push(v)) + } + for (let param of allParams) { + result = `${result} ${param}` + } + + return result + } + try { // Invoke deployment script logger.info("Invoking: '%s/%s'", appDirectory, instructions.command) let command = instructions.command if (options?.namespace) command = `${ command } ${ options.namespace }` - - const fnCmdWithParams = (cmd: string, pitfileParams?: Array, deployOptions?: DeployOptions) => { - let result = cmd - const allParams = new Array() - // first pass params delcared in the pitfile - if (pitfileParams) { - pitfileParams.forEach(v => allParams.push(v)) - } - // then pass additional params computed by deployer - if (deployOptions?.deployerParams) { - deployOptions.deployerParams.forEach(v => allParams.push(v)) - } - for (let param of allParams) { - result = `${result} ${param}` - } - - return result - } command = fnCmdWithParams(command, instructions.params, options) diff --git a/lock-manager/package-lock.json b/lock-manager/package-lock.json index cb6edca..606718c 100644 --- a/lock-manager/package-lock.json +++ b/lock-manager/package-lock.json @@ -1,12 +1,12 @@ { "name": "lock-manager", - "version": "1.4.2-dev", + "version": "1.5.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "lock-manager", - "version": "1.4.2-dev", + "version": "1.5.0", "license": "MIT", "dependencies": { "express": "^4.18.2", diff --git a/lock-manager/package.json b/lock-manager/package.json index 82e7f98..fc45393 100644 --- a/lock-manager/package.json +++ b/lock-manager/package.json @@ -1,6 +1,6 @@ { "name": "lock-manager", - "version": "1.4.2-dev", + "version": "1.5.0", "description": "The lock manager application of PIT toolkit", "type": "module", "main": "dist/index.js",