Skip to content

Commit 9ad176c

Browse files
committed
Merge remote-tracking branch 'origin/8.19' into rest-api-spec-type-duplicates
2 parents 404cae1 + e5481f6 commit 9ad176c

28 files changed

+2829
-2834
lines changed

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));
Binary file not shown.

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/steps/validate-model.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,6 @@ export default async function validateModel (apiModel: model.Model, restSpec: Ma
214214
const existingDuplicates: Record<string, string[]> = {
215215
Action: ['indices.modify_data_stream', 'indices.update_aliases', 'watcher._types'],
216216
Actions: ['ilm._types', 'security.put_privileges', 'watcher._types'],
217-
ClusterInfo: ['cluster.allocation_explain', 'esql._types'],
218217
ComponentTemplate: ['cat.component_templates', 'cluster._types'],
219218
Context: ['_global.get_script_context', '_global.search._types', 'nodes._types'],
220219
DatabaseConfigurationMetadata: ['ingest.get_geoip_database', 'ingest.get_ip_location_database'],

0 commit comments

Comments
 (0)