Merge pull request #1738 from rudderlabs/main

chore(release): pull main into develop post release v1.94.2
rudderlabs · Oct 4, 2024 · edcdd2e · edcdd2e
2 parents 50505c8 + ac272ee
commit edcdd2e
Show file tree

Hide file tree

Showing 19 changed files with 345 additions and 50 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 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.94.2](https://github.com/rudderlabs/rudder-config-schema/compare/v1.94.1...v1.94.2) (2024-10-04)
+
+
+### Bug Fixes
+
+* redshift serverless bq partitioning configuration changes ([#1730](https://github.com/rudderlabs/rudder-config-schema/issues/1730)) ([57563e1](https://github.com/rudderlabs/rudder-config-schema/commit/57563e193fd3a52609c8ddceeca243238db7a079))
+* update image for singer zendesk support to v8.3.9 ([#1731](https://github.com/rudderlabs/rudder-config-schema/issues/1731)) ([a7b6d10](https://github.com/rudderlabs/rudder-config-schema/commit/a7b6d10dbcdbaaf660e32f3a72e7ca406ba980d4))
+* webhook url regex to block ftp ([#1735](https://github.com/rudderlabs/rudder-config-schema/issues/1735)) ([92401fc](https://github.com/rudderlabs/rudder-config-schema/commit/92401fc02df8ebfacd43e327be62b5d0d8aac126))
+* salesforce v2 sandbox config remove ([#1737](https://github.com/rudderlabs/rudder-config-schema/issues/1737)) ([7b93a38](https://github.com/rudderlabs/rudder-config-schema/commit/7b93a38a68743fd12cb13ea769c004e0a4f288b8))
+
 ### [1.94.1](https://github.com/rudderlabs/rudder-config-schema/compare/v1.94.0...v1.94.1) (2024-10-01)
 
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rudder-config-schema",
-  "version": "1.94.1",
+  "version": "1.94.2",
   "description": "",
   "main": "src/index.ts",
   "private": true,

diff --git a/src/configurations/destinations/bq/db-config.json b/src/configurations/destinations/bq/db-config.json
@@ -35,7 +35,9 @@
         "skipUsersTable",
         "jsonPaths",
         "underscoreDivideNumbers",
-        "allowUsersContextTraits"
+        "allowUsersContextTraits",
+        "partitionColumn",
+        "partitionType"
       ],
       "android": [
         "connectionMode",

diff --git a/src/configurations/destinations/bq/schema.json b/src/configurations/destinations/bq/schema.json
@@ -33,6 +33,16 @@
         "pattern": "^(5|15|30|60|180|360|720|1440)$",
         "default": "180"
       },
+      "partitionColumn": {
+        "type": "string",
+        "pattern": "^(_PARTITIONTIME|loaded_at|received_at)$",
+        "default": "_PARTITIONTIME"
+      },
+      "partitionType": {
+        "type": "string",
+        "pattern": "^(hour|day)$",
+        "default": "day"
+      },
       "syncStartAt": {
         "type": "string"
       },

diff --git a/src/configurations/destinations/bq/ui-config.json b/src/configurations/destinations/bq/ui-config.json
@@ -142,6 +142,52 @@
           },
           "required": false,
           "footerNote": "Note: Please specify time in UTC"
+        },
+        {
+          "type": "singleSelect",
+          "immutable": true,
+          "label": "Partition Column",
+          "value": "partitionColumn",
+          "options": [
+            {
+              "name": "Ingestion Time",
+              "value": "_PARTITIONTIME"
+            },
+            {
+              "name": "Loaded At",
+              "value": "loaded_at"
+            },
+            {
+              "name": "Received At",
+              "value": "received_at"
+            }
+          ],
+          "defaultOption": {
+            "name": "Ingestion Time",
+            "value": "_PARTITIONTIME"
+          },
+          "required": false
+        },
+        {
+          "type": "singleSelect",
+          "immutable": true,
+          "label": "Partition Type",
+          "value": "partitionType",
+          "options": [
+            {
+              "name": "Hour",
+              "value": "hour"
+            },
+            {
+              "name": "Day",
+              "value": "day"
+            }
+          ],
+          "defaultOption": {
+            "name": "Day",
+            "value": "day"
+          },
+          "required": false
         }
       ]
     },

diff --git a/src/configurations/destinations/rs/db-config.json b/src/configurations/destinations/rs/db-config.json
@@ -44,6 +44,8 @@
         "iamRoleARNForAuth",
         "clusterId",
         "clusterRegion",
+        "useServerless",
+        "workgroupName",
         "bucketName",
         "iamRoleARN",
         "roleBasedAuth",

diff --git a/src/configurations/destinations/rs/schema.json b/src/configurations/destinations/rs/schema.json
@@ -941,19 +941,51 @@
               "type": "string",
               "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
             },
-            "clusterId": {
-              "type": "string",
-              "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,255})$"
-            },
             "clusterRegion": {
               "type": "string",
               "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,255})$"
             },
             "useIAMForAuth": {
               "const": true
+            },
+            "useServerless": {
+              "type": "boolean",
+              "default": false
             }
           },
-          "required": ["clusterId", "clusterRegion", "iamRoleARNForAuth", "useIAMForAuth"]
+          "anyOf": [
+            {
+              "properties": {
+                "clusterId": {
+                  "type": "string",
+                  "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,255})$"
+                },
+                "useServerless": {
+                  "const": false
+                },
+                "useIAMForAuth": {
+                  "const": true
+                }
+              },
+              "required": ["clusterId", "useIAMForAuth"]
+            },
+            {
+              "properties": {
+                "workgroupName": {
+                  "type": "string",
+                  "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,255})$"
+                },
+                "useIAMForAuth": {
+                  "const": true
+                },
+                "useServerless": {
+                  "const": true
+                }
+              },
+              "required": ["workgroupName", "useIAMForAuth", "useServerless"]
+            }
+          ],
+          "required": ["clusterRegion", "iamRoleARNForAuth", "useIAMForAuth"]
         }
       },
       {

diff --git a/src/configurations/destinations/rs/ui-config.json b/src/configurations/destinations/rs/ui-config.json
@@ -40,12 +40,29 @@
           "placeholder": "5439",
           "required": true
         },
