Merge branch 'develop' into feat.warehouseNewFormBuilder

rudderlabs · Mar 1, 2024 · 7ae604a · 7ae604a
2 parents 4233592 + 7da2f81
commit 7ae604a
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 1 deletion.
diff --git a/src/configurations/destinations/google_adwords_remarketing_lists/db-config.json b/src/configurations/destinations/google_adwords_remarketing_lists/db-config.json
@@ -36,6 +36,8 @@
         "userSchema",
         "isHashRequired",
         "typeOfList",
+        "userDataConsent",
+        "personalizationConsent",
         "oneTrustCookieCategories"
       ],
       "cloud": ["audienceId", "connectionMode"],

diff --git a/src/configurations/destinations/google_adwords_remarketing_lists/ui-config.json b/src/configurations/destinations/google_adwords_remarketing_lists/ui-config.json
@@ -70,6 +70,54 @@
             "value": "General"
           }
         },
+        {
+          "type": "singleSelect",
+          "label": "Specify the consent for uploaded users for using their data in Google Advertising Purpose",
+          "value": "userDataConsent",
+          "options": [
+            {
+              "name": "Unspecified",
+              "value": "UNSPECIFIED"
+            },
+            {
+              "name": "Unknown",
+              "value": "UNKNOWN"
+            },
+            {
+              "name": "Granted",
+              "value": "GRANTED"
+            },
+            {
+              "name": "Denied",
+              "value": "DENIED"
+            }
+          ],
+          "default": "UNSPECIFIED"
+        },
+        {
+          "type": "singleSelect",
+          "label": "Specify the consent for uploaded users regarding Ads Personalization",
+          "value": "personalizationConsent",
+          "options": [
+            {
+              "name": "Unspecified",
+              "value": "UNSPECIFIED"
+            },
+            {
+              "name": "Unknown",
+              "value": "UNKNOWN"
+            },
+            {
+              "name": "Granted",
+              "value": "GRANTED"
+            },
+            {
+              "name": "Denied",
+              "value": "DENIED"
+            }
+          ],
+          "default": "UNSPECIFIED"
+        },
         {
           "type": "checkbox",
           "label": "Hash Required",

diff --git a/src/configurations/destinations/snowflake/ui-config.json b/src/configurations/destinations/snowflake/ui-config.json
@@ -54,7 +54,7 @@
                     "type": "textInput",
                     "label": "Role",
                     "configKey": "role",
-                    "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$",
+                    "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$",
                     "regexErrorMessage": "Invalid Role",
                     "placeholder": "e.g: RUDDER_ROLE",
                     "secret": false