feat: updated regex and added in schema json

rudderlabs · Dec 3, 2024 · 4630789 · 4630789
1 parent 4d6a795
commit 4630789
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 41 deletions.
diff --git a/src/configurations/destinations/http/schema.json b/src/configurations/destinations/http/schema.json
@@ -34,11 +34,11 @@
           "properties": {
             "from": {
               "type": "string",
-              "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
+              "pattern": "^\\$(\\.(\\w+|\\*)|\\[\\d+\\]|\\[('\\w+'|\"\\w+\")\\]|\\[\\*\\]|\\.\\w+\\(\\))*$"
             },
             "to": {
               "type": "string",
-              "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
+              "pattern": "^\\$(\\.(\\w+|\\*)|\\[\\d+\\]|\\[('\\w+'|\"\\w+\")\\]|\\[\\*\\]|\\.\\w+\\(\\))*$|^(?!\\$).{0,100}$"
             }
           }
         }
@@ -48,13 +48,13 @@
         "items": {
           "type": "object",
           "properties": {
-            "from": {
+            "to": {
               "type": "string",
-              "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
+              "pattern": "^(?!\\$).{0,100}$"
             },
-            "to": {
+            "from": {
               "type": "string",
-              "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
+              "pattern": "^\\$(\\.(\\w+|\\*)|\\[\\d+\\]|\\[('\\w+'|\"\\w+\")\\]|\\[\\*\\]|\\.\\w+\\(\\))*$|^(?!\\$).{0,100}$"
             }
           }
         }
@@ -64,13 +64,13 @@
         "items": {
           "type": "object",
           "properties": {
-            "from": {
+            "to": {
               "type": "string",
-              "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
+              "pattern": "^(?!\\$).{0,100}$"
             },
-            "to": {
+            "from": {
               "type": "string",
-              "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
+              "pattern": "^\\$(\\.(\\w+|\\*)|\\[\\d+\\]|\\[('\\w+'|\"\\w+\")\\]|\\[\\*\\]|\\.\\w+\\(\\))*$|^(?!\\$).{0,100}$"
             }
           }
         }

diff --git a/src/configurations/destinations/http/ui-config.json b/src/configurations/destinations/http/ui-config.json
@@ -531,15 +531,15 @@
                     "type": "textInput",
                     "key": "from",
                     "label": "RudderStack",
-                    "regex": "^\\$((\\.[a-zA-Z_][a-zA-Z0-9_]*)|(\\[\\d+\\])|(\\[\\'.*?\\'\\])|(\\[\\\".*?\\\"\\]))*$\n",
+                    "regex": "^\\$(\\.(\\w+|\\*)|\\[\\d+\\]|\\[('\\w+'|\"\\w+\")\\]|\\[\\*\\]|\\.\\w+\\(\\))*$",
                     "regexErrorMessage": "Invalid RudderStack parameter",
                     "placeholder": "e.g: $.properties.key1"
                   },
                   {
                     "type": "textInput",
                     "key": "to",
                     "label": "HTTP",
-                    "regex": "^\\$((\\.[a-zA-Z_][a-zA-Z0-9_]*)|(\\[\\d+\\])|(\\[\\'.*?\\'\\])|(\\[\\\".*?\\\"\\]))*$|^[a-zA-Z_][a-zA-Z0-9_]*$\n",
+                    "regex": "^\\$(\\.(\\w+|\\*)|\\[\\d+\\]|\\[('\\w+'|\"\\w+\")\\]|\\[\\*\\]|\\.\\w+\\(\\))*$|^(?!\\$).{0,100}$",
                     "regexErrorMessage": "Invalid HTTP parameter",
                     "placeholder": "e.g: $.events.key2"
                   }
@@ -561,13 +561,15 @@
                     "type": "textInput",
                     "key": "to",
                     "label": "Key",
+                    "regex": "^(?!\\$).{0,100}$",
+                    "regexErrorMessage": "Invalid parameter",
                     "placeholder": "e.g: customerId"
                   },
                   {
                     "type": "textInput",
                     "key": "from",
                     "label": "Value",
-                    "regex": "^\\$((\\.[a-zA-Z_][a-zA-Z0-9_]*)|(\\[\\d+\\])|(\\[\\'.*?\\'\\])|(\\[\\\".*?\\\"\\]))*$|^[a-zA-Z_][a-zA-Z0-9_]*$\n",
+                    "regex": "^\\$(\\.(\\w+|\\*)|\\[\\d+\\]|\\[('\\w+'|\"\\w+\")\\]|\\[\\*\\]|\\.\\w+\\(\\))*$|^(?!\\$).{0,100}$",
                     "regexErrorMessage": "Invalid HTTP parameter",
                     "placeholder": "e.g: $.userId or \"userId\""
                   }
@@ -589,13 +591,15 @@
                     "type": "textInput",
                     "key": "to",
                     "label": "Key",
+                    "regex": "^(?!\\$).{0,100}$",
+                    "regexErrorMessage": "Invalid parameter",
                     "placeholder": "e.g. content-type"
                   },
                   {
                     "type": "textInput",
                     "key": "from",
                     "label": "Value",
-                    "regex": "^\\$((\\.[a-zA-Z_][a-zA-Z0-9_]*)|(\\[\\d+\\])|(\\[\\'.*?\\'\\])|(\\[\\\".*?\\\"\\]))*$|^[a-zA-Z_][a-zA-Z0-9_]*$\n",
+                    "regex": "^\\$(\\.(\\w+|\\*)|\\[\\d+\\]|\\[('\\w+'|\"\\w+\")\\]|\\[\\*\\]|\\.\\w+\\(\\))*$|^(?!\\$).{0,100}$",
                     "regexErrorMessage": "Invalid parameter",
                     "placeholder": "e.g. \"application/json\""
                   }

diff --git a/test/data/validation/destinations/http.json b/test/data/validation/destinations/http.json
@@ -17,22 +17,22 @@
       "maxBatchSize": "10",
       "headers": [
         {
-          "to": "$.h1",
-          "from": "'val1'"
+          "to": "val",
+          "from": "adfg"
         },
         {
-          "to": "$.h2",
+          "to": "val2",
           "from": "2"
         },
         {
-          "to": "$.h3",
+          "to": "auth",
           "from": "$.properties.testProp"
         }
       ],
       "queryParams": [
         {
-          "to": "$.q1",
-          "from": "'val1'"
+          "from": "$.q1",
+          "to": "'val1'"
         }
       ],
       "propertiesMapping": [
@@ -254,22 +254,22 @@
       "maxBatchSize": "10",
       "headers": [
         {
-          "to": "$.h1",
-          "from": "'val1'"
+          "from": "$.h1",
+          "to": "'val1'"
         },
         {
-          "to": "$.h2",
-          "from": "2"
+          "from": "$.h2",
+          "to": "2"
         },
         {
-          "to": "$.h3",
+          "to": "testProp",
           "from": "$.properties.testProp"
         }
       ],
       "queryParams": [
         {
-          "to": "$.q1",
-          "from": "'val1'"
+          "from": "$.q1",
+          "to": "'val1'"
         }
       ],
       "propertiesMapping": [
@@ -421,22 +421,22 @@
       "maxBatchSize": "10",
       "headers": [
         {
-          "to": "$.h1",
-          "from": "'val1'"
+          "from": "$.h1",
+          "to": "'val1'"
         },
         {
-          "to": "$.h2",
-          "from": "2"
+          "from": "$.h2",
+          "to": "2"
         },
         {
-          "to": "$.h3",
+          "to": "testProp",
           "from": "$.properties.testProp"
         }
       ],
       "queryParams": [
         {
-          "to": "$.q1",
-          "from": "'val1'"
+          "from": "$.q1",
+          "to": "'val1'"
         }
       ],
       "propertiesMapping": [
@@ -483,22 +483,22 @@
       "maxBatchSize": "10",
       "headers": [
         {
-          "to": "$.h1",
-          "from": "'val1'"
+          "from": "$.h1",
+          "to": "'val1'"
         },
         {
-          "to": "$.h2",
-          "from": "2"
+          "from": "$.h2",
+          "to": "2"
         },
         {
-          "to": "$.h3",
+          "to": "testProp",
           "from": "$.properties.testProp"
         }
       ],
       "queryParams": [
         {
-          "to": "$.q1",
-          "from": "'val1'"
+          "from": "$.q1",
+          "to": "'val1'"
         }
       ],
       "propertiesMapping": [