Rebase the branch and add "inventory-item" to constraints

DimitriZhurkin · Sep 25, 2024 · 997d820 · 997d820
1 parent efa0784
commit 997d820
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 21 deletions.
diff --git a/features/fedramp_extensions.feature b/features/fedramp_extensions.feature
@@ -17,8 +17,6 @@ Examples:
 #BEGIN_DYNAMIC_TEST_CASES
   | address-type-FAIL.yaml |
   | address-type-PASS.yaml |
-  | allows-authenticated-scan-FAIL.yaml |
-  | allows-authenticated-scan-PASS.yaml |
   | attachment-type-FAIL.yaml |
   | attachment-type-PASS.yaml |
   | authorization-type-FAIL.yaml |
@@ -113,12 +111,16 @@ Examples:
   | interconnection-direction-PASS.yaml |
   | interconnection-security-FAIL.yaml |
   | interconnection-security-PASS.yaml |
+  | inventory-item-allows-authenticated-scan-FAIL.yaml |
+  | inventory-item-allows-authenticated-scan-PASS.yaml |
+  | inventory-item-public-FAIL.yaml |
+  | inventory-item-public-PASS.yaml |
+  | inventory-item-virtual-FAIL.yaml |
+  | inventory-item-virtual-PASS.yaml |
   | missing-response-components-FAIL.yaml |
   | missing-response-components-PASS.yaml |
   | privilege-level-FAIL.yaml |
   | privilege-level-PASS.yaml |
-  | public-FAIL.yaml |
-  | public-PASS.yaml |
   | resource-has-base64-or-rlink-FAIL.yaml |
   | resource-has-base64-or-rlink-PASS.yaml |
   | resource-has-title-FAIL.yaml |
@@ -135,8 +137,6 @@ Examples:
   | scan-type-PASS.yaml |
   | user-type-FAIL.yaml |
   | user-type-PASS.yaml |
-  | virtual-FAIL.yaml |
-  | virtual-PASS.yaml |
 #END_DYNAMIC_TEST_CASES
 
 @full-coverage
@@ -153,7 +153,6 @@ Examples:
 | constraint_id |
 #BEGIN_DYNAMIC_CONSTRAINT_IDS
   | address-type |
-  | allows-authenticated-scan |
   | attachment-type |
   | authorization-type |
   | categorization-has-correct-system-attribute |
@@ -201,16 +200,17 @@ Examples:
   | information-type-system |
   | interconnection-direction |
   | interconnection-security |
+  | inventory-item-allows-authenticated-scan |
+  | inventory-item-public |
+  | inventory-item-virtual |
   | missing-response-components |
   | privilege-level |
   | prop-response-point-has-cardinality-one |
-  | public |
   | resource-has-base64-or-rlink |
   | resource-has-title |
   | role-defined-authorizing-official-poc |
   | role-defined-information-system-security-officer |
   | role-defined-system-owner |
   | scan-type |
   | user-type |
-  | virtual |
 #END_DYNAMIC_CONSTRAINT_IDS
diff --git a/...ssp-allows-authenticated-scan-INVALID.xml → ...tem-allows-authenticated-scan-INVALID.xml b/...ssp-allows-authenticated-scan-INVALID.xml → ...tem-allows-authenticated-scan-INVALID.xml
diff --git a/...onstraints/content/ssp-public-INVALID.xml → ...ent/ssp-inventory-item-public-INVALID.xml b/...onstraints/content/ssp-public-INVALID.xml → ...ent/ssp-inventory-item-public-INVALID.xml
diff --git a/...nstraints/content/ssp-virtual-INVALID.xml → ...nt/ssp-inventory-item-virtual-INVALID.xml b/...nstraints/content/ssp-virtual-INVALID.xml → ...nt/ssp-inventory-item-virtual-INVALID.xml
diff --git a/src/validations/constraints/fedramp-external-allowed-values.xml b/src/validations/constraints/fedramp-external-allowed-values.xml
@@ -175,21 +175,21 @@
                 <enum value="other">Other</enum>
             </allowed-values>
 
-            <allowed-values id="virtual" target="(//inventory-item/prop[@name='virtual'] | //component/prop[@name='virtual'])/@value" allow-other="no" level="ERROR">
+            <allowed-values id="inventory-item-virtual" target="(//inventory-item/prop[@name='virtual'] | //component/prop[@name='virtual'])/@value" allow-other="no" level="ERROR">
                 <formal-name>Virtual</formal-name>
                 <description>Indicates if the asset is virtual.</description>
                 <enum value="yes">Yes</enum>
                 <enum value="no">No</enum>
             </allowed-values>
 
