Work-around for Policy API Missing OrgUnit in Settings (0.4.1) release (

#605)

* policy_api: default to top-level org unit if not provided with policy setting

* update version number from 0.4.0 to 0.4.1

* policy_api: include log message for no orgunit in policy setting

---------

Co-authored-by: Alden Hilton <adhilto@sandia.gov>

README.md

@@ -6,7 +6,7 @@
   </ul>
   <ul>
         <a href="https://github.com/cisagov/ScubaGoggles/releases">
-        <img src="https://img.shields.io/badge/ScubaGoggles-v0.4.0-%2385B065?labelColor=%23005288"  alt="ScubaGoggles version #"></a>
+        <img src="https://img.shields.io/badge/ScubaGoggles-v0.4.1-%2385B065?labelColor=%23005288"  alt="ScubaGoggles version #"></a>
         <a href="https://github.com/cisagov/ScubaGoggles/tree/main/baselines">
         <img src="https://img.shields.io/badge/GWS_SCB-v0.4-%2385B065?labelColor=%23005288" alt="GWS SCB version #"></a>
         <a href="">

scubagoggles/__init__.py

@@ -4,4 +4,4 @@
 All other references to the version number are derived from this value.
 """
 
-__version__ = '0.4.0'
+__version__ = '0.4.1'

scubagoggles/policy_api.py

@@ -608,9 +608,20 @@ def _reduce(self, policies: Iterable):
             # For the current policy setting, use the returned org unit id
             # to get the org unit name, which is used as the key for the
             # result dictionary.
-            orgunit_id = policy['policyQuery']['orgUnit']
-            orgunit_id = orgunit_id.removeprefix('orgUnits/')
-            orgunit_name = self._orgunit_id_map[orgunit_id]['name']
+
+            if 'orgUnit' in policy['policyQuery']:
+                orgunit_id = policy['policyQuery']['orgUnit']
+                orgunit_id = orgunit_id.removeprefix('orgUnits/')
+                orgunit_name = self._orgunit_id_map[orgunit_id]['name']
+            else:
+                # NOTE: a policy setting should always be associated with
+                # an org unit.  In rare cases, an org unit is not provided,
+                # and in this case the policy is associated with the top-level
+                # org unit.
+                log.debug('Org unit data missing for "%s", '
+                          'assuming top-level OU.',
+                          policy['setting']['type'])
+                orgunit_name = self._top_orgunit
 
             if 'group' in policy['policyQuery']:
                 group_id = policy['policyQuery']['group']