Merge branch 'develop' into feat.bq-custom-partition

rudderlabs · Sep 30, 2024 · 41e28b2 · 41e28b2
2 parents e0ab84b + 6ac3dd6
commit 41e28b2
Show file tree

Hide file tree

Showing 6 changed files with 182 additions and 14 deletions.
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/singular/ui-config.json b/src/configurations/destinations/singular/ui-config.json
@@ -43,14 +43,6 @@
           "label": "Match ID mapping",
           "value": "match_id",
           "required": false,
-          "preRequisites": {
-            "featureFlags": [
-              {
-                "configKey": "AMP_enable-singular-matchid",
-                "value": true
-              }
-            ]
-          },
           "options": [
             {
               "name": "Map match ID to context.device.advertisingId",

diff --git a/src/configurations/sources/singer_shopify/db-config.json b/src/configurations/sources/singer_shopify/db-config.json
@@ -3,7 +3,7 @@
   "category": "singer-protocol",
   "displayName": "Shopify",
   "options": {
-    "image": "rudderstack/source-shopify:v8.2.9"
+    "image": "rudderstack/source-shopify:v8.3.7"
   },
   "type": "cloudSource"
 }
diff --git a/test/data/validation/destinations/rs.json b/test/data/validation/destinations/rs.json
@@ -125,11 +125,117 @@
     "result": false,
     "err": [
       " must have required property 'clusterId'",
+      " must have required property 'workgroupName'",
+      " must have required property 'useServerless'",
+      " must match a schema in anyOf",
       " must have required property 'clusterRegion'",
       " must have required property 'iamRoleARNForAuth'",
       " must match \"then\" schema"
     ]
   },
+  {
+    "config": {
+      "host": "",
+      "password": "",
+      "port": "",
+      "database": "test-database",
+      "user": "test-user",
+      "useIAMForAuth": true,
+      "useServerless": false,
+      "iamRoleARNForAuth": "iamRoleARNForAuth",
+      "clusterId": "clusterId",
+      "clusterRegion": "clusterRegion",
+      "useSSH": false,
+      "syncFrequency": "30",
+      "enableSSE": false,
+      "useRudderStorage": false,
+      "useSTSTokens": false,
+      "bucketName": "test-bucket",
+      "roleBasedAuth": false,
+      "accessKeyID": "",
+      "accessKey": ""
+    },
+    "result": true
+  },
+  {
+    "config": {
+      "host": "",
+      "password": "",
+      "port": "",
+      "database": "test-database",
+      "user": "test-user",
+      "useIAMForAuth": true,
+      "useServerless": true,
+      "iamRoleARNForAuth": "iamRoleARNForAuth",
+      "clusterId": "clusterId",
+      "clusterRegion": "clusterRegion",
+      "useSSH": false,
+      "syncFrequency": "30",
+      "enableSSE": false,
+      "useRudderStorage": false,
+      "useSTSTokens": false,
+      "bucketName": "test-bucket",
+      "roleBasedAuth": false,
+      "accessKeyID": "",
+      "accessKey": ""
+    },
+    "result": false,
+    "err": [
+      "useServerless must be equal to constant",
+      " must have required property 'workgroupName'",
+      " must match a schema in anyOf",
+      " must match \"then\" schema"
+    ]
+  },
+  {
+    "config": {
+      "host": "",
+      "password": "",
+      "port": "",
+      "database": "test-database",
+      "user": "test-user",
+      "useIAMForAuth": true,
+      "useServerless": true,
+      "iamRoleARNForAuth": "iamRoleARNForAuth",
+      "workgroupName": "workgroupName",
+      "clusterRegion": "clusterRegion",
+      "useSSH": false,
+      "syncFrequency": "30",
+      "enableSSE": false,
+      "useRudderStorage": false,
+      "useSTSTokens": false,
+      "bucketName": "test-bucket",
+      "roleBasedAuth": false,
+      "accessKeyID": "",
+      "accessKey": ""
+    },
+    "result": true
+  },
+  {
+    "config": {
+      "host": "",
+      "password": "",
+      "port": "",
+      "database": "test-database",
+      "user": "test-user",
+      "useIAMForAuth": true,
+      "useServerless": true,
+      "iamRoleARNForAuth": "iamRoleARNForAuth",
+      "clusterId": "clusterId",
+      "workgroupName": "workgroupName",
+      "clusterRegion": "clusterRegion",
+      "useSSH": false,
+      "syncFrequency": "30",
+      "enableSSE": false,
+      "useRudderStorage": false,
+      "useSTSTokens": false,
+      "bucketName": "test-bucket",
+      "roleBasedAuth": false,
+      "accessKeyID": "",
+      "accessKey": ""
+    },
+    "result": true
+  },
   {
     "config": {
       "host": "test-host",