chore: output of conversion is optional

rudderlabs · Nov 13, 2024 · e6b5fb7 · e6b5fb7
1 parent 704e9bd
commit e6b5fb7
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 12 deletions.
diff --git a/src/controllers/util/conversionStrategies/strategyV1ToV2.ts b/src/controllers/util/conversionStrategies/strategyV1ToV2.ts
@@ -35,7 +35,7 @@ export class StrategyV1ToV2 extends VersionConversionStrategy<SourceInput, Sourc
       } catch (err) {
         const conversionError =
           err instanceof Error ? err : new Error('error converting v1 to v2 spec');
-        return { output: {} as SourceInputV2, conversionError };
+        return { conversionError };
       }
     });
   }

diff --git a/src/controllers/util/conversionStrategies/strategyV2ToV0.ts b/src/controllers/util/conversionStrategies/strategyV2ToV0.ts
@@ -10,7 +10,7 @@ export class StrategyV2ToV0 extends VersionConversionStrategy<SourceInputV2, Non
       } catch (err) {
         const conversionError =
           err instanceof Error ? err : new Error('error converting v2 to v0 spec');
-        return { output: {} as NonNullable<unknown>, conversionError };
+        return { conversionError };
       }
     });
   }

diff --git a/src/controllers/util/conversionStrategies/strategyV2ToV1.ts b/src/controllers/util/conversionStrategies/strategyV2ToV1.ts
@@ -10,7 +10,7 @@ export class StrategyV2ToV1 extends VersionConversionStrategy<SourceInputV2, Sou
       } catch (err) {
         const conversionError =
           err instanceof Error ? err : new Error('error converting v2 to v1 spec');
-        return { output: {} as SourceInput, conversionError };
+        return { conversionError };
       }
     });
   }

diff --git a/src/controllers/util/index.test.ts b/src/controllers/util/index.test.ts
@@ -222,7 +222,6 @@ describe('adaptInputToVersion', () => {
       implementationVersion: 'v0',
       input: [
         {
-          output: {},
           conversionError: new SyntaxError('Unexpected end of JSON input'),
         },
       ],
@@ -322,7 +321,6 @@ describe('adaptInputToVersion', () => {
       implementationVersion: 'v1',
       input: [
         {
-          output: {},
           conversionError: new SyntaxError('Unexpected end of JSON input'),
         },
       ],

diff --git a/src/services/source/nativeIntegration.ts b/src/services/source/nativeIntegration.ts
@@ -53,12 +53,25 @@ export class NativeIntegrationSourceService implements SourceService {
               metaTO,
             );
           }
-          const newSourceEvent = sourceEvent.output;
-          const { headers } = newSourceEvent;
-          delete newSourceEvent.headers;
-          const respEvents: RudderMessage | RudderMessage[] | SourceTransformationResponse =
-            await sourceHandler.process(newSourceEvent);
-          return SourcePostTransformationService.handleSuccessEventsSource(respEvents, { headers });
+
+          if (sourceEvent.output) {
+            const newSourceEvent = sourceEvent.output;
+
+            const { headers } = newSourceEvent;
+            if (headers) {
+              delete newSourceEvent.headers;
+            }
+
+            const respEvents: RudderMessage | RudderMessage[] | SourceTransformationResponse =
+              await sourceHandler.process(newSourceEvent);
+            return SourcePostTransformationService.handleSuccessEventsSource(respEvents, {
+              headers,
+            });
+          }
+          return SourcePostTransformationService.handleFailureEventsSource(
+            new Error('Error post version converstion, converstion output is undefined'),
+            metaTO,
+          );
         } catch (error: FixMe) {
           stats.increment('source_transform_errors', {
             source: sourceType,

diff --git a/src/types/index.ts b/src/types/index.ts
@@ -374,7 +374,7 @@ type SourceInputV2 = {
 };
 
 type SourceInputConversionResult<T> = {
-  output: T;
+  output?: T;
   conversionError?: Error;
 };