Skip to content

chore: Use anchors in regular expressions #102

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

Merged
siegfriedweber merged 1 commit into from
Jan 22, 2026
+20 −17
Merged

chore: Use anchors in regular expressions #102

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion rust/operator-binary/src/crd/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ attributed_string_type! {
"Key in an OpenSearch keystore",
"s3.client.default.access_key",
(min_length = 1),
(regex = "[A-Za-z0-9_\\-.]+")
(regex = "^[A-Za-z0-9_\\-.]+$")
}

#[cfg(test)]
Expand Down
31 changes: 17 additions & 14 deletions rust/operator-binary/src/framework/macros/attributed_string_type.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use strum::{EnumDiscriminants, IntoStaticStr};

/// Maximum length of label values
///
/// Duplicates the private constant [`stackable-operator::kvp::label::value::LABEL_VALUE_MAX_LEN`]
/// Duplicates the private constant [`stackable_operator::kvp::LABEL_VALUE_MAX_LEN`]
pub const MAX_LABEL_VALUE_LENGTH: usize = 63;

#[derive(Debug, EnumDiscriminants, Snafu)]
Expand Down Expand Up @@ -185,7 +185,7 @@ macro_rules! attributed_string_type {
None
},
"pattern": match $name::REGEX {
$crate::framework::macros::attributed_string_type::Regex::Expression(regex) => Some(std::format!("^{regex}$")),
$crate::framework::macros::attributed_string_type::Regex::Expression(regex) => Some(regex),
_ => None
}
})
Expand Down Expand Up @@ -377,24 +377,27 @@ macro_rules! attributed_string_type {
.combine(attributed_string_type!(@regex $($attribute)*))
};
(@regex is_rfc_1035_label_name $($attribute:tt)*) => {
$crate::framework::macros::attributed_string_type::Regex::Expression(stackable_operator::validation::LOWERCASE_RFC_1035_LABEL_FMT)
// see https://github.com/kubernetes/kubernetes/blob/v1.35.0/staging/src/k8s.io/apimachinery/pkg/util/validation/validation.go#L228
$crate::framework::macros::attributed_string_type::Regex::Expression("^[a-z]([-a-z0-9]*[a-z0-9])?$")
.combine(attributed_string_type!(@regex $($attribute)*))
};
(@regex is_rfc_1123_dns_subdomain_name $($attribute:tt)*) => {
$crate::framework::macros::attributed_string_type::Regex::Expression(stackable_operator::validation::LOWERCASE_RFC_1123_SUBDOMAIN_FMT)
// see https://github.com/kubernetes/kubernetes/blob/v1.35.0/staging/src/k8s.io/apimachinery/pkg/util/validation/validation.go#L193
$crate::framework::macros::attributed_string_type::Regex::Expression("^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$")
.combine(attributed_string_type!(@regex $($attribute)*))
};
(@regex is_rfc_1123_label_name $($attribute:tt)*) => {
$crate::framework::macros::attributed_string_type::Regex::Expression(stackable_operator::validation::LOWERCASE_RFC_1123_LABEL_FMT)
// see https://github.com/kubernetes/kubernetes/blob/v1.35.0/staging/src/k8s.io/apimachinery/pkg/util/validation/validation.go#L163
$crate::framework::macros::attributed_string_type::Regex::Expression("^[a-z0-9]([-a-z0-9]*[a-z0-9])?$")
.combine(attributed_string_type!(@regex $($attribute)*))
};
(@regex is_valid_label_value $($attribute:tt)*) => {
// regular expression from stackable_operator::kvp::label::LABEL_VALUE_REGEX
$crate::framework::macros::attributed_string_type::Regex::Expression("[a-z0-9A-Z]([a-z0-9A-Z-_.]*[a-z0-9A-Z]+)?")
$crate::framework::macros::attributed_string_type::Regex::Expression("^[a-z0-9A-Z]([a-z0-9A-Z-_.]*[a-z0-9A-Z]+)?$")
.combine(attributed_string_type!(@regex $($attribute)*))
};
(@regex is_uid $($attribute:tt)*) => {
$crate::framework::macros::attributed_string_type::Regex::Expression("[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}")
$crate::framework::macros::attributed_string_type::Regex::Expression("^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$")
.combine(attributed_string_type!(@regex $($attribute)*))
};

