Skip to content

Commit d5a3109

Browse files
committed
adopt unexpected kind error message
1 parent 58b330b commit d5a3109

File tree

3 files changed

+6
-11
lines changed

3 files changed

+6
-11
lines changed

crates/stackable-versioned-macros/src/codegen/container/struct/k8s.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,9 @@ impl Struct {
193193
// accidentally updating upgrade/downgrade information in the
194194
// status in a later step.
195195
if object_kind != #enum_ident_string {
196-
return Err(#parse_object_error::UnexpectedObjectKind{
196+
return Err(#parse_object_error::UnexpectedKind{
197197
kind: object_kind.to_string(),
198-
supported_kind: #enum_ident_string.to_string(),
198+
expected: #enum_ident_string.to_string(),
199199
});
200200
}
201201

crates/stackable-versioned/src/k8s.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,8 @@ pub enum ParseObjectError {
5959
#[snafu(display("failed to deserialize object from JSON"))]
6060
Deserialize { source: serde_json::Error },
6161

62-
#[snafu(display(
63-
"unexpected object kind {kind:?}. The conversion can only convert objects of kind {supported_kind:?}"
64-
))]
65-
UnexpectedObjectKind {
66-
kind: String,
67-
supported_kind: String,
68-
},
62+
#[snafu(display("unexpected object kind {kind:?}, expected {expected:?}"))]
63+
UnexpectedKind { kind: String, expected: String },
6964
}
7065

7166
/// This error indicates that converting an object from a conversion review to the desired

crates/stackable-versioned/src/tests/snapshots/stackable_versioned__tests__fail@wrong_kind.json.snap

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)