cleanup

Author: lmolkova

crates/weaver_resolver/data/registry-test-v2-6-identity-demote/expected-errors.json

@@ -1 +1 @@
-{"CompoundError":[{"EntityRefinementChangedIdentity":{"refinement_id":"entity.chained.entity","ref":"entity.refined.entity","attribute_id":"test.attr","role":"descriptive","provenance":{"schema_url":"https://default/0.1.0","path":"data/registry-test-v2-6-identity-demote/registry/v2-identity-demote.yaml"}}},{"EntityRefinementChangedIdentity":{"refinement_id":"entity.demoting.entity","ref":"entity.base.entity","attribute_id":"test.attr","role":"descriptive","provenance":{"schema_url":"https://default/0.1.0","path":"data/registry-test-v2-6-identity-demote/registry/v2-identity-demote.yaml"}}}]}
+{"CompoundError":[{"EntityRefinementChangedIdentity":{"refinement_id":"entity.demoting.entity","ref":"entity.base.entity","attribute_id":"test.attr","role":"descriptive","provenance":{"schema_url":"https://default/0.1.0","path":"data/registry-test-v2-6-identity-demote/registry/v2-identity-demote.yaml"}}}]}

crates/weaver_resolver/data/registry-test-v2-6-identity-demote/registry/v2-identity-demote.yaml

@@ -21,14 +21,6 @@ entity_refinements:
     identity:
       - ref: test.attr
         brief: Refined identity attribute
-  # Invalid: demotion through a chained refinement — test.attr is inherited
-  # with the identifying role from refined.entity.
-  - id: entity.chained.entity
-    ref: refined.entity
-    brief: Chained refinement
-    description:
-      - ref: test.attr
-        brief: Demoted identity attribute of a refinement
   # Invalid: test.attr is an identity attribute of base.entity and must be
   # refined under `identity`, not `description`.
   - id: entity.demoting.entity
@@ -37,10 +29,3 @@ entity_refinements:
     description:
       - ref: test.attr
         brief: Demoted identity attribute
-  # Resolves cleanly against the offending refinement above: the demotion
-  # must not leave `demoting.entity` unresolved, so this group must NOT add
-  # `UnresolvedExtendsRef` noise. The only expected errors are the two
-  # demotions.
-  - id: entity.noise.entity
-    ref: demoting.entity
-    brief: Extends the offending refinement

crates/weaver_resolver/data/registry-test-v2-7-identity-promote/expected-errors.json

@@ -1 +1 @@
-{"CompoundError":[{"EntityRefinementChangedIdentity":{"refinement_id":"entity.chained.entity","ref":"entity.refined.entity","attribute_id":"test.attr2","role":"identifying","provenance":{"schema_url":"https://default/0.1.0","path":"data/registry-test-v2-7-identity-promote/registry/v2-identity-promote.yaml"}}},{"EntityRefinementChangedIdentity":{"refinement_id":"entity.promoting.entity","ref":"entity.base.entity","attribute_id":"test.attr2","role":"identifying","provenance":{"schema_url":"https://default/0.1.0","path":"data/registry-test-v2-7-identity-promote/registry/v2-identity-promote.yaml"}}}]}
+{"CompoundError":[{"EntityRefinementChangedIdentity":{"refinement_id":"entity.promoting.entity","ref":"entity.base.entity","attribute_id":"test.attr2","role":"identifying","provenance":{"schema_url":"https://default/0.1.0","path":"data/registry-test-v2-7-identity-promote/registry/v2-identity-promote.yaml"}}}]}

crates/weaver_resolver/data/registry-test-v2-7-identity-promote/registry/v2-identity-promote.yaml

@@ -27,14 +27,6 @@ entity_refinements:
     description:
       - ref: test.attr2
         brief: Refined descriptive attribute
-  # Invalid: promotion through a chained refinement — test.attr2 is inherited
-  # with the descriptive role from refined.entity.
-  - id: entity.chained.entity
-    ref: refined.entity
-    brief: Chained refinement
-    identity:
-      - ref: test.attr2
-        brief: Promoted descriptive attribute of a refinement
   # Invalid: test.attr2 is a descriptive attribute of base.entity and must be
   # refined under `description`, not `identity`.
   - id: entity.promoting.entity
@@ -43,10 +35,3 @@ entity_refinements:
     identity:
       - ref: test.attr2
         brief: Promoted descriptive attribute
-  # Resolves cleanly against the offending refinement above: the promotion
-  # must not leave `promoting.entity` unresolved, so this group must NOT add
-  # `UnresolvedExtendsRef` noise. The only expected errors are the two
-  # promotions.
-  - id: entity.noise.entity
-    ref: promoting.entity
-    brief: Extends the offending refinement

crates/weaver_resolver/src/error.rs

@@ -187,7 +187,7 @@ pub enum Error {
     },
 
     /// Entity refinement changes identity.
-    #[error("Entity refinement `{refinement_id}` changes the identity of `{ref}` by referencing `{attribute_id}` under `{role}`.\nProvenance: {provenance:?}")]
+    #[error("Entity refinement `{refinement_id}` changes the identity of `{ref}` by referencing `{attribute_id}` under `{role:?}`.\nProvenance: {provenance:?}")]
     #[diagnostic(help(
         "A refinement must preserve the base entity's identity: keep base attributes under the same section (`identity` or `description`) as the base, and do not add new `identity` attributes."
     ))]

crates/weaver_resolver/src/lib.rs

@@ -842,7 +842,7 @@ mod tests {
                 let msg = e.to_string();
                 assert!(
                     msg.contains("Entity refinement `demoted.host` changes the identity of")
-                        && msg.contains("referencing `host.id` under `description`"),
+                        && msg.contains("referencing `host.id` under `Descriptive`"),
                     "Expected identity demotion error, got: {msg}"
                 );
             }

crates/weaver_semconv/src/attribute.rs

@@ -263,17 +263,6 @@ impl AttributeRole {
     }
 }
 
-impl Display for AttributeRole {
-    /// Renders the role as the yaml section attributes with that role are
-    /// declared under (`identity` / `description`).
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Self::Identifying => write!(f, "identity"),
-            Self::Descriptive => write!(f, "description"),
-        }
-    }
-}
-
 /// Primitive or array types.
 #[derive(
     Serialize, Deserialize, Debug, Clone, Eq, PartialEq, Hash, JsonSchema, PartialOrd, Ord,