diff --git a/src/configurations/destinations/customerio/schema.json b/src/configurations/destinations/customerio/schema.json index 8a2f9d079..3a405abeb 100644 --- a/src/configurations/destinations/customerio/schema.json +++ b/src/configurations/destinations/customerio/schema.json @@ -144,8 +144,7 @@ "properties": { "resolutionStrategy": { "type": "string", - "enum": ["and", "or"], - "default": "and" + "enum": ["and", "or"] } }, "required": ["resolutionStrategy"] @@ -191,8 +190,7 @@ "properties": { "resolutionStrategy": { "type": "string", - "enum": ["and", "or"], - "default": "and" + "enum": ["and", "or"] } }, "required": ["resolutionStrategy"] @@ -238,8 +236,7 @@ "properties": { "resolutionStrategy": { "type": "string", - "enum": ["and", "or"], - "default": "and" + "enum": ["and", "or"] } }, "required": ["resolutionStrategy"] @@ -285,8 +282,7 @@ "properties": { "resolutionStrategy": { "type": "string", - "enum": ["and", "or"], - "default": "and" + "enum": ["and", "or"] } }, "required": ["resolutionStrategy"] @@ -332,8 +328,7 @@ "properties": { "resolutionStrategy": { "type": "string", - "enum": ["and", "or"], - "default": "and" + "enum": ["and", "or"] } }, "required": ["resolutionStrategy"] @@ -379,8 +374,7 @@ "properties": { "resolutionStrategy": { "type": "string", - "enum": ["and", "or"], - "default": "and" + "enum": ["and", "or"] } }, "required": ["resolutionStrategy"] @@ -426,8 +420,7 @@ "properties": { "resolutionStrategy": { "type": "string", - "enum": ["and", "or"], - "default": "and" + "enum": ["and", "or"] } }, "required": ["resolutionStrategy"] @@ -473,8 +466,7 @@ "properties": { "resolutionStrategy": { "type": "string", - "enum": ["and", "or"], - "default": "and" + "enum": ["and", "or"] } }, "required": ["resolutionStrategy"] @@ -520,8 +512,7 @@ "properties": { "resolutionStrategy": { "type": "string", - "enum": ["and", "or"], - "default": "and" + "enum": ["and", "or"] } }, "required": ["resolutionStrategy"] @@ -567,8 +558,7 @@ "properties": { "resolutionStrategy": { "type": "string", - "enum": ["and", "or"], - "default": "and" + "enum": ["and", "or"] } }, "required": ["resolutionStrategy"] diff --git a/src/configurations/destinations/customerio/ui-config.json b/src/configurations/destinations/customerio/ui-config.json index a314d64c6..871b55aaf 100644 --- a/src/configurations/destinations/customerio/ui-config.json +++ b/src/configurations/destinations/customerio/ui-config.json @@ -328,6 +328,9 @@ "label": "the required consent logic", "configKey": "resolutionStrategy", "options": [ + { + "label": "" + }, { "label": "AND", "value": "and" @@ -337,7 +340,6 @@ "value": "or" } ], - "default": "and", "required": true, "variant": "badge", "preRequisites": { diff --git a/src/configurations/destinations/ga4/schema.json b/src/configurations/destinations/ga4/schema.json index 4d26ead1d..8807ef22b 100644 --- a/src/configurations/destinations/ga4/schema.json +++ b/src/configurations/destinations/ga4/schema.json @@ -122,8 +122,7 @@ "properties": { "resolutionStrategy": { "type": "string", - "enum": ["and", "or"], - "default": "and" + "enum": ["and", "or"] } }, "required": ["resolutionStrategy"] @@ -169,8 +168,7 @@ "properties": { "resolutionStrategy": { "type": "string", - "enum": ["and", "or"], - "default": "and" + "enum": ["and", "or"] } }, "required": ["resolutionStrategy"] @@ -216,8 +214,7 @@ "properties": { "resolutionStrategy": { "type": "string", - "enum": ["and", "or"], - "default": "and" + "enum": ["and", "or"] } }, "required": ["resolutionStrategy"] @@ -263,8 +260,7 @@ "properties": { "resolutionStrategy": { "type": "string", - "enum": ["and", "or"], - "default": "and" + "enum": ["and", "or"] } }, "required": ["resolutionStrategy"] @@ -310,8 +306,7 @@ "properties": { "resolutionStrategy": { "type": "string", - "enum": ["and", "or"], - "default": "and" + "enum": ["and", "or"] } }, "required": ["resolutionStrategy"] @@ -357,8 +352,7 @@ "properties": { "resolutionStrategy": { "type": "string", - "enum": ["and", "or"], - "default": "and" + "enum": ["and", "or"] } }, "required": ["resolutionStrategy"] @@ -404,8 +398,7 @@ "properties": { "resolutionStrategy": { "type": "string", - "enum": ["and", "or"], - "default": "and" + "enum": ["and", "or"] } }, "required": ["resolutionStrategy"] @@ -451,8 +444,7 @@ "properties": { "resolutionStrategy": { "type": "string", - "enum": ["and", "or"], - "default": "and" + "enum": ["and", "or"] } }, "required": ["resolutionStrategy"] @@ -498,8 +490,7 @@ "properties": { "resolutionStrategy": { "type": "string", - "enum": ["and", "or"], - "default": "and" + "enum": ["and", "or"] } }, "required": ["resolutionStrategy"] diff --git a/src/configurations/destinations/ga4/ui-config.json b/src/configurations/destinations/ga4/ui-config.json index 408641aa2..e3503be12 100644 --- a/src/configurations/destinations/ga4/ui-config.json +++ b/src/configurations/destinations/ga4/ui-config.json @@ -429,6 +429,9 @@ "label": "the required consent logic", "configKey": "resolutionStrategy", "options": [ + { + "label": "" + }, { "label": "AND", "value": "and" @@ -438,7 +441,6 @@ "value": "or" } ], - "default": "and", "required": true, "variant": "badge", "preRequisites": { diff --git a/src/configurations/destinations/mp/schema.json b/src/configurations/destinations/mp/schema.json index 1ad98417b..895f921a2 100644 --- a/src/configurations/destinations/mp/schema.json +++ b/src/configurations/destinations/mp/schema.json @@ -262,8 +262,7 @@ "properties": { "resolutionStrategy": { "type": "string", - "enum": ["and", "or"], - "default": "and" + "enum": ["and", "or"] } }, "required": ["resolutionStrategy"] @@ -309,8 +308,7 @@ "properties": { "resolutionStrategy": { "type": "string", - "enum": ["and", "or"], - "default": "and" + "enum": ["and", "or"] } }, "required": ["resolutionStrategy"] @@ -356,8 +354,7 @@ "properties": { "resolutionStrategy": { "type": "string", - "enum": ["and", "or"], - "default": "and" + "enum": ["and", "or"] } }, "required": ["resolutionStrategy"] @@ -403,8 +400,7 @@ "properties": { "resolutionStrategy": { "type": "string", - "enum": ["and", "or"], - "default": "and" + "enum": ["and", "or"] } }, "required": ["resolutionStrategy"] @@ -450,8 +446,7 @@ "properties": { "resolutionStrategy": { "type": "string", - "enum": ["and", "or"], - "default": "and" + "enum": ["and", "or"] } }, "required": ["resolutionStrategy"] @@ -497,8 +492,7 @@ "properties": { "resolutionStrategy": { "type": "string", - "enum": ["and", "or"], - "default": "and" + "enum": ["and", "or"] } }, "required": ["resolutionStrategy"] @@ -544,8 +538,7 @@ "properties": { "resolutionStrategy": { "type": "string", - "enum": ["and", "or"], - "default": "and" + "enum": ["and", "or"] } }, "required": ["resolutionStrategy"] @@ -591,8 +584,7 @@ "properties": { "resolutionStrategy": { "type": "string", - "enum": ["and", "or"], - "default": "and" + "enum": ["and", "or"] } }, "required": ["resolutionStrategy"] @@ -638,8 +630,7 @@ "properties": { "resolutionStrategy": { "type": "string", - "enum": ["and", "or"], - "default": "and" + "enum": ["and", "or"] } }, "required": ["resolutionStrategy"] diff --git a/src/configurations/destinations/mp/ui-config.json b/src/configurations/destinations/mp/ui-config.json index 7bd8bfae6..2c690caf8 100644 --- a/src/configurations/destinations/mp/ui-config.json +++ b/src/configurations/destinations/mp/ui-config.json @@ -498,6 +498,9 @@ "label": "the required consent logic", "value": "resolutionStrategy", "options": [ + { + "label": "" + }, { "name": "AND", "value": "and" @@ -507,10 +510,6 @@ "value": "or" } ], - "defaultOption": { - "name": "AND", - "value": "and" - }, "required": true, "variant": "badge", "preRequisites": { diff --git a/src/configurations/destinations/snowflake/schema.json b/src/configurations/destinations/snowflake/schema.json index 76f26b6dc..885aafd6c 100644 --- a/src/configurations/destinations/snowflake/schema.json +++ b/src/configurations/destinations/snowflake/schema.json @@ -132,8 +132,7 @@ "properties": { "resolutionStrategy": { "type": "string", - "enum": ["and", "or"], - "default": "and" + "enum": ["and", "or"] } }, "required": ["resolutionStrategy"] @@ -179,8 +178,7 @@ "properties": { "resolutionStrategy": { "type": "string", - "enum": ["and", "or"], - "default": "and" + "enum": ["and", "or"] } }, "required": ["resolutionStrategy"] @@ -226,8 +224,7 @@ "properties": { "resolutionStrategy": { "type": "string", - "enum": ["and", "or"], - "default": "and" + "enum": ["and", "or"] } }, "required": ["resolutionStrategy"] @@ -273,8 +270,7 @@ "properties": { "resolutionStrategy": { "type": "string", - "enum": ["and", "or"], - "default": "and" + "enum": ["and", "or"] } }, "required": ["resolutionStrategy"] @@ -320,8 +316,7 @@ "properties": { "resolutionStrategy": { "type": "string", - "enum": ["and", "or"], - "default": "and" + "enum": ["and", "or"] } }, "required": ["resolutionStrategy"] @@ -367,8 +362,7 @@ "properties": { "resolutionStrategy": { "type": "string", - "enum": ["and", "or"], - "default": "and" + "enum": ["and", "or"] } }, "required": ["resolutionStrategy"] @@ -414,8 +408,7 @@ "properties": { "resolutionStrategy": { "type": "string", - "enum": ["and", "or"], - "default": "and" + "enum": ["and", "or"] } }, "required": ["resolutionStrategy"] @@ -461,8 +454,7 @@ "properties": { "resolutionStrategy": { "type": "string", - "enum": ["and", "or"], - "default": "and" + "enum": ["and", "or"] } }, "required": ["resolutionStrategy"] @@ -508,8 +500,7 @@ "properties": { "resolutionStrategy": { "type": "string", - "enum": ["and", "or"], - "default": "and" + "enum": ["and", "or"] } }, "required": ["resolutionStrategy"] diff --git a/src/configurations/destinations/snowflake/ui-config.json b/src/configurations/destinations/snowflake/ui-config.json index 7ae03d033..189d1056b 100644 --- a/src/configurations/destinations/snowflake/ui-config.json +++ b/src/configurations/destinations/snowflake/ui-config.json @@ -637,6 +637,9 @@ "label": "the required consent logic", "value": "resolutionStrategy", "options": [ + { + "label": "" + }, { "name": "AND", "value": "and" @@ -646,10 +649,6 @@ "value": "or" } ], - "defaultOption": { - "name": "AND", - "value": "and" - }, "required": true, "variant": "badge", "preRequisites": { diff --git a/test/data/validation/destinations/customerio.json b/test/data/validation/destinations/customerio.json index 5a3aa17dc..2795eae0c 100644 --- a/test/data/validation/destinations/customerio.json +++ b/test/data/validation/destinations/customerio.json @@ -247,18 +247,32 @@ "consentManagement": { "android": [ { - "provider": "custom", - "resolutionStrategy": "" + "provider": "custom" } ] } }, "result": false, "err": [ - "consentManagement.android.0.resolutionStrategy must be equal to one of the allowed values", + "consentManagement.android.0 must have required property 'resolutionStrategy'", "consentManagement.android.0 must match \"then\" schema" ] }, + { + "testTitle": "With consent management OneTrust provider config and no resolutionStrategy value", + "config": { + "siteID": "95bd1331112976i0ff9b", + "apiKey": "95bd1330072974f0ff9b", + "consentManagement": { + "android": [ + { + "provider": "oneTrust" + } + ] + } + }, + "result": true + }, { "testTitle": "With consent management custom provider config invalid provider value", "config": { diff --git a/test/data/validation/destinations/ga4.json b/test/data/validation/destinations/ga4.json index a7d1eb221..74584e071 100644 --- a/test/data/validation/destinations/ga4.json +++ b/test/data/validation/destinations/ga4.json @@ -383,18 +383,31 @@ "consentManagement": { "android": [ { - "provider": "custom", - "resolutionStrategy": "" + "provider": "custom" } ] } }, "result": false, "err": [ - "consentManagement.android.0.resolutionStrategy must be equal to one of the allowed values", + "consentManagement.android.0 must have required property 'resolutionStrategy'", "consentManagement.android.0 must match \"then\" schema" ] }, + { + "testTitle": "With consent management OneTrust provider config and no resolutionStrategy value", + "config": { + "apiSecret": "QyWIGHj8QhG2L4ePAPiXCA", + "consentManagement": { + "android": [ + { + "provider": "oneTrust" + } + ] + } + }, + "result": true + }, { "testTitle": "With consent management custom provider config invalid provider value", "config": { diff --git a/test/data/validation/destinations/mp.json b/test/data/validation/destinations/mp.json index fac08dc24..90d3d9ff1 100644 --- a/test/data/validation/destinations/mp.json +++ b/test/data/validation/destinations/mp.json @@ -273,18 +273,31 @@ "consentManagement": { "android": [ { - "provider": "custom", - "resolutionStrategy": "" + "provider": "custom" } ] } }, "result": false, "err": [ - "consentManagement.android.0.resolutionStrategy must be equal to one of the allowed values", + "consentManagement.android.0 must have required property 'resolutionStrategy'", "consentManagement.android.0 must match \"then\" schema" ] }, + { + "testTitle": "With consent management OneTrust provider config and no resolutionStrategy value", + "config": { + "token": "2de18c6hf6v45201ab43d2344b0c128x", + "consentManagement": { + "android": [ + { + "provider": "oneTrust" + } + ] + } + }, + "result": true + }, { "testTitle": "With consent management custom provider config invalid provider value", "config": { diff --git a/test/data/validation/destinations/snowflake.json b/test/data/validation/destinations/snowflake.json index 564ebe6ae..e99290d79 100644 --- a/test/data/validation/destinations/snowflake.json +++ b/test/data/validation/destinations/snowflake.json @@ -452,18 +452,35 @@ "consentManagement": { "android": [ { - "provider": "custom", - "resolutionStrategy": "" + "provider": "custom" } ] } }, "result": false, "err": [ - "consentManagement.android.0.resolutionStrategy must be equal to one of the allowed values", + "consentManagement.android.0 must have required property 'resolutionStrategy'", "consentManagement.android.0 must match \"then\" schema" ] }, + { + "testTitle": "With consent management OneTrust provider config and no resolutionStrategy value", + "config": { + "account": "test-account", + "database": "test-database", + "warehouse": "test-warehouse", + "user": "test-user", + "password": "test-password", + "consentManagement": { + "android": [ + { + "provider": "oneTrust" + } + ] + } + }, + "result": true + }, { "testTitle": "With consent management custom provider config invalid provider value", "config": {