chore: resolve conflicts and merge main to develop (#3865)

chore: resolve conflicts
rudderlabs · Nov 11, 2024 · 10d4cc0 · 10d4cc0
1 parent fa93f09
commit 10d4cc0
Show file tree

Hide file tree

Showing 17 changed files with 318 additions and 236 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 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.83.2](https://github.com/rudderlabs/rudder-transformer/compare/v1.83.1...v1.83.2) (2024-11-05)
+
+
+### Bug Fixes
+
+* update gaec destination with config validation ([#3847](https://github.com/rudderlabs/rudder-transformer/issues/3847)) ([e5c5b0a](https://github.com/rudderlabs/rudder-transformer/commit/e5c5b0a28070ff5ca89a274c3998b96780139149))
+
+### [1.83.1](https://github.com/rudderlabs/rudder-transformer/compare/v1.83.0...v1.83.1) (2024-11-01)
+
 ## [1.83.0](https://github.com/rudderlabs/rudder-transformer/compare/v1.82.2...v1.83.0) (2024-10-25)
 
 

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.83.0",
+  "version": "1.83.2",
   "description": "",
   "homepage": "https://github.com/rudderlabs/rudder-transformer#readme",
   "bugs": {

diff --git a/src/cdk/v2/destinations/pinterest_tag/procWorkflow.yaml b/src/cdk/v2/destinations/pinterest_tag/procWorkflow.yaml
@@ -167,11 +167,7 @@ steps:
               "content_ids": (props.product_id ?? props.sku ?? props.id)[],
               "contents": {
                 "quantity": Number(props.quantity) || 1,
-                "item_price": String(props.price),
-                "item_name": String(props.name),
-                "id": props.product_id ?? props.sku,
-                "item_category": props.category,
-                "item_brand": props.brand
+                "item_price": String(props.price)
               }[]
             };
       - name: combineAllEcomFields

diff --git a/src/v0/destinations/google_adwords_enhanced_conversions/transform.js b/src/v0/destinations/google_adwords_enhanced_conversions/transform.js
@@ -56,13 +56,11 @@ const responseBuilder = async (metadata, message, { Config }, payload) => {
   if (isNumber(customerId)) {
     customerId = customerId.toString();
   }
-  if (isNumber(loginCustomerId)) {
-    loginCustomerId = loginCustomerId.toString();
-  }
-  if (!isString(customerId) || !isString(loginCustomerId)) {
-    throw new InstrumentationError('customerId and loginCustomerId should be a string or number');
+  if (!isString(customerId)) {
+    throw new InstrumentationError('customerId should be a string or number');
   }
   const filteredCustomerId = removeHyphens(customerId);
+
   response.endpoint = `${BASE_ENDPOINT}/${filteredCustomerId}:uploadConversionAdjustments`;
   response.body.JSON = payload;
   const accessToken = getAccessToken(metadata, 'access_token');
@@ -72,11 +70,19 @@ const responseBuilder = async (metadata, message, { Config }, payload) => {
     'developer-token': getValueFromMessage(metadata, 'secret.developer_token'),
   };
   response.params = { event, customerId: filteredCustomerId };
-  if (subAccount)
-    if (loginCustomerId) {
-      const filteredLoginCustomerId = removeHyphens(loginCustomerId);
-      response.headers['login-customer-id'] = filteredLoginCustomerId;
-    } else throw new ConfigurationError(`LoginCustomerId is required as subAccount is true.`);
+  if (subAccount) {
+    if (!loginCustomerId) {
+      throw new ConfigurationError(`loginCustomerId is required as subAccount is true.`);
+    }
+    if (isNumber(loginCustomerId)) {
+      loginCustomerId = loginCustomerId.toString();
+    }
+    if (loginCustomerId && !isString(loginCustomerId)) {
+      throw new InstrumentationError('loginCustomerId should be a string or number');
+    }
+    const filteredLoginCustomerId = removeHyphens(loginCustomerId);
+    response.headers['login-customer-id'] = filteredLoginCustomerId;
+  }
 
   if (loginCustomerId) {
     const filteredLoginCustomerId = removeHyphens(loginCustomerId);

diff --git a/src/v0/util/index.test.js b/src/v0/util/index.test.js
@@ -977,6 +977,7 @@ describe('removeHyphens', () => {
     { input: null, expected: null },
     { input: undefined, expected: undefined },
     { input: 12345, expected: 12345 },
+    { input: '123-12-241', expected: '12312241' },
   ];
   it('should remove hyphens from string else return the input as it is', () => {
     data.forEach(({ input, expected }) => {

diff --git a/test/apitests/data_scenarios/cdk_v2/failure.json b/test/apitests/data_scenarios/cdk_v2/failure.json
@@ -556,10 +556,6 @@
               "content_ids": ["123"],
               "contents": [
                 {
-                  "id": "123",
-                  "item_brand": "Gamepro",
-                  "item_category": "Games",
-                  "item_name": "Game",
                   "quantity": 11,
                   "item_price": "13.49"
                 }
@@ -683,10 +679,6 @@
               "content_ids": ["123"],
               "contents": [
                 {
-                  "id": "123",
-                  "item_brand": "Gamepro",
-                  "item_category": "Games",
-                  "item_name": "Game",
                   "quantity": 11,
                   "item_price": "13.49"
                 }

diff --git a/test/apitests/data_scenarios/cdk_v2/success.json b/test/apitests/data_scenarios/cdk_v2/success.json
@@ -556,10 +556,6 @@
               "content_ids": ["123"],
               "contents": [
                 {
-                  "id": "123",
-                  "item_brand": "Gamepro",
-                  "item_category": "Games",
-                  "item_name": "Game",
                   "quantity": 11,
                   "item_price": "13.49"
                 }
@@ -638,10 +634,6 @@
               "content_ids": ["123"],
               "contents": [
                 {
-                  "id": "123",
-                  "item_brand": "Gamepro",
-                  "item_category": "Games",
-                  "item_name": "Game",
                   "quantity": 11,
                   "item_price": "13.49"
                 }
@@ -720,10 +712,6 @@
               "content_ids": ["123"],
               "contents": [
                 {
-                  "id": "123",
-                  "item_brand": "Gamepro",
-                  "item_category": "Games",
-                  "item_name": "Game",
                   "quantity": 11,
                   "item_price": "13.49"
                 }

diff --git a/test/apitests/data_scenarios/destination/proc/batch_input_multiplex.json b/test/apitests/data_scenarios/destination/proc/batch_input_multiplex.json
@@ -388,10 +388,6 @@
               "content_ids": ["123"],
               "contents": [
                 {
-                  "id": "123",
-                  "item_brand": "Gamepro",
-                  "item_category": "Games",
-                  "item_name": "Game",
                   "quantity": 11,
                   "item_price": "13.49"
                 }
@@ -470,10 +466,6 @@
               "content_ids": ["123"],
               "contents": [
                 {
-                  "id": "123",
-                  "item_brand": "Gamepro",
-                  "item_category": "Games",
-                  "item_name": "Game",
                   "quantity": 11,
                   "item_price": "13.49"
                 }
@@ -552,10 +544,6 @@
               "content_ids": ["123"],
               "contents": [
                 {
-                  "id": "123",
-                  "item_brand": "Gamepro",
-                  "item_category": "Games",
-                  "item_name": "Game",
                   "quantity": 11,
                   "item_price": "13.49"
                 }

diff --git a/test/apitests/data_scenarios/destination/proc/multiplex_partial_failure.json b/test/apitests/data_scenarios/destination/proc/multiplex_partial_failure.json
@@ -388,10 +388,6 @@
               "content_ids": ["123"],
               "contents": [
                 {
-                  "id": "123",
-                  "item_brand": "Gamepro",
-                  "item_category": "Games",
-                  "item_name": "Game",
                   "quantity": 11,
                   "item_price": "13.49"
                 }
@@ -470,10 +466,6 @@
               "content_ids": ["123"],
               "contents": [
                 {
-                  "id": "123",
-                  "item_brand": "Gamepro",
-                  "item_category": "Games",
-                  "item_name": "Game",
                   "quantity": 11,
                   "item_price": "13.49"
                 }

diff --git a/test/apitests/data_scenarios/destination/proc/multiplex_success.json b/test/apitests/data_scenarios/destination/proc/multiplex_success.json
@@ -207,10 +207,6 @@
               "content_ids": ["123"],
               "contents": [
                 {
-                  "id": "123",
-                  "item_brand": "Gamepro",
-                  "item_category": "Games",
-                  "item_name": "Game",
                   "quantity": 11,
                   "item_price": "13.49"
                 }
@@ -289,10 +285,6 @@
               "content_ids": ["123"],
               "contents": [
                 {
-                  "id": "123",
-                  "item_brand": "Gamepro",
-                  "item_category": "Games",
-                  "item_name": "Game",
                   "quantity": 11,
                   "item_price": "13.49"
                 }

diff --git a/test/apitests/data_scenarios/destination/router/failure_test.json b/test/apitests/data_scenarios/destination/router/failure_test.json
@@ -754,10 +754,6 @@
                     "content_ids": ["123"],
                     "contents": [
                       {
-                        "id": "123",
-                        "item_brand": "Gamepro",
-                        "item_category": "Games",
-                        "item_name": "Game",
                         "quantity": 11,
                         "item_price": "13.49"
                       }
@@ -785,10 +781,6 @@
                     "content_ids": ["123"],
                     "contents": [
                       {
-                        "id": "123",
-                        "item_brand": "Gamepro",
-                        "item_category": "Games",
-                        "item_name": "Game",
                         "quantity": 11,
                         "item_price": "13.49"
                       }

diff --git a/test/integrations/destinations/google_adwords_enhanced_conversions/processor/data.ts b/test/integrations/destinations/google_adwords_enhanced_conversions/processor/data.ts
@@ -814,7 +814,7 @@ export const data = [
               },
             },
             statusCode: 400,
-            error: 'LoginCustomerId is required as subAccount is true.',
+            error: 'loginCustomerId is required as subAccount is true.',
             statTags: {
               errorCategory: 'dataValidation',
               errorType: 'configuration',