From c822ed4994dc07636b7b4ea60d7600beb1ab871e Mon Sep 17 00:00:00 2001
From: Tim Donaworth <tdonaworth@flexion.us>
Date: Tue, 6 Sep 2022 17:11:27 -0400
Subject: [PATCH 01/15] refactored setup-javascript action

---
 .github/actions/setup-javascript/action.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 .github/actions/setup-javascript/action.yml

diff --git a/.github/actions/setup-javascript/action.yml b/.github/actions/setup-javascript/action.yml
new file mode 100644
index 0000000000..f3e2582ddb
--- /dev/null
+++ b/.github/actions/setup-javascript/action.yml
@@ -0,0 +1,15 @@
+name: Set up Javascript
+description: Installs Node.js and dependencies defined in package.json
+runs:
+  using: composite
+  steps:
+    - name: Set up node
+      uses: actions/setup-node@v2
+      with:
+        node-version: 18
+        cache: 'yarn'
+        cache-dependency-path: '**/yarn.lock'
+    - name: Install yarn dependencies
+      shell: bash
+      working-directory: ./frontend
+      run: yarn install --frozen-lockfile

From 2e0be56ec1f43276e467ab00325bbc589e55c143 Mon Sep 17 00:00:00 2001
From: Tim Donaworth <tdonaworth@flexion.us>
Date: Tue, 6 Sep 2022 17:11:48 -0400
Subject: [PATCH 02/15] refactored setup-python action

---
 .github/actions/setup-python/action.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 .github/actions/setup-python/action.yml

diff --git a/.github/actions/setup-python/action.yml b/.github/actions/setup-python/action.yml
new file mode 100644
index 0000000000..ccd24177d9
--- /dev/null
+++ b/.github/actions/setup-python/action.yml
@@ -0,0 +1,14 @@
+name: Set up Python
+description: Installs Python3 and dependencies defined in the Pipfile
+runs:
+  using: composite
+  steps:
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.9'
+        cache: pipenv
+    - name: Install Pipenv dependencies
+      shell: bash
+      working-directory: ./backend
+      run: pipenv install --dev

From b5e24303e0a193c81c57ea24818232a0f1cc4068 Mon Sep 17 00:00:00 2001
From: Tim Donaworth <tdonaworth@flexion.us>
Date: Tue, 6 Sep 2022 17:12:21 -0400
Subject: [PATCH 03/15] refactor setting up full-stack

---
 .github/actions/run-full-stack/action.yml | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 .github/actions/run-full-stack/action.yml

diff --git a/.github/actions/run-full-stack/action.yml b/.github/actions/run-full-stack/action.yml
new file mode 100644
index 0000000000..b10d8f4da4
--- /dev/null
+++ b/.github/actions/run-full-stack/action.yml
@@ -0,0 +1,8 @@
+name: Run Full Stack
+description: Runs the full stack from the docker-compose.yml
+runs:
+  using: composite
+  steps:
+    - name: Start Stack
+      shell: bash
+      run: docker-compose up --build -d

From ebc01d4106b33dfd14aafc3e362423f99a841088 Mon Sep 17 00:00:00 2001
From: Tim Donaworth <tdonaworth@flexion.us>
Date: Tue, 6 Sep 2022 17:13:10 -0400
Subject: [PATCH 04/15] refactor deploy-backend

---
 .github/actions/deploy-backend/action.yml | 29 +++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 .github/actions/deploy-backend/action.yml

