cleanup

Author: razvan

Cargo.lock

@@ -17,7 +17,6 @@ stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git",
 ], tag = "stackable-operator-0.109.0" }
 
 anyhow = "1.0"
-base64 = "0.22"
 built = { version = "0.8", features = ["chrono", "git2"] }
 clap = "4.5"
 const_format = "0.2"

Cargo.nix

@@ -13,7 +13,6 @@ product-config.workspace = true
 stackable-operator.workspace = true
 
 anyhow.workspace = true
-base64.workspace = true
 clap.workspace = true
 const_format.workspace = true
 fnv.workspace = true

Cargo.toml

@@ -93,7 +93,11 @@ use crate::{
             AirflowAuthenticationClassResolved, AirflowClientAuthenticationDetailsResolved,
         },
         authorization::AirflowAuthorizationResolved,
-        build_recommended_labels, v1alpha2,
+        build_recommended_labels,
+        internal_secret::{
+            FERNET_KEY_SECRET_KEY, INTERNAL_SECRET_SECRET_KEY, JWT_SECRET_SECRET_KEY,
+        },
+        v1alpha2,
     },
     env_vars::{self, build_airflow_template_envs},
     operations::{
@@ -109,21 +113,6 @@ use crate::{
     },
 };
 
-// Used for env-vars: AIRFLOW__WEBSERVER__SECRET_KEY, AIRFLOW__API__SECRET_KEY
-// N.B. AIRFLOW__WEBSERVER__SECRET_KEY is deprecated as of 3.0.2.
-// Secret key used to run the api server. It should be as random as possible.
-// It should be consistent across instances of the webserver. The webserver key
-// is also used to authorize requests to Celery workers when logs are retrieved.
-pub const INTERNAL_SECRET_SECRET_KEY: &str = "INTERNAL_SECRET";
-// Used for env-var: AIRFLOW__API_AUTH__JWT_SECRET
-// Secret key used to encode and decode JWTs to authenticate to public and
-// private APIs. It should be as random as possible, but consistent across
-// instances of API services.
-pub const JWT_SECRET_SECRET_KEY: &str = "JWT_SECRET";
-// Used for env-var: AIRFLOW__CORE__FERNET_KEY
-// See https://airflow.apache.org/docs/apache-airflow/stable/security/secrets/fernet.html#security-fernet
-pub const FERNET_KEY_SECRET_KEY: &str = "FERNET_KEY";
-
 pub const AIRFLOW_CONTROLLER_NAME: &str = "airflowcluster";
 pub const DOCKER_IMAGE_BASE_NAME: &str = "airflow";
 pub const AIRFLOW_FULL_CONTROLLER_NAME: &str =

rust/operator-binary/Cargo.toml

@@ -0,0 +1,12 @@
+// Secret key used to run the api server. It should be as random as possible.
+// It should be consistent across instances of the webserver. The webserver key
+// is also used to authorize requests to Celery workers when logs are retrieved.
+pub const INTERNAL_SECRET_SECRET_KEY: &str = "INTERNAL_SECRET";
+// Used for env-var: AIRFLOW__API_AUTH__JWT_SECRET
+// Secret key used to encode and decode JWTs to authenticate to public and
+// private APIs. It should be as random as possible, but consistent across
+// instances of API services.
+pub const JWT_SECRET_SECRET_KEY: &str = "JWT_SECRET";
+// Used for env-var: AIRFLOW__CORE__FERNET_KEY
+// See https://airflow.apache.org/docs/apache-airflow/stable/security/secrets/fernet.html#security-fernet
+pub const FERNET_KEY_SECRET_KEY: &str = "FERNET_KEY";

rust/operator-binary/src/airflow_controller.rs

@@ -61,6 +61,7 @@ use crate::{
 pub mod affinity;
 pub mod authentication;
 pub mod authorization;
+pub mod internal_secret;
 
 pub const APP_NAME: &str = "airflow";
 pub const FIELD_MANAGER: &str = "airflow-operator";