chore: resolve merge conflicts

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.54.2](https://github.com/rudderlabs/rudder-transformer/compare/v1.54.1...v1.54.2) (2024-01-25)
+
+
+### Bug Fixes
+
+* deleting access token cache for marketo bulk upload destination ([#3029](https://github.com/rudderlabs/rudder-transformer/issues/3029)) ([78b75bf](https://github.com/rudderlabs/rudder-transformer/commit/78b75bf4d9114209b3e89489fb43228dc9a70e5f))
+
 ### [1.54.1](https://github.com/rudderlabs/rudder-transformer/compare/v1.54.0...v1.54.1) (2024-01-24)
 
 

package.json

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

src/v0/destinations/marketo_bulk_upload/fileUpload.js

@@ -206,11 +206,11 @@ const getImportID = async (input, config, accessToken, csvHeader) => {
     stats.counter('marketo_bulk_upload_upload_file_unsuccJobs', unsuccessfulJobs.length);
     if (!isHttpStatusSuccess(resp.status)) {
       throw new NetworkError(
-        `Unable to upload file due to error : ${resp.response}`,
+        `Unable to upload file due to error : ${JSON.stringify(resp.response)}`,
         hydrateStatusForServer(resp.status, 'During uploading file'),
       );
     }
-    return handleFileUploadResponse(resp, successfulJobs, unsuccessfulJobs, requestTime, config);
+    return handleFileUploadResponse(resp, successfulJobs, unsuccessfulJobs, requestTime);
   }
   return { importId: null, successfulJobs, unsuccessfulJobs };
 };
@@ -242,7 +242,6 @@ const responseHandler = async (input, config) => {
     accessToken,
     headerForCsv,
   );
-
   // if upload is successful
   if (importId) {
     const csvHeader = headerForCsv.toString();

src/v0/destinations/marketo_bulk_upload/marketo_bulk_upload.util.test.js

@@ -2,9 +2,49 @@ const {
   handleCommonErrorResponse,
   handlePollResponse,
   handleFileUploadResponse,
+  getAccessToken,
 } = require('./util');
 
-const { AbortedError, RetryableError } = require('@rudderstack/integrations-lib');
+const {
+  AbortedError,
+  RetryableError,
+  NetworkError,
+  TransformationError,
+} = require('@rudderstack/integrations-lib');
+const util = require('./util.js');
+const networkAdapter = require('../../../adapters/network');
+const { handleHttpRequest } = networkAdapter;
+
+// Mock the handleHttpRequest function
+jest.mock('../../../adapters/network');
+
+const successfulResponse = {
+  status: 200,
+  response: {
+    access_token: '<dummy-access-token>',
+    token_type: 'bearer',
+    expires_in: 3600,
+    scope: '[email protected]',
+    success: true,
+  },
+};
+
+const unsuccessfulResponse = {
+  status: 400,
+  response: '[ENOTFOUND] :: DNS lookup failed',
+};
+
+const emptyResponse = {
+  response: '',
+};
+
+const invalidClientErrorResponse = {
+  status: 401,
+  response: {
+    error: 'invalid_client',
+    error_description: 'Bad client credentials',
+  },
+};
 
 describe('handleCommonErrorResponse', () => {
   test('should throw AbortedError for abortable error codes', () => {
@@ -13,7 +53,7 @@ describe('handleCommonErrorResponse', () => {
         errors: [{ code: 1003, message: 'Aborted' }],
       },
     };
-    expect(() => handleCommonErrorResponse(resp, 'OpErrorMessage', 'OpActivity')).toThrow(
+    expect(() => handleCommonErrorResponse(resp, 'opErrorMessage', 'opActivity')).toThrow(
       AbortedError,
     );
   });
@@ -24,7 +64,7 @@ describe('handleCommonErrorResponse', () => {
         errors: [{ code: 615, message: 'Throttled' }],
       },
     };
-    expect(() => handleCommonErrorResponse(resp, 'OpErrorMessage', 'OpActivity')).toThrow(
+    expect(() => handleCommonErrorResponse(resp, 'opErrorMessage', 'opActivity')).toThrow(
       RetryableError,
     );
   });
@@ -35,7 +75,7 @@ describe('handleCommonErrorResponse', () => {
         errors: [{ code: 2000, message: 'Retryable' }],
       },
     };
-    expect(() => handleCommonErrorResponse(resp, 'OpErrorMessage', 'OpActivity')).toThrow(
+    expect(() => handleCommonErrorResponse(resp, 'opErrorMessage', 'opActivity')).toThrow(
       RetryableError,
     );
   });
@@ -46,7 +86,7 @@ describe('handleCommonErrorResponse', () => {
         errors: [],
       },
     };
-    expect(() => handleCommonErrorResponse(resp, 'OpErrorMessage', 'OpActivity')).toThrow(
+    expect(() => handleCommonErrorResponse(resp, 'opErrorMessage', 'opActivity')).toThrow(
       RetryableError,
     );
   });
@@ -228,3 +268,88 @@ describe('handleFileUploadResponse', () => {
     }).toThrow(AbortedError);
   });
 });
