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

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

@@ -31,6 +31,15 @@ version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "anstream"
 version = "0.6.21"
@@ -150,12 +159,33 @@ version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3"
 
+[[package]]
+name = "cc"
+version = "1.2.52"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd4932aefd12402b36c60956a4fe0035421f544799057659ff86f923657aada3"
+dependencies = [
+ "find-msvc-tools",
+ "shlex",
+]
+
 [[package]]
 name = "cfg-if"
 version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
+[[package]]
+name = "chrono"
+version = "0.4.43"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fac4744fb15ae8337dc853fee7fb3f4e48c0fbaa23d0afe49c447b4fab126118"
+dependencies = [
+ "iana-time-zone",
+ "num-traits",
+ "windows-link",
+]
+
 [[package]]
 name = "clap"
 version = "4.5.53"
@@ -202,6 +232,12 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
 
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
 [[package]]
 name = "displaydoc"
 version = "0.2.5"
@@ -240,7 +276,7 @@ dependencies = [
 
 [[package]]
 name = "example"
-version = "0.0.4"
+version = "0.0.6"
 dependencies = [
  "anyhow",
  "sentry-options",
@@ -264,6 +300,12 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f449e6c6c08c865631d4890cfacf252b3d396c9bcc83adb6623cdb02a8336c41"
+
 [[package]]
 name = "fluent-uri"
 version = "0.4.1"
@@ -472,6 +514,30 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "iana-time-zone"
+version = "0.1.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "log",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "icu_collections"
 version = "2.1.1"
@@ -1111,7 +1177,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "sentry-options"
-version = "0.0.4"
+version = "0.0.6"
 dependencies = [
  "sentry-options-validation",
  "serde_json",
@@ -1121,8 +1187,9 @@ dependencies = [
 
 [[package]]
 name = "sentry-options-cli"
-version = "0.0.4"
+version = "0.0.6"
 dependencies = [
+ "chrono",
  "clap",
  "sentry-options-validation",
  "serde",
@@ -1135,7 +1202,7 @@ dependencies = [
 
 [[package]]
 name = "sentry-options-python"
-version = "0.0.4"
+version = "0.0.6"
 dependencies = [
  "pyo3",
  "sentry-options",
@@ -1144,7 +1211,7 @@ dependencies = [
 
 [[package]]
 name = "sentry-options-validation"
-version = "0.0.4"
+version = "0.0.6"
 dependencies = [
  "anyhow",
  "jsonschema",
@@ -1222,6 +1289,12 @@ dependencies = [
  "unsafe-libyaml",
 ]
 
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
 [[package]]
 name = "slab"
 version = "0.4.11"
@@ -1600,12 +1673,65 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "windows-core"
+version = "0.62.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-link",
+ "windows-result",
+ "windows-strings",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.59.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "windows-link"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
 
+[[package]]
+name = "windows-result"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
+dependencies = [
+ "windows-link",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.60.2"

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

@@ -11,13 +11,13 @@ default-members = [
 ]
 
 [workspace.package]
-version = "0.0.4"
+version = "0.0.6"
 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.6" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.145"
 anyhow = "1.0.100"

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sentry_options
-Version: 0.0.4
+Version: 0.0.6
 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.6}/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.6}/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.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "sentry_options"
-version = "0.0.4"
+version = "0.0.6"
 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.6}/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,56 @@ pub enum ValidationError {
 
     #[error("Failed to parse JSON: {0}")]
     JSONParse(#[from] serde_json::Error),
+
+    #[error("{} validation error(s)", .0.len())]
+    ValidationErrors(Vec<ValidationError>),
+
+    #[error("Invalid {label} '{name}': {reason}")]
+    InvalidName {
+        label: String,
+        name: String,
+        reason: String,
+    },
+}
+
+/// Validate a name component is valid for K8s (lowercase alphanumeric, '-', '.')
+pub fn validate_k8s_name_component(name: &str, label: &str) -> ValidationResult<()> {
+    if let Some(c) = name
+        .chars()
+        .find(|&c| !matches!(c, 'a'..='z' | '0'..='9' | '-' | '.'))
+    {
+        return Err(ValidationError::InvalidName {
+            label: label.to_string(),
+            name: name.to_string(),
+            reason: format!(
+                "character '{}' not allowed. Use lowercase alphanumeric, '-', or '.'",
+                c
+            ),
+        });
+    }
+    if !name.starts_with(|c: char| c.is_ascii_alphanumeric())
+        || !name.ends_with(|c: char| c.is_ascii_alphanumeric())
+    {
+        return Err(ValidationError::InvalidName {
+            label: label.to_string(),
+            name: name.to_string(),
+            reason: "must start and end with alphanumeric".to_string(),
+        });
+    }
+    Ok(())
 }
 
-/// Schema for a namespace, containing validator and defaults
+/// 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 option metadata
 pub struct NamespaceSchema {
     pub namespace: String,
-    defaults: HashMap<String, Value>,
+    pub options: HashMap<String, OptionMetadata>,
     validator: jsonschema::Validator,
 }
 
@@ -85,7 +155,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)
     }
 }
 
@@ -166,6 +236,8 @@ impl SchemaRegistry {
                         message: "Directory name contains invalid UTF-8".to_string(),
                     })?;
 
+            validate_k8s_name_component(&namespace, "namespace name")?;
+
             let schema_file = entry.path().join(SCHEMA_FILE_NAME);
             let schema = Self::load_schema(&schema_file, &namespace, &namespace_validator)?;
             schemas.insert(namespace, schema);
@@ -254,8 +326,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 +335,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 +358,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.
@@ -488,6 +571,52 @@ mod tests {
         schema_file
     }
 
+    #[test]
+    fn test_validate_k8s_name_component_valid() {
+        assert!(validate_k8s_name_component("relay", "namespace").is_ok());
+        assert!(validate_k8s_name_component("my-service", "namespace").is_ok());
+        assert!(validate_k8s_name_component("my.service", "namespace").is_ok());
+        assert!(validate_k8s_name_component("a1-b2.c3", "namespace").is_ok());
+    }
+
+    #[test]
+    fn test_validate_k8s_name_component_rejects_uppercase() {
+        let result = validate_k8s_name_component("MyService", "namespace");
+        assert!(matches!(result, Err(ValidationError::InvalidName { .. })));
+        assert!(result.unwrap_err().to_string().contains("'M' not allowed"));
+    }
+
+    #[test]
+    fn test_validate_k8s_name_component_rejects_underscore() {
+        let result = validate_k8s_name_component("my_service", "target");
+        assert!(matches!(result, Err(ValidationError::InvalidName { .. })));
+        assert!(result.unwrap_err().to_string().contains("'_' not allowed"));
+    }
+
+    #[test]
+    fn test_validate_k8s_name_component_rejects_leading_hyphen() {
+        let result = validate_k8s_name_component("-service", "namespace");
+        assert!(matches!(result, Err(ValidationError::InvalidName { .. })));
+        assert!(
+            result
+                .unwrap_err()
+                .to_string()
+                .contains("start and end with alphanumeric")
+        );
+    }
+
+    #[test]
+    fn test_validate_k8s_name_component_rejects_trailing_dot() {
+        let result = validate_k8s_name_component("service.", "namespace");
+        assert!(matches!(result, Err(ValidationError::InvalidName { .. })));
+        assert!(
+            result
+                .unwrap_err()
+                .to_string()
+                .contains("start and end with alphanumeric")
+        );
+    }
+
     #[test]
     fn test_load_schema_valid() {
         let temp_dir = TempDir::new().unwrap();
@@ -677,7 +806,7 @@ Error: \"version\" is a required property"
     fn test_invalid_directory_structure() {
         let temp_dir = TempDir::new().unwrap();
         // Create a namespace directory without schema.json file
-        let schema_dir = temp_dir.path().join("missing_schema");
+        let schema_dir = temp_dir.path().join("missing-schema");
         fs::create_dir_all(&schema_dir).unwrap();
 
         let result = SchemaRegistry::from_directory(temp_dir.path());
@@ -893,7 +1022,7 @@ Error: \"version\" is a required property"
         let values_dir = temp_dir.path().join("values");
 
         // Create two schemas
-        let schema_dir1 = schemas_dir.join("with_values");
+        let schema_dir1 = schemas_dir.join("with-values");
         fs::create_dir_all(&schema_dir1).unwrap();
         fs::write(
             schema_dir1.join("schema.json"),
@@ -907,7 +1036,7 @@ Error: \"version\" is a required property"
         )
         .unwrap();
 
-        let schema_dir2 = schemas_dir.join("without_values");
+        let schema_dir2 = schemas_dir.join("without-values");
         fs::create_dir_all(&schema_dir2).unwrap();
         fs::write(
             schema_dir2.join("schema.json"),
@@ -922,7 +1051,7 @@ Error: \"version\" is a required property"
         .unwrap();
 
         // Only create values for one namespace
-        let with_values_dir = values_dir.join("with_values");
+        let with_values_dir = values_dir.join("with-values");
         fs::create_dir_all(&with_values_dir).unwrap();
         fs::write(with_values_dir.join("values.json"), r#"{"opt": "y"}"#).unwrap();
 
@@ -930,8 +1059,8 @@ Error: \"version\" is a required property"
         let values = registry.load_values_json(&values_dir).unwrap();
 
         assert_eq!(values.len(), 1);
-        assert!(values.contains_key("with_values"));
-        assert!(!values.contains_key("without_values"));
+        assert!(values.contains_key("with-values"));
+        assert!(!values.contains_key("without-values"));
     }
 
     #[test]