Merge branch 'develop' into gaoc.refactor-proxy

rudderlabs · Mar 13, 2024 · b404ef4 · b404ef4
2 parents df55dee + 67fcdd3
commit b404ef4
Show file tree

Hide file tree

Showing 9 changed files with 295 additions and 23 deletions.
diff --git a/.github/workflows/dt-test-and-report-code-coverage.yml b/.github/workflows/dt-test-and-report-code-coverage.yml
@@ -41,6 +41,8 @@ jobs:
 
       - name: Upload Coverage Reports to Codecov
         uses: codecov/[email protected]
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         with:
           directory: ./reports/coverage
 

diff --git a/src/controllers/bulkUpload.ts b/src/controllers/bulkUpload.ts
@@ -1,14 +1,14 @@
 /* eslint-disable global-require, import/no-dynamic-require, @typescript-eslint/no-unused-vars */
 import { client as errNotificationClient } from '../util/errorNotifier';
 import logger from '../logger';
+import {
+  getJobStatusHandler,
+  getPollStatusHandler,
+  getDestFileUploadHandler,
+} from '../util/fetchDestinationHandlers';
 import { CatchErr, ContextBodySimple } from '../util/types';
 // TODO: To be refactored and redisgned
 
-const getDestFileUploadHandler = (version, dest) =>
-  require(`../${version}/destinations/${dest}/fileUpload`);
-const getPollStatusHandler = (version, dest) => require(`../${version}/destinations/${dest}/poll`);
-const getJobStatusHandler = (version, dest) =>
-  require(`../${version}/destinations/${dest}/fetchJobStatus`);
 const ERROR_MESSAGE_PROCESSOR_STRING = 'Error occurred while processing payload.';
 
 const getCommonMetadata = (ctx) =>