diff --git a/.github/actions/deploy-backend/action.yml b/.github/actions/deploy-backend/action.yml
new file mode 100644
index 0000000000..de0045e672
--- /dev/null
+++ b/.github/actions/deploy-backend/action.yml
@@ -0,0 +1,29 @@
+name: Deploy Backend
+description: Deploy backend code to Cloud.gov environment.
+inputs:
+  USERNAME:
+    description: Cloud.gov user to authenticate with.
+    required: true
+  PASSWORD:
+    description: Cloud.gov authentication password.
+    required: true
+  ORG_NAME:
+    description: Cloud.gov Organization Name.
+    required: true # Default to our Org once setup.
+  SPACE_NAME:
+    description: Cloud.gov Space (environment) Name.
+    required: true
+  APP_NAME:
+    description: Applicaiton name (from manifest.yml).
+    required: true
+runs:
+  using: composite
+  steps:
+    - name: Deploy to Cloud.gov
+      run: |
+          export PATH=$HOME/bin:$PATH
+          cf login -a https://api.fr.cloud.gov -u ${{ inputs.USERNAME }} -p ${{ inputs.PASSWORD }} -o ${{ inputs.ORG_NAME }} -s ${{ inputs.SPACE_NAME }}
+          cf push ${{ inputs.APP_NAME }} -f manifest.yml
+          BACKEND_GUID=$(cf app opre-ops-test --guid)
+          BACKEND_DOMAIN=$(cf curl /v3/apps/$BACKEND_GUID/env | jq -r .application_env_json.VCAP_APPLICATION.application_uris[0])
+          echo "::set-output name=BACKEND_DOMAIN::${BACKEND_DOMAIN}"

From 5d05d47dfd686a4725bd816a91bce5ae33d7fca3 Mon Sep 17 00:00:00 2001
From: Tim Donaworth <tdonaworth@flexion.us>
Date: Tue, 6 Sep 2022 17:13:22 -0400
Subject: [PATCH 05/15] refactor deploy-frontend

---
 .github/actions/deploy-frontend/action.yml | 34 ++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 .github/actions/deploy-frontend/action.yml

diff --git a/.github/actions/deploy-frontend/action.yml b/.github/actions/deploy-frontend/action.yml
new file mode 100644
index 0000000000..9b38356954
--- /dev/null
+++ b/.github/actions/deploy-frontend/action.yml
@@ -0,0 +1,34 @@
+name: Deploy Frontend
+description: Deploy frontend code to Cloud.gov environment.
+inputs:
+  USERNAME:
+    description: Cloud.gov user to authenticate with.
+    required: true
+  PASSWORD:
+    description: Cloud.gov authentication password.
+    required: true
+  ORG_NAME:
+    description: Cloud.gov Organization Name.
+    required: true # Default to our Org once setup.
+  SPACE_NAME:
+    description: Cloud.gov Space (environment) Name.
+    required: true
+  APP_NAME:
+    description: Applicaiton name (from manifest.yml).
+    required: true
+outputs:
+  BACKEND_DOMAIN:
+    description: Uri of the deployed backend.
+    value: ${{ steps.deploy-backend.outputs.BACKEND_DOMAIN }}
+runs:
+  using: composite
+  steps:
+    - name: Deploy to Cloud.gov
+      id: deploy-backend
+      run: |
+          export PATH=$HOME/bin:$PATH
+          cf login -a https://api.fr.cloud.gov -u ${{ inputs.USERNAME }} -p ${{ inputs.PASSWORD }} -o ${{ inputs.ORG_NAME }} -s ${{ inputs.SPACE_NAME }}
+          cf push ${{ inputs.APP_NAME }} -f manifest.yml
+          BACKEND_GUID=$(cf app ${{ inputs.APP_NAME }} --guid)
+          BACKEND_DOMAIN=$(cf curl /v3/apps/$BACKEND_GUID/env | jq -r .application_env_json.VCAP_APPLICATION.application_uris[0])
+          echo "::set-output name=BACKEND_DOMAIN::${BACKEND_DOMAIN}"

From 46aca2911738b034d151c6f6139d66083b2f5071 Mon Sep 17 00:00:00 2001
From: Tim Donaworth <tdonaworth@flexion.us>
Date: Tue, 6 Sep 2022 17:13:33 -0400
Subject: [PATCH 06/15] refactor cf setup

---
 .github/actions/setup-cloudfoundry/action.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 .github/actions/setup-cloudfoundry/action.yml

diff --git a/.github/actions/setup-cloudfoundry/action.yml b/.github/actions/setup-cloudfoundry/action.yml
new file mode 100644
index 0000000000..f2e9d01df5
--- /dev/null
+++ b/.github/actions/setup-cloudfoundry/action.yml
@@ -0,0 +1,10 @@
+name: Setup Cloud Foundry
+description: Download the cloud foundary binary
+runs:
+  using: composite
+  steps:
+    - name: Install CF
+      run: |
+        mkdir -p $HOME/bin
+        export PATH=$HOME/bin:$PATH
+        curl -L "https://cli.run.pivotal.io/stable?release=linux64-binary" | tar xzv -C $HOME/bin

From b4b714be74c8872ff6393edd009a809d43cec270 Mon Sep 17 00:00:00 2001
From: Tim Donaworth <tdonaworth@flexion.us>
Date: Tue, 6 Sep 2022 17:13:56 -0400
Subject: [PATCH 07/15] test refactored changes - 001

---
 .github/workflows/ci.yml                 | 18 +-----
 .github/workflows/dev_deploy.yml         | 72 ++++++++++++++----------
 .github/workflows/unit_test_reusable.yml | 31 ++--------
 3 files changed, 49 insertions(+), 72 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 22923891a1..97a05ab50f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,13 +35,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
-        with:
-          python-version: '3.9'
-          cache: 'pipenv'
-
-      - name: Pipenv install
-        run: pip install pipenv
+      - uses: ./.github/actions/setup-python
 
       - name: Install backend dependencies
         working-directory: ./backend
@@ -51,15 +45,7 @@ jobs:
         working-directory: ./backend
         run: pipenv run nox -s lint
 
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 18
-          cache: 'yarn'
-          cache-dependency-path: '**/yarn.lock'
-
-      - name: Install frontend dependencies
-        working-directory: ./frontend
-        run: yarn install --frozen-lockfile
+      - uses: ./.github/actions/setup-javascript
 
       - name: Lint frontend
         working-directory: ./frontend
diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml
index 0129248f31..46510f9db6 100644
--- a/.github/workflows/dev_deploy.yml
+++ b/.github/workflows/dev_deploy.yml
@@ -20,37 +20,51 @@ jobs:
       NODE_ENV: production
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
-        with:
-          python-version: '3.x'
-      - uses: actions/setup-node@v3
+      - uses: ./.github/actions/setup-python
+      - uses: ./.github/actions/setup-javascript
+      - uses: ./.github/actions/setup-cloudfoundry
+      # - name: Install CF CLI
+      #   run: |
+      #     mkdir -p $HOME/bin
+      #     export PATH=$HOME/bin:$PATH
+      #     curl -L "https://cli.run.pivotal.io/stable?release=linux64-binary" | tar xzv -C $HOME/bin
+
+
+      - name: Deploy Backend
+        uses: ./.github/actions/deploy-backend
         with:
-          node-version: 18
-          cache: 'yarn'
-          cache-dependency-path: '**/yarn.lock'
-      - name: Install CF CLI
-        run: |
-          mkdir -p $HOME/bin
-          export PATH=$HOME/bin:$PATH
-          curl -L "https://cli.run.pivotal.io/stable?release=linux64-binary" | tar xzv -C $HOME/bin
-      - name: Install frontend dependencies
-        working-directory: ./frontend
-        run: yarn install --production --frozen-lockfile
-      - name: Deploy backend to Cloud.gov
-        id: backend-deploy
-        run: |
-          export PATH=$HOME/bin:$PATH
-          cf login -a https://api.fr.cloud.gov -u ${{ secrets.DEV_USER }} -p ${{ secrets.DEV_PASSWORD }} -o ${{ secrets.ORG_NAME }} -s ${{ secrets.SPACE_NAME }}
-          cf push opre-ops-test -f manifest.yml
-          BACKEND_GUID=$(cf app opre-ops-test --guid)
-          BACKEND_DOMAIN=$(cf curl /v3/apps/$BACKEND_GUID/env | jq -r .application_env_json.VCAP_APPLICATION.application_uris[0])
-          echo "::set-output name=BACKEND_DOMAIN::${BACKEND_DOMAIN}"
+          USERNAME: ${{ secrets.DEV_USER }}
+          PASSWORD: ${{ secrets.DEV_PASSWORD }}
+          ORG_NAME: ${{ secrets.ORG_NAME }}
+          SPACE_NAME: ${{ secrets.SPACE_NAME }}
+          APP_NAME: opre-ops-test
+      # - name: Deploy backend to Cloud.gov
+      #   id: backend-deploy
+      #   run: |
+      #     export PATH=$HOME/bin:$PATH
+      #     cf login -a https://api.fr.cloud.gov -u ${{ secrets.DEV_USER }} -p ${{ secrets.DEV_PASSWORD }} -o ${{ secrets.ORG_NAME }} -s ${{ secrets.SPACE_NAME }}
+      #     cf push opre-ops-test -f manifest.yml
+      #     BACKEND_GUID=$(cf app opre-ops-test --guid)
+      #     BACKEND_DOMAIN=$(cf curl /v3/apps/$BACKEND_GUID/env | jq -r .application_env_json.VCAP_APPLICATION.application_uris[0])
+      #     echo "::set-output name=BACKEND_DOMAIN::${BACKEND_DOMAIN}"
+
       - name: Build frontend
         working-directory: ./frontend
