From 75b0d3234152672d2a6f521670e378e8bd2173d8 Mon Sep 17 00:00:00 2001 From: dej611 Date: Thu, 18 Jan 2024 16:02:17 +0100 Subject: [PATCH] :fire: Remove validation for CCS --- .../src/esql/lib/ast/validation/errors.ts | 9 ------- .../src/esql/lib/ast/validation/types.ts | 4 ---- .../lib/ast/validation/validation.test.ts | 24 +++++-------------- .../src/esql/lib/ast/validation/validation.ts | 11 ++------- 4 files changed, 8 insertions(+), 40 deletions(-) diff --git a/packages/kbn-monaco/src/esql/lib/ast/validation/errors.ts b/packages/kbn-monaco/src/esql/lib/ast/validation/errors.ts index 16913677c4890a..ef4fd4a0fd0094 100644 --- a/packages/kbn-monaco/src/esql/lib/ast/validation/errors.ts +++ b/packages/kbn-monaco/src/esql/lib/ast/validation/errors.ts @@ -172,15 +172,6 @@ function getMessageAndTypeFromId({ }, }), }; - case 'ccsNotSupportedForCommand': - return { - message: i18n.translate('monaco.esql.validation.ccsNotSupportedForCommand', { - defaultMessage: 'ES|QL does not yet support querying remote indices [{value}]', - values: { - value: out.value, - }, - }), - }; case 'unsupportedFieldType': return { message: i18n.translate('monaco.esql.validation.unsupportedFieldType', { diff --git a/packages/kbn-monaco/src/esql/lib/ast/validation/types.ts b/packages/kbn-monaco/src/esql/lib/ast/validation/types.ts index 07b7e504ab1be1..b0a1c2857e8c54 100644 --- a/packages/kbn-monaco/src/esql/lib/ast/validation/types.ts +++ b/packages/kbn-monaco/src/esql/lib/ast/validation/types.ts @@ -108,10 +108,6 @@ export interface ValidationErrors { message: string; type: { name: string }; }; - ccsNotSupportedForCommand: { - message: string; - type: { value: string }; - }; unsupportedFieldType: { message: string; type: { field: string }; diff --git a/packages/kbn-monaco/src/esql/lib/ast/validation/validation.test.ts b/packages/kbn-monaco/src/esql/lib/ast/validation/validation.test.ts index 246b8673974201..04ce681f766a0d 100644 --- a/packages/kbn-monaco/src/esql/lib/ast/validation/validation.test.ts +++ b/packages/kbn-monaco/src/esql/lib/ast/validation/validation.test.ts @@ -272,24 +272,12 @@ describe('validation logic', () => { testErrorsAndWarnings(`from ind*ex`, []); testErrorsAndWarnings(`from indexes*`, ['Unknown index [indexes*]']); - testErrorsAndWarnings(`from remote-*:indexes*`, [ - 'ES|QL does not yet support querying remote indices [remote-*:indexes*]', - ]); - testErrorsAndWarnings(`from remote-*:indexes`, [ - 'ES|QL does not yet support querying remote indices [remote-*:indexes]', - ]); - testErrorsAndWarnings(`from remote-ccs:indexes`, [ - 'ES|QL does not yet support querying remote indices [remote-ccs:indexes]', - ]); - testErrorsAndWarnings(`from a, remote-ccs:indexes`, [ - 'ES|QL does not yet support querying remote indices [remote-ccs:indexes]', - ]); - testErrorsAndWarnings(`from remote-ccs:indexes [METADATA _id]`, [ - 'ES|QL does not yet support querying remote indices [remote-ccs:indexes]', - ]); - testErrorsAndWarnings(`from *:indexes [METADATA _id]`, [ - 'ES|QL does not yet support querying remote indices [*:indexes]', - ]); + testErrorsAndWarnings(`from remote-*:indexes*`, []); + testErrorsAndWarnings(`from remote-*:indexes`, []); + testErrorsAndWarnings(`from remote-ccs:indexes`, []); + testErrorsAndWarnings(`from a, remote-ccs:indexes`, []); + testErrorsAndWarnings(`from remote-ccs:indexes [METADATA _id]`, []); + testErrorsAndWarnings(`from *:indexes [METADATA _id]`, []); testErrorsAndWarnings('from .secretIndex', []); testErrorsAndWarnings('from my-index', []); }); diff --git a/packages/kbn-monaco/src/esql/lib/ast/validation/validation.ts b/packages/kbn-monaco/src/esql/lib/ast/validation/validation.ts index b1a2a53be7acf1..744e63cc6bb13a 100644 --- a/packages/kbn-monaco/src/esql/lib/ast/validation/validation.ts +++ b/packages/kbn-monaco/src/esql/lib/ast/validation/validation.ts @@ -482,16 +482,9 @@ function validateSource( }) ); } else { + // give up on validate if CCS for now const hasCCS = hasCCSSource(source.name); - if (hasCCS) { - messages.push( - getMessageFromId({ - messageId: 'ccsNotSupportedForCommand', - values: { value: source.name }, - locations: source.location, - }) - ); - } else { + if (!hasCCS) { const isWildcardAndNotSupported = hasWildcard(source.name) && !commandDef.signature.params.some(({ wildcards }) => wildcards); if (isWildcardAndNotSupported) {