Expand Down Expand Up @@ -513,7 +516,7 @@ mod tests {
"test",
(min_length = 2), // should set the minimum length to 2
(max_length = 8), // should not affect the minimum length
(regex = ".{4}"), // should not affect the minimum length
(regex = "^.{4}$"), // should not affect the minimum length
is_rfc_1035_label_name, // should be overruled by the greater min_length
is_valid_label_value // should be overruled by the greater min_length
}
Expand Down Expand Up @@ -550,7 +553,7 @@ mod tests {
"test",
(min_length = 2), // should not affect the maximum length
(max_length = 8), // should set the maximum length to 8
(regex = ".{4}"), // should not affect the maximum length
(regex = "^.{4}$"), // should not affect the maximum length
is_rfc_1035_label_name, // should be overruled by the lower max_length
is_valid_label_value // should be overruled by the lower max_length
}
Expand Down Expand Up @@ -587,15 +590,15 @@ mod tests {
"test",
(min_length = 2), // should not affect the regular expression
(max_length = 8), // should not affect the regular expression
(regex = "[est]{4}") // should set the regular expression to "[est]{4}"
(regex = "^[est]{4}$") // should set the regular expression to "[est]{4}"
}

#[test]
fn test_attributed_string_type_regex_with_one_constraint() {
type T = RegexWithOneConstraintTest;

T::test_example();
assert_eq!(Regex::Expression("[est]{4}"), T::REGEX);
assert_eq!(Regex::Expression("^[est]{4}$"), T::REGEX);
assert_eq!(
Err(ErrorDiscriminants::RegexNotMatched),
T::from_str("t-st").map_err(ErrorDiscriminants::from)
Expand All @@ -608,7 +611,7 @@ mod tests {
"test",
(min_length = 2), // should not affect the regular expression
(max_length = 8), // should not affect the regular expression
(regex = "[est]{4}"), // should not be combinable with is_rfc_1123_dns_subdomain_name
(regex = "^[est]{4}$"), // should not be combinable with is_rfc_1123_dns_subdomain_name
is_rfc_1123_dns_subdomain_name // should not be combinable with regex
}

Expand Down Expand Up @@ -679,7 +682,7 @@ mod tests {
"test",
(min_length = 2),
(max_length = 4),
(regex = "[est-]+"),
(regex = "^[est-]+$"),
is_rfc_1035_label_name
}

Expand Down Expand Up @@ -785,7 +788,7 @@ mod tests {
"test",
(min_length = 4),
(max_length = 8),
(regex = "[est]+")
(regex = "^[est]+$")
}

#[test]
Expand Down
4 changes: 2 additions & 2 deletions rust/operator-binary/src/framework/types/kubernetes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ attributed_string_type! {
(min_length = 1),
// see https://github.com/kubernetes/kubernetes/blob/v1.34.1/staging/src/k8s.io/apimachinery/pkg/util/validation/validation.go#L435-L451
(max_length = RFC_1123_SUBDOMAIN_MAX_LENGTH),
(regex = "[-._a-zA-Z0-9]+")
(regex = "^[-._a-zA-Z0-9]+$")
}

attributed_string_type! {
Expand Down Expand Up @@ -95,7 +95,7 @@ attributed_string_type! {
(min_length = 1),
// see https://github.com/kubernetes/kubernetes/blob/v1.34.1/staging/src/k8s.io/apimachinery/pkg/util/validation/validation.go#L435-L451
(max_length = RFC_1123_SUBDOMAIN_MAX_LENGTH),
(regex = "[-._a-zA-Z0-9]+")
(regex = "^[-._a-zA-Z0-9]+$")
}

attributed_string_type! {
Expand Down