chore(release): pull main into develop post release v1.90.1 (#4050)

rudderlabs · Feb 6, 2025 · 0c117bb · 0c117bb
2 parents b71d1d4 + 68497f9
commit 0c117bb
Show file tree

Hide file tree

Showing 10 changed files with 74 additions and 67 deletions.
diff --git a/CHANGELOG.md b/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.90.1](https://github.com/rudderlabs/rudder-transformer/compare/v1.90.0...v1.90.1) (2025-02-06)
+
+
+### Bug Fixes
+
+* update google ads api version for gaoc ([#4047](https://github.com/rudderlabs/rudder-transformer/issues/4047)) ([62705c0](https://github.com/rudderlabs/rudder-transformer/commit/62705c0613f3c38b8f3e6baf047467ce97878625))
+
 ## [1.90.0](https://github.com/rudderlabs/rudder-transformer/compare/v1.89.1...v1.90.0) (2025-02-03)
 
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rudder-transformer",
-  "version": "1.90.0",
+  "version": "1.90.1",
   "description": "",
   "homepage": "https://github.com/rudderlabs/rudder-transformer#readme",
   "bugs": {

diff --git a/src/v0/destinations/google_adwords_offline_conversions/config.js b/src/v0/destinations/google_adwords_offline_conversions/config.js
@@ -1,6 +1,6 @@
 const { getMappingConfig } = require('../../util');
 
-const API_VERSION = 'v16';
+const API_VERSION = 'v17';
 
 const BASE_ENDPOINT = `https://googleads.googleapis.com/${API_VERSION}/customers/:customerId`;
 

diff --git a/src/v0/destinations/google_adwords_offline_conversions/utils.test.js b/src/v0/destinations/google_adwords_offline_conversions/utils.test.js
@@ -163,7 +163,7 @@ describe('getExisitingUserIdentifier util tests', () => {
 describe('getClickConversionPayloadAndEndpoint util tests', () => {
   it('getClickConversionPayloadAndEndpoint flow check when default field identifier is present', () => {
     let expectedOutput = {
-      endpoint: 'https://googleads.googleapis.com/v16/customers/9625812972:uploadClickConversions',
+      endpoint: 'https://googleads.googleapis.com/v17/customers/9625812972:uploadClickConversions',
       payload: {
         conversions: [
           {
@@ -193,7 +193,7 @@ describe('getClickConversionPayloadAndEndpoint util tests', () => {
     delete fittingPayload.traits.email;
     delete fittingPayload.properties.email;
     let expectedOutput = {
-      endpoint: 'https://googleads.googleapis.com/v16/customers/9625812972:uploadClickConversions',
+      endpoint: 'https://googleads.googleapis.com/v17/customers/9625812972:uploadClickConversions',
       payload: {
         conversions: [
           {
@@ -225,7 +225,7 @@ describe('getClickConversionPayloadAndEndpoint util tests', () => {
     delete fittingPayload.traits.phone;
     delete fittingPayload.properties.email;
     let expectedOutput = {
-      endpoint: 'https://googleads.googleapis.com/v16/customers/9625812972:uploadClickConversions',
+      endpoint: 'https://googleads.googleapis.com/v17/customers/9625812972:uploadClickConversions',
       payload: {
         conversions: [
           {
@@ -263,7 +263,7 @@ describe('getClickConversionPayloadAndEndpoint util tests', () => {
       },
     ];
     let expectedOutput = {
-      endpoint: 'https://googleads.googleapis.com/v16/customers/9625812972:uploadClickConversions',
+      endpoint: 'https://googleads.googleapis.com/v17/customers/9625812972:uploadClickConversions',
       payload: {
         conversions: [
           {

diff --git a/test/integrations/destinations/google_adwords_offline_conversions/dataDelivery/business.ts b/test/integrations/destinations/google_adwords_offline_conversions/dataDelivery/business.ts
@@ -235,7 +235,7 @@ export const testScenariosForV0API = [
           params: params.param1,
           JSON: invalidArgumentRequestPayload,
           endpoint:
-            'https://googleads.googleapis.com/v16/customers/11122233331/offlineUserDataJobs',
+            'https://googleads.googleapis.com/v17/customers/11122233331/offlineUserDataJobs',
         }),
         method: 'POST',
       },
@@ -309,7 +309,7 @@ export const testScenariosForV0API = [
           headers: headers.header1,
           params: params.param1,
           JSON: validRequestPayload1,
-          endpoint: 'https://googleads.googleapis.com/v16/customers/1112223333/offlineUserDataJobs',
+          endpoint: 'https://googleads.googleapis.com/v17/customers/1112223333/offlineUserDataJobs',
         }),
         method: 'POST',
       },
@@ -350,7 +350,7 @@ export const testScenariosForV0API = [
           params: params.param2,
           JSON: validRequestPayload2,
           endpoint:
-            'https://googleads.googleapis.com/v16/customers/1234567891:uploadClickConversions',
+            'https://googleads.googleapis.com/v17/customers/1234567891:uploadClickConversions',
         }),
         method: 'POST',
       },
@@ -400,7 +400,7 @@ export const testScenariosForV0API = [
           params: params.param3,
           JSON: validRequestPayload2,
           endpoint:
-            'https://googleads.googleapis.com/v16/customers/1234567891:uploadClickConversions',
+            'https://googleads.googleapis.com/v17/customers/1234567891:uploadClickConversions',
         }),
         method: 'POST',
       },
@@ -453,7 +453,7 @@ export const testScenariosForV1API = [
             params: params.param1,
             JSON: invalidArgumentRequestPayload,
             endpoint:
-              'https://googleads.googleapis.com/v16/customers/11122233331/offlineUserDataJobs',
+              'https://googleads.googleapis.com/v17/customers/11122233331/offlineUserDataJobs',
           },
           metadataArray,
         ),
@@ -500,7 +500,7 @@ export const testScenariosForV1API = [
             params: params.param1,
             JSON: validRequestPayload1,
             endpoint:
-              'https://googleads.googleapis.com/v16/customers/1112223333/offlineUserDataJobs',
+              'https://googleads.googleapis.com/v17/customers/1112223333/offlineUserDataJobs',
           },
           metadataArray,
         ),
@@ -545,7 +545,7 @@ export const testScenariosForV1API = [
             params: params.param2,
             JSON: validRequestPayload2,
             endpoint:
-              'https://googleads.googleapis.com/v16/customers/1234567891:uploadClickConversions',
+              'https://googleads.googleapis.com/v17/customers/1234567891:uploadClickConversions',
           },
           metadataArray,
         ),
@@ -591,7 +591,7 @@ export const testScenariosForV1API = [
             params: params.param3,
             JSON: validRequestPayload2,
             endpoint:
-              'https://googleads.googleapis.com/v16/customers/1234567891:uploadClickConversions',
+              'https://googleads.googleapis.com/v17/customers/1234567891:uploadClickConversions',
           },
           metadataArray,
         ),
@@ -637,7 +637,7 @@ export const testScenariosForV1API = [
             params: params.param4,
             JSON: notAllowedToAccessFeatureRequestPayload,
             endpoint:
-              'https://googleads.googleapis.com/v16/customers/1234567893:uploadClickConversions',
+              'https://googleads.googleapis.com/v17/customers/1234567893:uploadClickConversions',
           },
           metadataArray,
         ),

diff --git a/test/integrations/destinations/google_adwords_offline_conversions/dataDelivery/oauth.ts b/test/integrations/destinations/google_adwords_offline_conversions/dataDelivery/oauth.ts
@@ -95,7 +95,7 @@ export const v0oauthScenarios = [
       request: {
         body: generateProxyV0Payload({
           ...commonRequestParameters,
-          endpoint: 'https://googleads.googleapis.com/v16/customers/customerid/offlineUserDataJobs',
+          endpoint: 'https://googleads.googleapis.com/v17/customers/customerid/offlineUserDataJobs',
         }),
         method: 'POST',
       },
@@ -138,7 +138,7 @@ export const v0oauthScenarios = [
       request: {
         body: generateProxyV0Payload({
           ...commonRequestParameters,
-          endpoint: 'https://googleads.googleapis.com/v16/customers/1234/offlineUserDataJobs',
+          endpoint: 'https://googleads.googleapis.com/v17/customers/1234/offlineUserDataJobs',
         }),
         method: 'POST',
       },
@@ -184,7 +184,7 @@ export const v1oauthScenarios = [
           {
             ...commonRequestParameters,
             endpoint:
-              'https://googleads.googleapis.com/v16/customers/customerid/offlineUserDataJobs',
+              'https://googleads.googleapis.com/v17/customers/customerid/offlineUserDataJobs',
           },
           metadataArray,
         ),
@@ -230,7 +230,7 @@ export const v1oauthScenarios = [
         body: generateProxyV1Payload(
           {
             ...commonRequestParameters,
-            endpoint: 'https://googleads.googleapis.com/v16/customers/1234/offlineUserDataJobs',
+            endpoint: 'https://googleads.googleapis.com/v17/customers/1234/offlineUserDataJobs',
           },
           metadataArray,
         ),
@@ -282,7 +282,7 @@ export const v1oauthScenarios = [
               'login-customer-id': 'logincustomerid',
             },
             endpoint:
-              'https://googleads.googleapis.com/v16/customers/customerid/offlineUserDataJobs',
+              'https://googleads.googleapis.com/v17/customers/customerid/offlineUserDataJobs',
           },
           metadataArray,
         ),
@@ -354,7 +354,7 @@ export const v1oauthScenarios = [
               'login-customer-id': 'logincustomerid',
             },
             endpoint:
-              'https://googleads.googleapis.com/v16/customers/customerid/offlineUserDataJobs',
+              'https://googleads.googleapis.com/v17/customers/customerid/offlineUserDataJobs',
           },
           metadataArray,
         ),

diff --git a/test/integrations/destinations/google_adwords_offline_conversions/network.ts b/test/integrations/destinations/google_adwords_offline_conversions/network.ts
@@ -30,7 +30,7 @@ const commonResponse = {
 export const networkCallsData = [
   {
     httpReq: {
-      url: 'https://googleads.googleapis.com/v16/customers/11122233331/offlineUserDataJobs:create',
+      url: 'https://googleads.googleapis.com/v17/customers/11122233331/offlineUserDataJobs:create',
       data: {
         job: {
           storeSalesMetadata: {
@@ -59,7 +59,7 @@ export const networkCallsData = [
   },
   {
     httpReq: {
-      url: 'https://googleads.googleapis.com/v16/customers/1112223333/googleAds:searchStream',
+      url: 'https://googleads.googleapis.com/v17/customers/1112223333/googleAds:searchStream',
       data: {
         query: `SELECT conversion_action.id FROM conversion_action WHERE conversion_action.name = 'Sign-up - click'`,
       },
@@ -92,7 +92,7 @@ export const networkCallsData = [
   },
   {
     httpReq: {
-      url: 'https://googleads.googleapis.com/v16/customers/11122233331/offlineUserDataJobs/OFFLINE_USER_DATA_JOB_ID_FOR_ADD_FAILURE:addOperations',
+      url: 'https://googleads.googleapis.com/v17/customers/11122233331/offlineUserDataJobs/OFFLINE_USER_DATA_JOB_ID_FOR_ADD_FAILURE:addOperations',
       data: {
         enable_partial_failure: false,
         enable_warnings: false,
@@ -173,7 +173,7 @@ export const networkCallsData = [
   },
   {
     httpReq: {
-      url: 'https://googleads.googleapis.com/v16/customers/1112223333/offlineUserDataJobs:create',
+      url: 'https://googleads.googleapis.com/v17/customers/1112223333/offlineUserDataJobs:create',
       data: {
         job: {
           storeSalesMetadata: {
@@ -202,7 +202,7 @@ export const networkCallsData = [
   },
   {
     httpReq: {
-      url: 'https://googleads.googleapis.com/v16/customers/1112223333/offlineUserDataJobs/OFFLINE_USER_DATA_JOB_ID:addOperations',
+      url: 'https://googleads.googleapis.com/v17/customers/1112223333/offlineUserDataJobs/OFFLINE_USER_DATA_JOB_ID:addOperations',
       data: {
         enable_partial_failure: false,
         enable_warnings: false,
@@ -245,7 +245,7 @@ export const networkCallsData = [
   },
   {
     httpReq: {
-      url: 'https://googleads.googleapis.com/v16/customers/1112223333/offlineUserDataJobs/OFFLINE_USER_DATA_JOB_ID:run',
+      url: 'https://googleads.googleapis.com/v17/customers/1112223333/offlineUserDataJobs/OFFLINE_USER_DATA_JOB_ID:run',
       data: { validate_only: false },
       params: { destination: 'google_adwords_offline_conversion' },
       headers: {
@@ -267,7 +267,7 @@ export const networkCallsData = [
     description:
       'Mock response from destination depicting a request with invalid authentication credentials',
     httpReq: {
-      url: 'https://googleads.googleapis.com/v16/customers/customerid/offlineUserDataJobs:create',
+      url: 'https://googleads.googleapis.com/v17/customers/customerid/offlineUserDataJobs:create',
       data: {
         job: {
           storeSalesMetadata: {
@@ -303,7 +303,7 @@ export const networkCallsData = [
     description:
       'Mock response from destination depicting a request with invalid authentication scopes',
     httpReq: {
-      url: 'https://googleads.googleapis.com/v16/customers/1234/offlineUserDataJobs:create',
+      url: 'https://googleads.googleapis.com/v17/customers/1234/offlineUserDataJobs:create',
       data: {
         job: {
           storeSalesMetadata: {
@@ -336,7 +336,7 @@ export const networkCallsData = [
   },
   {
     httpReq: {
-      url: 'https://googleads.googleapis.com/v16/customers/1234567890/googleAds:searchStream',
+      url: 'https://googleads.googleapis.com/v17/customers/1234567890/googleAds:searchStream',
       data: {
         query: `SELECT conversion_action.id FROM conversion_action WHERE conversion_action.name = 'Sign-up - click'`,
       },
@@ -364,7 +364,7 @@ export const networkCallsData = [
   },
   {
     httpReq: {
-      url: 'https://googleads.googleapis.com/v16/customers/1234567891/googleAds:searchStream',
+      url: 'https://googleads.googleapis.com/v17/customers/1234567891/googleAds:searchStream',
       data: {
         query:
           "SELECT conversion_action.id FROM conversion_action WHERE conversion_action.name = 'Sign-up - click'",
@@ -397,7 +397,7 @@ export const networkCallsData = [
   },
   {
     httpReq: {
-      url: 'https://googleads.googleapis.com/v16/customers/1234567891/googleAds:searchStream',
+      url: 'https://googleads.googleapis.com/v17/customers/1234567891/googleAds:searchStream',
       data: { query: 'SELECT conversion_custom_variable.name FROM conversion_custom_variable' },
       headers: {
         Authorization: 'Bearer abcd1234',
@@ -431,7 +431,7 @@ export const networkCallsData = [
   },
   {
     httpReq: {
-      url: 'https://googleads.googleapis.com/v16/customers/1234567891:uploadClickConversions',
+      url: 'https://googleads.googleapis.com/v17/customers/1234567891:uploadClickConversions',
       data: {
         conversions: [
           {
@@ -498,7 +498,7 @@ export const networkCallsData = [
   },
   {
     httpReq: {
-      url: 'https://googleads.googleapis.com/v16/customers/1234567891:uploadClickConversions',
+      url: 'https://googleads.googleapis.com/v17/customers/1234567891:uploadClickConversions',
       data: {
         conversions: [
           {
@@ -559,7 +559,7 @@ export const networkCallsData = [
   },
   {
     httpReq: {
-      url: 'https://googleads.googleapis.com/v16/customers/1234567893/googleAds:searchStream',
+      url: 'https://googleads.googleapis.com/v17/customers/1234567893/googleAds:searchStream',
       data: {
         query:
           "SELECT conversion_action.id FROM conversion_action WHERE conversion_action.name = 'Sign-up - click'",
@@ -592,7 +592,7 @@ export const networkCallsData = [
   },
   {
     httpReq: {
-      url: 'https://googleads.googleapis.com/v16/customers/1234567893:uploadClickConversions',
+      url: 'https://googleads.googleapis.com/v17/customers/1234567893:uploadClickConversions',
       data: {
         conversions: [
           {
@@ -678,7 +678,7 @@ export const networkCallsData = [
     description:
       'Mock response from destination depicting a request from user who has not enabled 2 factor authentication',
     httpReq: {
-      url: 'https://googleads.googleapis.com/v16/customers/customerid/offlineUserDataJobs:create',
+      url: 'https://googleads.googleapis.com/v17/customers/customerid/offlineUserDataJobs:create',
       data: {
         job: {
           storeSalesMetadata: {
@@ -704,7 +704,7 @@ export const networkCallsData = [
     description:
       'Mock response from destination depicting a request from user who has not enabled 2 factor authentication',
     httpReq: {
-      url: 'https://googleads.googleapis.com/v16/customers/1112223333/googleAds:searchStream',
+      url: 'https://googleads.googleapis.com/v17/customers/1112223333/googleAds:searchStream',
       data: {
         query:
           "SELECT conversion_action.id FROM conversion_action WHERE conversion_action.name = 'Sign-up - click'",