Merge pull request #1148 from rudderlabs/release/v1.62.0

chore(release): pull release/v1.62.0 into main
rudderlabs · Jan 10, 2024 · 34fc270 · 34fc270
2 parents 4ecd461 + 0f2e71d
commit 34fc270
Show file tree

Hide file tree

Showing 405 changed files with 10,203 additions and 3,115 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -21,7 +21,13 @@
     "import/prefer-default-export": "off",
     "unicorn/filename-case": [
       "error",
-      { "cases": { "camelCase": true, "pascalCase": true, "kebabCase": true } }
+      {
+        "cases": {
+          "camelCase": true,
+          "pascalCase": true,
+          "kebabCase": true
+        }
+      }
     ],
     "unicorn/no-instanceof-array": "error",
     "unicorn/no-static-only-class": "error",

diff --git a/.github/workflows/deploy-to-prod.yml b/.github/workflows/deploy-to-prod.yml
@@ -27,7 +27,7 @@ jobs:
       version: ${{ steps.extract_version.outputs.version }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v4.1.1
         with:
           fetch-depth: 1
 

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -27,12 +27,12 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v4.1.1
         with:
           fetch-depth: 1
 
       - name: Setup Node
-        uses: actions/setup-node@v3.6.0
+        uses: actions/setup-node@v4.0.1
         with:
           node-version-file: '.nvmrc'
           cache: 'npm'
@@ -50,7 +50,7 @@ jobs:
           npm run test:ci
 
       - name: Install Python
-        uses: actions/setup-python@v4.5.0
+        uses: actions/setup-python@v5.0.0
         with:
           python-version: '3.9.13'
 

diff --git a/.github/workflows/draft-new-release.yml b/.github/workflows/draft-new-release.yml
@@ -11,12 +11,12 @@ jobs:
     if: (github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/heads/hotfix/')) && (github.actor == 'ItsSudip' || github.actor == 'krishna2020' || github.actor == 'lvrach' || github.actor == 'koladilip' || github.actor == 'cisse21' || github.actor == 'nidhilashkari17' || github.actor == 'debanjan97' || github.actor == 'AchuthaSourabhC' || github.actor == 'saikumarrs' || github.actor == 'sandeepdsvs' || github.actor == 'shrouti1507' || github.actor == 'anantjain45823' || github.actor == 'mihir-4116' || github.actor == 'yashasvibajpai' || github.actor == 'sanpj2292' || github.actor == 'ujjwal-ab' || github.actor == 'aashishmalik') &&  (github.triggering_actor == 'ItsSudip' || github.triggering_actor == 'krishna2020' || github.triggering_actor == 'koladilip' || github.triggering_actor == 'lvrach' || github.triggering_actor == 'cisse21' || github.triggering_actor == 'nidhilashkari17' || github.triggering_actor == 'debanjan97' || github.triggering_actor == 'AchuthaSourabhC' || github.triggering_actor == 'saikumarrs' || github.triggering_actor == 'sandeepdsvs' || github.triggering_actor == 'shrouti1507' || github.triggering_actor == 'anantjain45823' || github.triggering_actor == 'mihir-4116' || github.triggering_actor == 'yashasvibajpai' || github.triggering_actor == 'sanpj2292' || github.triggering_actor == 'ujjwal-ab' || github.triggering_actor == 'aashishmalik')
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v4.1.1
         with:
           fetch-depth: 0
 
       - name: Setup Node
-        uses: actions/setup-node@v3.6.0
+        uses: actions/setup-node@v4.0.1
         with:
           node-version-file: '.nvmrc'
           cache: 'npm'

diff --git a/.github/workflows/housekeeping.yml b/.github/workflows/housekeeping.yml
@@ -4,6 +4,7 @@ on:
   schedule:
     # Run everyday at 1 AM
     - cron: '0 1 * * *'
+  workflow_dispatch:
 
 jobs:
   prs:
@@ -14,7 +15,7 @@ jobs:
       pull-requests: write
 
     steps:
-      - uses: actions/stale@v8.0.0
+      - uses: actions/stale@v9.0.0
         with:
           repo-token: ${{ secrets.PAT }}
           operations-per-run: 200
@@ -32,14 +33,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v4.1.1
 
       - name: Delete Old Branches
-        uses: beatlabs/[email protected].9
+        uses: beatlabs/[email protected].10
         with:
           repo_token: ${{ secrets.PAT }}
           date: '3 months ago'
           dry_run: false
           delete_tags: false
-          extra_protected_branch_regex: ^(main|release/.*|develop|hotfix/.*|hotfix-release/.*)$
+          extra_protected_branch_regex: ^(main|develop)$
           exclude_open_pr_branches: true
diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml
@@ -25,12 +25,12 @@ jobs:
           echo "release_version=$version" >> $GITHUB_OUTPUT
 
       - name: Checkout
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v4.1.1
         with:
           fetch-depth: 0
 
       - name: Setup Node
-        uses: actions/setup-node@v3.6.0
+        uses: actions/setup-node@v4.0.1
         with:
           node-version-file: '.nvmrc'
           cache: 'npm'

diff --git a/.github/workflows/report-code-coverage.yml b/.github/workflows/report-code-coverage.yml
@@ -14,12 +14,12 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v4.1.1
         with:
           fetch-depth: 1
 
       - name: Setup Node
-        uses: actions/setup-node@v3.6.0
+        uses: actions/setup-node@v4.0.1
         with:
           node-version-file: '.nvmrc'
           cache: 'npm'

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -13,12 +13,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v4.1.1
         with:
           fetch-depth: 1
 
       - name: Setup Node
-        uses: actions/setup-node@v3.6.0
+        uses: actions/setup-node@v4.0.1
         with:
           node-version-file: '.nvmrc'
           cache: 'npm'
@@ -34,7 +34,7 @@ jobs:
 
       - name: Get changed files
         id: changed_files
-        uses: tj-actions/changed-files@v36
+        uses: tj-actions/changed-files@v41
         with:
           sha: ${{ github.event.pull_request.head.sha }}
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,33 @@
 
 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.0](https://github.com/rudderlabs/rudder-config-schema/compare/v1.61.0...v1.62.0) (2024-01-08)
+
+
+### Features
+
+* deprecate category name for onetrust consent management ([#1125](https://github.com/rudderlabs/rudder-config-schema/issues/1125)) ([9a4b830](https://github.com/rudderlabs/rudder-config-schema/commit/9a4b830fe3eb43839831c54f1fbdbc783efecedb))
+* disable clickhouse warehous source ([#1130](https://github.com/rudderlabs/rudder-config-schema/issues/1130)) ([bd0e35c](https://github.com/rudderlabs/rudder-config-schema/commit/bd0e35cf5aacec46f3b95dbdb4605d49e21c1a08))
+* **INT-780:** move intercom to routerTransform ([#1143](https://github.com/rudderlabs/rudder-config-schema/issues/1143)) ([9e662ed](https://github.com/rudderlabs/rudder-config-schema/commit/9e662ed525a5253883b958c198e45a542c79234d))
+* move Kafka destination to new UI form-builder ([#1090](https://github.com/rudderlabs/rudder-config-schema/issues/1090)) ([9ef698a](https://github.com/rudderlabs/rudder-config-schema/commit/9ef698a9447f16c15c9abc5e7c644e52ed986886))
+* move statsig to new UI form builder ([#1108](https://github.com/rudderlabs/rudder-config-schema/issues/1108)) ([e909562](https://github.com/rudderlabs/rudder-config-schema/commit/e909562c6a195be8af89053f79ddd3a554b32cc5))
+* onboard new destination the trade desk ([#1116](https://github.com/rudderlabs/rudder-config-schema/issues/1116)) ([a1b1e97](https://github.com/rudderlabs/rudder-config-schema/commit/a1b1e975488bf3276eae118b092457e758f25289))
+* onboard reddit cloud mode destination ([#1080](https://github.com/rudderlabs/rudder-config-schema/issues/1080)) ([a3abe96](https://github.com/rudderlabs/rudder-config-schema/commit/a3abe9622fd32b0c13c834b9b9cdfc06a48b06be))
+* re-add removed supportedConnectionModes for eloqua and launchdarkly audience ([#1112](https://github.com/rudderlabs/rudder-config-schema/issues/1112)) ([89294dd](https://github.com/rudderlabs/rudder-config-schema/commit/89294dd3706b0de5f1dac9490351a71777eaf298))
+* **reddit:** add support for hashData field ([#1107](https://github.com/rudderlabs/rudder-config-schema/issues/1107)) ([d875c96](https://github.com/rudderlabs/rudder-config-schema/commit/d875c9619c0150ab678f4730a7f408ab02194639))
+* **sprig:** cloud mode ([#1089](https://github.com/rudderlabs/rudder-config-schema/issues/1089)) ([c3c06b0](https://github.com/rudderlabs/rudder-config-schema/commit/c3c06b00415b20d9ed79f0d979f6eac7e4ce837e))
+* tiktok_ads: add support for custom events ([#1109](https://github.com/rudderlabs/rudder-config-schema/issues/1109)) ([a7cdf3d](https://github.com/rudderlabs/rudder-config-schema/commit/a7cdf3dae4a06c2a3f3488358cee482bd88ebe1b))
+
+
+### Bug Fixes
+
+* add check for requirement of hybridModeCloudEventsFilter property ([#1115](https://github.com/rudderlabs/rudder-config-schema/issues/1115)) ([eaa58a3](https://github.com/rudderlabs/rudder-config-schema/commit/eaa58a3861544bb96984814088379ec5c3c01204))
+* blank aud flow in criteo ([#1144](https://github.com/rudderlabs/rudder-config-schema/issues/1144)) ([2f118da](https://github.com/rudderlabs/rudder-config-schema/commit/2f118da1f5542198416feb58a35c80c5357aab25))
+* destination definition files and add schema ([#1092](https://github.com/rudderlabs/rudder-config-schema/issues/1092)) ([e205d16](https://github.com/rudderlabs/rudder-config-schema/commit/e205d16eb12db2d7921b49c09c9d450e4483b15e))
+* **ortto:** updated default for orttoPersonAttributes.type to "text" from ["text"] ([#1137](https://github.com/rudderlabs/rudder-config-schema/issues/1137)) ([4fc2062](https://github.com/rudderlabs/rudder-config-schema/commit/4fc2062b965e0d591e64a845855b29496ef98e43))
+* **PRO-1448:** update wht library definititons to reflect updated repository names [PRO- ([#1124](https://github.com/rudderlabs/rudder-config-schema/issues/1124)) ([de8928f](https://github.com/rudderlabs/rudder-config-schema/commit/de8928f7f3d22f95276f32bbb06e21743c2ba722))
+* **sprig:** schema issues ([#1141](https://github.com/rudderlabs/rudder-config-schema/issues/1141)) ([fffe907](https://github.com/rudderlabs/rudder-config-schema/commit/fffe907c541892d1f8e5b59fe9027d3c7248b461))
+
 ## [1.61.0](https://github.com/rudderlabs/rudder-config-schema/compare/v1.60.2...v1.61.0) (2023-12-12)
 
 

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.61.0",
+  "version": "1.62.0",
   "description": "",
   "main": "src/index.ts",
   "private": true,

diff --git a/scripts/deployToDB.py b/scripts/deployToDB.py
@@ -102,6 +102,10 @@ def update_diff_db(selector):
     current_items = os.listdir(f'./{CONFIG_DIR}/{selector}s')
 
     for item in current_items:
+        # check if item is a directory
+        if not os.path.isdir(f'./{CONFIG_DIR}/{selector}s/{item}'):
+            continue
+
         updated_data = get_file_content(item, selector)
         persisted_data = get_config_definition(CONTROL_PLANE_URL, selector, updated_data["name"])
 

diff --git a/src/configurations/destinations/active_campaign/schema.json b/src/configurations/destinations/active_campaign/schema.json
@@ -35,13 +35,18 @@
       "useNativeSDK": {
         "type": "object",
         "properties": {
-          "web": { "type": "boolean" }
+          "web": {
+            "type": "boolean"
+          }
         }
       },
       "connectionMode": {
         "type": "object",
         "properties": {
-          "web": { "type": "string", "enum": ["cloud", "device", "hybrid"] }
+          "web": {
+            "type": "string",
+            "enum": ["cloud", "device", "hybrid"]
+          }
         }
       }
     },

diff --git a/src/configurations/destinations/active_campaign/ui-config.json b/src/configurations/destinations/active_campaign/ui-config.json
@@ -28,7 +28,7 @@
                     "configKey": "apiKey",
                     "regex": ".*",
                     "required": true,
-                    "placeholder": "e.g. c59e3838caa934b535c1fd342dfds23452dfcccf95c16787304e7a0c0e8051b326451bb2",
+                    "placeholder": "e.g. c5Xe3398cla9fXXXXf95094eXa0c1e8b32X451bbpm8j2",
                     "secret": true,
                     "footerNote": "Your API Access Key"
                   }
@@ -74,7 +74,7 @@
                     "regex": "^(.{0,100})$",
                     "regexErrorMessage": "Invalid Event Key",
                     "required": false,
-                    "placeholder": "e.g. c2a856fddc721350dec4fbbc2e5c43a7ddfaaa03",
+                    "placeholder": "e.g. c1a85Xfddc121350XXX4fvbc2e5c83a7dXfaha01",
                     "secret": true,
                     "note": "Your Event Key"
                   },
@@ -85,7 +85,7 @@
                     "regex": "^(.{0,100})$",
                     "regexErrorMessage": "Invalid ActID",
                     "required": false,
-                    "placeholder": "e.g. 276450567",
+                    "placeholder": "e.g. 2764X0567",
                     "secret": true,
                     "note": "Your ActId"
                   }
@@ -99,23 +99,23 @@
             "icon": "otherSettings",
             "groups": [
               {
-                "title": "OneTrust cookie consent settings",
+                "title": "OneTrust consent settings",
                 "note": [
-                  "Enter your OneTrust category names if you have them configured. ",
+                  "Enter your OneTrust consent category IDs if you have them configured. The support for category names is deprecated. We recommend using the category IDs instead of the names as IDs are unique and less likely to change over time, making them a more reliable choice.",
                   {
                     "text": "Learn more ",
                     "link": "https://www.rudderstack.com/docs/sources/event-streams/sdks/consent-manager/onetrust/"
                   },
-                  "about RudderStack’s OneTrust Consent Manager feature."
+                  "about RudderStack's OneTrust Consent Management feature."
                 ],
                 "fields": [
                   {
                     "type": "tagInput",
-                    "label": "Cookie category name",
-                    "note": "Input your OneTrust category names by pressing ‘Enter’ after each entry",
+                    "label": "Consent categories",
+                    "note": "Input your OneTrust category IDs by pressing 'Enter' after each entry.",
                     "configKey": "oneTrustCookieCategories",
                     "tagKey": "oneTrustCookieCategory",
-                    "placeholder": "e.g: Credit card visit",
+                    "placeholder": "e.g: C0001",
                     "default": [
                       {
                         "oneTrustCookieCategory": ""

diff --git a/src/configurations/destinations/adj/ui-config.json b/src/configurations/destinations/adj/ui-config.json
@@ -10,7 +10,7 @@
           "regex": "^(.{0,100})$",
           "regexErrorMessage": "Invalid App Token",
           "required": true,
-          "placeholder": "e.g: bSjsdGYsOo9sasdjw23Shj"
+          "placeholder": "e.g: bXjsdGYXXX9saedjw13Slj"
         },
         {
           "type": "checkbox",
@@ -96,7 +96,7 @@
           "keyLeft": "from",
           "keyRight": "to",
           "placeholderLeft": "e.g: product_purchased",
-          "placeholderRight": "e.g: xcdrf5",
+          "placeholderRight": "e.g: xcxrf5",
           "value": "customMappings"
         }
       ]
@@ -127,7 +127,7 @@
           "regex": "^(.{0,100})$",
           "regexErrorMessage": "Invalid Value",
           "required": false,
-          "placeholder": "7"
+          "placeholder": "e.g. 7"
         }
       ]
     },
@@ -137,13 +137,15 @@
         {
           "type": "dynamicCustomForm",
           "value": "oneTrustCookieCategories",
-          "label": "OneTrust Cookie Categories",
+          "label": "OneTrust Consent Categories",
+          "footerNote": "The support for category names is deprecated. We recommend using the category IDs instead of the names as IDs are unique and less likely to change over time, making them a more reliable choice.",
           "customFields": [
             {
               "type": "textInput",
-              "placeholder": "Marketing",
+              "placeholder": "C0001",
               "value": "oneTrustCookieCategory",
-              "label": "Category Name/ID",
+              "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$",
+              "label": "Category ID",
               "required": false
             }
           ]