merged and resolved conflicts

raft-tech · Nov 30, 2023 · a75ef9d · a75ef9d
2 parents 7ffd424 + e36d297
commit a75ef9d
Show file tree

Hide file tree

Showing 101 changed files with 16,387 additions and 1,555 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -74,6 +74,7 @@ workflows:
                 - main
                 - master
                 - /^release.*/
+                # - '2722/circleci' #DELETE BEFORE MERGE
   circle-ci-setup:
     jobs:
       - setup:
@@ -85,4 +86,5 @@ workflows:
                 - main
                 - master
                 - /^release.*/
+                # - '2722/circleci' #DELETE BEFORE MERGE
 
diff --git a/.circleci/deployment/commands.yml b/.circleci/deployment/commands.yml
@@ -37,16 +37,40 @@
           backend-appname: <<parameters.backend-appname>>
           frontend-appname: <<parameters.frontend-appname>>
           cf-space: <<parameters.cf-space>>
-      - deploy-clamav:
-          backend-appname: <<parameters.backend-appname>>
-          cf-org: <<parameters.cf-org>>
-          cf-space: <<parameters.cf-space>>
       - deploy-frontend:
           environment: <<parameters.environment>>
           backend-appname: <<parameters.backend-appname>>
           frontend-appname: <<parameters.frontend-appname>>
           cf-space: <<parameters.cf-space>>
 
+  clamav-cloud-dot-gov:
+    parameters:
+      backend-appname:
+        default: tdp-backend
+        type: string
+      cf-password:
+        default: CF_PASSWORD_DEV
+        type: env_var_name
+      cf-org:
+        default: CF_ORG
+        type: env_var_name
+      cf-space:
+        default: tanf-dev
+        type: string
+      cf-username:
+        default: CF_USERNAME_DEV
+        type: env_var_name
+    steps:
+      - checkout
+      - sudo-check
+      - cf-check
+      - login-cloud-dot-gov:
+          cf-password: <<parameters.cf-password>>
+          cf-org: <<parameters.cf-org>>
+          cf-space: <<parameters.cf-space>>
+          cf-username: <<parameters.cf-username>>
+      - deploy-clamav
+
   deploy-backend:
     parameters:
       backend-appname:
@@ -71,30 +95,12 @@
               <<parameters.cf-space>>
 
   deploy-clamav:
-    parameters:
-      backend-appname:
-        default: tdp-backend
-        type: string
-      cf-org:
-        default: CF_ORG
-        type: env_var_name
-      cf-space:
-        default: tanf-dev
-        type: string
     steps:
       - run:
           name: Deploy ClamAV REST application
           command: |
             cf push clamav-rest -f tdrs-backend/manifest.clamav.yml \
-              --var cf-space=<<parameters.cf-space>> \
-      - run:
-          name: Enable internal route between backend and clamav-rest app
-          command: |
-            cf add-network-policy <<parameters.backend-appname>> clamav-rest \
-              -s <<parameters.cf-space>> \
-              -o ${<<parameters.cf-org>>} \
-              --protocol tcp \
-              --port 9000
+              --var cf-space=tanf-prod
 
   deploy-frontend:
     parameters:

diff --git a/.circleci/deployment/jobs.yml b/.circleci/deployment/jobs.yml
@@ -7,8 +7,8 @@
     working_directory: ~/tdp-deploy
     steps:
       - deploy-cloud-dot-gov:
-          backend-appname: tdp-backend-<< parameters.target_env >>
-          frontend-appname: tdp-frontend-<< parameters.target_env >>
+                backend-appname: tdp-backend-<< parameters.target_env >>
+                frontend-appname: tdp-frontend-<< parameters.target_env >>
 
   deploy-staging:
     executor: docker-executor

diff --git a/.circleci/deployment/workflows.yml b/.circleci/deployment/workflows.yml
@@ -57,6 +57,7 @@
           filters:
             branches:
               only:
+                # - '2722/circleci' #DELETE BEFORE MERGE
                 - develop
       - enable-versioning:
           requires:

diff --git a/.github/workflows/deploy-develop-on-merge.yml b/.github/workflows/deploy-develop-on-merge.yml
diff --git a/commands.sh b/commands.sh
@@ -227,7 +227,7 @@ tdrs-run-deploy() {
     --url https://circleci.com/api/v2/project/github/raft-tech/TANF-app/pipeline \
     --header 'Circle-Token: '$CIRCLE_CI_TOKEN \
     --header 'content-type: application/json' \
-    --data '{"parameters":{"run_dev_deployment": true, "target_env":"'$TARGET_ENV'"}, "branch":"'$BRANCH'"}'
+    --data '{"parameters":{"triggered": true, "run_dev_deployment": true, "target_env":"'$TARGET_ENV'"}, "branch":"'$BRANCH'"}'
 }
 
 # List all aliases and functions associated with tdrs