fix: added regexes in UI

rudderlabs · Sep 15, 2024 · e34eff3 · e34eff3
1 parent 9c7c5fe
commit e34eff3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/src/configurations/destinations/amazon_audience/db-config.json b/src/configurations/destinations/amazon_audience/db-config.json
@@ -10,6 +10,7 @@
       "cloud": ["cloud"],
       "warehouse": ["cloud"]
     },
+    "isAudienceSupported": true,
     "supportsBlankAudienceCreation": true,
     "syncBehaviours": ["mirror"],
     "disableJsonMapper": true,

diff --git a/src/configurations/destinations/amazon_audience/schema.json b/src/configurations/destinations/amazon_audience/schema.json
@@ -2,7 +2,7 @@
   "configSchema": {
     "$schema": "http://json-schema.org/draft-07/schema#",
     "type": "object",
-    "required": ["advertiserId"],
+    "required": ["authServer"],
     "properties": {
       "authServer": {
         "type": "string",
@@ -25,18 +25,18 @@
         "type": "boolean",
         "default": false
       },
-      "dataSourceCountry": {
+      "dataSourceCountry":  {
         "type": "array",
         "items": {
           "type": "object",
           "properties": {
             "country": {
               "type": "string",
-              "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,5})$"
+              "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
             }
           }
         }
-      },
+      } ,
       "connectionMode": {
         "type": "object",
         "properties": {

diff --git a/src/configurations/destinations/amazon_audience/ui-config.json b/src/configurations/destinations/amazon_audience/ui-config.json
@@ -22,7 +22,7 @@
                     "preRequisites": {
                       "fields": [
                         {
-                          "configKey": "rudderAdvertiserId",
+                          "configKey": "rudderAccountId",
                           "exists": true
                         }
                       ]
@@ -95,13 +95,17 @@
                     "type": "textInput",
                     "label": "Type External Audience Id to use while creating Audience",
                     "placeholder": "Default: Rudderstack Audience",
+                    "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,50})$",
+                    "regexErrorMessage": "Invalid External Audience Id",
                     "default": "Rudderstack Audience"
                   },
                   {
                     "configKey": "ttl",
                     "type": "textInput",
                     "label": "Time To Live",
                     "placeholder": "Default: 34300800(13 Months)",
+                    "regexErrorMessage": "ttl should be in number",
+                    "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^[0-9]\\d*$",
                     "note": [
                       "Refer below link for more info",
                       {

diff --git a/test/data/validation/destinations/amazon_audience.json b/test/data/validation/destinations/amazon_audience.json
@@ -22,9 +22,10 @@
     "testTitle": "With missing accountId",
     "config": {
       "rudderAccountId": "test-host",
-      "audienceId": "test-audience-id"
+      "audienceId": "test-audience-id",
+      "advertiserId": ""
     },
     "result": false,
-    "err": [" must have required property 'advertiserId'"]
+    "err": ["advertiserId must match pattern \"(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,50})$\""]
   }
 ]