Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(release): pull main into develop post release v1.63.0 #1168

Merged
merged 7 commits into from
Jan 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rudder-config-schema",
"version": "1.62.1",
"version": "1.63.0",
"description": "",
"main": "src/index.ts",
"private": true,
Expand Down
2 changes: 1 addition & 1 deletion src/configurations/destinations/am/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"properties": {
"web": {
"type": "string",
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(?!.*\\.ngrok\\.io).*$"
"pattern": "^(?!http:\/\/)(?:(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(?!.*\\.ngrok\\.io).*)$"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion src/configurations/destinations/am/ui-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
11 changes: 3 additions & 8 deletions src/configurations/destinations/customerio/ui-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,10 @@
"preRequisites": {
"fields": [
{
"configKey": "connectionModes.webDevice",
"value": true
},
{
"configKey": "connectionModes.mobileDevice",
"value": true
"configKey": "connectionMode.web",
"value": "device"
}
],
"condition": "or"
]
},
"fields": [
{
Expand Down
26 changes: 0 additions & 26 deletions src/configurations/destinations/spotifyPixel/metadata.json

This file was deleted.

73 changes: 67 additions & 6 deletions test/data/validation/destinations/am.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"config": {
"apiSecret": "a41d5bc768831f083e2swcwecfgf7398",
"proxyServerUrl": {
"web": "http://abc.example.com"
"web": "https://abc.example.com"
},
"groupTypeTrait": "",
"groupValueTrait": "",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -304,7 +304,7 @@
"config": {
"apiKey": "1173185cre3a65172943ba1e41113dwd",
"proxyServerUrl": {
"web": "http://abc.example.com"
"web": "https://abc.example.com"
},
"groupTypeTrait": "",
"groupValueTrait": "",
Expand Down Expand Up @@ -365,7 +365,7 @@
"config": {
"apiKey": "8559811e41334c6d22b5c4b5f6s7gb70",
"proxyServerUrl": {
"web": "http://abc.example.com"
"web": "https://abc.example.com"
},
"apiSecret": "a41d5bc768831f083e3dacwecfgf7398",
"groupTypeTrait": "college_id",
Expand Down Expand Up @@ -418,7 +418,7 @@
"config": {
"apiKey": "8559811e41334c6d22b5c4b5f6s7gb70",
"proxyServerUrl": {
"web": "http://abc.example.com"
"web": "https://abc.example.com"
},
"apiSecret": "a41d5bc768831f083e3dacwecfgf7398",
"groupTypeTrait": "college_id",
Expand Down Expand Up @@ -546,7 +546,7 @@
"config": {
"apiKey": "8559811e41334c6d22b5c4b5f6s7gb70",
"proxyServerUrl": {
"web": "http://abc.example.com"
"web": "https://abc.example.com"
},
"apiSecret": "a41d5bc768831f083e3dacwecfgf7398",
"groupTypeTrait": "company_id",
Expand Down Expand Up @@ -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).*)$\""
]
}
]
Loading