-        run: REACT_APP_BACKEND_DOMAIN=https://${{steps.backend-deploy.outputs.BACKEND_DOMAIN}} yarn build
-      - name: Deploy frontend to Cloud.gov
         run: |
-          export PATH=$HOME/bin:$PATH
+          REACT_APP_BACKEND_DOMAIN=https://${{steps.backend-deploy.outputs.BACKEND_DOMAIN}} yarn build
           cp ./frontend/Staticfile ./frontend/build/
-          cf login -a https://api.fr.cloud.gov -u ${{ secrets.DEV_USER }} -p ${{ secrets.DEV_PASSWORD }} -o ${{ secrets.ORG_NAME }} -s ${{ secrets.SPACE_NAME }}
-          cf push opre-ops-frontend-test -f manifest.yml
+
+      - name: Deploy frontend
+        uses: ./.github/actions/deploy-frontend
+        with:
+          USERNAME: ${{ secrets.DEV_USER }}
+          PASSWORD: ${{ secrets.DEV_PASSWORD }}
+          ORG_NAME: ${{ secrets.ORG_NAME }}
+          SPACE_NAME: ${{ secrets.SPACE_NAME }}
+          APP_NAME: opre-ops-frontend-test
+
+      # - name: Deploy frontend to Cloud.gov
+      #   run: |
+      #     export PATH=$HOME/bin:$PATH
+      #     cf login -a https://api.fr.cloud.gov -u ${{ secrets.DEV_USER }} -p ${{ secrets.DEV_PASSWORD }} -o ${{ secrets.ORG_NAME }} -s ${{ secrets.SPACE_NAME }}
+      #     cf push opre-ops-frontend-test -f manifest.yml
diff --git a/.github/workflows/unit_test_reusable.yml b/.github/workflows/unit_test_reusable.yml
index 034aee1853..4f4d8ca75b 100644
--- a/.github/workflows/unit_test_reusable.yml
+++ b/.github/workflows/unit_test_reusable.yml
@@ -8,15 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
-        with:
-          python-version: '3.9'
-          cache: pipenv
-      - name: Pipenv install
-        run: pip install pipenv
-      - name: Install backend dependencies
-        working-directory: ./backend
-        run: pipenv install --dev
+      - uses: ./.github/actions/setup-python
       - name: Run backend unit tests
         working-directory: ./backend
         run: pipenv run pytest
@@ -26,14 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 18
-          cache: 'yarn'
-          cache-dependency-path: '**/yarn.lock'
-      - name: Install frontend dependencies
-        working-directory: ./frontend
-        run: yarn install --frozen-lockfile
+      - uses: ./.github/actions/setup-javascript
       - name: Run frontend unit tests
         working-directory: ./frontend
         run: yarn test
@@ -45,17 +30,9 @@ jobs:
         uses: actions/checkout@v3
       # Install NPM dependencies, cache them correctly
       # and run all Cypress tests
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 18
-          cache: 'yarn'
-          cache-dependency-path: '**/yarn.lock'
-      - name: Install frontend dependencies
-        working-directory: frontend
-        run: yarn install --frozen-lockfile
+      - uses: ./.github/actions/setup-javascript
       # Stand up the system stack, to have something to poke
-      - name: Start Stack
-        run: docker-compose up --build -d
+      - uses: ./.github/actions/run-full-stack
       # Run the Cypress E2E Tests
       - name: E2E Test
         working-directory: frontend

From b6d7fb855be801df0a44dca37d60c6837ea79952 Mon Sep 17 00:00:00 2001
From: Tim Donaworth <tdonaworth@flexion.us>
Date: Tue, 6 Sep 2022 17:21:38 -0400
Subject: [PATCH 08/15] try to force re-install

