Revert "fix: improve error handling for webhook v2" (#4063)

rudderlabs · Feb 11, 2025 · 6fd8651 · 6fd8651
2 parents d795830 + 6d29785
commit 6fd8651
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 77 deletions.
diff --git a/src/constants/index.js b/src/constants/index.js
@@ -55,10 +55,6 @@ const HTTP_CUSTOM_STATUS_CODES = {
   FILTERED: 298,
 };
 
-const ErrorMessages = {
-  JSONParseError: 'Malformed JSON in request body',
-};
-
 module.exports = {
   EventType,
   GENERIC_TRUE_VALUES,
@@ -68,5 +64,4 @@ module.exports = {
   TraitsMapping,
   WhiteListedTraits,
   HTTP_CUSTOM_STATUS_CODES,
-  ErrorMessages,
 };
diff --git a/src/controllers/util/conversionStrategies/strategyV2ToV0.ts b/src/controllers/util/conversionStrategies/strategyV2ToV0.ts
@@ -1,32 +1,17 @@
-import { TransformationError } from '@rudderstack/integrations-lib';
 import { SourceInputConversionResult, SourceInputV2 } from '../../../types';
 import { VersionConversionStrategy } from './abstractions';
-import { ErrorMessages } from '../../../constants';
 
 export class StrategyV2ToV0 extends VersionConversionStrategy<SourceInputV2, NonNullable<unknown>> {
   convert(sourceEvents: SourceInputV2[]): SourceInputConversionResult<NonNullable<unknown>>[] {
-    return sourceEvents.map((sourceEvent) => this.convertSingleEvent(sourceEvent));
-  }
-
-  private convertSingleEvent(
-    sourceEvent: SourceInputV2,
-  ): SourceInputConversionResult<NonNullable<unknown>> {
-    try {
-      const v0Event = this.parseRequestBody(sourceEvent.request.body);
-      return { output: v0Event };
-    } catch (err) {
-      const conversionError =
-        err instanceof TransformationError ? err : new Error('error converting v2 to v0 spec');
-
-      return { conversionError };
-    }
-  }
-
-  private parseRequestBody(body: string): NonNullable<unknown> {
-    try {
-      return JSON.parse(body);
-    } catch (err) {
-      throw new TransformationError(ErrorMessages.JSONParseError);
-    }
+    return sourceEvents.map((sourceEvent) => {
+      try {
+        const v0Event = JSON.parse(sourceEvent.request.body);
+        return { output: v0Event };
+      } catch (err) {
+        const conversionError =
+          err instanceof Error ? err : new Error('error converting v2 to v0 spec');
+        return { conversionError };
+      }
+    });
   }
 }
diff --git a/src/controllers/util/conversionStrategies/strategyV2ToV1.ts b/src/controllers/util/conversionStrategies/strategyV2ToV1.ts
@@ -1,31 +1,17 @@
-import { TransformationError } from '@rudderstack/integrations-lib';
 import { SourceInput, SourceInputConversionResult, SourceInputV2 } from '../../../types';
 import { VersionConversionStrategy } from './abstractions';
 
 export class StrategyV2ToV1 extends VersionConversionStrategy<SourceInputV2, SourceInput> {
   convert(sourceEvents: SourceInputV2[]): SourceInputConversionResult<SourceInput>[] {
-    return sourceEvents.map((sourceEvent) => this.convertSingleEvent(sourceEvent));
-  }
-
-  private convertSingleEvent(sourceEvent: SourceInputV2): SourceInputConversionResult<SourceInput> {
-    try {
-      const v1Event = {
-        event: this.parseRequestBody(sourceEvent.request.body),
-        source: sourceEvent.source,
-      };
-      return { output: v1Event };
-    } catch (err) {
-      const conversionError =
-        err instanceof TransformationError ? err : new Error('error converting v2 to v1 spec');
-      return { conversionError };
-    }
-  }
-
-  private parseRequestBody(body: string): NonNullable<unknown> {
-    try {
-      return JSON.parse(body);
-    } catch (err) {
-      throw new TransformationError('Malformed JSON in request body');
-    }
+    return sourceEvents.map((sourceEvent) => {
+      try {
+        const v1Event = { event: JSON.parse(sourceEvent.request.body), source: sourceEvent.source };
+        return { output: v1Event };
+      } catch (err) {
+        const conversionError =
+          err instanceof Error ? err : new Error('error converting v2 to v1 spec');
+        return { conversionError };
+      }
+    });
   }
 }
diff --git a/src/controllers/util/index.test.ts b/src/controllers/util/index.test.ts
@@ -1,5 +1,3 @@
-import { TransformationError } from '@rudderstack/integrations-lib';
-import { ErrorMessages } from '../../constants';
 import {
   Destination,
   Metadata,
@@ -224,7 +222,7 @@ describe('adaptInputToVersion', () => {
       implementationVersion: 'v0',
       input: [
         {
-          conversionError: new TransformationError(ErrorMessages.JSONParseError),
+          conversionError: new SyntaxError('Unexpected end of JSON input'),
         },
       ],
     };
@@ -323,7 +321,7 @@ describe('adaptInputToVersion', () => {
       implementationVersion: 'v1',
       input: [
         {
-          conversionError: new TransformationError(ErrorMessages.JSONParseError),
+          conversionError: new SyntaxError('Unexpected end of JSON input'),
         },
       ],
     };

diff --git a/src/services/source/nativeIntegration.ts b/src/services/source/nativeIntegration.ts
@@ -2,7 +2,6 @@ import { FetchHandler } from '../../helpers/fetchHandlers';
 import { SourceService } from '../../interfaces/SourceService';
 import {
   ErrorDetailer,
-  ErrorDetailerOptions,
   MetaTransferObject,
   RudderMessage,
   SourceInputConversionResult,
@@ -16,14 +15,13 @@ import { SourcePostTransformationService } from './postTransformation';
 import logger from '../../logger';
 
 export class NativeIntegrationSourceService implements SourceService {
-  public getTags(extraErrorDetails: ErrorDetailerOptions = {}): MetaTransferObject {
+  public getTags(): MetaTransferObject {
     const metaTO = {
       errorDetails: {
         module: tags.MODULES.SOURCE,
         implementation: tags.IMPLEMENTATIONS.NATIVE,
         destinationId: 'Non determinable',
         workspaceId: 'Non determinable',
-        ...extraErrorDetails,
       } as ErrorDetailer,
       errorContext: '[Native Integration Service] Failure During Source Transform',
     } as MetaTransferObject;
@@ -38,7 +36,7 @@ export class NativeIntegrationSourceService implements SourceService {
     _requestMetadata: NonNullable<unknown>,
   ): Promise<SourceTransformationResponse[]> {
     const sourceHandler = FetchHandler.getSourceHandler(sourceType, version);
-    const metaTO = this.getTags({ srcType: sourceType });
+    const metaTO = this.getTags();
     const respList: SourceTransformationResponse[] = await Promise.all<FixMe>(
       sourceEvents.map(async (sourceEvent) => {
         try {

diff --git a/src/types/index.ts b/src/types/index.ts
@@ -270,9 +270,6 @@ type ErrorDetailer = {
   module: string;
   implementation: string;
   feature: string;
-} & ErrorDetailerOptions;
-
-type ErrorDetailerOptions = {
   errorCategory?: string;
   errorType?: string;
   meta?: string;
@@ -393,7 +390,6 @@ export {
   Connection,
   Destination,
   ErrorDetailer,
-  ErrorDetailerOptions,
   MessageIdMetadataMap,
   MetaTransferObject,
   Metadata,

diff --git a/test/integrations/sources/adjust/data.ts b/test/integrations/sources/adjust/data.ts
@@ -120,7 +120,6 @@ export const data = [
               errorCategory: 'transformation',
               implementation: 'native',
               module: 'source',
-              srcType: 'adjust',
               workspaceId: 'Non determinable',
             },
             statusCode: 400,
@@ -177,7 +176,6 @@ export const data = [
               errorCategory: 'transformation',
               implementation: 'native',
               module: 'source',
-              srcType: 'adjust',
               workspaceId: 'Non determinable',
             },
             statusCode: 400,

diff --git a/test/integrations/sources/appsflyer/data.ts b/test/integrations/sources/appsflyer/data.ts
@@ -687,7 +687,6 @@ export const data = [
               errorCategory: 'transformation',
               implementation: 'native',
               module: 'source',
-              srcType: 'appsflyer',
               workspaceId: 'Non determinable',
             },
             statusCode: 400,

diff --git a/test/integrations/sources/canny/data.ts b/test/integrations/sources/canny/data.ts
@@ -1573,7 +1573,6 @@ export const data = [
               errorCategory: 'transformation',
               implementation: 'native',
               module: 'source',
-              srcType: 'canny',
               workspaceId: 'Non determinable',
             },
           },
@@ -1651,7 +1650,6 @@ export const data = [
               errorCategory: 'transformation',
               implementation: 'native',
               module: 'source',
-              srcType: 'canny',
               workspaceId: 'Non determinable',
             },
           },

diff --git a/test/integrations/sources/gainsightpx/data.ts b/test/integrations/sources/gainsightpx/data.ts
@@ -853,7 +853,6 @@ export const data = [
               errorCategory: 'transformation',
               implementation: 'native',
               module: 'source',
-              srcType: 'gainsightpx',
               workspaceId: 'Non determinable',
             },
             statusCode: 400,

diff --git a/test/integrations/sources/iterable/data.ts b/test/integrations/sources/iterable/data.ts
@@ -101,7 +101,6 @@ export const data = [
               errorCategory: 'transformation',
               implementation: 'native',
               module: 'source',
-              srcType: 'iterable',
               workspaceId: 'Non determinable',
             },
             statusCode: 400,
@@ -146,7 +145,6 @@ export const data = [
               errorCategory: 'transformation',
               implementation: 'native',
               module: 'source',
-              srcType: 'iterable',
               workspaceId: 'Non determinable',
             },
             statusCode: 400,

diff --git a/test/integrations/sources/shopify/data.ts b/test/integrations/sources/shopify/data.ts
@@ -65,7 +65,6 @@ const serverSideEventsScenarios = [
               errorCategory: 'transformation',
               implementation: 'native',
               module: 'source',
-              srcType: 'shopify',
               workspaceId: 'Non determinable',
             },
             statusCode: 400,
@@ -105,7 +104,6 @@ const serverSideEventsScenarios = [
               errorCategory: 'transformation',
               implementation: 'native',
               module: 'source',
-              srcType: 'shopify',
               workspaceId: 'Non determinable',
             },
             statusCode: 400,
@@ -150,7 +148,6 @@ const serverSideEventsScenarios = [
               errorCategory: 'transformation',
               implementation: 'native',
               module: 'source',
-              srcType: 'shopify',
               workspaceId: 'Non determinable',
             },
             statusCode: 400,