diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e7bed670..d6a6a768c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ 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.3.3 (2023-01-13) + + +### Bug Fixes + +* enable cdkv2 for algolia and pinterest ([630644e](https://github.com/rudderlabs/rudder-config-schema/commit/630644e5466d5d624e76f52dd37d1524e71ef499)) +* revert a specific commit from [#253](https://github.com/rudderlabs/rudder-config-schema/issues/253) ([#284](https://github.com/rudderlabs/rudder-config-schema/issues/284)) ([856c9b9](https://github.com/rudderlabs/rudder-config-schema/commit/856c9b91c3f33bef5ca8c46b1d0b751629574b8f)) + ### 1.3.2 (2023-01-12) diff --git a/package-lock.json b/package-lock.json index c0a1b8971..ef59a7f51 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rudder-config-schema", - "version": "1.3.2", + "version": "1.3.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "rudder-config-schema", - "version": "1.3.2", + "version": "1.3.3", "license": "MIT", "dependencies": { "ajv": "^8.11.2", diff --git a/package.json b/package.json index e517a5451..c681a77af 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rudder-config-schema", - "version": "1.3.2", + "version": "1.3.3", "description": "", "main": "src/index.ts", "private": true, diff --git a/src/configurations/destinations/algolia/db-config.json b/src/configurations/destinations/algolia/db-config.json index 04bdd38f2..255d9d14d 100644 --- a/src/configurations/destinations/algolia/db-config.json +++ b/src/configurations/destinations/algolia/db-config.json @@ -2,7 +2,7 @@ "name": "ALGOLIA", "displayName": "Algolia", "config": { - "cdkV2TestThreshold": 1, + "cdkV2Enabled": true, "transformAt": "router", "transformAtV1": "router", "saveDestinationResponse": true, diff --git a/src/configurations/destinations/deltalake/db-config.json b/src/configurations/destinations/deltalake/db-config.json index 51baa34c4..5df9681b4 100644 --- a/src/configurations/destinations/deltalake/db-config.json +++ b/src/configurations/destinations/deltalake/db-config.json @@ -27,7 +27,6 @@ "port", "path", "token", - "catalog", "namespace", "bucketProvider", "bucketName", diff --git a/src/configurations/destinations/deltalake/schema.json b/src/configurations/destinations/deltalake/schema.json index 85ee36ad7..c0e1ae595 100644 --- a/src/configurations/destinations/deltalake/schema.json +++ b/src/configurations/destinations/deltalake/schema.json @@ -20,10 +20,6 @@ "type": "string", "pattern": "(^env[.].+)|^(.{1,100})$" }, - "catalog": { - "type": "string", - "pattern": "(^env[.].*)|^(.*)$" - }, "namespace": { "type": "string", "pattern": "(^env[.].*)|^((?!pg_|PG_|pG_|Pg_).{0,64})$" diff --git a/src/configurations/destinations/deltalake/ui-config.json b/src/configurations/destinations/deltalake/ui-config.json index cbda6e9c4..20c3a5471 100644 --- a/src/configurations/destinations/deltalake/ui-config.json +++ b/src/configurations/destinations/deltalake/ui-config.json @@ -66,16 +66,6 @@ "text": "Please refer to the FAQs section, before you wanted to make any changes around managed and unmanaged tables provided by the Databricks." } }, - { - "type": "textInput", - "label": "Catalog", - "labelNote": "Catalog name where you organize your data assets", - "value": "catalog", - "regex": "^(.*)$", - "regexErrorMessage": "Invalid Catalog", - "required": false, - "placeholder": "e.g: iosCatalog" - }, { "type": "textInput", "label": "Namespace", diff --git a/src/configurations/destinations/gtm/schema.json b/src/configurations/destinations/gtm/schema.json index 67af25e7b..3e182202a 100644 --- a/src/configurations/destinations/gtm/schema.json +++ b/src/configurations/destinations/gtm/schema.json @@ -10,7 +10,7 @@ }, "serverUrl": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(?:http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]+$" + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(?:(?!.*\\.ngrok\\.io)http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]+|^$" }, "eventFilteringOption": { "type": "string", diff --git a/src/configurations/destinations/pinterest_tag/db-config.json b/src/configurations/destinations/pinterest_tag/db-config.json index 00f9b583a..1afb35968 100644 --- a/src/configurations/destinations/pinterest_tag/db-config.json +++ b/src/configurations/destinations/pinterest_tag/db-config.json @@ -2,7 +2,7 @@ "name": "PINTEREST_TAG", "displayName": "Pinterest Tag", "config": { - "cdkV2TestThreshold": 1, + "cdkV2Enabled": true, "transformAt": "router", "transformAtV1": "router", "saveDestinationResponse": false, diff --git a/test/data/validation/destinations/deltalake.json b/test/data/validation/destinations/deltalake.json index 4318735d3..36b265565 100644 --- a/test/data/validation/destinations/deltalake.json +++ b/test/data/validation/destinations/deltalake.json @@ -16,42 +16,6 @@ }, "result": true }, - { - "config": { - "host": "test-host", - "path": "test-path", - "token": "test-token", - "port": "0000", - "catalog": "", - "bucketProvider": "S3", - "syncFrequency": "30", - "enableSSE": false, - "useRudderStorage": false, - "useSTSTokens": false, - "bucketName": "test-bucket", - "accessKeyID": "test-access-key-id", - "accessKey": "test-access-key" - }, - "result": true - }, - { - "config": { - "host": "test-host", - "path": "test-path", - "token": "test-token", - "port": "0000", - "catalog": "test-catalog", - "bucketProvider": "S3", - "syncFrequency": "30", - "enableSSE": false, - "useRudderStorage": false, - "useSTSTokens": false, - "bucketName": "test-bucket", - "accessKeyID": "test-access-key-id", - "accessKey": "test-access-key" - }, - "result": true - }, { "config": { "host": "test-host", diff --git a/test/data/validation/destinations/gtm.json b/test/data/validation/destinations/gtm.json index 80152fa2d..db36b847f 100644 --- a/test/data/validation/destinations/gtm.json +++ b/test/data/validation/destinations/gtm.json @@ -71,7 +71,58 @@ }, "result": false, "err": [ - "serverUrl must match pattern \"(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(?:http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]+$\"" + "serverUrl must match pattern \"(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(?:(?!.*\\.ngrok\\.io)http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]+|^$\"" + ] + }, + { + "config": { + "containerID": "GTM-ADDA", + "serverUrl": "", + "eventFilteringOption": "whitelistedEvents", + "whitelistedEvents": [ + { + "eventName": "registration" + } + ], + "blacklistedEvents": [ + { + "eventName": "" + } + ], + "useNativeSDK": { + "web": true + }, + "oneTrustCookieCategories": { + "web": [] + } + }, + "result": true + }, + { + "config": { + "containerID": "GTM-ADDA", + "serverUrl": "http://dfff.ngrok.io", + "eventFilteringOption": "whitelistedEvents", + "whitelistedEvents": [ + { + "eventName": "registration" + } + ], + "blacklistedEvents": [ + { + "eventName": "" + } + ], + "useNativeSDK": { + "web": true + }, + "oneTrustCookieCategories": { + "web": [] + } + }, + "result": false, + "err": [ + "serverUrl must match pattern \"(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(?:(?!.*\\.ngrok\\.io)http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]+|^$\"" ] } ]