kube-workflow
Advanced tools
Comparing version 1.6.4 to 1.6.5
{ | ||
"name": "kube-workflow", | ||
"version": "1.6.4", | ||
"version": "1.6.5", | ||
"repository": "git@github.com:SocialGouv/kube-workflow.git", | ||
@@ -19,2 +19,3 @@ "license": "MIT", | ||
"lodash.defaultsdeep": "^4.6.1", | ||
"lodash.mergewith": "^4.6.2", | ||
"nctx": "^1.2.0", | ||
@@ -21,0 +22,0 @@ "pino": "^7.9.2", |
@@ -6,3 +6,3 @@ const os = require("os") | ||
const yaml = require("js-yaml") | ||
const defautlsDeep = require("lodash.defaultsdeep") | ||
const mergeWith = require("lodash.mergewith") | ||
@@ -98,3 +98,7 @@ const asyncShell = require("~/utils/async-shell") | ||
]) | ||
const values = defautlsDeep({}, envValues, commonValues, defaultValues) | ||
const values = mergeWith({}, defaultValues, commonValues, envValues, (objValue, srcValue)=>{ | ||
if (Array.isArray(objValue)) { | ||
return srcValue; | ||
} | ||
}) | ||
logger.debug("Compiling jobs") | ||
@@ -101,0 +105,0 @@ await compileJobs(values) |
@@ -26,3 +26,3 @@ const fs = require("fs-extra") | ||
logger.debug(`degit ${use}`) | ||
await degit(use).clone(target) | ||
await degit(use,{force: true}).clone(target) | ||
} | ||
@@ -29,0 +29,0 @@ })() |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
303628
1126
17
+ Addedlodash.mergewith@^4.6.2
+ Addedlodash.mergewith@4.6.2(transitive)