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

Do not serialize basic license exp in x-pack info #30848

Merged
merged 2 commits into from
May 25, 2018

Conversation

Tim-Brooks
Copy link
Contributor

This is a bug that was identified by the kibana team. Currently on a
get-license call we do not serialize the hard-coded expiration for basic
licenses. However, the kibana team calls the x-pack info route which
still does serialize the expiration date. This commit removes that
serialization in the rest response.

This is a bug that was identified by the kibana team. Currently on a
get-license call we do not serialize the hard-coded expiration for basic
licenses. However, the kibana team calls the x-pack info route which
still does serialize the expiration date. This commit removes that
serialization in the rest response.
@Tim-Brooks Tim-Brooks added >bug review v7.0.0 v6.3.0 :Security/License License functionality for commercial features v6.4.0 labels May 24, 2018
@Tim-Brooks Tim-Brooks requested a review from imotov May 24, 2018 20:02
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-core-infra

Copy link
Member

@jasontedor jasontedor left a comment

Choose a reason for hiding this comment

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

LGTM.

@Tim-Brooks Tim-Brooks merged commit dcff63e into elastic:master May 25, 2018
Tim-Brooks added a commit that referenced this pull request May 25, 2018
This is a bug that was identified by the kibana team. Currently on a
get-license call we do not serialize the hard-coded expiration for basic
licenses. However, the kibana team calls the x-pack info route which
still does serialize the expiration date. This commit removes that
serialization in the rest response.
Tim-Brooks added a commit that referenced this pull request May 25, 2018
This is a bug that was identified by the kibana team. Currently on a
get-license call we do not serialize the hard-coded expiration for basic
licenses. However, the kibana team calls the x-pack info route which
still does serialize the expiration date. This commit removes that
serialization in the rest response.
jasontedor added a commit to jasontedor/elasticsearch that referenced this pull request May 25, 2018
* elastic/master:
  Do not serialize basic license exp in x-pack info (elastic#30848)
  Change BWC version for VerifyRepositoryResponse (elastic#30796)
  [DOCS] Document index name limitations (elastic#30826)
  Harmonize include_defaults tests (elastic#30700)
  [TEST] Mute {p0=snapshot.get_repository/10_basic/Verify created repository} YAML test
jasontedor added a commit to jasontedor/elasticsearch that referenced this pull request May 25, 2018
…ster

* elastic/master:
  Do not serialize basic license exp in x-pack info (elastic#30848)
  Change BWC version for VerifyRepositoryResponse (elastic#30796)
  [DOCS] Document index name limitations (elastic#30826)
  Harmonize include_defaults tests (elastic#30700)
  [TEST] Mute {p0=snapshot.get_repository/10_basic/Verify created repository} YAML test
dnhatn added a commit that referenced this pull request May 28, 2018
* master:
  silence InstallPluginCommandTests, see #30900
  Remove left-over comment
  Fix double semicolon in import statement
  [TEST] Fix minor random bug from #30794
  Include size of snapshot in snapshot metadata #18543, bwc clean up (#30890)
  Enabling testing against an external cluster (#30885)
  Add public key header/footer (#30877)
  SQL: Remove the last remaining server dependencies from jdbc (#30771)
  Include size of snapshot in snapshot metadata (#29602)
  Do not serialize basic license exp in x-pack info (#30848)
  Change BWC version for VerifyRepositoryResponse (#30796)
  [DOCS] Document index name limitations (#30826)
  Harmonize include_defaults tests (#30700)
dnhatn added a commit that referenced this pull request May 28, 2018
* 6.x:
  Fix double semicolon in import statement
  [TEST] Fix minor random bug from #30794
  Enabling testing against an external cluster (#30885)
  SQL: Remove the last remaining server dependencies from jdbc (#30771)
  Add public key header/footer (#30877)
  Include size of snapshot in snapshot metadata (#29602)
  QA: Test template creation during rolling restart (#30850)
  REST high-level client: add put ingest pipeline API (#30793)
  Do not serialize basic license exp in x-pack info (#30848)
  [docs] explainer for java packaging tests (#30825)
  Verify signatures on official plugins (#30800)
  [DOCS] Document index name limitations (#30826)
  [Docs] Add reindex.remote.whitelist example (#30828)
@Tim-Brooks Tim-Brooks deleted the do_not_serialize_expiration branch November 14, 2018 14:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
>bug :Security/License License functionality for commercial features v6.3.0 v6.4.0 v7.0.0-beta1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants