Merge branch 'develop' into feat.cdkV2-componentTests

src/controllers/source.ts

@@ -16,10 +16,15 @@ export default class SourceController {
     const { version, source }: { version: string; source: string } = ctx.params;
     const integrationService = ServiceSelector.getNativeSourceService();
     try {
-      const resplist = await integrationService.sourceTransformRoutine(
-        events,
+      const { implementationVersion, input } = ControllerUtility.adaptInputToVersion(
         source,
         version,
+        events,
+      );
+      const resplist = await integrationService.sourceTransformRoutine(
+        input,
+        source,
+        implementationVersion,
         requestMetadata,
       );
       ctx.body = resplist;

src/controllers/util/index.test.ts

@@ -0,0 +1,149 @@
+import ControllerUtility from './index';
+
+describe('adaptInputToVersion', () => {
+  it('should return the input unchanged when the implementation version is not found', () => {
+    const sourceType = 'NA_SOURCE';
+    const requestVersion = 'v0';
+    const input = [
+      { key1: 'val1', key2: 'val2' },
+      { key1: 'val1', key2: 'val2' },
+      { key1: 'val1', key2: 'val2' },
+    ];
+    const expected = {
+      implementationVersion: undefined,
+      input: [
+        { key1: 'val1', key2: 'val2' },
+        { key1: 'val1', key2: 'val2' },
+        { key1: 'val1', key2: 'val2' },
+      ],
+    };
+
+    const result = ControllerUtility.adaptInputToVersion(sourceType, requestVersion, input);
+
+    expect(result).toEqual(expected);
+  });
+  it('should return the input unchanged when the implementation version and request version are the same i.e. v0', () => {
+    const sourceType = 'pipedream';
+    const requestVersion = 'v0';
+    const input = [
+      { key1: 'val1', key2: 'val2' },
+      { key1: 'val1', key2: 'val2' },
+      { key1: 'val1', key2: 'val2' },
+    ];
+    const expected = {
+      implementationVersion: 'v0',
+      input: [
+        { key1: 'val1', key2: 'val2' },
+        { key1: 'val1', key2: 'val2' },
+        { key1: 'val1', key2: 'val2' },
+      ],
+    };
+
+    const result = ControllerUtility.adaptInputToVersion(sourceType, requestVersion, input);
+
+    expect(result).toEqual(expected);
+  });
+  it('should return the input unchanged when the implementation version and request version are the same i.e. v1', () => {
+    const sourceType = 'webhook';
+    const requestVersion = 'v1';
+    const input = [
+      {
+        event: { key1: 'val1', key2: 'val2' },
+        source: { id: 'source_id', config: { configField1: 'configVal1' } },
+      },
+      {
+        event: { key1: 'val1', key2: 'val2' },
+        source: { id: 'source_id', config: { configField1: 'configVal1' } },
+      },
+      {
+        event: { key1: 'val1', key2: 'val2' },
+        source: { id: 'source_id', config: { configField1: 'configVal1' } },
+      },
+    ];
+    const expected = {
+      implementationVersion: 'v1',
+      input: [
+        {
+          event: { key1: 'val1', key2: 'val2' },
+          source: { id: 'source_id', config: { configField1: 'configVal1' } },
+        },
+        {
+          event: { key1: 'val1', key2: 'val2' },
+          source: { id: 'source_id', config: { configField1: 'configVal1' } },
+        },
+        {
+          event: { key1: 'val1', key2: 'val2' },
+          source: { id: 'source_id', config: { configField1: 'configVal1' } },
+        },
+      ],
+    };
+
+    const result = ControllerUtility.adaptInputToVersion(sourceType, requestVersion, input);
+
+    expect(result).toEqual(expected);
+  });
+  it('should convert input from v0 to v1 when the request version is v0 and the implementation version is v1', () => {
+    const sourceType = 'webhook';
+    const requestVersion = 'v0';
+    const input = [
+      { key1: 'val1', key2: 'val2' },
+      { key1: 'val1', key2: 'val2' },
+      { key1: 'val1', key2: 'val2' },
+    ];
+    const expected = {
+      implementationVersion: 'v1',
+      input: [
+        { event: { key1: 'val1', key2: 'val2' }, source: undefined },
+        { event: { key1: 'val1', key2: 'val2' }, source: undefined },
+        { event: { key1: 'val1', key2: 'val2' }, source: undefined },
+      ],
+    };
+
+    const result = ControllerUtility.adaptInputToVersion(sourceType, requestVersion, input);
+
+    expect(result).toEqual(expected);
+  });
+
+  it('should convert input from v1 to v0 format when the request version is v1 and the implementation version is v0', () => {
+    const sourceType = 'pipedream';
+    const requestVersion = 'v1';
+    const input = [
+      {
+        event: { key1: 'val1', key2: 'val2' },
+        source: { id: 'source_id', config: { configField1: 'configVal1' } },
+      },
+      {
+        event: { key1: 'val1', key2: 'val2' },
+        source: { id: 'source_id', config: { configField1: 'configVal1' } },
+      },
+      {
+        event: { key1: 'val1', key2: 'val2' },
+        source: { id: 'source_id', config: { configField1: 'configVal1' } },
+      },
+    ];
+    const expected = {
+      implementationVersion: 'v0',
+      input: [
+        { key1: 'val1', key2: 'val2' },
+        { key1: 'val1', key2: 'val2' },
+        { key1: 'val1', key2: 'val2' },
+      ],
+    };
+
+    const result = ControllerUtility.adaptInputToVersion(sourceType, requestVersion, input);
+
+    expect(result).toEqual(expected);
+  });
+
+  // Should return an empty array when the input is an empty array
+  it('should return an empty array when the input is an empty array', () => {
+    const sourceType = 'pipedream';
+    const requestVersion = 'v1';
+    const input = [];
+    const expected = { implementationVersion: 'v0', input: [] };
+
+    const result = ControllerUtility.adaptInputToVersion(sourceType, requestVersion, input);
+
+    expect(result).toEqual(expected);
+  });
+});

src/controllers/util/index.ts

@@ -1,3 +1,5 @@
+import fs = require('fs');
+import path = require('path');
 import { Context } from 'koa';
 import isEmpty from 'lodash/isEmpty';
 import get from 'get-value';
@@ -7,12 +9,15 @@ import {
   ProcessorTransformationRequest,
   RouterTransformationRequestData,
   RudderMessage,
+  SourceInput,
 } from '../../types';
 import { getValueFromMessage } from '../../v0/util';
 import genericFieldMap from '../../v0/util/data/GenericFieldMapping.json';
 import { EventType, MappedToDestinationKey } from '../../constants';
 
 export default class ControllerUtility {
+  private static sourceVersionMap: Map<string, string> = new Map();
+
   public static timestampValsMap: Record<string, string[]> = {
     [EventType.IDENTIFY]: [
       `context.${RETL_TIMESTAMP}`,
@@ -23,6 +28,49 @@ export default class ControllerUtility {
     [EventType.TRACK]: [`properties.${RETL_TIMESTAMP}`, ...genericFieldMap.timestamp],
   };
 
+  private static getSourceVersionsMap(): Map<string, any> {
+    if (this.sourceVersionMap?.size > 0) {
+      return this.sourceVersionMap;
+    }
+    const versions = ['v0', 'v1'];
+    versions.forEach((version) => {
+      const files = fs.readdirSync(path.resolve(__dirname, `../../${version}/sources`), {
+        withFileTypes: true,
+      });
+      const sources = files.filter((file) => file.isDirectory()).map((folder) => folder.name);
+      sources.forEach((source) => {
+        this.sourceVersionMap.set(source, version);
+      });
+    });
+    return this.sourceVersionMap;
+  }
+
+  private static convertSourceInputv1Tov0(sourceEvents: SourceInput[]): NonNullable<unknown>[] {
+    return sourceEvents.map((sourceEvent) => sourceEvent.event);
+  }
+
+  private static convertSourceInputv0Tov1(sourceEvents: unknown[]): SourceInput[] {
+    return sourceEvents.map(
+      (sourceEvent) => ({ event: sourceEvent, source: undefined } as SourceInput),
+    );
+  }
+
+  public static adaptInputToVersion(
+    sourceType: string,
+    requestVersion: string,
+    input: NonNullable<unknown>[],
+  ): { implementationVersion: string; input: NonNullable<unknown>[] } {
+    const sourceToVersionMap = this.getSourceVersionsMap();
+    const implementationVersion = sourceToVersionMap.get(sourceType);
+    let updatedInput: NonNullable<unknown>[] = input;
+    if (requestVersion === 'v0' && implementationVersion === 'v1') {
+      updatedInput = this.convertSourceInputv0Tov1(input);
+    } else if (requestVersion === 'v1' && implementationVersion === 'v0') {
+      updatedInput = this.convertSourceInputv1Tov0(input as SourceInput[]);
+    }
+    return { implementationVersion, input: updatedInput };
+  }
+
   private static getCompatibleStatusCode(status: number): number {
     return getCompatibleStatusCode(status);
   }

src/features.json

@@ -61,5 +61,6 @@
     "ORTTO": true,
     "ONE_SIGNAL": true,
     "TIKTOK_AUDIENCE": true
-  }
+  },
+  "supportSourceTransformV1": true
 }

src/legacy/router.js

@@ -7,6 +7,7 @@ const Router = require('@koa/router');
 const lodash = require('lodash');
 const fs = require('fs');
 const path = require('path');
+const { PlatformError } = require('@rudderstack/integrations-lib');
 const logger = require('../logger');
 const stats = require('../util/stats');
 const { SUPPORTED_VERSIONS, API_VERSION } = require('../routes/utils/constants');
@@ -35,7 +36,6 @@ const {
   sendViolationMetrics,
   constructValidationErrors,
 } = require('../util/utils');
-const { PlatformError } = require('../v0/util/errorTypes');
 const { processCdkV1 } = require('../cdk/v1/handler');
 const { extractLibraries } = require('../util/customTransformer');
 const { getCompatibleStatusCode } = require('../adapters/utils/networkUtils');

src/types/index.ts

@@ -224,7 +224,34 @@ type ComparatorInput = {
   requestMetadata: object;
   feature: string;
 };
+type SourceDefinition = {
+  ID: string;
+  Name: string;
+  Category: string;
+  Type: string;
+};
+
+type Source = {
+  ID: string;
+  OriginalID: string;
+  Name: string;
+  SourceDefinition: SourceDefinition;
+  Config: object;
+  Enabled: boolean;
+  WorkspaceID: string;
+  WriteKey: string;
+  Transformations?: UserTransformationInput[];
+  RevisionID?: string;
+  Destinations?: Destination[];
+  Transient: boolean;
+  EventSchemasEnabled: boolean;
+  DgSourceTrackingPlanConfig: object;
+};
 
+type SourceInput = {
+  event: NonNullable<unknown>[];
+  source?: Source;
+};
 export {
   Metadata,
   MessageIdMetadataMap,
@@ -246,4 +273,6 @@ export {
   UserDeletionResponse,
   Destination,
   ComparatorInput,
+  SourceInput,
+  Source,
 };

src/v0/destinations/facebook_conversions/transform.js

@@ -1,6 +1,7 @@
 /* eslint-disable no-param-reassign */
 const get = require('get-value');
 const moment = require('moment');
+const { InstrumentationError, ConfigurationError } = require('@rudderstack/integrations-lib');
 const {
   CONFIG_CATEGORIES,
   MAPPING_CONFIG,
@@ -34,8 +35,6 @@ const {
   formingFinalResponse,
 } = require('../../util/facebookUtils');
 
-const { InstrumentationError, ConfigurationError } = require('../../util/errorTypes');
-
 const responseBuilderSimple = (message, category, destination) => {
   const { Config, ID } = destination;
   let { categoryToContent } = Config;

src/v0/destinations/facebook_conversions/utils.js

@@ -1,3 +1,4 @@
+const { InstrumentationError } = require('@rudderstack/integrations-lib');
 const {
   CONFIG_CATEGORIES,
   OTHER_STANDARD_EVENTS,
@@ -8,7 +9,6 @@ const {
 } = require('./config');
 const { constructPayload, isObject, isAppleFamily } = require('../../util');
 const { getContentType, getContentCategory } = require('../../util/facebookUtils');
-const { InstrumentationError } = require('../../util/errorTypes');
 
 const getActionSource = (payload, fallbackActionSource) => {
   let actionSource = fallbackActionSource;

src/v0/sources/appcenter/transform.js

@@ -1,13 +1,13 @@
 const path = require('path');
 const fs = require('fs');
+const { TransformationError } = require('@rudderstack/integrations-lib');
 const { generateUUID } = require('../../util');
 const Message = require('../message');
 
 const mappingJson = JSON.parse(fs.readFileSync(path.resolve(__dirname, './mapping.json'), 'utf-8'));
 
 const { removeUndefinedAndNullValues } = require('../../util');
 
-const { TransformationError } = require('../../util/errorTypes');
 const { JSON_MIME_TYPE } = require('../../util/constant');
 
 const processNormalEvent = (event) => {

src/v0/sources/webhook/transform.js → src/v1/sources/webhook/transform.js

@@ -1,4 +1,4 @@
-const { removeUndefinedAndNullValues, generateUUID } = require('../../util');
+const { removeUndefinedAndNullValues, generateUUID } = require('../../../v0/util');
 
 function processEvent(event) {
   const payload = {
@@ -10,7 +10,8 @@ function processEvent(event) {
   return payload;
 }
 
-function process(event) {
+function process(inputEvent) {
+  const { event } = inputEvent;
   const response = processEvent(event);
   return removeUndefinedAndNullValues(response);
 }

test/apitests/data_scenarios/source/v1/failure.json

@@ -0,0 +1,27 @@
+{
+  "input": [
+    {
+      "event": {
+        "anonymousId": "63767499ca6fb1b7c988d5bb",
+        "artist": "Gautam",
+        "genre": "Jazz",
+        "song": "Take Five"
+      },
+      "source": {
+        "id": "source_id",
+        "config": {
+          "configField1": "configVal1"
+        }
+      }
+    }
+  ],
+  "output": [
+    {
+      "statusCode": 500,
+      "error": "Cannot find module '../undefined/sources/NA_SOURCE/transform' from 'src/services/misc.ts'",
+      "statTags": {
+        "errorCategory": "transformation"
+      }
+    }
+  ]
+}