Skip to content

Commit 0660983

Browse files
committed
test: Fix tests
1 parent aab3fff commit 0660983

File tree

4 files changed

+13
-11
lines changed

4 files changed

+13
-11
lines changed

crates/stackable-operator/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ versioned = []
1616

1717
[dependencies]
1818
stackable-telemetry = { path = "../stackable-telemetry", features = ["clap"] }
19-
stackable-versioned = { path = "../stackable-versioned", features = ["k8s", "flux-converter"] }
19+
stackable-versioned = { path = "../stackable-versioned", features = ["k8s"] }
2020
stackable-operator-derive = { path = "../stackable-operator-derive" }
2121
stackable-shared = { path = "../stackable-shared" }
2222

crates/stackable-versioned/Cargo.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ flux-converter = [
2222
"dep:k8s-openapi",
2323
"dep:serde",
2424
"dep:schemars",
25-
"dep:serde_json",
26-
"dep:snafu",
25+
"dep:serde_json"
2726
]
2827

2928
[dependencies]
@@ -34,7 +33,7 @@ k8s-openapi = { workspace = true, optional = true }
3433
serde = { workspace = true, optional = true }
3534
schemars = { workspace = true, optional = true }
3635
serde_json = { workspace = true, optional = true }
37-
snafu = { workspace = true, optional = true }
36+
snafu.workspace = true
3837

3938
[dev-dependencies]
4039
insta.workspace = true

crates/stackable-versioned/src/flux_converter/mod.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,11 @@ use std::{error::Error, fmt::Write};
77

88
use snafu::Snafu;
99

10+
use crate::ParseResourceVersionError;
11+
1012
#[cfg(test)]
1113
mod tests;
1214

13-
#[derive(Debug, Snafu)]
14-
pub enum ParseResourceVersionError {
15-
#[snafu(display("the resource version \"{version}\" is not known"))]
16-
UnknownResourceVersion { version: String },
17-
}
18-
1915
#[derive(Debug, Snafu)]
2016
pub enum ConversionError {
2117
#[snafu(display("failed to parse current resource version \"{version}\""))]

crates/stackable-versioned/src/lib.rs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,20 @@
1212
//! See [`versioned`] for an in-depth usage guide and a list of supported
1313
//! parameters.
1414
15+
use snafu::Snafu;
1516
pub use stackable_versioned_macros::*;
1617

1718
#[cfg(feature = "flux-converter")]
1819
mod flux_converter;
1920

2021
#[cfg(feature = "flux-converter")]
21-
pub use flux_converter::{ConversionError, ParseResourceVersionError};
22+
pub use flux_converter::ConversionError;
23+
24+
#[derive(Debug, Snafu)]
25+
pub enum ParseResourceVersionError {
26+
#[snafu(display("the resource version \"{version}\" is not known"))]
27+
UnknownResourceVersion { version: String },
28+
}
2229

2330
// Unused for now, might get picked up again in the future.
2431
#[doc(hidden)]

0 commit comments

Comments
 (0)