Merge pull request #1253 from rudderlabs/release/v1.67.0

chore(release): pull release/v1.67.0 into main
rudderlabs · Mar 5, 2024 · 0e15bc9 · 0e15bc9
2 parents 8bcbb7f + a340241
commit 0e15bc9
Show file tree

Hide file tree

Showing 54 changed files with 1,384 additions and 167 deletions.
diff --git a/.github/workflows/commitlint.yml b/.github/workflows/commitlint.yml
@@ -12,7 +12,7 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Node
-        uses: actions/[email protected].1
+        uses: actions/[email protected].2
         with:
           node-version-file: '.nvmrc'
           cache: 'npm'

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -32,7 +32,7 @@ jobs:
           fetch-depth: 1
 
       - name: Setup Node
-        uses: actions/[email protected].1
+        uses: actions/[email protected].2
         with:
           node-version-file: '.nvmrc'
           cache: 'npm'
@@ -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: |
@@ -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
@@ -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:

diff --git a/.github/workflows/draft-new-release.yml b/.github/workflows/draft-new-release.yml
@@ -16,7 +16,7 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Node
-        uses: actions/[email protected].1
+        uses: actions/[email protected].2
         with:
           node-version-file: '.nvmrc'
           cache: 'npm'

diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml
@@ -30,7 +30,7 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Node
-        uses: actions/[email protected].1
+        uses: actions/[email protected].2
         with:
           node-version-file: '.nvmrc'
           cache: 'npm'
@@ -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 }}

diff --git a/.github/workflows/report-code-coverage.yml b/.github/workflows/report-code-coverage.yml
@@ -19,22 +19,19 @@ jobs:
           fetch-depth: 1
 
       - name: Setup Node
-        uses: actions/[email protected].1
+        uses: actions/[email protected].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 }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -18,23 +18,20 @@ jobs:
           fetch-depth: 1
 
       - name: Setup Node
-        uses: actions/[email protected].1
+        uses: actions/[email protected].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 }}
 

diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
@@ -11,12 +11,8 @@ jobs:
       - name: Checkout
         uses: actions/[email protected]
 
-      - 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
@@ -33,13 +29,13 @@ jobs:
         uses: actions/[email protected]
 
       - 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: |

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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)
 
 

diff --git a/README.md b/README.md
@@ -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:
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rudder-config-schema",
-  "version": "1.66.1",
+  "version": "1.67.0",
   "description": "",
   "main": "src/index.ts",
   "private": true,
@@ -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",
@@ -82,7 +84,7 @@
   },
   "lint-staged": {
     "*.{json,js,ts,md}": "prettier --write",
-    "*.{py}": "python3 -m black"
+    "*.py": "python3 -m black"
   },
   "config": {
     "commitizen": {

diff --git a/scripts/requirements.txt b/scripts/requirements.txt
@@ -1,3 +1,4 @@
 requests
 jsonschema
 jsondiff
+black
diff --git a/scripts/setup-python.sh b/scripts/setup-python.sh
diff --git a/src/configurations/destinations/autopilot/db-config.json b/src/configurations/destinations/autopilot/db-config.json
@@ -3,7 +3,7 @@
   "displayName": "Autopilot",
   "config": {
     "transformAtV1": "processor",
-    "cdkEnabled": true,
+    "cdkV2Enabled": true,
     "saveDestinationResponse": true,
     "includeKeys": ["oneTrustCookieCategories"],
     "excludeKeys": [],

diff --git a/src/configurations/destinations/customerio/db-config.json b/src/configurations/destinations/customerio/db-config.json
@@ -65,6 +65,7 @@
       ],
       "unity": ["consentManagement"],
       "amp": ["consentManagement"],
+      "cloud": ["consentManagement"],
       "warehouse": ["consentManagement"],
       "reactnative": ["consentManagement"],
       "flutter": ["consentManagement"],

diff --git a/src/configurations/destinations/customerio/schema.json b/src/configurations/destinations/customerio/schema.json
@@ -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": {

diff --git a/src/configurations/destinations/dcm_floodlight/db-config.json b/src/configurations/destinations/dcm_floodlight/db-config.json
@@ -3,7 +3,7 @@
   "displayName": "DCM Floodlight",
   "config": {
     "transformAtV1": "processor",
-    "cdkEnabled": true,
+    "cdkV2Enabled": true,
     "saveDestinationResponse": true,
     "includeKeys": [
       "advertiserId",

diff --git a/src/configurations/destinations/facebook_conversions/db-config.json b/src/configurations/destinations/facebook_conversions/db-config.json
@@ -34,7 +34,6 @@
     "destConfig": {
       "defaultConfig": [
         "blacklistPiiProperties",
-        "categoryToContent",
         "datasetId",
         "eventsToEvents",
         "whitelistPiiProperties",

diff --git a/src/configurations/destinations/facebook_conversions/schema.json b/src/configurations/destinations/facebook_conversions/schema.json
@@ -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": {

diff --git a/src/configurations/destinations/facebook_conversions/ui-config.json b/src/configurations/destinations/facebook_conversions/ui-config.json
@@ -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": [