+
+describe('getAccessToken', () => {
+  beforeEach(() => {
+    handleHttpRequest.mockClear();
+  });
+
+  it('should retrieve and return access token on successful response', async () => {
+    const url =
+      'https://dummyMunchkinId.mktorest.com/identity/oauth/token?client_id=dummyClientId&client_secret=dummyClientSecret&grant_type=client_credentials';
+
+    handleHttpRequest.mockResolvedValueOnce({
+      processedResponse: successfulResponse,
+    });
+
+    const config = {
+      clientId: 'dummyClientId',
+      clientSecret: 'dummyClientSecret',
+      munchkinId: 'dummyMunchkinId',
+    };
+
+    const result = await getAccessToken(config);
+    expect(result).toBe('<dummy-access-token>');
+    expect(handleHttpRequest).toHaveBeenCalledTimes(1);
+    // Ensure your mock response structure is consistent with the actual behavior
+    expect(handleHttpRequest).toHaveBeenCalledWith('get', url, {
+      destType: 'marketo_bulk_upload',
+      feature: 'transformation',
+    });
+  });
+
+  it('should throw a NetworkError on unsuccessful HTTP status', async () => {
+    handleHttpRequest.mockResolvedValueOnce({
+      processedResponse: unsuccessfulResponse,
+    });
+
+    const config = {
+      clientId: 'dummyClientId',
+      clientSecret: 'dummyClientSecret',
+      munchkinId: 'dummyMunchkinId',
+    };
+
+    await expect(getAccessToken(config)).rejects.toThrow(NetworkError);
+  });
+
+  it('should throw a RetryableError when expires_in is 0', async () => {
+    handleHttpRequest.mockResolvedValueOnce({
+      processedResponse: {
+        ...successfulResponse,
+        response: { ...successfulResponse.response, expires_in: 0 },
+      },
+    });
+
+    const config = {
+      clientId: 'dummyClientId',
+      clientSecret: 'dummyClientSecret',
+      munchkinId: 'dummyMunchkinId',
+    };
+
+    await expect(getAccessToken(config)).rejects.toThrow(RetryableError);
+  });
+
+  it('should throw an AbortedError on unsuccessful response', async () => {
+    handleHttpRequest.mockResolvedValueOnce({ processedResponse: invalidClientErrorResponse });
+
+    const config = {
+      clientId: 'invalidClientID',
+      clientSecret: 'dummyClientSecret',
+      munchkinId: 'dummyMunchkinId',
+    };
+
+    await expect(getAccessToken(config)).rejects.toThrow(NetworkError);
+  });
+
+  it('should throw transformation error response', async () => {
+    handleHttpRequest.mockResolvedValueOnce({ processedResponse: emptyResponse });
+
+    const config = {
+      clientId: 'dummyClientId',
+      clientSecret: 'dummyClientSecret',
+      munchkinId: 'dummyMunchkinId',
+    };
+
+    await expect(getAccessToken(config)).rejects.toThrow(TransformationError);
+  });
+});

src/v0/destinations/marketo_bulk_upload/poll.js

@@ -34,11 +34,11 @@ const getPollStatus = async (event) => {
       state: 'Retryable',
     });
     throw new NetworkError(
-      `Could not poll status: due to error ${pollStatus.response}`,
+      `Could not poll status: due to error ${JSON.stringify(pollStatus.response)}`,
       hydrateStatusForServer(pollStatus.status, 'During fetching poll status'),
     );
   }
-  return handlePollResponse(pollStatus, event.config);
+  return handlePollResponse(pollStatus);
 };
 
 const responseHandler = async (event) => {