+        {
+          "type": "checkbox",
+          "preRequisiteField": [
+            {
+              "name": "useIAMForAuth",
+              "selectedValue": true
+            }
+          ],
+          "label": "Use Redshift Serverless",
+          "value": "useServerless",
+          "required": false,
+          "default": false
+        },
         {
           "type": "textInput",
           "preRequisiteField": [
             {
               "name": "useIAMForAuth",
               "selectedValue": true
+            },
+            {
+              "name": "useServerless",
+              "selectedValue": false
             }
           ],
           "label": "Cluster Id",
@@ -55,6 +72,25 @@
           "placeholder": "Cluster Identifier",
           "required": true
         },
+        {
+          "type": "textInput",
+          "preRequisiteField": [
+            {
+              "name": "useIAMForAuth",
+              "selectedValue": true
+            },
+            {
+              "name": "useServerless",
+              "selectedValue": true
+            }
+          ],
+          "label": "Workgroup Name",
+          "value": "workgroupName",
+          "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,255})$",
+          "regexErrorMessage": "Invalid Workgroup Name",
+          "placeholder": "Workgroup Name",
+          "required": true
+        },
         {
           "type": "textInput",
           "preRequisiteField": [

diff --git a/src/configurations/destinations/salesforce_oauth/db-config.json b/src/configurations/destinations/salesforce_oauth/db-config.json
@@ -27,7 +27,7 @@
     ],
     "supportedMessageTypes": ["identify"],
     "destConfig": {
-      "defaultConfig": ["rudderAccountId", "mapProperties", "sandbox", "useContactId"],
+      "defaultConfig": ["rudderAccountId", "mapProperties", "useContactId"],
       "android": [
         "connectionMode",
         "consentManagement",

diff --git a/src/configurations/destinations/salesforce_oauth/schema.json b/src/configurations/destinations/salesforce_oauth/schema.json
@@ -8,10 +8,6 @@
         "type": "boolean",
         "default": true
       },
-      "sandbox": {
-        "type": "boolean",
-        "default": false
-      },
       "useContactId": {
         "type": "boolean",
         "default": false

diff --git a/src/configurations/destinations/salesforce_oauth/ui-config.json b/src/configurations/destinations/salesforce_oauth/ui-config.json
@@ -9,12 +9,6 @@
           "value": "mapProperties",
           "default": true
         },
-        {
-          "type": "checkbox",
-          "label": "Sandbox mode",
-          "value": "sandbox",
-          "default": false
-        },
         {
           "type": "checkbox",
           "label": "Use contactId for converted leads",

diff --git a/src/configurations/destinations/webhook/schema.json b/src/configurations/destinations/webhook/schema.json
@@ -517,7 +517,7 @@
       },
       "webhookUrl": {
         "type": "string",
-        "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(https?|ftp):\\/\\/(?!localhost|127\\.0\\.0\\.1|10\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}|192\\.168\\.\\d{1,3}\\.\\d{1,3}|172\\.(1[6-9]|2[0-9]|3[0-1])\\.\\d{1,3}\\.\\d{1,3}|0\\.0\\.0\\.0|\\[::1\\]|\\[fc[0-9a-fA-F]{2}:.*\\]|\\[fd[0-9a-fA-F]{2}:.*\\]|\\[::ffff:(?:25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\\.(?:25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\\.(?:25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\\.(?:25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\\]).*([^\\s/$.?#].[^\\s]*)$"
+        "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(https?):\\/\\/(?!localhost|127\\.0\\.0\\.1|10\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}|192\\.168\\.\\d{1,3}\\.\\d{1,3}|172\\.(1[6-9]|2[0-9]|3[0-1])\\.\\d{1,3}\\.\\d{1,3}|0\\.0\\.0\\.0|\\[::1\\]|\\[fc[0-9a-fA-F]{2}:.*\\]|\\[fd[0-9a-fA-F]{2}:.*\\]|\\[::ffff:(?:25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\\.(?:25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\\.(?:25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\\.(?:25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\\]).*([^\\s/$.?#].[^\\s]*)$"
       },
       "webhookMethod": {
         "type": "string",

diff --git a/src/configurations/destinations/webhook/ui-config.json b/src/configurations/destinations/webhook/ui-config.json
@@ -9,7 +9,7 @@
           "value": "webhookUrl",
           "required": true,
           "placeholder": "http://www.abcd.com",
-          "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(https?|ftp):\\/\\/(?!localhost|127\\.0\\.0\\.1|10\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}|192\\.168\\.\\d{1,3}\\.\\d{1,3}|172\\.(1[6-9]|2[0-9]|3[0-1])\\.\\d{1,3}\\.\\d{1,3}|0\\.0\\.0\\.0|\\[::1\\]|\\[fc[0-9a-fA-F]{2}:.*\\]|\\[fd[0-9a-fA-F]{2}:.*\\]|\\[::ffff:(?:25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\\.(?:25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\\.(?:25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\\.(?:25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\\]).*([^\\s/$.?#].[^\\s]*)$"
+          "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(https?):\\/\\/(?!localhost|127\\.0\\.0\\.1|10\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}|192\\.168\\.\\d{1,3}\\.\\d{1,3}|172\\.(1[6-9]|2[0-9]|3[0-1])\\.\\d{1,3}\\.\\d{1,3}|0\\.0\\.0\\.0|\\[::1\\]|\\[fc[0-9a-fA-F]{2}:.*\\]|\\[fd[0-9a-fA-F]{2}:.*\\]|\\[::ffff:(?:25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\\.(?:25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\\.(?:25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\\.(?:25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\\]).*([^\\s/$.?#].[^\\s]*)$"
         },
         {
           "type": "singleSelect",

diff --git a/src/configurations/sources/singer_zendesk_support/db-config.json b/src/configurations/sources/singer_zendesk_support/db-config.json
@@ -3,7 +3,7 @@
   "category": "singer-protocol",
   "displayName": "Zendesk Support",
   "options": {
-    "image": "rudderstack/source-zendesk-support:v8.2.22"
+    "image": "rudderstack/source-zendesk-support:v8.3.9"
   },
   "type": "cloudSource"
 }
diff --git a/test/data/validation/destinations/bq.json b/test/data/validation/destinations/bq.json
@@ -13,6 +13,74 @@
     },
     "result": true
   },
