Merge pull request #329 from meaningfy-ws/feature/MWB-838

Updated app version provider

Makefile

@@ -13,6 +13,8 @@ FRONTEND_INFRA_FOLDER := ${PROJECT_PATH}/${FRONTEND_HOME}
 
 RML_MAPPER_PATH = ${PROJECT_PATH}/.rmlmapper/rmlmapper.jar
 
+PYTHON := python3
+APP_VERSION_SCRIPT := ${BACKEND_INFRA_FOLDER}/core/scripts/get_app_version.py
 
 #-----------------------------------------------------------------------------
 # INSTALLING
@@ -245,3 +247,10 @@ init-rml-mapper:
 setup-env-paths:
 	@ perl -i -ne 'print unless /^RML_MAPPER_PATH/' ${ENV_FILE}
 	@ echo RML_MAPPER_PATH=${RML_MAPPER_PATH} >> ${ENV_FILE}
+
+add-app-version:
+	@ perl -i -ne 'print unless /^MW_APP_VERSION/' ${ENV_FILE}
+	@ echo MW_APP_VERSION=$$($(PYTHON) $(APP_VERSION_SCRIPT)) >> ${ENV_FILE}
+
+prepare-env-deploy: add-app-version
+	@ echo "Prepared ENV Deploy"

infra/backend/Dockerfile

@@ -17,6 +17,7 @@ COPY ./mapping_workbench/backend ./mapping_workbench/backend
 COPY ./requirements.txt ./
 COPY ./Makefile ./
 COPY ./.env ./
+RUN make prepare-env-deploy
 
 RUN make install-backend
 

mapping_workbench/backend/config/__init__.py

@@ -14,6 +14,10 @@ class AppSettings(BaseSettings):
     def APP_NAME(self, config_value: str) -> str:
         return config_value
 
+    @env_property(config_key='MW_APP_VERSION')
+    def APP_VERSION(self, config_value: str) -> str:
+        return config_value
+
     @env_property(config_key='MW_APP_DEBUG_MODE')
     def DEBUG_MODE(self, config_value: str) -> bool:
         return config_value == '1'

mapping_workbench/backend/core/entrypoints/api/routes.py

@@ -1,8 +1,8 @@
 from fastapi import APIRouter, Request
 from fastapi.responses import JSONResponse
-from mapping_workbench.backend.core.models.api_response import AppSettingsResponse
 
-from mapping_workbench.backend.core.services.app import get_current_app_version
+from mapping_workbench.backend.config import settings
+from mapping_workbench.backend.core.models.api_response import AppSettingsResponse
 
 router = APIRouter()
 
@@ -24,5 +24,5 @@ async def index(request: Request) -> JSONResponse:
 )
 async def app_settings() -> AppSettingsResponse:
     return AppSettingsResponse(
-        version=get_current_app_version()
+        version=settings.APP_VERSION
     )

mapping_workbench/backend/core/scripts/get_app_version.py

@@ -0,0 +1,37 @@
+import subprocess
+
+
+def get_current_app_tag():
+    try:
+        # Get the tag of the current commit (if any)
+        current_tag = subprocess.check_output(["git", "describe", "--exact-match", "--tags"]).strip().decode('utf-8')
+        return current_tag
+    except subprocess.CalledProcessError as e:
+        return None
+
+
+def get_current_app_branch():
+    try:
+        return subprocess.check_output(["git", "rev-parse", "--abbrev-ref", "HEAD"]).strip().decode('utf-8')
+    except subprocess.CalledProcessError:
+        return None
+
+
+def get_current_app_tag_or_branch():
+    tag = get_current_app_tag()
+    if tag:
+        return tag
+    else:
+        branch = get_current_app_branch()
+        if branch:
+            return branch
+        else:
+            return None
+
+
+def get_current_app_version():
+    return get_current_app_tag_or_branch()
+
+
+if __name__ == "__main__":
+    print(get_current_app_version())

mapping_workbench/backend/core/services/app.py

@@ -1,32 +0,0 @@
-import subprocess
-
-
-def get_current_app_tag():
-    try:
-        # Get the tag of the current commit (if any)
-        current_tag = subprocess.check_output(["git", "describe", "--exact-match", "--tags"]).strip().decode('utf-8')
-        return current_tag
-    except subprocess.CalledProcessError as e:
-        return None
-
-
-def get_current_app_branch():
-    try:
-        return subprocess.check_output(["git", "rev-parse", "--abbrev-ref", "HEAD"]).strip().decode('utf-8')
-    except subprocess.CalledProcessError:
-        return None
-
-
-def get_current_app_tag_or_branch():
-    tag = get_current_app_tag()
-    if tag:
-        return tag
-    else:
-        branch = get_current_app_branch()
-        if branch:
-            return branch
-        else:
-            return None
-
-def get_current_app_version():
-    return get_current_app_tag_or_branch()