Merge branch 'feat.salesforce-auth' of github.com:rudderlabs/rudder-t…

…ransformer into feat.salesforce-auth

.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.actor == 'anantjain45823' || github.actor == 'chandumlg' || github.actor == 'mihir-4116' || github.actor == 'ujjwal-ab') && (github.triggering_actor == 'ItsSudip' || github.triggering_actor == 'krishna2020' ||  github.triggering_actor == 'saikumarrs' || github.triggering_actor == 'sandeepdsvs' || github.triggering_actor == 'shrouti1507' || github.triggering_actor == 'anantjain45823' || github.triggering_actor == 'chandumlg' || github.triggering_actor == 'mihir-4116' || github.triggering_actor == 'ujjwal-ab)
+    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.actor == 'chandumlg' || github.actor == 'mihir-4116' || github.actor == 'ujjwal-ab') && (github.triggering_actor == 'ItsSudip' || github.triggering_actor == 'krishna2020' ||  github.triggering_actor == 'saikumarrs' || github.triggering_actor == 'sandeepdsvs' || github.triggering_actor == 'shrouti1507' || github.triggering_actor == 'anantjain45823' || github.triggering_actor == 'chandumlg' || github.triggering_actor == 'mihir-4116' || github.triggering_actor == 'ujjwal-ab')
     steps:
       - name: Create Branch
         uses: peterjgrainger/[email protected]

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 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.49.1](https://github.com/rudderlabs/rudder-transformer/compare/v1.49.0...v1.49.1) (2023-11-10)
+
+
+### Bug Fixes
+
+* update create-hotfix-branch.yml ([#2815](https://github.com/rudderlabs/rudder-transformer/issues/2815)) ([dd884dd](https://github.com/rudderlabs/rudder-transformer/commit/dd884ddc78898bd7de155ec4f05ce8fe6e2c4b80))
+
 ## [1.49.0](https://github.com/rudderlabs/rudder-transformer/compare/v1.48.0...v1.49.0) (2023-11-06)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rudder-transformer",
-  "version": "1.49.0",
+  "version": "1.49.1",
   "description": "",
   "homepage": "https://github.com/rudderlabs/rudder-transformer#readme",
   "bugs": {

src/cdk/v2/destinations/pinterest_tag/procWorkflow.yaml

@@ -100,7 +100,8 @@ steps:
         "hashed_maids": .context.device.advertisingId,
         "client_ip_address": .context.ip ?? .request_ip,
         "client_user_agent": .context.userAgent,
-        "external_id": {{{{$.getGenericPaths("userId")}}}}
+        "external_id": {{{{$.getGenericPaths("userId")}}}},
+        "click_id": .properties.clickId
       });
       !.destination.Config.sendExternalId ?  userFields = userFields{~["external_id"]} : null;
       userFields = $.removeUndefinedAndNullAndEmptyValues(userFields);
@@ -185,14 +186,13 @@ steps:
   - name: payload
     template: |
       $.outputs.eventNames.().({...$.outputs.basePayload, event_name: .})[]
-    
+
   - name: checkSendTestEventConfig
     description: |
       If sendTestEvent is enabled, we send test event to the destination
       ref: https://help.pinterest.com/en/business/article/track-conversions-with-the-conversions-api
     template: |
-        ^.destination.Config.sendAsTestEvent ? {"test": true} : {}
-        
+      ^.destination.Config.sendAsTestEvent ? {"test": true} : {}
 
   - name: buildResponseForBatchMode
     description: In batchMode we return payload directly

src/cdk/v2/handler.ts

@@ -65,13 +65,9 @@ export function getCachedWorkflowEngine(
 }
 
 export async function executeWorkflow(workflowEngine: WorkflowEngine, parsedEvent: FixMe) {
-  try {
-    const result = await workflowEngine.execute(parsedEvent);
-    // TODO: Handle remaining output scenarios
-    return result.output;
-  } catch (error) {
-    throw getErrorInfo(error, isCdkV2Destination(parsedEvent), defTags);
-  }
+  const result = await workflowEngine.execute(parsedEvent);
+  // TODO: Handle remaining output scenarios
+  return result.output;
 }
 
 export async function processCdkV2Workflow(

src/v0/destinations/am/transform.js

@@ -195,9 +195,9 @@ const handleTraits = (messageTrait, destination) => {
 
 const getScreenevTypeAndUpdatedProperties = (message, CATEGORY_KEY) => {
   const name = message.name || message.event || get(message, CATEGORY_KEY);
-  const updatedName = name ? `${name} ` : '';
+
   return {
-    eventType: `Viewed ${updatedName}Screen`,
+    eventType: `Viewed ${message.name || message.event || get(message, CATEGORY_KEY) || ''} Screen`,
     updatedProperties: {
       ...message.properties,
       name,
@@ -578,8 +578,6 @@ const getGroupInfo = (destination, groupInfo, groupTraits) => {
   }
   return groupInfo;
 };
-const getUpdatedPageNameWithoutUserDefinedPageEventName = (name, message, CATEGORY_KEY) =>
-  name || get(message, CATEGORY_KEY) ? `${name || get(message, CATEGORY_KEY)} ` : undefined;
 
 // Generic process function which invokes specific handler functions depending on message type
 // and event type where applicable
@@ -615,12 +613,7 @@ const processSingleMessage = (message, destination) => {
                 .trim()
                 .replaceAll(/{{([^{}]+)}}/g, get(message, getMessagePath));
       } else {
-        const updatedName = getUpdatedPageNameWithoutUserDefinedPageEventName(
-          name,
-          message,
-          CATEGORY_KEY,
-        );
-        evType = `Viewed ${updatedName || ''}Page`;
+        evType = `Viewed ${name || get(message, CATEGORY_KEY) || ''} Page`;
       }
       message.properties = {
         ...properties,

src/v0/destinations/tiktok_ads/data/TikTokTrack.json

@@ -72,6 +72,11 @@
     "sourceKeys": ["properties.context.ad", "context.ad"],
     "required": false
   },
+  {
+    "destKey": "context.ad.callback",
+    "sourceKeys": "properties.clickId",
+    "required": false
+  },
   {
     "destKey": "context.page",
     "sourceKeys": ["properties.context.page", "context.page"],

test/__tests__/data/am_output.json

@@ -3944,7 +3944,7 @@
               "id": "User Android",
               "userId": "User Android"
             },
-            "event_type": "Viewed Screen",
+            "event_type": "Viewed  Screen",
             "user_id": "User Android",
             "device_brand": "Google",
             "time": 1662393883250,
@@ -4276,7 +4276,7 @@
             "app_name": "RudderLabs JavaScript SDK",
             "app_version": "1.0.0",
             "language": "en-US",
-            "event_type": "Viewed Page",
+            "event_type": "Viewed  Page",
             "event_properties": {
               "path": "/destinations/amplitude",
               "referrer": "",

test/apitests/data_scenarios/cdk_v2/failure.json

@@ -646,7 +646,8 @@
       "statusCode": 400,
       "error": "Action source must be one of app_android, app_ios, web, offline: Workflow: procWorkflow, Step: validateCommonFields, ChildStep: undefined, OriginalError: Action source must be one of app_android, app_ios, web, offline",
       "statTags": {
-        "errorCategory": "platform",
+        "errorCategory": "dataValidation",
+        "errorType": "instrumentation",
         "implementation": "cdkV2",
         "destType": "PINTEREST_TAG",
         "module": "destination",