diff --git a/CHANGELOG.md b/CHANGELOG.md index 019adaf48..4bffc903f 100644 --- 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.43.1](https://github.com/rudderlabs/rudder-config-schema/compare/v1.43.0...v1.43.1) (2023-07-28) + ## [1.43.0](https://github.com/rudderlabs/rudder-config-schema/compare/v1.42.2...v1.43.0) (2023-07-24) diff --git a/package-lock.json b/package-lock.json index 874fa0d8e..22b73123f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rudder-config-schema", - "version": "1.43.0", + "version": "1.43.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "rudder-config-schema", - "version": "1.43.0", + "version": "1.43.1", "license": "MIT", "dependencies": { "ajv": "^8.12.0", diff --git a/package.json b/package.json index a8e1248f7..98312b657 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rudder-config-schema", - "version": "1.43.0", + "version": "1.43.1", "description": "", "main": "src/index.ts", "private": true, diff --git a/scripts/schemaGenerator.py b/scripts/schemaGenerator.py index 280809a65..7a196bca8 100644 --- a/scripts/schemaGenerator.py +++ b/scripts/schemaGenerator.py @@ -17,8 +17,6 @@ CONFIG_DIR = 'src/configurations' -EXCLUDED_DEST = ['postgres'] - class FieldTypeEnum(Enum): STRING = "string" OBJECT = "object" @@ -1004,8 +1002,7 @@ def get_schema_diff(name, selector): uiConfig = file_content.get("uiConfig") schema = file_content.get("configSchema") dbConfig = file_content.get("config") - if name not in EXCLUDED_DEST: - validate_config_consistency(name, selector, uiConfig, dbConfig, schema) + validate_config_consistency(name, selector, uiConfig, dbConfig, schema) if __name__ == '__main__': diff --git a/src/configurations/destinations/hs/schema.json b/src/configurations/destinations/hs/schema.json index 0a6a56528..fdb5997ad 100644 --- a/src/configurations/destinations/hs/schema.json +++ b/src/configurations/destinations/hs/schema.json @@ -1,24 +1,68 @@ { "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})$" }, - "authorizationType": { + "apiKey": { "type": "string", - "enum": ["legacyApiKey", "newPrivateAppApi"], - "default": "legacyApiKey" + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + }, + "accessToken": { + "type": "string", + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + }, + "apiVersion": { + "type": "string", + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(legacyApi|newApi)$" + }, + "lookupField": { + "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})$" + } + } + } + } + } + } }, - "apiVersion": { "type": "string", "enum": ["legacyApi", "newApi"], "default": "legacyApi" }, "useNativeSDK": { "type": "object", "properties": { "web": { "type": "boolean" } } }, "eventFilteringOption": { "type": "string", - "enum": ["disable", "whitelistedEvents", "blacklistedEvents"], - "default": "disable" + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(disable|whitelistedEvents|blacklistedEvents)$" }, "whitelistedEvents": { "type": "array", @@ -56,83 +100,6 @@ } } } - }, - "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"] - } - } - ] + } } } diff --git a/src/configurations/destinations/hs/ui-config.json b/src/configurations/destinations/hs/ui-config.json index d02ab3e55..fb1b734c1 100644 --- a/src/configurations/destinations/hs/ui-config.json +++ b/src/configurations/destinations/hs/ui-config.json @@ -7,7 +7,7 @@ "type": "textInput", "label": "Hub ID", "value": "hubID", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid Hub ID", "required": false, "placeholder": "e.g: 748991", @@ -39,7 +39,7 @@ }, "label": "API Key", "value": "apiKey", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{0,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": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{0,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": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid Property Name", "required": true, "placeholder": "e.g: lookupField", @@ -114,7 +114,7 @@ "type": "textInput", "label": "RudderStack Event Name", "value": "rsEventName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", + "regex": "^(.{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": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", + "regex": "^(.{0,100})$", "required": false, "placeholder": "e.g Search", "footerNote": "Enter the corresponding Hubspot event name you want to map" diff --git a/src/configurations/destinations/pinterest_tag/schema.json b/src/configurations/destinations/pinterest_tag/schema.json index 6b71c7877..9e278fad2 100644 --- a/src/configurations/destinations/pinterest_tag/schema.json +++ b/src/configurations/destinations/pinterest_tag/schema.json @@ -1,61 +1,66 @@ { "configSchema": { "$schema": "http://json-schema.org/draft-07/schema#", - "required": [], "type": "object", "properties": { "tagId": { "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^[0-9]*$" }, + "advertiserId": { + "type": "string", + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^[0-9]*$" + }, "appId": { "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^[0-9]*$" }, - "apiVersion": { "type": "string", "enum": ["legacyApi", "newApi"], "default": "legacyApi" }, - "sendingUnHashedData": { "type": "boolean", "default": true }, - "enableDeduplication": { "type": "boolean", "default": false }, - "enhancedMatch": { "type": "boolean", "default": true }, - "sendExternalId": { "type": "boolean", "default": false }, - "sendAsCustomEvent": { "type": "boolean", "default": false }, - "customProperties": { + "apiVersion": { + "type": "string", + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(legacyApi|newApi)$" + }, + "adAccountId": { + "type": "string", + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^[0-9]*$" + }, + "conversionToken": { + "type": "string", + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,101})$" + }, + "sendingUnHashedData": { "type": "boolean" }, + "enableDeduplication": { "type": "boolean" }, + "deduplicationKey": { + "type": "string", + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + }, + "enhancedMatch": { "type": "boolean" }, + "sendExternalId": { "type": "boolean" }, + "sendAsCustomEvent": { "type": "boolean" }, + "eventsMapping": { "type": "array", "items": { "type": "object", "properties": { - "properties": { + "from": { + "type": "string", + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + }, + "to": { "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" } } } }, - "eventsMapping": { + "customProperties": { "type": "array", "items": { "type": "object", "properties": { - "from": { + "properties": { "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" - }, - "to": { - "type": "string", - "enum": [ - "Lead", - "PageVisit", - "ViewCategory", - "Signup", - "WatchVideo", - "Checkout", - "Search", - "AddToCart", - "Custom", - "" - ] } } } }, - "useNativeSDK": { "type": "object", "properties": { "web": { "type": "boolean" } } }, "eventFilteringOption": { "type": "string", - "enum": ["disable", "whitelistedEvents", "blacklistedEvents"], - "default": "disable" + "pattern": "(^env[.].+)|^(disable|whitelistedEvents|blacklistedEvents)$" }, "whitelistedEvents": { "type": "array", @@ -93,54 +98,6 @@ } } } - }, - "allOf": [ - { - "if": { - "properties": { "apiVersion": { "const": "legacyApi" } }, - "required": ["apiVersion"] - }, - "then": { - "properties": { - "advertiserId": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^[0-9]*$" - } - }, - "required": [] - } - }, - { - "if": { "properties": { "apiVersion": { "const": "newApi" } }, "required": ["apiVersion"] }, - "then": { - "properties": { - "adAccountId": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^[0-9]*$" - }, - "conversionToken": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,101})$" - } - }, - "required": ["adAccountId", "conversionToken"] - } - }, - { - "if": { - "properties": { "enableDeduplication": { "const": true } }, - "required": ["enableDeduplication"] - }, - "then": { - "properties": { - "deduplicationKey": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" - } - }, - "required": ["deduplicationKey"] - } - } - ] + } } } diff --git a/src/configurations/destinations/pinterest_tag/ui-config.json b/src/configurations/destinations/pinterest_tag/ui-config.json index 67fe4e379..35ddf68d3 100644 --- a/src/configurations/destinations/pinterest_tag/ui-config.json +++ b/src/configurations/destinations/pinterest_tag/ui-config.json @@ -7,7 +7,6 @@ "type": "textInput", "label": "TAG ID", "value": "tagId", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^[0-9]*$", "required": false, "placeholder": "e.g: 123456789", "secret": true @@ -16,7 +15,6 @@ "type": "textInput", "label": "App Store App ID", "value": "appId", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^[0-9]*$", "required": false, "placeholder": "e.g: 429047995", "secret": false, @@ -65,7 +63,7 @@ "value": "adAccountId", "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^[0-9]*$", "regexErrorMessage": "Invalid Ad Account ID", - "required": true, + "required": false, "placeholder": "e.g: 549935085302", "secret": true, "footerNote": "Required field for cloud mode integration. For more information about how to get ad account id refer docs" @@ -78,9 +76,9 @@ }, "label": "Conversion Token", "value": "conversionToken", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,101})$", + "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,101})$", "regexErrorMessage": "Invalid Conversion Token", - "required": true, + "required": false, "placeholder": "e.g: pina_A98DB973KWL8XP1LZ94KJF0BMA5PEZ8C6490FWEI01QJMN32YU", "secret": true, "footerNote": "Required field for cloud mode integration. For more information about how to get conversion token refer docs" @@ -115,8 +113,7 @@ "label": "Deduplication Key", "value": "deduplicationKey", "placeholder": "e.g: messageId", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", - "required": true, + "required": false, "footerNote": "Rudderstack will send this key-value from payload as an event deduplication key" }, { diff --git a/src/configurations/destinations/pipedream/schema.json b/src/configurations/destinations/pipedream/schema.json index 6e99701b6..49f7bcf93 100644 --- a/src/configurations/destinations/pipedream/schema.json +++ b/src/configurations/destinations/pipedream/schema.json @@ -1,8 +1,8 @@ { "configSchema": { "$schema": "http://json-schema.org/draft-07/schema#", - "required": ["pipedreamUrl"], "type": "object", + "required": ["pipedreamUrl"], "properties": { "pipedreamUrl": { "type": "string", @@ -10,8 +10,7 @@ }, "pipedreamMethod": { "type": "string", - "enum": ["POST", "PUT", "PATCH", "GET", "DELETE"], - "default": "POST" + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(^(POST|PUT|PATCH|GET|DELETE)$)" }, "headers": { "type": "array", @@ -20,11 +19,11 @@ "properties": { "from": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,1000})$" + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" }, "to": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,1000})$" + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100000})$" } } } diff --git a/src/configurations/destinations/pipedream/ui-config.json b/src/configurations/destinations/pipedream/ui-config.json index 88bc6b569..6e128845b 100644 --- a/src/configurations/destinations/pipedream/ui-config.json +++ b/src/configurations/destinations/pipedream/ui-config.json @@ -32,7 +32,6 @@ "labelRight": "Value", "keyLeft": "from", "keyRight": "to", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,1000})$", "placeholderLeft": "content-type", "placeholderRight": "application/json", "value": "headers" diff --git a/src/configurations/destinations/podsights/schema.json b/src/configurations/destinations/podsights/schema.json index 8552c28a3..509469367 100644 --- a/src/configurations/destinations/podsights/schema.json +++ b/src/configurations/destinations/podsights/schema.json @@ -1,8 +1,8 @@ { "configSchema": { "$schema": "http://json-schema.org/draft-07/schema#", - "required": ["pixelId"], "type": "object", + "required": ["pixelId"], "properties": { "pixelId": { "type": "string", @@ -19,7 +19,7 @@ }, "to": { "type": "string", - "enum": ["lead", "product", "addtocart", "checkout", "purchase", ""] + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" } } } @@ -27,8 +27,7 @@ "enableAliasCall": { "type": "boolean", "default": false }, "eventFilteringOption": { "type": "string", - "enum": ["disable", "whitelistedEvents", "blacklistedEvents"], - "default": "disable" + "pattern": "(^env[.].+)|^(disable|whitelistedEvents|blacklistedEvents)$" }, "whitelistedEvents": { "type": "array", diff --git a/src/configurations/destinations/podsights/ui-config.json b/src/configurations/destinations/podsights/ui-config.json index c9894466d..03b773c0f 100644 --- a/src/configurations/destinations/podsights/ui-config.json +++ b/src/configurations/destinations/podsights/ui-config.json @@ -7,7 +7,7 @@ "type": "textInput", "label": "Pixel ID", "value": "pixelId", - "regex": "^(.{1,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid Pixel ID", "required": true, "placeholder": "e.g. dzq1p89h2bnp1ubi9x65hyx2hf5q1k3v", diff --git a/src/configurations/destinations/postgres/schema.json b/src/configurations/destinations/postgres/schema.json index d62cbd63b..625558306 100644 --- a/src/configurations/destinations/postgres/schema.json +++ b/src/configurations/destinations/postgres/schema.json @@ -58,7 +58,7 @@ "sshHost": { "type": "string", "pattern": "(^env[.].+)|^(.{1,255})$" }, "sshPort": { "type": "string", "pattern": "(^env[.].+)|^(.{1,255})$" }, "sshUser": { "type": "string", "pattern": "(^env[.].+)|^(.{1,255})$" }, - "sshPublicKey": { "type": "string", "pattern": "(^env[.].+)|^(.{1,1000})$" } + "sshPublicKey": { "type": "string", "pattern": "(^env[.].+)|^(.{1,10000})$" } }, "required": ["sshHost", "sshPort", "sshUser", "sshPublicKey"] } diff --git a/src/configurations/destinations/qualaroo/schema.json b/src/configurations/destinations/qualaroo/schema.json index 85125b149..e712ad15b 100644 --- a/src/configurations/destinations/qualaroo/schema.json +++ b/src/configurations/destinations/qualaroo/schema.json @@ -1,8 +1,8 @@ { "configSchema": { "$schema": "http://json-schema.org/draft-07/schema#", - "required": ["customerId", "siteToken"], "type": "object", + "required": ["customerId", "siteToken"], "properties": { "customerId": { "type": "string", @@ -12,12 +12,27 @@ "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" }, - "useNativeSDK": { "type": "object", "properties": { "web": { "type": "boolean" } } }, - "recordQualarooEvents": { "type": "boolean", "default": false }, + "recordQualarooEvents": { "type": "boolean" }, + "updateEventNames": { "type": "boolean" }, + "eventsToStandard": { + "type": "array", + "items": { + "type": "object", + "properties": { + "from": { + "type": "string", + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + }, + "to": { + "type": "string", + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + } + } + } + }, "eventFilteringOption": { "type": "string", - "enum": ["disable", "whitelistedEvents", "blacklistedEvents"], - "default": "disable" + "pattern": "(^env[.].+)|^(disable|whitelistedEvents|blacklistedEvents)$" }, "whitelistedEvents": { "type": "array", @@ -43,6 +58,7 @@ } } }, + "useNativeSDK": { "type": "object", "properties": { "web": { "type": "boolean" } } }, "oneTrustCookieCategories": { "type": "array", "items": { @@ -55,64 +71,6 @@ } } } - }, - "allOf": [ - { - "if": { - "properties": { "recordQualarooEvents": { "const": true } }, - "required": ["recordQualarooEvents"] - }, - "then": { - "properties": { - "eventsList": { - "type": "array", - "items": { "type": "string", "enum": ["show", "close", "submit", "noTargetMatch"] }, - "default": ["show"] - } - }, - "required": [] - } - }, - { - "if": { - "properties": { "recordQualarooEvents": { "const": true } }, - "required": ["recordQualarooEvents"] - }, - "then": { - "properties": { "updateEventNames": { "type": "boolean", "default": false } }, - "required": [] - } - }, - { - "if": { - "properties": { - "recordQualarooEvents": { "const": true }, - "updateEventNames": { "const": true } - }, - "required": ["recordQualarooEvents", "updateEventNames"] - }, - "then": { - "properties": { - "eventsToStandard": { - "type": "array", - "items": { - "type": "object", - "properties": { - "from": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" - }, - "to": { - "type": "string", - "enum": ["show", "close", "submit", "noTargetMatch", ""] - } - } - } - } - }, - "required": [] - } - } - ] + } } } diff --git a/src/configurations/destinations/qualaroo/ui-config.json b/src/configurations/destinations/qualaroo/ui-config.json index 7b67c94a3..c0bbecab1 100644 --- a/src/configurations/destinations/qualaroo/ui-config.json +++ b/src/configurations/destinations/qualaroo/ui-config.json @@ -7,7 +7,7 @@ "type": "textInput", "label": "Customer ID", "value": "customerId", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{1,100})$", "regexErrorMessage": "Invalid Customer ID", "required": true, "placeholder": "e.g. 92102", @@ -18,7 +18,7 @@ "type": "textInput", "label": "Site Token", "value": "siteToken", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{1,100})$", "regexErrorMessage": "Invalid Site Token", "required": true, "placeholder": "e.g. j8N", @@ -171,7 +171,6 @@ { "type": "textInput", "value": "eventName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "required": false, "placeholder": "e.g: Anonymous Page Visit" } @@ -185,7 +184,6 @@ { "type": "textInput", "value": "eventName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "required": false, "placeholder": "e.g: Credit Card Added" } @@ -205,7 +203,6 @@ "type": "textInput", "placeholder": "Marketing", "value": "oneTrustCookieCategory", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "label": "Category Name/ID", "required": false } diff --git a/src/configurations/destinations/quora_pixel/schema.json b/src/configurations/destinations/quora_pixel/schema.json index 4f4641ec6..00e925657 100644 --- a/src/configurations/destinations/quora_pixel/schema.json +++ b/src/configurations/destinations/quora_pixel/schema.json @@ -1,8 +1,8 @@ { "configSchema": { "$schema": "http://json-schema.org/draft-07/schema#", - "required": ["pixelId"], "type": "object", + "required": ["pixelId"], "properties": { "pixelId": { "type": "string", @@ -19,27 +19,14 @@ }, "to": { "type": "string", - "enum": [ - "Generic", - "Purchase", - "GenerateLead", - "CompleteRegistration", - "AddPaymentInfo", - "AddToCart", - "AddToWishlist", - "InitiateCheckout", - "Search", - "Custom", - "" - ] + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" } } } }, "eventFilteringOption": { "type": "string", - "enum": ["disable", "whitelistedEvents", "blacklistedEvents"], - "default": "disable" + "pattern": "(^env[.].+)|^(disable|whitelistedEvents|blacklistedEvents)$" }, "whitelistedEvents": { "type": "array", diff --git a/src/configurations/destinations/quora_pixel/ui-config.json b/src/configurations/destinations/quora_pixel/ui-config.json index 67488df1b..8a7004b31 100644 --- a/src/configurations/destinations/quora_pixel/ui-config.json +++ b/src/configurations/destinations/quora_pixel/ui-config.json @@ -7,7 +7,7 @@ "type": "textInput", "label": "PIXEL ID", "value": "pixelId", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid PIXEL ID", "required": true, "placeholder": "e.g. d2bnp1ubi9x6zq1p89h5hyx2hf5q1k3v", @@ -110,7 +110,6 @@ { "type": "textInput", "value": "eventName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "required": false, "placeholder": "e.g: Anonymous Page Visit" } @@ -124,7 +123,6 @@ { "type": "textInput", "value": "eventName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "required": false, "placeholder": "e.g: Credit Card Added" } @@ -155,7 +153,6 @@ "type": "textInput", "placeholder": "Marketing", "value": "oneTrustCookieCategory", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "label": "Category Name/ID", "required": false } diff --git a/src/configurations/destinations/redis/schema.json b/src/configurations/destinations/redis/schema.json index 669010760..bf6542350 100644 --- a/src/configurations/destinations/redis/schema.json +++ b/src/configurations/destinations/redis/schema.json @@ -1,20 +1,30 @@ { "configSchema": { "$schema": "http://json-schema.org/draft-07/schema#", - "required": ["address"], "type": "object", + "additionalProperties": false, + "required": ["address"], "properties": { "address": { "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{0,100})$" }, "password": { "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|.*" }, - "clusterMode": { "type": "boolean", "default": true }, - "secure": { "type": "boolean", "default": false }, + "clusterMode": { "type": "boolean" }, + "secure": { "type": "boolean" }, "prefix": { "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" }, + "database": { + "type": "string", + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + }, + "caCertificate": { + "type": "string", + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|.*" + }, + "skipVerify": { "type": "boolean" }, "oneTrustCookieCategories": { "type": "array", "items": { @@ -27,33 +37,6 @@ } } } - }, - "allOf": [ - { - "if": { "properties": { "clusterMode": { "const": false } }, "required": ["clusterMode"] }, - "then": { - "properties": { - "database": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" - } - }, - "required": [] - } - }, - { - "if": { "properties": { "secure": { "const": true } }, "required": ["secure"] }, - "then": { - "properties": { - "skipVerify": { "type": "boolean", "default": false }, - "caCertificate": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|.*" - } - }, - "required": [] - } - } - ] + } } } diff --git a/src/configurations/destinations/redis/ui-config.json b/src/configurations/destinations/redis/ui-config.json index 91809575e..8a4e586e4 100644 --- a/src/configurations/destinations/redis/ui-config.json +++ b/src/configurations/destinations/redis/ui-config.json @@ -7,7 +7,7 @@ "type": "textInput", "label": "Address", "value": "address", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{0,100})$", + "regex": "(?!.*\\.ngrok\\.io)^(.{0,100})$", "regexErrorMessage": "Invalid Address", "required": true, "placeholder": "e.g: localhost:6379" @@ -16,7 +16,7 @@ "type": "textInput", "label": "Password", "value": "password", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|.*", + "regex": ".*", "required": false, "placeholder": "", "secret": true @@ -25,7 +25,7 @@ "type": "textInput", "label": "Database", "value": "database", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid Database", "required": false, "placeholder": "", @@ -46,7 +46,7 @@ "preRequisiteField": { "name": "secure", "selectedValue": true }, "label": "CA certificate", "value": "caCertificate", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|.*", + "regex": ".*", "required": false, "placeholder": "CA Certificate", "footerNote": "Can be skipped for CA's that can be verified with any client (eg. Elasticache)" @@ -55,7 +55,7 @@ "type": "textInput", "label": "Prefix", "value": "prefix", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid Prefix", "required": false, "placeholder": "" @@ -74,7 +74,6 @@ "type": "textInput", "placeholder": "Marketing", "value": "oneTrustCookieCategory", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "label": "Category Name/ID", "required": false } diff --git a/src/configurations/destinations/refiner/schema.json b/src/configurations/destinations/refiner/schema.json index e1ccb4552..098ec124f 100644 --- a/src/configurations/destinations/refiner/schema.json +++ b/src/configurations/destinations/refiner/schema.json @@ -1,8 +1,8 @@ { "configSchema": { "$schema": "http://json-schema.org/draft-07/schema#", - "required": ["apiKey", "webClientApiKey"], "type": "object", + "required": ["apiKey", "webClientApiKey"], "properties": { "apiKey": { "type": "string", @@ -44,12 +44,6 @@ } } }, - "useNativeSDK": { "type": "object", "properties": { "web": { "type": "boolean" } } }, - "eventFilteringOption": { - "type": "string", - "enum": ["disable", "whitelistedEvents", "blacklistedEvents"], - "default": "disable" - }, "whitelistedEvents": { "type": "array", "items": { @@ -74,6 +68,7 @@ } } }, + "useNativeSDK": { "type": "object", "properties": { "web": { "type": "boolean" } } }, "oneTrustCookieCategories": { "type": "array", "items": { diff --git a/src/configurations/destinations/refiner/ui-config.json b/src/configurations/destinations/refiner/ui-config.json index 294a12907..058377a10 100644 --- a/src/configurations/destinations/refiner/ui-config.json +++ b/src/configurations/destinations/refiner/ui-config.json @@ -7,7 +7,7 @@ "type": "textInput", "label": "Refiner REST API Key", "value": "apiKey", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{1,100})$", "required": true, "placeholder": "e.g. da70156h-05a3-4fa6-bb1g-da757fd036b4", "secret": true, @@ -17,7 +17,7 @@ "type": "textInput", "label": "Refiner Web Client API Key", "value": "webClientApiKey", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{1,100})$", "required": true, "placeholder": "e.g. 0d8759e0-401c-11ed-8dbd-9757h4929b55", "secret": true, @@ -100,7 +100,6 @@ { "type": "textInput", "value": "eventName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "required": false, "placeholder": "e.g: Anonymous Page Visit" } @@ -114,7 +113,6 @@ { "type": "textInput", "value": "eventName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "required": false, "placeholder": "e.g: Credit Card Added" } @@ -134,7 +132,6 @@ "type": "textInput", "placeholder": "Marketing", "value": "oneTrustCookieCategory", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "label": "Category Name/ID", "required": false } diff --git a/src/configurations/destinations/revenue_cat/schema.json b/src/configurations/destinations/revenue_cat/schema.json index 1aff6af15..ef312897e 100644 --- a/src/configurations/destinations/revenue_cat/schema.json +++ b/src/configurations/destinations/revenue_cat/schema.json @@ -1,8 +1,8 @@ { "configSchema": { "$schema": "http://json-schema.org/draft-07/schema#", - "required": ["apiKey"], "type": "object", + "required": ["apiKey"], "properties": { "apiKey": { "type": "string", @@ -10,8 +10,7 @@ }, "xPlatform": { "type": "string", - "enum": ["ios", "android", "amazon", "macos", "stripe", "uikitformac"], - "default": "stripe" + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(ios|android|amazon|macos|stripe|uikitformac)$" }, "oneTrustCookieCategories": { "type": "array", diff --git a/src/configurations/destinations/revenue_cat/ui-config.json b/src/configurations/destinations/revenue_cat/ui-config.json index 3326fea48..241acd692 100644 --- a/src/configurations/destinations/revenue_cat/ui-config.json +++ b/src/configurations/destinations/revenue_cat/ui-config.json @@ -7,7 +7,7 @@ "type": "textInput", "label": "Public API Key", "value": "apiKey", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{1,100})$", "required": true, "placeholder": "e.g. b4a29aba5e75d99c8a18acd920ec1e2e", "secret": true, @@ -41,7 +41,6 @@ "type": "textInput", "placeholder": "Marketing", "value": "oneTrustCookieCategory", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "label": "Category Name/ID", "required": false } diff --git a/src/configurations/destinations/rockerbox/schema.json b/src/configurations/destinations/rockerbox/schema.json index 210a1021c..2f1985574 100644 --- a/src/configurations/destinations/rockerbox/schema.json +++ b/src/configurations/destinations/rockerbox/schema.json @@ -1,31 +1,37 @@ { "configSchema": { "$schema": "http://json-schema.org/draft-07/schema#", - "required": ["advertiserId"], "type": "object", + "required": ["advertiserId"], "properties": { - "advertiserId": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" - }, - "eventFilteringOption": { - "type": "string", - "enum": ["disable", "whitelistedEvents", "blacklistedEvents"], - "default": "disable" + "advertiserId": { "type": "string" }, + "clientAuthId": { "type": "object", "properties": { "web": { "type": "string" } } }, + "customDomain": { + "type": "object", + "properties": { "web": { "type": "string", "pattern": "^(?!.*\\.ngrok\\.io).*$" } } }, - "whitelistedEvents": { + "enableCookieSync": { "type": "object", "properties": { "web": { "type": "boolean" } } }, + "eventsMap": { "type": "array", "items": { "type": "object", "properties": { - "eventName": { + "from": { + "type": "string", + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + }, + "to": { "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" } } } }, - "blacklistedEvents": { + "eventFilteringOption": { + "type": "string", + "pattern": "(^env[.].+)|^(disable|whitelistedEvents|blacklistedEvents)$" + }, + "whitelistedEvents": { "type": "array", "items": { "type": "object", @@ -37,57 +43,31 @@ } } }, - "oneTrustCookieCategories": { + "blacklistedEvents": { "type": "array", "items": { "type": "object", "properties": { - "oneTrustCookieCategory": { + "eventName": { "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" } } } }, - "eventsMap": { + "useNativeSDK": { "type": "object", "properties": { "web": { "type": "boolean" } } }, + "useNativeSDKToSend": { "type": "object", "properties": { "web": { "type": "boolean" } } }, + "oneTrustCookieCategories": { "type": "array", "items": { "type": "object", "properties": { - "from": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" - }, - "to": { + "oneTrustCookieCategory": { "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" } } } - }, - "clientAuthId": { - "type": "object", - "properties": { - "web": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" - } - } - }, - "customDomain": { - "type": "object", - "properties": { - "web": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(?!.*\\.ngrok\\.io).*$" - } - } - }, - "enableCookieSync": { "type": "object", "properties": { "web": { "type": "boolean" } } }, - "useNativeSDK": { "type": "object", "properties": { "web": { "type": "boolean" } } }, - "connectionMode": { - "type": "object", - "properties": { "web": { "type": "string", "enum": ["cloud", "device", "hybrid"] } } } } } diff --git a/src/configurations/destinations/rockerbox/ui-config.json b/src/configurations/destinations/rockerbox/ui-config.json index a850e3a8b..cfc95c876 100644 --- a/src/configurations/destinations/rockerbox/ui-config.json +++ b/src/configurations/destinations/rockerbox/ui-config.json @@ -17,7 +17,7 @@ "label": "Advertiser Id", "note": "Enter you Advertiser Id. If you don't have this, contact your RockerBox account manager", "configKey": "advertiserId", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{1,100})$", "regexErrorMessage": "Invalid Advertiser Id", "placeholder": "e.g: MOx2ZmMwLNE2A2IdNKL0N2VhN2I3ZGY1MTVmMzA1ODk0YmIkN" } @@ -202,7 +202,7 @@ "label": "Client Auth ID", "note": "Set you Client Auth ID here", "configKey": "clientAuthId", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Length of API Key must be below 50 characters.", "placeholder": "e.g: 755fc11162r14c41ar7e7df232f305984bb021a1" }, @@ -211,7 +211,7 @@ "label": "Custom Domain", "note": "Load pixel from a custom specific domain", "configKey": "customDomain", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(?!.*\\.ngrok\\.io).*$", + "regex": "^(?!.*\\.ngrok\\.io).*$", "regexErrorMessage": "Invalid Custom Domain", "placeholder": "customdomain.com" }, diff --git a/src/configurations/destinations/rollbar/schema.json b/src/configurations/destinations/rollbar/schema.json index 4f0b4708b..94f4c0e0d 100644 --- a/src/configurations/destinations/rollbar/schema.json +++ b/src/configurations/destinations/rollbar/schema.json @@ -8,36 +8,30 @@ "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" }, - "useNativeSDK": { "type": "object", "properties": { "web": { "type": "boolean" } } }, - "captureUncaughtException": { "type": "boolean", "default": true }, - "captureUnhandledRejections": { "type": "boolean", "default": false }, - "guessUncaughtFrames": { "type": "boolean", "default": false }, + "captureUncaughtException": { "type": "boolean" }, + "captureUnhandledRejections": { "type": "boolean" }, + "guessUncaughtFrames": { "type": "boolean" }, "codeVersion": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" }, "environment": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" }, "ignoredMessages": { "type": "array", "items": { "type": "object", "properties": { - "singleIgnoredMessage": { + "eventName": { "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" } } } }, - "sourceMapEnabled": { "type": "boolean", "default": false }, - "eventFilteringOption": { - "type": "string", - "enum": ["disable", "whitelistedEvents", "blacklistedEvents"], - "default": "disable" - }, + "sourceMapEnabled": { "type": "boolean" }, "whitelistedEvents": { "type": "array", "items": { @@ -62,6 +56,7 @@ } } }, + "useNativeSDK": { "type": "object", "properties": { "web": { "type": "boolean" } } }, "oneTrustCookieCategories": { "type": "array", "items": { diff --git a/src/configurations/destinations/rollbar/ui-config.json b/src/configurations/destinations/rollbar/ui-config.json index 413ebe240..02201c8f2 100644 --- a/src/configurations/destinations/rollbar/ui-config.json +++ b/src/configurations/destinations/rollbar/ui-config.json @@ -7,7 +7,7 @@ "type": "textInput", "label": "Access Token", "value": "accessToken", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid Access Token", "required": true, "placeholder": "e.g: 96d96af0cdb847f4b1a4e7cc13255705", @@ -55,7 +55,7 @@ "type": "textInput", "label": "Code Version", "value": "codeVersion", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid ", "required": false, "placeholder": "e.g. 1.1.1", @@ -66,7 +66,7 @@ "type": "textInput", "label": "Environment", "value": "environment", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid ", "required": false, "placeholder": "e.g. production", @@ -131,7 +131,6 @@ { "type": "textInput", "value": "eventName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "required": false, "placeholder": "e.g: Anonymous Page Visit" } @@ -145,7 +144,6 @@ { "type": "textInput", "value": "eventName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "required": false, "placeholder": "e.g: Credit Card Added" } @@ -165,7 +163,6 @@ "type": "textInput", "placeholder": "Marketing", "value": "oneTrustCookieCategory", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "label": "Category Name/ID", "required": false } diff --git a/src/configurations/destinations/rs/schema.json b/src/configurations/destinations/rs/schema.json index 4e5b3ee28..e9332052c 100644 --- a/src/configurations/destinations/rs/schema.json +++ b/src/configurations/destinations/rs/schema.json @@ -1,6 +1,7 @@ { "configSchema": { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "http://json-schema.org/draft-07/schema", + "type": "object", "required": [ "host", "port", @@ -10,48 +11,35 @@ "syncFrequency", "useRudderStorage" ], - "type": "object", "properties": { - "host": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{1,255})$" - }, - "port": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" - }, - "database": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" - }, - "user": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" - }, - "password": { "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|.*" }, - "namespace": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^((?!pg_|PG_|pG_|Pg_).{0,64})$" - }, + "host": { "type": "string", "pattern": "(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{1,255})$" }, + "port": { "type": "string", "pattern": "(^env[.].+)|^(.{1,100})$" }, + "database": { "type": "string", "pattern": "(^env[.].+)|^(.{1,100})$" }, + "user": { "type": "string", "pattern": "(^env[.].+)|^(.{1,100})$" }, + "password": { "type": "string", "pattern": "(^env[.].+)|.+" }, + "namespace": { "type": "string", "pattern": "(^env[.].*)|^((?!pg_|PG_|pG_|Pg_).{0,64})$" }, "syncFrequency": { "type": "string", - "enum": ["30", "60", "180", "360", "720", "1440"], + "pattern": "^(30|60|180|360|720|1440)$", "default": "30" }, "syncStartAt": { "type": "string" }, "excludeWindow": { "type": "object", + "required": ["excludeWindowStartTime", "excludeWindowEndTime"], "properties": { "excludeWindowStartTime": { "type": "string" }, "excludeWindowEndTime": { "type": "string" } - }, - "required": ["excludeWindowStartTime", "excludeWindowEndTime"] - }, - "jsonPaths": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.*)$" + } }, + "jsonPaths": { "type": "string", "pattern": "(^env[.].*)|.*" }, "useRudderStorage": { "type": "boolean", "default": false }, + "prefix": { "type": "string", "pattern": "(^env[.].*)|^(.{0,100})$" }, + "iamRoleARN": { "type": "string" }, + "roleBasedAuth": { "type": "boolean" }, + "accessKeyID": { "type": "string", "pattern": "(^env[.].*)|^(.{0,100})$" }, + "accessKey": { "type": "string", "pattern": "(^env[.].*)|^(.{0,100})$" }, + "enableSSE": { "type": "boolean" }, "oneTrustCookieCategories": { "type": "array", "items": { @@ -66,6 +54,18 @@ } }, "allOf": [ + { + "if": { "properties": { "useSSH": { "const": true } }, "required": ["useSSH"] }, + "then": { + "properties": { + "sshHost": { "type": "string", "pattern": "(^env[.].+)|^(.{1,255})$" }, + "sshPort": { "type": "string", "pattern": "(^env[.].+)|^(.{1,255})$" }, + "sshUser": { "type": "string", "pattern": "(^env[.].+)|^(.{1,255})$" }, + "sshPublicKey": { "type": "string", "pattern": "(^env[.].+)|^(.{1,10000})$" } + }, + "required": ["sshHost", "sshPort", "sshUser", "sshPublicKey"] + } + }, { "if": { "properties": { "useRudderStorage": { "const": false } }, @@ -75,53 +75,22 @@ "properties": { "bucketName": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^((?!^xn--)(?!.*\\.\\..*)(?!^(\\d+(\\.|$)){4}$)[a-z0-9][a-z0-9-.]{1,61}[a-z0-9])$|(^\\{\\{.+\\}\\}$)" - }, - "prefix": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^([^\\s]{0,100})$" - }, - "enableSSE": { "type": "boolean", "default": false } - }, - "required": ["bucketName"], - "anyOf": [ - { - "properties": { - "accessKeyID": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" - }, - "accessKey": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" - }, - "roleBasedAuth": { "const": false } - }, - "required": [] - }, - { - "properties": { - "iamRoleARN": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" - }, - "roleBasedAuth": { "const": true } - }, - "required": ["iamRoleARN", "roleBasedAuth"] + "pattern": "(^env[.].+)|^((?!^xn--)(?!.*\\.\\..*)(?!^(\\d+(\\.|$)){4}$)[a-z0-9][a-z0-9-.]{1,61}[a-z0-9])$|(^\\{\\{.+\\}\\}$)" } - ] + }, + "required": ["bucketName"] } }, { "if": { - "properties": { "useRudderStorage": { "const": false } }, - "required": ["useRudderStorage"] + "properties": { "roleBasedAuth": { "const": true } }, + "required": ["roleBasedAuth"] }, "then": { - "properties": { "roleBasedAuth": { "type": "boolean", "default": true } }, - "required": [] + "required": ["iamRoleARN"] } } - ] + ], + "additionalProperties": true } } diff --git a/src/configurations/destinations/rs/ui-config.json b/src/configurations/destinations/rs/ui-config.json index dbc7e0db4..d0939e37d 100644 --- a/src/configurations/destinations/rs/ui-config.json +++ b/src/configurations/destinations/rs/ui-config.json @@ -7,7 +7,7 @@ "type": "textInput", "label": "Host", "value": "host", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{1,255})$", + "regex": "(?!.*\\.ngrok\\.io)^(.{0,255})$", "regexErrorMessage": "Invalid Host", "placeholder": "redshift.mydomain.com", "required": true @@ -16,7 +16,7 @@ "type": "textInput", "label": "Port", "value": "port", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid Port", "placeholder": "5439", "required": true @@ -25,7 +25,7 @@ "type": "textInput", "label": "Database", "value": "database", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid Database", "placeholder": "e.g: warehouse", "required": true @@ -34,7 +34,7 @@ "type": "textInput", "label": "User", "value": "user", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid User", "placeholder": "e.g: warehouseuser", "required": true @@ -43,7 +43,7 @@ "type": "textInput", "label": "Password", "value": "password", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|.*", + "regex": ".*", "placeholder": "e.g: warehousepassword", "required": true, "secret": true @@ -53,7 +53,7 @@ "label": "Namespace", "labelNote": "Schema name for the warehouse where the tables are created", "value": "namespace", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^((?!pg_|PG_|pG_|Pg_).{0,64})$", + "regex": "^((?!pg_|PG_|pG_|Pg_).{0,64})$", "regexErrorMessage": "Invalid Namespace", "required": false, "placeholder": "e.g: iosSource", @@ -72,7 +72,7 @@ { "name": "Every 24 hours", "value": "1440" } ], "defaultOption": { "name": "Every 30 minutes", "value": "30" }, - "required": true + "required": false }, { "type": "timePicker", @@ -97,7 +97,7 @@ "label": "JSON columns (Optional)", "labelNote": "Specify required JSON properties in dot notation separated by commas", "value": "jsonPaths", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.*)$", + "regex": "^(.*)$", "placeholder": "e.g: testMap.nestedMap, testArray", "required": false, "footerURL": { @@ -114,7 +114,6 @@ "type": "checkbox", "label": "Use RudderStack managed object storage", "value": "useRudderStorage", - "required": true, "default": false, "footerNote": "Note: Only available for Rudderstack managed data planes" }, @@ -123,7 +122,7 @@ "label": "Staging S3 Storage Bucket Name", "labelNote": "S3 Bucket to store data before loading into Redshift", "value": "bucketName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^((?!^xn--)(?!.*\\.\\..*)(?!^(\\d+(\\.|$)){4}$)[a-z0-9][a-z0-9-.]{1,61}[a-z0-9])$|(^\\{\\{.+\\}\\}$)", + "regex": "^((?!^xn--)(?!.*\\.\\..*)(?!^(\\d+(\\.|$)){4}$)[a-z0-9][a-z0-9-.]{1,61}[a-z0-9])$|(^\\{\\{.+\\}\\}$)", "regexErrorMessage": "Invalid Bucket name", "required": true, "placeholder": "e.g: event-bucket", @@ -134,7 +133,7 @@ "type": "textInput", "label": "Prefix", "value": "prefix", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^([^\\s]{0,100})$", + "regex": "^([^\\s]{0,100})$", "regexErrorMessage": "Invalid Prefix", "required": false, "placeholder": "e.g: rudder", @@ -155,7 +154,7 @@ ], "label": "IAM Role ARN", "value": "iamRoleARN", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid Role ARN", "required": true, "placeholder": "e.g: arn:aws:iam::123456789012:role/S3Access", @@ -168,7 +167,7 @@ "type": "textInput", "label": "AWS Access Key ID", "value": "accessKeyID", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid AWS Access Key ID", "required": false, "placeholder": "e.g: access-key-id", @@ -182,7 +181,7 @@ "type": "textInput", "label": "AWS Secret Access Key", "value": "accessKey", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid AWS Secret Access Key", "required": false, "placeholder": "e.g: secret-access-key", @@ -213,7 +212,6 @@ "type": "textInput", "placeholder": "Marketing", "value": "oneTrustCookieCategory", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "label": "Category Name/ID", "required": false } diff --git a/src/configurations/destinations/s3/schema.json b/src/configurations/destinations/s3/schema.json index 4f4be35d9..6e226362c 100644 --- a/src/configurations/destinations/s3/schema.json +++ b/src/configurations/destinations/s3/schema.json @@ -1,8 +1,8 @@ { "configSchema": { "$schema": "http://json-schema.org/draft-07/schema#", - "required": ["bucketName"], "type": "object", + "required": ["bucketName"], "properties": { "bucketName": { "type": "string", @@ -12,8 +12,13 @@ "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" }, - "roleBasedAuth": { "type": "boolean", "default": true }, - "enableSSE": { "type": "boolean", "default": false }, + "iamRoleARN": { "type": "string" }, + "roleBasedAuth": { "type": "boolean" }, + "accessKeyID": { + "type": "string", + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + }, + "enableSSE": { "type": "boolean" }, "oneTrustCookieCategories": { "type": "array", "items": { @@ -26,44 +31,6 @@ } } } - }, - "allOf": [ - { - "if": { - "properties": { "roleBasedAuth": { "const": true } }, - "required": ["roleBasedAuth"] - }, - "then": { - "properties": { - "iamRoleARN": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" - }, - "roleBasedAuth": { "const": true } - }, - "required": ["roleBasedAuth"] - } - }, - { - "if": { - "properties": { "roleBasedAuth": { "const": false } }, - "required": ["roleBasedAuth"] - }, - "then": { - "properties": { - "accessKeyID": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" - }, - "accessKey": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" - }, - "roleBasedAuth": { "const": false } - }, - "required": [] - } - } - ] + } } } diff --git a/src/configurations/destinations/s3/ui-config.json b/src/configurations/destinations/s3/ui-config.json index cb6043aa2..920e9f0af 100644 --- a/src/configurations/destinations/s3/ui-config.json +++ b/src/configurations/destinations/s3/ui-config.json @@ -7,7 +7,7 @@ "type": "textInput", "label": "S3 Bucket Name", "value": "bucketName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid S3 Bucket Name", "required": true, "placeholder": "e.g: s3-event-logs" @@ -32,7 +32,7 @@ "preRequisiteField": { "name": "roleBasedAuth", "selectedValue": true }, "label": "IAM Role ARN", "value": "iamRoleARN", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid Role ARN", "required": false, "placeholder": "e.g: arn:aws:iam::123456789012:role/S3Access", @@ -46,7 +46,7 @@ "preRequisiteField": { "name": "roleBasedAuth", "selectedValue": false }, "label": "AWS Access Key ID", "value": "accessKeyID", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid AWS Access Key ID", "required": false, "placeholder": "e.g: access-key-id", @@ -57,7 +57,7 @@ "preRequisiteField": { "name": "roleBasedAuth", "selectedValue": false }, "label": "AWS Secret Access Key", "value": "accessKey", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid AWS Secret Access Key", "required": false, "placeholder": "e.g: secret-access-key", diff --git a/src/configurations/destinations/s3_datalake/schema.json b/src/configurations/destinations/s3_datalake/schema.json index 11fa124a0..277893a3d 100644 --- a/src/configurations/destinations/s3_datalake/schema.json +++ b/src/configurations/destinations/s3_datalake/schema.json @@ -1,24 +1,24 @@ { "configSchema": { - "$schema": "http://json-schema.org/draft-07/schema#", - "required": ["bucketName"], + "$schema": "http://json-schema.org/draft-07/schema", "type": "object", + "required": ["bucketName", "useGlue", "syncFrequency"], "properties": { "bucketName": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^((?!^xn--)(?!.*\\.\\..*)(?!^(\\d+(\\.|$)){4}$)[a-z0-9][a-z0-9-.]{1,61}[a-z0-9])$" + "pattern": "(^env[.].+)|^((?!^xn--)(?!.*\\.\\..*)(?!^(\\d+(\\.|$)){4}$)[a-z0-9][a-z0-9-.]{1,61}[a-z0-9])$" }, - "useGlue": { "type": "boolean", "default": false }, - "prefix": { "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|.*" }, - "namespace": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^((?!pg_|PG_|pG_|Pg_).{0,64})$" - }, - "roleBasedAuth": { "type": "boolean", "default": true }, - "enableSSE": { "type": "boolean", "default": false }, + "useGlue": { "type": "boolean" }, + "prefix": { "type": "string", "pattern": "(^env[.].*)|.*" }, + "namespace": { "type": "string", "pattern": "(^env[.].*)|^((?!pg_|PG_|pG_|Pg_).{0,64})$" }, + "iamRoleARN": { "type": "string" }, + "roleBasedAuth": { "type": "boolean" }, + "accessKeyID": { "type": "string", "pattern": "(^env[.].*)|.*" }, + "accessKey": { "type": "string", "pattern": "(^env[.].*)|.*" }, + "enableSSE": { "type": "boolean" }, "syncFrequency": { "type": "string", - "enum": ["30", "60", "180", "360", "720", "1440"], + "pattern": "^(30|60|180|360|720|1440)$", "default": "30" }, "syncStartAt": { "type": "string" }, @@ -39,9 +39,7 @@ { "if": { "properties": { "useGlue": { "const": true } }, "required": ["useGlue"] }, "then": { - "properties": { - "region": { "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|.*" } - }, + "properties": { "region": { "type": "string", "pattern": "(^env[.].+)|.+" } }, "required": ["region"] } }, @@ -51,36 +49,10 @@ "required": ["roleBasedAuth"] }, "then": { - "properties": { - "iamRoleARN": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" - }, - "roleBasedAuth": { "const": true } - }, - "required": ["iamRoleARN", "roleBasedAuth"] - } - }, - { - "if": { - "properties": { "roleBasedAuth": { "const": false } }, - "required": ["roleBasedAuth"] - }, - "then": { - "properties": { - "accessKeyID": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|.*" - }, - "accessKey": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|.*" - }, - "roleBasedAuth": { "const": false } - }, - "required": [] + "required": ["iamRoleARN"] } } - ] + ], + "additionalProperties": true } } diff --git a/src/configurations/destinations/s3_datalake/ui-config.json b/src/configurations/destinations/s3_datalake/ui-config.json index fe8ba591f..440e82bdd 100644 --- a/src/configurations/destinations/s3_datalake/ui-config.json +++ b/src/configurations/destinations/s3_datalake/ui-config.json @@ -8,7 +8,7 @@ "label": "S3 Storage Bucket Name", "labelNote": "S3 Bucket to store your event data", "value": "bucketName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^((?!^xn--)(?!.*\\.\\..*)(?!^(\\d+(\\.|$)){4}$)[a-z0-9][a-z0-9-.]{1,61}[a-z0-9])$", + "regex": "^((?!^xn--)(?!.*\\.\\..*)(?!^(\\d+(\\.|$)){4}$)[a-z0-9][a-z0-9-.]{1,61}[a-z0-9])$", "required": true, "footerNote": "Please make sure the bucket exists in your S3" }, @@ -24,7 +24,7 @@ "label": "AWS Glue Region", "labelNote": "Your AWS Glue region.Ex-For N.Virginia, this field's value would be 'us-east-1'", "value": "region", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|.*", + "regex": ".*", "required": true, "preRequisiteField": { "name": "useGlue", "selectedValue": true } }, @@ -42,7 +42,7 @@ "label": "Namespace", "value": "namespace", "labelNote": "Defaults to source name.", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^((?!pg_|PG_|pG_|Pg_).{0,64})$", + "regex": "^((?!pg_|PG_|pG_|Pg_).{0,64})$", "required": false, "footerNote": "All data for the destination would be pushed to s3:////rudder-datalake/.If glue is enabled, all table definitions are created in a database with name set to namespace." }, @@ -57,7 +57,7 @@ "preRequisiteField": [{ "name": "roleBasedAuth", "selectedValue": true }], "label": "IAM Role ARN", "value": "iamRoleARN", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid Role ARN", "required": true, "placeholder": "e.g: arn:aws:iam::123456789012:role/S3Access", @@ -71,7 +71,7 @@ "preRequisiteField": [{ "name": "roleBasedAuth", "selectedValue": false }], "label": "AWS Access Key ID", "value": "accessKeyID", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|.*", + "regex": ".*", "required": false, "placeholder": "e.g: access-key-id", "secret": true @@ -81,7 +81,7 @@ "preRequisiteField": [{ "name": "roleBasedAuth", "selectedValue": false }], "label": "AWS Secret Access Key", "value": "accessKey", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|.*", + "regex": ".*", "required": false, "placeholder": "e.g: secret-access-key", "secret": true diff --git a/src/configurations/destinations/salesforce/schema.json b/src/configurations/destinations/salesforce/schema.json index 9e0395b4a..79ea036d1 100644 --- a/src/configurations/destinations/salesforce/schema.json +++ b/src/configurations/destinations/salesforce/schema.json @@ -1,8 +1,8 @@ { "configSchema": { "$schema": "http://json-schema.org/draft-07/schema#", - "required": ["userName", "password", "initialAccessToken"], "type": "object", + "required": ["userName", "password", "initialAccessToken"], "properties": { "userName": { "type": "string", @@ -16,9 +16,9 @@ "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" }, - "mapProperties": { "type": "boolean", "default": true }, - "sandbox": { "type": "boolean", "default": false }, - "useContactId": { "type": "boolean", "default": false }, + "mapProperties": { "type": "boolean" }, + "sandbox": { "type": "boolean" }, + "useContactId": { "type": "boolean" }, "oneTrustCookieCategories": { "type": "array", "items": { diff --git a/src/configurations/destinations/salesforce/ui-config.json b/src/configurations/destinations/salesforce/ui-config.json index 94815d649..499f0d13c 100644 --- a/src/configurations/destinations/salesforce/ui-config.json +++ b/src/configurations/destinations/salesforce/ui-config.json @@ -64,7 +64,6 @@ "type": "textInput", "placeholder": "Marketing", "value": "oneTrustCookieCategory", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "label": "Category Name/ID", "required": false } diff --git a/src/configurations/destinations/satismeter/schema.json b/src/configurations/destinations/satismeter/schema.json index 6b0f368d3..3e4eb4bda 100644 --- a/src/configurations/destinations/satismeter/schema.json +++ b/src/configurations/destinations/satismeter/schema.json @@ -1,20 +1,35 @@ { "configSchema": { "$schema": "http://json-schema.org/draft-07/schema#", - "required": ["writeKey"], "type": "object", + "required": ["writeKey"], "properties": { "writeKey": { "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" }, - "useNativeSDK": { "type": "object", "properties": { "web": { "type": "boolean" } } }, - "identifyAnonymousUsers": { "type": "boolean", "default": false }, - "recordSatismeterEvents": { "type": "boolean", "default": false }, + "identifyAnonymousUsers": { "type": "boolean" }, + "recordSatismeterEvents": { "type": "boolean" }, + "updateEventNames": { "type": "boolean" }, + "eventsToStandard": { + "type": "array", + "items": { + "type": "object", + "properties": { + "from": { + "type": "string", + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + }, + "to": { + "type": "string", + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + } + } + } + }, "eventFilteringOption": { "type": "string", - "enum": ["disable", "whitelistedEvents", "blacklistedEvents"], - "default": "disable" + "pattern": "(^env[.].+)|^(disable|whitelistedEvents|blacklistedEvents)$" }, "whitelistedEvents": { "type": "array", @@ -40,6 +55,7 @@ } } }, + "useNativeSDK": { "type": "object", "properties": { "web": { "type": "boolean" } } }, "oneTrustCookieCategories": { "type": "array", "items": { @@ -52,64 +68,6 @@ } } } - }, - "allOf": [ - { - "if": { - "properties": { "recordSatismeterEvents": { "const": true } }, - "required": ["recordSatismeterEvents"] - }, - "then": { - "properties": { - "eventsList": { - "type": "array", - "items": { "type": "string", "enum": ["display", "dismiss", "progress", "complete"] }, - "default": ["display"] - } - }, - "required": [] - } - }, - { - "if": { - "properties": { "recordSatismeterEvents": { "const": true } }, - "required": ["recordSatismeterEvents"] - }, - "then": { - "properties": { "updateEventNames": { "type": "boolean", "default": false } }, - "required": [] - } - }, - { - "if": { - "properties": { - "recordSatismeterEvents": { "const": true }, - "updateEventNames": { "const": true } - }, - "required": ["recordSatismeterEvents", "updateEventNames"] - }, - "then": { - "properties": { - "eventsToStandard": { - "type": "array", - "items": { - "type": "object", - "properties": { - "from": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" - }, - "to": { - "type": "string", - "enum": ["display", "dismiss", "progress", "complete", ""] - } - } - } - } - }, - "required": [] - } - } - ] + } } } diff --git a/src/configurations/destinations/satismeter/ui-config.json b/src/configurations/destinations/satismeter/ui-config.json index 671446d01..d025d6484 100644 --- a/src/configurations/destinations/satismeter/ui-config.json +++ b/src/configurations/destinations/satismeter/ui-config.json @@ -7,7 +7,7 @@ "type": "textInput", "label": "Write Key", "value": "writeKey", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{1,100})$", "regexErrorMessage": "Invalid Write Key.", "required": true, "placeholder": "e.g. 8ebfu2tr2833r08gfb", @@ -167,7 +167,6 @@ { "type": "textInput", "value": "eventName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "required": false, "placeholder": "e.g: Anonymous Page Visit" } @@ -181,7 +180,6 @@ { "type": "textInput", "value": "eventName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "required": false, "placeholder": "e.g: Credit Card Added" } @@ -201,7 +199,6 @@ "type": "textInput", "placeholder": "Marketing", "value": "oneTrustCookieCategory", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "label": "Category Name/ID", "required": false } diff --git a/src/configurations/destinations/sendinblue/schema.json b/src/configurations/destinations/sendinblue/schema.json index 291ed7ba1..2c5bf83fe 100644 --- a/src/configurations/destinations/sendinblue/schema.json +++ b/src/configurations/destinations/sendinblue/schema.json @@ -1,8 +1,8 @@ { "configSchema": { "$schema": "http://json-schema.org/draft-07/schema#", - "required": ["apiKey", "clientKey"], "type": "object", + "required": ["apiKey", "clientKey"], "properties": { "apiKey": { "type": "string", @@ -12,10 +12,16 @@ "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" }, - "useNativeSDK": { "type": "object", "properties": { "web": { "type": "boolean" } } }, - "doi": { "type": "boolean", "default": false }, - "sendTraitsInTrack": { "type": "boolean", "default": false }, - "contactAttributeMapping": { + "doi": { "type": "boolean" }, + "templateId": { + "type": "string", + "pattern": "(^\\{\\{.*\\|\\|(.*?)\\}\\}$)|(^env[.].+)|^[0-9]+$|^$" + }, + "redirectionUrl": { + "type": "string", + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(?:http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]+$|^$" + }, + "keyToContactAttributeMapping": { "type": "array", "items": { "type": "object", @@ -31,10 +37,10 @@ } } }, + "sendTraitsInTrack": { "type": "boolean" }, "eventFilteringOption": { "type": "string", - "enum": ["disable", "whitelistedEvents", "blacklistedEvents"], - "default": "disable" + "pattern": "(^env[.].+)|^(disable|whitelistedEvents|blacklistedEvents)$" }, "whitelistedEvents": { "type": "array", @@ -60,6 +66,7 @@ } } }, + "useNativeSDK": { "type": "object", "properties": { "web": { "type": "boolean" } } }, "oneTrustCookieCategories": { "type": "array", "items": { @@ -72,24 +79,6 @@ } } } - }, - "anyOf": [ - { - "if": { "properties": { "doi": { "const": true } }, "required": ["doi"] }, - "then": { - "properties": { - "templateId": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^[0-9]+$" - }, - "redirectionUrl": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(?:http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]+$" - } - }, - "required": ["redirectionUrl"] - } - } - ] + } } } diff --git a/src/configurations/destinations/sendinblue/ui-config.json b/src/configurations/destinations/sendinblue/ui-config.json index 1593c50bf..47821e997 100644 --- a/src/configurations/destinations/sendinblue/ui-config.json +++ b/src/configurations/destinations/sendinblue/ui-config.json @@ -7,7 +7,7 @@ "type": "textInput", "label": "API Key", "value": "apiKey", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{1,100})$", "regexErrorMessage": "Invalid API Key", "required": true, "placeholder": "e.g. xkeysib-cI7d098201bW5acf0453FY1b64fsej32da3f8ae01d7c8f9b78L43153d814td000020eb9-1e4M595C0", @@ -18,7 +18,7 @@ "type": "textInput", "label": "Client Key", "value": "clientKey", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{1,100})$", "regexErrorMessage": "Invalid Client Key", "required": true, "placeholder": "e.g. 1vd0i6w1al7q38ap5kucurfy", @@ -52,7 +52,7 @@ "type": "textInput", "label": "Template ID", "value": "templateId", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^[0-9]+$", + "regex": "^[0-9]+$", "regexErrorMessage": "Invalid Template ID", "placeholder": "e.g. 2", "footerNote": "Your DOI template ID from Automation tab", @@ -65,7 +65,7 @@ "type": "textInput", "label": "Redirection Url", "value": "redirectionUrl", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(?:http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]+$", + "regex": "(?!.*\\.ngrok\\.io)^(?:http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]+$", "regexErrorMessage": "Invalid Redirection Url", "required": true, "placeholder": "e.g. https://my.sendinblue.com/", @@ -131,7 +131,6 @@ { "type": "textInput", "value": "eventName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "required": false, "placeholder": "e.g: Anonymous Page Visit" } @@ -145,7 +144,6 @@ { "type": "textInput", "value": "eventName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "required": false, "placeholder": "e.g: Credit Card Added" } @@ -165,7 +163,6 @@ "type": "textInput", "placeholder": "Marketing", "value": "oneTrustCookieCategory", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "label": "Category Name/ID", "required": false } diff --git a/src/configurations/destinations/sentry/schema.json b/src/configurations/destinations/sentry/schema.json index be30ceecf..8cfa744ee 100644 --- a/src/configurations/destinations/sentry/schema.json +++ b/src/configurations/destinations/sentry/schema.json @@ -1,8 +1,9 @@ { "configSchema": { "$schema": "http://json-schema.org/draft-07/schema#", - "required": ["dsn"], "type": "object", + "additionalProperties": false, + "required": ["dsn"], "properties": { "dsn": { "type": "string" }, "environment": { "type": "string" }, @@ -10,60 +11,32 @@ "release": { "type": "string" }, "serverName": { "type": "string" }, "logger": { "type": "string" }, + "debugMode": { "type": "boolean" }, "ignoreErrors": { "type": "array", - "items": { - "type": "object", - "properties": { - "ignoreErrors": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" - } - } - } + "items": { "type": "object", "properties": { "ignoreErrors": { "type": "string" } } } }, "includePaths": { "type": "array", - "items": { - "type": "object", - "properties": { - "includePaths": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" - } - } - } + "items": { "type": "object", "properties": { "includePaths": { "type": "string" } } } }, "allowUrls": { "type": "array", "items": { "type": "object", - "properties": { - "allowUrls": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(?!.*\\.ngrok\\.io).*$" - } - } + "properties": { "allowUrls": { "type": "string", "pattern": "^(?!.*\\.ngrok\\.io).*$" } } } }, "denyUrls": { "type": "array", "items": { "type": "object", - "properties": { - "denyUrls": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(?!.*\\.ngrok\\.io).*$" - } - } + "properties": { "denyUrls": { "type": "string", "pattern": "^(?!.*\\.ngrok\\.io).*$" } } } }, - "debugMode": { "type": "boolean", "default": false }, - "useNativeSDK": { "type": "object", "properties": { "web": { "type": "boolean" } } }, "eventFilteringOption": { "type": "string", - "enum": ["disable", "whitelistedEvents", "blacklistedEvents"], - "default": "disable" + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(disable|whitelistedEvents|blacklistedEvents)$" }, "whitelistedEvents": { "type": "array", @@ -89,6 +62,7 @@ } } }, + "useNativeSDK": { "type": "object", "properties": { "web": { "type": "boolean" } } }, "oneTrustCookieCategories": { "type": "array", "items": { @@ -101,7 +75,6 @@ } } } - }, - "additionalProperties": false + } } } diff --git a/src/configurations/destinations/sentry/ui-config.json b/src/configurations/destinations/sentry/ui-config.json index bcb422322..e0c2cc0c1 100644 --- a/src/configurations/destinations/sentry/ui-config.json +++ b/src/configurations/destinations/sentry/ui-config.json @@ -54,7 +54,6 @@ "type": "textInput", "placeholder": "e.g. TYPE_ERROR", "value": "ignoreErrors", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "label": "Ignore Errors", "required": false } @@ -68,7 +67,6 @@ "type": "textInput", "placeholder": "e.g. abc/", "value": "includePaths", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "label": "Include Paths", "required": false } @@ -81,7 +79,7 @@ { "type": "textInput", "placeholder": "e.g. https://example.com/", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(?!.*\\.ngrok\\.io).*$", + "regex": "^(?!.*\\.ngrok\\.io).*$", "value": "allowUrls", "label": "Allow URLs", "required": false @@ -95,7 +93,7 @@ { "type": "textInput", "placeholder": "e.g. https://example.com/", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(?!.*\\.ngrok\\.io).*$", + "regex": "^(?!.*\\.ngrok\\.io).*$", "value": "denyUrls", "label": "Deny URLs", "required": false @@ -156,7 +154,6 @@ { "type": "textInput", "value": "eventName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "required": false, "placeholder": "e.g: Anonymous Page Visit" } @@ -170,7 +167,6 @@ { "type": "textInput", "value": "eventName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "required": false, "placeholder": "e.g: Credit Card Added" } @@ -190,7 +186,6 @@ "type": "textInput", "placeholder": "Marketing", "value": "oneTrustCookieCategory", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "label": "Category Name/ID", "required": false } diff --git a/src/configurations/destinations/serenytics/schema.json b/src/configurations/destinations/serenytics/schema.json index a55f77506..ac886d20f 100644 --- a/src/configurations/destinations/serenytics/schema.json +++ b/src/configurations/destinations/serenytics/schema.json @@ -1,16 +1,31 @@ { "configSchema": { "$schema": "http://json-schema.org/draft-07/schema#", - "required": [], "type": "object", "properties": { "storageUrlIdentify": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{1,200})$" + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{0,200})$" }, "storageUrlTrack": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{1,200})$" + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{0,200})$" + }, + "storageUrlGroup": { + "type": "string", + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{0,200})$" + }, + "storageUrlAlias": { + "type": "string", + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{0,200})$" + }, + "storageUrlPage": { + "type": "string", + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{0,200})$" + }, + "storageUrlScreen": { + "type": "string", + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{0,200})$" }, "eventToStorageUrlMap": { "type": "array", @@ -19,31 +34,15 @@ "properties": { "from": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,200})$" }, "to": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,200})$" } } } }, - "storageUrlGroup": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{1,200})$" - }, - "storageUrlAlias": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{1,200})$" - }, - "storageUrlPage": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{1,200})$" - }, - "storageUrlScreen": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{1,200})$" - }, "oneTrustCookieCategories": { "type": "array", "items": { diff --git a/src/configurations/destinations/serenytics/ui-config.json b/src/configurations/destinations/serenytics/ui-config.json index 61bcc8845..0eb753f6e 100644 --- a/src/configurations/destinations/serenytics/ui-config.json +++ b/src/configurations/destinations/serenytics/ui-config.json @@ -7,7 +7,7 @@ "type": "textInput", "label": "Data Source Storage Url for Identify", "value": "storageUrlIdentify", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{1,200})$", + "regex": "(?!.*\\.ngrok\\.io)^(.{1,200})$", "required": false, "placeholder": "e.g. https://api.serenytics.com/api/data_source/7e0670-8cd1-40da-93a3-10a5/push/f06274c43f8904735b9a06c3ae917" }, @@ -15,7 +15,7 @@ "type": "textInput", "label": "Data Source Storage Url for Track", "value": "storageUrlTrack", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{1,200})$", + "regex": "(?!.*\\.ngrok\\.io)^(.{1,200})$", "required": false, "placeholder": "e.g. https://api.serenytics.com/api/data_source/7e0670-8cd1-40da-93a3-10a5/push/f06274c43f8904735b9a06c3ae917" }, @@ -35,7 +35,7 @@ "type": "textInput", "label": "Data Source Storage Url for Group", "value": "storageUrlGroup", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{1,200})$", + "regex": "(?!.*\\.ngrok\\.io)^(.{1,200})$", "required": false, "placeholder": "e.g. https://api.serenytics.com/api/data_source/7e0670-8cd1-40da-93a3-10a5/push/f06274c43f8904735b9a06c3ae917" }, @@ -43,7 +43,7 @@ "type": "textInput", "label": "Data Source Storage Url for Alias", "value": "storageUrlAlias", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{1,200})$", + "regex": "(?!.*\\.ngrok\\.io)^(.{1,200})$", "required": false, "placeholder": "e.g. https://api.serenytics.com/api/data_source/7e0670-8cd1-40da-93a3-10a5/push/f06274c43f8904735b9a06c3ae917" }, @@ -51,7 +51,7 @@ "type": "textInput", "label": "Data Source Storage Url for Page", "value": "storageUrlPage", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{1,200})$", + "regex": "(?!.*\\.ngrok\\.io)^(.{1,200})$", "required": false, "placeholder": "e.g. https://api.serenytics.com/api/data_source/7e0670-8cd1-40da-93a3-10a5/push/f06274c43f8904735b9a06c3ae917" }, @@ -59,7 +59,7 @@ "type": "textInput", "label": "Data Source Storage Url for Screen", "value": "storageUrlScreen", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{1,200})$", + "regex": "(?!.*\\.ngrok\\.io)^(.{1,200})$", "required": false, "placeholder": "e.g. https://api.serenytics.com/api/data_source/7e0670-8cd1-40da-93a3-10a5/push/f06274c43f8904735b9a06c3ae917" } @@ -77,7 +77,6 @@ "type": "textInput", "placeholder": "Marketing", "value": "oneTrustCookieCategory", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "label": "Category Name/ID", "required": false } diff --git a/src/configurations/destinations/shynet/schema.json b/src/configurations/destinations/shynet/schema.json index cdb150b84..ac74b09da 100644 --- a/src/configurations/destinations/shynet/schema.json +++ b/src/configurations/destinations/shynet/schema.json @@ -10,14 +10,13 @@ }, "shynetServiceUrl": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{1,300})$" + "pattern": "^(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{1,300})$" }, - "useNativeSDK": { "type": "object", "properties": { "web": { "type": "boolean" } } }, "eventFilteringOption": { "type": "string", - "enum": ["disable", "whitelistedEvents", "blacklistedEvents"], - "default": "disable" + "pattern": "(^env[.].+)|^(disable|whitelistedEvents|blacklistedEvents)$" }, + "useNativeSDK": { "type": "object", "properties": { "web": { "type": "boolean" } } }, "whitelistedEvents": { "type": "array", "items": { @@ -37,7 +36,7 @@ "properties": { "eventName": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,300})$" } } } diff --git a/src/configurations/destinations/shynet/ui-config.json b/src/configurations/destinations/shynet/ui-config.json index ec3460172..39b2fc146 100644 --- a/src/configurations/destinations/shynet/ui-config.json +++ b/src/configurations/destinations/shynet/ui-config.json @@ -7,7 +7,7 @@ "type": "textInput", "label": "Heart Beat", "value": "heartBeatFrequencyInMs", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,10})$", + "regex": "^(.{0,10})$", "regexErrorMessage": "Length of Heart Beat must be below 10 characters.", "required": false, "secret": false, @@ -17,7 +17,7 @@ "type": "textInput", "label": "Shynet Script URL", "value": "shynetServiceUrl", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{1,300})$", + "regex": "(?!.*\\.ngrok\\.io)^(.{1,300})$", "regexErrorMessage": "Length of URL must be below 300 characters.", "required": true, "secret": false, @@ -71,7 +71,6 @@ { "type": "textInput", "value": "eventName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "required": false, "placeholder": "e.g: Anonymous Page Visit" } @@ -85,7 +84,6 @@ { "type": "textInput", "value": "eventName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "required": false, "placeholder": "e.g: Credit Card Added" } @@ -105,7 +103,6 @@ "type": "textInput", "placeholder": "Marketing", "value": "oneTrustCookieCategory", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "label": "Category Name/ID", "required": false } diff --git a/src/configurations/destinations/signl4/schema.json b/src/configurations/destinations/signl4/schema.json index dda4e9f9e..3fdc23200 100644 --- a/src/configurations/destinations/signl4/schema.json +++ b/src/configurations/destinations/signl4/schema.json @@ -1,12 +1,12 @@ { "configSchema": { "$schema": "http://json-schema.org/draft-07/schema#", - "required": ["apiKey"], "type": "object", + "required": ["apiKey"], "properties": { "apiKey": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,300})$" + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" }, "s4ServiceValue": { "type": "string", @@ -26,8 +26,7 @@ }, "s4AlertingScenarioValue": { "type": "string", - "enum": ["single_ack", "multi_ack", "emergency"], - "default": "single_ack" + "pattern": "^(single_ack|multi_ack|emergency)$" }, "s4AlertingScenarioProperty": { "type": "string", @@ -41,17 +40,13 @@ "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" }, - "s4StatusValue": { - "type": "string", - "enum": ["new", "acknowledged", "resolved"], - "default": "new" - }, + "s4StatusValue": { "type": "string", "pattern": "^(new|acknowledged|resolved)$" }, "s4StatusProperty": { "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" }, - "s4Filter": { "type": "boolean", "default": false }, - "eventToTitleMapping": { + "s4Filter": { "type": "boolean" }, + "columnToPropertyMapping": { "type": "array", "items": { "type": "object", diff --git a/src/configurations/destinations/signl4/ui-config.json b/src/configurations/destinations/signl4/ui-config.json index fcacf967d..fbc06c885 100644 --- a/src/configurations/destinations/signl4/ui-config.json +++ b/src/configurations/destinations/signl4/ui-config.json @@ -7,7 +7,7 @@ "type": "textInput", "label": "API Key", "value": "apiKey", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,300})$", + "regex": "^(.{1,300})$", "regexErrorMessage": "Invalid API Key", "required": true, "placeholder": "e.g. gi11aat8xy", @@ -23,7 +23,7 @@ "type": "textInput", "label": "Default Value", "value": "s4ServiceValue", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid X-S4-Service Value", "required": false, "placeholder": "e.g. Security", @@ -33,7 +33,7 @@ "type": "textInput", "label": "RudderStack property name", "value": "s4ServiceProperty", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid property name", "required": false, "placeholder": "e.g. service", @@ -49,7 +49,7 @@ "type": "textInput", "label": "Default Value", "value": "s4LocationValue", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid X-S4-Location Value", "required": false, "placeholder": "e.g. 40.6413111,-73.7781391", @@ -59,7 +59,7 @@ "type": "textInput", "label": "RudderStack property name", "value": "s4LocationProperty", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid property name", "required": false, "placeholder": "e.g. location", @@ -86,7 +86,7 @@ "type": "textInput", "label": "RudderStack property name", "value": "s4AlertingScenarioProperty", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid property name", "required": false, "placeholder": "e.g. alertingScenario", @@ -102,7 +102,7 @@ "type": "textInput", "label": "Default Value", "value": "s4ExternalIDValue", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid X-S4-ExternalID", "required": false, "placeholder": "e.g. INC091210", @@ -112,7 +112,7 @@ "type": "textInput", "label": "RudderStack property name", "value": "s4ExternalIDProperty", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid property name", "required": false, "placeholder": "e.g. externalId", @@ -140,7 +140,7 @@ "type": "textInput", "label": "RudderStack property name", "value": "s4StatusProperty", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid property name", "required": false, "placeholder": "e.g. status", @@ -189,7 +189,6 @@ "type": "textInput", "placeholder": "Marketing", "value": "oneTrustCookieCategory", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "label": "Category Name/ID", "required": false } diff --git a/src/configurations/destinations/singular/schema.json b/src/configurations/destinations/singular/schema.json index 2582c434f..da3946213 100644 --- a/src/configurations/destinations/singular/schema.json +++ b/src/configurations/destinations/singular/schema.json @@ -1,42 +1,26 @@ { "configSchema": { "$schema": "http://json-schema.org/draft-07/schema#", - "required": ["apiKey"], "type": "object", + "required": ["apiKey"], "properties": { - "apiKey": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^[a-zA-Z0-9_]*$" - }, - "apiSecret": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^[a-zA-Z0-9]*$" - }, + "apiKey": { "type": "string" }, + "apiSecret": { "type": "string" }, "sessionEventList": { "type": "array", "items": { "type": "object", "properties": { - "sessionEventName": { + "eventName": { "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" } } } }, - "useNativeSDK": { - "type": "object", - "properties": { - "android": { "type": "boolean" }, - "ios": { "type": "boolean" }, - "reactnative": { "type": "boolean" }, - "cordova": { "type": "boolean" } - } - }, "eventFilteringOption": { "type": "string", - "enum": ["disable", "whitelistedEvents", "blacklistedEvents"], - "default": "disable" + "pattern": "(^env[.].+)|^(disable|whitelistedEvents|blacklistedEvents)$" }, "whitelistedEvents": { "type": "array", @@ -62,6 +46,10 @@ } } }, + "useNativeSDK": { + "type": "object", + "properties": { "android": { "type": "boolean" }, "ios": { "type": "boolean" } } + }, "oneTrustCookieCategories": { "type": "array", "items": { diff --git a/src/configurations/destinations/singular/ui-config.json b/src/configurations/destinations/singular/ui-config.json index b7eed9eae..fb55a9439 100644 --- a/src/configurations/destinations/singular/ui-config.json +++ b/src/configurations/destinations/singular/ui-config.json @@ -7,7 +7,7 @@ "type": "textInput", "label": "API Key", "value": "apiKey", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^[a-zA-Z0-9_]*$", + "regex": "^[a-zA-Z0-9_]*$", "regexErrorMessage": "Invalid API Key", "required": true, "placeholder": "e.g: abcd_456e5678", @@ -17,7 +17,7 @@ "type": "textInput", "label": "Secret", "value": "apiSecret", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^[a-zA-Z0-9]*$", + "regex": "^[a-zA-Z0-9]*$", "regexErrorMessage": "Invalid Secret Key", "required": false, "placeholder": "e.g: r344c6e48c0r87y6iio567b67ad61324", @@ -32,7 +32,6 @@ { "type": "textInput", "value": "sessionEventName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "required": false, "placeholder": "e.g: Session Event Name" } @@ -86,7 +85,6 @@ { "type": "textInput", "value": "eventName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "required": false, "placeholder": "e.g: Anonymous Page Visit" } @@ -100,7 +98,6 @@ { "type": "textInput", "value": "eventName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "required": false, "placeholder": "e.g: Credit Card Added" } @@ -120,7 +117,6 @@ "type": "textInput", "placeholder": "Marketing", "value": "oneTrustCookieCategory", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "label": "Category Name/ID", "required": false } diff --git a/src/configurations/destinations/slack/schema.json b/src/configurations/destinations/slack/schema.json index 2da9b1f05..40063cfd6 100644 --- a/src/configurations/destinations/slack/schema.json +++ b/src/configurations/destinations/slack/schema.json @@ -1,9 +1,13 @@ { "configSchema": { "$schema": "http://json-schema.org/draft-07/schema#", - "required": ["webhookUrl"], "type": "object", "properties": { + "webhookUrl": { + "type": "string", + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{0,100})" + }, + "identifyTemplate": { "type": "string" }, "eventChannelSettings": { "type": "array", "items": { @@ -17,14 +21,10 @@ "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" }, - "eventRegex": { "type": "boolean", "default": false } + "eventRegex": { "type": "boolean" } } } }, - "identifyTemplate": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,1000})$" - }, "eventTemplateSettings": { "type": "array", "items": { @@ -38,14 +38,10 @@ "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,1000})$" }, - "eventRegex": { "type": "boolean", "default": false } + "eventRegex": { "type": "boolean" } } } }, - "webhookUrl": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{0,100})$" - }, "whitelistedTraitsSettings": { "type": "array", "items": { @@ -53,7 +49,7 @@ "properties": { "trait": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})" } } } diff --git a/src/configurations/destinations/slack/ui-config.json b/src/configurations/destinations/slack/ui-config.json index 6c4f8fc4c..c6382bc51 100644 --- a/src/configurations/destinations/slack/ui-config.json +++ b/src/configurations/destinations/slack/ui-config.json @@ -11,7 +11,7 @@ "type": "textInput", "label": "Event Name", "value": "eventName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid Event Name", "required": false, "placeholder": "e.g: ABCDEFG" @@ -20,7 +20,7 @@ "type": "textInput", "label": "Event Channel", "value": "eventChannel", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid Event Channel", "required": false, "placeholder": "e.g: ABCDEFG" @@ -42,7 +42,7 @@ "type": "textInput", "label": "Identify Template", "value": "identifyTemplate", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,1000})$", + "regex": "^(.{0,1000})$", "regexErrorMessage": "Invalid Identify Template", "required": false, "placeholder": "e.g: ABCDEFG" @@ -60,7 +60,7 @@ "type": "textInput", "label": "Event Name", "value": "eventName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid Event Name", "required": false, "placeholder": "e.g: ABCDEFG" @@ -69,7 +69,7 @@ "type": "textInput", "label": "Event Template", "value": "eventTemplate", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,1000})$", + "regex": "^(.{0,1000})$", "regexErrorMessage": "Invalid Event Template", "required": false, "placeholder": "e.g: ABCDEFG" diff --git a/src/configurations/destinations/snapchat_conversion/schema.json b/src/configurations/destinations/snapchat_conversion/schema.json index e3ffe35d9..be8efcca7 100644 --- a/src/configurations/destinations/snapchat_conversion/schema.json +++ b/src/configurations/destinations/snapchat_conversion/schema.json @@ -1,8 +1,8 @@ { "configSchema": { "$schema": "http://json-schema.org/draft-07/schema#", - "required": ["apiKey"], "type": "object", + "required": ["apiKey"], "properties": { "apiKey": { "type": "string", @@ -12,14 +12,8 @@ "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" }, - "snapAppId": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" - }, - "appId": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" - }, + "snapAppId": { "type": "string" }, + "appId": { "type": "string" }, "rudderEventsToSnapEvents": { "type": "array", "items": { @@ -31,45 +25,16 @@ }, "to": { "type": "string", - "enum": [ - "products_searched", - "product_list_viewed", - "promotion_viewed", - "promotion_clicked", - "product_viewed", - "checkout_started", - "payment_info_entered", - "order_completed", - "product_added", - "product_added_to_wishlist", - "sign_up", - "app_open", - "save", - "subscribe", - "complete_tutorial", - "invite", - "login", - "share", - "reserve", - "achievement_unlocked", - "spent_credits", - "rate", - "start_trial", - "list_view", - "page_view", - "app_install", - "custom_event_1", - "custom_event_2", - "custom_event_3", - "custom_event_4", - "custom_event_5", - "" - ] + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" } } } }, - "enableDeduplication": { "type": "boolean", "default": false }, + "enableDeduplication": { "type": "boolean" }, + "deduplicationKey": { + "type": "string", + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" + }, "oneTrustCookieCategories": { "type": "array", "items": { @@ -82,23 +47,6 @@ } } } - }, - "anyOf": [ - { - "if": { - "properties": { "enableDeduplication": { "const": true } }, - "required": ["enableDeduplication"] - }, - "then": { - "properties": { - "deduplicationKey": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" - } - }, - "required": ["deduplicationKey"] - } - } - ] + } } } diff --git a/src/configurations/destinations/snapchat_conversion/ui-config.json b/src/configurations/destinations/snapchat_conversion/ui-config.json index 8811db5af..676103aff 100644 --- a/src/configurations/destinations/snapchat_conversion/ui-config.json +++ b/src/configurations/destinations/snapchat_conversion/ui-config.json @@ -7,7 +7,7 @@ "type": "textInput", "label": "API Token", "value": "apiKey", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,500})$", + "regex": "^(.{1,500})$", "required": true, "placeholder": "e.g. MTp6WHZyNbJXZVNMMm11AlJ1R1BXeVVBOkk0dFk5dkEybUVEWAw5NHk5dXBYUjBIdWp6QzZCNC1TMEFGU9QwYVdnUjg", "secret": true, @@ -17,7 +17,7 @@ "type": "textInput", "label": "Pixel ID", "value": "pixelId", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid Pixel ID", "required": false, "placeholder": "e.g: 836d6231-aad6-4e41-9cbb-5854565cad8e", @@ -29,7 +29,6 @@ "label": "Snap App ID", "value": "snapAppId", "required": false, - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "placeholder": "e.g: 836d6231-aad6-4e41-9cbb-5854565cad8e", "secret": true, "footerNote": "Your Snap App ID" @@ -39,7 +38,6 @@ "label": "App ID", "value": "appId", "required": false, - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "placeholder": "e.g: 836d6231-aad6-4e41-9cbb-5854565cad8e", "secret": true, "footerNote": "Your App ID" @@ -109,9 +107,8 @@ "preRequisiteField": [{ "name": "enableDeduplication", "selectedValue": true }], "label": "Deduplication Key", "value": "deduplicationKey", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", "placeholder": "e.g: messageId", - "required": true, + "required": false, "footerNote": "RudderStack will use this field for deduplication. If nothing is specified, messageId field will be used." } ] @@ -128,7 +125,6 @@ "type": "textInput", "placeholder": "Marketing", "value": "oneTrustCookieCategory", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "label": "Category Name/ID", "required": false } diff --git a/src/configurations/destinations/snapchat_custom_audience/schema.json b/src/configurations/destinations/snapchat_custom_audience/schema.json index e3f6aa58b..75b492a28 100644 --- a/src/configurations/destinations/snapchat_custom_audience/schema.json +++ b/src/configurations/destinations/snapchat_custom_audience/schema.json @@ -1,15 +1,15 @@ { "configSchema": { "$schema": "http://json-schema.org/draft-07/schema#", - "required": ["segmentId", "schema"], "type": "object", + "required": ["segmentId"], "properties": { "segmentId": { "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" }, - "schema": { "type": "string", "enum": ["email", "phone", "mobileAdId"], "default": "email" }, - "disableHashing": { "type": "boolean", "default": false }, + "schema": { "type": "string", "pattern": "^(email|phone|mobileAdId)$" }, + "disableHashing": { "type": "boolean" }, "oneTrustCookieCategories": { "type": "array", "items": { diff --git a/src/configurations/destinations/snapchat_custom_audience/ui-config.json b/src/configurations/destinations/snapchat_custom_audience/ui-config.json index cc9bc3de9..64846d94c 100644 --- a/src/configurations/destinations/snapchat_custom_audience/ui-config.json +++ b/src/configurations/destinations/snapchat_custom_audience/ui-config.json @@ -7,7 +7,7 @@ "type": "textInput", "label": "Segment Id", "value": "segmentId", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{1,100})$", "regexErrorMessage": "Invalid Segment Id", "required": true, "placeholder": "e.g. 4996042382964722", @@ -52,7 +52,6 @@ "type": "textInput", "placeholder": "Marketing", "value": "oneTrustCookieCategory", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "label": "Category Name/ID", "required": false } diff --git a/src/configurations/destinations/snapengage/schema.json b/src/configurations/destinations/snapengage/schema.json index c3fdbeac3..4715b4896 100644 --- a/src/configurations/destinations/snapengage/schema.json +++ b/src/configurations/destinations/snapengage/schema.json @@ -8,12 +8,27 @@ "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" }, - "useNativeSDK": { "type": "object", "properties": { "web": { "type": "boolean" } } }, - "recordLiveChatEvents": { "type": "boolean", "default": false }, + "recordLiveChatEvents": { "type": "boolean" }, + "updateEventNames": { "type": "boolean" }, + "eventsToStandard": { + "type": "array", + "items": { + "type": "object", + "properties": { + "from": { + "type": "string", + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + }, + "to": { + "type": "string", + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + } + } + } + }, "eventFilteringOption": { "type": "string", - "enum": ["disable", "whitelistedEvents", "blacklistedEvents"], - "default": "disable" + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(disable|whitelistedEvents|blacklistedEvents)$" }, "whitelistedEvents": { "type": "array", @@ -51,55 +66,6 @@ } } } - }, - "allOf": [ - { - "if": { - "properties": { "recordLiveChatEvents": { "const": true } }, - "required": ["recordLiveChatEvents"] - }, - "then": { - "properties": { "updateEventNames": { "type": "boolean", "default": false } }, - "required": [] - } - }, - { - "if": { - "properties": { - "recordLiveChatEvents": { "const": true }, - "updateEventNames": { "const": true } - }, - "required": ["recordLiveChatEvents", "updateEventNames"] - }, - "then": { - "properties": { - "eventsToStandard": { - "type": "array", - "items": { - "type": "object", - "properties": { - "from": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" - }, - "to": { - "type": "string", - "enum": [ - "startChat", - "close", - "chatMessageSent", - "chatMessageReceived", - "inlineButtonClicked", - "" - ] - } - } - } - } - }, - "required": [] - } - } - ] + } } } diff --git a/src/configurations/destinations/snapengage/ui-config.json b/src/configurations/destinations/snapengage/ui-config.json index 1a1bed04a..cfb45b573 100644 --- a/src/configurations/destinations/snapengage/ui-config.json +++ b/src/configurations/destinations/snapengage/ui-config.json @@ -7,7 +7,7 @@ "type": "textInput", "label": "Widget ID", "value": "widgetId", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{1,100})$", "regexErrorMessage": "Widget ID length should be less than 100 characters", "required": true, "placeholder": "e.g: 0c739ebb-2016-44a0-b1da-a5b5eb272474", @@ -129,7 +129,6 @@ { "type": "textInput", "value": "eventName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "required": false, "placeholder": "e.g: Anonymous Page Visit" } @@ -143,7 +142,6 @@ { "type": "textInput", "value": "eventName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "required": false, "placeholder": "e.g: Credit Card Added" } @@ -163,7 +161,6 @@ "type": "textInput", "placeholder": "Marketing", "value": "oneTrustCookieCategory", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "label": "Category Name/ID", "required": false } diff --git a/src/configurations/destinations/snowflake/schema.json b/src/configurations/destinations/snowflake/schema.json index 36b185cba..597116dbd 100644 --- a/src/configurations/destinations/snowflake/schema.json +++ b/src/configurations/destinations/snowflake/schema.json @@ -1,6 +1,7 @@ { "configSchema": { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "http://json-schema.org/draft-07/schema", + "type": "object", "required": [ "account", "database", @@ -10,52 +11,67 @@ "syncFrequency", "useRudderStorage" ], - "type": "object", "properties": { "account": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" + "pattern": "(^env[.].+)|^(.{1,100})$" }, "database": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" + "pattern": "(^env[.].+)|^(.{1,100})$" }, "warehouse": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" + "pattern": "(^env[.].+)|^(.{1,100})$" }, "user": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" + "pattern": "(^env[.].+)|^(.{1,100})$" }, "role": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "(^env[.].*)|^(.{0,100})$" + }, + "password": { + "type": "string", + "pattern": "(^env[.].+)|.+" }, - "password": { "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|.*" }, "namespace": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^((?!pg_|PG_|pG_|Pg_).{0,64})$" + "pattern": "(^env[.].*)|^((?!pg_|PG_|pG_|Pg_).{0,64})$" }, "syncFrequency": { "type": "string", - "enum": ["30", "60", "180", "360", "720", "1440"], + "pattern": "^(30|60|180|360|720|1440)$", "default": "30" }, - "syncStartAt": { "type": "string" }, + "syncStartAt": { + "type": "string" + }, "excludeWindow": { "type": "object", + "required": ["excludeWindowStartTime", "excludeWindowEndTime"], "properties": { - "excludeWindowStartTime": { "type": "string" }, - "excludeWindowEndTime": { "type": "string" } - }, - "required": ["excludeWindowStartTime", "excludeWindowEndTime"] + "excludeWindowStartTime": { + "type": "string" + }, + "excludeWindowEndTime": { + "type": "string" + } + } }, "jsonPaths": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.*)$" + "pattern": "(^env[.].*)|.*" + }, + "useRudderStorage": { + "type": "boolean", + "default": false + }, + "cloudProvider": { + "type": "string", + "pattern": "^(AWS|GCP|AZURE)$" }, - "useRudderStorage": { "type": "boolean", "default": false }, "oneTrustCookieCategories": { "type": "array", "items": { @@ -67,41 +83,61 @@ } } } - }, - "ketchConsentPurposes": { - "type": "array", - "items": { - "type": "object", - "properties": { "purpose": { "type": "string", "pattern": "^(.{0,100})$" } } + } + }, + "ketchConsentPurposes": { + "type": "array", + "items": { + "type": "object", + "properties": { + "purpose": { + "type": "string", + "pattern": "^(.{0,100})$" + } } } }, "allOf": [ { "if": { - "properties": { "useRudderStorage": { "const": false } }, + "properties": { + "useRudderStorage": { + "const": false + } + }, + "required": ["useRudderStorage"] + }, + "then": { + "required": ["cloudProvider"] + } + }, + { + "if": { + "properties": { + "useRudderStorage": { + "const": false + } + }, "required": ["useRudderStorage"] }, "then": { "properties": { - "cloudProvider": { - "type": "string", - "enum": ["AWS", "GCP", "AZURE"], - "default": "AWS" - }, "prefix": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "(^env[.].*)|^(.{0,100})$" } - }, - "required": ["cloudProvider"] + } } }, { "if": { "properties": { - "cloudProvider": { "const": "AWS" }, - "useRudderStorage": { "const": false } + "cloudProvider": { + "const": "AWS" + }, + "useRudderStorage": { + "const": false + } }, "required": ["cloudProvider", "useRudderStorage"] }, @@ -109,37 +145,26 @@ "properties": { "bucketName": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^((?!^xn--)(?!.*\\.\\..*)(?!^(\\d+(\\.|$)){4}$)[a-z0-9][a-z0-9-.]{1,61}[a-z0-9])$" + "pattern": "(^env[.].+)|^((?!^xn--)(?!.*\\.\\..*)(?!^(\\d+(\\.|$)){4}$)[a-z0-9][a-z0-9-.]{1,61}[a-z0-9])$" }, - "storageIntegration": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" - }, - "roleBasedAuth": { "type": "boolean", "default": true }, - "enableSSE": { "type": "boolean", "default": false } + "enableSSE": { + "type": "boolean" + } }, "required": ["bucketName"], "anyOf": [ { + "type": "object", "properties": { - "accessKeyID": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" - }, - "accessKey": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" - }, - "roleBasedAuth": { "const": false } + "accessKeyID": { "type": "string", "pattern": "(^env[.].+)|^(.{0,100})$" }, + "accessKey": { "type": "string", "pattern": "(^env[.].+)|^(.{0,100})$" } }, "required": ["accessKeyID", "accessKey"] }, { + "type": "object", "properties": { - "iamRoleARN": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" - }, + "iamRoleARN": { "type": "string" }, "roleBasedAuth": { "const": true } }, "required": ["iamRoleARN", "roleBasedAuth"] @@ -150,8 +175,12 @@ { "if": { "properties": { - "cloudProvider": { "const": "GCP" }, - "useRudderStorage": { "const": false } + "cloudProvider": { + "const": "GCP" + }, + "useRudderStorage": { + "const": false + } }, "required": ["cloudProvider", "useRudderStorage"] }, @@ -159,25 +188,28 @@ "properties": { "bucketName": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^((?!goog)(?!.*google.*)(?!^(\\d+(\\.|$)){4}$)(?!.*\\.\\..*)[a-z0-9][a-z0-9-._]{1,61}[a-z0-9])$" + "pattern": "(^env[.].+)|^((?!goog)(?!.*google.*)(?!^(\\d+(\\.|$)){4}$)(?!.*\\.\\..*)[a-z0-9][a-z0-9-._]{1,61}[a-z0-9])$" }, - "storageIntegration": { + "credentials": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" + "pattern": "(^env[.].+)|.+" }, - "credentials": { + "storageIntegration": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|.*" + "pattern": "(^env[.].+)|^(.{1,100})$" } - }, - "required": ["bucketName", "storageIntegration", "credentials"] + } } }, { "if": { "properties": { - "cloudProvider": { "const": "AZURE" }, - "useRudderStorage": { "const": false } + "cloudProvider": { + "const": "AZURE" + }, + "useRudderStorage": { + "const": false + } }, "required": ["cloudProvider", "useRudderStorage"] }, @@ -185,27 +217,24 @@ "properties": { "containerName": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(?=.{3,63}$)[a-z0-9]+(-[a-z0-9]+)*$" - }, - "storageIntegration": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" + "pattern": "(^env[.].+)|^(?=.{3,63}$)[a-z0-9]+(-[a-z0-9]+)*$" }, "accountName": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" + "pattern": "(^env[.].+)|^(.{1,100})$" }, - "useSASTokens": { "type": "boolean", "default": false } + "storageIntegration": { + "type": "string", + "pattern": "(^env[.].+)|^(.{1,100})$" + } }, - "required": ["containerName", "storageIntegration", "accountName"], "anyOf": [ { "properties": { "accountKey": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" - }, - "useSASTokens": { "const": false } + "pattern": "(^env[.].+)|^(.{1,100})$" + } }, "required": ["accountKey"] }, @@ -213,15 +242,18 @@ "properties": { "sasToken": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.+)$" + "pattern": "(^env[.].+)|^(.+)$" }, - "useSASTokens": { "const": true } + "useSASTokens": { + "const": true + } }, "required": ["sasToken", "useSASTokens"] } ] } } - ] + ], + "additionalProperties": true } } diff --git a/src/configurations/destinations/snowflake/ui-config.json b/src/configurations/destinations/snowflake/ui-config.json index c55ae41fc..b72c15616 100644 --- a/src/configurations/destinations/snowflake/ui-config.json +++ b/src/configurations/destinations/snowflake/ui-config.json @@ -7,7 +7,7 @@ "type": "textInput", "label": "Account", "value": "account", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid Account", "placeholder": "e.g: qya54180.us-east-1", "required": true @@ -16,7 +16,7 @@ "type": "textInput", "label": "Database", "value": "database", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid Database", "placeholder": "e.g: RUDDER_EVENTS", "required": true @@ -25,7 +25,7 @@ "type": "textInput", "label": "Warehouse", "value": "warehouse", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid Database", "placeholder": "e.g: RUDDER_WAREHOUSE", "required": true @@ -34,7 +34,7 @@ "type": "textInput", "label": "User", "value": "user", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid User", "placeholder": "e.g: RUDDER_USER", "required": true @@ -43,7 +43,7 @@ "type": "textInput", "label": "Role", "value": "role", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid Role", "placeholder": "e.g: RUDDER_ROLE", "required": false @@ -52,7 +52,7 @@ "type": "textInput", "label": "Password", "value": "password", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|.*", + "regex": ".*", "placeholder": "e.g: RUDDER_PASSWORD", "required": true, "secret": true @@ -62,7 +62,7 @@ "label": "Namespace", "labelNote": "Schema name for the warehouse where the tables are created", "value": "namespace", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^((?!pg_|PG_|pG_|Pg_).{0,64})$", + "regex": "^((?!pg_|PG_|pG_|Pg_).{0,64})$", "regexErrorMessage": "Invalid Namespace", "required": false, "placeholder": "e.g: RUDDER_NAMESPACE", @@ -102,7 +102,7 @@ "name": "Every 30 minutes", "value": "30" }, - "required": true + "required": false }, { "type": "timePicker", @@ -139,7 +139,7 @@ "label": "JSON columns (Optional)", "labelNote": "Specify required JSON properties in dot notation separated by commas", "value": "jsonPaths", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.*)$", + "regex": "^(.*)$", "placeholder": "e.g: testMap.nestedMap, testArray", "required": false, "footerURL": { @@ -157,8 +157,7 @@ "label": "Use RudderStack managed object storage", "value": "useRudderStorage", "default": false, - "footerNote": "Note: Only available for RudderStack managed data planes", - "required": true + "footerNote": "Note: Only available for RudderStack managed data planes" }, { "type": "singleSelect", @@ -203,7 +202,7 @@ "label": "Staging S3 Storage Bucket Name", "labelNote": "S3 Bucket to store data before loading into Snowflake", "value": "bucketName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^((?!^xn--)(?!.*\\.\\..*)(?!^(\\d+(\\.|$)){4}$)[a-z0-9][a-z0-9-.]{1,61}[a-z0-9])$", + "regex": "^((?!^xn--)(?!.*\\.\\..*)(?!^(\\d+(\\.|$)){4}$)[a-z0-9][a-z0-9-.]{1,61}[a-z0-9])$", "regexErrorMessage": "Invalid Staging S3 Storage Bucket Name", "placeholder": "e.g: s3-event-logs", "required": true, @@ -224,7 +223,7 @@ "label": "Staging GCS Object Storage Bucket Name", "labelNote": "GCS Bucket to store data before loading into Snowflake", "value": "bucketName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^((?!goog)(?!.*google.*)(?!^(\\d+(\\.|$)){4}$)(?!.*\\.\\..*)[a-z0-9][a-z0-9-._]{1,61}[a-z0-9])$", + "regex": "^((?!goog)(?!.*google.*)(?!^(\\d+(\\.|$)){4}$)(?!.*\\.\\..*)[a-z0-9][a-z0-9-._]{1,61}[a-z0-9])$", "regexErrorMessage": "Invalid Staging GCS Object Storage Bucket Name", "required": true, "placeholder": "e.g: gcs-event-logs", @@ -245,7 +244,7 @@ "label": "Staging Azure Blob Storage Container Name", "labelNote": "Container to store data before loading into Snowflake", "value": "containerName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(?=.{3,63}$)[a-z0-9]+(-[a-z0-9]+)*$", + "regex": "^(?=.{3,63}$)[a-z0-9]+(-[a-z0-9]+)*$", "regexErrorMessage": "Invalid Staging Azure Blob Storage Container Name", "required": true, "placeholder": "e.g: azure-event-logs", @@ -255,7 +254,7 @@ "type": "textInput", "label": "Prefix", "value": "prefix", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid Prefix", "required": false, "placeholder": "e.g: rudder", @@ -278,7 +277,7 @@ ], "label": "Storage Integration", "value": "storageIntegration", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid Storage Integration", "placeholder": "e.g: aws_int", "footerURL": { @@ -300,7 +299,7 @@ ], "label": "Storage Integration", "value": "storageIntegration", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid Storage Integration", "required": true, "placeholder": "e.g: gcs_int", @@ -323,7 +322,7 @@ ], "label": "Storage Integration", "value": "storageIntegration", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid Storage Integration", "required": true, "placeholder": "e.g: azure_int", @@ -366,7 +365,7 @@ ], "label": "IAM Role ARN", "value": "iamRoleARN", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid Role ARN", "required": true, "placeholder": "e.g: arn:aws:iam::123456789012:role/S3Access", @@ -393,7 +392,7 @@ ], "label": "AWS Access Key ID", "value": "accessKeyID", - "regex": "^(.{1,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid AWS Access Key ID", "required": true, "placeholder": "e.g: access-key-id", @@ -417,7 +416,7 @@ ], "label": "AWS Secret Access Key", "value": "accessKey", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid AWS Secret Access Key", "required": true, "placeholder": "e.g: secret-access-key", @@ -453,7 +452,7 @@ ], "label": "Azure Blob Storage Account Name", "value": "accountName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid Azure Blob Storage Account Name", "required": true, "placeholder": "e.g: account-name" @@ -476,7 +475,7 @@ ], "label": "Azure Blob Storage Account Key", "value": "accountKey", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid Azure Blob Storage Account Key", "required": true, "secret": true, @@ -500,7 +499,7 @@ ], "label": "Azure Blob Storage SAS Token", "value": "sasToken", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.+)$", + "regex": "^(.+)$", "regexErrorMessage": "Invalid Azure Blob Storage SAS Token", "required": true, "placeholder": "e.g: sas-token", @@ -538,7 +537,7 @@ "label": "Credentials", "labelNote": "GCP Service Account credentials JSON for RudderStack to use in loading data into your Google Cloud Storage", "value": "credentials", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|.*", + "regex": ".*", "required": true, "footerNote": "Create a service account in your GCP Project for RudderStack with roles of 'storage.objectCreator'" } @@ -556,7 +555,6 @@ "type": "textInput", "placeholder": "Marketing", "value": "oneTrustCookieCategory", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "label": "Category Name/ID", "required": false } diff --git a/src/configurations/destinations/tiktok_ads/schema.json b/src/configurations/destinations/tiktok_ads/schema.json index f677b0b10..210a71345 100644 --- a/src/configurations/destinations/tiktok_ads/schema.json +++ b/src/configurations/destinations/tiktok_ads/schema.json @@ -1,52 +1,36 @@ { "configSchema": { "$schema": "http://json-schema.org/draft-07/schema#", - "required": ["pixelCode"], "type": "object", + "required": [ + "pixelCode" + ], "properties": { - "accessToken": { "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|.*" }, + "accessToken": { + "type": "string", + "pattern": ".*" + }, "pixelCode": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" + "pattern": "^(.{0,100})$" + }, + "hashUserProperties": { + "type": "boolean" }, - "hashUserProperties": { "type": "boolean", "default": true }, "eventsToStandard": { "type": "array", "items": { "type": "object", "properties": { "from": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "type": "string" }, "to": { - "type": "string", - "enum": [ - "AddPaymentInfo", - "AddToCart", - "AddToWishlist", - "ClickButton", - "CompletePayment", - "CompleteRegistration", - "Contact", - "Download", - "InitiateCheckout", - "PlaceAnOrder", - "Search", - "SubmitForm", - "Subscribe", - "ViewContent", - "" - ] + "type": "string" } } } }, - "eventFilteringOption": { - "type": "string", - "enum": ["disable", "whitelistedEvents", "blacklistedEvents"], - "default": "disable" - }, "whitelistedEvents": { "type": "array", "items": { @@ -71,7 +55,14 @@ } } }, - "useNativeSDK": { "type": "object", "properties": { "web": { "type": "boolean" } } }, + "useNativeSDK": { + "type": "object", + "properties": { + "web": { + "type": "boolean" + } + } + }, "oneTrustCookieCategories": { "type": "array", "items": { @@ -88,9 +79,14 @@ "type": "array", "items": { "type": "object", - "properties": { "purpose": { "type": "string", "pattern": "^(.{0,100})$" } } + "properties": { + "purpose": { + "type": "string", + "pattern": "^(.{0,100})$" + } + } } } } } -} +} \ No newline at end of file diff --git a/src/configurations/destinations/tiktok_ads/ui-config.json b/src/configurations/destinations/tiktok_ads/ui-config.json index fac9a7957..34dd91e21 100644 --- a/src/configurations/destinations/tiktok_ads/ui-config.json +++ b/src/configurations/destinations/tiktok_ads/ui-config.json @@ -7,7 +7,7 @@ "type": "textInput", "label": "Access Token", "value": "accessToken", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|.*", + "regex": ".*", "required": false, "placeholder": "e.g. 1234ac663758946dfea3520b394bbac611b371f7", "secret": true, @@ -17,7 +17,7 @@ "type": "textInput", "label": "Pixel Code", "value": "pixelCode", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid Pixel Code", "required": true, "placeholder": "e.g: A1T8T4UYGVIQA8ORZMX9", @@ -142,7 +142,6 @@ { "type": "textInput", "value": "eventName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "required": false, "placeholder": "e.g: Anonymous Page Visit" } @@ -156,7 +155,6 @@ { "type": "textInput", "value": "eventName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "required": false, "placeholder": "e.g: Credit Card Added" } @@ -187,7 +185,6 @@ "type": "textInput", "placeholder": "Marketing", "value": "oneTrustCookieCategory", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "label": "Category Name/ID", "required": false } @@ -211,4 +208,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/src/configurations/destinations/tiktok_ads_offline_events/schema.json b/src/configurations/destinations/tiktok_ads_offline_events/schema.json index 9b0a46788..ac474fc1a 100644 --- a/src/configurations/destinations/tiktok_ads_offline_events/schema.json +++ b/src/configurations/destinations/tiktok_ads_offline_events/schema.json @@ -1,8 +1,8 @@ { "configSchema": { "$schema": "http://json-schema.org/draft-07/schema#", - "required": ["accessToken"], "type": "object", + "required": ["accessToken"], "properties": { "accessToken": { "type": "string", @@ -19,12 +19,12 @@ }, "to": { "type": "string", - "enum": ["CompletePayment", "Contact", "SubmitForm", "Subscribe", ""] + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" } } } }, - "hashUserProperties": { "type": "boolean", "default": true }, + "hashUserProperties": { "type": "boolean" }, "oneTrustCookieCategories": { "type": "array", "items": { diff --git a/src/configurations/destinations/tiktok_ads_offline_events/ui-config.json b/src/configurations/destinations/tiktok_ads_offline_events/ui-config.json index 55528b091..97e7d167f 100644 --- a/src/configurations/destinations/tiktok_ads_offline_events/ui-config.json +++ b/src/configurations/destinations/tiktok_ads_offline_events/ui-config.json @@ -7,7 +7,7 @@ "type": "textInput", "label": "Access Token", "value": "accessToken", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", + "regex": "^(.{0,100})$", "required": true, "placeholder": "e.g. 1234ac663758946dfea3520b394bbac611b371f7", "secret": true, @@ -61,7 +61,6 @@ "type": "textInput", "placeholder": "Marketing", "value": "oneTrustCookieCategory", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "label": "Category Name/ID", "required": false } diff --git a/src/configurations/destinations/user/schema.json b/src/configurations/destinations/user/schema.json index de051e124..21e56be5b 100644 --- a/src/configurations/destinations/user/schema.json +++ b/src/configurations/destinations/user/schema.json @@ -1,12 +1,12 @@ { "configSchema": { "$schema": "http://json-schema.org/draft-07/schema#", - "required": ["apiKey", "appSubdomain"], "type": "object", + "required": ["apiKey"], "properties": { "apiKey": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,500})$" }, "appSubdomain": { "type": "string", diff --git a/src/configurations/destinations/user/ui-config.json b/src/configurations/destinations/user/ui-config.json index 3c1031cc7..d940af1ec 100644 --- a/src/configurations/destinations/user/ui-config.json +++ b/src/configurations/destinations/user/ui-config.json @@ -7,7 +7,7 @@ "type": "textInput", "label": "Public REST API Key", "value": "apiKey", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid API Key", "required": true, "placeholder": "e.g: 1d6583b196d34de28a3g19ahadde4b0z" @@ -16,7 +16,7 @@ "type": "textInput", "label": "Your App Subdomain", "value": "appSubdomain", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,500})$", + "regex": "^(.{0,500})$", "regexErrorMessage": "Invalid App Subdomain", "required": true, "placeholder": "e.g: commander" @@ -100,7 +100,6 @@ "type": "textInput", "placeholder": "Marketing", "value": "oneTrustCookieCategory", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "label": "Category Name/ID", "required": false } diff --git a/src/configurations/destinations/vero/schema.json b/src/configurations/destinations/vero/schema.json index 7980232ec..8770afda4 100644 --- a/src/configurations/destinations/vero/schema.json +++ b/src/configurations/destinations/vero/schema.json @@ -1,13 +1,9 @@ { "configSchema": { "$schema": "http://json-schema.org/draft-07/schema#", - "required": [], "type": "object", + "required": [], "properties": { - "authToken": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,150})$" - }, "apiKey": { "type": "object", "properties": { @@ -17,12 +13,7 @@ } } }, - "useNativeSDK": { "type": "object", "properties": { "web": { "type": "boolean" } } }, - "eventFilteringOption": { - "type": "string", - "enum": ["disable", "whitelistedEvents", "blacklistedEvents"], - "default": "disable" - }, + "authToken": { "type": "string" }, "whitelistedEvents": { "type": "array", "items": { @@ -47,6 +38,7 @@ } } }, + "useNativeSDK": { "type": "object", "properties": { "web": { "type": "boolean" } } }, "oneTrustCookieCategories": { "type": "array", "items": { diff --git a/src/configurations/destinations/vero/ui-config.json b/src/configurations/destinations/vero/ui-config.json index e915fdebd..01e7ab2df 100644 --- a/src/configurations/destinations/vero/ui-config.json +++ b/src/configurations/destinations/vero/ui-config.json @@ -7,7 +7,7 @@ "type": "textInput", "label": "Authentication Token", "value": "authToken", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,150})$", + "regex": "^(.{0,150})$", "regexErrorMessage": "Length of Authentication Token must be below 150 characters.", "required": false, "secret": true, @@ -17,7 +17,7 @@ "type": "textInput", "label": "API Key", "value": "apiKey", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", + "regex": "^(.{0,50})$", "regexErrorMessage": "Length of API Key must be below 50 characters.", "required": false, "secret": true, @@ -103,7 +103,6 @@ "type": "textInput", "placeholder": "Marketing", "value": "oneTrustCookieCategory", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "label": "Category Name/ID", "required": false } diff --git a/src/configurations/destinations/vitally/ui-config.json b/src/configurations/destinations/vitally/ui-config.json index 994f0908c..dd934784c 100644 --- a/src/configurations/destinations/vitally/ui-config.json +++ b/src/configurations/destinations/vitally/ui-config.json @@ -7,7 +7,7 @@ "type": "textInput", "label": "API KEY", "value": "apiKeyVitally", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,500})$", + "regex": "^(.{1,500})$", "regexErrorMessage": "Length of API KEY must be below 200 characters.", "required": true, "secret": true, @@ -27,7 +27,6 @@ "type": "textInput", "placeholder": "Marketing", "value": "oneTrustCookieCategory", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "label": "Category Name/ID", "required": false } diff --git a/src/configurations/destinations/vwo/schema.json b/src/configurations/destinations/vwo/schema.json index 33a0819d8..888358477 100644 --- a/src/configurations/destinations/vwo/schema.json +++ b/src/configurations/destinations/vwo/schema.json @@ -1,21 +1,28 @@ { "configSchema": { "$schema": "http://json-schema.org/draft-07/schema#", - "required": ["accountId"], "type": "object", + "required": ["accountId"], "properties": { "accountId": { + "type": "string", + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" + }, + "isSPA": { "type": "boolean" }, + "sendExperimentTrack": { "type": "boolean" }, + "sendExperimentIdentify": { "type": "boolean" }, + "libraryTolerance": { "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" }, - "isSPA": { "type": "boolean", "default": false }, - "sendExperimentTrack": { "type": "boolean", "default": false }, - "sendExperimentIdentify": { "type": "boolean", "default": false }, - "useNativeSDK": { "type": "object", "properties": { "web": { "type": "boolean" } } }, + "settingsTolerance": { + "type": "string", + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + }, + "useExistingJquery": { "type": "boolean" }, "eventFilteringOption": { "type": "string", - "enum": ["disable", "whitelistedEvents", "blacklistedEvents"], - "default": "disable" + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(^(disable|whitelistedEvents|blacklistedEvents)$)" }, "whitelistedEvents": { "type": "array", @@ -41,15 +48,7 @@ } } }, - "libraryTolerance": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" - }, - "settingsTolerance": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" - }, - "useExistingJquery": { "type": "boolean", "default": false }, + "useNativeSDK": { "type": "object", "properties": { "web": { "type": "boolean" } } }, "oneTrustCookieCategories": { "type": "array", "items": { diff --git a/src/configurations/destinations/vwo/ui-config.json b/src/configurations/destinations/vwo/ui-config.json index b9ee61051..5f2af5437 100644 --- a/src/configurations/destinations/vwo/ui-config.json +++ b/src/configurations/destinations/vwo/ui-config.json @@ -7,7 +7,7 @@ "type": "textInput", "label": "Account Id", "value": "accountId", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid Account Id", "required": true, "placeholder": "e.g: 410057" @@ -78,7 +78,6 @@ { "type": "textInput", "value": "eventName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "required": false, "placeholder": "e.g: Anonymous Page Visit" } @@ -92,7 +91,6 @@ { "type": "textInput", "value": "eventName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "required": false, "placeholder": "e.g: Credit Card Added" } @@ -107,7 +105,7 @@ "type": "textInput", "label": "Library Tolerance", "value": "libraryTolerance", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid Library Tolerance", "placeholder": "e.g: 2000", "default": "2500" @@ -116,7 +114,7 @@ "type": "textInput", "label": "Setting Tolerance", "value": "settingsTolerance", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid Setting Tolerance", "placeholder": "e.g: 2000", "default": "2000" @@ -141,7 +139,6 @@ "type": "textInput", "placeholder": "Marketing", "value": "oneTrustCookieCategory", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "label": "Category Name/ID", "required": false } diff --git a/src/configurations/destinations/webengage/schema.json b/src/configurations/destinations/webengage/schema.json index d1c041860..4fcc40fdf 100644 --- a/src/configurations/destinations/webengage/schema.json +++ b/src/configurations/destinations/webengage/schema.json @@ -1,8 +1,8 @@ { "configSchema": { "$schema": "http://json-schema.org/draft-07/schema#", - "required": ["licenseCode", "apiKey", "dataCenter"], "type": "object", + "required": ["licenseCode", "apiKey", "dataCenter"], "properties": { "licenseCode": { "type": "string", @@ -12,7 +12,10 @@ "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" }, - "dataCenter": { "type": "string", "enum": ["standard", "ind"], "default": "standard" }, + "dataCenter": { + "type": "string", + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(standard|ind)$" + }, "oneTrustCookieCategories": { "type": "array", "items": { diff --git a/src/configurations/destinations/webengage/ui-config.json b/src/configurations/destinations/webengage/ui-config.json index 2bc0c8d86..d1e78326f 100644 --- a/src/configurations/destinations/webengage/ui-config.json +++ b/src/configurations/destinations/webengage/ui-config.json @@ -7,7 +7,7 @@ "type": "textInput", "label": "License Code", "value": "licenseCode", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{1,100})$", "required": true, "placeholder": "e.g. b4a29aba", "secret": true @@ -16,7 +16,7 @@ "type": "textInput", "label": "Api Key", "value": "apiKey", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{1,100})$", "required": true, "placeholder": "e.g. b4a29aba17jmbad7b6c1a5asjghj", "secret": true @@ -25,7 +25,6 @@ "type": "singleSelect", "label": "Data Center", "value": "dataCenter", - "required": true, "options": [ { "name": "Standard", "value": "standard" }, { "name": "IND", "value": "ind" } @@ -46,7 +45,6 @@ "type": "textInput", "placeholder": "Marketing", "value": "oneTrustCookieCategory", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "label": "Category Name/ID", "required": false } diff --git a/src/configurations/destinations/webhook/schema.json b/src/configurations/destinations/webhook/schema.json index 6cf73802b..b9bf8b7aa 100644 --- a/src/configurations/destinations/webhook/schema.json +++ b/src/configurations/destinations/webhook/schema.json @@ -1,8 +1,8 @@ { "configSchema": { "$schema": "http://json-schema.org/draft-07/schema#", - "required": ["webhookUrl"], "type": "object", + "required": ["webhookUrl"], "properties": { "webhookUrl": { "type": "string", @@ -10,8 +10,7 @@ }, "webhookMethod": { "type": "string", - "enum": ["POST", "PUT", "PATCH", "GET", "DELETE"], - "default": "POST" + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(^(POST|PUT|PATCH|GET|DELETE)$)" }, "headers": { "type": "array", @@ -20,11 +19,11 @@ "properties": { "from": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,1000})$" + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" }, "to": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,1000})$" + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100000})$" } } } diff --git a/src/configurations/destinations/webhook/ui-config.json b/src/configurations/destinations/webhook/ui-config.json index c24be2871..59409991d 100644 --- a/src/configurations/destinations/webhook/ui-config.json +++ b/src/configurations/destinations/webhook/ui-config.json @@ -31,7 +31,6 @@ "labelLeft": "Key", "labelRight": "Value", "keyLeft": "from", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,1000})$", "keyRight": "to", "placeholderLeft": "content-type", "placeholderRight": "application/json", @@ -51,7 +50,6 @@ "type": "textInput", "placeholder": "Marketing", "value": "oneTrustCookieCategory", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "label": "Category Name/ID", "required": false } diff --git a/src/configurations/destinations/woopra/schema.json b/src/configurations/destinations/woopra/schema.json index 9e36b7f90..fdfb411c9 100644 --- a/src/configurations/destinations/woopra/schema.json +++ b/src/configurations/destinations/woopra/schema.json @@ -1,41 +1,20 @@ { "configSchema": { "$schema": "http://json-schema.org/draft-07/schema#", - "required": ["projectName"], "type": "object", + "required": ["projectName"], "properties": { - "projectName": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(([a-z0-9]+[.])+[a-z]{1,})$" - }, - "cookieName": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" - }, - "cookieDomain": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" - }, - "clickTracking": { "type": "boolean", "default": false }, - "cookiePath": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" - }, - "downloadTracking": { "type": "boolean", "default": true }, - "hideCampaign": { "type": "boolean", "default": false }, - "idleTimeout": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^([0-9]+)$" - }, - "ignoreQueryUrl": { "type": "boolean", "default": true }, - "outgoingIgnoreSubdomain": { "type": "boolean", "default": true }, - "outgoingTracking": { "type": "boolean", "default": false }, - "useNativeSDK": { "type": "object", "properties": { "web": { "type": "boolean" } } }, - "eventFilteringOption": { - "type": "string", - "enum": ["disable", "whitelistedEvents", "blacklistedEvents"], - "default": "disable" - }, + "projectName": { "type": "string", "pattern": "^(([a-z0-9]+[.])+[a-z]{1,})$" }, + "cookieName": { "type": "string" }, + "cookieDomain": { "type": "string" }, + "clickTracking": { "type": "boolean" }, + "cookiePath": { "type": "string" }, + "downloadTracking": { "type": "boolean" }, + "hideCampaign": { "type": "boolean" }, + "idleTimeout": { "type": "string" }, + "ignoreQueryUrl": { "type": "boolean" }, + "outgoingIgnoreSubdomain": { "type": "boolean" }, + "outgoingTracking": { "type": "boolean" }, "whitelistedEvents": { "type": "array", "items": { @@ -60,6 +39,7 @@ } } }, + "useNativeSDK": { "type": "object", "properties": { "web": { "type": "boolean" } } }, "oneTrustCookieCategories": { "type": "array", "items": { diff --git a/src/configurations/destinations/woopra/ui-config.json b/src/configurations/destinations/woopra/ui-config.json index a1386e760..d0ad27445 100644 --- a/src/configurations/destinations/woopra/ui-config.json +++ b/src/configurations/destinations/woopra/ui-config.json @@ -8,7 +8,7 @@ "label": "Project Name", "value": "projectName", "required": true, - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(([a-z0-9]+[.])+[a-z]{1,})$", + "regex": "^(([a-z0-9]+[.])+[a-z]{1,})$", "regexErrorMessage": "Project Name should be a Domain.", "placeholder": "e.g: myproject.com", "footerNote": "Enter The name of your project in Woopra. This would be used as fallback value if not provided inside integrations object of payload." @@ -23,7 +23,6 @@ "type": "textInput", "label": "Cookie Name", "value": "cookieName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "default": "wooTracker", "required": false, "placeholder": "e.g: wpTracker", @@ -33,7 +32,6 @@ "type": "textInput", "label": "Cookie Domain", "value": "cookieDomain", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "required": false, "placeholder": "e.g: test", "footerNote": "Domain scope of the Woopra cookie. Default: Website domain." @@ -42,7 +40,6 @@ "type": "checkbox", "label": "Click Tracking", "value": "clickTracking", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "required": false, "default": false, "footerNote": "Tracks user click interactions with links and buttons. Default: False." @@ -51,7 +48,6 @@ "type": "textInput", "label": "Cookie Path", "value": "cookiePath", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "required": false, "placeholder": "e.g: newFolder/test", "default": "/", @@ -78,7 +74,7 @@ "label": "Idle Timeout", "value": "idleTimeout", "required": false, - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^([0-9]+)$", + "regex": "^([0-9]+)$", "regexErrorMessage": "Idle Timeout should be a number.", "default": "300000", "placeholder": "20000000", @@ -156,7 +152,6 @@ { "type": "textInput", "value": "eventName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "required": false, "placeholder": "e.g: Anonymous Page Visit" } @@ -170,7 +165,6 @@ { "type": "textInput", "value": "eventName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "required": false, "placeholder": "e.g: Credit Card Added" } @@ -190,7 +184,6 @@ "type": "textInput", "placeholder": "Marketing", "value": "oneTrustCookieCategory", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "label": "Category Name/ID", "required": false } diff --git a/src/configurations/destinations/wootric/schema.json b/src/configurations/destinations/wootric/schema.json index 0647ad77d..c4c5ac68c 100644 --- a/src/configurations/destinations/wootric/schema.json +++ b/src/configurations/destinations/wootric/schema.json @@ -1,14 +1,14 @@ { "configSchema": { "$schema": "http://json-schema.org/draft-07/schema#", - "required": ["username", "password", "accountToken"], "type": "object", + "required": ["username", "password", "accountToken"], "properties": { "username": { "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" }, - "password": { "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|.*" }, + "password": { "type": "string", "pattern": "(^env[.].+)|.+" }, "accountToken": { "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" diff --git a/src/configurations/destinations/wootric/ui-config.json b/src/configurations/destinations/wootric/ui-config.json index cdc8584cf..93bf13437 100644 --- a/src/configurations/destinations/wootric/ui-config.json +++ b/src/configurations/destinations/wootric/ui-config.json @@ -7,7 +7,7 @@ "type": "textInput", "label": "Username", "value": "username", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{1,100})$", "regexErrorMessage": "Invalid User", "required": true, "placeholder": "e.g. test@gmail.com", @@ -17,7 +17,7 @@ "type": "textInput", "label": "Password", "value": "password", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|.*", + "regex": ".*", "required": true, "placeholder": "e.g. password@123", "secret": true @@ -26,7 +26,7 @@ "type": "textInput", "label": "Account Token", "value": "accountToken", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid Account Token", "required": true, "placeholder": "e.g. NPS-123456", @@ -46,7 +46,6 @@ "type": "textInput", "placeholder": "Marketing", "value": "oneTrustCookieCategory", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "label": "Category Name/ID", "required": false } diff --git a/src/configurations/destinations/yahoo_dsp/schema.json b/src/configurations/destinations/yahoo_dsp/schema.json index cb3230eab..ca1b90f7c 100644 --- a/src/configurations/destinations/yahoo_dsp/schema.json +++ b/src/configurations/destinations/yahoo_dsp/schema.json @@ -1,8 +1,8 @@ { "configSchema": { "$schema": "http://json-schema.org/draft-07/schema#", - "required": ["clientId", "clientSecret", "accountId", "audienceType", "audienceId"], "type": "object", + "required": ["clientId", "clientSecret", "audienceId", "accountId"], "properties": { "clientId": { "type": "string", @@ -12,20 +12,17 @@ "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" }, - "accountId": { + "audienceId": { "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^[0-9]+$" }, - "audienceType": { - "type": "string", - "enum": ["EMAIL", "DEVICE_ID", "IP_ADDRESS"], - "default": "EMAIL" - }, - "audienceId": { + "accountId": { "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^[0-9]+$" }, - "hashRequired": { "type": "boolean", "default": true }, + "audienceType": { "type": "string", "pattern": "^(EMAIL|DEVICE_ID|IP_ADDRESS)$" }, + "seedListType": { "type": "string", "pattern": "^(GPADVID|IDFA)$" }, + "hashRequired": { "type": "boolean" }, "oneTrustCookieCategories": { "type": "array", "items": { @@ -38,20 +35,6 @@ } } } - }, - "anyOf": [ - { - "if": { - "properties": { "audienceType": { "const": "DEVICE_ID" } }, - "required": ["audienceType"] - }, - "then": { - "properties": { - "seedListType": { "type": "string", "enum": ["GPADVID", "IDFA"], "default": "GPADVID" } - }, - "required": ["seedListType"] - } - } - ] + } } } diff --git a/src/configurations/destinations/yahoo_dsp/ui-config.json b/src/configurations/destinations/yahoo_dsp/ui-config.json index 3337b7eda..94866cca1 100644 --- a/src/configurations/destinations/yahoo_dsp/ui-config.json +++ b/src/configurations/destinations/yahoo_dsp/ui-config.json @@ -7,7 +7,7 @@ "type": "textInput", "label": "Client Id", "value": "clientId", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{1,100})$", "regexErrorMessage": "Invalid Client Id", "required": true, "placeholder": "e.g. b05ebeb8-a223-3cd6-z4c5-9512d3d66d431", @@ -18,7 +18,7 @@ "type": "textInput", "label": "Client Secret", "value": "clientSecret", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{1,100})$", "regexErrorMessage": "Invalid Client Secret", "required": true, "placeholder": "e.g: XpewiPsz3yc9LrADR43f9h53jADLccXTykHCcA6eEoFR4rXQ", @@ -34,7 +34,7 @@ "type": "textInput", "label": "Account Id", "value": "accountId", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^[0-9]+$", + "regex": "^[0-9]+$", "regexErrorMessage": "Invalid Account Id", "required": true, "placeholder": "e.g. 84223", @@ -77,7 +77,7 @@ "type": "textInput", "label": "Audience Id", "value": "audienceId", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^[0-9]+$", + "regex": "^[0-9]+$", "regexErrorMessage": "Invalid Audience Id", "required": true, "placeholder": "e.g. 53213445", @@ -110,7 +110,6 @@ "type": "textInput", "placeholder": "Marketing", "value": "oneTrustCookieCategory", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "label": "Category Name/ID", "required": false } diff --git a/src/configurations/destinations/yandex_metrica/schema.json b/src/configurations/destinations/yandex_metrica/schema.json index 4d3723dc0..2c77637c9 100644 --- a/src/configurations/destinations/yandex_metrica/schema.json +++ b/src/configurations/destinations/yandex_metrica/schema.json @@ -1,17 +1,17 @@ { "configSchema": { "$schema": "http://json-schema.org/draft-07/schema#", - "required": ["tagId"], "type": "object", + "required": ["tagId"], "properties": { "tagId": { "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" }, - "clickMap": { "type": "boolean", "default": false }, - "trackLinks": { "type": "boolean", "default": false }, - "trackBounce": { "type": "boolean", "default": false }, - "webvisor": { "type": "boolean", "default": false }, + "clickMap": { "type": "boolean" }, + "trackLinks": { "type": "boolean" }, + "trackBounce": { "type": "boolean" }, + "webvisor": { "type": "boolean" }, "containerName": { "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" @@ -25,19 +25,20 @@ "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" }, - "to": { "type": "string", "enum": ["detail", "add", "remove", "purchase", ""] } + "to": { + "type": "string", + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + } } } }, - "goalId": { + "eventFilteringOption": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^[0-9]+$" + "pattern": "(^env[.].+)|^(disable|whitelistedEvents|blacklistedEvents)$" }, - "useNativeSDK": { "type": "object", "properties": { "web": { "type": "boolean" } } }, - "eventFilteringOption": { + "goalId": { "type": "string", - "enum": ["disable", "whitelistedEvents", "blacklistedEvents"], - "default": "disable" + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^[0-9]+$" }, "whitelistedEvents": { "type": "array", @@ -63,6 +64,7 @@ } } }, + "useNativeSDK": { "type": "object", "properties": { "web": { "type": "boolean" } } }, "oneTrustCookieCategories": { "type": "array", "items": { diff --git a/src/configurations/destinations/yandex_metrica/ui-config.json b/src/configurations/destinations/yandex_metrica/ui-config.json index 831c5ec4a..c2828d2b2 100644 --- a/src/configurations/destinations/yandex_metrica/ui-config.json +++ b/src/configurations/destinations/yandex_metrica/ui-config.json @@ -7,7 +7,7 @@ "type": "textInput", "label": "Tag ID", "value": "tagId", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{1,100})$", "regexErrorMessage": "Invalid Tag ID, example value 56252632", "required": true, "placeholder": "e.g. 56252632", @@ -51,7 +51,7 @@ "type": "textInput", "label": "Container name", "value": "containerName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid Container name", "required": false, "placeholder": "e.g. dataLayer", @@ -91,7 +91,7 @@ "type": "textInput", "label": "Goal ID", "value": "goalId", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^[0-9]+$", + "regex": "^[0-9]+$", "regexErrorMessage": "Invalid Goal ID", "required": false, "placeholder": "e.g. 263922671", @@ -146,7 +146,6 @@ { "type": "textInput", "value": "eventName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "required": false, "placeholder": "e.g: Anonymous Page Visit" } @@ -160,7 +159,6 @@ { "type": "textInput", "value": "eventName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "required": false, "placeholder": "e.g: Credit Card Added" } @@ -180,7 +178,6 @@ "type": "textInput", "placeholder": "Marketing", "value": "oneTrustCookieCategory", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "label": "Category Name/ID", "required": false } diff --git a/src/configurations/destinations/zapier/schema.json b/src/configurations/destinations/zapier/schema.json index bdf30bde7..02affeed9 100644 --- a/src/configurations/destinations/zapier/schema.json +++ b/src/configurations/destinations/zapier/schema.json @@ -1,8 +1,8 @@ { "configSchema": { "$schema": "http://json-schema.org/draft-07/schema#", - "required": ["zapUrl"], "type": "object", + "required": ["zapUrl"], "properties": { "zapUrl": { "type": "string", diff --git a/src/configurations/destinations/zapier/ui-config.json b/src/configurations/destinations/zapier/ui-config.json index 4532fb85c..868295f79 100644 --- a/src/configurations/destinations/zapier/ui-config.json +++ b/src/configurations/destinations/zapier/ui-config.json @@ -7,7 +7,7 @@ "type": "textInput", "label": "Zap URL", "value": "zapUrl", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{1,100})$", + "regex": "(?!.*\\.ngrok\\.io)^(.{1,100})$", "regexErrorMessage": "Invalid Zap URL", "required": true, "placeholder": "e.g. https://hooks.zapier.com/hooks/catch/123456/abcdefg/", @@ -54,7 +54,6 @@ "type": "textInput", "placeholder": "Marketing", "value": "oneTrustCookieCategory", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "label": "Category Name/ID", "required": false } diff --git a/src/configurations/destinations/zendesk/schema.json b/src/configurations/destinations/zendesk/schema.json index 0857dc53c..47acc678a 100644 --- a/src/configurations/destinations/zendesk/schema.json +++ b/src/configurations/destinations/zendesk/schema.json @@ -1,26 +1,26 @@ { "configSchema": { "$schema": "http://json-schema.org/draft-07/schema#", - "required": ["email", "apiToken", "domain"], "type": "object", "additionalProperties": false, + "required": ["email", "apiToken", "domain"], "properties": { "email": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" }, "apiToken": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" }, "domain": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$" + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" }, - "createUsersAsVerified": { "type": "boolean", "default": false }, - "sendGroupCallsWithoutUserId": { "type": "boolean", "default": false }, - "removeUsersFromOrganization": { "type": "boolean", "default": false }, - "searchByExternalId": { "type": "boolean", "default": false }, + "createUsersAsVerified": { "type": "boolean" }, + "sendGroupCallsWithoutUserId": { "type": "boolean" }, + "removeUsersFromOrganization": { "type": "boolean" }, + "searchByExternalId": { "type": "boolean" }, "oneTrustCookieCategories": { "type": "array", "items": { diff --git a/src/configurations/destinations/zendesk/ui-config.json b/src/configurations/destinations/zendesk/ui-config.json index 1c8db35bf..4a61ed791 100644 --- a/src/configurations/destinations/zendesk/ui-config.json +++ b/src/configurations/destinations/zendesk/ui-config.json @@ -7,7 +7,7 @@ "type": "textInput", "label": "Email", "value": "email", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid Email Address", "required": true, "placeholder": "e.g: abc@xyz.com" @@ -16,7 +16,7 @@ "type": "textInput", "label": "API Token", "value": "apiToken", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid API Token", "required": true, "placeholder": "API Token for Zendesk login", @@ -26,7 +26,7 @@ "type": "textInput", "label": "Zendesk Subdomain", "value": "domain", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$", + "regex": "^(.{0,100})$", "regexErrorMessage": "Invalid Zendesk Subdomain", "required": true, "placeholder": "Subdomain only not including .zendesk.com" @@ -70,7 +70,6 @@ "type": "textInput", "placeholder": "Marketing", "value": "oneTrustCookieCategory", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", "label": "Category Name/ID", "required": false } diff --git a/test/data/validation/destinations/pinterest_tag.json b/test/data/validation/destinations/pinterest_tag.json index 5cd470bd6..b8ba4513c 100644 --- a/test/data/validation/destinations/pinterest_tag.json +++ b/test/data/validation/destinations/pinterest_tag.json @@ -21,7 +21,7 @@ "eventsMapping": [ { "from": "Track Ping", - "to": "Lead" + "to": "ping" } ] }, @@ -47,7 +47,7 @@ "eventsMapping": [ { "from": "Track Ping", - "to": "Lead" + "to": "ping" } ] }, @@ -74,15 +74,12 @@ "eventsMapping": [ { "from": "Track Ping", - "to": "Lead" + "to": "ping" } ] }, "result": false, - "err": [ - "advertiserId must match pattern \"(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^[0-9]*$\"", - " must match \"then\" schema" - ] + "err": ["advertiserId must match pattern \"(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^[0-9]*$\""] }, { "config": { @@ -103,7 +100,7 @@ "eventsMapping": [ { "from": "Track Ping", - "to": "Lead" + "to": "ping" } ] }, @@ -130,14 +127,13 @@ "eventsMapping": [ { "from": "Track Ping", - "to": "Lead" + "to": "ping" } ] }, "result": false, "err": [ - "deduplicationKey must match pattern \"(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$\"", - " must match \"then\" schema" + "deduplicationKey must match pattern \"(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$\"" ] }, { @@ -163,15 +159,12 @@ "eventsMapping": [ { "from": "Track Ping", - "to": "Lead" + "to": "ping" } ] }, "result": false, - "err": [ - "adAccountId must match pattern \"(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^[0-9]*$\"", - " must match \"then\" schema" - ] + "err": ["adAccountId must match pattern \"(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^[0-9]*$\""] }, { "config": { @@ -196,14 +189,13 @@ "eventsMapping": [ { "from": "Track Ping", - "to": "Lead" + "to": "ping" } ] }, "result": false, "err": [ - "conversionToken must match pattern \"(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,101})$\"", - " must match \"then\" schema" + "conversionToken must match pattern \"(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,101})$\"" ] } ] diff --git a/test/data/validation/destinations/quora_pixel.json b/test/data/validation/destinations/quora_pixel.json index 33e337155..162099b45 100644 --- a/test/data/validation/destinations/quora_pixel.json +++ b/test/data/validation/destinations/quora_pixel.json @@ -5,7 +5,7 @@ "eventsToQPEvents": [ { "from": "Order Completed", - "to": "InitiateCheckout" + "to": "Initiate Checkout" } ], "eventFilteringOption": "disable", @@ -30,7 +30,7 @@ "eventsToQPEvents": [ { "from": "Order Completed", - "to": "InitiateCheckout" + "to": "Initiate Checkout" }, { "from": "Anonymous Page Visit", @@ -38,7 +38,7 @@ }, { "from": "Credit Card Added", - "to": "AddPaymentInfo" + "to": "Add Payment Info" } ], "eventFilteringOption": "whitelistedEvents", @@ -53,7 +53,7 @@ "eventsToQPEvents": [ { "from": "Order Completed", - "to": "InitiateCheckout" + "to": "Initiate Checkout" } ], "eventFilteringOption": "disable", @@ -69,7 +69,7 @@ "eventsToQPEvents": [ { "from": "Order Completed", - "to": "InitiateCheckout" + "to": "Initiate Checkout" } ], "eventFilteringOption": "disable", @@ -84,7 +84,7 @@ "eventsToQPEvents": [ { "from": "Order Completed", - "to": "InitiateCheckout" + "to": "Initiate Checkout" } ], "eventFilteringOption": "disable", diff --git a/test/data/validation/destinations/rs.json b/test/data/validation/destinations/rs.json index 0e70b6fec..364cc27eb 100644 --- a/test/data/validation/destinations/rs.json +++ b/test/data/validation/destinations/rs.json @@ -12,7 +12,6 @@ "useRudderStorage": false, "useSTSTokens": false, "bucketName": "test-bucket", - "roleBasedAuth": false, "accessKeyID": "", "accessKey": "" }, @@ -29,12 +28,10 @@ "syncFrequency": "30", "enableSSE": false, "useRudderStorage": false, - "roleBasedAuth": true, "useSTSTokens": false, "bucketName": "test-bucket", "accessKeyID": "test-access-key-id", - "accessKey": "test-access-key", - "iamRoleARN": "fdsf" + "accessKey": "test-access-key" }, "result": true }, @@ -72,12 +69,7 @@ "roleBasedAuth": true }, "result": false, - "err": [ - "roleBasedAuth must be equal to constant", - " must have required property 'iamRoleARN'", - " must match a schema in anyOf", - " must match \"then\" schema" - ] + "err": [" must have required property 'iamRoleARN'", " must match \"then\" schema"] }, { "config": { @@ -92,13 +84,12 @@ "useRudderStorage": false, "useSTSTokens": false, "bucketName": "{{}}", - "roleBasedAuth": false, "accessKeyID": "test-access-key-id", "accessKey": "test-access-key" }, "result": false, "err": [ - "bucketName must match pattern \"(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^((?!^xn--)(?!.*\\.\\..*)(?!^(\\d+(\\.|$)){4}$)[a-z0-9][a-z0-9-.]{1,61}[a-z0-9])$|(^\\{\\{.+\\}\\}$)\"", + "bucketName must match pattern \"(^env[.].+)|^((?!^xn--)(?!.*\\.\\..*)(?!^(\\d+(\\.|$)){4}$)[a-z0-9][a-z0-9-.]{1,61}[a-z0-9])$|(^\\{\\{.+\\}\\}$)\"", " must match \"then\" schema" ] }, @@ -115,7 +106,6 @@ "useRudderStorage": false, "useSTSTokens": false, "bucketName": "{{ TEST_BUCKET }}", - "roleBasedAuth": false, "accessKeyID": "test-access-key-id", "accessKey": "test-access-key" }, @@ -134,14 +124,13 @@ "useRudderStorage": false, "useSTSTokens": false, "syncFrequency": "30", - "roleBasedAuth": false, "bucketName": "ab..ab", "accessKeyID": "test-access-key-id", "accessKey": "test-access-key" }, "result": false, "err": [ - "bucketName must match pattern \"(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^((?!^xn--)(?!.*\\.\\..*)(?!^(\\d+(\\.|$)){4}$)[a-z0-9][a-z0-9-.]{1,61}[a-z0-9])$|(^\\{\\{.+\\}\\}$)\"", + "bucketName must match pattern \"(^env[.].+)|^((?!^xn--)(?!.*\\.\\..*)(?!^(\\d+(\\.|$)){4}$)[a-z0-9][a-z0-9-.]{1,61}[a-z0-9])$|(^\\{\\{.+\\}\\}$)\"", " must match \"then\" schema" ] }, @@ -160,7 +149,6 @@ "useRudderStorage": false, "bucketName": "{{ TEST_BUCKET }}", "prefix": "rudder", - "roleBasedAuth": false, "accessKeyID": "test-access-key-id", "accessKey": "test-access-key", "useSTSTokens": false @@ -186,7 +174,6 @@ "useRudderStorage": false, "bucketName": "{{ TEST_BUCKET }}", "prefix": "rudder", - "roleBasedAuth": false, "accessKeyID": "test-access-key-id", "accessKey": "test-access-key", "useSTSTokens": false diff --git a/test/data/validation/destinations/s3.json b/test/data/validation/destinations/s3.json index b152afda2..a0778242d 100644 --- a/test/data/validation/destinations/s3.json +++ b/test/data/validation/destinations/s3.json @@ -5,7 +5,6 @@ "prefix": "load-GA", "accessKeyID": "test-access-key-id", "accessKey": "test-access-key", - "roleBasedAuth": false, "enableSSE": false }, "result": true @@ -17,7 +16,6 @@ "accessKey": "test-access-key", "enableSSE": true, "testConnection": false, - "roleBasedAuth": false, "testConnectionTS": 1627655059687 }, "result": false, @@ -28,7 +26,6 @@ "bucketName": "iqw.btex.deltalake.production", "accessKeyID": "test-access-key-id", "accessKey": "test-access-key", - "roleBasedAuth": false, "enableSSE": true }, "result": true @@ -37,7 +34,6 @@ "config": { "bucketName": "iqw.btex.deltalake.production", "prefix": "tashforcenonsse/app_events/", - "roleBasedAuth": false, "accessKeyID": "test-access-key-id", "accessKey": "test-access-key" }, @@ -48,7 +44,6 @@ "bucketName": "iqw.btex.deltalake.production", "prefix": ["p1", "p2"], "accessKeyID": "test-access-key-id", - "roleBasedAuth": false, "accessKey": "test-access-key", "enableSSE": false }, @@ -62,7 +57,6 @@ "p1qpqowoeujdjhfsjcbcnfhhruthgdhdhffpoahwbseytxyideodjfwoefhdwofwbqbckjqowjhdbsjhdhdbfdefbvbswdbswvdwvuqvqooiwqdwcwewef", "p2" ], - "roleBasedAuth": false, "accessKeyID": "test-access-key-id", "accessKey": "test-access-key", "enableSSE": false diff --git a/test/data/validation/destinations/s3_datalake.json b/test/data/validation/destinations/s3_datalake.json index 50477f6f3..f35dd384e 100644 --- a/test/data/validation/destinations/s3_datalake.json +++ b/test/data/validation/destinations/s3_datalake.json @@ -64,7 +64,7 @@ }, "result": false, "err": [ - "bucketName must match pattern \"(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^((?!^xn--)(?!.*\\.\\..*)(?!^(\\d+(\\.|$)){4}$)[a-z0-9][a-z0-9-.]{1,61}[a-z0-9])$\"" + "bucketName must match pattern \"(^env[.].+)|^((?!^xn--)(?!.*\\.\\..*)(?!^(\\d+(\\.|$)){4}$)[a-z0-9][a-z0-9-.]{1,61}[a-z0-9])$\"" ] }, { @@ -93,7 +93,7 @@ }, "result": false, "err": [ - "bucketName must match pattern \"(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^((?!^xn--)(?!.*\\.\\..*)(?!^(\\d+(\\.|$)){4}$)[a-z0-9][a-z0-9-.]{1,61}[a-z0-9])$\"" + "bucketName must match pattern \"(^env[.].+)|^((?!^xn--)(?!.*\\.\\..*)(?!^(\\d+(\\.|$)){4}$)[a-z0-9][a-z0-9-.]{1,61}[a-z0-9])$\"" ] }, { @@ -109,7 +109,7 @@ }, "result": false, "err": [ - "bucketName must match pattern \"(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^((?!^xn--)(?!.*\\.\\..*)(?!^(\\d+(\\.|$)){4}$)[a-z0-9][a-z0-9-.]{1,61}[a-z0-9])$\"" + "bucketName must match pattern \"(^env[.].+)|^((?!^xn--)(?!.*\\.\\..*)(?!^(\\d+(\\.|$)){4}$)[a-z0-9][a-z0-9-.]{1,61}[a-z0-9])$\"" ] }, { @@ -125,7 +125,7 @@ }, "result": false, "err": [ - "bucketName must match pattern \"(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^((?!^xn--)(?!.*\\.\\..*)(?!^(\\d+(\\.|$)){4}$)[a-z0-9][a-z0-9-.]{1,61}[a-z0-9])$\"" + "bucketName must match pattern \"(^env[.].+)|^((?!^xn--)(?!.*\\.\\..*)(?!^(\\d+(\\.|$)){4}$)[a-z0-9][a-z0-9-.]{1,61}[a-z0-9])$\"" ] }, { @@ -141,7 +141,7 @@ }, "result": false, "err": [ - "bucketName must match pattern \"(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^((?!^xn--)(?!.*\\.\\..*)(?!^(\\d+(\\.|$)){4}$)[a-z0-9][a-z0-9-.]{1,61}[a-z0-9])$\"" + "bucketName must match pattern \"(^env[.].+)|^((?!^xn--)(?!.*\\.\\..*)(?!^(\\d+(\\.|$)){4}$)[a-z0-9][a-z0-9-.]{1,61}[a-z0-9])$\"" ] } ] diff --git a/test/data/validation/destinations/sendinblue.json b/test/data/validation/destinations/sendinblue.json index 136d25b6a..708b9fd2f 100644 --- a/test/data/validation/destinations/sendinblue.json +++ b/test/data/validation/destinations/sendinblue.json @@ -83,9 +83,7 @@ }, "result": false, "err": [ - "templateId must match pattern \"(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^[0-9]+$\"", - " must match \"then\" schema", - " must match a schema in anyOf" + "templateId must match pattern \"(^\\{\\{.*\\|\\|(.*?)\\}\\}$)|(^env[.].+)|^[0-9]+$|^$\"" ] }, { @@ -97,11 +95,7 @@ "redirectionUrl": "https://my.sendinblue.com/" }, "result": false, - "err": [ - "templateId must be string", - " must match \"then\" schema", - " must match a schema in anyOf" - ] + "err": ["templateId must be string"] }, { "config": { @@ -113,9 +107,7 @@ }, "result": false, "err": [ - "redirectionUrl must match pattern \"(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(?:http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]+$\"", - " must match \"then\" schema", - " must match a schema in anyOf" + "redirectionUrl must match pattern \"(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(?:http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]+$|^$\"" ] } ] diff --git a/test/data/validation/destinations/shynet.json b/test/data/validation/destinations/shynet.json index 3096f67e5..ab7eedf51 100644 --- a/test/data/validation/destinations/shynet.json +++ b/test/data/validation/destinations/shynet.json @@ -29,7 +29,7 @@ "shynetServiceUrl": "" }, "err": [ - "shynetServiceUrl must match pattern \"(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{1,300})$\"" + "shynetServiceUrl must match pattern \"^(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{1,300})$\"" ] } ] diff --git a/test/data/validation/destinations/snowflake.json b/test/data/validation/destinations/snowflake.json index be514ee0f..59efeb44c 100644 --- a/test/data/validation/destinations/snowflake.json +++ b/test/data/validation/destinations/snowflake.json @@ -10,7 +10,6 @@ "syncFrequency": "30", "enableSSE": false, "useRudderStorage": false, - "roleBasedAuth": false, "prefix": "test-prefix", "useSTSTokens": false, "bucketName": "test-bucket", @@ -49,7 +48,6 @@ "syncFrequency": "30", "enableSSE": false, "useRudderStorage": false, - "roleBasedAuth": false, "prefix": "test-prefix", "useSTSTokens": false, "bucketName": "test-bucket" @@ -59,7 +57,7 @@ " must have required property 'accessKeyID'", " must have required property 'accessKey'", " must have required property 'iamRoleARN'", - "roleBasedAuth must be equal to constant", + " must have required property 'roleBasedAuth'", " must match a schema in anyOf", " must match \"then\" schema" ] @@ -75,7 +73,6 @@ "syncFrequency": "30", "enableSSE": false, "useRudderStorage": false, - "roleBasedAuth": false, "prefix": "test-prefix", "useSTSTokens": false, "bucketName": "test-bucket", @@ -85,7 +82,7 @@ "err": [ " must have required property 'accessKey'", " must have required property 'iamRoleARN'", - "roleBasedAuth must be equal to constant", + " must have required property 'roleBasedAuth'", " must match a schema in anyOf", " must match \"then\" schema" ] @@ -110,7 +107,6 @@ "err": [ " must have required property 'accessKeyID'", " must have required property 'accessKey'", - "roleBasedAuth must be equal to constant", " must have required property 'iamRoleARN'", " must match a schema in anyOf", " must match \"then\" schema" @@ -128,7 +124,6 @@ "syncFrequency": "30", "enableSSE": false, "useRudderStorage": false, - "roleBasedAuth": false, "prefix": "test-prefix", "useSTSTokens": false, "bucketName": "test-bucket", @@ -147,8 +142,6 @@ "sslMode": "disable", "syncFrequency": "30", "useRudderStorage": false, - "roleBasedAuth": false, - "storageIntegration": "gcp_int", "prefix": "", "cloudProvider": "GCP", "bucketName": "test-bucket", @@ -173,10 +166,6 @@ "sslMode": "disable", "syncFrequency": "30", "useRudderStorage": false, - "roleBasedAuth": false, - "sasToken": "sas-token", - "useSASTokens": false, - "storageIntegration": "gcp_int", "cloudProvider": "AZURE", "containerName": "test-container", "accountName": "test-account-name", @@ -195,9 +184,7 @@ "sslMode": "disable", "syncFrequency": "30", "useRudderStorage": false, - "roleBasedAuth": false, "cloudProvider": "AZURE", - "storageIntegration": "gcp_int", "containerName": "test-container", "accountName": "test-account-name", "accountKey": "test-azure-account-key", @@ -217,9 +204,7 @@ "sslMode": "disable", "syncFrequency": "30", "useRudderStorage": false, - "roleBasedAuth": false, "cloudProvider": "AZURE", - "storageIntegration": "gcp_int", "containerName": "test-container", "accountName": "test-account-name", "accountKey": "", @@ -239,9 +224,7 @@ "sslMode": "disable", "syncFrequency": "30", "useRudderStorage": false, - "roleBasedAuth": false, "cloudProvider": "AZURE", - "storageIntegration": "gcp_int", "containerName": "test-container", "accountName": "test-account-name", "accountKey": "test-azure-account-key", @@ -261,8 +244,6 @@ "sslMode": "disable", "syncFrequency": "30", "useRudderStorage": false, - "roleBasedAuth": false, - "storageIntegration": "gcp_int", "cloudProvider": "AZURE", "containerName": "test-container", "accountName": "test-account-name", @@ -283,8 +264,6 @@ "sslMode": "disable", "syncFrequency": "30", "useRudderStorage": false, - "roleBasedAuth": false, - "storageIntegration": "gcp_int", "cloudProvider": "AZURE", "containerName": "test-container", "accountName": "test-account-name", @@ -310,8 +289,6 @@ "cloudProvider": "AWS", "enableSSE": false, "useRudderStorage": false, - "roleBasedAuth": false, - "storageIntegration": "gcp_int", "prefix": "test-prefix", "useSTSTokens": false, "syncFrequency": "30", @@ -321,7 +298,7 @@ }, "result": false, "err": [ - "bucketName must match pattern \"(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^((?!^xn--)(?!.*\\.\\..*)(?!^(\\d+(\\.|$)){4}$)[a-z0-9][a-z0-9-.]{1,61}[a-z0-9])$\"", + "bucketName must match pattern \"(^env[.].+)|^((?!^xn--)(?!.*\\.\\..*)(?!^(\\d+(\\.|$)){4}$)[a-z0-9][a-z0-9-.]{1,61}[a-z0-9])$\"", " must match \"then\" schema" ] }, @@ -335,11 +312,9 @@ "sslMode": "disable", "syncFrequency": "30", "useRudderStorage": false, - "roleBasedAuth": false, "prefix": "test-prefix", "cloudProvider": "GCP", "bucketName": "test..bucket", - "storageIntegration": "gcp_int", "endPoint": "", "useSSL": true, "credentials": "{}", @@ -351,7 +326,7 @@ }, "result": false, "err": [ - "bucketName must match pattern \"(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^((?!goog)(?!.*google.*)(?!^(\\d+(\\.|$)){4}$)(?!.*\\.\\..*)[a-z0-9][a-z0-9-._]{1,61}[a-z0-9])$\"", + "bucketName must match pattern \"(^env[.].+)|^((?!goog)(?!.*google.*)(?!^(\\d+(\\.|$)){4}$)(?!.*\\.\\..*)[a-z0-9][a-z0-9-._]{1,61}[a-z0-9])$\"", " must match \"then\" schema" ] }, @@ -365,20 +340,16 @@ "sslMode": "disable", "syncFrequency": "30", "useRudderStorage": false, - "roleBasedAuth": false, "prefix": "test-prefix", "cloudProvider": "AZURE", "containerName": "test--container", "accountName": "test-account-name", - "useSASTokens": true, - "storageIntegration": "gcp_int", - "sasToken": "sas-token", "accountKey": "test-azure-account-key", "useSSL": true }, "result": false, "err": [ - "containerName must match pattern \"(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(?=.{3,63}$)[a-z0-9]+(-[a-z0-9]+)*$\"", + "containerName must match pattern \"(^env[.].+)|^(?=.{3,63}$)[a-z0-9]+(-[a-z0-9]+)*$\"", " must match \"then\" schema" ] } diff --git a/test/data/validation/destinations/tiktok_ads_offline_events.json b/test/data/validation/destinations/tiktok_ads_offline_events.json index 0b26387f3..c01687f35 100644 --- a/test/data/validation/destinations/tiktok_ads_offline_events.json +++ b/test/data/validation/destinations/tiktok_ads_offline_events.json @@ -6,15 +6,15 @@ "eventsToStandard": [ { "from": "a", - "to": "Subscribe" + "to": "a" }, { "from": "b", - "to": "Subscribe" + "to": "b" }, { "from": "c", - "to": "Subscribe" + "to": "c" } ] }, @@ -26,15 +26,15 @@ "eventsToStandard": [ { "from": "a", - "to": "Subscribe" + "to": "a" }, { "from": "b", - "to": "Subscribe" + "to": "b" }, { "from": "c", - "to": "Subscribe" + "to": "c" } ] }, diff --git a/test/data/validation/destinations/vero.json b/test/data/validation/destinations/vero.json index 75be927e5..41147699c 100644 --- a/test/data/validation/destinations/vero.json +++ b/test/data/validation/destinations/vero.json @@ -8,7 +8,7 @@ "web": [{ "eventName": "Pin Generated" }, { "eventName": "Pin Expired" }] }, "whitelistedEvents": { "web": [{ "eventName": "" }] }, - "eventFilteringOption": "blacklistedEvents", + "eventFilteringOption": { "web": "blacklistedEvents" }, "oneTrustCookieCategories": [ { "oneTrustCookieCategory": "Sales" }, { "oneTrustCookieCategory": "Marketing" } diff --git a/test/data/validation/destinations/woopra.json b/test/data/validation/destinations/woopra.json index 3deb0705e..61ea5ae7d 100644 --- a/test/data/validation/destinations/woopra.json +++ b/test/data/validation/destinations/woopra.json @@ -30,8 +30,6 @@ "outgoingTracking": true }, "result": false, - "err": [ - "projectName must match pattern \"(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(([a-z0-9]+[.])+[a-z]{1,})$\"" - ] + "err": ["projectName must match pattern \"^(([a-z0-9]+[.])+[a-z]{1,})$\""] } ] diff --git a/test/data/validation/destinations/yahoo_dsp.json b/test/data/validation/destinations/yahoo_dsp.json index 75a688944..79eafedfc 100644 --- a/test/data/validation/destinations/yahoo_dsp.json +++ b/test/data/validation/destinations/yahoo_dsp.json @@ -71,7 +71,7 @@ "hashRequired": false }, "result": false, - "err": ["audienceType must be equal to one of the allowed values"] + "err": ["audienceType must match pattern \"^(EMAIL|DEVICE_ID|IP_ADDRESS)$\""] }, { "config": { @@ -84,11 +84,7 @@ "hashRequired": false }, "result": false, - "err": [ - "seedListType must be equal to one of the allowed values", - " must match \"then\" schema", - " must match a schema in anyOf" - ] + "err": ["seedListType must match pattern \"^(GPADVID|IDFA)$\""] }, { "config": { @@ -97,7 +93,6 @@ "audienceId": "138383", "accountId": "53421", "audienceType": "DEVICE_ID", - "seedListType": "GPADVID", "hashRequired": "" }, "result": false, diff --git a/test/data/validation/destinations/yandex_metrica.json b/test/data/validation/destinations/yandex_metrica.json index 44907ed0a..ba8b7ef72 100644 --- a/test/data/validation/destinations/yandex_metrica.json +++ b/test/data/validation/destinations/yandex_metrica.json @@ -158,10 +158,7 @@ "useNativeSDK": { "web": false } }, "result": false, - "err": [ - "eventFilteringOption must be string", - "eventFilteringOption must be equal to one of the allowed values" - ] + "err": ["eventFilteringOption must be string"] }, { "config": {