Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(remap): Fix case_sensitive defaults for string matching functions #7091

Merged
merged 1 commit into from
Apr 16, 2021
+40 −38
Merged

fix(remap): Fix case_sensitive defaults for string matching functions #7091

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions lib/vrl/stdlib/src/contains.rs
View file
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ impl Function for Contains {
fn compile(&self, mut arguments: ArgumentList) -> Compiled {
let value = arguments.required("value");
let substring = arguments.required("substring");
let case_sensitive = arguments.optional("case_sensitive");
let case_sensitive = arguments.optional("case_sensitive").unwrap_or(expr!(true));

Ok(Box::new(ContainsFn {
value,
@@ -44,8 +44,8 @@ impl Function for Contains {
&[
Example {
title: "case sensitive",
source: r#"contains("banana", "ana")"#,
result: Ok(r#"true"#),
source: r#"contains("banana", "AnA")"#,
result: Ok(r#"false"#),
},
Example {
title: "case insensitive",
@@ -60,15 +60,12 @@ impl Function for Contains {
struct ContainsFn {
value: Box<dyn Expression>,
substring: Box<dyn Expression>,
case_sensitive: Option<Box<dyn Expression>>,
case_sensitive: Box<dyn Expression>,
}

impl Expression for ContainsFn {
fn resolve(&self, ctx: &mut Context) -> Resolved {
let case_sensitive = match &self.case_sensitive {
Some(expr) => expr.resolve(ctx)?.try_boolean()?,
None => false,
};
let case_sensitive = self.case_sensitive.resolve(ctx)?.try_boolean()?;

let substring = {
let bytes = self.substring.resolve(ctx)?.try_bytes()?;
@@ -150,7 +147,6 @@ mod tests {
case_sensitive_yes {
args: func_args![value: value!("fooBAR"),
substring: value!("BAR"),
case_sensitive: true
],
want: Ok(value!(true)),
tdef: TypeDef::new().boolean().infallible(),
@@ -168,7 +164,6 @@ mod tests {
case_sensitive_no_uppercase {
args: func_args![value: value!("foobar"),
substring: value!("BAR"),
case_sensitive: true
],
want: Ok(value!(false)),
tdef: TypeDef::new().boolean().infallible(),
39 changes: 24 additions & 15 deletions lib/vrl/stdlib/src/ends_with.rs
View file
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ impl Function for EndsWith {
fn compile(&self, mut arguments: ArgumentList) -> Compiled {
let value = arguments.required("value");
let substring = arguments.required("substring");
let case_sensitive = arguments.optional("case_sensitive");
let case_sensitive = arguments.optional("case_sensitive").unwrap_or(expr!(true));

Ok(Box::new(EndsWithFn {
value,
@@ -41,27 +41,36 @@ impl Function for EndsWith {
}

fn examples(&self) -> &'static [Example] {
&[Example {
title: "ends with",
source: r#"ends_with("the restaurant", "restaurant")"#,
result: Ok("true"),
}]
&[
Example {
title: "case sensitive",
source: r#"ends_with("foobar", "R")"#,
result: Ok("false"),
},
Example {
title: "case insensitive",
source: r#"ends_with("foobar", "R", false)"#,
result: Ok("true"),
},
Example {
title: "mismatch",
source: r#"ends_with("foobar", "foo")"#,
result: Ok("false"),
},
]
}
}

#[derive(Clone, Debug)]
struct EndsWithFn {
value: Box<dyn Expression>,
substring: Box<dyn Expression>,
case_sensitive: Option<Box<dyn Expression>>,
case_sensitive: Box<dyn Expression>,
}

impl Expression for EndsWithFn {
fn resolve(&self, ctx: &mut Context) -> Resolved {
let case_sensitive = match &self.case_sensitive {
Some(expr) => expr.resolve(ctx)?.try_boolean()?,
None => false,
};
let case_sensitive = self.case_sensitive.resolve(ctx)?.try_boolean()?;

let substring = {
let bytes = self.substring.resolve(ctx)?.try_bytes()?;
@@ -135,16 +144,16 @@ mod tests {

uppercase {
args: func_args![value: "fooBAR",
substring: "BAR",
case_sensitive: true],
substring: "BAR"
],
want: Ok(value!(true)),
tdef: TypeDef::new().infallible().boolean(),
}

case_sensitive {
args: func_args![value: "foobar",
substring: "BAR",
case_sensitive: true],
substring: "BAR"
],
want: Ok(value!(false)),
tdef: TypeDef::new().infallible().boolean(),
}
24 changes: 11 additions & 13 deletions lib/vrl/stdlib/src/starts_with.rs
View file
Original file line number Diff line number Diff line change
@@ -31,18 +31,18 @@ impl Function for StartsWith {
fn examples(&self) -> &'static [Example] {
&[
Example {
title: "match",
source: r#"starts_with("foobar", "foo")"#,
result: Ok("true"),
title: "case sensitive",
source: r#"starts_with("foobar", "F")"#,
result: Ok("false"),
},
Example {
title: "mismatch",
source: r#"starts_with("foobar", "baz")"#,
result: Ok("false"),
title: "case insensitive",
source: r#"starts_with("foobar", "F", false)"#,
result: Ok("true"),
},
Example {
title: "case sensitive",
source: r#"starts_with("foobar", "F", true)"#,
title: "mismatch",
source: r#"starts_with("foobar", "bar")"#,
result: Ok("false"),
},
]
@@ -51,7 +51,7 @@ impl Function for StartsWith {
fn compile(&self, mut arguments: ArgumentList) -> Compiled {
let value = arguments.required("value");
let substring = arguments.required("substring");
let case_sensitive = arguments.optional("case_sensitive").unwrap_or(expr!(false));
let case_sensitive = arguments.optional("case_sensitive").unwrap_or(expr!(true));

Ok(Box::new(StartsWithFn {
value,
@@ -158,17 +158,15 @@ mod tests {

case_sensitive_same_case {
args: func_args![value: "FOObar",
substring: "FOO",
case_sensitive: true
substring: "FOO"
],
want: Ok(true),
tdef: TypeDef::new().infallible().boolean(),
}

case_sensitive_different_case {
args: func_args![value: "foobar",
substring: "FOO",
case_sensitive: true
substring: "FOO"
],
want: Ok(false),
tdef: TypeDef::new().infallible().boolean(),