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

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

@@ -276,7 +276,7 @@ dependencies = [
 
 [[package]]
 name = "example"
-version = "0.0.6"
+version = "0.0.7"
 dependencies = [
  "anyhow",
  "sentry-options",
@@ -1177,7 +1177,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "sentry-options"
-version = "0.0.6"
+version = "0.0.7"
 dependencies = [
  "sentry-options-validation",
  "serde_json",
@@ -1187,7 +1187,7 @@ dependencies = [
 
 [[package]]
 name = "sentry-options-cli"
-version = "0.0.6"
+version = "0.0.7"
 dependencies = [
  "chrono",
  "clap",
@@ -1202,7 +1202,7 @@ dependencies = [
 
 [[package]]
 name = "sentry-options-python"
-version = "0.0.6"
+version = "0.0.7"
 dependencies = [
  "pyo3",
  "sentry-options",
@@ -1211,7 +1211,7 @@ dependencies = [
 
 [[package]]
 name = "sentry-options-validation"
-version = "0.0.6"
+version = "0.0.7"
 dependencies = [
  "anyhow",
  "jsonschema",

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

@@ -11,13 +11,13 @@ default-members = [
 ]
 
 [workspace.package]
-version = "0.0.6"
+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.6" }
+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.6 → sentry_options-0.0.7}/PKG-INFO

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

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "sentry_options"
-version = "0.0.6"
+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.6 → sentry_options-0.0.7}/sentry-options-validation/src/lib.rs

@@ -365,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();
@@ -376,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)?)?;
 
-            if let Value::Object(obj) = values {
+            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.clone() {
                 let ns_values: HashMap<String, Value> = obj.into_iter().collect();
                 all_values.insert(namespace.clone(), ns_values);
             }
@@ -979,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();
@@ -1053,7 +1064,11 @@ Error: \"version\" is a required property"
         // Only create values for one namespace
         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();
@@ -1087,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();
 
@@ -1123,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();
@@ -1141,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)
         }
@@ -1158,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();
 
@@ -1195,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();
 
@@ -1231,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();