Skip to content

fix: Remove Merge trait bound and make product_specific_common_config field public #946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 20, 2025
Merged

fix: Remove Merge trait bound and make product_specific_common_config field public #946

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
066bd21
remove merge trait and make product_specific_common_config public
maltesander Jan 20, 2025
2f9d98e
adapt changelog
maltesander Jan 20, 2025
89573f3
Update crates/stackable-operator/src/role_utils.rs
maltesander Jan 20, 2025
25369ce
Update crates/stackable-operator/CHANGELOG.md
maltesander Jan 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions crates/stackable-operator/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 5 additions & 3 deletions crates/stackable-operator/src/role_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,11 @@ pub struct CommonConfiguration<T, ProductSpecificCommonConfig> {
// 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<T, ProductSpecificCommonConfig> CommonConfiguration<T, ProductSpecificCommonConfig> {
Expand Down Expand Up @@ -324,7 +326,7 @@ impl<T, U, ProductSpecificCommonConfig> Role<T, U, ProductSpecificCommonConfig>
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
Expand Down
Loading