chore(release): pull release/v1.46.0 into main

CHANGELOG.md

@@ -2,6 +2,25 @@
 
 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.46.0](https://github.com/rudderlabs/rudder-config-schema/compare/v1.45.2...v1.46.0) (2023-08-21)
+
+
+### Features
+
+* add flattenproperty field ([3a2b3e1](https://github.com/rudderlabs/rudder-config-schema/commit/3a2b3e191b657b7d2bb2629c6ac882f557c054e4))
+* add support for test events for Pinterest ([#811](https://github.com/rudderlabs/rudder-config-schema/issues/811)) ([85132bb](https://github.com/rudderlabs/rudder-config-schema/commit/85132bb3328468837c85e4225a8a290bc8ed7d6a))
+* enable blueshift for rETL ([#842](https://github.com/rudderlabs/rudder-config-schema/issues/842)) ([34e07a1](https://github.com/rudderlabs/rudder-config-schema/commit/34e07a189f7899c850d4ab14de14bb6b0bc1ac82))
+* **INT-151:** moving clevertap to router ([#831](https://github.com/rudderlabs/rudder-config-schema/issues/831)) ([c8dbf49](https://github.com/rudderlabs/rudder-config-schema/commit/c8dbf4918872acf01abce141e14d107ae2f4b873))
+* **INT-319:** update label to support v2 api token ([#829](https://github.com/rudderlabs/rudder-config-schema/issues/829)) ([b2ddb5d](https://github.com/rudderlabs/rudder-config-schema/commit/b2ddb5d9a7afd8ce87d8840b6f55801dfe49d49a))
+
+
+### Bug Fixes
+
+* add flattenProperty field ([3d7c9e7](https://github.com/rudderlabs/rudder-config-schema/commit/3d7c9e7525e4c7e107aeaf9e52dbc1739d92f2a8))
+* re-add removed schema for consent ([421d7c9](https://github.com/rudderlabs/rudder-config-schema/commit/421d7c94d9533b85f4884b3da182da6e3865c403))
+* updated with defaults for boolean fields in zendesk schema.json ([b7df821](https://github.com/rudderlabs/rudder-config-schema/commit/b7df821de6014bb4697620db1c0f19524780a080))
+* update supportedSourceTypes ([b00ab34](https://github.com/rudderlabs/rudder-config-schema/commit/b00ab34899bfe84a5afb71a0a1054c59dd5ddfea))
+
 ### [1.45.2](https://github.com/rudderlabs/rudder-config-schema/compare/v1.45.1...v1.45.2) (2023-08-16)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rudder-config-schema",
-  "version": "1.45.2",
+  "version": "1.46.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/af/ui-config.json

@@ -135,7 +135,7 @@
           "value": "apiToken",
           "placeholder": "c81aaf36-8323-4bb6-b5a8-asdfasdfas4f3c",
           "secret": true,
-          "footerNote": "Provide your V1.0 API Token."
+          "footerNote": "Provide your V2.0 API Token."
         }
       ]
     },

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

@@ -41,9 +41,7 @@
       "oneTrustCookieCategories",
       "eventFilteringOption",
       "mapDeviceBrand",
-      "residencyServer",
-      "userProvidedPageEventString",
-      "useUserDefinedPageEventName"
+      "residencyServer"
     ],
     "excludeKeys": [],
     "supportedSourceTypes": [

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

@@ -10,10 +10,17 @@
     ],
     "excludeKeys": [],
     "supportedSourceTypes": [
+      "android",
+      "ios",
+      "unity",
+      "amp",
+      "reactnative",
+      "flutter",
+      "cordova",
       "web",
       "cloud",
-      "mobile",
-      "shopify"
+      "shopify",
+      "warehouse"
     ],
     "supportedMessageTypes": [
       "identify",

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

@@ -8,7 +8,6 @@
     "includeKeys": [
       "apiKey",
       "releaseStage",
-      "ssl",
       "blacklistedEvents",
       "whitelistedEvents",
       "oneTrustCookieCategories",
@@ -26,7 +25,7 @@
       ],
       "android": ["useNativeSDK"],
       "ios": ["useNativeSDK"],
-      "web": ["useNativeSDK", "releaseStage", "ssl"]
+      "web": ["useNativeSDK", "releaseStage"]
     },
     "secretKeys": ["apiKey"]
   }

src/configurations/destinations/bugsnag/ui-config.json

@@ -87,12 +87,6 @@
           "type": "checkbox",
           "label": "Release Stage. If turned on : Development stage else : Production",
           "value": "releaseStage"
-        },
-        {
-          "type": "checkbox",
-          "label": "SSL",
-          "value": "ssl",
-          "default": true
         }
       ]
     },

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

@@ -2,16 +2,14 @@
   "name": "CLEVERTAP",
   "displayName": "CleverTap",
   "config": {
-    "transformAt": "processor",
-    "transformAtV1": "processor",
+    "transformAt": "router",
+    "transformAtV1": "router",
     "saveDestinationResponse": true,
     "includeKeys": [
       "accountId",
       "accountToken",
       "passcode",
       "region",
-      "trackAnonymous",
-      "enableObjectIdMapping",
       "blacklistedEvents",
       "whitelistedEvents",
       "oneTrustCookieCategories",

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

@@ -18,7 +18,6 @@
       "whitelistedEvents",
       "oneTrustCookieCategories",
       "eventFilteringOption",
-      "removeExternalId",
       "useUpdatedMapping",
       "ketchConsentPurposes"
     ],

src/configurations/destinations/hs/schema.json

@@ -1,68 +1,24 @@
 {
   "configSchema": {
     "$schema": "http://json-schema.org/draft-07/schema#",
+    "required": [],
     "type": "object",
     "properties": {
-      "authorizationType": {
-        "type": "string",
-        "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(legacyApiKey|newPrivateAppApi)$"
-      },
       "hubID": {
         "type": "string",
         "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
       },
-      "apiKey": {
-        "type": "string",
-        "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
-      },
-      "accessToken": {
-        "type": "string",
-        "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
-      },
-      "apiVersion": {
-        "type": "string",
-        "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(legacyApi|newApi)$"
-      },
-      "lookupField": {
+      "authorizationType": {
         "type": "string",
-        "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
-      },
-      "hubspotEvents": {
-        "type": "array",
-        "items": {
-          "type": "object",
-          "properties": {
-            "rsEventName": {
-              "type": "string",
-              "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
-            },
-            "hubspotEventName": {
-              "type": "string",
-              "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
-            },
-            "eventProperties": {
-              "type": "array",
-              "items": {
-                "type": "object",
-                "properties": {
-                  "from": {
-                    "type": "string",
-                    "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
-                  },
-                  "to": {
-                    "type": "string",
-                    "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
-                  }
-                }
-              }
-            }
-          }
-        }
+        "enum": ["legacyApiKey", "newPrivateAppApi"],
+        "default": "legacyApiKey"
       },
+      "apiVersion": { "type": "string", "enum": ["legacyApi", "newApi"], "default": "legacyApi" },
       "useNativeSDK": { "type": "object", "properties": { "web": { "type": "boolean" } } },
       "eventFilteringOption": {
         "type": "string",
-        "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(disable|whitelistedEvents|blacklistedEvents)$"
+        "enum": ["disable", "whitelistedEvents", "blacklistedEvents"],
+        "default": "disable"
       },
       "whitelistedEvents": {
         "type": "array",
@@ -100,6 +56,83 @@
           }
         }
       }
-    }
+    },
+    "allOf": [
+      {
+        "if": {
+          "properties": { "authorizationType": { "const": "legacyApiKey" } },
+          "required": ["authorizationType"]
+        },
+        "then": {
+          "properties": {
+            "apiKey": {
+              "type": "string",
+              "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$"
+            }
+          },
+          "required": ["apiKey"]
+        }
+      },
+      {
+        "if": {
+          "properties": { "authorizationType": { "const": "newPrivateAppApi" } },
+          "required": ["authorizationType"]
+        },
+        "then": {
+          "properties": {
+            "accessToken": {
+              "type": "string",
+              "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$"
+            }
+          },
+          "required": ["accessToken"]
+        }
+      },
+      {
+        "if": { "properties": { "apiVersion": { "const": "newApi" } }, "required": ["apiVersion"] },
+        "then": {
+          "properties": {
+            "lookupField": {
+              "type": "string",
+              "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$"
+            },
+            "doAssociation": { "type": "boolean", "default": false },
+            "hubspotEvents": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "rsEventName": {
+                    "type": "string",
+                    "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
+                  },
+                  "hubspotEventName": {
+                    "type": "string",
+                    "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
+                  },
+                  "eventProperties": {
+                    "type": "array",
+                    "items": {
+                      "type": "object",
+                      "properties": {
+                        "from": {
+                          "type": "string",
+                          "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
+                        },
+                        "to": {
+                          "type": "string",
+                          "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "required": ["lookupField"]
+        }
+      }
+    ]
   }
 }

src/configurations/destinations/hs/ui-config.json

@@ -7,7 +7,7 @@
           "type": "textInput",
           "label": "Hub ID",
           "value": "hubID",
-          "regex": "^(.{0,100})$",
+          "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$",
           "regexErrorMessage": "Invalid Hub ID",
           "required": false,
           "placeholder": "e.g: 748991",
@@ -39,7 +39,7 @@
           },
           "label": "API Key",
           "value": "apiKey",
-          "regex": "^(.{0,100})$",
+          "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$",
           "regexErrorMessage": "Invalid API Key",
           "required": true,
           "placeholder": "e.g: 05afa518-132c-40db-830a-de0f688902f7",
@@ -53,7 +53,7 @@
           },
           "label": "Access Token",
           "value": "accessToken",
-          "regex": "^(.{0,100})$",
+          "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$",
           "regexErrorMessage": "Invalid Access Token",
           "required": true,
           "placeholder": "e.g: pat-eu1-kjg875ya-9de4-98uu-8171-62875ht847r9",
@@ -85,7 +85,7 @@
           },
           "label": "Hubspot property name to be used as lookup field",
           "value": "lookupField",
-          "regex": "^(.{0,100})$",
+          "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$",
           "regexErrorMessage": "Invalid Property Name",
           "required": true,
           "placeholder": "e.g: lookupField",
@@ -114,7 +114,7 @@
               "type": "textInput",
               "label": "RudderStack Event Name",
               "value": "rsEventName",
-              "regex": "^(.{0,100})$",
+              "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$",
               "required": false,
               "placeholder": "e.g Products Searched",
               "footerNote": "Enter the RudderStack event name you want to map"
@@ -123,7 +123,7 @@
               "type": "textInput",
               "label": "HubSpot Event Name",
               "value": "hubspotEventName",
-              "regex": "^(.{0,100})$",
+              "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$",
               "required": false,
               "placeholder": "e.g Search",
               "footerNote": "Enter the corresponding Hubspot event name you want to map"

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

@@ -40,6 +40,7 @@
         "publicApiKey",
         "privateApiKey",
         "consent",
+        "flattenProperties",
         "listId",
         "enforceEmailAsPrimary",
         "blacklistedEvents",