Merge branch 'develop' into 2536-cat4-design

raft-tech · Feb 20, 2024 · 821ae10 · 821ae10
2 parents 67528c5 + 44d6913
commit 821ae10
Show file tree

Hide file tree

Showing 24 changed files with 812 additions and 51 deletions.
diff --git a/.circleci/README.md b/.circleci/README.md
@@ -79,7 +79,7 @@ updated along with the secondary apps running in CF.
 
 ### Frontend/Backend
  - Before updating, make sure the current buildpacks that these apps use are supported by the latest OS. If they aren't you can update the manifest to point them to the correct buildpacks.
- - To update the apps you can either deploy each of the environments (sandbox, raft, qasp, etc) from CircleCi or you can use the `tdrs-deploy <ENVIRONMENT>` command from `commands.sh`. Assuming the buildpacks are up to date, that is all you need to do.
+ - To update the apps you can either deploy each of the environments (raft, qasp, etc) from CircleCi or you can use the `tdrs-deploy <ENVIRONMENT>` command from `commands.sh`. Assuming the buildpacks are up to date, that is all you need to do.
 
 ### Secondary apps
  - Before you can make the update, you need to ensure you have the CF plugin that allows you to do so. Download the binary for your respective OS [HERE](https://github.com/cloudfoundry/stack-auditor/releases) and follow the installation instructions [HERE](https://docs.cloudfoundry.org/adminguide/stack-auditor.html#install).

diff --git a/docs/Technical-Documentation/Architecture-Decision-Record/008-deployment-flow.md b/docs/Technical-Documentation/Architecture-Decision-Record/008-deployment-flow.md
@@ -33,7 +33,6 @@ Within the dev space, there is no correlation for branch to environment as these
 
 | Dev Site | Frontend URL | Backend URL | Purpose                                          |
 | -------- | -------- | -------- |--------------------------------------------------|
-| Sandbox     | https://tdp-frontend-sandbox.app.cloud.gov | https://tdp-backend-sandbox.app.cloud.gov/admin/     | Space for development in a deployed environment |
 | A11y | https://tdp-frontend-a11y.app.cloud.gov | https://tdp-backend-a11y.app.cloud.gov/admin/ | Space for accessibility testing                  |
 | QASP | https://tdp-frontend-qasp.app.cloud.gov | https://tdp-backend-qasp.app.cloud.gov/admin/ | Space for QASP review                            |
 | raft | https://tdp-frontend-raft.app.cloud.gov | https://tdp-backend-raft.app.cloud.gov/admin/ | Space for Raft review                          |
@@ -53,4 +52,4 @@ Within the dev space, there is no correlation for branch to environment as these
 
 ## Notes
 
-- As of June 2022, CircleCI supplies environment variable key-value pairs to multiple environments (e.g. vendor's CircleCI deploys applications to dev and staging environments). The values from CircleCI are expected to be unique per environment, so until [#1826](https://github.com/raft-tech/TANF-app/issues/1826) is researched and addressed, these values will need to be manually corrected in cloud.gov immediately following the execution of the execution of the [`<env>-deployment` CircleCI workflow](../../.circleci/config.yml) CircleCI workflow. This workaround applies to backend applications in the TDP staging environment.
+- As of June 2022, CircleCI supplies environment variable key-value pairs to multiple environments (e.g. vendor's CircleCI deploys applications to dev and staging environments). The values from CircleCI are expected to be unique per environment, so until [#1826](https://github.com/raft-tech/TANF-app/issues/1826) is researched and addressed, these values will need to be manually corrected in cloud.gov immediately following the execution of the execution of the [`<env>-deployment` CircleCI workflow](../../.circleci/config.yml) CircleCI workflow. This workaround applies to backend applications in the TDP staging environment.
diff --git a/docs/Technical-Documentation/TDP-environments-README.md b/docs/Technical-Documentation/TDP-environments-README.md
@@ -4,7 +4,6 @@
 
 | Dev Site | Frontend URL | Backend URL | Purpose |
 | -------- | -------- | -------- | -------- |
-| Sandbox     | https://tdp-frontend-sandbox.app.cloud.gov | https://tdp-frontend-sandbox.app.cloud.gov/admin/     | Space for devs to test in a deployed environment |
 | A11y | https://tdp-frontend-a11y.app.cloud.gov | https://tdp-frontend-a11y.app.cloud.gov/admin/ | Space for accessibility testing |
 | QASP | https://tdp-frontend-qasp.app.cloud.gov | https://tdp-frontend-qasp.app.cloud.gov/admin/ | Space for QASP review |
 | raft | https://tdp-frontend-raft.app.cloud.gov | https://tdp-frontend-raft.app.cloud.gov/admin/ | Space for raft review |

diff --git a/docs/Technical-Documentation/diagrams/tdp-environments.drawio b/docs/Technical-Documentation/diagrams/tdp-environments.drawio
diff --git a/docs/Technical-Documentation/diagrams/tdp-environments.drawio.png b/docs/Technical-Documentation/diagrams/tdp-environments.drawio.png
diff --git a/scripts/update-ssh-config.sh b/scripts/update-ssh-config.sh
@@ -3,7 +3,7 @@
 sshcfg=~/.ssh/config
 echo "" > $sshcfg
 
-for host in a11y raft qasp sandbox; do
+for host in a11y raft qasp; do
 	guid=$(cf curl /v3/apps/$(cf app "tdp-backend-$host" --guid)/processes | jq --raw-output '.resources | .[] | select(.type == "web").guid')
 	echo "Host $host
 	  HostName ssh.fr.cloud.gov

diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m1.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m1.py
@@ -12,6 +12,7 @@
             document=SSP_M1DataSubmissionDocument(),
             preparsing_validators=[
                 validators.hasLength(150),
+                validators.notEmpty(8, 19)
             ],
             postparsing_validators=[
                 validators.if_then_validator(
@@ -125,7 +126,7 @@
                     startIndex=8,
                     endIndex=19,
                     required=True,
-                    validators=[validators.isAlphaNumeric()]
+                    validators=[validators.notEmpty()]
                 ),
                 Field(
                     item="2",

diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m2.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m2.py
@@ -14,6 +14,7 @@
             document=SSP_M2DataSubmissionDocument(),
             preparsing_validators=[
                 validators.hasLength(150),
+                validators.notEmpty(8, 19)
             ],
             postparsing_validators=[
                 validators.validate__FAM_AFF__SSN(),
@@ -152,7 +153,7 @@
                     startIndex=8,
                     endIndex=19,
                     required=True,
-                    validators=[validators.isAlphaNumeric()]
+                    validators=[validators.notEmpty()]
                 ),
                 Field(
                     item="26",
@@ -193,7 +194,7 @@
                     startIndex=29,
                     endIndex=38,
                     required=True,
-                    validators=[validators.validateSSN()],
+                    validators=[validators.isNumber()],
                     is_encrypted=False
                 ),
                 Field(

diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m3.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m3.py
@@ -11,6 +11,7 @@
     document=SSP_M3DataSubmissionDocument(),
     preparsing_validators=[
         validators.notEmpty(start=19, end=60),
+        validators.notEmpty(8, 19)
     ],
     postparsing_validators=[
         validators.if_then_validator(
@@ -118,7 +119,7 @@
             startIndex=8,
             endIndex=19,
             required=True,
-            validators=[validators.isAlphaNumeric()]
+            validators=[validators.notEmpty()]
         ),
         Field(
             item="60",
@@ -153,7 +154,7 @@
             endIndex=37,
             required=True,
             is_encrypted=False,
-            validators=[validators.validateSSN()]
+            validators=[validators.isNumber()]
         ),
         Field(
             item="63A",
@@ -318,6 +319,7 @@
     quiet_preparser_errors=True,
     preparsing_validators=[
         validators.notEmpty(start=60, end=101),
+        validators.notEmpty(8, 19)
     ],
     postparsing_validators=[
         validators.if_then_validator(
@@ -425,7 +427,7 @@
             startIndex=8,
             endIndex=19,
             required=True,
-            validators=[validators.isAlphaNumeric()]
+            validators=[validators.notEmpty()]
         ),
         Field(
             item="60",
@@ -460,7 +462,7 @@
             endIndex=78,
             required=True,
             is_encrypted=False,
-            validators=[validators.validateSSN()]
+            validators=[validators.isNumber()]
         ),
         Field(
             item="63A",

diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m4.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m4.py
@@ -12,6 +12,7 @@
             document=SSP_M4DataSubmissionDocument(),
             preparsing_validators=[
                 validators.hasLength(66),
+                validators.notEmpty(8, 19)
             ],
             postparsing_validators=[],
             fields=[
@@ -46,7 +47,7 @@
                     startIndex=8,
                     endIndex=19,
                     required=True,
-                    validators=[validators.isAlphaNumeric()],
+                    validators=[validators.notEmpty()],
                 ),
                 Field(
                     item="2",

diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m5.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m5.py
@@ -14,6 +14,7 @@
             document=SSP_M5DataSubmissionDocument(),
             preparsing_validators=[
                 validators.hasLength(66),
+                validators.notEmpty(8, 19)
             ],
             postparsing_validators=[
                 validators.if_then_validator(
@@ -131,7 +132,7 @@
                     startIndex=8,
                     endIndex=19,
                     required=True,
-                    validators=[validators.isAlphaNumeric()],
+                    validators=[validators.notEmpty()],
                 ),
                 Field(
                     item="13",
@@ -165,7 +166,7 @@
                     startIndex=28,
                     endIndex=37,
                     required=True,
-                    validators=[validators.validateSSN()],
+                    validators=[validators.isNumber()],
                     is_encrypted=False,
                 ),
                 Field(

diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py
@@ -12,6 +12,7 @@
             document=TANF_T1DataSubmissionDocument(),
             preparsing_validators=[
                 validators.hasLength(156),
+                validators.notEmpty(8, 19)
             ],
             postparsing_validators=[
                 validators.if_then_validator(
@@ -149,7 +150,7 @@
                     startIndex=8,
                     endIndex=19,
                     required=True,
-                    validators=[validators.isAlphaNumeric()],
+                    validators=[validators.notEmpty()],
                 ),
                 Field(
                     item="2",

diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py
@@ -14,6 +14,7 @@
             document=TANF_T2DataSubmissionDocument(),
             preparsing_validators=[
                 validators.hasLength(156),
+                validators.notEmpty(8, 19)
             ],
             postparsing_validators=[
                 validators.validate__FAM_AFF__SSN(),
@@ -154,7 +155,7 @@
                     startIndex=8,
                     endIndex=19,
                     required=True,
-                    validators=[validators.isAlphaNumeric()],
+                    validators=[validators.notEmpty()],
                 ),
                 Field(
                     item="30",
@@ -198,7 +199,7 @@
                     startIndex=29,
                     endIndex=38,
                     required=True,
-                    validators=[validators.validateSSN()],
+                    validators=[validators.isNumber()],
                     is_encrypted=False,
                 ),
                 Field(

diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py
@@ -12,6 +12,7 @@
     document=TANF_T3DataSubmissionDocument(),
     preparsing_validators=[
         validators.notEmpty(start=19, end=60),
+        validators.notEmpty(8, 19)
     ],
     postparsing_validators=[
         validators.if_then_validator(
@@ -116,7 +117,7 @@
             startIndex=8,
             endIndex=19,
             required=True,
-            validators=[validators.isAlphaNumeric()],
+            validators=[validators.notEmpty()],
         ),
         Field(
             item="67",
@@ -150,7 +151,7 @@
             startIndex=28,
             endIndex=37,
             required=True,
-            validators=[validators.validateSSN()],
+            validators=[validators.isNumber()],
             is_encrypted=False,
         ),
         Field(
@@ -316,6 +317,7 @@
     quiet_preparser_errors=True,
     preparsing_validators=[
         validators.notEmpty(start=60, end=101),
+        validators.notEmpty(8, 19)
     ],
     postparsing_validators=[
         validators.if_then_validator(
@@ -420,7 +422,7 @@
             startIndex=8,
             endIndex=19,
             required=True,
-            validators=[validators.isAlphaNumeric()],
+            validators=[validators.notEmpty()],
         ),
         Field(
             item="67",
@@ -454,7 +456,7 @@
             startIndex=69,
             endIndex=78,
             required=True,
-            validators=[validators.validateSSN()],
+            validators=[validators.isNumber()],
             is_encrypted=False,
         ),
         Field(

diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t4.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t4.py
@@ -13,6 +13,7 @@
             document=TANF_T4DataSubmissionDocument(),
             preparsing_validators=[
                 validators.hasLength(71),
+                validators.notEmpty(8, 19)
             ],
             postparsing_validators=[],
             fields=[
@@ -47,7 +48,7 @@
                     startIndex=8,
                     endIndex=19,
                     required=True,
-                    validators=[validators.isAlphaNumeric()],
+                    validators=[validators.notEmpty()],
                 ),
                 Field(
                     item="2",

diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t5.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t5.py
@@ -14,6 +14,7 @@
             document=TANF_T5DataSubmissionDocument(),
             preparsing_validators=[
                 validators.hasLength(71),
+                validators.notEmpty(8, 19)
             ],
             postparsing_validators=[
                 validators.if_then_validator(
@@ -132,7 +133,7 @@
                     startIndex=8,
                     endIndex=19,
                     required=True,
-                    validators=[validators.isAlphaNumeric()],
+                    validators=[validators.notEmpty()],
                 ),
                 Field(
                     item="14",

diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t1.py b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t1.py
@@ -12,6 +12,7 @@
             document=Tribal_TANF_T1DataSubmissionDocument(),
             preparsing_validators=[
                 validators.hasLength(122),
+                validators.notEmpty(8, 19)
             ],
             postparsing_validators=[
                 validators.if_then_validator(
@@ -149,7 +150,7 @@
                     startIndex=8,
                     endIndex=19,
                     required=True,
-                    validators=[validators.isAlphaNumeric()],
+                    validators=[validators.notEmpty()],
                 ),
                 Field(
                     item="2",

diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t2.py b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t2.py
@@ -14,6 +14,7 @@
             document=Tribal_TANF_T2DataSubmissionDocument(),
             preparsing_validators=[
                 validators.hasLength(122),
+                validators.notEmpty(8, 19)
             ],
             postparsing_validators=[
                 validators.validate__FAM_AFF__SSN(),
@@ -143,7 +144,7 @@
                     startIndex=8,
                     endIndex=19,
                     required=True,
-                    validators=[validators.isAlphaNumeric()],
+                    validators=[validators.notEmpty()],
                 ),
                 Field(
                     item="30",
@@ -187,7 +188,7 @@
                     startIndex=29,
                     endIndex=38,
                     required=True,
-                    validators=[validators.validateSSN()],
+                    validators=[validators.isNumber()],
                     is_encrypted=False,
                 ),
                 Field(