From f9bd57234a368e168d1f3575255134a075bac650 Mon Sep 17 00:00:00 2001
From: David Waltermire <david.waltermire@nist.gov>
Date: Tue, 27 Jun 2023 12:34:35 -0400
Subject: [PATCH] Validating the current SP 800-53 catalog in oscal-content
 results in a missing key violation. This fixes that. (#1808)

---
 src/metaschema/oscal_catalog_metaschema.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/metaschema/oscal_catalog_metaschema.xml b/src/metaschema/oscal_catalog_metaschema.xml
index fc2a4d25a2..a02e813357 100644
--- a/src/metaschema/oscal_catalog_metaschema.xml
+++ b/src/metaschema/oscal_catalog_metaschema.xml
@@ -64,6 +64,9 @@
                   <index name="catalog-props" target="//prop" >
                         <key-field target="@uuid"/>
                   </index>
+                  <index name="catalog-groups-controls-parts" target="//(control|group|part)">
+                        <key-field target="@id"/>
+                  </index>
                   <index name="catalog-controls" target="//control" >
                         <key-field target="@id"/>
                   </index>
@@ -261,7 +264,7 @@
                               referenced control.</enum>
                   </allowed-values>
                   <!-- TODO: add expect constraint to check for controls that reference themselves -->
-                  <index-has-key name="catalog-controls"
+                  <index-has-key name="catalog-groups-controls-parts"
                         target="link[@rel=('related','required','incorporated-into','moved-to') and starts-with(@href,'#')]">
                         <key-field target="@href" pattern="#(.*)"/>
                   </index-has-key>