From a605f2b0a3bb041c1995c9f28cf0957c1d774a6e Mon Sep 17 00:00:00 2001 From: Kylie Hunter Date: Thu, 24 Oct 2024 11:50:05 -0400 Subject: [PATCH 01/13] fixed data center property arguments in ssp-all-VALID --- src/validations/constraints/content/ssp-all-VALID.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/validations/constraints/content/ssp-all-VALID.xml b/src/validations/constraints/content/ssp-all-VALID.xml index 12478cc2f..65ae0a7cf 100644 --- a/src/validations/constraints/content/ssp-all-VALID.xml +++ b/src/validations/constraints/content/ssp-all-VALID.xml @@ -38,13 +38,13 @@
US
- +
US
- + Example Organization From 5e826f87e8b6208d7298c3ade7be3e3ebe801785 Mon Sep 17 00:00:00 2001 From: Kylie Hunter Date: Thu, 24 Oct 2024 11:56:05 -0400 Subject: [PATCH 02/13] changed data-center constraints to point to name = type, value = data-center --- .../constraints/fedramp-external-constraints.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/validations/constraints/fedramp-external-constraints.xml b/src/validations/constraints/fedramp-external-constraints.xml index fa2dda45e..9b1658e7e 100644 --- a/src/validations/constraints/fedramp-external-constraints.xml +++ b/src/validations/constraints/fedramp-external-constraints.xml @@ -169,13 +169,13 @@ - + There must be at least two (2) data centers listed. - + There must be a single primary data center. - + There must be one or more alternate data center(s). From e5ac66c2bc3cf998fa76778e7883679b5a8233b0 Mon Sep 17 00:00:00 2001 From: Kylie Hunter Date: Thu, 24 Oct 2024 12:19:11 -0400 Subject: [PATCH 03/13] made unit tests much more specific to their file name, AKA only one error occurs in each file --- .../constraints/content/ssp-data-center-US-INVALID.xml | 8 +++++++- .../content/ssp-data-center-alternate-INVALID.xml | 10 ++++++++-- .../content/ssp-data-center-count-INVALID.xml | 6 +++--- .../content/ssp-data-center-country-code-INVALID.xml | 9 +++++++-- .../content/ssp-data-center-primary-INVALID.xml | 10 ++++++++-- 5 files changed, 33 insertions(+), 10 deletions(-) diff --git a/src/validations/constraints/content/ssp-data-center-US-INVALID.xml b/src/validations/constraints/content/ssp-data-center-US-INVALID.xml index e3c0db34c..a3d2eb5c9 100644 --- a/src/validations/constraints/content/ssp-data-center-US-INVALID.xml +++ b/src/validations/constraints/content/ssp-data-center-US-INVALID.xml @@ -8,7 +8,13 @@
WRONG
- + + + +
+ WRONG +
+ diff --git a/src/validations/constraints/content/ssp-data-center-alternate-INVALID.xml b/src/validations/constraints/content/ssp-data-center-alternate-INVALID.xml index e3c0db34c..d4acfbd83 100644 --- a/src/validations/constraints/content/ssp-data-center-alternate-INVALID.xml +++ b/src/validations/constraints/content/ssp-data-center-alternate-INVALID.xml @@ -4,11 +4,17 @@ xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/1.0 https://github.com/usnistgov/OSCAL/releases/download/v1.1.2/oscal_ssp_schema.xsd" uuid="12345678-1234-4321-8765-123456789012"> + +
+ US +
+ +
- WRONG + US
- + diff --git a/src/validations/constraints/content/ssp-data-center-count-INVALID.xml b/src/validations/constraints/content/ssp-data-center-count-INVALID.xml index e3c0db34c..ba469b574 100644 --- a/src/validations/constraints/content/ssp-data-center-count-INVALID.xml +++ b/src/validations/constraints/content/ssp-data-center-count-INVALID.xml @@ -5,10 +5,10 @@ uuid="12345678-1234-4321-8765-123456789012"> -
- WRONG +
+ US
- + diff --git a/src/validations/constraints/content/ssp-data-center-country-code-INVALID.xml b/src/validations/constraints/content/ssp-data-center-country-code-INVALID.xml index 7b9097095..9e382f5d2 100644 --- a/src/validations/constraints/content/ssp-data-center-country-code-INVALID.xml +++ b/src/validations/constraints/content/ssp-data-center-country-code-INVALID.xml @@ -5,9 +5,14 @@ uuid="12345678-1234-4321-8765-123456789012"> -
+
- + + + +
+
+ diff --git a/src/validations/constraints/content/ssp-data-center-primary-INVALID.xml b/src/validations/constraints/content/ssp-data-center-primary-INVALID.xml index e3c0db34c..4d60d80c2 100644 --- a/src/validations/constraints/content/ssp-data-center-primary-INVALID.xml +++ b/src/validations/constraints/content/ssp-data-center-primary-INVALID.xml @@ -6,9 +6,15 @@
- WRONG + US
- + + + +
+ US +
+ From 41277476c141b2af85bfcc0cb346d61251f64386 Mon Sep 17 00:00:00 2001 From: Kylie Hunter Date: Thu, 24 Oct 2024 14:24:19 -0400 Subject: [PATCH 04/13] Update src/validations/constraints/content/ssp-data-center-US-INVALID.xml Co-authored-by: A.J. Stein --- .../constraints/content/ssp-data-center-US-INVALID.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/validations/constraints/content/ssp-data-center-US-INVALID.xml b/src/validations/constraints/content/ssp-data-center-US-INVALID.xml index a3d2eb5c9..fe85df493 100644 --- a/src/validations/constraints/content/ssp-data-center-US-INVALID.xml +++ b/src/validations/constraints/content/ssp-data-center-US-INVALID.xml @@ -8,7 +8,7 @@
WRONG
- +
From a21566f9ce7b8f811c8e3526f6dee9d9798d4cbe Mon Sep 17 00:00:00 2001 From: Kylie Hunter Date: Thu, 24 Oct 2024 14:24:34 -0400 Subject: [PATCH 05/13] Update src/validations/constraints/content/ssp-data-center-alternate-INVALID.xml Co-authored-by: A.J. Stein --- .../constraints/content/ssp-data-center-alternate-INVALID.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/validations/constraints/content/ssp-data-center-alternate-INVALID.xml b/src/validations/constraints/content/ssp-data-center-alternate-INVALID.xml index d4acfbd83..ebe61b911 100644 --- a/src/validations/constraints/content/ssp-data-center-alternate-INVALID.xml +++ b/src/validations/constraints/content/ssp-data-center-alternate-INVALID.xml @@ -14,7 +14,7 @@
US
- + From 78e54c99633199c291c57e2c1a0e0d19e29847b0 Mon Sep 17 00:00:00 2001 From: Kylie Hunter Date: Thu, 24 Oct 2024 14:24:41 -0400 Subject: [PATCH 06/13] Update src/validations/constraints/content/ssp-data-center-country-code-INVALID.xml Co-authored-by: A.J. Stein --- .../content/ssp-data-center-country-code-INVALID.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/validations/constraints/content/ssp-data-center-country-code-INVALID.xml b/src/validations/constraints/content/ssp-data-center-country-code-INVALID.xml index 9e382f5d2..217db047c 100644 --- a/src/validations/constraints/content/ssp-data-center-country-code-INVALID.xml +++ b/src/validations/constraints/content/ssp-data-center-country-code-INVALID.xml @@ -12,7 +12,7 @@
- + From 2545939288b49ec3519f9293e5742f1b63d2a6ef Mon Sep 17 00:00:00 2001 From: Kylie Hunter Date: Thu, 24 Oct 2024 14:24:48 -0400 Subject: [PATCH 07/13] Update src/validations/constraints/content/ssp-data-center-primary-INVALID.xml Co-authored-by: A.J. Stein --- .../constraints/content/ssp-data-center-primary-INVALID.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/validations/constraints/content/ssp-data-center-primary-INVALID.xml b/src/validations/constraints/content/ssp-data-center-primary-INVALID.xml index 4d60d80c2..df441fd06 100644 --- a/src/validations/constraints/content/ssp-data-center-primary-INVALID.xml +++ b/src/validations/constraints/content/ssp-data-center-primary-INVALID.xml @@ -14,7 +14,7 @@
US
- + From 8e57658f0f549ff86b59863a5d19c6664ca093c2 Mon Sep 17 00:00:00 2001 From: Kylie Hunter Date: Thu, 24 Oct 2024 14:24:55 -0400 Subject: [PATCH 08/13] Update src/validations/constraints/content/ssp-data-center-primary-INVALID.xml Co-authored-by: A.J. Stein --- .../constraints/content/ssp-data-center-primary-INVALID.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/validations/constraints/content/ssp-data-center-primary-INVALID.xml b/src/validations/constraints/content/ssp-data-center-primary-INVALID.xml index df441fd06..fe327ea35 100644 --- a/src/validations/constraints/content/ssp-data-center-primary-INVALID.xml +++ b/src/validations/constraints/content/ssp-data-center-primary-INVALID.xml @@ -8,7 +8,7 @@
US
- +
From 859580980164f075093ce0485bc29c9dd58d81ea Mon Sep 17 00:00:00 2001 From: Kylie Hunter Date: Thu, 24 Oct 2024 14:25:13 -0400 Subject: [PATCH 09/13] Update src/validations/constraints/content/ssp-data-center-US-INVALID.xml Co-authored-by: A.J. Stein --- .../constraints/content/ssp-data-center-US-INVALID.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/validations/constraints/content/ssp-data-center-US-INVALID.xml b/src/validations/constraints/content/ssp-data-center-US-INVALID.xml index fe85df493..40188d889 100644 --- a/src/validations/constraints/content/ssp-data-center-US-INVALID.xml +++ b/src/validations/constraints/content/ssp-data-center-US-INVALID.xml @@ -14,7 +14,7 @@
WRONG
- + From 90c2952ec85f4daa83db8858efceb78505fcbc41 Mon Sep 17 00:00:00 2001 From: Kylie Hunter Date: Thu, 24 Oct 2024 14:25:40 -0400 Subject: [PATCH 10/13] Update src/validations/constraints/fedramp-external-constraints.xml Co-authored-by: A.J. Stein --- src/validations/constraints/fedramp-external-constraints.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/validations/constraints/fedramp-external-constraints.xml b/src/validations/constraints/fedramp-external-constraints.xml index 9b1658e7e..260c2d6b2 100644 --- a/src/validations/constraints/fedramp-external-constraints.xml +++ b/src/validations/constraints/fedramp-external-constraints.xml @@ -170,6 +170,7 @@ + There must be at least two (2) data centers listed. From b2c4c20b19175205db4a82ddc752e184e1f703e3 Mon Sep 17 00:00:00 2001 From: Kylie Hunter Date: Thu, 24 Oct 2024 14:25:50 -0400 Subject: [PATCH 11/13] Update src/validations/constraints/fedramp-external-constraints.xml Co-authored-by: A.J. Stein --- src/validations/constraints/fedramp-external-constraints.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/validations/constraints/fedramp-external-constraints.xml b/src/validations/constraints/fedramp-external-constraints.xml index 260c2d6b2..5b421da12 100644 --- a/src/validations/constraints/fedramp-external-constraints.xml +++ b/src/validations/constraints/fedramp-external-constraints.xml @@ -174,6 +174,7 @@ There must be at least two (2) data centers listed. + There must be a single primary data center. From 61b8f6cf8986bd1e55719eb69a3e71779dbb0a8b Mon Sep 17 00:00:00 2001 From: Kylie Hunter Date: Thu, 24 Oct 2024 14:26:03 -0400 Subject: [PATCH 12/13] Update src/validations/constraints/fedramp-external-constraints.xml Co-authored-by: A.J. Stein --- src/validations/constraints/fedramp-external-constraints.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/validations/constraints/fedramp-external-constraints.xml b/src/validations/constraints/fedramp-external-constraints.xml index 5b421da12..dd1b78c23 100644 --- a/src/validations/constraints/fedramp-external-constraints.xml +++ b/src/validations/constraints/fedramp-external-constraints.xml @@ -178,6 +178,7 @@ There must be a single primary data center. + There must be one or more alternate data center(s). From 30016ded6486c1699367fee7d81778ae24d86ae4 Mon Sep 17 00:00:00 2001 From: Kylie Hunter Date: Thu, 24 Oct 2024 14:26:15 -0400 Subject: [PATCH 13/13] Update src/validations/constraints/content/ssp-data-center-count-INVALID.xml Co-authored-by: A.J. Stein --- .../constraints/content/ssp-data-center-count-INVALID.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/validations/constraints/content/ssp-data-center-count-INVALID.xml b/src/validations/constraints/content/ssp-data-center-count-INVALID.xml index ba469b574..d93296f61 100644 --- a/src/validations/constraints/content/ssp-data-center-count-INVALID.xml +++ b/src/validations/constraints/content/ssp-data-center-count-INVALID.xml @@ -8,7 +8,7 @@
US
- +