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

Add build_flavor back to info api rest response #88336

Merged
merged 10 commits into from
Jul 8, 2022
Merged

Add build_flavor back to info api rest response #88336

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a17e86d
Add build_flavor back to main api rest response
rjernst Jul 6, 2022
e9f0d78
Update docs/changelog/88336.yaml
rjernst Jul 7, 2022
d375510
test fix
rjernst Jul 7, 2022
9e51f06
fix test syntax
rjernst Jul 7, 2022
869a44c
Merge branch 'master' into main_info_restore_bwc
rjernst Jul 7, 2022
7bca461
add to azure docs...
rjernst Jul 7, 2022
b68cb0b
another
rjernst Jul 7, 2022
a4e6f64
another test
rjernst Jul 7, 2022
cdb808d
disable bwc until backported
rjernst Jul 7, 2022
81fc086
fix version
rjernst Jul 7, 2022
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
6 changes: 6 additions & 0 deletions docs/changelog/88336.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 88336
summary: Add `build_flavor` back to info api rest response
area: Infra/Core
type: bug
issues:
- 88318
1 change: 1 addition & 0 deletions docs/plugins/discovery-azure-classic.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,7 @@ This command should give you a JSON result:
"number" : "{version_qualified}",
"build_type" : "{build_type}",
"build_hash" : "f27399d",
"build_flavor": "default",
"build_date" : "2016-03-30T09:51:41.449Z",
"build_snapshot" : false,
"lucene_version" : "{lucene_version}",
Expand Down
8 changes: 8 additions & 0 deletions rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/info/10_info.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,11 @@
- is_true: tagline
- is_true: version
- is_true: version.number

---
"Info build flavor":
- skip:
version: "8.3.0 - 8.3.2"
reason: "build flavor in info was missing in 8.3.0 to 8.3.2"
- do: {info: {}}
- match: { version.build_flavor: default }
1 change: 1 addition & 0 deletions server/src/main/java/org/elasticsearch/action/main/MainResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
builder.field("cluster_uuid", clusterUuid);
builder.startObject("version")
.field("number", build.qualifiedVersion())
.field("build_flavor", "default")
.field("build_type", build.type().displayName())
.field("build_hash", build.hash())
.field("build_date", build.date())
Expand Down