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 hotfix-release/v1.47.0 into main #867

Merged
merged 2 commits into from
Aug 28, 2023
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
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.47.0](https://github.com/rudderlabs/rudder-config-schema/compare/v1.46.2...v1.47.0) (2023-08-28)


### Features

* **mixpanel:** add persistence name setting ([#865](https://github.com/rudderlabs/rudder-config-schema/issues/865)) ([5c0e99e](https://github.com/rudderlabs/rudder-config-schema/commit/5c0e99e72963c99dce522f8f8db915694448ef5c))

### [1.46.2](https://github.com/rudderlabs/rudder-config-schema/compare/v1.46.1...v1.46.2) (2023-08-23)


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.46.2",
"version": "1.47.0",
"description": "",
"main": "src/index.ts",
"private": true,
Expand Down
4 changes: 4 additions & 0 deletions src/configurations/destinations/mp/db-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
"sourceName",
"crossSubdomainCookie",
"persistence",
"persistenceType",
"persistenceName",
"secureCookie",
"blacklistedEvents",
"whitelistedEvents",
Expand Down Expand Up @@ -62,6 +64,8 @@
"sourceName",
"crossSubdomainCookie",
"persistence",
"persistenceType",
"persistenceName",
"secureCookie",
"blacklistedEvents",
"whitelistedEvents",
Expand Down
93 changes: 77 additions & 16 deletions src/configurations/destinations/mp/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,42 @@
"type": "string",
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
},
"serviceAccountUserName": { "type": "string" },
"serviceAccountSecret": { "type": "string" },
"projectId": { "type": "string" },
"dataResidency": { "type": "string", "enum": ["us", "eu"], "default": "us" },
"serviceAccountUserName": {
"type": "string"
},
"serviceAccountSecret": {
"type": "string"
},
"projectId": {
"type": "string"
},
"dataResidency": {
"type": "string",
"enum": ["us", "eu"],
"default": "us"
},
"identityMergeApi": {
"type": "string",
"enum": ["simplified", "original"],
"default": "original"
},
"strictMode": { "type": "boolean", "default": false },
"userDeletionApi": { "type": "string", "enum": ["engage", "task"], "default": "engage" },
"people": { "type": "boolean", "default": false },
"setAllTraitsByDefault": { "type": "boolean", "default": false },
"strictMode": {
"type": "boolean",
"default": false
},
"userDeletionApi": {
"type": "string",
"enum": ["engage", "task"],
"default": "engage"
},
"people": {
"type": "boolean",
"default": false
},
"setAllTraitsByDefault": {
"type": "boolean",
"default": false
},
"superProperties": {
"type": "array",
"items": {
Expand Down Expand Up @@ -73,20 +96,44 @@
}
}
},
"consolidatedPageCalls": { "type": "boolean", "default": true },
"trackCategorizedPages": { "type": "boolean", "default": false },
"trackNamedPages": { "type": "boolean", "default": false },
"consolidatedPageCalls": {
"type": "boolean",
"default": true
},
"trackCategorizedPages": {
"type": "boolean",
"default": false
},
"trackNamedPages": {
"type": "boolean",
"default": false
},
"sourceName": {
"type": "string",
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
},
"crossSubdomainCookie": { "type": "boolean", "default": false },
"crossSubdomainCookie": {
"type": "boolean",
"default": false
},
"persistence": {
"type": "string",
"enum": ["none", "cookie", "localStorage"],
"default": "none"
},
"secureCookie": { "type": "boolean", "default": false },
"persistenceType": {
"type": "string",
"enum": ["none", "cookie", "localStorage"],
"default": "cookie"
},
"persistenceName": {
"type": "string",
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
},
"secureCookie": {
"type": "boolean",
"default": false
},
"groupKeySettings": {
"type": "array",
"items": {
Expand All @@ -99,8 +146,18 @@
}
}
},
"useNativeSDK": { "type": "object", "properties": { "web": { "type": "boolean" } } },
"useNewMapping": { "type": "boolean", "default": false },
"useNativeSDK": {
"type": "object",
"properties": {
"web": {
"type": "boolean"
}
}
},
"useNewMapping": {
"type": "boolean",
"default": false
},
"eventFilteringOption": {
"type": "string",
"enum": ["disable", "whitelistedEvents", "blacklistedEvents"],
Expand Down Expand Up @@ -146,7 +203,11 @@
"anyOf": [
{
"if": {
"properties": { "userDeletionApi": { "const": "task" } },
"properties": {
"userDeletionApi": {
"const": "task"
}
},
"required": ["userDeletionApi"]
},
"then": {
Expand Down
15 changes: 11 additions & 4 deletions src/configurations/destinations/mp/ui-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@
{
"type": "singleSelect",
"label": "Persistence Type",
"value": "persistence",
"value": "persistenceType",
"options": [
{
"name": "None",
Expand All @@ -260,10 +260,17 @@
}
],
"defaultOption": {
"name": "None",
"value": "none"
"name": "Cookie",
"value": "cookie"
},
"footerNote": "Choose persistence for Mixpanel SDK"
"footerNote": "Choose the persistence type for Mixpanel cookie. If 'Local Storage' is selected, then any existing Mixpanel cookie value with the same persistence name will be transferred to 'Local Storage' and deleted."
},
{
"type": "textInput",
"label": "Persistence Name",
"value": "persistenceName",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$",
"footerNote": "Enter a persistence name for the Mixpanel cookie."
},
{
"type": "checkbox",
Expand Down
120 changes: 102 additions & 18 deletions test/data/validation/destinations/mp.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,52 @@
"sourceName": "AWS",
"crossSubdomainCookie": true,
"persistence": "cookie",
"persistenceType": "cookie",
"persistenceName": "cookie",
"secureCookie": true,
"superProperties": [{ "property": "super001" }],
"peopleProperties": [{ "property": "maidenName" }],
"eventIncrements": [{ "property": "triggerName" }],
"propIncrements": [{ "property": "extraProps" }],
"groupKeySettings": [{ "groupKey": "gg101" }],
"useNativeSDK": { "android": false },
"blacklistedEvents": [{ "eventName": "black" }],
"whitelistedEvents": [{ "eventName": "white" }],
"oneTrustCookieCategories": [{ "oneTrustCookieCategory": "Marketing" }],
"superProperties": [
{
"property": "super001"
}
],
"peopleProperties": [
{
"property": "maidenName"
}
],
"eventIncrements": [
{
"property": "triggerName"
}
],
"propIncrements": [
{
"property": "extraProps"
}
],
"groupKeySettings": [
{
"groupKey": "gg101"
}
],
"useNativeSDK": {
"android": false
},
"blacklistedEvents": [
{
"eventName": "black"
}
],
"whitelistedEvents": [
{
"eventName": "white"
}
],
"oneTrustCookieCategories": [
{
"oneTrustCookieCategory": "Marketing"
}
],
"userDeletionApi": "task",
"gdprApiToken": "gdprApiToken123",
"strictMode": true
Expand All @@ -32,7 +68,11 @@
"config": {
"apiSecret": "8ac88f162ddfefd91156565c431611fb",
"dataResidency": "us",
"groupKeySettings": [{ "groupKey": "admissions" }]
"groupKeySettings": [
{
"groupKey": "admissions"
}
]
},
"result": false,
"err": [" must have required property 'token'"]
Expand All @@ -50,9 +90,15 @@
"persistence": "localStorage",
"secureCookie": false,
"eventFilteringOption": "disable",
"useNativeSDK": { "web": false },
"useNativeSDK": {
"web": false
},
"strictMode": false,
"oneTrustCookieCategories": [{ "oneTrustCookieCategory": "Marketing" }]
"oneTrustCookieCategories": [
{
"oneTrustCookieCategory": "Marketing"
}
]
},
"result": true
},
Expand All @@ -66,8 +112,14 @@
"persistence": "localStorage",
"secureCookie": false,
"eventFilteringOption": "disable",
"useNativeSDK": { "web": false },
"oneTrustCookieCategories": [{ "oneTrustCookieCategory": "Marketing" }]
"useNativeSDK": {
"web": false
},
"oneTrustCookieCategories": [
{
"oneTrustCookieCategory": "Marketing"
}
]
},
"result": true
},
Expand All @@ -79,12 +131,16 @@
"setAllTraitsByDefault": false,
"consolidatedPageCalls": false,
"trackCategorizedPages": false,
"trackNamedPages": { "name": true },
"trackNamedPages": {
"name": true
},
"crossSubdomainCookie": false,
"persistence": "localStorage",
"secureCookie": false,
"eventFilteringOption": "disable",
"useNativeSDK": { "web": false }
"useNativeSDK": {
"web": false
}
},
"result": false,
"err": ["trackNamedPages must be boolean"]
Expand All @@ -103,7 +159,9 @@
"persistence": "localStorage",
"secureCookie": false,
"eventFilteringOption": "disable",
"useNativeSDK": { "web": false }
"useNativeSDK": {
"web": false
}
},
"result": false,
"err": [
Expand All @@ -115,10 +173,36 @@
"token": "token123",
"apiSecret": "apiSecret123",
"dataResidency": "us",
"groupKeySettings": [{ "groupKey": "admissions" }],
"groupKeySettings": [
{
"groupKey": "admissions"
}
],
"userDeletionApi": "test"
},
"result": false,
"err": ["userDeletionApi must be equal to one of the allowed values"]
},
{
"config": {
"token": "2de18c6hf6v45201ab43d2344b0c128x",
"dataResidency": "us",
"people": false,
"setAllTraitsByDefault": false,
"consolidatedPageCalls": false,
"trackCategorizedPages": false,
"trackNamedPages": true,
"crossSubdomainCookie": false,
"persistence": "none",
"persistenceType": "abc",
"persistenceName": "",
"secureCookie": false,
"eventFilteringOption": "disable",
"useNativeSDK": {
"web": false
}
},
"result": false,
"err": ["persistenceType must be equal to one of the allowed values"]
}
]
Loading