Skip to content

Commit d3bd713

Browse files
committed
chore: Adjust error variants
1 parent f7537c7 commit d3bd713

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

crates/stackable-operator/src/utils/cluster_domain.rs

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,17 @@ pub enum Error {
1717
#[snafu(display("failed to read resolv.conf"))]
1818
ReadResolvConfFile { source: std::io::Error },
1919

20-
#[snafu(display("failed to parse {cluster_domain:?} as cluster domain"))]
20+
#[snafu(display("failed to parse {cluster_domain:?} as domain name"))]
2121
ParseDomainName {
2222
source: crate::validation::Errors,
2323
cluster_domain: String,
2424
},
2525

26-
#[snafu(display("No 'search' entries found in"))]
27-
SearchEntryNotFound,
26+
#[snafu(display("unable to find \"search\" entry"))]
27+
NoSearchEntry,
2828

29-
#[snafu(display("Could not trim search entry in '{search_entry_line}'."))]
30-
TrimSearchEntryFailed { search_entry_line: String },
31-
32-
#[snafu(display("Could not find any cluster domain entry in search line."))]
33-
LookupClusterDomainEntryFailed,
29+
#[snafu(display("unable to find unambiguous domain in \"search\" entry"))]
30+
AmbiguousDomainEntries,
3431
}
3532

3633
/// This is the primary entry point to retrieve the Kubernetes cluster domain.
@@ -115,12 +112,12 @@ where
115112
.filter(|l| l.starts_with("search"))
116113
.map(|l| l.trim_start_matches("search"))
117114
.last()
118-
.context(SearchEntryNotFoundSnafu)?;
115+
.context(NoSearchEntrySnafu)?;
119116

120117
let shortest_entry = last
121118
.split_ascii_whitespace()
122119
.min_by_key(|item| item.len())
123-
.context(LookupClusterDomainEntryFailedSnafu)?;
120+
.context(AmbiguousDomainEntriesSnafu)?;
124121

125122
// NOTE (@Techassi): This is really sad and bothers me more than I would like to admit
126123
Ok(shortest_entry.to_owned())

0 commit comments

Comments
 (0)