update from canary

features/fedramp_extensions.feature

@@ -130,8 +130,6 @@ Examples:
   | inventory-item-has-function |
   | inventory-item-has-is-scanned |
   | inventory-item-has-scan-type |
-  | inventory-item-has-function |
-  | inventory-item-has-scan-type |
   | inventory-item-has-software-name |
   | inventory-item-has-software-version |
   | inventory-item-has-valid-mac-address |
@@ -410,10 +408,6 @@ Examples:
   | inventory-item-has-is-scanned-PASS.yaml |
   | inventory-item-has-scan-type-FAIL.yaml |
   | inventory-item-has-scan-type-PASS.yaml |
-  | inventory-item-has-function-FAIL.yaml |
-  | inventory-item-has-function-PASS.yaml |
-  | inventory-item-has-scan-type-FAIL.yaml |
-  | inventory-item-has-scan-type-PASS.yaml |
   | inventory-item-has-software-name-FAIL.yaml |
   | inventory-item-has-software-name-PASS.yaml |
   | inventory-item-has-software-version-FAIL.yaml |

src/validations/constraints/fedramp-external-constraints.xml

@@ -770,11 +770,6 @@
                 <prop namespace="https://docs.oasis-open.org/sarif/sarif/v2.1.0" name="help-url" value="https://automate.fedramp.gov/documentation/ssp/5-attachments/#system-inventory-approach"/>
                 <message>When scan-type is 'other' or 'not-applicable', remarks MUST be provided to explain the selection.</message>
             </expect>
-            <expect id="scan-type-has-remarks" target="..//prop[@name='scan-type' and @ns='http://fedramp.gov/ns/oscal' and @value=('other','not-applicable')]" test="exists(remarks)" level="ERROR">
-                <formal-name>Scan Type Has Remarks</formal-name>
-                <prop namespace="https://docs.oasis-open.org/sarif/sarif/v2.1.0" name="help-url" value="https://automate.fedramp.gov/documentation/ssp/5-attachments/#system-inventory-approach"/>
-                <message>When scan-type is 'other' or 'not-applicable', remarks MUST be provided to explain the selection.</message>
-            </expect>
         </constraints>
     </context>