refactor: remove writer.rs & bump dependencies

Author: maltesander

Cargo.lock

@@ -14,12 +14,11 @@ stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git",
 
 anyhow = "1.0"
 built = { version = "0.8", features = ["chrono", "git2"] }
-clap = "4.5"
+clap = "4.6"
 const_format = "0.2"
 fnv = "1.0"
 futures = { version = "0.3", features = ["compat"] }
 indoc = "2.0"
-java-properties = "2.0"
 openssl = "0.10"
 pin-project = "1.1"
 rstest = "0.26"
@@ -29,7 +28,7 @@ serde_json = "1.0"
 serde_yaml = "0.9"
 snafu = "0.9"
 strum = { version = "0.28", features = ["derive"] }
-tokio = { version = "1.40", features = ["full"] }
+tokio = { version = "1.52", features = ["full"] }
 tracing = "0.1"
 
 [patch."https://github.com/stackabletech/operator-rs.git"]

Cargo.nix

@@ -17,7 +17,6 @@ const_format.workspace = true
 fnv.workspace = true
 futures.workspace = true
 indoc.workspace = true
-java-properties.workspace = true
 openssl.workspace = true
 pin-project.workspace = true
 semver.workspace = true

Cargo.toml

@@ -73,9 +73,10 @@ mod build;
 mod dereference;
 mod validate;
 
-use build::discovery::{self, build_discovery_configmaps};
-use build::properties::logging::MAX_DRUID_LOG_FILES_SIZE;
-
+use build::{
+    discovery::{self, build_discovery_configmaps},
+    properties::logging::MAX_DRUID_LOG_FILES_SIZE,
+};
 use validate::DruidRoleGroupConfig;
 
 pub const DRUID_CONTROLLER_NAME: &str = "druidcluster";
@@ -944,7 +945,7 @@ mod test {
         controller::{
             build::{
                 config_map::build_rolegroup_config_map,
-                properties::{ConfigFileName, runtime_properties, writer},
+                properties::{ConfigFileName, runtime_properties},
             },
             validate::{DruidRoleGroupConfig, ValidatedCluster, ValidatedClusterConfig},
         },
@@ -1042,14 +1043,15 @@ mod test {
             .unwrap()
             .to_string();
 
-        let escaped_segment_cache_property = writer::to_java_properties_string(
-            vec![(
-                &PROP_SEGMENT_CACHE_LOCATIONS.to_string(),
-                &Some(expected_druid_segment_cache_property.to_string()),
-            )]
-            .into_iter(),
-        )
-        .unwrap();
+        let escaped_segment_cache_property =
+            stackable_operator::v2::config_file_writer::to_java_properties_string(
+                vec![(
+                    &PROP_SEGMENT_CACHE_LOCATIONS.to_string(),
+                    &Some(expected_druid_segment_cache_property.to_string()),
+                )]
+                .into_iter(),
+            )
+            .unwrap();
 
         assert!(
             druid_segment_cache_property.contains(&escaped_segment_cache_property),

rust/operator-binary/Cargo.toml

@@ -20,6 +20,7 @@ use stackable_operator::{
     k8s_openapi::api::core::v1::{ConfigMap, EnvVar},
     product_logging::framework::VECTOR_CONFIG_FILE,
     role_utils::RoleGroupRef,
+    v2::config_file_writer::to_java_properties_string,
 };
 
 use crate::{
@@ -29,7 +30,6 @@ use crate::{
         build::properties::{
             ConfigFileName,
             logging::{build_log4j2_config, build_vector_config},
-            writer::to_java_properties_string,
         },
         validate::{DruidRoleGroupConfig, ValidatedCluster},
     },
@@ -72,12 +72,12 @@ pub enum Error {
 
     #[snafu(display("failed to serialize [runtime.properties]"))]
     SerializeRuntimeProperties {
-        source: crate::controller::build::properties::writer::PropertiesWriterError,
+        source: stackable_operator::v2::config_file_writer::PropertiesWriterError,
     },
 
     #[snafu(display("failed to serialize [security.properties] for {rolegroup}"))]
     JvmSecurityProperties {
-        source: crate::controller::build::properties::writer::PropertiesWriterError,
+        source: stackable_operator::v2::config_file_writer::PropertiesWriterError,
         rolegroup: String,
     },
 

rust/operator-binary/src/controller.rs

@@ -1,7 +1,5 @@
 //! Per-file builders for Druid `.properties` files.
 
-pub mod writer;
-
 pub mod logging;
 pub mod runtime_properties;
 pub mod security_properties;