Merge branch 'develop' into 2592/separate-celery

.circleci/deployment/jobs.yml

@@ -1,9 +1,9 @@
 # jobs:
   deploy-dev:
-    executor: docker-executor
     parameters:
       target_env:
         type: string
+    executor: docker-executor
     working_directory: ~/tdp-deploy
     steps:
       - deploy-cloud-dot-gov:
@@ -30,26 +30,16 @@
           cf-username: CF_USERNAME_STAGING
 
   deploy-infrastructure-dev:
-    executor: terraform/default
-    working_directory: ~/tdp-deploy
     parameters:
       target_env:
         type: string
-    steps:
-      - deploy-infrastructure:
-          cf-app: << parameters.target_env >>
-
-  deploy-infrastructure-staging:
     executor: terraform/default
     working_directory: ~/tdp-deploy
     steps:
       - deploy-infrastructure:
-          cf-password: CF_PASSWORD_STAGING
-          cf-username: CF_USERNAME_STAGING
-          cf-space: tanf-staging
-          tf-path: ./terraform/staging
+                cf-app: << parameters.target_env >>
 
-  deploy-infrastructure-develop:
+  deploy-infrastructure-staging:
     executor: terraform/default
     working_directory: ~/tdp-deploy
     steps:

.circleci/deployment/workflows.yml

@@ -1,43 +1,51 @@
 #workflows:
-  dev-deployment:
+  deployment:
     when:
-      << pipeline.parameters.run_dev_deployment >>
+      and:
+        - or:
+            - equal: [ master, << pipeline.git.branch >> ]
+            - equal: [ main, << pipeline.git.branch >> ]
+            - equal: [ develop, << pipeline.git.branch >> ]
+            - << pipeline.parameters.run_dev_deployment >>
+        - not: << pipeline.parameters.run_nightly_owasp_scan >>
+
     jobs:
+      - deploy-project-updates-site:
+          filters:
+            branches:
+              only:
+                - develop
       - deploy-infrastructure-dev:
           target_env: << pipeline.parameters.target_env >>
-      - enable-versioning:
-          requires:
-            - deploy-infrastructure-dev
           filters:
             branches:
               ignore:
                 - develop
                 - main
                 - master
-      - deploy-dev:
-          target_env: << pipeline.parameters.target_env >>
-          requires:
-            - deploy-infrastructure-dev
-
-  staging-deployment:
-    unless:
-      or:
-        - << pipeline.parameters.run_dev_deployment >>
-        - << pipeline.parameters.run_nightly_owasp_scan >>
-    jobs:
-      - deploy-project-updates-site:
+      - deploy-infrastructure-staging:
           filters:
             branches:
               only:
                 - develop
-      - deploy-infrastructure-develop:
+                - main
+      - deploy-infrastructure-production:
           filters:
             branches:
               only:
+                - master
+      - enable-versioning:
+          requires:
+            - deploy-infrastructure-dev
+          filters:
+            branches:
+              ignore:
                 - develop
+                - main
+                - master
       - enable-versioning:
           requires:
-            - deploy-infrastructure-develop
+            - deploy-infrastructure-staging
           target_env: develop
           cf-password: CF_PASSWORD_STAGING
           cf-username: CF_USERNAME_STAGING
@@ -46,88 +54,76 @@
             branches:
               only:
                 - develop
-      - deploy-develop:
+      - enable-versioning:
           requires:
-            - deploy-infrastructure-develop
+            - deploy-infrastructure-staging
+          target_env: staging
+          cf-password: CF_PASSWORD_STAGING
+          cf-username: CF_USERNAME_STAGING
+          cf-space: tanf-staging
           filters:
             branches:
               only:
-                - develop
-      - test-deployment-e2e:
+                - main
+      - enable-versioning:
           requires:
-            - deploy-develop
+            - deploy-infrastructure-production
+          target_env: prod
+          cf-password: CF_PASSWORD_PROD
+          cf-username: CF_USERNAME_PROD
+          cf-space: tanf-prod
           filters:
             branches:
               only:
-                - develop
-      - make_erd: # from ../util folder
+                - master
+      - prod-deploy-clamav:
+          requires:
+            - deploy-infrastructure-production
           filters:
             branches:
               only:
-                - develop
-      - deploy-infrastructure-staging:
+                - master
+      - deploy-dev:
+          target_env: << pipeline.parameters.target_env >>
+          requires:
+            - deploy-infrastructure-dev
           filters:
             branches:
-              only:
+              ignore:
+                - develop
                 - main
