fix: flow file name depends on the nifi version

stackabletech · Sep 17, 2024 · 805d48b · 805d48b
1 parent 7e8528a
commit 805d48b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/rust/operator-binary/src/config.rs b/rust/operator-binary/src/config.rs
@@ -196,12 +196,18 @@ pub fn build_nifi_properties(
     proxy_hosts: &str,
     auth_config: &NifiAuthenticationConfig,
     overrides: BTreeMap<String, String>,
+    product_version: &str,
 ) -> Result<String, Error> {
     let mut properties = BTreeMap::new();
     // Core Properties
+    let flow_file_name = if product_version.starts_with("2") {
+        "flow.json.gz"
+    } else {
+        "flow.xml.gz"
+    };
     properties.insert(
         "nifi.flow.configuration.file".to_string(),
-        NifiRepository::Database.mount_path() + "/flow.json.gz",
+        NifiRepository::Database.mount_path() + "/" + flow_file_name,
     );
     properties.insert(
         "nifi.flow.configuration.archive.enabled".to_string(),

diff --git a/rust/operator-binary/src/controller.rs b/rust/operator-binary/src/controller.rs
@@ -764,6 +764,7 @@ async fn build_node_rolegroup_config_map(
                         kind: NIFI_PROPERTIES.to_string(),
                     })?
                     .clone(),
+                resolved_product_image.product_version.as_ref(),
             )
             .with_context(|_| BuildProductConfigSnafu {
                 rolegroup: rolegroup.clone(),