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.

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

Test: REST": Fix the accept_enterprise parameter for Get License API #51527

Merged
merged 1 commit into from
Feb 2, 2020

Conversation

karmi
Copy link
Contributor

@karmi karmi commented Jan 28, 2020

The Get License API specifies the accept_enterprise parameter as a boolean:

"accept_enterprise":{
"type":"boolean",

In the test, a string is passed however, which makes the test compilation fail in the Go client.

/cc @tvernum

The Get License API specifies the `accept_enterprise` parameter as a `boolean`:

https://github.com/elastic/elasticsearch/blob/0ca5cb8cb636a4be9c36b8e38e565af66abc423b/x-pack/plugin/src/test/resources/rest-api-spec/api/license.get.json#L22-L27

In the test, a `string` is passed however, which makes the test compilation fail in the Go client.

/cc @tvernum
@tvernum tvernum self-requested a review January 28, 2020 23:15
@tvernum
Copy link
Contributor

tvernum commented Jan 28, 2020

@elasticmachine run elasticsearch-ci/1

Copy link
Contributor

@tvernum tvernum left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@tvernum tvernum added :Security/License License functionality for commercial features >non-issue v7.6.1 v7.7.0 v8.0.0 labels Jan 28, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-security (:Security/License)

@tvernum tvernum added >test Issues or PRs that are addressing/adding tests and removed >non-issue labels Jan 28, 2020
@tvernum
Copy link
Contributor

tvernum commented Jan 30, 2020

@karmi Would you like me to take on the merging & backport of this?

@karmi
Copy link
Contributor Author

karmi commented Jan 31, 2020

No, I can do that, sorry for the delay. I did the patch during a week full of giving trainings, and it got more hectic towards the end. I'll merge today or tomorrow.

@karmi karmi merged commit e2a2169 into master Feb 2, 2020
karmi added a commit that referenced this pull request Feb 2, 2020
…#51527)

The Get License API specifies the `accept_enterprise` parameter as a `boolean`:

https://github.com/elastic/elasticsearch/blob/0ca5cb8cb636a4be9c36b8e38e565af66abc423b/x-pack/plugin/src/test/resources/rest-api-spec/api/license.get.json#L22-L27

In the test, a `string` is passed however, which makes the test compilation fail in the Go client.

(cherry picked from commit e2a2169)
karmi added a commit that referenced this pull request Feb 2, 2020
* REST: Test: Fix the `accept_enterprise` parameter for Get License API (#51527)

The Get License API specifies the `accept_enterprise` parameter as a `boolean`:

https://github.com/elastic/elasticsearch/blob/0ca5cb8cb636a4be9c36b8e38e565af66abc423b/x-pack/plugin/src/test/resources/rest-api-spec/api/license.get.json#L22-L27

In the test, a `string` is passed however, which makes the test compilation fail in the Go client.

(cherry picked from commit e2a2169)

* Fix the SQL API documentation in REST specification (#51534)

This patch fixes the SQL REST API documentation to conform to the current schema.

(cherry picked from commit c8b6a84)

* Fix the "slices" parameter for the Delete By Query API in the REST specification (#51535)

This patch updates the `type` parameter in the Delete By Query API: according to
[the documentation](https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-delete-by-query.html#docs-delete-by-query-slice),
it can be set to "auto", but the type in the documentation allows only numerical values.

This prevents people from setting the parameter to "auto" eg. in the Go client,
which generates source from the specification, and sets the corresponding Go
type as number.

The patch uses the `|` notation, which we have discussed previously for encoding
a "polymorphic" parameter like this.

Related: elastic/go-elasticsearch#77

* Fix the Enrich API documentation in REST specification (#51528)

This patch fixes the REST API documentation for the Enrich APIs to conform to the current schema.

(cherry picked from commit 59f28f4)
@karmi karmi deleted the rest_tests_fix_license branch February 2, 2020 14:34
@polyfractal polyfractal added v7.6.0 and removed v7.6.1 labels Feb 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
:Security/License License functionality for commercial features >test Issues or PRs that are addressing/adding tests v7.6.0 v7.7.0 v8.0.0-alpha1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants