Merge branch 'develop' into chore.unused.sdk.param.cleanup

rudderlabs · Jul 25, 2023 · 678b858 · 678b858
2 parents 2731418 + 97b6b8f
commit 678b858
Show file tree

Hide file tree

Showing 123 changed files with 2,772 additions and 1,666 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 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.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)
 
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rudder-config-schema",
-  "version": "1.42.1",
+  "version": "1.42.2",
   "description": "",
   "main": "src/index.ts",
   "private": true,

diff --git a/scripts/schemaGenerator.py b/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__':

diff --git a/src/configurations/destinations/adobe_analytics/db-config.json b/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"]
     }
   }
 }
diff --git a/src/configurations/destinations/adobe_analytics/schema.json b/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
   }
 }