---
 .github/actions/setup-python/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/setup-python/action.yml b/.github/actions/setup-python/action.yml
index ccd24177d9..ef134fa556 100644
--- a/.github/actions/setup-python/action.yml
+++ b/.github/actions/setup-python/action.yml
@@ -7,7 +7,7 @@ runs:
       uses: actions/setup-python@v4
       with:
         python-version: '3.9'
-        cache: pipenv
+
     - name: Install Pipenv dependencies
       shell: bash
       working-directory: ./backend

From 5159b7f3a4ac84747908a445262f8aac00dbb248 Mon Sep 17 00:00:00 2001
From: Tim Donaworth <tdonaworth@flexion.us>
Date: Tue, 6 Sep 2022 17:24:35 -0400
Subject: [PATCH 09/15] forgot to install pipenv

---
 .github/actions/setup-python/action.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/actions/setup-python/action.yml b/.github/actions/setup-python/action.yml
index ef134fa556..bb37b124f3 100644
--- a/.github/actions/setup-python/action.yml
+++ b/.github/actions/setup-python/action.yml
@@ -7,7 +7,10 @@ runs:
       uses: actions/setup-python@v4
       with:
         python-version: '3.9'
-
+        cache: pipenv
+    - name: Install Pipenv
+      shell: bash
+      run: pip install pipenv
     - name: Install Pipenv dependencies
       shell: bash
       working-directory: ./backend

From aba12caec0d4bc72665f478842ea9996a2509924 Mon Sep 17 00:00:00 2001
From: Tim Donaworth <tdonaworth@flexion.us>
Date: Tue, 6 Sep 2022 18:04:58 -0400
Subject: [PATCH 10/15] added owasp-zap action

---
 .github/workflows/nightly_scans.yml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 .github/workflows/nightly_scans.yml

diff --git a/.github/workflows/nightly_scans.yml b/.github/workflows/nightly_scans.yml
new file mode 100644
index 0000000000..23f039b9c9
--- /dev/null
+++ b/.github/workflows/nightly_scans.yml
@@ -0,0 +1,25 @@
+name: Nightly Security Analysis
+on:
+  workflow_dispatch:
+  schedule:
+    # cron format: 'minute hour dayofmonth month dayofweek'
+    # this will run at noon UTC every day (3am EST / 4am EDT)
+    - cron: '0 8 * * *'
+
+jobs:
+  dast-scan:
+    name: OWASP Zap Scan
+    runs-on: ubuntu-latest
+    stesp:
+      - uses: actions/checkout@v3
+
+      - id: setup
+        uses: ./.github/actions/run-full-stack
+
+      - name: Run OWASP Zap Scan
+        uses: zaproxy/action-full-scan@v0.4.0
+        with:
+          docker_name: 'owasp/zap2docker-stable'
+          targer: 'http://localhost:3000/'
+          fail_action: true
+          cmd_options: '-I'

From 9865e99a69280842bd82fb587da0c1e0e3cf3d8e Mon Sep 17 00:00:00 2001
From: Tim Donaworth <tdonaworth@flexion.us>
Date: Tue, 6 Sep 2022 18:14:48 -0400
Subject: [PATCH 11/15] fix typo

---
 .github/workflows/nightly_scans.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/nightly_scans.yml b/.github/workflows/nightly_scans.yml
index 23f039b9c9..8af3afa2a5 100644
--- a/.github/workflows/nightly_scans.yml
+++ b/.github/workflows/nightly_scans.yml
@@ -10,7 +10,7 @@ jobs:
   dast-scan:
     name: OWASP Zap Scan
     runs-on: ubuntu-latest
-    stesp:
+    steps:
       - uses: actions/checkout@v3
 
       - id: setup

From d030fd871dd9e991ea73f75fae5bb8747aae671d Mon Sep 17 00:00:00 2001
From: Tim Donaworth <tdonaworth@flexion.us>
Date: Wed, 7 Sep 2022 11:50:07 -0400
Subject: [PATCH 12/15] missed a hard coded app-name

---
 .github/actions/deploy-backend/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/deploy-backend/action.yml b/.github/actions/deploy-backend/action.yml
