Merge pull request #1654 from GSA/main

04/15/2025 Production Deploy

Author: ccostino

Makefile

@@ -5,7 +5,8 @@ DATE = $(shell date +%Y-%m-%d:%H:%M:%S)
 APP_VERSION_FILE = app/version.py
 
 GIT_BRANCH ?= $(shell git symbolic-ref --short HEAD 2> /dev/null || echo "detached")
-GIT_COMMIT ?= $(shell git rev-parse HEAD)
+GIT_COMMIT ?= $(shell git rev-parse HEAD 2> /dev/null || echo "")
+GIT_HOOKS_PATH ?= $(shell git config --global core.hooksPath || echo "")
 
 ## DEVELOPMENT
 
@@ -23,6 +24,19 @@ bootstrap: ## Set up everything to run the app
 	createdb test_notification_api || true
 	(poetry run flask db upgrade) || true
 
+.PHONY: bootstrap-with-git-hooks
+bootstrap-with-git-hooks:  ## Sets everything up and accounts for pre-existing git hooks
+	make generate-version-file
+	poetry self add poetry-dotenv-plugin
+	poetry lock --no-update
+	poetry install --sync --no-root
+	git config --global --unset-all core.hooksPath
+	poetry run pre-commit install
+	git config --global core.hookspath "${GIT_HOOKS_PATH}"
+	createdb notification_api || true
+	createdb test_notification_api || true
+	(poetry run flask db upgrade) || true
+
 .PHONY: bootstrap-with-docker
 bootstrap-with-docker: ## Build the image to run the app in Docker
 	docker build -f docker/Dockerfile -t notifications-api .

app/clients/document_download.py

@@ -33,7 +33,7 @@ def upload_document(self, service_id, file_contents, is_csv=None):
                     "document": file_contents,
                     "is_csv": is_csv or False,
                 },
-                timeout=30
+                timeout=30,
             )
 
             response.raise_for_status()

app/clients/performance_platform/performance_platform_client.py

@@ -29,7 +29,7 @@ def send_stats_to_performance_platform(self, payload):
                 self.performance_platform_url + payload["dataType"],
                 json=payload,
                 headers=headers,
-                timeout=30
+                timeout=30,
             )
 
             if resp.status_code == 200:

app/clients/sms/aws_sns.py

@@ -48,7 +48,10 @@ def _valid_sender_number(self, sender):
 
     def send_sms(self, to, content, reference, sender=None, international=False):
         matched = False
-        for match in phonenumbers.PhoneNumberMatcher(to, "US"):
+        if "+" not in to:
+            to = f"+{to}"
+
+        for match in phonenumbers.PhoneNumberMatcher(to, None):
             matched = True
             to = phonenumbers.format_number(
                 match.number, phonenumbers.PhoneNumberFormat.E164

app/cronitor.py

@@ -35,7 +35,7 @@ def ping_cronitor(command):
                     params={
                         "host": current_app.config["API_HOST_NAME"],
                     },
-                    timeout=30
+                    timeout=30,
                 )
                 resp.raise_for_status()
             except requests.RequestException as e:

app/delivery/send_to_providers.py

@@ -105,6 +105,17 @@ def send_sms_to_provider(notification):
                 # The future home of the validation is TBD
                 _experimentally_validate_phone_numbers(recipient)
 
+                # TODO current we allow US phone numbers to be uploaded without the country code (1)
+                # This will break certain international phone numbers (Norway, Denmark, East Timor)
+                # When we officially announce support for international numbers, US numbers must contain
+                # their country code.
+                recipient = str(recipient)
+                if len(recipient) == 10:
+                    if os.getenv("NOTIFY_ENVIRONMENT") not in [
+                        "test"
+                    ]:  # we want to test intl support
+                        recipient = f"1{recipient}"
+
                 sender_numbers = get_sender_numbers(notification)
                 if notification.reply_to_text not in sender_numbers:
                     raise ValueError(

migrations/versions/0216_remove_colours.py

@@ -2,7 +2,7 @@
  Revision ID: 0216_remove_colours
 Revises: 0215_email_brand_type
 Create Date: 2018-08-24 13:36:49.346156
- """
+"""
 
 import sqlalchemy as sa
 from alembic import op

migrations/versions/0219_default_email_branding.py

@@ -2,7 +2,7 @@
  Revision ID: 0219_default_email_branding
 Revises: 0216_remove_colours
 Create Date: 2018-08-24 13:36:49.346156
- """
+"""
 
 from alembic import op
 from sqlalchemy import text

migrations/versions/0220_email_brand_type_non_null.py

@@ -2,7 +2,7 @@
  Revision ID: 0220_email_brand_type_non_null
 Revises: 0219_default_email_branding
 Create Date: 2018-08-24 13:36:49.346156
- """
+"""
 
 from alembic import op
 

migrations/versions/0221_nullable_service_branding.py

@@ -2,7 +2,7 @@
  Revision ID: 0221_nullable_service_branding
 Revises: 0220_email_brand_type_non_null
 Create Date: 2018-08-24 13:36:49.346156
- """
+"""
 
 from alembic import op