diff --git a/src/util/fetchDestinationHandlers.ts b/src/util/fetchDestinationHandlers.ts
@@ -0,0 +1,42 @@
+import * as V0MarketoBulkUploadFileUpload from '../v0/destinations/marketo_bulk_upload/fileUpload';
+import * as V0MarketoBulkUploadPollStatus from '../v0/destinations/marketo_bulk_upload/poll';
+import * as V0MarketoBulkUploadJobStatus from '../v0/destinations/marketo_bulk_upload/fetchJobStatus';
+
+const fileUploadHandlers = {
+  v0: {
+    marketo_bulk_upload: V0MarketoBulkUploadFileUpload,
+  },
+};
+
+const pollStatusHandlers = {
+  v0: {
+    marketo_bulk_upload: V0MarketoBulkUploadPollStatus,
+  },
+};
+
+const jobStatusHandlers = {
+  v0: {
+    marketo_bulk_upload: V0MarketoBulkUploadJobStatus,
+  },
+};
+
+export const getDestFileUploadHandler = (version, dest) => {
+  if (fileUploadHandlers[version] && fileUploadHandlers[version][dest]) {
+    return fileUploadHandlers[version][dest];
+  }
+  return undefined;
+};
+
+export const getPollStatusHandler = (version, dest) => {
+  if (pollStatusHandlers[version] && pollStatusHandlers[version][dest]) {
+    return pollStatusHandlers[version][dest];
+  }
+  return undefined;
+};
+
+export const getJobStatusHandler = (version, dest) => {
+  if (jobStatusHandlers[version] && jobStatusHandlers[version][dest]) {
+    return jobStatusHandlers[version][dest];
+  }
+  return undefined;
+};
diff --git a/src/v1/destinations/campaign_manager/networkHandler.js b/src/v1/destinations/campaign_manager/networkHandler.js
@@ -69,15 +69,15 @@ const responseHandler = (responseParams) => {
   const errorMessage = response.error?.message || 'unknown error format';
   for (const metadata of rudderJobMetadata) {
     responseWithIndividualEvents.push({
-      statusCode: 500,
+      statusCode: status,
       metadata,
       error: errorMessage,
     });
   }
 
   throw new TransformerProxyError(
     `Campaign Manager: Error transformer proxy v1 during CAMPAIGN_MANAGER response transformation`,
-    500,
+    status,
     {
       [tags.TAG_NAMES.ERROR_TYPE]: getDynamicErrorType(status),
     },

diff --git a/test/integrations/destinations/campaign_manager/dataDelivery/oauth.ts b/test/integrations/destinations/campaign_manager/dataDelivery/oauth.ts
@@ -326,14 +326,14 @@ export const v1oauthScenarios: ProxyV1TestData[] = [
     },
     output: {
       response: {
-        status: 500,
+        status: 401,
         body: {
           output: {
             response: [
               {
                 error:
                   '{"error":{"code":401,"message":"Request is missing required authentication credential. Expected OAuth 2 access token, login cookie or other valid authentication credential. See https://developers.google.com/identity/sign-in/web/devconsole-project.","errors":[{"message":"Login Required.","domain":"global","reason":"required","location":"Authorization","locationType":"header"}],"status":"UNAUTHENTICATED","details":[{"@type":"type.googleapis.com/google.rpc.ErrorInfo","reason":"CREDENTIALS_MISSING","domain":"googleapis.com","metadata":{"method":"google.ads.xfa.op.v4.DfareportingConversions.Batchinsert","service":"googleapis.com"}}]}}',
-                statusCode: 500,
+                statusCode: 401,
                 metadata: {
                   jobId: 1,
                   attemptNum: 1,
@@ -361,7 +361,7 @@ export const v1oauthScenarios: ProxyV1TestData[] = [
             authErrorCategory: 'REFRESH_TOKEN',
             message:
               'Campaign Manager: Error transformer proxy v1 during CAMPAIGN_MANAGER response transformation',
-            status: 500,
+            status: 401,
           },
         },
       },
@@ -389,14 +389,14 @@ export const v1oauthScenarios: ProxyV1TestData[] = [
     },
     output: {
       response: {
-        status: 500,
+        status: 403,
         body: {
           output: {
             response: [
               {
                 error:
                   '{"error":{"code":403,"message":"Request had insufficient authentication scopes.","errors":[{"message":"Insufficient Permission","domain":"global","reason":"insufficientPermissions"}],"status":"PERMISSION_DENIED","details":[{"@type":"type.googleapis.com/google.rpc.ErrorInfo","reason":"ACCESS_TOKEN_SCOPE_INSUFFICIENT","domain":"googleapis.com","metadata":{"service":"gmail.googleapis.com","method":"caribou.api.proto.MailboxService.GetProfile"}}]}}',
-                statusCode: 500,
+                statusCode: 403,
                 metadata: {
                   jobId: 1,
                   attemptNum: 1,
@@ -424,7 +424,7 @@ export const v1oauthScenarios: ProxyV1TestData[] = [
             authErrorCategory: 'AUTH_STATUS_INACTIVE',
             message:
               'Campaign Manager: Error transformer proxy v1 during CAMPAIGN_MANAGER response transformation',
-            status: 500,
+            status: 403,
           },
         },
       },
@@ -452,14 +452,14 @@ export const v1oauthScenarios: ProxyV1TestData[] = [
     },
     output: {
       response: {
-        status: 500,
+        status: 403,
         body: {
           output: {
             response: [
               {
                 error:
                   '{"error":{"code":403,"message":"invalid_grant","error_description":"Bad accesss"}}',
-                statusCode: 500,
+                statusCode: 403,
                 metadata: {
                   jobId: 1,
                   attemptNum: 1,
@@ -487,7 +487,7 @@ export const v1oauthScenarios: ProxyV1TestData[] = [
             authErrorCategory: 'AUTH_STATUS_INACTIVE',
             message:
               'Campaign Manager: Error transformer proxy v1 during CAMPAIGN_MANAGER response transformation',
-            status: 500,
+            status: 403,
           },
         },
       },
@@ -514,14 +514,14 @@ export const v1oauthScenarios: ProxyV1TestData[] = [
     },
     output: {
       response: {
-        status: 500,
+        status: 401,
         body: {
           output: {
             response: [
               {
                 error:
                   '{"error":"unauthorized","error_description":"Access token expired: 2020-10-20T12:00:00.000Z"}',
-                statusCode: 500,
+                statusCode: 401,
                 metadata: {
                   jobId: 1,
                   attemptNum: 1,
@@ -549,7 +549,7 @@ export const v1oauthScenarios: ProxyV1TestData[] = [
             authErrorCategory: 'REFRESH_TOKEN',
             message:
               'Campaign Manager: Error transformer proxy v1 during CAMPAIGN_MANAGER response transformation',
-            status: 500,
+            status: 401,
           },
         },
       },

diff --git a/test/integrations/destinations/campaign_manager/dataDelivery/other.ts b/test/integrations/destinations/campaign_manager/dataDelivery/other.ts
@@ -260,7 +260,7 @@ export const otherScenariosV1: ProxyV1TestData[] = [
               {
                 error:
                   '{"error":{"message":"Service Unavailable","description":"The server is currently unable to handle the request due to temporary overloading or maintenance of the server. Please try again later."}}',
-                statusCode: 500,
+                statusCode: 503,
                 metadata: {
                   jobId: 1,
                   attemptNum: 1,
@@ -287,7 +287,7 @@ export const otherScenariosV1: ProxyV1TestData[] = [
             },
             message:
               'Campaign Manager: Error transformer proxy v1 during CAMPAIGN_MANAGER response transformation',
-            status: 500,
+            status: 503,
           },
         },
       },
@@ -376,7 +376,7 @@ export const otherScenariosV1: ProxyV1TestData[] = [
             response: [
               {
                 error: '"Gateway Timeout"',
-                statusCode: 500,
+                statusCode: 504,
                 metadata: {
                   jobId: 1,
                   attemptNum: 1,
@@ -403,7 +403,7 @@ export const otherScenariosV1: ProxyV1TestData[] = [
             },
             message:
               'Campaign Manager: Error transformer proxy v1 during CAMPAIGN_MANAGER response transformation',
-            status: 500,
+            status: 504,
           },
         },
       },

diff --git a/test/integrations/destinations/salesforce_oauth/dataDelivery/data.ts b/test/integrations/destinations/salesforce_oauth/dataDelivery/data.ts
@@ -0,0 +1,3 @@
+import { testScenariosForV1API } from './oauth';
+
+export const data = [...testScenariosForV1API];
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import { testScenariosForV1API } from './oauth';

		export const data = [...testScenariosForV1API];