index de0045e672..f7d881a0e7 100644
--- a/.github/actions/deploy-backend/action.yml
+++ b/.github/actions/deploy-backend/action.yml
@@ -24,6 +24,6 @@ runs:
           export PATH=$HOME/bin:$PATH
           cf login -a https://api.fr.cloud.gov -u ${{ inputs.USERNAME }} -p ${{ inputs.PASSWORD }} -o ${{ inputs.ORG_NAME }} -s ${{ inputs.SPACE_NAME }}
           cf push ${{ inputs.APP_NAME }} -f manifest.yml
-          BACKEND_GUID=$(cf app opre-ops-test --guid)
+          BACKEND_GUID=$(cf app ${{ inputs.APP_NAME }} --guid)
           BACKEND_DOMAIN=$(cf curl /v3/apps/$BACKEND_GUID/env | jq -r .application_env_json.VCAP_APPLICATION.application_uris[0])
           echo "::set-output name=BACKEND_DOMAIN::${BACKEND_DOMAIN}"

From d693cbef37028a44b426c5643617ff47c423d378 Mon Sep 17 00:00:00 2001
From: Tim Donaworth <tdonaworth@flexion.us>
Date: Wed, 7 Sep 2022 11:55:43 -0400
Subject: [PATCH 13/15] updated comment description

---
 .github/workflows/nightly_scans.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/nightly_scans.yml b/.github/workflows/nightly_scans.yml
index 8af3afa2a5..543b1d3dd3 100644
--- a/.github/workflows/nightly_scans.yml
+++ b/.github/workflows/nightly_scans.yml
@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
   schedule:
     # cron format: 'minute hour dayofmonth month dayofweek'
-    # this will run at noon UTC every day (3am EST / 4am EDT)
+    # this will run at 8AM UTC every day (3am EST / 4am EDT)
     - cron: '0 8 * * *'
 
 jobs:

From ca5c9c7bb5b138b21f531ee38d4507be096414b7 Mon Sep 17 00:00:00 2001
From: Tim Donaworth <tdonaworth@flexion.us>
Date: Wed, 7 Sep 2022 15:16:12 -0400
Subject: [PATCH 14/15] cleanup a bad c/p issue

---
 .github/actions/deploy-backend/action.yml  |  4 ++++
 .github/actions/deploy-frontend/action.yml | 16 +++++-----------
 .github/workflows/dev_deploy.yml           | 21 ---------------------
 3 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/.github/actions/deploy-backend/action.yml b/.github/actions/deploy-backend/action.yml
index f7d881a0e7..da537a62ea 100644
--- a/.github/actions/deploy-backend/action.yml
+++ b/.github/actions/deploy-backend/action.yml
@@ -16,6 +16,10 @@ inputs:
   APP_NAME:
     description: Applicaiton name (from manifest.yml).
     required: true
+outputs:
+  BACKEND_DOMAIN:
+    description: Uri of the deployed backend.
+    value: ${{ steps.deploy-backend.outputs.BACKEND_DOMAIN }}
 runs:
   using: composite
   steps:
diff --git a/.github/actions/deploy-frontend/action.yml b/.github/actions/deploy-frontend/action.yml
index 9b38356954..838c8affaa 100644
--- a/.github/actions/deploy-frontend/action.yml
+++ b/.github/actions/deploy-frontend/action.yml
@@ -16,19 +16,13 @@ inputs:
   APP_NAME:
     description: Applicaiton name (from manifest.yml).
     required: true
-outputs:
-  BACKEND_DOMAIN:
-    description: Uri of the deployed backend.
-    value: ${{ steps.deploy-backend.outputs.BACKEND_DOMAIN }}
+
 runs:
   using: composite
   steps:
     - name: Deploy to Cloud.gov
-      id: deploy-backend
+      id: deploy-frontend
       run: |
