Skip to content

Commit 4364c53

Browse files
committed
Add ParseApiVersionError variant
1 parent d5a3109 commit 4364c53

10 files changed

+105
-67
lines changed

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ impl Struct {
250250
let automatically_derived = is_nested.not().then(|| quote! {#[automatically_derived]});
251251

252252
let versioned_path = &*kubernetes_arguments.crates.versioned;
253-
let convert_object_error = quote! { #versioned_path::ConvertObjectError };
253+
let parse_api_version_error = quote! { #versioned_path::ParseApiVersionError };
254254

255255
// Get the per-version items to be able to iterate over them via quote
256256
let variant_strings = &tokens.variant_strings;
@@ -288,11 +288,11 @@ impl Struct {
288288
}
289289
}
290290

291-
pub fn try_from_api_version(api_version: &str) -> Result<Self, #convert_object_error> {
291+
pub fn try_from_api_version(api_version: &str) -> Result<Self, #parse_api_version_error> {
292292
match api_version {
293293
#(#api_versions => Ok(Self::#variant_idents)),*,
294-
_ => Err(#convert_object_error::DesiredApiVersionUnknown {
295-
unknown_desired_api_version: api_version.to_string(),
294+
_ => Err(#parse_api_version_error::UnknownVersion {
295+
api_version: api_version.to_string(),
296296
}),
297297
}
298298
}
@@ -469,7 +469,8 @@ impl Struct {
469469
)
470470
-> ::std::result::Result<::std::vec::Vec<#serde_json_path::Value>, #convert_object_error>
471471
{
472-
let desired_api_version = #version_enum_ident::try_from_api_version(desired_api_version)?;
472+
let desired_api_version = #version_enum_ident::try_from_api_version(desired_api_version)
473+
.map_err(|source| #convert_object_error::ParseDesiredApiVersion { source })?;
473474

474475
let mut converted_objects = ::std::vec::Vec::with_capacity(objects.len());
475476

crates/stackable-versioned-macros/tests/snapshots/[email protected]

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

crates/stackable-versioned-macros/tests/snapshots/stackable_versioned_macros__snapshot_tests__k8s@conversion_tracking.rs.snap

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

crates/stackable-versioned-macros/tests/snapshots/stackable_versioned_macros__snapshot_tests__k8s@crate_overrides.rs.snap

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

crates/stackable-versioned-macros/tests/snapshots/[email protected]

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

crates/stackable-versioned-macros/tests/snapshots/stackable_versioned_macros__snapshot_tests__k8s@module_preserve.rs.snap

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

crates/stackable-versioned-macros/tests/snapshots/stackable_versioned_macros__snapshot_tests__k8s@renamed_kind.rs.snap

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

0 commit comments

Comments
 (0)