From b136ffe474ae33cccb19662f11e88cba051411ae Mon Sep 17 00:00:00 2001 From: kjijo Date: Thu, 7 Aug 2025 09:54:46 -0500 Subject: [PATCH 1/3] XMS edit update --- app/api/management/utils/api_helper_functions.py | 10 ++++++++-- app/core/management/utils/xss_client.py | 3 ++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/api/management/utils/api_helper_functions.py b/app/api/management/utils/api_helper_functions.py index 7299347..e10d3fa 100644 --- a/app/api/management/utils/api_helper_functions.py +++ b/app/api/management/utils/api_helper_functions.py @@ -31,7 +31,10 @@ def add_metadata_ledger(data, experience_id): data['unique_record_identifier'] = str(uuid.uuid4()) # sorting the metadata for consistency - data['metadata'] = multi_dict_sort(data['metadata']) + if 'metadata' in data: + data['metadata'] = multi_dict_sort(data['metadata']) + else: + data['metadata'] = {} # create hash values of metadata and supplemental data metadata_hash = hashlib.sha512(str(data['metadata']).encode( @@ -78,7 +81,10 @@ def add_supplemental_ledger(data, experience_id): data['unique_record_identifier'] = str(uuid.uuid4()) # sorting the metadata for consistency - data['metadata'] = multi_dict_sort(data['metadata']) + if 'metadata' in data: + data['metadata'] = multi_dict_sort(data['metadata']) + else: + data['metadata'] = {} # create hash values of metadata and supplemental data supplemental_hash = hashlib.sha512(str(data['metadata']) diff --git a/app/core/management/utils/xss_client.py b/app/core/management/utils/xss_client.py index 7f46178..3ce8309 100644 --- a/app/core/management/utils/xss_client.py +++ b/app/core/management/utils/xss_client.py @@ -106,7 +106,8 @@ def get_data_types_for_validation(): datatype_to_object = { "int": int, "str": str, - "bool": bool + "bool": bool, + "URI": str } expected_data_types = dict() From 9f3949758483fddf2f91eb769e65ee3e8a1dadaa Mon Sep 17 00:00:00 2001 From: kjijo Date: Thu, 7 Aug 2025 10:32:32 -0500 Subject: [PATCH 2/3] sonar update --- .github/workflows/cd-workflows.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/cd-workflows.yml b/.github/workflows/cd-workflows.yml index b0b1e99..90a76f3 100644 --- a/.github/workflows/cd-workflows.yml +++ b/.github/workflows/cd-workflows.yml @@ -52,18 +52,18 @@ jobs: echo "Running coverage unit test" docker compose --env-file ./.env run app_xis sh -c "python manage.py waitdb && coverage run manage.py test --tag=unit && flake8 && coverage report && coverage report --fail-under=80" - sonarcloud: - name: SonarCloud - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - - name: SonarCloud Scan - uses: SonarSource/sonarcloud-github-action@master - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + # sonarcloud: + # name: SonarCloud + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v2 + # with: + # fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis + # - name: SonarCloud Scan + # uses: SonarSource/sonarcloud-github-action@master + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any + # SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} build: # requires dependency from step above From a52fb2793ad15b2798400441be48659e22e3244a Mon Sep 17 00:00:00 2001 From: kjijo Date: Thu, 7 Aug 2025 10:45:12 -0500 Subject: [PATCH 3/3] Updated Base --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b1e3bb6..9ae7cab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # Dockerfile -FROM python:3.9-buster +FROM python:3.9-bookworm # install nginx