Skip to content

Commit fcf48c9

Browse files
committed
Renamed fn to new_trimmed
1 parent 03d8966 commit fcf48c9

1 file changed

Lines changed: 5 additions & 8 deletions

File tree

  • crates/stackable-operator/src/kvp

crates/stackable-operator/src/kvp/key.rs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,7 @@ impl Key {
144144
/// adds a hyphen and probably digits, very likely being an invalid result.
145145
///
146146
/// See [`ensure_max_string_length`] for details on the shortening algorithm.
147-
pub fn shortened_to_valid_length(
148-
prefix: Option<&str>,
149-
name: impl Into<String>,
150-
) -> Result<Self, KeyError> {
147+
pub fn new_trimmed(prefix: Option<&str>, name: impl Into<String>) -> Result<Self, KeyError> {
151148
let name = ensure_max_string_length(name, KEY_NAME_MAX_LEN, 8);
152149

153150
let key = match prefix {
@@ -386,7 +383,7 @@ mod test {
386383

387384
#[test]
388385
fn key_shortened_to_valid_length_with_short_enough_name() {
389-
let key = Key::shortened_to_valid_length(Some("stackable.tech"), "a".repeat(63)).unwrap();
386+
let key = Key::new_trimmed(Some("stackable.tech"), "a".repeat(63)).unwrap();
390387

391388
assert_eq!(key.prefix, Some(KeyPrefix("stackable.tech".into())));
392389
assert_eq!(key.name, KeyName("a".repeat(63)));
@@ -399,7 +396,7 @@ mod test {
399396

400397
#[test]
401398
fn key_shortened_to_valid_length_with_too_long_name() {
402-
let key = Key::shortened_to_valid_length(Some("stackable.tech"), "a".repeat(64)).unwrap();
399+
let key = Key::new_trimmed(Some("stackable.tech"), "a".repeat(64)).unwrap();
403400

404401
assert_eq!(key.prefix, Some(KeyPrefix("stackable.tech".into())));
405402
assert_eq!(key.name, KeyName(format!("{}-ffe054fe", "a".repeat(54))));
@@ -414,7 +411,7 @@ mod test {
414411
fn key_shortened_to_valid_length_with_too_long_prefix() {
415412
// The prefix is a valid DNS subdomain name, except for being one character too long.
416413
let prefix = format!("{}.tech", "a".repeat(249));
417-
let error = Key::shortened_to_valid_length(Some(&prefix), "myname")
414+
let error = Key::new_trimmed(Some(&prefix), "myname")
418415
.expect_err("the prefix exceeds the maximum length");
419416

420417
assert_eq!(
@@ -427,7 +424,7 @@ mod test {
427424

428425
#[test]
429426
fn key_shortened_to_valid_length_without_prefix() {
430-
let key = Key::shortened_to_valid_length(None, "a".repeat(64)).unwrap();
427+
let key = Key::new_trimmed(None, "a".repeat(64)).unwrap();
431428

432429
assert_eq!(key.prefix, None);
433430
assert_eq!(key.name, KeyName(format!("{}-ffe054fe", "a".repeat(54))));

0 commit comments

Comments
 (0)