Merge branch 'develop' into AL-update-rds-strage-type

Author: aloftus23

.github/workflows/build.yml

@@ -44,6 +44,13 @@ jobs:
       - id: setup-env
         uses: cisagov/setup-env-github-action@develop
       - uses: actions/checkout@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: 'npm'
+      - name: Install root npm dependencies
+        run: npm ci
       - id: setup-python
         uses: actions/setup-python@v4
         with:

.github/workflows/frontend.yml

@@ -52,17 +52,22 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/.npm
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}-v2
           restore-keys: ${{ runner.os }}-node-
       - name: Install dependencies
         run: npm ci
         working-directory: ./frontend
       - name: Build
         run: npm run build
         working-directory: ./frontend
-      - name: Test
-        run: npm run test
+      - name: Run tests with coverage
+        run: npx vitest --run --coverage
         working-directory: ./frontend
+      - name: Upload coverage to Coveralls
+        uses: coverallsapp/github-action@v2
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          path-to-lcov: ./frontend/coverage/lcov.info
 
   deploy_staging:
     needs: [lint, test]

.github/workflows/regression.yml

@@ -34,7 +34,8 @@ jobs:
     runs-on: ubuntu-latest
     environment: staging
     timeout-minutes: 60
-    if: (github.event_name == 'push' && github.ref == 'refs/heads/develop') || (github.event_name == 'pull_request' && github.base_ref == 'develop')
+    # if: (github.event_name == 'push' && github.ref == 'refs/heads/develop') || (github.event_name == 'pull_request' && github.base_ref == 'develop' && !startsWith(github.actor, 'dependabot'))
+    if: false # TODO: Temporarily skip while issues with regression testing are resolved.
     env:
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -56,7 +57,6 @@ jobs:
       PW_STANDARD_USER_PASSWORD: ${{ secrets.PW_STANDARD_USER_PASSWORD }}
       PW_STANDARD_USER_2FA_SECRET: ${{ secrets.PW_STANDARD_USER_2FA_SECRET }}
       PW_XFD_2FA_ISSUER: ${{ secrets.PW_XFD_2FA_ISSUER }}
-      PW_HEADLESS: true
       CI: true
       ENVIRONMENT: staging
       GIT_BRANCH: develop
@@ -162,7 +162,8 @@ jobs:
      runs-on: ubuntu-latest
      environment: integration
      timeout-minutes: 60
-     if: (github.event_name == 'push' && github.ref == 'refs/heads/integration') || (github.event_name == 'pull_request' && github.base_ref == 'integration')
+     # if: (github.event_name == 'push' && github.ref == 'refs/heads/integration') || (github.event_name == 'pull_request' && github.base_ref == 'integration'  && !startsWith(github.actor, 'dependabot'))
+     if: false # TODO: Temporarily skip while issues with regression testing are resolved.
      env:
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -184,7 +185,6 @@ jobs:
       PW_STANDARD_USER_PASSWORD: ${{ secrets.PW_STANDARD_USER_PASSWORD }}
       PW_STANDARD_USER_2FA_SECRET: ${{ secrets.PW_STANDARD_USER_2FA_SECRET }}
       PW_XFD_2FA_ISSUER: ${{ secrets.PW_XFD_2FA_ISSUER }}
-      PW_HEADLESS: true
       CI: true
       ENVIRONMENT: integration
       GIT_BRANCH: integration

.gitignore

@@ -36,10 +36,12 @@ tmp/*
 .DS_STORE
 */.DS_STORE
 .idea
+.eslintcache
 
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+backend/src/xfd_django/vuln_scanning_sync.log
 
 .serverless
 .build

.pre-commit-config.yaml

@@ -46,6 +46,17 @@ repos:
       - id: yamllint
         args:
           - --strict
+  - repo: local
+    hooks:
+      - id: eslint
+        name: ESLint
+        entry: >
+          bash -c 'export NVM_DIR="$HOME/.nvm";
+          [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" --no-use
+          && nvm use || true;
+          cd frontend && npx eslint . --cache'
+        language: system
+        files: ^frontend/src/.*\.(js|jsx|ts|tsx)$
 
   # GitHub Actions hooks
   - repo: https://github.com/python-jsonschema/check-jsonschema

backend/Makefile

@@ -60,6 +60,12 @@ populate-cache:
 local-scan-execution:
 	docker compose exec backend python manage.py local_scan_execution --scan-type=dnstwist --desired-count=1 --org-list="National Science Foundation (NSF) - CISA"
 
-#Create local dev api key. ONLY run this after initial login, since that is when the user(user is tied to api_key) is created
+# Create local dev api key. ONLY run this after initial login, since that is when the user(user is tied to api_key) is created
 generate-dev-api-key:
 	docker compose exec backend python manage.py generate_dev_api_key
+
+# Import test users to db
+import-test-users:
+	FILE_BASENAME=$$(basename $(FILE)); \
+	docker compose cp $(FILE) backend:/tmp/$$FILE_BASENAME; \
+	docker compose exec backend python manage.py import_test_users /tmp/$$FILE_BASENAME