Merge branch 'main' into fix-security-vulnerabilities

Bumps [black](https://github.com/psf/black) from 25.12.0 to 26.1.0.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](https://github.com/psf/black/compare/25.12.0...26.1.0)

---
updated-dependencies:
- dependency-name: black
  dependency-version: 26.1.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

app/cloudfoundry_config.py

@@ -9,8 +9,8 @@ class CloudfoundryConfig:
         self.s3_buckets = {bucket["name"]: bucket["credentials"] for bucket in buckets}
         self._empty_bucket_credentials = {
             "bucket": "",
-            "access_key_id": "",
-            "secret_access_key": "",
+            "access_key_id": "",  # nosec B105
+            "secret_access_key": "",  # nosec B105
             "region": "",
         }
 

app/notifications/validators.py

@@ -35,11 +35,12 @@ def check_service_over_total_message_limit(key_type, service):
     # For now we are using calendar year
     # Switch to using service agreement dates when the Agreement model is ready
     # If the service stat has never been set before, compute the remaining seconds for 2025
-    # and set it (all services) to expire on 12/31/2025.
+    # and set it (all services) to expire on 12/31/2026.
     if service_stats is None:
         now_et = datetime.now(ZoneInfo("America/New_York"))
+
         target_time = datetime(
-            2025, 12, 31, 23, 59, 59, tzinfo=ZoneInfo("America/New_York")
+            2026, 12, 31, 23, 59, 59, tzinfo=ZoneInfo("America/New_York")
         )
         time_difference = target_time - now_et
         seconds_difference = int(time_difference.total_seconds())

app/organization/rest.py

@@ -180,7 +180,9 @@ def get_organization_dashboard(organization_id):
         organization_id, year, include_all_services=True
     )
 
-    service_ids = [service_data["service_id"] for service_data in services_with_usage.values()]
+    service_ids = [
+        service_data["service_id"] for service_data in services_with_usage.values()
+    ]
 
     if not service_ids:
         return jsonify(services=[]), 200
@@ -197,11 +199,13 @@ def get_organization_dashboard(organization_id):
     sorted_services = sorted(
         services_list,
         key=lambda s: (
-            0 if (s["active"] and not s["restricted"]) else
-            1 if (s["active"] and s["restricted"]) else
-            2,
-            s["service_name"].lower()
-        )
+            (
+                0
+                if (s["active"] and not s["restricted"])
+                else 1 if (s["active"] and s["restricted"]) else 2
+            ),
+            s["service_name"].lower(),
+        ),
     )
 
     return jsonify(services=sorted_services)

pyproject.toml

@@ -9,17 +9,17 @@ readme = "README.md"
 
 [tool.poetry.dependencies]
 python = "^3.13.2"
-alembic = "==1.17.1"
+alembic = "==1.18.1"
 amqp = "==5.3.1"
-beautifulsoup4 = "==4.14.2"
+beautifulsoup4 = "==4.14.3"
 boto3 = "^1.38.27"
 botocore = "^1.38.27"
-cachetools = "==6.2.1"
-celery = {version = "==5.5.3", extras = ["redis"]}
+cachetools = "==6.2.4"
+celery = {version = "==5.6.2", extras = ["redis"]}
 certifi = ">=2022.12.7"
 cffi = "==2.0.0"
 charset-normalizer = "^3.4.4"
-click = "==8.3.0"
+click = "==8.3.1"
 click-datetime = "==0.4.0"
 click-didyoumean = "==0.3.1"
 click-plugins = "==1.1.1.2"
@@ -34,30 +34,30 @@ flask-redis = "==0.4.0"
 flask-sqlalchemy = "^3.1.1"
 gunicorn = {version = "==23.0.0", extras = ["gevent"]}
 iso8601 = "==2.1.0"
-jsonschema = {version = "==4.25.1", extras = ["format"]}
+jsonschema = {version = "==4.26.0", extras = ["format"]}
 lxml = "==6.0.2"
-marshmallow = "^4.1.0"
+marshmallow = "^4.2.0"
 marshmallow-sqlalchemy = "^1.4.2"
-newrelic = "^11.1.0"
+newrelic = "^11.2.0"
 packaging = "==25.0"
 poetry-dotenv-plugin = "==0.2.0"
 psycopg2-binary = "==2.9.11"
 pyjwt = "==2.10.1"
 python-dotenv = "==1.2.1"
-sqlalchemy = "==2.0.44"
-werkzeug = "^3.0.6"
-faker = "^37.12.0"
+sqlalchemy = "==2.0.45"
+werkzeug = "^3.1.5"
+faker = "^40.1.0"
 async-timeout = "^5.0.1"
 bleach = "^6.3.0"
 geojson = "^3.2.0"
-numpy = "^2.3.4"
+numpy = "^2.4.0"
 ordered-set = "^4.1.0"
-phonenumbers = "^9.0.18"
+phonenumbers = "^9.0.22"
 python-json-logger = "^4.0.0"
 regex = "^2025.11.3"
 shapely = "^2.1.2"
 smartypants = "^2.0.1"
