fensu-cli 0.28.0__tar.gz → 0.28.2__tar.gz

{fensu_cli-0.28.0 → fensu_cli-0.28.2}/Cargo.lock

@@ -388,7 +388,7 @@ checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
 
 [[package]]
 name = "fensu-cli"
-version = "0.28.0"
+version = "0.28.2"
 dependencies = [
  "cap-fs-ext",
  "cap-std",
@@ -458,7 +458,7 @@ dependencies = [
 
 [[package]]
 name = "fensu-policy"
-version = "0.28.0"
+version = "0.28.2"
 dependencies = [
  "command-group",
  "globset",

{fensu_cli-0.28.0 → fensu_cli-0.28.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fensu-cli
-Version: 0.28.0
+Version: 0.28.2
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
@@ -10,9 +10,9 @@ Summary: Native command-line executable for fensu
 License-Expression: Apache-2.0
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
-Project-URL: Homepage, https://github.com/chio-labs/fensu
-Project-URL: Issues, https://github.com/chio-labs/fensu/issues
-Project-URL: Repository, https://github.com/chio-labs/fensu
+Project-URL: Homepage, https://github.com/sqlstack-io/fensu
+Project-URL: Issues, https://github.com/sqlstack-io/fensu/issues
+Project-URL: Repository, https://github.com/sqlstack-io/fensu
 
 # fensu-cli
 

{fensu_cli-0.28.0 → fensu_cli-0.28.2}/crates/fensu-cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fensu-cli"
-version = "0.28.0" # x-release-please-version
+version = "0.28.2" # x-release-please-version
 edition.workspace = true
 license.workspace = true
 publish = false

{fensu_cli-0.28.0 → fensu_cli-0.28.2}/crates/fensu-cli/tests/command/test_check_rust.rs

@@ -314,7 +314,7 @@ fn given_unavailable_cargo_metadata_when_checking_then_failure_is_read_only_and_
 fn given_selected_custom_rust_file_rule_when_checking_then_owned_item_and_tree_facts_emit_fault() {
     let python = require_workspace_python!();
     let test_cases = [RustCustomFileRuleTestCase {
-        description: "typed Rust file rule reads item and tree facts",
+        description: "large Rust fact identities preserve findings at both ends of the file",
         expected_exit_code: 1,
         expected_location: "src/lib.rs:2:11",
         expected_code: "XRS001",
@@ -327,11 +327,16 @@ fn given_selected_custom_rust_file_rule_when_checking_then_owned_item_and_tree_f
         );
         write(
             repository.path().join("src/lib.rs"),
-            "#[derive(Clone)]\npub struct LegacyService;\n",
+            &format!(
+                "#[derive(Clone)]\npub struct LegacyServiceFirst;\n{}pub struct LegacyServiceLast;\n",
+                (0..70_000)
+                    .map(|index| format!("pub struct Record{index};\n"))
+                    .collect::<String>()
+            ),
         );
         write(
             repository.path().join("rules/custom.py"),
-            "from fensu import AnalyzerId, Family, Fault, File, RuleContext, RuleOption, RustItemKind, rule\nNAME = RuleOption.string(name='name', default='LegacyService')\n@rule(code='XRS001', family=Family.CUSTOM, slug='rust-item', message='legacy item', analyzers=(AnalyzerId.RUST,), options=(NAME,), cacheable=True)\ndef rust_item(*, file: File, ctx: RuleContext) -> list[Fault]:\n    position = ctx.project.tree.position(file.path)\n    facts = ctx.rust.file(file)\n    if position is None or facts is None or position.analyzer is not AnalyzerId.RUST:\n        return []\n    return [ctx.fault_at(location=item.location) for item in facts.items if item.kind is RustItemKind.STRUCT and item.name == ctx.option(NAME)]\n",
+            "from fensu import AnalyzerId, Family, Fault, File, RuleContext, RuleOption, RustItemKind, rule\nNAME = RuleOption.string(name='name', default='LegacyService')\n@rule(code='XRS001', family=Family.CUSTOM, slug='rust-item', message='legacy item', analyzers=(AnalyzerId.RUST,), options=(NAME,), cacheable=True)\ndef rust_item(*, file: File, ctx: RuleContext) -> list[Fault]:\n    position = ctx.project.tree.position(file.path)\n    facts = ctx.rust.file(file)\n    if position is None or facts is None or position.analyzer is not AnalyzerId.RUST:\n        return []\n    return [ctx.fault_at(location=item.location) for item in facts.items if item.kind is RustItemKind.STRUCT and item.name.startswith(ctx.option(NAME))]\n",
         );
         write(
             repository.path().join("fensu.toml"),
@@ -358,6 +363,12 @@ fn given_selected_custom_rust_file_rule_when_checking_then_owned_item_and_tree_f
             "{}: {stdout}",
             test_case.description
         );
+        assert!(stdout.contains("src/lib.rs:70003:11"), "{stdout}");
+        assert_eq!(
+            stdout.matches(test_case.expected_code).count(),
+            2,
+            "{stdout}"
+        );
         assert!(
             stdout.contains(test_case.expected_code),
             "{}: {stdout}",
@@ -835,6 +846,23 @@ fn given_file_fact_dependency_when_unrelated_file_changes_then_subject_cache_reu
             "{}: {after_stdout}",
             test_case.description
         );
+
+        // The source is unchanged, but Cargo-derived file facts have changed.
+        write(
+            repository.path().join("Cargo.toml"),
+            "[package]\nname = \"renamed\"\nversion = \"0.1.0\"\nedition = \"2021\"\n",
+        );
+        let metadata_changed = run();
+        let metadata_stdout = String::from_utf8_lossy(&metadata_changed.stdout);
+        assert_eq!(metadata_changed.status.code(), Some(1), "{metadata_stdout}");
+        assert!(
+            metadata_stdout.contains(test_case.unchanged_path),
+            "{metadata_stdout}"
+        );
+        assert!(
+            !metadata_stdout.contains(test_case.expected_reused_message),
+            "{metadata_stdout}"
+        );
     }
 }
 

{fensu_cli-0.28.0 → fensu_cli-0.28.2}/crates/fensu-policy/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "fensu-policy"
-version = "0.28.0" # x-release-please-version
+version = "0.28.2" # x-release-please-version
 edition.workspace = true
 license.workspace = true
 publish = true
 rust-version = "1.85"
 description = "Product-neutral policy selection contracts from Fensu"
-repository = "https://github.com/chio-labs/fensu"
+repository = "https://github.com/sqlstack-io/fensu"
 readme = "README.md"
 keywords = ["policy", "lint", "architecture"]
 categories = ["development-tools"]

{fensu_cli-0.28.0 → fensu_cli-0.28.2}/crates/fensu-policy/src/lifecycle/_helpers/canonical.rs

@@ -1,15 +1,16 @@
 //! Canonical JSON encoding and hashing.
 
 use serde::Serialize;
-use serde_json::{Map, Value};
+use serde_json::Value;
 use sha2::{Digest, Sha256};
 
 use crate::lifecycle::constants::CACHE_IDENTITY_SCHEMA_VERSION;
 use crate::lifecycle::errors::LifecycleError;
 
 pub(crate) fn canonical_json<T: Serialize>(value: &T) -> Result<Vec<u8>, LifecycleError> {
-    let value = serde_json::to_value(value).map_err(serialization_error)?;
-    serde_json::to_vec(&sorted_value(value)).map_err(serialization_error)
+    let mut value = serde_json::to_value(value).map_err(serialization_error)?;
+    value.sort_all_objects();
+    serde_json::to_vec(&value).map_err(serialization_error)
 }
 
 pub(crate) fn fingerprint<T: Serialize>(value: &T) -> Result<String, LifecycleError> {
@@ -45,24 +46,6 @@ pub(crate) fn batch_fingerprint<T: Serialize>(
     fingerprint(&value)
 }
 
-fn sorted_value(value: Value) -> Value {
-    match value {
-        Value::Array(values) => Value::Array(values.into_iter().map(sorted_value).collect()),
-        Value::Object(values) => {
-            let mut keys = values.keys().cloned().collect::<Vec<_>>();
-            keys.sort();
-            let mut sorted = Map::new();
-            for key in keys {
-                if let Some(value) = values.get(&key) {
-                    sorted.insert(key, sorted_value(value.clone()));
-                }
-            }
-            Value::Object(sorted)
-        }
-        scalar => scalar,
-    }
-}
-
 fn serialization_error(error: serde_json::Error) -> LifecycleError {
     LifecycleError::Serialization {
         message: error.to_string(),

{fensu_cli-0.28.0 → fensu_cli-0.28.2}/crates/fensu-rust/src/models.rs

@@ -3,6 +3,7 @@
 use std::collections::BTreeMap;
 use std::collections::HashSet;
 use std::path;
+use std::rc::Rc;
 
 use crate::configuration::main::validate_repository_policy::validate_repository_policy;
 use crate::constants;
@@ -232,7 +233,7 @@ pub struct SourceFile {
     pub source_root_relative: String,
     pub source_relative: String,
     pub source: String,
-    pub(crate) syntax: RustSyntax,
+    pub(crate) syntax: Rc<RustSyntax>,
 }
 
 impl SourceFile {
@@ -268,7 +269,7 @@ impl SourceFile {
 }
 
 /// One shared parser result reused by built-in checks and serialized fact collection.
-#[derive(Debug, Clone)]
+#[derive(Debug)]
 pub(crate) struct RustSyntax {
     pub(crate) file: Option<syn::File>,
     pub(crate) error: Option<RustParseFailure>,

{fensu_cli-0.28.0 → fensu_cli-0.28.2}/crates/fensu-rust/src/rules/_helpers/sources/scanning.rs

@@ -2,6 +2,7 @@
 
 use std::fs;
 use std::path;
+use std::rc::Rc;
 
 use crate::constants;
 use crate::models;
@@ -660,7 +661,7 @@ pub(crate) fn rust_files(repo_root: &path::Path, root: &path::Path) -> models::S
                     source_relative: relative_display(&canonical_root, &path),
                     path,
                     source,
-                    syntax,
+                    syntax: Rc::new(syntax),
                 });
             }
             Err(error) => violations.push(models::Violation::new(models::ViolationRequest {

{fensu_cli-0.28.0 → fensu_cli-0.28.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "fensu-cli"
-version = "0.28.0" # x-release-please-version
+version = "0.28.2" # x-release-please-version
 description = "Native command-line executable for fensu"
 readme = "README.md"
 requires-python = ">=3.12"
@@ -18,9 +18,9 @@ classifiers = [
 ]
 
 [project.urls]
-Homepage = "https://github.com/chio-labs/fensu"
-Issues = "https://github.com/chio-labs/fensu/issues"
-Repository = "https://github.com/chio-labs/fensu"
+Homepage = "https://github.com/sqlstack-io/fensu"
+Issues = "https://github.com/sqlstack-io/fensu/issues"
+Repository = "https://github.com/sqlstack-io/fensu"
 
 [tool.maturin]
 bindings = "bin"