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

{sentry_options-0.0.5 → sentry_options-0.0.7}/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.5"
+version = "0.0.7"
 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.5"
+version = "0.0.7"
 dependencies = [
  "sentry-options-validation",
  "serde_json",
@@ -1121,8 +1187,9 @@ dependencies = [
 
 [[package]]
 name = "sentry-options-cli"
-version = "0.0.5"
+version = "0.0.7"
 dependencies = [
+ "chrono",
  "clap",
  "sentry-options-validation",
  "serde",
@@ -1135,7 +1202,7 @@ dependencies = [
 
 [[package]]
 name = "sentry-options-python"
-version = "0.0.5"
+version = "0.0.7"
 dependencies = [
  "pyo3",
  "sentry-options",
@@ -1144,7 +1211,7 @@ dependencies = [
 
 [[package]]
 name = "sentry-options-validation"
-version = "0.0.5"
+version = "0.0.7"
 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.5 → sentry_options-0.0.7}/Cargo.toml

@@ -11,13 +11,13 @@ default-members = [
 ]
 
 [workspace.package]
-version = "0.0.5"
+version = "0.0.7"
 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.5" }
+sentry-options-validation = { path = "sentry-options-validation", version = "0.0.7" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.145"
 anyhow = "1.0.100"

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

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

{sentry_options-0.0.5 → sentry_options-0.0.7}/clients/python/tests/options_test.py

@@ -19,7 +19,7 @@ def init_options(tmp_path_factory: pytest.TempPathFactory) -> None:
     tmpdir = tmp_path_factory.mktemp('sentry_options')
 
     # Create schema
-    schema_dir = tmpdir / 'schemas' / 'testing'
+    schema_dir = tmpdir / 'schemas' / 'sentry-options-testing'
     schema_dir.mkdir(parents=True)
     (schema_dir / 'schema.json').write_text(
         json.dumps(
@@ -53,9 +53,9 @@ def init_options(tmp_path_factory: pytest.TempPathFactory) -> None:
     )
 
     # Create values (override str-opt)
-    values_dir = tmpdir / 'values' / 'testing'
+    values_dir = tmpdir / 'values' / 'sentry-options-testing'
     values_dir.mkdir(parents=True)
-    values = {'str-opt': 'custom-value'}
+    values = {'options': {'str-opt': 'custom-value'}}
     (values_dir / 'values.json').write_text(json.dumps(values))
 
     # Set env var and initialize
@@ -74,25 +74,25 @@ def init_options(tmp_path_factory: pytest.TempPathFactory) -> None:
 
 
 def test_get_string_from_values() -> None:
-    value = options('testing').get('str-opt')
+    value = options('sentry-options-testing').get('str-opt')
     assert value == 'custom-value'
     assert isinstance(value, str)
 
 
 def test_get_int_default() -> None:
-    value = options('testing').get('int-opt')
+    value = options('sentry-options-testing').get('int-opt')
     assert value == 42
     assert isinstance(value, int)
 
 
 def test_get_float_default() -> None:
-    value = options('testing').get('float-opt')
+    value = options('sentry-options-testing').get('float-opt')
     assert value == 3.14
     assert isinstance(value, float)
 
 
 def test_get_bool_default() -> None:
-    value = options('testing').get('bool-opt')
+    value = options('sentry-options-testing').get('bool-opt')
     assert value is True
     assert isinstance(value, bool)
 
@@ -104,7 +104,7 @@ def test_unknown_namespace() -> None:
 
 def test_unknown_option() -> None:
     with pytest.raises(UnknownOptionError, match='bad-key'):
-        options('testing').get('bad-key')
+        options('sentry-options-testing').get('bad-key')
 
 
 def test_double_init() -> None:

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

@@ -171,7 +171,7 @@ mod tests {
                 }
             }"#,
         );
-        create_values(&values, "test", r#"{"enabled": true}"#);
+        create_values(&values, "test", r#"{"options": {"enabled": true}}"#);
 
         let options = Options::from_directory(temp.path()).unwrap();
         assert_eq!(options.get("test", "enabled").unwrap(), json!(true));

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

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

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

@@ -81,6 +81,40 @@ pub enum ValidationError {
 
     #[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(())
 }
 
 /// Metadata for a single option in a namespace schema
@@ -202,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);
@@ -329,6 +365,7 @@ impl SchemaRegistry {
 
     /// Load and validate JSON values from a directory.
     /// Expects structure: `{values_dir}/{namespace}/values.json`
+    /// Values file must have format: `{"options": {"key": value, ...}}`
     /// Skips namespaces without a values.json file.
     pub fn load_values_json(&self, values_dir: &Path) -> ValidationResult<ValuesByNamespace> {
         let mut all_values = HashMap::new();
@@ -340,10 +377,18 @@ impl SchemaRegistry {
                 continue;
             }
 
-            let values: Value = serde_json::from_reader(fs::File::open(&values_file)?)?;
-            self.validate_values(namespace, &values)?;
+            let parsed: Value = serde_json::from_reader(fs::File::open(&values_file)?)?;
+
+            let values = parsed
+                .get("options")
+                .ok_or_else(|| ValidationError::ValueError {
+                    namespace: namespace.clone(),
+                    errors: "values.json must have an 'options' key".to_string(),
+                })?;
+
+            self.validate_values(namespace, values)?;
 
-            if let Value::Object(obj) = values {
+            if let Value::Object(obj) = values.clone() {
                 let ns_values: HashMap<String, Value> = obj.into_iter().collect();
                 all_values.insert(namespace.clone(), ns_values);
             }
@@ -535,6 +580,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();
@@ -724,7 +815,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());
@@ -897,10 +988,12 @@ Error: \"version\" is a required property"
         fs::write(
             test_values_dir.join("values.json"),
             r#"{
-                "enabled": true,
-                "name": "test-name",
-                "count": 42,
-                "rate": 0.75
+                "options": {
+                    "enabled": true,
+                    "name": "test-name",
+                    "count": 42,
+                    "rate": 0.75
+                }
             }"#,
         )
         .unwrap();
@@ -940,7 +1033,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"),
@@ -954,7 +1047,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"),
@@ -969,16 +1062,20 @@ 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();
+        fs::write(
+            with_values_dir.join("values.json"),
+            r#"{"options": {"opt": "y"}}"#,
+        )
+        .unwrap();
 
         let registry = SchemaRegistry::from_directory(&schemas_dir).unwrap();
         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]
@@ -1005,7 +1102,7 @@ Error: \"version\" is a required property"
         fs::create_dir_all(&test_values_dir).unwrap();
         fs::write(
             test_values_dir.join("values.json"),
-            r#"{"count": "not-a-number"}"#,
+            r#"{"options": {"count": "not-a-number"}}"#,
         )
         .unwrap();
 
@@ -1041,7 +1138,11 @@ Error: \"version\" is a required property"
 
             let ns1_values = values_dir.join("ns1");
             fs::create_dir_all(&ns1_values).unwrap();
-            fs::write(ns1_values.join("values.json"), r#"{"enabled": true}"#).unwrap();
+            fs::write(
+                ns1_values.join("values.json"),
+                r#"{"options": {"enabled": true}}"#,
+            )
+            .unwrap();
 
             let ns2_schema = schemas_dir.join("ns2");
             fs::create_dir_all(&ns2_schema).unwrap();
@@ -1059,7 +1160,11 @@ Error: \"version\" is a required property"
 
             let ns2_values = values_dir.join("ns2");
             fs::create_dir_all(&ns2_values).unwrap();
-            fs::write(ns2_values.join("values.json"), r#"{"count": 42}"#).unwrap();
+            fs::write(
+                ns2_values.join("values.json"),
+                r#"{"options": {"count": 42}}"#,
+            )
+            .unwrap();
 
             (temp_dir, schemas_dir, values_dir)
         }
@@ -1076,7 +1181,7 @@ Error: \"version\" is a required property"
             thread::sleep(std::time::Duration::from_millis(10));
             fs::write(
                 values_dir.join("ns1").join("values.json"),
-                r#"{"enabled": false}"#,
+                r#"{"options": {"enabled": false}}"#,
             )
             .unwrap();
 
@@ -1113,12 +1218,12 @@ Error: \"version\" is a required property"
             // modify
             fs::write(
                 values_dir.join("ns1").join("values.json"),
-                r#"{"enabled": false}"#,
+                r#"{"options": {"enabled": false}}"#,
             )
             .unwrap();
             fs::write(
                 values_dir.join("ns2").join("values.json"),
-                r#"{"count": 100}"#,
+                r#"{"options": {"count": 100}}"#,
             )
             .unwrap();
 
@@ -1149,7 +1254,7 @@ Error: \"version\" is a required property"
             // won't pass validation
             fs::write(
                 values_dir.join("ns1").join("values.json"),
-                r#"{"enabled": "not-a-boolean"}"#,
+                r#"{"options": {"enabled": "not-a-boolean"}}"#,
             )
             .unwrap();