[Merged by Bors] - Changes to be compatible with crate2nix

CHANGELOG.md

@@ -9,6 +9,17 @@
 ### Changed
 
 - `operator-rs` `0.31.0` -> `0.34.0` ([#219]).
+- Revert openshift settings ([#233])
+- Support crate2nix in dev environments ([#234])
+
+[#219]: https://github.com/stackabletech/airflow-operator/pull/219
+[#233]: https://github.com/stackabletech/spark-k8s-operator/pull/233
+[#234]: https://github.com/stackabletech/spark-k8s-operator/pull/234
+
+## [23.1.0] - 2023-01-23
+
+### Changed
+
 - Specified security context settings needed for OpenShift ([#222]).
 - Fixed template parsing for OpenShift tests ([#222]).
 - Revert openshift settings ([#233])

rust/operator-binary/build.rs

@@ -1,3 +1,13 @@
+use std::path::PathBuf;
+
 fn main() {
-    built::write_built_file().expect("Failed to acquire build-time information");
+    let out_dir = PathBuf::from(std::env::var("OUT_DIR").expect("OUT_DIR is required"));
+    built::write_built_file_with_opts(
+        // built's env module depends on a whole bunch of variables that crate2nix doesn't provide
+        // so we grab the specific env variables that we care about out ourselves instead.
+        built::Options::default().set_env(false),
+        "Cargo.toml".as_ref(),
+        &out_dir.join("built.rs"),
+    )
+    .unwrap();
 }

rust/operator-binary/src/main.rs

@@ -8,7 +8,7 @@ mod util;
 
 use crate::airflow_controller::AIRFLOW_CONTROLLER_NAME;
 
-use clap::Parser;
+use clap::{crate_description, crate_version, Parser};
 use futures::StreamExt;
 use stackable_airflow_crd::{
     airflowdb::{AirflowDB, AIRFLOW_DB_CONTROLLER_NAME},
@@ -34,10 +34,11 @@ use std::sync::Arc;
 
 mod built_info {
     include!(concat!(env!("OUT_DIR"), "/built.rs"));
+    pub const TARGET_PLATFORM: Option<&str> = option_env!("TARGET");
 }
 
 #[derive(Parser)]
-#[clap(about = built_info::PKG_DESCRIPTION, author = stackable_operator::cli::AUTHOR)]
+#[clap(about, author)]
 struct Opts {
     #[clap(subcommand)]
     cmd: Command,
@@ -63,10 +64,10 @@ async fn main() -> anyhow::Result<()> {
                 tracing_target,
             );
             stackable_operator::utils::print_startup_string(
-                built_info::PKG_DESCRIPTION,
-                built_info::PKG_VERSION,
+                crate_description!(),
+                crate_version!(),
                 built_info::GIT_VERSION,
-                built_info::TARGET,
+                built_info::TARGET_PLATFORM.unwrap_or("unknown target"),
                 built_info::BUILT_TIME_UTC,
                 built_info::RUSTC_VERSION,
             );