chore(release): pull main into develop post release v1.68.0

CHANGELOG.md

@@ -2,6 +2,22 @@
 
 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.68.0](https://github.com/rudderlabs/rudder-config-schema/compare/v1.67.1...v1.68.0) (2024-03-18)
+
+
+### Features
+
+* custom environment slug ([#1275](https://github.com/rudderlabs/rudder-config-schema/issues/1275)) ([a856eef](https://github.com/rudderlabs/rudder-config-schema/commit/a856eef62d79dbf61fad3b9d84eb31d33f62b5ea))
+* onboard destination movable ink ([#1252](https://github.com/rudderlabs/rudder-config-schema/issues/1252)) ([c4bdb5e](https://github.com/rudderlabs/rudder-config-schema/commit/c4bdb5ee623765c7c18802628366ff02f2196782))
+* onboard new destination koala ([#1258](https://github.com/rudderlabs/rudder-config-schema/issues/1258)) ([37b7150](https://github.com/rudderlabs/rudder-config-schema/commit/37b7150736fe803b3c837f01a57a80ad53cbfede))
+* reviewed destinations for secret keys and updated configs accordingly ([#1268](https://github.com/rudderlabs/rudder-config-schema/issues/1268)) ([7289e5c](https://github.com/rudderlabs/rudder-config-schema/commit/7289e5c07e849f40ecc0700db733b48c9afc9364))
+
+
+### Bug Fixes
+
+* secret keys for destinations ([#1224](https://github.com/rudderlabs/rudder-config-schema/issues/1224)) ([6d1be08](https://github.com/rudderlabs/rudder-config-schema/commit/6d1be08238de2fa00e16d4bf4717ebd611e12341))
+* slack notifications ([#1260](https://github.com/rudderlabs/rudder-config-schema/issues/1260)) ([9800571](https://github.com/rudderlabs/rudder-config-schema/commit/9800571dcd81eab128dc7a3345a6dcb6645ed079))
+
 ### [1.67.1](https://github.com/rudderlabs/rudder-config-schema/compare/v1.67.0...v1.67.1) (2024-03-08)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rudder-config-schema",
-  "version": "1.67.1",
+  "version": "1.68.0",
   "description": "",
   "main": "src/index.ts",
   "private": true,

src/configurations/destinations/google_adwords_offline_conversions/db-config.json

@@ -53,7 +53,9 @@
         "defaultUserIdentifier",
         "hashUserIdentifier",
         "validateOnly",
-        "oneTrustCookieCategories"
+        "oneTrustCookieCategories",
+        "personalizationConsent",
+        "userDataConsent"
       ]
     },
     "secretKeys": []

src/configurations/destinations/google_adwords_offline_conversions/schema.json

@@ -44,6 +44,16 @@
           }
         }
       },
+      "userDataConsent": {
+        "type": "string",
+        "enum": ["UNSPECIFIED", "UNKNOWN", "GRANTED", "DENIED"],
+        "default": "UNSPECIFIED"
+      },
+      "personalizationConsent": {
+        "type": "string",
+        "enum": ["UNSPECIFIED", "UNKNOWN", "GRANTED", "DENIED"],
+        "default": "UNSPECIFIED"
+      },
       "customVariables": {
         "type": "array",
         "items": {

src/configurations/destinations/google_adwords_offline_conversions/ui-config.json

@@ -74,6 +74,72 @@
           "placeholderRight": "e.g: App Sign-up",
           "value": "eventsToConversionsNamesMapping"
         },
+        {
+          "type": "singleSelect",
+          "label": "Specify the consent for uploaded users for using their data in Google Advertising Purpose",
+          "footerNote": "For store sales this is the only way to provide consent for using the data for Google Advertising. ref: https://developers.google.com/google-ads/api/rest/reference/rest/v16/Consent",
+          "value": "userDataConsent",
+          "options": [
+            {
+              "name": "Unspecified",
+              "value": "UNSPECIFIED"
+            },
+            {
+              "name": "Unknown",
+              "value": "UNKNOWN"
+            },
+            {
+              "name": "Granted",
+              "value": "GRANTED"
+            },
+            {
+              "name": "Denied",
+              "value": "DENIED"
+            }
+          ],
+          "default": "UNSPECIFIED",
+          "preRequisites": {
+            "featureFlags": [
+              {
+                "configKey": "AMP_gaoc_enable_consent_mode",
+                "value": true
+              }
+            ]
+          }
+        },
+        {
+          "type": "singleSelect",
+          "label": "Specify the consent for uploaded users for using their data regarding Ads Personalization",
+          "footerNote": "For store sales this is the only way to provide consent for using the data for Google Ads Personalization. Ref: https://developers.google.com/google-ads/api/rest/reference/rest/v16/Consent",
+          "value": "personalizationConsent",
+          "options": [
+            {
+              "name": "Unspecified",
+              "value": "UNSPECIFIED"
+            },
+            {
+              "name": "Unknown",
+              "value": "UNKNOWN"
+            },
+            {
+              "name": "Granted",
+              "value": "GRANTED"
+            },
+            {
+              "name": "Denied",
+              "value": "DENIED"
+            }
+          ],
+          "default": "UNSPECIFIED",
+          "preRequisites": {
+            "featureFlags": [
+              {
+                "configKey": "AMP_gaoc_enable_consent_mode",
+                "value": true
+              }
+            ]
+          }
+        },
         {
           "type": "dynamicForm",
           "label": "Map your variable names to custom Google Ads variables.",

test/data/validation/destinations/google_adwords_offline_conversions.json

@@ -20,6 +20,8 @@
           "to": "call"
         }
       ],
+      "userDataConsent": "GRANTED",
+      "personalizationConsent": "GRANTED",
       "eventsToConversionsNamesMapping": [
         {
           "from": "Sign up completed",
@@ -42,5 +44,52 @@
       ]
     },
     "result": true
+  },
+  {
+    "config": {
+      "customerId": "962-581-2972",
+      "eventsToOfflineConversionsTypeMapping": [
+        {
+          "from": "download",
+          "to": "click"
+        },
+        {
+          "from": "Product Searched",
+          "to": "call"
+        },
+        {
+          "from": "download",
+          "to": "click"
+        },
+        {
+          "from": "download",
+          "to": "call"
+        }
+      ],
+      "userDataConsent": "RANDOM",
+      "personalizationConsent": "GRANTED",
+      "eventsToConversionsNamesMapping": [
+        {
+          "from": "Sign up completed",
+          "to": "Sign-up - click"
+        },
+        {
+          "from": "Download",
+          "to": "Page view"
+        },
+        {
+          "from": "Product Searched",
+          "to": "search"
+        }
+      ],
+      "customVariables": [
+        {
+          "from": "value",
+          "to": "revenue"
+        }
+      ]
+    },
+    "result": false,
+    "err": ["userDataConsent must be equal to one of the allowed values"]
   }
 ]