Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
0e937a9
Merge branch 'main' of github.com:elastic/kibana
drewdaemon Feb 6, 2025
7ffbf4c
Merge branch 'main' of github.com:elastic/kibana
drewdaemon Feb 10, 2025
b426318
Merge branch 'main' of github.com:elastic/kibana
drewdaemon Feb 13, 2025
511ccaa
Merge branch 'main' of github.com:elastic/kibana
drewdaemon Feb 14, 2025
2d71300
Merge branch 'main' of github.com:elastic/kibana
drewdaemon Feb 18, 2025
0076de9
Merge branch 'main' of github.com:elastic/kibana
drewdaemon Feb 21, 2025
2898ce1
Merge branch 'main' of github.com:elastic/kibana
drewdaemon Feb 24, 2025
ace0009
Merge branch 'main' of github.com:elastic/kibana
drewdaemon Mar 3, 2025
6cdd8c1
Merge branch 'main' of github.com:elastic/kibana
drewdaemon Mar 4, 2025
98616e9
Merge branch 'main' of github.com:elastic/kibana
drewdaemon Mar 6, 2025
64e40fd
Merge branch 'main' of github.com:elastic/kibana
drewdaemon Mar 7, 2025
1e3f8d1
Merge branch 'main' of github.com:elastic/kibana
drewdaemon Mar 11, 2025
afd5630
Merge branch 'main' of github.com:elastic/kibana
drewdaemon Mar 13, 2025
31c6cb3
Merge branch 'main' of github.com:elastic/kibana
drewdaemon Mar 18, 2025
08f4b1b
Merge branch 'main' of github.com:elastic/kibana
drewdaemon Mar 18, 2025
0c11f55
Merge branch 'main' of github.com:elastic/kibana
drewdaemon Mar 20, 2025
de2bc7a
Merge branch 'main' of github.com:elastic/kibana
drewdaemon Mar 21, 2025
828d142
Merge branch 'main' of github.com:elastic/kibana
drewdaemon Mar 25, 2025
34bd1ef
Merge branch 'main' of github.com:elastic/kibana
drewdaemon Apr 1, 2025
f0070c6
Merge branch 'main' of github.com:elastic/kibana
drewdaemon Apr 3, 2025
16a27c7
Merge branch 'main' of github.com:elastic/kibana
drewdaemon Apr 3, 2025
cde697e
Merge branch 'main' of github.com:elastic/kibana
drewdaemon Apr 8, 2025
8b66178
Merge branch 'main' of github.com:elastic/kibana
drewdaemon Apr 10, 2025
3555b0c
Merge branch 'main' of github.com:elastic/kibana
drewdaemon Apr 14, 2025
57a5f4a
Merge branch 'main' of github.com:elastic/kibana
drewdaemon Apr 16, 2025
420eb2b
Merge branch 'main' of github.com:elastic/kibana
drewdaemon Apr 29, 2025
8e5e4a8
Merge branch 'main' of github.com:elastic/kibana
drewdaemon May 5, 2025
141765f
Merge branch 'main' of github.com:elastic/kibana
drewdaemon May 21, 2025
cdf4d20
Merge branch 'main' of github.com:elastic/kibana
drewdaemon May 23, 2025
d177eb1
Merge branch 'main' of github.com:elastic/kibana
drewdaemon May 28, 2025
4fd1791
Merge branch 'main' of github.com:elastic/kibana
drewdaemon Jun 4, 2025
aa1c776
Merge branch 'main' of github.com:elastic/kibana
drewdaemon Jun 5, 2025
5fe324c
Merge branch 'main' of github.com:elastic/kibana
drewdaemon Jun 9, 2025
6dfd40a
Merge branch 'main' of github.com:elastic/kibana
drewdaemon Jul 15, 2025
5b804dc
Merge branch 'main' of github.com:elastic/kibana
drewdaemon Jul 17, 2025
072394a
Merge branch 'main' of github.com:elastic/kibana
drewdaemon Jul 23, 2025
b0929bf
Merge branch 'main' of github.com:elastic/kibana
drewdaemon Jul 29, 2025
e1611aa
Merge branch 'main' of github.com:elastic/kibana
drewdaemon Jul 30, 2025
a56c928
remove fields shadowing check
drewdaemon Jul 30, 2025
e82f11e
remove wildcard validation
drewdaemon Jul 30, 2025
1c56b1b
remove all function-specific validation
drewdaemon Jul 31, 2025
ab71567
remove some STATS-specific checks
drewdaemon Jul 31, 2025
7c3dc52
update test
drewdaemon Jul 31, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
*/
import type { RecursivePartial } from '@kbn/utility-types';
import { FunctionDefinition, FunctionDefinitionTypes } from '../src/definitions/types';
import { validateLogFunctions } from './validators';
import {
defaultScalarFunctionLocations,
dateDiffSuggestions,
Expand Down Expand Up @@ -48,12 +47,6 @@ export const extraFunctions: FunctionDefinition[] = [
* and, hence, won't be present in the JSON file.
*/
export const functionEnrichments: Record<string, RecursivePartial<FunctionDefinition>> = {
log10: {
validate: validateLogFunctions,
},
log: {
validate: validateLogFunctions,
},
date_diff: {
signatures: [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import {
} from '../src/definitions/types';
import { Location } from '../src/commands_registry/types';
import { FULL_TEXT_SEARCH_FUNCTIONS } from '../src/definitions/constants';
import { mathValidators } from './validators';
import {
aliasTable,
aliases,
Expand Down Expand Up @@ -149,7 +148,6 @@ const enrichGrouping = (
const enrichOperators = (
operatorsFunctionDefinitions: FunctionDefinition[]
): FunctionDefinition[] => {
// @ts-expect-error Stringified version of the validator function
return operatorsFunctionDefinitions.map((op) => {
const isMathOperator = MATH_OPERATORS.includes(op.name);
const isComparisonOperator = COMPARISON_OPERATORS.includes(op.name);
Expand Down Expand Up @@ -231,7 +229,6 @@ const enrichOperators = (
// so we are overriding to add proper support
locationsAvailable,
type: FunctionDefinitionTypes.OPERATOR,
validate: mathValidators[op.name],
};
});
};
Expand Down Expand Up @@ -315,7 +312,6 @@ const ${getDefinitionName(name)}: FunctionDefinition = {
signatures: ${JSON.stringify(signatures, null, 2)},
locationsAvailable: [${locationsAvailable.join(', ')}],
${licenseField}
validate: ${functionDefinition.validate || 'undefined'},
examples: ${JSON.stringify(functionDefinition.examples || [])},${
customParametersSnippet
? `\ncustomParametersSnippet: ${JSON.stringify(customParametersSnippet)},`
Expand Down Expand Up @@ -346,17 +342,6 @@ const ${getDefinitionName(name)}: FunctionDefinition = {
import { i18n } from '@kbn/i18n';
import { Location } from '../../commands_registry/types';
import { type FunctionDefinition, FunctionDefinitionTypes } from '../types';
${
functionsType === FunctionDefinitionTypes.SCALAR
? `import type { ESQLFunction } from '../../types';
import { isLiteral } from '../../ast/is';;`
: ''
}
${
functionsType === FunctionDefinitionTypes.OPERATOR
? `import { isNumericType } from '../types';`
: ''
}



Expand Down
88 changes: 0 additions & 88 deletions src/platform/packages/shared/kbn-esql-ast/scripts/validators.ts

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,6 @@ describe('ENRICH Validation', () => {
enrichExpectErrors('from a_index | enrich `this``is fine`', ['Unknown policy [`this``is]']);
enrichExpectErrors('from a_index | enrich this is fine', ['Unknown policy [this]']);
enrichExpectErrors(`from a_index |enrich missing-policy `, ['Unknown policy [missing-policy]']);
enrichExpectErrors('from a_index | enrich my-pol*', [
'Using wildcards (*) in ENRICH is not allowed [my-pol*]',
]);
});

test('validates the columns', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@ import { ENRICH_MODES } from './util';
import type { ESQLPolicy, ICommandContext, ICommandCallbacks } from '../../types';
import { validateCommandArguments } from '../../../definitions/utils/validation';

function hasWildcard(name: string) {
return /\*/.test(name);
}

export const validate = (
command: ESQLCommand,
ast: ESQLAst,
Expand All @@ -28,24 +24,14 @@ export const validate = (
const index = source.index;
const policies = context?.policies || new Map<string, ESQLPolicy>();

if (index) {
if (hasWildcard(index.valueUnquoted)) {
messages.push(
getMessageFromId({
messageId: 'wildcardNotSupportedForCommand',
values: { command: 'ENRICH', value: index.valueUnquoted },
locations: index.location,
})
);
} else if (!policies.has(index.valueUnquoted)) {
messages.push(
getMessageFromId({
messageId: 'unknownPolicy',
values: { name: index.valueUnquoted },
locations: index.location,
})
);
}
if (index && !policies.has(index.valueUnquoted)) {
messages.push(
getMessageFromId({
messageId: 'unknownPolicy',
values: { name: index.valueUnquoted },
locations: index.location,
})
);
}

if (cluster) {
Expand Down
Loading