From 033fc6cbc3ef1b0006491874212239876ce5b80c Mon Sep 17 00:00:00 2001
From: Bo Maryniuk <bo@maryniuk.net>
Date: Wed, 30 Oct 2024 18:59:03 +0100
Subject: [PATCH] Add support for more structures in claims

---
 libsysinspect/src/intp/inspector.rs | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/libsysinspect/src/intp/inspector.rs b/libsysinspect/src/intp/inspector.rs
index cc1ebaab..f94a6f25 100644
--- a/libsysinspect/src/intp/inspector.rs
+++ b/libsysinspect/src/intp/inspector.rs
@@ -209,18 +209,7 @@ impl SysInspector {
                 if let Some(claims) = claims.get(state) {
                     for claim in claims {
                         if let Some(v) = claim.get(func.ns().get(ClaimNamespace::LABEL as usize).unwrap()) {
-                            if let serde_yaml::Value::Mapping(v) = v {
-                                if let Some(v) = v.get(func.ns().get(1).unwrap()) {
-                                    return Ok(Some(v).cloned());
-                                }
-                            } else {
-                                return Err(SysinspectError::ModelDSLError(format!(
-                                    "Claim {}.claims.{}.{} must be a key/value mapping",
-                                    eid,
-                                    state,
-                                    func.namespace()
-                                )));
-                            }
+                            return Ok(functions::get_by_namespace(Some(v).cloned(), func.ns()[1..].join(".").as_str()));
                         }
                     }
                 } else {