Merge branch 'matomo' of github.com:cisagov/XFD into matomo

cisagov · Feb 18, 2025 · a190fa8 · a190fa8
2 parents 1d0592e + a14a3a9
commit a190fa8
Show file tree

Hide file tree

Showing 274 changed files with 5,868 additions and 90,530 deletions.
diff --git a/backend/env.yml b/backend/env.yml
@@ -194,6 +194,8 @@ staging:
   ELASTICSEARCH_ENDPOINT: ${ssm:/crossfeed/staging/ELASTICSEARCH_ENDPOINT}
   REACT_APP_TERMS_VERSION: ${ssm:/crossfeed/staging/REACT_APP_TERMS_VERSION}
   MATOMO_URL: http://matomo.cfs.lz.us-cert.gov
+  MATOMO_DB_HOST: ${ssm:/crossfeed/staging/MATOMO_DATABASE_HOST}
+  MATOMO_DB_PASSWORD: ${ssm:/crossfeed/staging/MATOMO_DATABASE_PASSWORD}
   EXPORT_BUCKET_NAME: cisa-crossfeed-staging-exports
   PE_API_URL: ${ssm:/crossfeed/staging/PE_API_URL}
   REPORTS_BUCKET_NAME: cisa-crossfeed-staging-reports
@@ -243,7 +245,7 @@ prod:
   LOGIN_GOV_JWT_KEY: ${ssm:/crossfeed/prod/LOGIN_GOV_JWT_KEY}
   LOGIN_GOV_ISSUER: ${ssm:/crossfeed/prod/LOGIN_GOV_ISSUER}
   DOMAIN: ${ssm:/crossfeed/prod/DOMAIN}
-  CERT_DOMAIN: staging.crossfeed.cyber.dhs.gov
+  CERT_DOMAIN: crossfeed.cyber.dhs.gov
   FARGATE_SG_ID: ${ssm:/crossfeed/prod/WORKER_SG_ID}
   FARGATE_SUBNET_ID: ${ssm:/crossfeed/prod/WORKER_SUBNET_ID}
   FARGATE_MAX_CONCURRENCY: 300
@@ -264,6 +266,8 @@ prod:
   ELASTICACHE_ENDPOINT: ${ssm:/crossfeed/prod/ELASTICACHE_ENDPOINT}
   REACT_APP_TERMS_VERSION: ${ssm:/crossfeed/prod/REACT_APP_TERMS_VERSION}
   MATOMO_URL: http://matomo.cfs.lz.us-cert.gov
+  MATOMO_DB_HOST: ${ssm:/crossfeed/prod/MATOMO_DATABASE_HOST}
+  MATOMO_DB_PASSWORD: ${ssm:/crossfeed/prod/MATOMO_DATABASE_PASSWORD}
   EXPORT_BUCKET_NAME: cisa-crossfeed-prod-exports
   PE_API_URL: ${ssm:/crossfeed/prod/PE_API_URL}
   REPORTS_BUCKET_NAME: cisa-crossfeed-prod-reports

diff --git a/backend/jest.config.js b/backend/jest.config.js
diff --git a/backend/mock.js b/backend/mock.js
diff --git a/backend/requirements.txt b/backend/requirements.txt
@@ -43,6 +43,7 @@ minio==7.2.12
 multidict==6.1.0
 mypy==1.13.0
 mypy-extensions==1.0.0
+netaddr==1.3.0
 orjson==3.10.12
 packaging==24.2
 pika==1.3.2
@@ -58,6 +59,7 @@ pydantic_core==2.27.1
 Pygments==2.18.0
 PyJWT==2.10.1
 pylint==3.3.2
+PyMySQL==1.1.1
 pytest==8.3.4
 pytest-django==4.9.0
 pytest-env==1.1.5
@@ -79,6 +81,7 @@ starlette==0.37.2
 tomlkit==0.13.2
 typer==0.15.1
 types-cffi==1.16.0.20240331
+types-PyMySQL==1.1.0.20241103
 types-pyOpenSSL==24.1.0.20240722
 types-redis==4.6.0.20241004
 types-setuptools==75.6.0.20241126

diff --git a/backend/scripts/populateCountiesCities/United_States_Cities_with_URLs.csv b/backend/scripts/populateCountiesCities/United_States_Cities_with_URLs.csv
diff --git a/backend/scripts/populateCountiesCities/United_States_Counties_with_URLs.csv b/backend/scripts/populateCountiesCities/United_States_Counties_with_URLs.csv
diff --git a/backend/scripts/populateCountiesCities/cities.py b/backend/scripts/populateCountiesCities/cities.py
diff --git a/backend/scripts/populateCountiesCities/counties.py b/backend/scripts/populateCountiesCities/counties.py
diff --git a/backend/scripts/populateCountiesCities/main.py b/backend/scripts/populateCountiesCities/main.py
diff --git a/backend/scripts/populateCountiesCities/requirements.txt b/backend/scripts/populateCountiesCities/requirements.txt
diff --git a/backend/src/api-dev.ts b/backend/src/api-dev.ts
diff --git a/backend/src/api.ts b/backend/src/api.ts