-            <allowed-values id="public" target="(//inventory-item | //component)/prop[@name='public']/@value" allow-other="no" level="ERROR">
+            <allowed-values id="inventory-item-public" target="(//inventory-item | //component)/prop[@name='public']/@value" allow-other="no" level="ERROR">
                 <formal-name>Public</formal-name>
                 <description>Indicates if the asset is exposed to the public Internet.</description>
                 <enum value="yes">Yes</enum>
                 <enum value="no">No</enum>
             </allowed-values>
 
-            <allowed-values id="allows-authenticated-scan" target="(//inventory-item | //component)/prop[@name='allows-authenticated-scan']/@value" allow-other="no" level="ERROR">
+            <allowed-values id="inventory-item-allows-authenticated-scan" target="(//inventory-item | //component)/prop[@name='allows-authenticated-scan']/@value" allow-other="no" level="ERROR">
                 <formal-name>Allows Authenticated Scan</formal-name>
                 <description>Indicates if the asset is capable of having an authenticated scan.</description>
                 <enum value="yes">Yes</enum>

diff --git a/...tests/allows-authenticated-scan-FAIL.yaml → ...-item-allows-authenticated-scan-FAIL.yaml b/...tests/allows-authenticated-scan-FAIL.yaml → ...-item-allows-authenticated-scan-FAIL.yaml
@@ -2,7 +2,7 @@
 test-case:
   name: The invalid authenticated scan test.
   description: Test that the specified authenticated scan is invalid.
-  content: ../content/ssp-allows-authenticated-scan-INVALID.xml
+  content: ../content/ssp-inventory-item-allows-authenticated-scan-INVALID.xml
   expectations:
-  - constraint-id: allows-authenticated-scan
+  - constraint-id: inventory-item-allows-authenticated-scan
     result: fail
diff --git a/...tests/allows-authenticated-scan-PASS.yaml → ...-item-allows-authenticated-scan-PASS.yaml b/...tests/allows-authenticated-scan-PASS.yaml → ...-item-allows-authenticated-scan-PASS.yaml
@@ -4,5 +4,5 @@ test-case:
   description: Test that the specified authenticated scan is valid.
   content: ../content/ssp-all-VALID.xml
   expectations:
-  - constraint-id: allows-authenticated-scan
+  - constraint-id: inventory-item-allows-authenticated-scan
     result: pass
diff --git a/...s/constraints/unit-tests/public-FAIL.yaml → ...nit-tests/inventory-item-public-FAIL.yaml b/...s/constraints/unit-tests/public-FAIL.yaml → ...nit-tests/inventory-item-public-FAIL.yaml
@@ -2,7 +2,7 @@
 test-case:
   name: The invalid public asset test.
   description: Test that the specified public asset is invalid.
-  content: ../content/ssp-public-INVALID.xml
+  content: ../content/ssp-inventory-item-public-INVALID.xml
   expectations:
-  - constraint-id: public
+  - constraint-id: inventory-item-public
     result: fail
diff --git a/...s/constraints/unit-tests/public-PASS.yaml → ...nit-tests/inventory-item-public-PASS.yaml b/...s/constraints/unit-tests/public-PASS.yaml → ...nit-tests/inventory-item-public-PASS.yaml
@@ -4,5 +4,5 @@ test-case:
   description: Test that the specified public asset is valid.
   content: ../content/ssp-all-VALID.xml
   expectations:
-  - constraint-id: public
+  - constraint-id: inventory-item-public
     result: pass
diff --git a/.../constraints/unit-tests/virtual-FAIL.yaml → ...it-tests/inventory-item-virtual-FAIL.yaml b/.../constraints/unit-tests/virtual-FAIL.yaml → ...it-tests/inventory-item-virtual-FAIL.yaml
@@ -2,7 +2,7 @@
 test-case:
   name: The invalid virtual asset test.
   description: Test that the specified virtual asset is invalid.
-  content: ../content/ssp-virtual-INVALID.xml
+  content: ../content/ssp-inventory-item-virtual-INVALID.xml
   expectations:
-  - constraint-id: virtual
+  - constraint-id: inventory-item-virtual
     result: fail
diff --git a/.../constraints/unit-tests/virtual-PASS.yaml → ...it-tests/inventory-item-virtual-PASS.yaml b/.../constraints/unit-tests/virtual-PASS.yaml → ...it-tests/inventory-item-virtual-PASS.yaml
@@ -4,5 +4,5 @@ test-case:
   description: Test that the specified virtual asset is valid.
   content: ../content/ssp-all-VALID.xml
   expectations:
-  - constraint-id: virtual
+  - constraint-id: inventory-item-virtual
     result: pass