Merge branch 'develop' into feat.hs-newUI

CHANGELOG.md

@@ -2,6 +2,22 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.43.0](https://github.com/rudderlabs/rudder-config-schema/compare/v1.42.2...v1.43.0) (2023-07-24)
+
+
+### Features
+
+* **mixpanel:** add strict mode setting ([#753](https://github.com/rudderlabs/rudder-config-schema/issues/753)) ([626924d](https://github.com/rudderlabs/rudder-config-schema/commit/626924d2597926662d9093698bf20402ee046896))
+* moved adobe analytics to new UI ([#759](https://github.com/rudderlabs/rudder-config-schema/issues/759)) ([fc1569e](https://github.com/rudderlabs/rudder-config-schema/commit/fc1569eab8932586676432f014d0c87333f43119))
+* **stormly:** onboard new destiantion ([#769](https://github.com/rudderlabs/rudder-config-schema/issues/769)) ([f7767ee](https://github.com/rudderlabs/rudder-config-schema/commit/f7767eebef5d03d2a4be47286b5745087ca39a8d))
+* updated db config ([#787](https://github.com/rudderlabs/rudder-config-schema/issues/787)) ([34bb15f](https://github.com/rudderlabs/rudder-config-schema/commit/34bb15f0f85397d6a2cfff2004cc91ca33be7ec5))
+* **intercom:** feat(intercom): add config in dashboard to updateLastRequestAt ([b68bc14](https://github.com/rudderlabs/rudder-config-schema/commit/b68bc1489328cf9dd314a62b0c9a03e7cbbc075d))
+
+### Bug Fixes
+
+* fix schema incosistency ([#697](https://github.com/rudderlabs/rudder-config-schema/issues/697)) ([66e1259](https://github.com/rudderlabs/rudder-config-schema/commit/66e12590d625c879b264e4529f6e6561f3c89408))
+* schema inconsistency ([#761](https://github.com/rudderlabs/rudder-config-schema/issues/761)) ([9c2dfa0](https://github.com/rudderlabs/rudder-config-schema/commit/9c2dfa0ccf17bb0002cff9738dfb4b722771152c))
+
 ### [1.42.2](https://github.com/rudderlabs/rudder-config-schema/compare/v1.42.1...v1.42.2) (2023-07-19)
 
 ### [1.42.1](https://github.com/rudderlabs/rudder-config-schema/compare/v1.42.0...v1.42.1) (2023-07-14)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rudder-config-schema",
-  "version": "1.42.2",
+  "version": "1.43.0",
   "description": "",
   "main": "src/index.ts",
   "private": true,

scripts/schemaGenerator.py

@@ -17,6 +17,8 @@
 
 CONFIG_DIR = 'src/configurations'
 
+EXCLUDED_DEST = ['postgres']
+
 class FieldTypeEnum(Enum):
     STRING = "string"
     OBJECT = "object"
@@ -1002,7 +1004,8 @@ def get_schema_diff(name, selector):
     uiConfig = file_content.get("uiConfig")
     schema = file_content.get("configSchema")
     dbConfig = file_content.get("config")
-    validate_config_consistency(name, selector, uiConfig, dbConfig, schema)
+    if name not in EXCLUDED_DEST:
+        validate_config_consistency(name, selector, uiConfig, dbConfig, schema)
 
 
 if __name__ == '__main__':

src/configurations/destinations/adobe_analytics/db-config.json

@@ -37,7 +37,8 @@
       "blacklistedEvents",
       "whitelistedEvents",
       "oneTrustCookieCategories",
-      "eventFilteringOption"
+      "eventFilteringOption",
+      "connectionMode"
     ],
     "excludeKeys": [],
     "supportedSourceTypes": [
@@ -52,6 +53,11 @@
       "flutter",
       "cordova"
     ],
+    "supportedConnectionModes": {
+      "web": ["cloud", "device"],
+      "android": ["cloud", "device"],
+      "ios": ["cloud", "device"]
+    },
     "destConfig": {
       "defaultConfig": [
         "trackingServerUrl",
@@ -90,9 +96,9 @@
         "eventFilteringOption",
         "oneTrustCookieCategories"
       ],
-      "web": ["useNativeSDK"],
-      "android": ["useNativeSDK"],
-      "ios": ["useNativeSDK"]
+      "web": ["useNativeSDK", "connectionMode"],
+      "android": ["useNativeSDK", "connectionMode"],
+      "ios": ["useNativeSDK", "connectionMode"]
     }
   }
 }

src/configurations/destinations/adobe_analytics/schema.json

@@ -176,20 +176,8 @@
             "to": {
               "type": "string",
               "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
-            }
-          }
-        }
-      },
-      "listDelimiter": {
-        "type": "array",
-        "items": {
-          "type": "object",
-          "properties": {
-            "from": {
-              "type": "string",
-              "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
             },
-            "to": { "type": "string", "enum": ["|", ":", ",", ";", "/", ""] }
+            "delimiter": { "type": "string", "enum": ["|", ":", ",", ";", "/", ""] }
           }
         }
       },
@@ -205,20 +193,8 @@
             "to": {
               "type": "string",
               "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
-            }
-          }
-        }
-      },
-      "propsDelimiter": {
-        "type": "array",
-        "items": {
-          "type": "object",
-          "properties": {
-            "from": {
-              "type": "string",
-              "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
             },
-            "to": { "type": "string", "enum": ["|", ":", ",", ";", "/", ""] }
+            "delimiter": { "type": "string", "enum": ["|", ":", ",", ";", "/", ""] }
           }
         }
       },
@@ -303,6 +279,14 @@
           "web": { "type": "boolean" }
         }
       },
+      "connectionMode": {
+        "type": "object",
+        "properties": {
+          "android": { "type": "string", "enum": ["cloud", "device"] },
+          "ios": { "type": "string", "enum": ["cloud", "device"] },
+          "web": { "type": "string", "enum": ["cloud", "device"] }
+        }
+      },
       "eventFilteringOption": {
         "type": "string",
         "enum": ["disable", "whitelistedEvents", "blacklistedEvents"],
@@ -345,6 +329,6 @@
         }
       }
     },
-    "additionalProperties": false
+    "additionalProperties": true
   }
 }