Skip to content

Commit 18f138f

Browse files
adwk67claude
andcommitted
refactor: move vendored writer to config/writer, drop framework module
Relocates the vendored Flask config writer from framework/flask_app_config_writer to config/writer, matching hdfs-operator's config/writer.rs convention (no operator keeps a vendored writer under framework/, which trino reserves for v2 upstream mirrors). Converts config.rs into a config/ module. No behaviour change. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
1 parent 2bd1f79 commit 18f138f

6 files changed

Lines changed: 11 additions & 20 deletions

File tree

rust/operator-binary/src/airflow_controller.rs

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,10 @@ use stackable_operator::{
7272
use strum::{EnumDiscriminants, IntoStaticStr};
7373

7474
use crate::{
75-
config::{self, PYTHON_IMPORTS},
75+
config::{
76+
self, PYTHON_IMPORTS,
77+
writer::{self, FlaskAppConfigWriterError},
78+
},
7679
controller_commons::{self, CONFIG_VOLUME_NAME, LOG_CONFIG_VOLUME_NAME, LOG_VOLUME_NAME},
7780
crd::{
7881
self, AIRFLOW_CONFIG_FILENAME, APP_NAME, AirflowClusterStatus, AirflowConfig,
@@ -91,7 +94,6 @@ use crate::{
9194
v1alpha2,
9295
},
9396
env_vars::{self, build_airflow_template_envs},
94-
framework::flask_app_config_writer::{self, FlaskAppConfigWriterError},
9597
operations::{
9698
graceful_shutdown::{
9799
add_airflow_graceful_shutdown_config, add_executor_graceful_shutdown_config,
@@ -770,14 +772,10 @@ fn build_rolegroup_config_map(
770772

771773
let temp_file_footer: Option<String> = config.remove(CONFIG_OVERRIDE_FILE_FOOTER_KEY);
772774

773-
flask_app_config_writer::write::<AirflowConfigOptions, _, _>(
774-
&mut config_file,
775-
config.iter(),
776-
PYTHON_IMPORTS,
777-
)
778-
.with_context(|_| BuildRoleGroupConfigFileSnafu {
779-
rolegroup: rolegroup.clone(),
780-
})?;
775+
writer::write::<AirflowConfigOptions, _, _>(&mut config_file, config.iter(), PYTHON_IMPORTS)
776+
.with_context(|_| BuildRoleGroupConfigFileSnafu {
777+
rolegroup: rolegroup.clone(),
778+
})?;
781779

782780
if let Some(footer) = temp_file_footer {
783781
writeln!(config_file, "{}", footer).context(WriteToConfigFileStringSnafu)?;
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
pub mod writer;
2+
13
use std::collections::BTreeMap;
24

35
use indoc::formatdoc;
File renamed without changes.

rust/operator-binary/src/crd/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ use stackable_operator::{
4545
use strum::{Display, EnumIter, EnumString, IntoEnumIterator};
4646

4747
use crate::{
48+
config::writer::{FlaskAppConfigOptions, PythonType},
4849
crd::{
4950
affinity::{get_affinity, get_executor_affinity},
5051
authentication::{
@@ -55,7 +56,6 @@ use crate::{
5556
CeleryBrokerConnection, CeleryResultBackendConnection, MetadataDatabaseConnection,
5657
},
5758
},
58-
framework::flask_app_config_writer::{FlaskAppConfigOptions, PythonType},
5959
util::role_service_name,
6060
};
6161

rust/operator-binary/src/framework.rs

Lines changed: 0 additions & 8 deletions
This file was deleted.

rust/operator-binary/src/main.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ mod controller;
4444
mod controller_commons;
4545
mod crd;
4646
mod env_vars;
47-
mod framework;
4847
mod operations;
4948
mod product_logging;
5049
mod service;

0 commit comments

Comments
 (0)