darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-23 15:57:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1311 from GSA/fix_commit_hash

Browse Source 
Fix commit hash
This commit is contained in:
Carlo Costino
2024-03-14 16:36:10 -04:00
committed by GitHub
parent a09e813f80 e4087ca9d5
commit 85215f45a8
6 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/deploy-demo.yml vendored
View File

@@ -54,7 +54,7 @@ jobs:
ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }} ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }}
NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }} NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }}
NR_BROWSER_KEY: ${{ secrets.NR_BROWSER_KEY }} NR_BROWSER_KEY: ${{ secrets.NR_BROWSER_KEY }}
COMMIT_HASH: $(git rev-parse --short "$GITHUB_SHA") COMMIT_HASH: ${{ github.sha }}
LOGIN_PEM: ${{ secrets.LOGIN_PEM }} LOGIN_PEM: ${{ secrets.LOGIN_PEM }}
LOGIN_DOT_GOV_CLIENT_ID: "urn:gov:gsa:openidconnect.profiles:sp:sso:gsa:notify-gov" LOGIN_DOT_GOV_CLIENT_ID: "urn:gov:gsa:openidconnect.profiles:sp:sso:gsa:notify-gov"
LOGIN_DOT_GOV_USER_INFO_URL: "https://secure.login.gov/api/openid_connect/userinfo" LOGIN_DOT_GOV_USER_INFO_URL: "https://secure.login.gov/api/openid_connect/userinfo"

2
.github/workflows/deploy-prod.yml vendored
View File

@@ -54,7 +54,7 @@ jobs:
ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }} ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }}
NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }} NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }}
NR_BROWSER_KEY: ${{ secrets.NR_BROWSER_KEY }} NR_BROWSER_KEY: ${{ secrets.NR_BROWSER_KEY }}
COMMIT_HASH: $(git rev-parse --short "$GITHUB_SHA") COMMIT_HASH: ${{ github.sha }}
LOGIN_PEM: ${{ secrets.LOGIN_PEM }} LOGIN_PEM: ${{ secrets.LOGIN_PEM }}
LOGIN_DOT_GOV_CLIENT_ID: "urn:gov:gsa:openidconnect.profiles:sp:sso:gsa:notify-gov" LOGIN_DOT_GOV_CLIENT_ID: "urn:gov:gsa:openidconnect.profiles:sp:sso:gsa:notify-gov"
LOGIN_DOT_GOV_USER_INFO_URL: "https://secure.login.gov/api/openid_connect/userinfo" LOGIN_DOT_GOV_USER_INFO_URL: "https://secure.login.gov/api/openid_connect/userinfo"

2
.github/workflows/deploy.yml vendored
View File

@@ -60,7 +60,7 @@ jobs:
ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }} ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }}
NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }} NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }}
NR_BROWSER_KEY: ${{ secrets.NR_BROWSER_KEY }} NR_BROWSER_KEY: ${{ secrets.NR_BROWSER_KEY }}
COMMIT_HASH: $(git rev-parse --short "$GITHUB_SHA") COMMIT_HASH: ${{ github.sha }}
LOGIN_PEM: ${{ secrets.LOGIN_PEM }} LOGIN_PEM: ${{ secrets.LOGIN_PEM }}
LOGIN_DOT_GOV_CLIENT_ID: "urn:gov:gsa:openidconnect.profiles:sp:sso:gsa:notify-gov" LOGIN_DOT_GOV_CLIENT_ID: "urn:gov:gsa:openidconnect.profiles:sp:sso:gsa:notify-gov"
LOGIN_DOT_GOV_USER_INFO_URL: "https://secure.login.gov/api/openid_connect/userinfo" LOGIN_DOT_GOV_USER_INFO_URL: "https://secure.login.gov/api/openid_connect/userinfo"

2
app/config.py
View File

@@ -36,7 +36,7 @@ class Config(object):
NR_BROWSER_KEY = getenv("NR_BROWSER_KEY") NR_BROWSER_KEY = getenv("NR_BROWSER_KEY")
settings = newrelic.agent.global_settings() settings = newrelic.agent.global_settings()
NR_MONITOR_ON = settings and settings.monitor_mode NR_MONITOR_ON = settings and settings.monitor_mode
COMMIT_HASH = getenv("COMMIT_HASH", "-----") COMMIT_HASH = getenv("COMMIT_HASH", "--------")[0:7]
TEMPLATE_PREVIEW_API_HOST = getenv( TEMPLATE_PREVIEW_API_HOST = getenv(
"TEMPLATE_PREVIEW_API_HOST", "http://localhost:9999" "TEMPLATE_PREVIEW_API_HOST", "http://localhost:9999"

4
app/main/views/send.py
View File

@@ -524,7 +524,9 @@ def _check_messages(service_id, template_id, upload_id, preview_row):
for user in Users(service_id): for user in Users(service_id):
allow_list.extend([user.name, user.mobile_number, user.email_address]) allow_list.extend([user.name, user.mobile_number, user.email_address])
# Failed sms number # Failed sms number
allow_list.extend(["simulated user (fail)", "+14254147167", "simulated@simulated.gov"]) allow_list.extend(
["simulated user (fail)", "+14254147167", "simulated@simulated.gov"]
)
# Success sms number # Success sms number
allow_list.extend( allow_list.extend(
["simulated user (success)", "+14254147755", "simulatedtwo@simulated.gov"] ["simulated user (success)", "+14254147755", "simulatedtwo@simulated.gov"]

7
tests/app/test_utils.py
View File

@@ -1,4 +1,5 @@
import pytest import pytest
from flask import current_app
from app.utils import merge_jsonlike from app.utils import merge_jsonlike
@@ -49,3 +50,9 @@ def test_merge_jsonlike_merges_jsonlike_objects_correctly(
): ):
merge_jsonlike(source_object, destination_object) merge_jsonlike(source_object, destination_object)
assert source_object == expected_result assert source_object == expected_result
def test_commit_hash():
# Assert that we have trimmed the default (unknown) commit hash to seven characters
# The real commit hash is supplied at deploy time.
assert current_app.config["COMMIT_HASH"] == "-------"