Merge typed role and role group configs

CHANGELOG.md

@@ -4,16 +4,23 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+### Added
+
+- An `Optional` macro to derive a struct with only optional parameters and the Merge trait for merging ([#425]).
+- BREAKING: `role_utils::Role<O, M` now takes 2 parameters. One OptionalFooConfig (derived by the `Optional` macro) and the original FooConfig ([#425]).
+
 ### Changed
 
 - BREAKING: Bump to k8s 1.24 and kube 0.73.1 ([#408]).
+- BREAKING: The CommonConfiguration of the Role and RoleGroup now have to retrieved via a get() method ([#425]).
 
 ### Fixed
 
 - Correctly propagate storage class in `PVCConfig::build_pvc()` ([#412]).
 
 [#408]: https://github.com/stackabletech/operator-rs/pull/408
 [#412]: https://github.com/stackabletech/operator-rs/pull/412
+[#425]: https://github.com/stackabletech/operator-rs/pull/425
 
 ## [0.21.1] - 2022-05-22
 

src/config/merge.rs

@@ -4,6 +4,7 @@ use std::{
     hash::Hash,
 };
 
+use crate::commons::resources::Resources;
 pub use stackable_operator_derive::Merge;
 
 /// A type that can be merged with itself
@@ -134,6 +135,8 @@ impl Atomic for String {}
 impl Atomic for Quantity {}
 impl<'a> Atomic for &'a str {}
 impl Atomic for LabelSelector {}
+impl<T: Clone> Atomic for Vec<T> {}
+impl<T: Clone + Default + Merge> Atomic for Resources<T> {}
 
 impl<T: Atomic> Merge for Option<T> {
     fn merge(&mut self, defaults: &Self) {

src/config/mod.rs

@@ -1 +1,2 @@
 pub mod merge;
+pub mod optional;

src/config/optional.rs

@@ -0,0 +1,28 @@
+use crate::config::merge::Merge;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+
+pub use stackable_operator_derive::Optional;
+
+#[derive(Clone, Debug, Default, Deserialize, JsonSchema, PartialEq, Serialize)]
+#[serde(transparent)]
+pub struct Complex<T>(Option<T>);
+
+impl<T> Complex<T> {
+    pub fn get(self) -> Option<T> {
+        self.0
+    }
+}
+
+impl<T: Clone + Merge> Merge for Complex<T> {
+    fn merge(&mut self, defaults: &Self) {
+        match (&mut self.0, &defaults.0) {
+            (Some(s), Some(d)) => s.merge(d),
+            (None, Some(d)) => self.0 = Some(d).cloned(),
+            (_, _) => {}
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {}