From 066bd21227e4a94ba155f87c809b98ca7fb10af4 Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Mon, 20 Jan 2025 14:20:40 +0100 Subject: [PATCH 1/4] remove merge trait and make product_specific_common_config public --- crates/stackable-operator/src/role_utils.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/crates/stackable-operator/src/role_utils.rs b/crates/stackable-operator/src/role_utils.rs index e77672793..3d9789ffa 100644 --- a/crates/stackable-operator/src/role_utils.rs +++ b/crates/stackable-operator/src/role_utils.rs @@ -163,9 +163,11 @@ pub struct CommonConfiguration { // No docs needed, as we flatten this struct. // // This field is product-specific and can contain e.g. jvmArgumentOverrides. - // It is not accessible by operators, please use [`Role::get_product_specific_common_configs`] to read the values. + // + // If JavaCommonConfig is used, please use [`Role::get_merged_jvm_argument_overrides`] instead of + // reading this field directly. #[serde(flatten, default)] - pub(crate) product_specific_common_config: ProductSpecificCommonConfig, + pub product_specific_common_config: ProductSpecificCommonConfig, } impl CommonConfiguration { @@ -324,7 +326,7 @@ impl Role where T: Configuration + 'static, U: Default + JsonSchema + Serialize, - ProductSpecificCommonConfig: Default + JsonSchema + Serialize + Clone + Merge, + ProductSpecificCommonConfig: Default + JsonSchema + Serialize + Clone, { /// This casts a generic struct implementing [`crate::product_config_utils::Configuration`] /// and used in [`Role`] into a Box of a dynamically dispatched From 2f9d98ea87d77eddcbaaaf06856c31863d3121ae Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Mon, 20 Jan 2025 14:32:22 +0100 Subject: [PATCH 2/4] adapt changelog --- crates/stackable-operator/CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/crates/stackable-operator/CHANGELOG.md b/crates/stackable-operator/CHANGELOG.md index e81e0d9ab..397d206a7 100644 --- a/crates/stackable-operator/CHANGELOG.md +++ b/crates/stackable-operator/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +### Fixed + +- Remove Merge trait from `erase` and make `product_specific_common_config` public ([#946]). + +[#946]: https://github.com/stackabletech/operator-rs/pull/946 + ## [0.84.0] - 2025-01-16 ### Added From 89573f31f79664b5b6dddb84560de834a0c49592 Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Mon, 20 Jan 2025 14:32:39 +0100 Subject: [PATCH 3/4] Update crates/stackable-operator/src/role_utils.rs Co-authored-by: Sebastian Bernauer --- crates/stackable-operator/src/role_utils.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/stackable-operator/src/role_utils.rs b/crates/stackable-operator/src/role_utils.rs index 3d9789ffa..068705cd4 100644 --- a/crates/stackable-operator/src/role_utils.rs +++ b/crates/stackable-operator/src/role_utils.rs @@ -164,7 +164,7 @@ pub struct CommonConfiguration { // // This field is product-specific and can contain e.g. jvmArgumentOverrides. // - // If JavaCommonConfig is used, please use [`Role::get_merged_jvm_argument_overrides`] instead of + // If [`JavaCommonConfig`] is used, please use [`Role::get_merged_jvm_argument_overrides`] instead of // reading this field directly. #[serde(flatten, default)] pub product_specific_common_config: ProductSpecificCommonConfig, From 25369cee1da2f9dbc80982cab14f8837790012b1 Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Mon, 20 Jan 2025 14:35:10 +0100 Subject: [PATCH 4/4] Update crates/stackable-operator/CHANGELOG.md Co-authored-by: Sebastian Bernauer --- crates/stackable-operator/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/stackable-operator/CHANGELOG.md b/crates/stackable-operator/CHANGELOG.md index 397d206a7..b9e33e004 100644 --- a/crates/stackable-operator/CHANGELOG.md +++ b/crates/stackable-operator/CHANGELOG.md @@ -6,7 +6,7 @@ All notable changes to this project will be documented in this file. ### Fixed -- Remove Merge trait from `erase` and make `product_specific_common_config` public ([#946]). +- Remove `Merge` trait bound from `erase` and make `product_specific_common_config` public ([#946]). [#946]: https://github.com/stackabletech/operator-rs/pull/946