From fbdb08fd9288acf6f3c667296c16422f9d2ab5b1 Mon Sep 17 00:00:00 2001 From: devops-github-rudderstack <88187154+devops-github-rudderstack@users.noreply.github.com> Date: Tue, 16 Jan 2024 18:23:43 +0530 Subject: [PATCH 1/5] chore(release): pull hotfix-release/v1.62.1 into main (#1157) Co-authored-by: nidhilashkari17 <108564211+nidhilashkari17@users.noreply.github.com> Co-authored-by: a-rampalli Co-authored-by: GitHub Actions --- CHANGELOG.md | 7 +++++++ package-lock.json | 4 ++-- package.json | 2 +- src/configurations/sources/singer_sendgrid/db-config.json | 2 +- src/configurations/sources/singer_stripe/db-config.json | 2 +- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6451eb074..4e9a8bb47 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ 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.62.1](https://github.com/rudderlabs/rudder-config-schema/compare/v1.62.0...v1.62.1) (2024-01-16) + + +### Bug Fixes + +* update stripe image to fix subscription sync [ETL-239] ([#1151](https://github.com/rudderlabs/rudder-config-schema/issues/1151)) ([ec443f7](https://github.com/rudderlabs/rudder-config-schema/commit/ec443f7db5f6f22a8bea2cf9a042dfeb750bcec5)) + ## [1.62.0](https://github.com/rudderlabs/rudder-config-schema/compare/v1.61.0...v1.62.0) (2024-01-08) diff --git a/package-lock.json b/package-lock.json index 5df3f2437..ec969f2d5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rudder-config-schema", - "version": "1.62.0", + "version": "1.62.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "rudder-config-schema", - "version": "1.62.0", + "version": "1.62.1", "license": "MIT", "dependencies": { "ajv": "^8.12.0", diff --git a/package.json b/package.json index f020224fb..c4ad46f25 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rudder-config-schema", - "version": "1.62.0", + "version": "1.62.1", "description": "", "main": "src/index.ts", "private": true, diff --git a/src/configurations/sources/singer_sendgrid/db-config.json b/src/configurations/sources/singer_sendgrid/db-config.json index 9375d1501..78ab88f86 100644 --- a/src/configurations/sources/singer_sendgrid/db-config.json +++ b/src/configurations/sources/singer_sendgrid/db-config.json @@ -4,7 +4,7 @@ "displayName": "Sendgrid", "options": { "isBeta": false, - "image": "rudderstack/source-sendgrid:v5.3.0-sendgrid-messages-fixes" + "image": "rudderstack/source-sendgrid:v5.3.0-sendgrid-messages-pagination-fix" }, "type": "cloudSource" } diff --git a/src/configurations/sources/singer_stripe/db-config.json b/src/configurations/sources/singer_stripe/db-config.json index 91c75e5d9..cf9cb0d13 100644 --- a/src/configurations/sources/singer_stripe/db-config.json +++ b/src/configurations/sources/singer_stripe/db-config.json @@ -3,7 +3,7 @@ "category": "singer-protocol", "displayName": "Stripe", "options": { - "image": "rudderstack/source-stripe:v6.3.4" + "image": "rudderstack/source-stripe:v8.2.3" }, "type": "cloudSource" } From 6981464f6f00d41dedeef846bffd695b13adc924 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Mon, 22 Jan 2024 11:34:20 +0000 Subject: [PATCH 2/5] chore(release): 1.63.0 --- CHANGELOG.md | 15 +++++++++++++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e9a8bb47..fdf5c890b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,21 @@ 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.63.0](https://github.com/rudderlabs/rudder-config-schema/compare/v1.62.1...v1.63.0) (2024-01-22) + + +### Features + +* adding proxy server url in amplitude device mode ([#1163](https://github.com/rudderlabs/rudder-config-schema/issues/1163)) ([38d47b5](https://github.com/rudderlabs/rudder-config-schema/commit/38d47b57f9da248adcb0594387f7f1eefb841d3c)) +* onboard customerio to new UI ([#1118](https://github.com/rudderlabs/rudder-config-schema/issues/1118)) ([914bde6](https://github.com/rudderlabs/rudder-config-schema/commit/914bde6b62067ba1097c7734fb212963f7d4aaf6)) +* onboard new destination spotify pixel ([#1139](https://github.com/rudderlabs/rudder-config-schema/issues/1139)) ([d338d02](https://github.com/rudderlabs/rudder-config-schema/commit/d338d02f220395737352faa45473fced803512a8)) +* tiktok_ads: support new event version 2.0 ([7bd2848](https://github.com/rudderlabs/rudder-config-schema/commit/7bd2848349092f89f0f5d149cc3051c3347cbb19)) + + +### Bug Fixes + +* update stripe image to fix subscription sync [ETL-239] ([#1151](https://github.com/rudderlabs/rudder-config-schema/issues/1151)) ([6bb6e29](https://github.com/rudderlabs/rudder-config-schema/commit/6bb6e29318b6c526987dd2488d28a477fab205e8)) + ### [1.62.1](https://github.com/rudderlabs/rudder-config-schema/compare/v1.62.0...v1.62.1) (2024-01-16) diff --git a/package-lock.json b/package-lock.json index ec969f2d5..e0de2f71f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rudder-config-schema", - "version": "1.62.1", + "version": "1.63.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "rudder-config-schema", - "version": "1.62.1", + "version": "1.63.0", "license": "MIT", "dependencies": { "ajv": "^8.12.0", diff --git a/package.json b/package.json index c4ad46f25..ad3500bb5 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rudder-config-schema", - "version": "1.62.1", + "version": "1.63.0", "description": "", "main": "src/index.ts", "private": true, From f91fe2a5af5c2866f3ed4e030a5e3b7d29e253ee Mon Sep 17 00:00:00 2001 From: shrouti1507 <60211312+shrouti1507@users.noreply.github.com> Date: Tue, 23 Jan 2024 17:05:55 +0530 Subject: [PATCH 3/5] fix: regex issue of proxy url (#1167) Co-authored-by: Yashasvi Bajpai <33063622+yashasvibajpai@users.noreply.github.com> --- .../destinations/am/schema.json | 2 +- .../destinations/am/ui-config.json | 2 +- test/data/validation/destinations/am.json | 73 +++++++++++++++++-- 3 files changed, 69 insertions(+), 8 deletions(-) diff --git a/src/configurations/destinations/am/schema.json b/src/configurations/destinations/am/schema.json index 20febe58d..48782987f 100644 --- a/src/configurations/destinations/am/schema.json +++ b/src/configurations/destinations/am/schema.json @@ -18,7 +18,7 @@ "properties": { "web": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(?!.*\\.ngrok\\.io).*$" + "pattern": "^(?!http:\/\/)(?:(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(?!.*\\.ngrok\\.io).*)$" } } }, diff --git a/src/configurations/destinations/am/ui-config.json b/src/configurations/destinations/am/ui-config.json index 119e1cc80..12eba8b71 100644 --- a/src/configurations/destinations/am/ui-config.json +++ b/src/configurations/destinations/am/ui-config.json @@ -543,7 +543,7 @@ "label": "Proxy server url", "note": "Send data to Amplitude by using a domain proxy to relay requests. Presently supported for web device mode only", "configKey": "proxyServerUrl", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(?!.*\\.ngrok\\.io).*$", + "regex":"^(?!http:\/\/)(?:(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(?!.*\\.ngrok\\.io).*)$", "regexErrorMessage": "Invalid Proxy Server URL", "placeholder": "e.g: https://proxyserver.url.com" }, diff --git a/test/data/validation/destinations/am.json b/test/data/validation/destinations/am.json index 64ac78b08..8b0147706 100644 --- a/test/data/validation/destinations/am.json +++ b/test/data/validation/destinations/am.json @@ -81,7 +81,7 @@ "config": { "apiSecret": "a41d5bc768831f083e2swcwecfgf7398", "proxyServerUrl": { - "web": "http://abc.example.com" + "web": "https://abc.example.com" }, "groupTypeTrait": "", "groupValueTrait": "", @@ -188,7 +188,7 @@ "config": { "apiKey": "12fd322b8c13214e36450b519typo402", "proxyServerUrl": { - "web": "http://abc.example.com" + "web": "https://abc.example.com" }, "groupTypeTrait": "Modelorama_app_Stage", "groupValueTrait": "Modelorama Stage", @@ -304,7 +304,7 @@ "config": { "apiKey": "1173185cre3a65172943ba1e41113dwd", "proxyServerUrl": { - "web": "http://abc.example.com" + "web": "https://abc.example.com" }, "groupTypeTrait": "", "groupValueTrait": "", @@ -365,7 +365,7 @@ "config": { "apiKey": "8559811e41334c6d22b5c4b5f6s7gb70", "proxyServerUrl": { - "web": "http://abc.example.com" + "web": "https://abc.example.com" }, "apiSecret": "a41d5bc768831f083e3dacwecfgf7398", "groupTypeTrait": "college_id", @@ -418,7 +418,7 @@ "config": { "apiKey": "8559811e41334c6d22b5c4b5f6s7gb70", "proxyServerUrl": { - "web": "http://abc.example.com" + "web": "https://abc.example.com" }, "apiSecret": "a41d5bc768831f083e3dacwecfgf7398", "groupTypeTrait": "college_id", @@ -546,7 +546,7 @@ "config": { "apiKey": "8559811e41334c6d22b5c4b5f6s7gb70", "proxyServerUrl": { - "web": "http://abc.example.com" + "web": "https://abc.example.com" }, "apiSecret": "a41d5bc768831f083e3dacwecfgf7398", "groupTypeTrait": "company_id", @@ -625,5 +625,66 @@ }, "result": false, "err": ["oneTrustCookieCategories must be array", "attribution.web must be boolean"] + }, + { + "config": { + "apiKey": "8559811e41334c6d22b5c4b5f6s7gb70", + "apiSecret": "a41d5bc768831f083e2swcwecfgf7398", + "proxyServerUrl": { + "web": "http://abc.example.com" + }, + "groupTypeTrait": "", + "groupValueTrait": "", + "trackAllPages": true, + "trackCategorizedPages": true, + "trackNamedPages": true, + "trackProductsOnce": false, + "trackRevenuePerProduct": false, + "versionName": "1.0.1", + "residencyServer": "EU", + "connectionMode": { + "web": "device", + "android": "device", + "ios": "cloud", + "reactnative": "cloud", + "flutter": "device" + }, + "traitsToIncrement": [ + { + "traits": "profile_trait" + } + ], + "traitsToSetOnce": [ + { + "traits": "init" + }, + { + "traits": "init02" + } + ], + "useNativeSDK": { + "web": true, + "android": true, + "ios": false, + "reactnative": false, + "flutter": true + }, + "preferAnonymousIdForDeviceId": { + "web": false + }, + "trackNewCampaigns": { + "web": true + }, + "eventUploadPeriodMillis": { + "web": "30000" + }, + "eventUploadThreshold": { + "web": "30" + } + }, + "result": false, + "err": [ + "proxyServerUrl.web must match pattern \"^(?!http://)(?:(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(?!.*\\.ngrok\\.io).*)$\"" + ] } ] From d6c2ae3229830007baf556efc899510431efb6e5 Mon Sep 17 00:00:00 2001 From: Anant Jain Date: Wed, 24 Jan 2024 12:44:47 +0530 Subject: [PATCH 4/5] fix: remove extra prerequisite fields for event filtering field --- .../destinations/customerio/ui-config.json | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/configurations/destinations/customerio/ui-config.json b/src/configurations/destinations/customerio/ui-config.json index ef23b463c..6aab25384 100644 --- a/src/configurations/destinations/customerio/ui-config.json +++ b/src/configurations/destinations/customerio/ui-config.json @@ -108,15 +108,10 @@ "preRequisites": { "fields": [ { - "configKey": "connectionModes.webDevice", - "value": true - }, - { - "configKey": "connectionModes.mobileDevice", - "value": true + "configKey": "connectionMode.web", + "value": "device" } - ], - "condition": "or" + ] }, "fields": [ { From 3b5ab759a5518cd141a1d816ce475d241a5873c8 Mon Sep 17 00:00:00 2001 From: Anant Jain Date: Wed, 24 Jan 2024 12:53:47 +0530 Subject: [PATCH 5/5] chore: remove unused file metadata from spotify pixel --- .../destinations/spotifyPixel/metadata.json | 26 ------------------- 1 file changed, 26 deletions(-) delete mode 100644 src/configurations/destinations/spotifyPixel/metadata.json diff --git a/src/configurations/destinations/spotifyPixel/metadata.json b/src/configurations/destinations/spotifyPixel/metadata.json deleted file mode 100644 index c1d78b6e5..000000000 --- a/src/configurations/destinations/spotifyPixel/metadata.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "metadata": { - "primaryCategory": "", - "secondaryCategory": [], - "docLink": "", - "logoPath": "", - "connectionMode": { - "cloud-mode": true, - "device-mode": ["web"] - }, - "supportedMethods": { - "cloud-mode": ["track", "page"], - "device-mode": { - "web": ["track", "page"] - } - }, - "releaseStatus": "beta", - "sourceCode": { - "android": { - "github": "", - "version": "v1.0.0" - } - } - } - } - \ No newline at end of file