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 release/v1.67.0 into main #1253

Merged
merged 22 commits into from
Mar 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
4d43918
chore: fix minor issues in tooling and tests (#1231)
saikumarrs Feb 21, 2024
24762f5
chore(deps): bump codecov/codecov-action from 3.1.1 to 4.0.1 (#1192)
dependabot[bot] Feb 21, 2024
a7626c4
chore(deps): bump actions/setup-node from 3.7.0 to 4.0.2 (#1202)
dependabot[bot] Feb 21, 2024
2e3494f
chore(deps): bump slackapi/slack-github-action from 1.23.0 to 1.25.0 …
dependabot[bot] Feb 21, 2024
cdd88c0
chore(deps): bump tj-actions/changed-files from 41 to 42 (#1166)
dependabot[bot] Feb 21, 2024
fbd3b7f
Merge pull request #1232 from rudderlabs/main
krishna2020 Feb 22, 2024
32e1d10
fix: make accessToken required only for cloud mode (#1233)
sandeepdsvs Feb 23, 2024
0e3a3d8
chore: updates fb ads to 8.2.11
a-rampalli Feb 26, 2024
d906685
Merge pull request #1235 from rudderlabs/chore-etl-277-update-fb-image
a-rampalli Feb 26, 2024
582e414
chore: updates bing ads image to 8.2.11 (#1234)
nidhilashkari17 Feb 26, 2024
ac4587f
Merge pull request #1243 from rudderlabs/main
sanpj2292 Feb 27, 2024
635f5cc
feat: add mapping for event-event definition key in sfmc (#1227)
yashasvibajpai Feb 27, 2024
af30138
feat: add v2 toggle for google ads for ecom spec support (#1204)
yashasvibajpai Feb 28, 2024
1812a8c
fix: gcm config for missed source types (#1245)
saikumarrs Feb 29, 2024
ef2045f
feat: onboard new destination ninetailed (#1211)
anantjain45823 Feb 29, 2024
7da2f81
feat: garl consent mode (#1246)
shrouti1507 Feb 29, 2024
0db6823
feat: add support of custom page/screen event name in mixpanel (#1228)
Gauravudia Mar 1, 2024
74949fd
chore: removed ga4 beta flag (#1241)
mihir-4116 Mar 1, 2024
1cd665c
feat: remove categoryToContent mapping field for fb_pixel and fb_conv…
sandeepdsvs Mar 4, 2024
ef6bebf
feat: deprecate cdkV1 destination and onboard to cdkV2 (#1244)
aashishmalik Mar 4, 2024
46ebb73
Merge pull request #1251 from rudderlabs/main
ItsSudip Mar 4, 2024
a340241
chore(release): 1.67.0
web-flow Mar 4, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/commitlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
fetch-depth: 0

- name: Setup Node
uses: actions/setup-node@v4.0.1
uses: actions/setup-node@v4.0.2
with:
node-version-file: '.nvmrc'
cache: 'npm'
Expand Down
12 changes: 3 additions & 9 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
fetch-depth: 1

- name: Setup Node
uses: actions/setup-node@v4.0.1
uses: actions/setup-node@v4.0.2
with:
node-version-file: '.nvmrc'
cache: 'npm'
Expand All @@ -41,10 +41,7 @@ jobs:
env:
HUSKY: 0
run: |
npm ci

- name: Set up Python
run: scripts/setup-python.sh
npm run setup

- name: Display Python Version
run: |
Expand All @@ -57,9 +54,6 @@ jobs:
run: |
npm run test:ci

- name: Install Python Dependencies
run: pip3 install -r ./scripts/requirements.txt

- name: List Working Directory Files
run: |
echo current directory
Expand All @@ -78,7 +72,7 @@ jobs:

- name: Notify Slack Channel
id: slack
uses: slackapi/slack-github-action@v1.23.0
uses: slackapi/slack-github-action@v1.25.0
continue-on-error: true
if: inputs.notify == true
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/draft-new-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
fetch-depth: 0

- name: Setup Node
uses: actions/setup-node@v4.0.1
uses: actions/setup-node@v4.0.2
with:
node-version-file: '.nvmrc'
cache: 'npm'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-new-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
fetch-depth: 0

- name: Setup Node
uses: actions/setup-node@v4.0.1
uses: actions/setup-node@v4.0.2
with:
node-version-file: '.nvmrc'
cache: 'npm'
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:

- name: Notify Slack Channel
id: slack
uses: slackapi/slack-github-action@v1.23.0
uses: slackapi/slack-github-action@v1.25.0
continue-on-error: true
env:
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
Expand Down
9 changes: 3 additions & 6 deletions .github/workflows/report-code-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,19 @@ jobs:
fetch-depth: 1

- name: Setup Node
uses: actions/setup-node@v4.0.1
uses: actions/setup-node@v4.0.2
with:
node-version-file: '.nvmrc'
cache: 'npm'

- name: Install Dependencies
run: npm ci

- name: Set up Python
run: scripts/setup-python.sh
run: npm run setup

- name: Run Tests
run: npm run test:ci

- name: Upload Coverage Reports to Codecov
uses: codecov/codecov-action@v3.1.1
uses: codecov/codecov-action@v4.0.1
with:
directory: ./reports/coverage
token: ${{ secrets.CODECOV_TOKEN }}
9 changes: 3 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,20 @@ jobs:
fetch-depth: 1

- name: Setup Node
uses: actions/setup-node@v4.0.1
uses: actions/setup-node@v4.0.2
with:
node-version-file: '.nvmrc'
cache: 'npm'

- name: Install Dependencies
run: npm ci

- name: Set up Python
run: scripts/setup-python.sh
run: npm run setup

- name: Run Tests
run: npm run test:ci

- name: Get changed files
id: changed_files
uses: tj-actions/changed-files@v41
uses: tj-actions/changed-files@v42
with:
sha: ${{ github.event.pull_request.head.sha }}

Expand Down
12 changes: 4 additions & 8 deletions .github/workflows/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,8 @@ jobs:
- name: Checkout
uses: actions/checkout@v4.1.1

- uses: actions/setup-python@v5
with:
python-version: '3.10'

- name: Setting up python libraries
run: ./scripts/setup-python.sh
- name: Install Dependencies
run: npm run setup:python

# Reference: https://black.readthedocs.io/en/stable/integrations/github_actions.html
- name: Check formatting for Python files
Expand All @@ -33,13 +29,13 @@ jobs:
uses: actions/checkout@v4.1.1

- name: Setup Node
uses: actions/setup-node@v3.7.0
uses: actions/setup-node@v4.0.2
with:
node-version-file: .nvmrc
cache: 'npm'

- name: Install Dependencies
run: npm ci
run: npm run setup:npm

- name: Run Lint Checks
run: |
Expand Down
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,25 @@

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.67.0](https://github.com/rudderlabs/rudder-config-schema/compare/v1.66.1...v1.67.0) (2024-03-04)


### Features

* add mapping for event-event definition key in sfmc ([#1227](https://github.com/rudderlabs/rudder-config-schema/issues/1227)) ([635f5cc](https://github.com/rudderlabs/rudder-config-schema/commit/635f5cc7ff14528306b7f28de0e1555a6301bb33))
* add support of custom page/screen event name in mixpanel ([#1228](https://github.com/rudderlabs/rudder-config-schema/issues/1228)) ([0db6823](https://github.com/rudderlabs/rudder-config-schema/commit/0db6823ce429900e22b310945c088d6a165feea5))
* add v2 toggle for google ads for ecom spec support ([#1204](https://github.com/rudderlabs/rudder-config-schema/issues/1204)) ([af30138](https://github.com/rudderlabs/rudder-config-schema/commit/af30138e626664eb2899c0e2a050674220f3e608))
* deprecate cdkV1 destination and onboard to cdkV2 ([#1244](https://github.com/rudderlabs/rudder-config-schema/issues/1244)) ([ef6bebf](https://github.com/rudderlabs/rudder-config-schema/commit/ef6bebf3511c0aef39fdbe0b5660a61d984b3cf2))
* garl consent mode ([#1246](https://github.com/rudderlabs/rudder-config-schema/issues/1246)) ([7da2f81](https://github.com/rudderlabs/rudder-config-schema/commit/7da2f81c6d75a25e1ed9e51f72d3cc3429ec4384))
* onboard new destination ninetailed ([#1211](https://github.com/rudderlabs/rudder-config-schema/issues/1211)) ([ef2045f](https://github.com/rudderlabs/rudder-config-schema/commit/ef2045fca0150640c39683cfe248205d422fe7cb))
* remove categoryToContent mapping field for fb_pixel and fb_conversions ([#1248](https://github.com/rudderlabs/rudder-config-schema/issues/1248)) ([1cd665c](https://github.com/rudderlabs/rudder-config-schema/commit/1cd665cdae3a8bd7f292cdc18a824a1856c0f089))


### Bug Fixes

* gcm config for missed source types ([#1245](https://github.com/rudderlabs/rudder-config-schema/issues/1245)) ([1812a8c](https://github.com/rudderlabs/rudder-config-schema/commit/1812a8c7dae3b77290bba4c7af178bfa4fe9e2ed))
* make accessToken required only for cloud mode ([#1233](https://github.com/rudderlabs/rudder-config-schema/issues/1233)) ([32e1d10](https://github.com/rudderlabs/rudder-config-schema/commit/32e1d10d059b9409f31c3d6c209a3c944b512465))

### [1.66.1](https://github.com/rudderlabs/rudder-config-schema/compare/v1.66.0...v1.66.1) (2024-03-04)


Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@

You need to install Python3.

And then, install Python dependencies:
And then, setup the project dependencies by running below command:

`pip3 install -r ./scripts/requirements.txt`
`npm run setup`

Run below command to deploy integrations definitions config to database:

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.

8 changes: 5 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rudder-config-schema",
"version": "1.66.1",
"version": "1.67.0",
"description": "",
"main": "src/index.ts",
"private": true,
Expand All @@ -15,7 +15,9 @@
"url": "https://github.com/rudderlabs/rudder-config-schema.git"
},
"scripts": {
"setup": "npm ci",
"setup:python": "pip3 install -r ./scripts/requirements.txt",
"setup:npm": "npm ci",
"setup": "npm run setup:npm && npm run setup:python",
"test": "jest --detectOpenHandles --coverage --notify --watchAll=false",
"test:ci": "npm run test -- --silent --expand --maxWorkers=2",
"test:silent": "npm run test -- --silent",
Expand Down Expand Up @@ -82,7 +84,7 @@
},
"lint-staged": {
"*.{json,js,ts,md}": "prettier --write",
"*.{py}": "python3 -m black"
"*.py": "python3 -m black"
},
"config": {
"commitizen": {
Expand Down
1 change: 1 addition & 0 deletions scripts/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
requests
jsonschema
jsondiff
black
8 changes: 0 additions & 8 deletions scripts/setup-python.sh

This file was deleted.

2 changes: 1 addition & 1 deletion src/configurations/destinations/autopilot/db-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"displayName": "Autopilot",
"config": {
"transformAtV1": "processor",
"cdkEnabled": true,
"cdkV2Enabled": true,
"saveDestinationResponse": true,
"includeKeys": ["oneTrustCookieCategories"],
"excludeKeys": [],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
],
"unity": ["consentManagement"],
"amp": ["consentManagement"],
"cloud": ["consentManagement"],
"warehouse": ["consentManagement"],
"reactnative": ["consentManagement"],
"flutter": ["consentManagement"],
Expand Down
46 changes: 46 additions & 0 deletions src/configurations/destinations/customerio/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,52 @@
"consentManagement": {
"type": "object",
"properties": {
"cloud": {
"type": "array",
"items": {
"type": "object",
"properties": {
"provider": {
"type": "string",
"enum": ["custom", "ketch", "oneTrust"],
"default": "oneTrust"
},
"consents": {
"type": "array",
"items": {
"type": "object",
"properties": {
"consent": {
"type": "string",
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
}
}
}
}
},
"allOf": [
{
"if": {
"properties": {
"provider": {
"const": "custom"
}
},
"required": ["provider"]
},
"then": {
"properties": {
"resolutionStrategy": {
"type": "string",
"enum": ["and", "or"]
}
},
"required": ["resolutionStrategy"]
}
}
]
}
},
"android": {
"type": "array",
"items": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"displayName": "DCM Floodlight",
"config": {
"transformAtV1": "processor",
"cdkEnabled": true,
"cdkV2Enabled": true,
"saveDestinationResponse": true,
"includeKeys": [
"advertiserId",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
"destConfig": {
"defaultConfig": [
"blacklistPiiProperties",
"categoryToContent",
"datasetId",
"eventsToEvents",
"whitelistPiiProperties",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,6 @@
"type": "string",
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,500})$"
},
"categoryToContent": {
"type": "array",
"items": {
"type": "object",
"properties": {
"from": {
"type": "string",
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
},
"to": {
"type": "string",
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
}
}
}
},
"eventsToEvents": {
"type": "array",
"items": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -301,32 +301,6 @@
"redirectGroups": {
"customEventMapping": {
"tabs": [
{
"name": "Category mapping",
"fields": [
{
"type": "mapping",
"label": "Map your RudderStack Categories to Facebook Content Types",
"note": "Input the RudderStack category to map to Facebook's content type.",
"configKey": "categoryToContent",
"default": [],
"columns": [
{
"type": "textInput",
"key": "from",
"label": "RudderStack Category",
"placeholder": "e.g: Product Searched"
},
{
"type": "textInput",
"key": "to",
"label": "Facebook Content Type",
"placeholder": "e.g: Product"
}
]
}
]
},
{
"name": "Custom event",
"fields": [
Expand Down
Loading
Loading