fix: references on merge, formatting

Signed-off-by: Sai Sankeerth <[email protected]>
rudderlabs · Feb 9, 2024 · df51c1e · df51c1e
1 parent db44c3b
commit df51c1e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/scripts/schemaGenerator.py b/scripts/schemaGenerator.py
@@ -1234,7 +1234,7 @@ def generate_warnings_for_each_type(uiConfig, dbConfig, schema, curUiType):
                         newSchemaField = uiTypetoSchemaFn.get(curUiType)(
                             field, dbConfig, "configKey"
                         )
-                        schemaDiff = diff(newSchemaField, curSchemaField)
+                        schemaDiff = get_json_diff(newSchemaField, curSchemaField)
                         if schemaDiff:
                             warnings.warn(
                                 "For type:{} field:{} Difference is : \n\n {} \n".format(
@@ -1259,7 +1259,7 @@ def generate_warnings_for_each_type(uiConfig, dbConfig, schema, curUiType):
                         newSchemaField = uiTypetoSchemaFn.get(curUiType)(
                             field, dbConfig, "configKey"
                         )
-                        schemaDiff = diff(newSchemaField, curSchemaField)
+                        schemaDiff = get_json_diff(newSchemaField, curSchemaField)
                         if schemaDiff:
                             warnings.warn(
                                 "For type:{} field:{} Difference is : \n\n {} \n".format(

diff --git a/test/component_tests/configurations/destinations/update_schema_dest/schema.json b/test/component_tests/configurations/destinations/update_schema_dest/schema.json
@@ -1,7 +1,7 @@
 {
   "configSchema": {
     "$schema": "http://json-schema.org/draft-07/schema#",
-    "required": ["secretTextInputField"],
+    "required": ["secretTextInputField", "singleSelectField"],
     "type": "object",
     "properties": {
       "secretTextInputField": {
@@ -26,7 +26,8 @@
         "type": "object",
         "properties": {
           "android": {
-            "type": "string"
+            "type": "string",
+            "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^([0-9]{0,100})$"
           }
         }
       },
@@ -35,6 +36,9 @@
         "properties": {
           "android": {
             "type": "boolean"
+          },
+          "web": {
+            "type": "boolean"
           }
         }
       },
@@ -86,6 +90,10 @@
             "enum": ["cloud"]
           }
         }
+      },
+      "checkboxField": {
+        "type": "boolean",
+        "default": true
       }
     }
   }