From 95870de6ae0a05d181cf09f3b3c8b43084fa9e67 Mon Sep 17 00:00:00 2001 From: Alexandros Milaios Date: Fri, 28 Feb 2025 12:55:37 +0200 Subject: [PATCH 1/4] chore: update siger salesforce image to v8.3.15 (#1914) --- src/configurations/sources/singer_salesforce/db-config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/configurations/sources/singer_salesforce/db-config.json b/src/configurations/sources/singer_salesforce/db-config.json index 9fc0ab294..978d0f74a 100644 --- a/src/configurations/sources/singer_salesforce/db-config.json +++ b/src/configurations/sources/singer_salesforce/db-config.json @@ -7,7 +7,7 @@ "oauthRole": "singer-salesforce" }, "isBeta": false, - "image": "rudderstack/source-salesforce:v8.3.2" + "image": "rudderstack/source-salesforce:v8.3.15" }, "type": "cloudSource" } From 8bb0f3c3c2e92e96b820637806411ec4e3730df4 Mon Sep 17 00:00:00 2001 From: Sudip Paul <67197965+ItsSudip@users.noreply.github.com> Date: Mon, 3 Mar 2025 09:48:21 +0530 Subject: [PATCH 2/4] Merge pull request #1902 from rudderlabs/fix.gaoc fix: remove unused config from gaoc --- .../db-config.json | 4 +- .../schema.json | 10 --- .../ui-config.json | 66 ------------------- .../google_adwords_offline_conversions.json | 13 +--- 4 files changed, 2 insertions(+), 91 deletions(-) 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 3684067e3..3ed387d5a 100644 --- a/src/configurations/destinations/google_adwords_offline_conversions/db-config.json +++ b/src/configurations/destinations/google_adwords_offline_conversions/db-config.json @@ -54,9 +54,7 @@ "conversionEnvironment", "defaultUserIdentifier", "hashUserIdentifier", - "validateOnly", - "personalizationConsent", - "userDataConsent" + "validateOnly" ], "android": [ "connectionMode", diff --git a/src/configurations/destinations/google_adwords_offline_conversions/schema.json b/src/configurations/destinations/google_adwords_offline_conversions/schema.json index 6dfeb5309..d9b790b7c 100644 --- a/src/configurations/destinations/google_adwords_offline_conversions/schema.json +++ b/src/configurations/destinations/google_adwords_offline_conversions/schema.json @@ -44,16 +44,6 @@ } } }, - "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 e677c7c83..d2e72ad7e 100644 --- a/src/configurations/destinations/google_adwords_offline_conversions/ui-config.json +++ b/src/configurations/destinations/google_adwords_offline_conversions/ui-config.json @@ -74,72 +74,6 @@ "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 f16924fca..3de1e5b8b 100644 --- a/test/data/validation/destinations/google_adwords_offline_conversions.json +++ b/test/data/validation/destinations/google_adwords_offline_conversions.json @@ -20,8 +20,6 @@ "to": "call" } ], - "userDataConsent": "GRANTED", - "personalizationConsent": "GRANTED", "eventsToConversionsNamesMapping": [ { "from": "Sign up completed", @@ -66,8 +64,6 @@ "to": "call" } ], - "userDataConsent": "RANDOM", - "personalizationConsent": "GRANTED", "eventsToConversionsNamesMapping": [ { "from": "Sign up completed", @@ -89,8 +85,7 @@ } ] }, - "result": false, - "err": ["userDataConsent must be equal to one of the allowed values"] + "result": true }, { "config": { @@ -113,8 +108,6 @@ "to": "call" } ], - "userDataConsent": "GRANTED", - "personalizationConsent": "GRANTED", "eventsToConversionsNamesMapping": [ { "from": "Sign up completed", @@ -281,8 +274,6 @@ "to": "call" } ], - "userDataConsent": "GRANTED", - "personalizationConsent": "GRANTED", "eventsToConversionsNamesMapping": [ { "from": "Sign up completed", @@ -344,8 +335,6 @@ "to": "call" } ], - "userDataConsent": "GRANTED", - "personalizationConsent": "GRANTED", "eventsToConversionsNamesMapping": [ { "from": "Sign up completed", From cf284a0fda7da71627118ab387dde95d6813856b Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Mon, 3 Mar 2025 07:23:58 +0000 Subject: [PATCH 3/4] chore(release): 1.106.1 --- CHANGELOG.md | 2 ++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a68bf1385..f3aa8cd29 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ 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.106.1](https://github.com/rudderlabs/rudder-config-schema/compare/v1.106.0...v1.106.1) (2025-03-03) + ## [1.106.0](https://github.com/rudderlabs/rudder-config-schema/compare/v1.105.0...v1.106.0) (2025-02-21) diff --git a/package-lock.json b/package-lock.json index f567b66f8..be5c094c7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rudder-config-schema", - "version": "1.106.0", + "version": "1.106.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "rudder-config-schema", - "version": "1.106.0", + "version": "1.106.1", "license": "MIT", "dependencies": { "ajv": "^8.12.0", diff --git a/package.json b/package.json index 97e0b08d0..0ae3b86e0 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rudder-config-schema", - "version": "1.106.0", + "version": "1.106.1", "description": "", "main": "src/index.ts", "private": true, From 0f6bc1673b024ea1500496625ba3c79638d14e3f Mon Sep 17 00:00:00 2001 From: Mohamed Khattab Date: Mon, 3 Mar 2025 21:51:03 +0700 Subject: [PATCH 4/4] feat: adds iubenda to subset of destinations - second patch (#1915) --- .../destinations/am/schema.json | 22 +++++++++---------- .../destinations/am/ui-config.json | 4 ++++ .../destinations/googleads/schema.json | 2 +- .../destinations/googleads/ui-config.json | 4 ++++ .../destinations/s3/schema.json | 22 +++++++++---------- .../destinations/s3/ui-config.json | 4 ++++ .../destinations/s3_datalake/schema.json | 22 +++++++++---------- .../destinations/s3_datalake/ui-config.json | 4 ++++ test/data/validation/destinations/am.json | 11 ++++++++++ .../validation/destinations/googleads.json | 11 ++++++++++ test/data/validation/destinations/s3.json | 11 ++++++++++ .../validation/destinations/s3_datalake.json | 11 ++++++++++ 12 files changed, 94 insertions(+), 34 deletions(-) diff --git a/src/configurations/destinations/am/schema.json b/src/configurations/destinations/am/schema.json index 6142e1747..581b6a7c0 100644 --- a/src/configurations/destinations/am/schema.json +++ b/src/configurations/destinations/am/schema.json @@ -475,7 +475,7 @@ "properties": { "provider": { "type": "string", - "enum": ["custom", "ketch", "oneTrust"], + "enum": ["custom", "iubenda", "ketch", "oneTrust"], "default": "oneTrust" }, "consents": { @@ -521,7 +521,7 @@ "properties": { "provider": { "type": "string", - "enum": ["custom", "ketch", "oneTrust"], + "enum": ["custom", "iubenda", "ketch", "oneTrust"], "default": "oneTrust" }, "consents": { @@ -567,7 +567,7 @@ "properties": { "provider": { "type": "string", - "enum": ["custom", "ketch", "oneTrust"], + "enum": ["custom", "iubenda", "ketch", "oneTrust"], "default": "oneTrust" }, "consents": { @@ -613,7 +613,7 @@ "properties": { "provider": { "type": "string", - "enum": ["custom", "ketch", "oneTrust"], + "enum": ["custom", "iubenda", "ketch", "oneTrust"], "default": "oneTrust" }, "consents": { @@ -659,7 +659,7 @@ "properties": { "provider": { "type": "string", - "enum": ["custom", "ketch", "oneTrust"], + "enum": ["custom", "iubenda", "ketch", "oneTrust"], "default": "oneTrust" }, "consents": { @@ -705,7 +705,7 @@ "properties": { "provider": { "type": "string", - "enum": ["custom", "ketch", "oneTrust"], + "enum": ["custom", "iubenda", "ketch", "oneTrust"], "default": "oneTrust" }, "consents": { @@ -751,7 +751,7 @@ "properties": { "provider": { "type": "string", - "enum": ["custom", "ketch", "oneTrust"], + "enum": ["custom", "iubenda", "ketch", "oneTrust"], "default": "oneTrust" }, "consents": { @@ -797,7 +797,7 @@ "properties": { "provider": { "type": "string", - "enum": ["custom", "ketch", "oneTrust"], + "enum": ["custom", "iubenda", "ketch", "oneTrust"], "default": "oneTrust" }, "consents": { @@ -843,7 +843,7 @@ "properties": { "provider": { "type": "string", - "enum": ["custom", "ketch", "oneTrust"], + "enum": ["custom", "iubenda", "ketch", "oneTrust"], "default": "oneTrust" }, "consents": { @@ -889,7 +889,7 @@ "properties": { "provider": { "type": "string", - "enum": ["custom", "ketch", "oneTrust"], + "enum": ["custom", "iubenda", "ketch", "oneTrust"], "default": "oneTrust" }, "consents": { @@ -935,7 +935,7 @@ "properties": { "provider": { "type": "string", - "enum": ["custom", "ketch", "oneTrust"], + "enum": ["custom", "iubenda", "ketch", "oneTrust"], "default": "oneTrust" }, "consents": { diff --git a/src/configurations/destinations/am/ui-config.json b/src/configurations/destinations/am/ui-config.json index 57553e60c..8146c1690 100644 --- a/src/configurations/destinations/am/ui-config.json +++ b/src/configurations/destinations/am/ui-config.json @@ -728,6 +728,10 @@ "label": "Custom", "value": "custom" }, + { + "label": "iubenda", + "value": "iubenda" + }, { "label": "Ketch", "value": "ketch" diff --git a/src/configurations/destinations/googleads/schema.json b/src/configurations/destinations/googleads/schema.json index 91483742b..b2e7dd9ee 100644 --- a/src/configurations/destinations/googleads/schema.json +++ b/src/configurations/destinations/googleads/schema.json @@ -180,7 +180,7 @@ "properties": { "provider": { "type": "string", - "enum": ["custom", "ketch", "oneTrust"], + "enum": ["custom", "iubenda", "ketch", "oneTrust"], "default": "oneTrust" }, "consents": { diff --git a/src/configurations/destinations/googleads/ui-config.json b/src/configurations/destinations/googleads/ui-config.json index 9ad62f9c2..42091b935 100644 --- a/src/configurations/destinations/googleads/ui-config.json +++ b/src/configurations/destinations/googleads/ui-config.json @@ -335,6 +335,10 @@ "name": "Custom", "value": "custom" }, + { + "name": "iubenda", + "value": "iubenda" + }, { "name": "Ketch", "value": "ketch" diff --git a/src/configurations/destinations/s3/schema.json b/src/configurations/destinations/s3/schema.json index 1aef123a2..a55bb2c69 100644 --- a/src/configurations/destinations/s3/schema.json +++ b/src/configurations/destinations/s3/schema.json @@ -304,7 +304,7 @@ "properties": { "provider": { "type": "string", - "enum": ["custom", "ketch", "oneTrust"], + "enum": ["custom", "iubenda", "ketch", "oneTrust"], "default": "oneTrust" }, "consents": { @@ -350,7 +350,7 @@ "properties": { "provider": { "type": "string", - "enum": ["custom", "ketch", "oneTrust"], + "enum": ["custom", "iubenda", "ketch", "oneTrust"], "default": "oneTrust" }, "consents": { @@ -396,7 +396,7 @@ "properties": { "provider": { "type": "string", - "enum": ["custom", "ketch", "oneTrust"], + "enum": ["custom", "iubenda", "ketch", "oneTrust"], "default": "oneTrust" }, "consents": { @@ -442,7 +442,7 @@ "properties": { "provider": { "type": "string", - "enum": ["custom", "ketch", "oneTrust"], + "enum": ["custom", "iubenda", "ketch", "oneTrust"], "default": "oneTrust" }, "consents": { @@ -488,7 +488,7 @@ "properties": { "provider": { "type": "string", - "enum": ["custom", "ketch", "oneTrust"], + "enum": ["custom", "iubenda", "ketch", "oneTrust"], "default": "oneTrust" }, "consents": { @@ -534,7 +534,7 @@ "properties": { "provider": { "type": "string", - "enum": ["custom", "ketch", "oneTrust"], + "enum": ["custom", "iubenda", "ketch", "oneTrust"], "default": "oneTrust" }, "consents": { @@ -580,7 +580,7 @@ "properties": { "provider": { "type": "string", - "enum": ["custom", "ketch", "oneTrust"], + "enum": ["custom", "iubenda", "ketch", "oneTrust"], "default": "oneTrust" }, "consents": { @@ -626,7 +626,7 @@ "properties": { "provider": { "type": "string", - "enum": ["custom", "ketch", "oneTrust"], + "enum": ["custom", "iubenda", "ketch", "oneTrust"], "default": "oneTrust" }, "consents": { @@ -672,7 +672,7 @@ "properties": { "provider": { "type": "string", - "enum": ["custom", "ketch", "oneTrust"], + "enum": ["custom", "iubenda", "ketch", "oneTrust"], "default": "oneTrust" }, "consents": { @@ -718,7 +718,7 @@ "properties": { "provider": { "type": "string", - "enum": ["custom", "ketch", "oneTrust"], + "enum": ["custom", "iubenda", "ketch", "oneTrust"], "default": "oneTrust" }, "consents": { @@ -764,7 +764,7 @@ "properties": { "provider": { "type": "string", - "enum": ["custom", "ketch", "oneTrust"], + "enum": ["custom", "iubenda", "ketch", "oneTrust"], "default": "oneTrust" }, "consents": { diff --git a/src/configurations/destinations/s3/ui-config.json b/src/configurations/destinations/s3/ui-config.json index 9b83c7b9b..59815b042 100644 --- a/src/configurations/destinations/s3/ui-config.json +++ b/src/configurations/destinations/s3/ui-config.json @@ -98,6 +98,10 @@ "name": "Custom", "value": "custom" }, + { + "name": "iubenda", + "value": "iubenda" + }, { "name": "Ketch", "value": "ketch" diff --git a/src/configurations/destinations/s3_datalake/schema.json b/src/configurations/destinations/s3_datalake/schema.json index d7fda3a38..8c2a0ab4f 100644 --- a/src/configurations/destinations/s3_datalake/schema.json +++ b/src/configurations/destinations/s3_datalake/schema.json @@ -195,7 +195,7 @@ "properties": { "provider": { "type": "string", - "enum": ["custom", "ketch", "oneTrust"], + "enum": ["custom", "iubenda", "ketch", "oneTrust"], "default": "oneTrust" }, "consents": { @@ -241,7 +241,7 @@ "properties": { "provider": { "type": "string", - "enum": ["custom", "ketch", "oneTrust"], + "enum": ["custom", "iubenda", "ketch", "oneTrust"], "default": "oneTrust" }, "consents": { @@ -287,7 +287,7 @@ "properties": { "provider": { "type": "string", - "enum": ["custom", "ketch", "oneTrust"], + "enum": ["custom", "iubenda", "ketch", "oneTrust"], "default": "oneTrust" }, "consents": { @@ -333,7 +333,7 @@ "properties": { "provider": { "type": "string", - "enum": ["custom", "ketch", "oneTrust"], + "enum": ["custom", "iubenda", "ketch", "oneTrust"], "default": "oneTrust" }, "consents": { @@ -379,7 +379,7 @@ "properties": { "provider": { "type": "string", - "enum": ["custom", "ketch", "oneTrust"], + "enum": ["custom", "iubenda", "ketch", "oneTrust"], "default": "oneTrust" }, "consents": { @@ -425,7 +425,7 @@ "properties": { "provider": { "type": "string", - "enum": ["custom", "ketch", "oneTrust"], + "enum": ["custom", "iubenda", "ketch", "oneTrust"], "default": "oneTrust" }, "consents": { @@ -471,7 +471,7 @@ "properties": { "provider": { "type": "string", - "enum": ["custom", "ketch", "oneTrust"], + "enum": ["custom", "iubenda", "ketch", "oneTrust"], "default": "oneTrust" }, "consents": { @@ -517,7 +517,7 @@ "properties": { "provider": { "type": "string", - "enum": ["custom", "ketch", "oneTrust"], + "enum": ["custom", "iubenda", "ketch", "oneTrust"], "default": "oneTrust" }, "consents": { @@ -563,7 +563,7 @@ "properties": { "provider": { "type": "string", - "enum": ["custom", "ketch", "oneTrust"], + "enum": ["custom", "iubenda", "ketch", "oneTrust"], "default": "oneTrust" }, "consents": { @@ -609,7 +609,7 @@ "properties": { "provider": { "type": "string", - "enum": ["custom", "ketch", "oneTrust"], + "enum": ["custom", "iubenda", "ketch", "oneTrust"], "default": "oneTrust" }, "consents": { @@ -655,7 +655,7 @@ "properties": { "provider": { "type": "string", - "enum": ["custom", "ketch", "oneTrust"], + "enum": ["custom", "iubenda", "ketch", "oneTrust"], "default": "oneTrust" }, "consents": { diff --git a/src/configurations/destinations/s3_datalake/ui-config.json b/src/configurations/destinations/s3_datalake/ui-config.json index ce1bc5788..1097e4ddb 100644 --- a/src/configurations/destinations/s3_datalake/ui-config.json +++ b/src/configurations/destinations/s3_datalake/ui-config.json @@ -212,6 +212,10 @@ "name": "Custom", "value": "custom" }, + { + "name": "iubenda", + "value": "iubenda" + }, { "name": "Ketch", "value": "ketch" diff --git a/test/data/validation/destinations/am.json b/test/data/validation/destinations/am.json index 330b206e9..01a899fb1 100644 --- a/test/data/validation/destinations/am.json +++ b/test/data/validation/destinations/am.json @@ -671,6 +671,17 @@ { "provider": "ketch", "consents": [] + }, + { + "provider": "iubenda", + "consents": [ + { + "consent": "1" + }, + { + "consent": "4" + } + ] } ] } diff --git a/test/data/validation/destinations/googleads.json b/test/data/validation/destinations/googleads.json index 3db334aee..21d28d446 100644 --- a/test/data/validation/destinations/googleads.json +++ b/test/data/validation/destinations/googleads.json @@ -208,6 +208,17 @@ { "provider": "ketch", "consents": [] + }, + { + "provider": "iubenda", + "consents": [ + { + "consent": "1" + }, + { + "consent": "4" + } + ] } ] } diff --git a/test/data/validation/destinations/s3.json b/test/data/validation/destinations/s3.json index b7180c55a..153500b9b 100644 --- a/test/data/validation/destinations/s3.json +++ b/test/data/validation/destinations/s3.json @@ -96,6 +96,17 @@ { "provider": "ketch", "consents": [] + }, + { + "provider": "iubenda", + "consents": [ + { + "consent": "1" + }, + { + "consent": "4" + } + ] } ] } diff --git a/test/data/validation/destinations/s3_datalake.json b/test/data/validation/destinations/s3_datalake.json index e9929c378..6c2344997 100644 --- a/test/data/validation/destinations/s3_datalake.json +++ b/test/data/validation/destinations/s3_datalake.json @@ -177,6 +177,17 @@ { "provider": "ketch", "consents": [] + }, + { + "provider": "iubenda", + "consents": [ + { + "consent": "1" + }, + { + "consent": "4" + } + ] } ] }