From 3aacdcb3ef9c609d3824a2adb21856d1bd4c24ea Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Thu, 14 Mar 2024 13:25:02 -0700
Subject: [PATCH] fix_commit_hash

---
 .github/workflows/deploy-demo.yml | 2 +-
 .github/workflows/deploy-prod.yml | 2 +-
 .github/workflows/deploy.yml      | 2 +-
 app/config.py                     | 2 +-
 tests/app/test_utils.py           | 5 +++++
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/deploy-demo.yml b/.github/workflows/deploy-demo.yml
index 65384ac81..139c8c4c4 100644
--- a/.github/workflows/deploy-demo.yml
+++ b/.github/workflows/deploy-demo.yml
@@ -54,7 +54,7 @@ jobs:
           ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }}
           NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_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_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"
diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml
index de0c5714d..683ec5b70 100644
--- a/.github/workflows/deploy-prod.yml
+++ b/.github/workflows/deploy-prod.yml
@@ -54,7 +54,7 @@ jobs:
           ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }}
           NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_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_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"
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index cbb7b9bb7..f620bd662 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -60,7 +60,7 @@ jobs:
           ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }}
           NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_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_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"
diff --git a/app/config.py b/app/config.py
index 4328f4a75..ba89ce6bf 100644
--- a/app/config.py
+++ b/app/config.py
@@ -36,7 +36,7 @@ class Config(object):
     NR_BROWSER_KEY = getenv("NR_BROWSER_KEY")
     settings = newrelic.agent.global_settings()
     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", "http://localhost:9999"
diff --git a/tests/app/test_utils.py b/tests/app/test_utils.py
index 4da7e8718..40a10cfb5 100644
--- a/tests/app/test_utils.py
+++ b/tests/app/test_utils.py
@@ -49,3 +49,8 @@ def test_merge_jsonlike_merges_jsonlike_objects_correctly(
 ):
     merge_jsonlike(source_object, destination_object)
     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"] == "-------"