[Fleet] fix output host validator when host url is empty (#174086)

## Summary

Closes https://github.com/elastic/kibana/issues/174076

Fix output host url validation when url is empty.
To verify:
- Go to Add output flyout
- Click Add another URL
- Delete the second URL box
- Expect to see validation message `URL is required`

<img width="639" alt="image"
src="d5ee45f3-dd7d-43dd-8edf-9a3568b18d0d">


### Checklist

Delete any items that are not applicable to this PR.

- [x] Any text added follows [EUI's writing
guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses
sentence case text and includes [i18n
support](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)
- [x] [Unit or functional
tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)
were updated or added to match the most common scenarios
This commit is contained in:
Julia Bardi 2024-01-02 16:23:33 +01:00 committed by GitHub
parent 8b3e1d3893
commit 4df6951882
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 8 deletions

View file

@ -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', () => {

View file

@ -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,
});
}