Fixes #8782: Fix details on script (remove $ from token and fix double password prefix) #1153
Conversation
…e password prefix)
|
Commit modified |
VinceMacBuche
force-pushed
the
ust_8782/fix_details_on_script_remove_from_token_and_fix_double_password_prefix
branch
from
3543bc5
to
1500591
Compare
| final object DisabledEngine extends JsEngine { | ||
| /* | ||
| * Eval does nothing on variable without the EVAL keyword, and | ||
| * fails on variable with the keyword. | ||
| */ | ||
| def eval(variable: Variable, lib: JsRudderLibBinding): Box[Variable] = { | ||
| val (default, js, _) = getEvaluatorTuple(variable) | ||
| variable.values.find( x => x.startsWith(default) || x.startsWith(js) ) match { | ||
| case None => Full(variable) | ||
| variable.values.find( x => x.startsWith(default)) match { |
There was a problem hiding this comment.
i think it's less readable to have two separated tests. Or maybe add a comment before (i guess it's for performance reason), and move the comme "Here, we nned to chose" just before this line
There was a problem hiding this comment.
I find it less readable too, but it was not able to differentiate which EVAL was found,
Séparate them allow a much more précise error message
Le 29 juillet 2016 07:53:43 GMT+02:00, Nicolas Charles notifications@github.com a écrit :
final object DisabledEngine extends JsEngine {
/*
* Eval does nothing on variable without the EVAL keyword, and
* fails on variable with the keyword.
*/
def eval(variable: Variable, lib: JsRudderLibBinding):
Box[Variable] = {
val (default, js, _) = getEvaluatorTuple(variable)
variable.values.find( x => x.startsWith(default) ||case None => Full(variable)variable.values.find( x => x.startsWith(default)) match {i think it's less readable to have two separated tests. Or maybe add a
comment before (i guess it's for performance reason), and move the
comme "Here, we nned to chose" just before this line
You are receiving this because you authored the thread.
Reply to this email directly or view it on GitHub:
https://github.com/Normation/rudder/pull/1153/files/150059137b7d15c19d9169ad39ce59aea863c83d#r72744578
Envoyé de mon appareil Android avec K-9 Mail. Veuillez excuser ma brièveté.
There was a problem hiding this comment.
having the "Here, we need to chose betwwen" in between masks that they are related and do the same
|
Appart from the comment part, this lloks great to me ! |
|
OK, merging this PR |
https://www.rudder-project.org/redmine/issues/8782