chore(release): pull hotfix-release/v1.45.1 into main (#834)

Co-authored-by: shrouti1507 <60211312+shrouti1507@users.noreply.github.com>
Co-authored-by: Mihir Bhalala <77438541+mihir-4116@users.noreply.github.com>
Co-authored-by: GitHub Actions <noreply@github.com>

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 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.45.1](https://github.com/rudderlabs/rudder-config-schema/compare/v1.45.0...v1.45.1) (2023-08-16)
+
+
+### Bug Fixes
+
+* **dcmfloodlight:** schema issue ([#833](https://github.com/rudderlabs/rudder-config-schema/issues/833)) ([9f8cede](https://github.com/rudderlabs/rudder-config-schema/commit/9f8cede260f4fd9619609a7fdc6e1500d20d6fc6))
+* make bingAds aud visible and add message type to marketo bulk upload ([#832](https://github.com/rudderlabs/rudder-config-schema/issues/832)) ([e8b0435](https://github.com/rudderlabs/rudder-config-schema/commit/e8b0435aae6b71d59e977ce8e56762a5e3ae0e18))
+
 ## [1.45.0](https://github.com/rudderlabs/rudder-config-schema/compare/v1.44.2...v1.45.0) (2023-08-14)
 
 

package.json

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

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

@@ -30,7 +30,5 @@
       ]
     }
   },
-  "options": {
-    "hidden": true
-  }
+  "options": { "isBeta": true }
 }

src/configurations/destinations/dcm_floodlight/schema.json

@@ -2,7 +2,9 @@
   "configSchema": {
     "$schema": "http://json-schema.org/draft-07/schema#",
     "type": "object",
-    "required": ["advertiserId"],
+    "required": [
+      "advertiserId"
+    ],
     "properties": {
       "advertiserId": {
         "type": "string",
@@ -33,7 +35,10 @@
               "type": "string",
               "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
             },
-            "salesTag": { "type": "boolean" },
+            "salesTag": {
+              "type": "boolean",
+              "default": false
+            },
             "customVariables": {
               "type": "array",
               "items": {
@@ -45,17 +50,76 @@
                   },
                   "to": {
                     "type": "string",
-                    "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^([0-9]{0,100})$"
+                    "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
                   }
                 }
               }
             }
           }
         }
       },
+      "useNativeSDK": {
+        "type": "object",
+        "properties": {
+          "web": {
+            "type": "boolean"
+          }
+        }
+      },
+      "tagFormat": {
+        "type": "object",
+        "properties": {
+          "web": {
+            "type": "string",
+            "enum": [
+              "globalSiteTag",
+              "iframeTag"
+            ],
+            "default": "globalSiteTag"
+          }
+        }
+      },
+      "conversionLinker": {
+        "type": "object",
+        "properties": {
+          "web": {
+            "type": "boolean"
+          }
+        }
+      },
+      "allowAdPersonalizationSignals": {
+        "type": "object",
+        "properties": {
+          "web": {
+            "type": "boolean"
+          }
+        }
+      },
+      "doubleclickId": {
+        "type": "object",
+        "properties": {
+          "web": {
+            "type": "boolean"
+          }
+        }
+      },
+      "googleNetworkId": {
+        "type": "object",
+        "properties": {
+          "web": {
+            "type": "string",
+            "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
+          }
+        }
+      },
       "eventFilteringOption": {
         "type": "string",
-        "pattern": "(^env[.].+)|^(disable|whitelistedEvents|blacklistedEvents)$"
+        "enum": [
+          "disable",
+          "whitelistedEvents",
+          "blacklistedEvents"
+        ],
+        "default": "disable"
       },
       "whitelistedEvents": {
         "type": "array",
@@ -81,23 +145,6 @@
           }
         }
       },
-      "useNativeSDK": { "type": "object", "properties": { "web": { "type": "boolean" } } },
-      "tagFormat": { "type": "string", "pattern": "(^env[.].+)|^(globalSiteTag|iframeTag)$" },
-      "conversionLinker": { "type": "object", "properties": { "web": { "type": "boolean" } } },
-      "allowAdPersonalizationSignals": {
-        "type": "object",
-        "properties": { "web": { "type": "boolean" } }
-      },
-      "doubleclickId": { "type": "object", "properties": { "web": { "type": "boolean" } } },
-      "googleNetworkId": {
-        "type": "object",
-        "properties": {
-          "web": {
-            "type": "string",
-            "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
-          }
-        }
-      },
       "oneTrustCookieCategories": {
         "type": "array",
         "items": {
@@ -112,4 +159,4 @@
       }
     }
   }
-}
+}

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

@@ -17,7 +17,7 @@
           "type": "textInput",
           "label": "Activity Tag",
           "value": "activityTag",
-          "regex": ".*",
+          "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$",
           "required": false,
           "placeholder": "e.g. signu0",
           "secret": false,
@@ -27,7 +27,7 @@
           "type": "textInput",
           "label": "Group Tag",
           "value": "groupTag",
-          "regex": ".*",
+          "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$",
           "required": false,
           "placeholder": "e.g. conv01",
           "secret": false,
@@ -136,7 +136,7 @@
           "type": "textInput",
           "label": "Google Network Id",
           "value": "googleNetworkId",
-          "regex": ".*",
+          "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$",
           "required": false,
           "footerNote": "Network ID (NID) for the bidder account"
         }
@@ -217,4 +217,4 @@
       ]
     }
   ]
-}
+}

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

@@ -20,6 +20,7 @@
       "warehouse",
       "shopify"
     ],
+    "supportedMessageTypes": ["identify"],
     "destConfig": {
       "defaultConfig": [
         "clientId",

test/data/validation/destinations/dcm_floodlight.json

@@ -26,36 +26,6 @@
     },
     "result": true
   },
-  {
-    "config": {
-      "advertiserId": "22448662",
-      "activityTag": "",
-      "groupTag": "",
-      "conversionEvents": [
-        {
-          "eventName": "Product viewed",
-          "floodlightActivityTag": "signu01",
-          "floodlightGroupTag": "conv01",
-          "salesTag": false,
-          "customVariables": [
-            { "from": "RudderstackProperty1", "to": "u1" },
-            { "from": "RudderstackProperty2", "to": "2" }
-          ]
-        },
-        {
-          "eventName": "Order Complete",
-          "floodlightActivityTag": "signu01",
-          "floodlightGroupTag": "conv02",
-          "salesTag": false,
-          "customVariables": [{ "from": "", "to": "" }]
-        }
-      ]
-    },
-    "result": false,
-    "err": [
-      "conversionEvents.0.customVariables.0.to must match pattern \"(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^([0-9]{0,100})$\""
-    ]
-  },
   {
     "config": {
       "advertiserId": "12AUXUS123",
@@ -116,7 +86,7 @@
       "useNativeSDK": { "web": true },
       "conversionLinker": { "web": true },
       "allowAdPersonalizationSignals": { "web": true },
-      "tagFormat": "globalSiteTag",
+      "tagFormat": {"web": "globalSiteTag"},
       "doubleclickId": { "web": true },
       "googleNetworkId": { "web": "1234" },
       "oneTrustCookieCategories": [{ "oneTrustCookieCategory": "" }]
@@ -153,7 +123,7 @@
       "useNativeSDK": { "web": false },
       "conversionLinker": { "web": true },
       "allowAdPersonalizationSignals": { "web": true },
-      "tagFormat": "iframeTag",
+      "tagFormat": {"web": "iframeTag"},
       "doubleclickId": { "web": false },
       "googleNetworkId": { "web": "1234" },
       "oneTrustCookieCategories": [{ "oneTrustCookieCategory": "" }]