-      - enable-versioning:
+                - master
+      - deploy-develop:
           requires:
             - deploy-infrastructure-staging
-          target_env: staging
-          cf-password: CF_PASSWORD_STAGING
-          cf-username: CF_USERNAME_STAGING
-          cf-space: tanf-staging
           filters:
             branches:
               only:
-                - main
+                - develop
       - deploy-staging:
           requires:
             - deploy-infrastructure-staging
           filters:
             branches:
               only:
                 - main
-
-  production-deployment:
-    unless:
-      or:
-        - << pipeline.parameters.run_dev_deployment >>
-        - << pipeline.parameters.run_nightly_owasp_scan >>
-    jobs:
-      - deploy-infrastructure-production:
-          filters:
-            branches:
-              only:
-                - master
-      - enable-versioning:
-          requires:
-            - deploy-infrastructure-production
-          target_env: prod
-          cf-password: CF_PASSWORD_PROD
-          cf-username: CF_USERNAME_PROD
-          cf-space: tanf-prod
-          filters:
-            branches:
-              only:
-                - master
       - deploy-production:
           requires:
             - deploy-infrastructure-production
           filters:
             branches:
               only:
                 - master
-      - prod-deploy-clamav:
+      - test-deployment-e2e:
           requires:
-            - deploy-infrastructure-production
+            - deploy-develop
           filters:
             branches:
               only:
-                - master
+                - develop
       - make_erd: # from ../util folder
           filters:
             branches:
               only:
+                - develop
                 - master
-

docs/Sprint-Review/sprint-87-summary.md

@@ -0,0 +1,76 @@
+# Sprint 87 Summary
+11/22/23 - 12/05/23
+
+Velocity (Dev): 5
+
+## Sprint Goal
+* Dev:
+    * Continue parsing engine development
+        * Review SSP Sec 04
+        * Implement all Tribal Sec (02, 03 and review 01)
+    * Finalize review on #2683 - ZAP CORS Misconfiguration
+    * #2599 - Error Report "Friendly Names"
+    * Coordinate w/ OFA and draft dev contingency plan in event of lapse in government funding
+* DevOps:
+    * 2429 - Singular Clam AV
+    * 2722 - Singular deployment workflow
+        * Scoped out of 2419
+    * #2729 - Migrations via CircleCI 
+
+---
+
+## Tickets
+### Completed/Merged
+* [#1118 SSP Closed Data (02) Parsing](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/1118)
+* [#1119 SSP Aggregate (03) Parsing](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/1119)
+* [#1120 SSP Stratum (04) Parsing](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/1120)
+* [#2683 ZAP result - CORS config issue](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/2683)
+* [#2760 Add file size to clamav-nginx](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/2760)
+
+### Ready to Merge
+
+
+
+
+
+### Submitted (QASP Review, OCIO Review)
+* [#2748 Fix parser/preparser validation of empty strings](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/2748)
+* [#2765 Added needed space into logic](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/2765)
+
+### Closed (not merged)
+* [Debug migration deployments (resolved by other deployment fix work)](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/2740)
+
+---
+
+## Moved to Next Sprint (Blocked, Raft Review, In Progress, Current Sprint Backlog)
+### In Progress
+
+* [#2536 [spike] Cat 4 validation](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/2536)
+* [#2592 Deploy celery as a separate cloud.gov app](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/2592)
+* [#2732 S3 bucket rebind](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/2732)
+* [#2759 Changes for fully local development](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/2759)
+
+
+
+### Blocked
+ * [#2729 - Migrations via CircleCI (Revisit ~Feb 2024)](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/2729)
+     * [#2755 Feature/2729 remote migrations](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/2755)
+
+### Raft Review
+
+* [#1116 Tribal TANF Aggregate (03) File Parsing](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/1116)
+* [#1117 Tribal TANF Sample (04) File Parsing](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/1117)
+* [#2599 Readability enhancements for error reports](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/2599)
+* [#2722 simplify workflows and de-bloat pipeline code](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/2722)
+* [Spike - Investigate OWASP nightly scan findings](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/2663)
+* [Tribal TANF Active Data (01) Parsing](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/1114)
+
+### Current Sprint Backlog
+
+
+### Demo
+* Jan and Eric to demo SSP functionality 
+    * [#1118 SSP Closed Data (02) Parsing](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/1118)
+    * [#1119 SSP Aggregate (03) Parsing](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/1119)
+    * [#1120 SSP Stratum (04) Parsing](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/1120)
+