fix output host validator when host url is empty

elastic · Jan 2, 2024 · 1415f7e · 1415f7e
1 parent 2cddc60
commit 1415f7e
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 8 deletions.
diff --git a/...ons/fleet/sections/settings/components/edit_output_flyout/output_form_validators.test.tsx b/...ons/fleet/sections/settings/components/edit_output_flyout/output_form_validators.test.tsx
@@ -83,6 +83,12 @@ describe('Output form validation', () => {
       expect(res).toEqual([{ message: 'URL is required' }]);
     });
 
+    it('should not work with empty url', () => {
+      const res = validateESHosts(['']);
+
+      expect(res).toEqual([{ index: 0, message: 'URL is required' }]);
+    });
+
     it('should work with valid url', () => {
       const res = validateESHosts(['https://test.fr:9200']);
 
@@ -117,6 +123,11 @@ describe('Output form validation', () => {
         { index: 1, message: 'Duplicate URL' },
       ]);
     });
+    it('should return an error when invalid protocol', () => {
+      const res = validateESHosts(['ftp://test.fr']);
+
+      expect(res).toEqual([{ index: 0, message: 'Invalid protocol' }]);
+    });
   });
 
   describe('validateLogstashHosts', () => {

diff --git a/...ications/fleet/sections/settings/components/edit_output_flyout/output_form_validators.tsx b/...ications/fleet/sections/settings/components/edit_output_flyout/output_form_validators.tsx
@@ -88,14 +88,29 @@ export function validateKafkaHosts(value: string[]) {
 export function validateESHosts(value: string[]) {
   const res: Array<{ message: string; index?: number }> = [];
   const urlIndexes: { [key: string]: number[] } = {};
+  const urlRequiredMessage = i18n.translate(
+    'xpack.fleet.settings.outputForm.elasticUrlRequiredError',
+    {
+      defaultMessage: 'URL is required',
+    }
+  );
   value.forEach((val, idx) => {
     try {
       if (!val) {
-        throw new Error('Host URL required');
-      }
-      const urlParsed = new URL(val);
-      if (!['http:', 'https:'].includes(urlParsed.protocol)) {
-        throw new Error('Invalid protocol');
+        res.push({
+          message: urlRequiredMessage,
+          index: idx,
+        });
+      } else {
+        const urlParsed = new URL(val);
+        if (!['http:', 'https:'].includes(urlParsed.protocol)) {
+          res.push({
+            message: i18n.translate('xpack.fleet.settings.outputForm.invalidProtocolError', {
+              defaultMessage: 'Invalid protocol',
+            }),
+            index: idx,
+          });
+        }
       }
     } catch (error) {
       res.push({
@@ -125,9 +140,7 @@ export function validateESHosts(value: string[]) {
 
   if (value.length === 0) {
     res.push({
-      message: i18n.translate('xpack.fleet.settings.outputForm.elasticUrlRequiredError', {
-        defaultMessage: 'URL is required',
-      }),
+      message: urlRequiredMessage,
     });
   }