-mistune = "^3.1.4"
+mistune = "^3.2.0"
 blinker = "^1.9.0"
 cryptography = "^46.0.3"
 idna = "^3.11"
@@ -68,38 +68,39 @@ python-dateutil = "^2.9.0.post0"
 pyyaml = "^6.0.3"
 s3transfer = "^0.13.1"
 six = "^1.16.0"
-urllib3 = "^2.5.0"
+urllib3 = "^2.6.3"
 webencodings = "^0.5.1"
 itsdangerous = "^2.2.0"
 jinja2 = "^3.1.6"
-redis = "^5.0.8"
+redis = "^6.4.0"
 requests = "^2.32.5"
-virtualenv = "^20.35.4"
+virtualenv = "^20.36.1"
 marshmallow-enum = "^1.5.1"
 awscli = "^1.40.36"
 typing-extensions = "^4.15.0"
-aiohttp = "^3.13.2"
-pytest = "^9.0.0"
+aiohttp = "^3.13.3"
+pytest = "^9.0.2"
+filelock = ">=3.20.3"
+pyasn1 = ">=0.6.2"
 
 
 [tool.poetry.group.dev.dependencies]
-awscli = "^1.33.32"
 bandit = "*"
-black = "^25.11.0"
-cyclonedx-python-lib = "^11.5.0"
+black = "^26.1.0"
+cyclonedx-python-lib = "^11.6.0"
 cloudfoundry-client = "*"
-exceptiongroup = "==1.3.0"
+exceptiongroup = "==1.3.1"
 flake8 = "^7.3.0"
-flake8-bugbear = "^25.10.21"
+flake8-bugbear = "^25.11.29"
 freezegun = "^1.5.5"
-hypothesis = "^6.147.0"
+hypothesis = "^6.150.2"
 honcho = "*"
 isort = "^7.0.0"
-jinja2-cli = {version = "==0.8.2", extras = ["yaml"]}
-moto = "==5.1.16"
+jinja2-cli = {version = "==1.0.0", extras = ["yaml"]}
+moto = "==5.1.19"
 pip-audit = "*"
-pre-commit = "^4.4.0"
-pytest = "^9.0.0"
+pre-commit = "^4.5.1"
+pytest = "^9.0.2"
 pytest-env = "^1.2.0"
 pytest-mock = "^3.15.1"
 pytest-cov = "^7.0.0"

terraform/demo/main.tf

@@ -50,7 +50,7 @@ module "egress-space" {
   cf_restricted_space_name = local.cf_space_name
   deployers = [
     var.cf_user,
-    "carlo.costino@gsa.gov"
+    "alex.janousek@gsa.gov"
   ]
 }
 

terraform/demo/providers.tf

@@ -2,8 +2,8 @@ terraform {
   required_version = "~> 1.7"
   required_providers {
     cloudfoundry = {
-      source  = "cloudfoundry-community/cloudfoundry"
-      version = "0.53.1"
+      source  = "cloudfoundry/cloudfoundry"
+      version = "1.9.0"
     }
     cfcommunity = {
       source  = "cloudfoundry-community/cloudfoundry"

terraform/production/providers.tf

@@ -2,8 +2,8 @@ terraform {
   required_version = "~> 1.7"
   required_providers {
     cloudfoundry = {
-      source  = "cloudfoundry-community/cloudfoundry"
-      version = "0.53.1"
+      source  = "cloudfoundry/cloudfoundry"
+      version = "1.9.0"
     }
     cfcommunity = {
       source  = "cloudfoundry-community/cloudfoundry"

terraform/sandbox/main.tf

@@ -50,7 +50,7 @@ module "egress-space" {
   cf_restricted_space_name = local.cf_space_name
   deployers = [
     var.cf_user,
-    "carlo.costino@gsa.gov"
+    "alex.janousek@gsa.gov"
   ]
 }
 

terraform/staging/main.tf

@@ -60,7 +60,7 @@ module "egress-space" {
   cf_restricted_space_name = local.cf_space_name
   deployers = [
     var.cf_user,
-    "carlo.costino@gsa.gov"
+    "alex.janousek@gsa.gov"
   ]
 }
 

tests/app/organization/test_rest.py

@@ -1009,10 +1009,14 @@ def test_get_organization_dashboard(admin_request, mocker):
         }
     }
 
-    mock_templates = mocker.patch("app.organization.rest.dao_get_recent_sms_template_per_service")
+    mock_templates = mocker.patch(
+        "app.organization.rest.dao_get_recent_sms_template_per_service"
+    )
     mock_templates.return_value = {service_id: "Welcome SMS"}
 
-    mock_contacts = mocker.patch("app.organization.rest.dao_get_service_primary_contacts")
+    mock_contacts = mocker.patch(
+        "app.organization.rest.dao_get_service_primary_contacts"
+    )
     mock_contacts.return_value = {service_id: "billing@example.com"}
 
     response = admin_request.get(