Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove ES|QL version #2569

Merged
merged 2 commits into from
May 22, 2024
Merged

Remove ES|QL version #2569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b6dbe2
Remove ES|QL version
swallez May 22, 2024
0c4a7fc
Make linter happy
swallez May 22, 2024
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
5 changes: 1 addition & 4 deletions compiler/src/steps/validate-model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,7 @@ export default async function validateModel (apiModel: model.Model, restSpec: Ma

const additionalRoots: TypeName[] = [
// ErrorResponse is not referenced anywhere, but any API could return it if an error happens.
{ namespace: '_types', name: 'ErrorResponseBase' },
// ESQL base versions are pseudo-constants
{ namespace: 'esql._types', name: 'BaseStatefulEsqlVersion' },
{ namespace: 'esql._types', name: 'BaseServerlessEsqlVersion' }
{ namespace: '_types', name: 'ErrorResponseBase' }
]
additionalRoots.forEach(t => validateTypeRef(t, undefined, new Set()))

Expand Down
12 changes: 1 addition & 11 deletions output/openapi/elasticsearch-serverless-openapi.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

55 changes: 1 addition & 54 deletions output/schema/schema.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 0 additions & 7 deletions output/typescript/types.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

48 changes: 0 additions & 48 deletions specification/esql/_types/EsqlVersion.ts
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions specification/esql/query/QueryRequest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import { RequestBase } from '@_types/Base'
import { QueryContainer } from '@_types/query_dsl/abstractions'
import { ScalarValue } from '@_types/common'
import { EsqlVersion } from '@esql/_types/EsqlVersion'

/**
* Executes an ES|QL request
Expand Down Expand Up @@ -62,9 +61,5 @@ export interface Request extends RequestBase {
* The ES|QL query API accepts an ES|QL query string in the query parameter, runs it, and returns the results.
*/
query: string
/**
* The version of the ES|QL language in which the "query" field was written.
*/
version: EsqlVersion
}
}
Loading