Merge branch 'develop' into fix.shopify.v2.property.bugfixes

rudderlabs · Jan 2, 2025 · 48b83ad · 48b83ad
2 parents e989b14 + ac673fc
commit 48b83ad
Show file tree

Hide file tree

Showing 94 changed files with 2,342 additions and 2,156 deletions.
diff --git a/.github/workflows/prepare-for-prod-dt-deploy.yml b/.github/workflows/prepare-for-prod-dt-deploy.yml
@@ -159,29 +159,29 @@ jobs:
 
           cd customer-objects
 
-          declare -a enabled_ut_customers=()
+          declare -a enabled_dt_customers=()
           declare -a sub_directories=('enterprise-us' 'enterprise-eu')
 
           # identify the customers enabled in sub-directories
           for directory in "${sub_directories[@]}"; do
             for f in "./$directory"/*; do
               [[ -f $f ]] || continue
 
-              enabled="$(yq e '.spec.user_transformer.enabled' $f)"
+              enabled="$(yq e '.spec.transformer.enabled' $f)"
               if [ $enabled == "true" ]; then
-                  enabled_ut_customers+=( $f )
+                  enabled_dt_customers+=( $f )
               fi
             done
           done
 
           # bump up the customers version and repository information
-          for customer in "${enabled_ut_customers[@]}"; do
-            yq eval -i ".spec.user_transformer.image.version=\"$TAG_NAME\"" $customer
-            yq eval -i ".spec.user_transformer.image.repository=\"$TF_IMAGE_REPOSITORY\"" $customer
+          for customer in "${enabled_dt_customers[@]}"; do
+            yq eval -i ".spec.transformer.image.version=\"$TAG_NAME\"" $customer
+            yq eval -i ".spec.transformer.image.repository=\"$TF_IMAGE_REPOSITORY\"" $customer
             git add $customer
           done
 
-          git commit -m "chore: upgrade dedicated transformers to $TAG_NAME"
+          git commit -m "chore: upgrade dedicated dt transformers to $TAG_NAME"
           git push -u origin dedicated-transformer-$TAG_NAME
 
           gh pr create --fill
diff --git a/.github/workflows/prepare-for-prod-ut-deploy.yml b/.github/workflows/prepare-for-prod-ut-deploy.yml
@@ -29,6 +29,7 @@ jobs:
     if: ((startsWith(github.event.pull_request.head.ref, 'release/') || startsWith(github.event.pull_request.head.ref, 'hotfix-release/')) && github.event.pull_request.merged == true)
     outputs:
       tag_name_ut: ${{ steps.gen_tag_names.outputs.tag_name_ut }}
+      tag_name: ${{ steps.gen_tag_names.outputs.tag_name }}
     steps:
       - name: Checkout
         uses: actions/[email protected]
@@ -71,6 +72,7 @@ jobs:
     needs: [generate-tag-names, build-user-transformer-image]
     env:
       UT_TAG_NAME: ${{ needs.generate-tag-names.outputs.tag_name_ut }}
+      TAG_NAME: ${{ needs.generate-tag-names.outputs.tag_name }}
       TF_IMAGE_REPOSITORY: rudderstack/rudder-transformer
     steps:
       - name: Checkout
@@ -134,3 +136,39 @@ jobs:
           git push -u origin hosted-user-transformer-$UT_TAG_NAME
 
           gh pr create --fill
+
+      - name: Update helm charts and raise pull request for enterprise customers on dedicated transformers
+        env:
+          GITHUB_TOKEN: ${{ secrets.PAT }}
+        run: |
+          cd rudder-devops
+          git checkout -b dedicated-user-transformer-$TAG_NAME
+
+          cd customer-objects
+
+          declare -a enabled_ut_customers=()
+          declare -a sub_directories=('enterprise-us' 'enterprise-eu')
+
+          # identify the customers enabled in sub-directories
+          for directory in "${sub_directories[@]}"; do
+            for f in "./$directory"/*; do
+              [[ -f $f ]] || continue
+
+              enabled="$(yq e '.spec.user_transformer.enabled' $f)"
+              if [ $enabled == "true" ]; then
+                  enabled_ut_customers+=( $f )
+              fi
+            done
+          done
+
+          # bump up the customers version and repository information
+          for customer in "${enabled_ut_customers[@]}"; do
+            yq eval -i ".spec.user_transformer.image.version=\"$TAG_NAME\"" $customer
+            yq eval -i ".spec.user_transformer.image.repository=\"$TF_IMAGE_REPOSITORY\"" $customer
+            git add $customer
+          done
+
+          git commit -m "chore: upgrade dedicated user transformers to $TAG_NAME"
+          git push -u origin dedicated-user-transformer-$TAG_NAME
+
+          gh pr create --fill
diff --git a/.gitignore b/.gitignore
@@ -139,4 +139,8 @@ dist
 
 # component test report
 test_reports/
-temp/
+temp/
+
+# Allure
+allure-results/
+allure-report/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 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.87.0](https://github.com/rudderlabs/rudder-transformer/compare/v1.86.0...v1.87.0) (2024-12-13)
+
+
+### Features
+
+* onboard topsort destination ([#3913](https://github.com/rudderlabs/rudder-transformer/issues/3913)) ([227419f](https://github.com/rudderlabs/rudder-transformer/commit/227419f1ff618f96aafa849862828e2315e4ac55))
+
+
+### Bug Fixes
+
+* handling partial error in a batch for reddit destination ([#3935](https://github.com/rudderlabs/rudder-transformer/issues/3935)) ([d40db6c](https://github.com/rudderlabs/rudder-transformer/commit/d40db6c1e7f71c5ab5fc3a3659d1fc51b6d527fa))
+
 ## [1.86.0](https://github.com/rudderlabs/rudder-transformer/compare/v1.85.1...v1.86.0) (2024-12-09)
 
 

diff --git a/jest.config.typescript.js b/jest.config.typescript.js
@@ -128,7 +128,7 @@ module.exports = {
   // snapshotSerializers: [],
 
   // The test environment that will be used for testing
-  testEnvironment: 'node',
+  testEnvironment: 'allure-jest/node',
 
   // Options that will be passed to the testEnvironment
   // testEnvironmentOptions: {},

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rudder-transformer",
-  "version": "1.86.0",
+  "version": "1.87.0",
   "description": "",
   "homepage": "https://github.com/rudderlabs/rudder-transformer#readme",
   "bugs": {
@@ -135,6 +135,7 @@
     "@types/supertest": "^6.0.2",
     "@typescript-eslint/eslint-plugin": "^5.61.0",
     "@typescript-eslint/parser": "^5.59.2",
+    "allure-jest": "^3.0.7",
     "axios-mock-adapter": "^1.22.0",
     "benchmark-suite": "^0.1.8",
     "commander": "^10.0.1",
@@ -154,6 +155,8 @@
     "http-terminator": "^3.2.0",
     "husky": "^9.1.6",
     "jest": "^29.5.0",
+    "jest-diff": "^29.7.0",
+    "jest-environment-node": "^29.7.0",
     "jest-sonar": "^0.2.16",
     "jest-when": "^3.5.2",
     "lint-staged": "^13.2.2",