Add enterprise license check for Inference API actions#119893
Merged
dan-rubinstein merged 9 commits intoelastic:mainfrom Jan 13, 2025
Merged
Add enterprise license check for Inference API actions#119893dan-rubinstein merged 9 commits intoelastic:mainfrom
dan-rubinstein merged 9 commits intoelastic:mainfrom
Conversation
dan-rubinstein
added
>enhancement
:ml
elasticsearchmachine
added
the
external-contributor
dan-rubinstein
removed
the
external-contributor
Collaborator
|
Hi @dan-rubinstein, I've created a changelog YAML for you. |
…rom get inference services API
Member
Author
|
@elasticmachine merge upstream |
Collaborator
|
Pinging @elastic/ml-core (Team:ML) |
davidkyle
approved these changes
Jan 13, 2025
...rade/src/javaRestTest/java/org/elasticsearch/xpack/application/InferenceUpgradeTestCase.java
Outdated
Show resolved
Hide resolved
Member
Author
|
@elasticmachine merge upstream |
dan-rubinstein
added
the
auto-backport
Member
Author
|
@elasticmachine merge upstream |
Collaborator
💚 Backport successful
|
dan-rubinstein
added a commit
to dan-rubinstein/elasticsearch
that referenced
this pull request
Jan 13, 2025
* Add enterprise license check for Inference API actions * Update docs/changelog/119893.yaml * Adding missing plugin to ModelRegistryIT and removing license check from get inference services API * Fix tests * Fix basic license test * Removing unused feature flag from InferenceUpgradeTestCase --------- Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
martijnvg
pushed a commit
to martijnvg/elasticsearch
that referenced
this pull request
Jan 14, 2025
* Add enterprise license check for Inference API actions * Update docs/changelog/119893.yaml * Adding missing plugin to ModelRegistryIT and removing license check from get inference services API * Fix tests * Fix basic license test * Removing unused feature flag from InferenceUpgradeTestCase --------- Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
elasticsearchmachine
pushed a commit
that referenced
this pull request
Jan 15, 2025
…0066) * Add enterprise license check for Inference API actions * Update docs/changelog/119893.yaml * Adding missing plugin to ModelRegistryIT and removing license check from get inference services API * Fix tests * Fix basic license test * Removing unused feature flag from InferenceUpgradeTestCase --------- Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The Inference API is meant to only be used by users with an enterprise license agreement. Up to this point we have not enforced this requirement so this change adds license checks to the inference APIs transport actions. The GET/DELETE model APIs and the GET inference usage actions have been excluded from this check as we would like to still allow users who have let their enterprise subscription expire to check their remaining inference endpoints through the GET action and clean them up through the DELETE action. This change also adds integration tests to check that the actions are properly blocking on invalid license types. Note that the tests use the trial license type instead of the enterprise type as it has the same permissions and is the preferred type to use in testing as enterprise licensing requires more complicated setup.
Note: Before this change is merged we should confirm whether the GET inference services API needs the license check. The change currently has it checking for valid license type but there may be some use case in the kibana UI that still needs to make the call even for users who do not have enterprise licenses.