Skip to content

chore: bump operator rs 0.67 #614

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.

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 14 commits into from
May 13, 2024
Merged

chore: bump operator rs 0.67 #614

merged 14 commits into from
May 13, 2024

Conversation

fhennig
Copy link
Contributor

@fhennig fhennig commented May 8, 2024

Description

Please add a description here. This will become the commit message of the merge request later.

Definition of Done Checklist

  • Not all of these items are applicable to all PRs, the author should update this template to only leave the boxes in that are relevant
  • Please make sure all these things are done and tick the boxes

Author

Preview Give feedback

Reviewer

Preview Give feedback

Acceptance

Preview Give feedback

soenkeliebau
soenkeliebau previously approved these changes May 10, 2024
Copy link
Member

@soenkeliebau soenkeliebau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Went over the changes, and tested it in a local kind cluster, looking good to me.

One thing I noticed was that I got clippy lints when running clippy locally, but we decided to not do anything about these for now (opened stackabletech/product-config#107), and CI didn't find them for some reason

@sbernauer
Copy link
Member

When you open up the files in your IDE they show up as yellow, I would be very happy if we would put the big variants behind a Box (also should improve the performance)
I don't want to dictate the effort on you, I already have a patch below (it also fixes a typo) :)

diff --git a/rust/operator-binary/src/controller.rs b/rust/operator-binary/src/controller.rs
index 808d69a..de1f580 100644
--- a/rust/operator-binary/src/controller.rs
+++ b/rust/operator-binary/src/controller.rs
@@ -182,8 +182,11 @@ pub enum Error {
         source: stackable_operator::builder::meta::Error,
     },
 
-    #[snafu(display("Failed to load Product Config"))]
-    ProductConfigLoadFailed { source: config::Error },
+    #[snafu(display("Failed to load Product config"))]
+    ProductConfigLoadFailed {
+        #[snafu(source(from(config::Error, Box::new)))]
+        source: Box<config::Error>,
+    },
 
     #[snafu(display("Failed to find information about file [{}] in product config", kind))]
     ProductConfigKindNotSpecified { kind: String },
@@ -207,11 +210,15 @@ pub enum Error {
     NoRoleServiceFqdn,
 
     #[snafu(display("Bootstrap configuration error"))]
-    BoostrapConfig { source: crate::config::Error },
+    BootstrapConfig {
+        #[snafu(source(from(config::Error, Box::new)))]
+        source: Box<config::Error>,
+    },
 
     #[snafu(display("failed to prepare NiFi configuration for rolegroup {rolegroup}"))]
     BuildProductConfig {
-        source: crate::config::Error,
+        #[snafu(source(from(config::Error, Box::new)))]
+        source: Box<config::Error>,
         rolegroup: RoleGroupRef<NifiCluster>,
     },
 
@@ -731,7 +738,7 @@ async fn build_node_rolegroup_config_map(
                     })?
                     .clone(),
             )
-            .context(BoostrapConfigSnafu)?,
+            .context(BootstrapConfigSnafu)?,
         )
         .add_data(
             NIFI_PROPERTIES,

Copy link
Member

@maltesander maltesander left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, LGTM!

Copy link
Member

@sbernauer sbernauer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

@fhennig fhennig enabled auto-merge May 13, 2024 08:49
@fhennig fhennig added this pull request to the merge queue May 13, 2024
Merged via the queue into main with commit cbdb728 May 13, 2024
30 checks passed
@fhennig fhennig deleted the chore/bump-operator-rs-0.67 branch May 13, 2024 08:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants