chore: pr conflicts resolved

.eslintrc.json

@@ -28,7 +28,7 @@
     ],
     "unicorn/no-instanceof-array": "error",
     "unicorn/no-static-only-class": "error",
-    "unicorn/consistent-destructuring": "off",
+    "unicorn/consistent-destructuring": "error",
     "unicorn/better-regex": "error",
     "unicorn/no-for-loop": "error",
     "unicorn/prefer-array-some": "error",
@@ -40,29 +40,31 @@
     "unicorn/no-useless-spread": "error",
     "unicorn/no-useless-length-check": "error",
     "unicorn/prefer-export-from": "error",
-    "import/no-dynamic-require": "warn",
-    "no-param-reassign": "warn",
+    "import/no-dynamic-require": "error",
+    "no-param-reassign": "error",
     "sonarjs/prefer-immediate-return": "off",
     "sonarjs/no-nested-template-literals": "off",
-    "sonarjs/max-switch-cases": "off",
-    "sonarjs/no-small-switch": "warn",
+    "sonarjs/max-switch-cases": "error",
+    "sonarjs/no-small-switch": "error",
     "sonarjs/cognitive-complexity": ["error", 60],
     "@typescript-eslint/no-var-requires": "off",
-    "global-require": "off",
-    "@typescript-eslint/naming-convention": "off",
-    "@typescript-eslint/ban-types": "off",
+    "global-require": "error",
+    "@typescript-eslint/naming-convention": "error",
+    "@typescript-eslint/ban-types": "error",
+    "@typescript-eslint/no-explicit-any": "off",
     "class-methods-use-this": "off",
-    "@typescript-eslint/return-await": "off",
-    "import/prefer-default-export": "off",
-    "sonarjs/no-ignored-return": "off",
-    "no-new": "off",
-    "@typescript-eslint/no-shadow": "off",
-    "@typescript-eslint/no-loop-func": "off",
-    "sonarjs/no-same-line-conditional": "off",
-    "no-restricted-syntax": "off",
-    "sonarjs/no-duplicate-string": "off",
-    "sonarjs/no-identical-functions": "off",
+    "@typescript-eslint/return-await": "error",
+    "import/prefer-default-export": "error",
+    "sonarjs/no-ignored-return": "error",
+    "no-new": "error",
+    "@typescript-eslint/no-shadow": "error",
+    "@typescript-eslint/no-loop-func": "error",
+    "sonarjs/no-same-line-conditional": "error",
+    "no-restricted-syntax": "error",
+    "sonarjs/no-duplicate-string": "error",
+    "sonarjs/no-identical-functions": "error",
     "no-prototype-builtins": "off",
-    "@typescript-eslint/dot-notation": "off"
+    "@typescript-eslint/dot-notation": "error",
+    "@typescript-eslint/no-unused-vars": "error"
   }
 }

.github/workflows/create-hotfix-branch.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
 
     # Only allow these users to create new hotfix branch from 'main'
-    if: github.ref == 'refs/heads/main' && (github.actor == 'ItsSudip' || github.actor == 'krishna2020' || github.actor == 'saikumarrs' || github.actor == 'sandeepdsvs' || github.actor == 'shrouti1507') && (github.triggering_actor == 'ItsSudip' || github.triggering_actor == 'krishna2020' ||  github.triggering_actor == 'saikumarrs' || github.triggering_actor == 'sandeepdsvs' || github.triggering_actor == 'shrouti1507')
+    if: github.ref == 'refs/heads/main' && (github.actor == 'ItsSudip' || github.actor == 'krishna2020' || github.actor == 'saikumarrs' || github.actor == 'sandeepdsvs' || github.actor == 'shrouti1507' || github.actor == 'anantjain45823') && (github.triggering_actor == 'ItsSudip' || github.triggering_actor == 'krishna2020' ||  github.triggering_actor == 'saikumarrs' || github.triggering_actor == 'sandeepdsvs' || github.triggering_actor == 'shrouti1507' || github.triggering_actor == 'anantjain45823')
     steps:
       - name: Create Branch
         uses: peterjgrainger/[email protected]

.github/workflows/draft-new-release.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
 
     # Only allow release stakeholders to initiate releases
-    if: (github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/heads/hotfix/')) && (github.actor == 'ItsSudip' || github.actor == 'krishna2020' || github.actor == 'saikumarrs' || github.actor == 'sandeepdsvs' || github.actor == 'shrouti1507') &&  (github.triggering_actor == 'ItsSudip' || github.triggering_actor == 'krishna2020' || github.triggering_actor == 'saikumarrs' || github.triggering_actor == 'sandeepdsvs' || github.triggering_actor == 'shrouti1507')
+    if: (github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/heads/hotfix/')) && (github.actor == 'ItsSudip' || github.actor == 'krishna2020' || github.actor == 'saikumarrs' || github.actor == 'sandeepdsvs' || github.actor == 'shrouti1507' || github.actor == 'anantjain45823') &&  (github.triggering_actor == 'ItsSudip' || github.triggering_actor == 'krishna2020' || github.triggering_actor == 'saikumarrs' || github.triggering_actor == 'sandeepdsvs' || github.triggering_actor == 'shrouti1507' || github.triggering_actor == 'anantjain45823')
     steps:
       - name: Checkout
         uses: actions/[email protected]

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 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.43.1](https://github.com/rudderlabs/rudder-transformer/compare/v1.43.0...v1.43.1) (2023-09-26)
+
+
+### Bug Fixes
+
+* **dm:** updated the stats definition for the tracking plan service ([eb2724f](https://github.com/rudderlabs/rudder-transformer/commit/eb2724f135d2c3c2a1fb8a88051cfb0f2720b5ed))
+* **iterable:** event id mapping ([#2659](https://github.com/rudderlabs/rudder-transformer/issues/2659)) ([84083aa](https://github.com/rudderlabs/rudder-transformer/commit/84083aa671312e3934414b5534489fba87d9b29f))
+
 ## [1.43.0](https://github.com/rudderlabs/rudder-transformer/compare/v1.42.0...v1.43.0) (2023-09-25)