From 1e302700ededdccf2a53c5de2c93d5d626d8aa1a Mon Sep 17 00:00:00 2001
From: Waqar Ahmed <waqarahmedjoyia@live.com>
Date: Wed, 15 May 2024 06:37:43 +0500
Subject: [PATCH] Make version schema more strict

---
 apps_validation/json_schema_utils.py | 4 +++-
 catalog_reader/app.py                | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps_validation/json_schema_utils.py b/apps_validation/json_schema_utils.py
index 9a14bc5..467a638 100644
--- a/apps_validation/json_schema_utils.py
+++ b/apps_validation/json_schema_utils.py
@@ -285,6 +285,8 @@
                     'pattern': '[0-9]+.[0-9]+.[0-9]+'
                 },
                 'app_metadata': APP_METADATA_JSON_SCHEMA,
+                'readme': {'type': ['string', 'null']},
+                'changelog': {'type': ['string', 'null']},
                 'schema': {
                     'type': 'object',
                     'properties': {
@@ -330,7 +332,7 @@
             },
             'required': [
                 'healthy', 'supported', 'healthy_error', 'location', 'last_update', 'required_features',
-                'human_version', 'version', 'app_metadata', 'schema',
+                'human_version', 'version', 'app_metadata', 'schema', 'readme', 'changelog',
             ],
         },
     },
diff --git a/catalog_reader/app.py b/catalog_reader/app.py
index 4b8a4ba..65d57e2 100644
--- a/catalog_reader/app.py
+++ b/catalog_reader/app.py
@@ -149,7 +149,7 @@ def get_app_version_details(
     for key, filename, parser in (
         ('app_metadata', 'app.yaml', yaml.safe_load),
         ('schema', 'questions.yaml', yaml.safe_load),
-        ('readme', 'README.md', markdown.markdown),  # TODO: Has been changed, make sure json schema accounts for it
+        ('readme', 'README.md', markdown.markdown),
         ('changelog', 'CHANGELOG.md', markdown.markdown),
     ):
         if os.path.exists(os.path.join(version_path, filename)):