sentry-options 0.0.4__tar.gz → 0.0.5__tar.gz

{sentry_options-0.0.4 → sentry_options-0.0.5}/Cargo.lock

@@ -240,7 +240,7 @@ dependencies = [
 
 [[package]]
 name = "example"
-version = "0.0.4"
+version = "0.0.5"
 dependencies = [
  "anyhow",
  "sentry-options",
@@ -1111,7 +1111,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "sentry-options"
-version = "0.0.4"
+version = "0.0.5"
 dependencies = [
  "sentry-options-validation",
  "serde_json",
@@ -1121,7 +1121,7 @@ dependencies = [
 
 [[package]]
 name = "sentry-options-cli"
-version = "0.0.4"
+version = "0.0.5"
 dependencies = [
  "clap",
  "sentry-options-validation",
@@ -1135,7 +1135,7 @@ dependencies = [
 
 [[package]]
 name = "sentry-options-python"
-version = "0.0.4"
+version = "0.0.5"
 dependencies = [
  "pyo3",
  "sentry-options",
@@ -1144,7 +1144,7 @@ dependencies = [
 
 [[package]]
 name = "sentry-options-validation"
-version = "0.0.4"
+version = "0.0.5"
 dependencies = [
  "anyhow",
  "jsonschema",

{sentry_options-0.0.4 → sentry_options-0.0.5}/Cargo.toml

@@ -11,13 +11,13 @@ default-members = [
 ]
 
 [workspace.package]
-version = "0.0.4"
+version = "0.0.5"
 edition = "2024"
 repository = "https://github.com/getsentry/sentry-options"
 license = "Apache-2.0"
 
 [workspace.dependencies]
-sentry-options-validation = { path = "sentry-options-validation", version = "0.0.4" }
+sentry-options-validation = { path = "sentry-options-validation", version = "0.0.5" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.145"
 anyhow = "1.0.100"

{sentry_options-0.0.4 → sentry_options-0.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sentry_options
-Version: 0.0.4
+Version: 0.0.5
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: Implementation :: CPython

{sentry_options-0.0.4 → sentry_options-0.0.5}/clients/python/src/lib.rs

@@ -79,7 +79,8 @@ fn options_err(err: RustOptionsError) -> PyErr {
     }
 }
 
-/// Initialize global options from default path or SENTRY_OPTIONS_DIR env var.
+/// Initialize global options using fallback chain: SENTRY_OPTIONS_DIR env var,
+/// then /etc/sentry-options if it exists, otherwise sentry-options/.
 #[pyfunction]
 fn init() -> PyResult<()> {
     let opts = RustOptions::new().map_err(options_err)?;

{sentry_options-0.0.4 → sentry_options-0.0.5}/clients/rust/src/lib.rs

@@ -1,16 +1,15 @@
 //! Options client for reading validated configuration values.
 
 use std::collections::HashMap;
-use std::path::{Path, PathBuf};
+use std::path::Path;
 use std::sync::{Arc, OnceLock, RwLock};
 
-use sentry_options_validation::{SchemaRegistry, ValidationError, ValuesWatcher};
+use sentry_options_validation::{
+    SchemaRegistry, ValidationError, ValuesWatcher, resolve_options_dir,
+};
 use serde_json::Value;
 use thiserror::Error;
 
-const DEFAULT_OPTIONS_DIR: &str = "/etc/sentry-options";
-const OPTIONS_DIR_ENV: &str = "SENTRY_OPTIONS_DIR";
-
 static GLOBAL_OPTIONS: OnceLock<Options> = OnceLock::new();
 
 #[derive(Debug, Error)]
@@ -38,14 +37,11 @@ pub struct Options {
 }
 
 impl Options {
-    /// Load options from default path (`/etc/sentry-options`) or `SENTRY_OPTIONS_DIR` env var.
+    /// Load options using fallback chain: `SENTRY_OPTIONS_DIR` env var, then `/etc/sentry-options`
+    /// if it exists, otherwise `sentry-options/`.
     /// Expects `{dir}/schemas/` and `{dir}/values/` subdirectories.
     pub fn new() -> Result<Self> {
-        let base_dir = std::env::var(OPTIONS_DIR_ENV)
-            .map(PathBuf::from)
-            .unwrap_or_else(|_| PathBuf::from(DEFAULT_OPTIONS_DIR));
-
-        Self::from_directory(&base_dir)
+        Self::from_directory(&resolve_options_dir())
     }
 
     /// Load options from a specific directory (useful for testing).
@@ -98,7 +94,8 @@ impl Options {
     }
 }
 
-/// Initialize global options from default path or `SENTRY_OPTIONS_DIR` env var.
+/// Initialize global options using fallback chain: `SENTRY_OPTIONS_DIR` env var,
+/// then `/etc/sentry-options` if it exists, otherwise `sentry-options/`.
 pub fn init() -> Result<()> {
     let opts = Options::new()?;
     GLOBAL_OPTIONS

{sentry_options-0.0.4 → sentry_options-0.0.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "sentry_options"
-version = "0.0.4"
+version = "0.0.5"
 description = "Python client for sentry-options using Rust validation"
 license = "Apache-2.0"
 requires-python = ">=3.11"

{sentry_options-0.0.4 → sentry_options-0.0.5}/sentry-options-validation/src/lib.rs

@@ -26,6 +26,32 @@ const VALUES_FILE_NAME: &str = "values.json";
 /// Time between file polls in seconds
 const POLLING_DELAY: u64 = 5;
 
+/// Production path where options are deployed via config map
+pub const PRODUCTION_OPTIONS_DIR: &str = "/etc/sentry-options";
+
+/// Local fallback path for development
+pub const LOCAL_OPTIONS_DIR: &str = "sentry-options";
+
+/// Environment variable to override options directory
+pub const OPTIONS_DIR_ENV: &str = "SENTRY_OPTIONS_DIR";
+
+/// Resolve options directory using fallback chain:
+/// 1. `SENTRY_OPTIONS_DIR` env var (if set)
+/// 2. `/etc/sentry-options` (if exists)
+/// 3. `sentry-options/` (local fallback)
+pub fn resolve_options_dir() -> PathBuf {
+    if let Ok(dir) = std::env::var(OPTIONS_DIR_ENV) {
+        return PathBuf::from(dir);
+    }
+
+    let prod_path = PathBuf::from(PRODUCTION_OPTIONS_DIR);
+    if prod_path.exists() {
+        return prod_path;
+    }
+
+    PathBuf::from(LOCAL_OPTIONS_DIR)
+}
+
 /// Result type for validation operations
 pub type ValidationResult<T> = Result<T, ValidationError>;
 
@@ -52,12 +78,22 @@ pub enum ValidationError {
 
     #[error("Failed to parse JSON: {0}")]
     JSONParse(#[from] serde_json::Error),
+
+    #[error("{} validation error(s)", .0.len())]
+    ValidationErrors(Vec<ValidationError>),
+}
+
+/// Metadata for a single option in a namespace schema
+#[derive(Debug, Clone)]
+pub struct OptionMetadata {
+    pub option_type: String,
+    pub default: Value,
 }
 
-/// Schema for a namespace, containing validator and defaults
+/// Schema for a namespace, containing validator and option metadata
 pub struct NamespaceSchema {
     pub namespace: String,
-    defaults: HashMap<String, Value>,
+    pub options: HashMap<String, OptionMetadata>,
     validator: jsonschema::Validator,
 }
 
@@ -85,7 +121,7 @@ impl NamespaceSchema {
     /// Get the default value for an option key.
     /// Returns None if the key doesn't exist in the schema.
     pub fn get_default(&self, key: &str) -> Option<&Value> {
-        self.defaults.get(key)
+        self.options.get(key).map(|meta| &meta.default)
     }
 }
 
@@ -254,8 +290,8 @@ impl SchemaRegistry {
                 message: format!("Failed to compile validator: {}", e),
             })?;
 
-        // Extract defaults and validate types
-        let mut defaults = HashMap::new();
+        // Extract option metadata and validate types
+        let mut options = HashMap::new();
         if let Some(properties) = schema.get("properties").and_then(|p| p.as_object()) {
             for (prop_name, prop_value) in properties {
                 if let (Some(prop_type), Some(default_value)) = (
@@ -263,14 +299,20 @@ impl SchemaRegistry {
                     prop_value.get("default"),
                 ) {
                     Self::validate_default_type(prop_name, prop_type, default_value, path)?;
-                    defaults.insert(prop_name.clone(), default_value.clone());
+                    options.insert(
+                        prop_name.clone(),
+                        OptionMetadata {
+                            option_type: prop_type.to_string(),
+                            default: default_value.clone(),
+                        },
+                    );
                 }
             }
         }
 
         Ok(Arc::new(NamespaceSchema {
             namespace: namespace.to_string(),
-            defaults,
+            options,
             validator,
         }))
     }
@@ -280,6 +322,11 @@ impl SchemaRegistry {
         self.schemas.get(namespace)
     }
 
+    /// Get all loaded schemas (for schema evolution validation)
+    pub fn schemas(&self) -> &HashMap<String, Arc<NamespaceSchema>> {
+        &self.schemas
+    }
+
     /// Load and validate JSON values from a directory.
     /// Expects structure: `{values_dir}/{namespace}/values.json`
     /// Skips namespaces without a values.json file.