feat: inventory on fromenv

Author: prestwich

Cargo.toml

@@ -4,7 +4,7 @@ name = "init4-bin-base"
 description = "Internal utilities for binaries produced by the init4 team"
 keywords = ["init4", "bin", "base"]
 
-version = "0.1.3"
+version = "0.2.0"
 edition = "2021"
 rust-version = "1.81"
 authors = ["init4", "James Prestwich"]

src/perms/builders.rs

@@ -175,6 +175,12 @@ impl Builders {
 impl FromEnv for Builders {
     type Error = BuilderConfigError;
 
+    fn inventory() -> Vec<&'static str> {
+        let mut v = vec![BUILDERS];
+        v.extend(SlotAuthzConfig::inventory());
+        v
+    }
+
     fn from_env() -> Result<Self, FromEnvErr<Self::Error>> {
         let s = String::from_env_var(BUILDERS)
             .map_err(FromEnvErr::infallible_into::<BuilderConfigError>)?;

src/perms/config.rs

@@ -76,6 +76,12 @@ impl SlotAuthzConfig {
 impl FromEnv for SlotAuthzConfig {
     type Error = SlotAuthzConfigError;
 
+    fn inventory() -> Vec<&'static str> {
+        let mut v = vec![BLOCK_QUERY_CUTOFF, BLOCK_QUERY_START];
+        v.extend(SlotCalculator::inventory());
+        v
+    }
+
     fn from_env() -> Result<Self, FromEnvErr<Self::Error>> {
         let calc = SlotCalculator::from_env().map_err(FromEnvErr::from)?;
         let block_query_cutoff = u8::from_env_var(BLOCK_QUERY_CUTOFF)

src/utils/calc.rs

@@ -125,6 +125,10 @@ impl SlotCalculator {
 impl FromEnv for SlotCalculator {
     type Error = SlotCalcEnvError;
 
+    fn inventory() -> Vec<&'static str> {
+        vec![START_TIMESTAMP, SLOT_OFFSET, SLOT_DURATION]
+    }
+
     fn from_env() -> Result<Self, FromEnvErr<Self::Error>> {
         let start_timestamp = u64::from_env_var(START_TIMESTAMP)
             .map_err(|e| e.map(SlotCalcEnvError::StartTimestamp))?;

src/utils/from_env.rs

@@ -93,6 +93,9 @@ pub trait FromEnv: core::fmt::Debug + Sized + 'static {
     /// Error type produced when loading from the environment.
     type Error: core::error::Error;
 
+    /// Get the environment variable names for this type.
+    fn inventory() -> Vec<&'static str>;
+
     /// Load from the environment.
     fn from_env() -> Result<Self, FromEnvErr<Self::Error>>;
 }

src/utils/metrics.rs

@@ -40,6 +40,10 @@ impl From<u16> for MetricsConfig {
 impl FromEnv for MetricsConfig {
     type Error = std::num::ParseIntError;
 
+    fn inventory() -> Vec<&'static str> {
+        vec![METRICS_PORT]
+    }
+
     fn from_env() -> Result<Self, FromEnvErr<Self::Error>> {
         match u16::from_env_var(METRICS_PORT).map(Self::from) {
             Ok(cfg) => Ok(cfg),

src/utils/otlp.rs

@@ -110,6 +110,10 @@ pub struct OtelConfig {
 impl FromEnv for OtelConfig {
     type Error = url::ParseError;
 
+    fn inventory() -> Vec<&'static str> {
+        vec![OTEL_ENDPOINT, OTEL_LEVEL, OTEL_TIMEOUT, OTEL_ENVIRONMENT]
+    }
+
     fn from_env() -> Result<Self, FromEnvErr<Self::Error>> {
         // load endpoint from env. ignore empty values (shortcut return None), parse, and print the error if any using inspect_err
         let endpoint = Url::from_env_var(OTEL_ENDPOINT).inspect_err(|e| eprintln!("{e}"))?;