Skip to content

Commit 2afc320

Browse files
committed
Merge branch 'main' of github.com:elastic/elasticsearch-specification into sagemaker
2 parents 5c7b57d + cf6914e commit 2afc320

File tree

62 files changed

+7973
-3669
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+7973
-3669
lines changed

.github/workflows/generate.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
- 'main'
77
- '7.17'
88
- '8.[0-9]+'
9+
- '9.[0-9]+'
910

1011
# For debugging purposes:
1112
# pull_request:

compiler-rs/clients_schema_to_openapi/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,10 @@ pub fn product_meta_as_extensions(namespace: &str, product_meta: &IndexMap<Strin
191191
additional_namespace = format!(", {meta}");
192192
}
193193

194-
let product_str = format!("elasticsearch{additional_namespace}");
194+
let product_str = format!("Elasticsearch{additional_namespace}");
195195
let mut product_feature_list: Vec<Value> = Vec::new();
196196
let mut product_feature: Map<String, Value> = Map::new();
197-
product_feature.insert("name".to_string(),Value::String("x-product-feature".to_string()));
197+
product_feature.insert("name".to_string(),Value::String("product_name".to_string()));
198198
product_feature.insert("content".to_string(),Value::String(product_str));
199199
product_feature_list.push(Value::Object(product_feature));
200200
result.insert("x-metaTags".to_string(), Value::Array(product_feature_list));

compiler-rs/compiler-wasm-lib/pkg/compiler_wasm_lib.js

Lines changed: 49 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
3.5 KB
Binary file not shown.

compiler-rs/compiler-wasm-lib/pkg/compiler_wasm_lib_bg.wasm.d.ts

Lines changed: 2 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

compiler/package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

compiler/src/validation-errors.ts

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
* under the License.
1818
*/
1919

20+
const IGNORED_ERRORS = [
21+
"request definition xpack.info:Request / query - Property 'human' is already defined in an ancestor class"
22+
]
23+
2024
/** Errors for an endpoint */
2125
export class EndpointError {
2226
request: string[]
@@ -35,6 +39,10 @@ export class ValidationErrors {
3539

3640
/** Add some error information relative to an endpoint's request or response */
3741
addEndpointError (endpoint: string, part: 'request' | 'response', message: string): void {
42+
if (IGNORED_ERRORS.includes(message)) {
43+
return
44+
}
45+
3846
let error = this.endpointErrors[endpoint]
3947
if (error == null) {
4048
error = { request: [], response: [] }
@@ -54,10 +62,8 @@ export class ValidationErrors {
5462
let count = 0
5563
const logArray = function (errs: string[], prefix = ''): void {
5664
for (const err of errs) {
57-
if (err !== 'Missing request & response') {
58-
console.error(`${prefix}${err}`)
59-
count++
60-
}
65+
console.error(`${prefix}${err}`)
66+
count++
6167
}
6268
}
6369

0 commit comments

Comments
 (0)