+  {
+    "config": {
+      "project": "test-gcs-project",
+      "location": "",
+      "bucketName": "test-bucket",
+      "prefix": "xyzxx",
+      "namespace": "eu_new3",
+      "partitionColumn": "_PARTITIONTIME",
+      "partitionType": "day",
+      "credentials": "{}",
+      "syncFrequency": "30",
+      "testConnection": false,
+      "testConnectionTS": 1621402528550
+    },
+    "result": true
+  },
+  {
+    "config": {
+      "project": "test-gcs-project",
+      "location": "",
+      "bucketName": "test-bucket",
+      "prefix": "xyzxx",
+      "namespace": "eu_new3",
+      "partitionColumn": "received_at",
+      "partitionType": "hour",
+      "credentials": "{}",
+      "syncFrequency": "30",
+      "testConnection": false,
+      "testConnectionTS": 1621402528550
+    },
+    "result": true
+  },
+  {
+    "config": {
+      "project": "test-gcs-project",
+      "location": "",
+      "bucketName": "test-bucket",
+      "prefix": "xyzxx",
+      "namespace": "eu_new3",
+      "partitionColumn": "invalid",
+      "partitionType": "day",
+      "credentials": "{}",
+      "syncFrequency": "30",
+      "testConnection": false,
+      "testConnectionTS": 1621402528550
+    },
+    "result": false,
+    "error": [
+      "partitionColumn must match pattern \"^(_PARTITIONTIME|loaded_at|received_at|timestamp)$\""
+    ]
+  },
+  {
+    "config": {
+      "project": "test-gcs-project",
+      "location": "",
+      "bucketName": "test-bucket",
+      "prefix": "xyzxx",
+      "namespace": "eu_new3",
+      "partitionColumn": "_PARTITIONTIME",
+      "partitionType": "invalid",
+      "credentials": "{}",
+      "syncFrequency": "30",
+      "testConnection": false,
+      "testConnectionTS": 1621402528550
+    },
+    "result": false,
+    "error": ["partitionType must match pattern \"^(hour|day|month|year)$\""]
+  },
   {
     "config": {
       "project": "test-gcs-project",