Acouch patch 1

.github/ISSUE_TEMPLATE/internal_task.yml

@@ -1,7 +1,6 @@
 name: Internal - Task
 description: Describes an individual task that needs to be completed
 title: "[Task]: "
-labels: ["project: grants.gov"]
 assignees:
   - octocat
 body:

.github/workflows/ci-analytics.yml

@@ -42,11 +42,12 @@ jobs:
       - name: Run tests
         run: make test-audit
 
-      - name: Export GitHub data
-        run: make gh-data-export
+      # Both of these tasks are looking for github and slack auth
+      # - name: Export GitHub data
+      #   run: make gh-data-export
 
-      - name: Run reports
-        run: make sprint-reports
+      # - name: Run reports
+      #   run: make sprint-reports
 
   vulnerability-scans:
     name: Run Analytics Vulnerability Scans

.github/workflows/ci-frontend-a11y.yml

@@ -0,0 +1,73 @@
+name: pa11y tests
+
+on:
+  pull_request:
+    paths:
+      - frontend/**
+      - .github/workflows/ci-frontend-a11y.yml
+
+jobs:
+  build:
+    name: Pa11y-ci tests
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./frontend
+
+    env:
+      NODE_VERSION: 20
+      LOCKFILE_PATH: ./frontend/package-lock.json
+      PACKAGE_MANAGER: npm
+
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v4
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+          cache-dependency-path: ${{ env.LOCKFILE_PATH }}
+          cache: ${{ env.PACKAGE_MANAGER }}
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Create screenshots directory
+        run: mkdir -p screenshots-output
+
+      - name: Build project
+        run: npm run build
+
+      - name: Start server and log output
+        run: npm run start &
+
+      - name: Start API Server for search results
+        run: |
+          cd ../api
+          make init db-seed-local start &
+          cd ../frontend
+          # ensure the API wait script is executable
+          chmod +x ../api/bin/wait-for-api.sh
+          ../api/bin/wait-for-api.sh
+        shell: bash
+
+      - name: Wait for frontend to be ready
+        run: |
+          # Ensure the server wait script is executable
+          chmod +x ./bin/wait-for-frontend.sh
+          ./bin/wait-for-frontend.sh
+
+      - name: Run pa11y-ci
+        run: |
+          set -e # Ensure the script fails if any command fails
+          npm run test:pa11y-desktop
+          npm run test:pa11y-mobile
+          echo "pa11y-ci tests finished."
+
+      - name: Upload screenshots to artifacts
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: screenshots
+          path: ./frontend/screenshots-output

.gitignore

@@ -143,3 +143,6 @@ dmypy.json
 
 # vscode
 .vscode/settings.json
+
+# vim
+*.swp

.grype.yml

@@ -16,11 +16,11 @@ ignore:
   - fix-state: not-fixed
   - fix-state: wont-fix
   - fix-state: unknown
-  # Golang vulnerability inside of a python docker image. It's basically impossible to find
-  # out where the impacted golang vulnerability is coming from. The python image in question
-  # does not even have golang installed, yet somehow still there's a golang vulnerability.
-  # We are ignoring the finding because it would take undue effort to track down the source.
+  # Golang vulnerabilities inside of a python docker image. Both originate from lower level packages within the GitHub CLI:
+  # https://github.com/cli/cli/blob/trunk/go.mod#L101 
+  # https://github.com/cli/cli/blob/trunk/go.mod#L161
   - vulnerability: GHSA-4v7x-pqxf-cx7m
+  - vulnerability: GHSA-v6v8-xj6m-xwqh
   # https://github.com/anchore/grype/issues/1172
   - vulnerability: GHSA-xqr8-7jwr-rhp7
   - vulnerability: GHSA-7fh5-64p2-3v2j

README.md

@@ -1,64 +1,3 @@
-# [Simpler.Grants.gov](https://simpler.grants.gov/)
+# This is an archived fork of https://github.com/HHS/simpler-grants-gov 
 
-A modernization effort for [Grants.gov](https://grants.gov/)
-
-## About the Project
-
-We want Grants.gov to be an extremely simple, accessible, and easy-to-use tool for posting, finding, sharing, and applying for federal financial assistance. Our mission is to increase access to grants and improve the grants experience for everyone. We’re improving the way applicants search for and discover funding opportunities, making it easier to find and apply. For federal grantmaking agencies, we’re making it easier for their communities to find the funding they need.
-
-Go to [Simpler.Grants.gov](https://simpler.grants.gov/) to learn about our transparent process and what we’re doing now, or explore our existing user research and the findings that are guiding our work.
-
-See [goals.md](./documentation/goals.md) for more information about the vision and goals for the project.
-
-## Core Team
-
-The core team on the grants.gov project is a small group of content strategists, designers, developers, and product managers working for and with the Department of Health and Human Services, and other federal agencies, and community volunteers.
-
-An up-to-date list of core team members can be found in [MAINTAINERS.md](./MAINTAINERS.md). At this time, the project is still building the core team and defining roles and responsibilities. We are eagerly seeking individuals who would like to join the community and help us define and fill these roles.
-
-## Repository Structure
-
-- [./.github](./.github) contains Github specific settings files and testing, linting, and CI/CD workflows
-- [./api](./api) contains an API built in Python using the Flask library
-- [./bin](./bin) contains scripts for managing infrastructure
-- [./documentation](./documentation) contains project guides, documentation, and decision records
-- [./frontend](./frontend) contains a web application built using Next.js
-- [./infra](./infra) contains Terraform modules and configuration for managing the AWS infrastructure
-
-## Development
-
-### API
-
-Documentation for the API is linked to from the [API README.md](./api/README.md). For installation instructions, see the [development documentation](./documentation/api/development.md).
-
-### Front-end
-
-Documentation and development instructions for the front-end are provided in the [Front-end README.md](./frontend/README.md).
-
-## Contributing
-
-Thank you for considering contributing to an Open Source project of the US
-Government! For more information about our contribution guidelines, see
-[CONTRIBUTING.md](CONTRIBUTING.md) to learn more and join our community see our [wiki](https://wiki.simpler.hhs.gov).
-
-## Security
-
-For more information about our Security, Vulnerability, and Responsible
-Disclosure Policies, see [SECURITY.md](SECURITY.md).
-
-## Authors and Maintainers
-
-For more information about our Authors and maintainers, see [MAINTAINERS.md](MAINTAINERS.md).
-
-A full list of [contributors](https://github.com/HHS/simpler-grants-gov/graphs/contributors) can be found on GitHub.
-
-## Public domain
-
-This project is licensed within in the public domain within the United States,
-and copyright and related rights in the work worldwide are waived through the
-[CC0 1.0 Universal public domain
-dedication](https://creativecommons.org/publicdomain/zero/1.0/).
-
-All contributions to this project will be released under the CC0 dedication. By
-submitting a pull request or issue, you are agreeing to comply with this waiver
-of copyright interest.
+Do not commit or do work here! Go to https://github.com/HHS/simpler-grants-gov for project updates.

analytics/.gitignore

@@ -1,4 +1,2 @@
 data
 
-# Ignore dynaconf secret files
-.secrets.*

analytics/Makefile

@@ -146,6 +146,13 @@ sprint-data-export:
 	--project $(SPRINT_PROJECT) \
 	--output-file $(SPRINT_FILE)
 
+gh-db-data-import:
+	@echo "=> Importing sprint data to the database"
+	@echo "====================================================="
+	$(POETRY) analytics import db_import \
+	--sprint-file $(SPRINT_FILE) \
+	--issue-file $(ISSUE_FILE)
+
 roadmap-data-export:
 	@echo "=> Exporting project data from the product roadmap"
 	@echo "====================================================="

analytics/config.py

@@ -1,32 +1,23 @@
-"""Loads configuration variables from settings files and settings files
+"""Loads configuration variables from settings files
 
-Dynaconf provides a few valuable features for configuration management:
-- Load variables from env vars and files with predictable overrides
-- Validate the existence and format of required configs
-- Connect with secrets managers like HashiCorp's Vault server
-- Load different configs based on environment (e.g. DEV, PROD, STAGING)
-
-For more information visit: https://www.dynaconf.com/
 """
-from dynaconf import Dynaconf, Validator, ValidationError
+import os 
+from typing import Optional
+from pydantic_settings import BaseSettings, SettingsConfigDict
+from pydantic import Field
+
+# reads environment variables from .env files defaulting to "local.env"
+class PydanticBaseEnvConfig(BaseSettings):
+    model_config = SettingsConfigDict(env_file="%s.env" % os.getenv("ENVIRONMENT", "local"), extra="ignore") # set extra to ignore so that it ignores variables irrelevant to the database config (e.g. metabase settings)
 
-settings = Dynaconf(
-    # set env vars with `export ANALYTICS_FOO=bar`
-    envvar_prefix="ANALYTICS",
-    # looks for config vars in the following files
-    # with vars in .secrets.toml overriding vars in settings.toml
-    settings_files=["settings.toml", ".secrets.toml"],
-    # add validators for our required config vars
-    validators=[
-        Validator("SLACK_BOT_TOKEN", must_exist=True),
-        Validator("REPORTING_CHANNEL_ID", must_exist=True),
-    ],
-)
+class DBSettings(PydanticBaseEnvConfig):
+     db_host: str = Field(alias="DB_HOST")
+     port: int = Field(5432,alias="DB_PORT")
+     user: str = Field (alias="DB_USER")
+     password: str = Field(alias="DB_PASSWORD")
+     ssl_mode: str = Field(alias="DB_SSL_MODE")
+     slack_bot_token: str = Field(alias="ANALYTICS_SLACK_BOT_TOKEN")
+     reporting_channel_id: str = Field(alias="ANALYTICS_REPORTING_CHANNEL_ID")
 
-# raises after all possible errors are evaluated
-try:
-    settings.validators.validate_all()
-except ValidationError as error:
-    list_of_all_errors = error.details
-    print(list_of_all_errors)
-    raise
+def get_db_settings() -> DBSettings:
+     return DBSettings()

analytics/local.env

@@ -28,3 +28,13 @@ MB_DB_PORT=5432
 MB_DB_USER=app
 MB_DB_PASS=secret123
 MB_DB_HOST=grants-analytics-db
+
+###########################
+# Slack Configuration   #
+###########################
+# Do not add these values to this file
+# to avoid mistakenly committing them.
+# Set these in your shell
+# by doing `export ANALYTICS_REPORTING_CHANNEL_ID=whatever`
+ANALYTICS_REPORTING_CHANNEL_ID=DO_NOT_SET_HERE
+ANALYTICS_SLACK_BOT_TOKEN=DO_NOT_SET_HERE