🔧 [#728] Update retrieving version info

Author: SilviaAmAm

backend/src/openarchiefbeheer/conf/base.py

@@ -8,7 +8,7 @@
 from celery.schedules import crontab
 from corsheaders.defaults import default_headers
 
-from .utils import config, get_sentry_integrations
+from .utils import config, get_git_sha, get_release, get_sentry_integrations
 
 # Build paths inside the project, so further paths can be defined relative to
 # the code root.
@@ -378,26 +378,17 @@
 # multiple login urls defined.
 LOGIN_URLS = [reverse_lazy("admin:login")]
 
+
 if "GIT_SHA" in os.environ:
     GIT_SHA = config("GIT_SHA", "")
-# in docker (build) context, there is no .git directory
-elif (BASE_DIR / ".git").exists():
-    try:
-        import git
-    except ImportError:
-        GIT_SHA = None
-    else:
-        repo = git.Repo(search_parent_directories=True)
-        try:
-            GIT_SHA = repo.head.object.hexsha
-        except (
-            ValueError
-        ):  # on startproject initial runs before any git commits have been made
-            GIT_SHA = repo.active_branch.name
 else:
-    GIT_SHA = None
+    GIT_SHA = get_git_sha()
+
+if "RELEASE" in os.environ:
+    RELEASE = config("RELEASE", "")
+else:
+    RELEASE = get_release() or GIT_SHA
 
-RELEASE = config("RELEASE", GIT_SHA)
 
 REQUESTS_READ_TIMEOUT = config("REQUESTS_READ_TIMEOUT", 30)
 # Default (connection timeout, read timeout) for the requests library (in seconds)

backend/src/openarchiefbeheer/conf/utils.py

@@ -48,3 +48,38 @@ def get_sentry_integrations() -> list:
         extra.append(celery.CeleryIntegration())
 
     return [*default, *extra]
+
+
+def get_git_sha() -> str:
+    from git import InvalidGitRepositoryError, Repo
+
+    try:
+        # in docker (build) context, there is no .git directory
+        repo = Repo(search_parent_directories=True)
+    except InvalidGitRepositoryError:
+        return ""
+
+    try:
+        return repo.head.object.hexsha
+    except (
+        ValueError
+    ):  # on startproject initial runs before any git commits have been made
+        return repo.active_branch.name
+
+
+def get_release() -> str:
+    from git import InvalidGitRepositoryError, Repo
+
+    try:
+        # in docker (build) context, there is no .git directory
+        repo = Repo(search_parent_directories=True)
+    except InvalidGitRepositoryError:
+        return ""
+
+    if not len(repo.tags):
+        return ""
+
+    current_tag = next(
+        (tag for tag in repo.tags if tag.commit == repo.head.commit), None
+    )
+    return current_tag.name if current_tag else ""