-
Notifications
You must be signed in to change notification settings - Fork 8.3k
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
[SecuritySolution] Register AI Assistant management settings according to productFeatureKeys #213105
Open
angorayc
wants to merge
12
commits into
elastic:main
Choose a base branch
from
angorayc:issue-212667
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+44
−4
Open
[SecuritySolution] Register AI Assistant management settings according to productFeatureKeys #213105
Changes from 8 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
6ae9b0b
set product feature keys
angorayc e5fdb46
set product feature keys
angorayc 82c6210
set product feature keys
angorayc 5b268f8
Update x-pack/solutions/security/plugins/security_solution/public/plu…
angorayc 82a297d
Update x-pack/solutions/security/plugins/security_solution/public/plu…
angorayc 7efa0f3
code review
angorayc 666ef4f
code review
angorayc 93a2c5c
[CI] Auto-commit changed files from 'node scripts/eslint --no-cache -…
kibanamachine 5612a56
code review
angorayc 9025334
code review
angorayc 68d2c9e
code review
angorayc 6a0d714
Merge branch 'main' into issue-212667
angorayc File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,6 +24,7 @@ import { | |
} from '../common/experimental_features'; | ||
import { setOnboardingSettings } from './onboarding'; | ||
import { getAdditionalChargesMessage } from './components/additional_charges_message'; | ||
import { getProductProductFeatures } from '../common/pli/pli_features'; | ||
|
||
export class SecuritySolutionServerlessPlugin | ||
implements | ||
|
@@ -47,12 +48,14 @@ export class SecuritySolutionServerlessPlugin | |
setupDeps: SecuritySolutionServerlessPluginSetupDeps | ||
): SecuritySolutionServerlessPluginSetup { | ||
const { securitySolution } = setupDeps; | ||
const { productTypes } = this.config; | ||
|
||
this.experimentalFeatures = parseExperimentalConfigValue( | ||
this.config.enableExperimental, | ||
securitySolution.experimentalFeatures | ||
).features; | ||
|
||
securitySolution.setProductFeatureKeys(getProductProductFeatures(productTypes)); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It setProductFeatureKeys correctly for complete and essential tiers. |
||
return {}; | ||
} | ||
|
||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I just realized that if
productFeatureKeys
is still null, or thelicense
is not defined yet, this code will behave as if the assistant is not available, disabling the assistant management.Can we add a check for at the beginning?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It seems that as long as we use BehaviorSubject with an initial value, it will always emit the initial value as the first emission. To avoid that, I'd like to replace BehaviorSubject with Subject so the first emission will be the productFeatureKeys from ESS/serverless.
combineLatestWith waits for both productFeatureKeys$ and license$ to emit at least once before emitting a combined value.
In this case, we should be able to always receive the non null values.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Using Subject the subscribe handler will be called only if it is registered before the first next call. If the next happens before the handler is subscribed, it will never be called.
To avoid that, I'm sticking to BehaviorSubject and check if productFeatureKeys and license exists.