Skip to content

Commit

Permalink
[Deprecation] Deprecate master_timeout in favor of cluster_manager_ti…
Browse files Browse the repository at this point in the history 
…meout (#1788) (#1794)

As part of the meta issue opensearch-project/OpenSearch#2589 to track the plan and progress of applying inclusive naming across OpenSearch Repositories.

Includes updates from generation with the removal of type.

Issues:
#1685
#1290

Signed-off-by: Manasvini B Suryanarayana <[email protected]>
(cherry picked from commit c659831)

Co-authored-by: Manasvini B Suryanarayana <[email protected]>
  • Loading branch information
@opensearch-trigger-bot @manasvinibs
opensearch-trigger-bot[bot] and manasvinibs authored Jun 24, 2022
1 parent 1592b22 commit f0446b8
Show file tree
Hide file tree
Showing 54 changed files with 78 additions and 37 deletions.
1 change: 1 addition & 0 deletions packages/osd-spec-to-console/test/fixtures/cluster_health_autocomplete.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
],
"local": "__flag__",
"master_timeout": "",
"cluster_manager_timeout": "",
"timeout": "",
"wait_for_active_shards": "",
"wait_for_nodes": "",
Expand Down
4 changes: 4 additions & 0 deletions packages/osd-spec-to-console/test/fixtures/cluster_health_spec.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@
"type":"time",
"description":"Explicit operation timeout for connection to master node"
},
"cluster_manager_timeout":{
"type":"time",
"description":"Explicit operation timeout for connection to cluster manager node"
},
"timeout":{
"type":"time",
"description":"Explicit operation timeout"
Expand Down
3 changes: 2 additions & 1 deletion src/plugins/console/server/lib/spec_definitions/json/generated/cat.allocation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"bytes": [
"b",
"k",
"osd",
"kb",
"m",
"mb",
"g",
Expand All @@ -17,6 +17,7 @@
],
"local": "__flag__",
"master_timeout": "",
"cluster_manager_timeout": "",
"h": [],
"help": "__flag__",
"s": [],
Expand Down
3 changes: 2 additions & 1 deletion src/plugins/console/server/lib/spec_definitions/json/generated/cat.indices.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"bytes": [
"b",
"k",
"osd",
"kb",
"m",
"mb",
"g",
Expand All @@ -17,6 +17,7 @@
],
"local": "__flag__",
"master_timeout": "",
"cluster_manager_timeout": "",
"h": [],
"health": [
"green",
Expand Down
1 change: 1 addition & 0 deletions src/plugins/console/server/lib/spec_definitions/json/generated/cat.nodeattrs.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"format": "",
"local": "__flag__",
"master_timeout": "",
"cluster_manager_timeout": "",
"h": [],
"help": "__flag__",
"s": [],
Expand Down
3 changes: 2 additions & 1 deletion src/plugins/console/server/lib/spec_definitions/json/generated/cat.nodes.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"bytes": [
"b",
"k",
"osd",
"kb",
"m",
"mb",
"g",
Expand All @@ -18,6 +18,7 @@
"full_id": "__flag__",
"local": "__flag__",
"master_timeout": "",
"cluster_manager_timeout": "",
"h": [],
"help": "__flag__",
"s": [],
Expand Down
1 change: 1 addition & 0 deletions src/plugins/console/server/lib/spec_definitions/json/generated/cat.pending_tasks.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"format": "",
"local": "__flag__",
"master_timeout": "",
"cluster_manager_timeout": "",
"h": [],
"help": "__flag__",
"s": [],
Expand Down
1 change: 1 addition & 0 deletions src/plugins/console/server/lib/spec_definitions/json/generated/cat.plugins.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"format": "",
"local": "__flag__",
"master_timeout": "",
"cluster_manager_timeout": "",
"h": [],
"help": "__flag__",
"s": [],
Expand Down
1 change: 1 addition & 0 deletions src/plugins/console/server/lib/spec_definitions/json/generated/cat.repositories.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"format": "",
"local": "__flag__",
"master_timeout": "",
"cluster_manager_timeout": "",
"h": [],
"help": "__flag__",
"s": [],
Expand Down
3 changes: 2 additions & 1 deletion src/plugins/console/server/lib/spec_definitions/json/generated/cat.shards.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"bytes": [
"b",
"k",
"osd",
"kb",
"m",
"mb",
"g",
Expand All @@ -17,6 +17,7 @@
],
"local": "__flag__",
"master_timeout": "",
"cluster_manager_timeout": "",
"h": [],
"help": "__flag__",
"s": [],
Expand Down
1 change: 1 addition & 0 deletions src/plugins/console/server/lib/spec_definitions/json/generated/cat.snapshots.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"format": "",
"ignore_unavailable": "__flag__",
"master_timeout": "",
"cluster_manager_timeout": "",
"h": [],
"help": "__flag__",
"s": [],
Expand Down
1 change: 1 addition & 0 deletions src/plugins/console/server/lib/spec_definitions/json/generated/cat.templates.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"format": "",
"local": "__flag__",
"master_timeout": "",
"cluster_manager_timeout": "",
"h": [],
"help": "__flag__",
"s": [],
Expand Down
1 change: 1 addition & 0 deletions src/plugins/console/server/lib/spec_definitions/json/generated/cat.thread_pool.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
],
"local": "__flag__",
"master_timeout": "",
"cluster_manager_timeout": "",
"h": [],
"help": "__flag__",
"s": [],
Expand Down
3 changes: 2 additions & 1 deletion ...console/server/lib/spec_definitions/json/generated/cluster.delete_component_template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"cluster.delete_component_template": {
"url_params": {
"timeout": "",
"master_timeout": ""
"master_timeout": "",
"cluster_manager_timeout": ""
},
"methods": [
"DELETE"
Expand Down
1 change: 1 addition & 0 deletions src/plugins/console/server/lib/spec_definitions/json/generated/cluster.get_settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"url_params": {
"flat_settings": "__flag__",
"master_timeout": "",
"cluster_manager_timeout": "",
"timeout": "",
"include_defaults": "__flag__"
},
Expand Down
1 change: 1 addition & 0 deletions src/plugins/console/server/lib/spec_definitions/json/generated/cluster.health.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
],
"local": "__flag__",
"master_timeout": "",
"cluster_manager_timeout": "",
"timeout": "",
"wait_for_active_shards": "",
"wait_for_nodes": "",
Expand Down
3 changes: 2 additions & 1 deletion src/plugins/console/server/lib/spec_definitions/json/generated/cluster.pending_tasks.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"cluster.pending_tasks": {
"url_params": {
"local": "__flag__",
"master_timeout": ""
"master_timeout": "",
"cluster_manager_timeout": ""
},
"methods": [
"GET"
Expand Down
1 change: 1 addition & 0 deletions src/plugins/console/server/lib/spec_definitions/json/generated/cluster.put_settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"url_params": {
"flat_settings": "__flag__",
"master_timeout": "",
"cluster_manager_timeout": "",
"timeout": ""
},
"methods": [
Expand Down
1 change: 1 addition & 0 deletions src/plugins/console/server/lib/spec_definitions/json/generated/cluster.reroute.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"retry_failed": "__flag__",
"metric": [],
"master_timeout": "",
"cluster_manager_timeout": "",
"timeout": ""
},
"methods": [
Expand Down
3 changes: 2 additions & 1 deletion src/plugins/console/server/lib/spec_definitions/json/generated/cluster.state.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"url_params": {
"local": "__flag__",
"master_timeout": "",
"cluster_manager_timeout": "",
"flat_settings": "__flag__",
"wait_for_metadata_version": "",
"wait_for_timeout": "",
Expand All @@ -28,8 +29,8 @@
"metrics": [
"_all",
"blocks",
"master_node",
"cluster_manager_node",
"master_node",
"metadata",
"nodes",
"routing_nodes",
Expand Down
3 changes: 2 additions & 1 deletion src/plugins/console/server/lib/spec_definitions/json/generated/delete_script.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"delete_script": {
"url_params": {
"timeout": "",
"master_timeout": ""
"master_timeout": "",
"cluster_manager_timeout": ""
},
"methods": [
"DELETE"
Expand Down
3 changes: 2 additions & 1 deletion src/plugins/console/server/lib/spec_definitions/json/generated/get_script.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"get_script": {
"url_params": {
"master_timeout": ""
"master_timeout": "",
"cluster_manager_timeout": ""
},
"methods": [
"GET"
Expand Down
1 change: 1 addition & 0 deletions src/plugins/console/server/lib/spec_definitions/json/generated/indices.clone.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"url_params": {
"timeout": "",
"master_timeout": "",
"cluster_manager_timeout": "",
"wait_for_active_shards": ""
},
"methods": [
Expand Down
1 change: 1 addition & 0 deletions src/plugins/console/server/lib/spec_definitions/json/generated/indices.close.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"url_params": {
"timeout": "",
"master_timeout": "",
"cluster_manager_timeout": "",
"ignore_unavailable": "__flag__",
"allow_no_indices": "__flag__",
"expand_wildcards": [
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/console/server/lib/spec_definitions/json/generated/indices.create.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"indices.create": {
"url_params": {
"include_type_name": "__flag__",
"wait_for_active_shards": "",
"timeout": "",
"master_timeout": ""
"master_timeout": "",
"cluster_manager_timeout": ""
},
"methods": [
"PUT"
Expand Down
3 changes: 2 additions & 1 deletion src/plugins/console/server/lib/spec_definitions/json/generated/indices.delete_alias.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"indices.delete_alias": {
"url_params": {
"timeout": "",
"master_timeout": ""
"master_timeout": "",
"cluster_manager_timeout": ""
},
"methods": [
"DELETE"
Expand Down
3 changes: 2 additions & 1 deletion src/plugins/console/server/lib/spec_definitions/json/generated/indices.delete_template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"indices.delete_template": {
"url_params": {
"timeout": "",
"master_timeout": ""
"master_timeout": "",
"cluster_manager_timeout": ""
},
"methods": [
"DELETE"
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/console/server/lib/spec_definitions/json/generated/indices.get.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"indices.get": {
"url_params": {
"include_type_name": "__flag__",
"local": "__flag__",
"ignore_unavailable": "__flag__",
"allow_no_indices": "__flag__",
Expand All @@ -14,7 +13,8 @@
],
"flat_settings": "__flag__",
"include_defaults": "__flag__",
"master_timeout": ""
"master_timeout": "",
"cluster_manager_timeout": ""
},
"methods": [
"GET"
Expand Down
6 changes: 2 additions & 4 deletions src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_mapping.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"indices.get_mapping": {
"url_params": {
"include_type_name": "__flag__",
"ignore_unavailable": "__flag__",
"allow_no_indices": "__flag__",
"expand_wildcards": [
Expand All @@ -12,16 +11,15 @@
"all"
],
"master_timeout": "",
"cluster_manager_timeout": "",
"local": "__flag__"
},
"methods": [
"GET"
],
"patterns": [
"_mapping",
"{indices}/_mapping",
"_mapping/{type}",
"{indices}/_mapping/{type}"
"{indices}/_mapping"
],
"documentation": "https://opensearch.org/docs/latest/guide/en/elasticsearch/reference/master/indices-get-mapping.html"
}
Expand Down
1 change: 1 addition & 0 deletions src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"indices.get_settings": {
"url_params": {
"master_timeout": "",
"cluster_manager_timeout": "",
"ignore_unavailable": "__flag__",
"allow_no_indices": "__flag__",
"expand_wildcards": [
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_template.json
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"indices.get_template": {
"url_params": {
"include_type_name": "__flag__",
"flat_settings": "__flag__",
"master_timeout": "",
"cluster_manager_timeout": "",
"local": "__flag__"
},
"methods": [
Expand Down
3 changes: 2 additions & 1 deletion src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_alias.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"indices.put_alias": {
"url_params": {
"timeout": "",
"master_timeout": ""
"master_timeout": "",
"cluster_manager_timeout": ""
},
"methods": [
"PUT",
Expand Down
14 changes: 4 additions & 10 deletions src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_mapping.json
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"indices.put_mapping": {
"url_params": {
"include_type_name": "__flag__",
"timeout": "",
"master_timeout": "",
"cluster_manager_timeout": "",
"ignore_unavailable": "__flag__",
"allow_no_indices": "__flag__",
"expand_wildcards": [
Expand All @@ -12,21 +12,15 @@
"hidden",
"none",
"all"
]
],
"write_index_only": "__flag__"
},
"methods": [
"PUT",
"POST"
],
"patterns": [
"{indices}/_mapping",
"{indices}/{type}/_mapping",
"{indices}/_mapping/{type}",
"{indices}/{type}/_mappings",
"{indices}/_mappings/{type}",
"_mappings/{type}",
"{indices}/_mappings",
"_mapping/{type}"
"{indices}/_mapping"
],
"documentation": "https://opensearch.org/docs/latest/guide/en/elasticsearch/reference/master/indices-put-mapping.html"
}
Expand Down
1 change: 1 addition & 0 deletions src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"indices.put_settings": {
"url_params": {
"master_timeout": "",
"cluster_manager_timeout": "",
"timeout": "",
"preserve_existing": "__flag__",
"ignore_unavailable": "__flag__",
Expand Down
Loading

0 comments on commit f0446b8

Please sign in to comment.