chore: addressed review comments

rudderlabs · Feb 4, 2025 · afa365f · afa365f
1 parent 8d6b15b
commit afa365f
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 11 deletions.
diff --git a/src/configurations/destinations/bloomreach/schema.json b/src/configurations/destinations/bloomreach/schema.json
@@ -6,7 +6,7 @@
     "properties": {
       "apiBaseUrl": {
         "type": "string",
-        "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(?:http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]+$"
+        "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(?:http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]{1,500}$"
       },
       "apiKey": {
         "type": "string",

diff --git a/src/configurations/destinations/bloomreach/ui-config.json b/src/configurations/destinations/bloomreach/ui-config.json
@@ -23,7 +23,7 @@
                     "label": "API Base URL",
                     "note": "URL of the Bloomreach instance",
                     "configKey": "apiBaseUrl",
-                    "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(?:http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]+$",
+                    "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(?:http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]{1,500}$",
                     "regexErrorMessage": "Invalid API Base URl",
                     "placeholder": "e.g. https://demoapp-api.bloomreach.com"
                   },

diff --git a/src/configurations/destinations/bloomreach_catalog/schema.json b/src/configurations/destinations/bloomreach_catalog/schema.json
@@ -6,7 +6,7 @@
     "properties": {
       "apiBaseUrl": {
         "type": "string",
-        "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(?:http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]+$"
+        "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(?:http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]{1,500}$"
       },
       "apiKey": {
         "type": "string",

diff --git a/src/configurations/destinations/bloomreach_catalog/ui-config.json b/src/configurations/destinations/bloomreach_catalog/ui-config.json
@@ -23,7 +23,7 @@
                     "label": "API Base URL",
                     "note": "URL of the Bloomreach instance",
                     "configKey": "apiBaseUrl",
-                    "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(?:http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]+$",
+                    "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(?:http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]{1,500}$",
                     "regexErrorMessage": "Invalid API Base URl",
                     "placeholder": "e.g. https://demoapp-api.bloomreach.com"
                   },

diff --git a/src/configurations/destinations/cordial/schema.json b/src/configurations/destinations/cordial/schema.json
@@ -10,7 +10,7 @@
       },
       "apiBaseUrl": {
         "type": "string",
-        "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(?:http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]+$"
+        "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(?:http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]{1,500}$"
       },
       "oneTrustCookieCategories": {
         "type": "object",

diff --git a/src/configurations/destinations/cordial/ui-config.json b/src/configurations/destinations/cordial/ui-config.json
@@ -31,7 +31,7 @@
                     "label": "API Base URL",
                     "note": "You can find out which one your account uses by navigating to your Cordial dashboard and checking the website URL.",
                     "configKey": "apiBaseUrl",
-                    "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(?:http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]+$",
+                    "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(?:http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]{1,500}$",
                     "regexErrorMessage": "Invalid API Base URl",
                     "placeholder": "e.g. https://usw2.admin.cordial.io"
                   }

diff --git a/src/configurations/destinations/movable_ink/schema.json b/src/configurations/destinations/movable_ink/schema.json
@@ -6,7 +6,7 @@
     "properties": {
       "endpoint": {
         "type": "string",
-        "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(?:http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]+$"
+        "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(?:http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]{1,500}$"
       },
       "accessKey": {
         "type": "string",

diff --git a/src/configurations/destinations/movable_ink/ui-config.json b/src/configurations/destinations/movable_ink/ui-config.json
@@ -17,7 +17,7 @@
                     "label": "Endpoint",
                     "note": "The Movable Ink Endpoint to which data will be sent",
                     "configKey": "endpoint",
-                    "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(?:http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]+$",
+                    "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(?:http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]{1,500}$",
                     "regexErrorMessage": "Invalid Endpoint",
                     "placeholder": "e.g: https://collector.movableink-dmz.com/behavioral/12***"
                   },

diff --git a/src/configurations/destinations/optimizely_fullstack/schema.json b/src/configurations/destinations/optimizely_fullstack/schema.json
@@ -6,7 +6,7 @@
     "properties": {
       "dataFileUrl": {
         "type": "string",
-        "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(?:http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]+$"
+        "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(?:http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]{1,500}$"
       },
       "accountId": {
         "type": "string",

diff --git a/src/configurations/destinations/optimizely_fullstack/ui-config.json b/src/configurations/destinations/optimizely_fullstack/ui-config.json
@@ -23,7 +23,7 @@
                     "label": "Datafile URL",
                     "note": "Your datafile URL From Settings -> Environments",
                     "configKey": "dataFileUrl",
-                    "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(?:http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]+$",
+                    "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(?:http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]{1,500}$",
                     "regexErrorMessage": "Invalid Datafile URL",
                     "placeholder": "e.g. https://cdn.optimizely.com/json/3Cee2qXeMgXXXXk8Sh5qX.json",
                     "preRequisites": {

diff --git a/test/data/validation/destinations/movable_ink.json b/test/data/validation/destinations/movable_ink.json
@@ -15,7 +15,7 @@
     },
     "result": false,
     "err": [
-      "endpoint must match pattern \"(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(?:http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]+$\""
+      "endpoint must match pattern \"(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(?:http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]{1,500}$\""
     ]
   },
   {