-          export PATH=$HOME/bin:$PATH
-          cf login -a https://api.fr.cloud.gov -u ${{ inputs.USERNAME }} -p ${{ inputs.PASSWORD }} -o ${{ inputs.ORG_NAME }} -s ${{ inputs.SPACE_NAME }}
-          cf push ${{ inputs.APP_NAME }} -f manifest.yml
-          BACKEND_GUID=$(cf app ${{ inputs.APP_NAME }} --guid)
-          BACKEND_DOMAIN=$(cf curl /v3/apps/$BACKEND_GUID/env | jq -r .application_env_json.VCAP_APPLICATION.application_uris[0])
-          echo "::set-output name=BACKEND_DOMAIN::${BACKEND_DOMAIN}"
+        export PATH=$HOME/bin:$PATH
+        cf login -a https://api.fr.cloud.gov -u ${{ inputs.USERNAME }} -p ${{ inputs.PASSWORD }} -o ${{ inputs.ORG_NAME }} -s ${{ inputs.SPACE_NAME }}
+        cf push ${{ inputs.APP_NAME }} -f manifest.yml
diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml
index 46510f9db6..fbc59f47c2 100644
--- a/.github/workflows/dev_deploy.yml
+++ b/.github/workflows/dev_deploy.yml
@@ -23,12 +23,6 @@ jobs:
       - uses: ./.github/actions/setup-python
       - uses: ./.github/actions/setup-javascript
       - uses: ./.github/actions/setup-cloudfoundry
-      # - name: Install CF CLI
-      #   run: |
-      #     mkdir -p $HOME/bin
-      #     export PATH=$HOME/bin:$PATH
-      #     curl -L "https://cli.run.pivotal.io/stable?release=linux64-binary" | tar xzv -C $HOME/bin
-
 
       - name: Deploy Backend
         uses: ./.github/actions/deploy-backend
@@ -38,15 +32,6 @@ jobs:
           ORG_NAME: ${{ secrets.ORG_NAME }}
           SPACE_NAME: ${{ secrets.SPACE_NAME }}
           APP_NAME: opre-ops-test
-      # - name: Deploy backend to Cloud.gov
-      #   id: backend-deploy
-      #   run: |
-      #     export PATH=$HOME/bin:$PATH
-      #     cf login -a https://api.fr.cloud.gov -u ${{ secrets.DEV_USER }} -p ${{ secrets.DEV_PASSWORD }} -o ${{ secrets.ORG_NAME }} -s ${{ secrets.SPACE_NAME }}
-      #     cf push opre-ops-test -f manifest.yml
-      #     BACKEND_GUID=$(cf app opre-ops-test --guid)
-      #     BACKEND_DOMAIN=$(cf curl /v3/apps/$BACKEND_GUID/env | jq -r .application_env_json.VCAP_APPLICATION.application_uris[0])
-      #     echo "::set-output name=BACKEND_DOMAIN::${BACKEND_DOMAIN}"
 
       - name: Build frontend
         working-directory: ./frontend
@@ -62,9 +47,3 @@ jobs:
           ORG_NAME: ${{ secrets.ORG_NAME }}
           SPACE_NAME: ${{ secrets.SPACE_NAME }}
           APP_NAME: opre-ops-frontend-test
-
-      # - name: Deploy frontend to Cloud.gov
-      #   run: |
-      #     export PATH=$HOME/bin:$PATH
-      #     cf login -a https://api.fr.cloud.gov -u ${{ secrets.DEV_USER }} -p ${{ secrets.DEV_PASSWORD }} -o ${{ secrets.ORG_NAME }} -s ${{ secrets.SPACE_NAME }}
-      #     cf push opre-ops-frontend-test -f manifest.yml

From 23fe17b35fb4bdeb3950dff1128f5e51acbdb4d8 Mon Sep 17 00:00:00 2001
From: Tim Donaworth <tdonaworth@flexion.us>
Date: Wed, 7 Sep 2022 15:28:06 -0400
Subject: [PATCH 15/15] typo

---
 .github/workflows/nightly_scans.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/nightly_scans.yml b/.github/workflows/nightly_scans.yml
index 543b1d3dd3..46310f7bf5 100644
--- a/.github/workflows/nightly_scans.yml
+++ b/.github/workflows/nightly_scans.yml
@@ -20,6 +20,6 @@ jobs:
         uses: zaproxy/action-full-scan@v0.4.0
         with:
           docker_name: 'owasp/zap2docker-stable'
-          targer: 'http://localhost:3000/'
+          target: 'http://localhost:3000/'
           fail_action: true
           cmd_options: '-I'