From 48e0078a2258f5fa5001cfbc7c287d86d3c94313 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Mon, 18 Mar 2024 07:55:19 +0000 Subject: [PATCH 1/2] chore(release): 1.68.0 --- CHANGELOG.md | 16 ++++++++++++++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 76adadf2f..79c26c819 100644 --- a/CHANGELOG.md +++ b/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) diff --git a/package-lock.json b/package-lock.json index 8c47a3990..56886014b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rudder-config-schema", - "version": "1.67.1", + "version": "1.68.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "rudder-config-schema", - "version": "1.67.1", + "version": "1.68.0", "license": "MIT", "dependencies": { "ajv": "^8.12.0", diff --git a/package.json b/package.json index 8d77e4cf7..4fa426451 100755 --- a/package.json +++ b/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, From f4dcdb8c55543bb49257e06326e81c7157214f4c Mon Sep 17 00:00:00 2001 From: shrouti1507 <60211312+shrouti1507@users.noreply.github.com> Date: Tue, 19 Mar 2024 19:30:05 +0530 Subject: [PATCH 2/2] feat: adding consent field support for gaoc store sales (#1261) --- .../db-config.json | 4 +- .../schema.json | 10 +++ .../ui-config.json | 66 +++++++++++++++++++ .../google_adwords_offline_conversions.json | 49 ++++++++++++++ 4 files changed, 128 insertions(+), 1 deletion(-) diff --git a/src/configurations/destinations/google_adwords_offline_conversions/db-config.json b/src/configurations/destinations/google_adwords_offline_conversions/db-config.json index 3663af881..a5d03291a 100644 --- a/src/configurations/destinations/google_adwords_offline_conversions/db-config.json +++ b/src/configurations/destinations/google_adwords_offline_conversions/db-config.json @@ -53,7 +53,9 @@ "defaultUserIdentifier", "hashUserIdentifier", "validateOnly", - "oneTrustCookieCategories" + "oneTrustCookieCategories", + "personalizationConsent", + "userDataConsent" ] }, "secretKeys": [] diff --git a/src/configurations/destinations/google_adwords_offline_conversions/schema.json b/src/configurations/destinations/google_adwords_offline_conversions/schema.json index 4a2282611..e8ac48e7b 100644 --- a/src/configurations/destinations/google_adwords_offline_conversions/schema.json +++ b/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": { diff --git a/src/configurations/destinations/google_adwords_offline_conversions/ui-config.json b/src/configurations/destinations/google_adwords_offline_conversions/ui-config.json index d45be0ffb..e44ed3fdf 100644 --- a/src/configurations/destinations/google_adwords_offline_conversions/ui-config.json +++ b/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.", diff --git a/test/data/validation/destinations/google_adwords_offline_conversions.json b/test/data/validation/destinations/google_adwords_offline_conversions.json index 68c4d5951..473047bf4 100644 --- a/test/data/validation/destinations/google_adwords_offline_conversions.json +++ b/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"] } ]