[Security Solution][Endpoint] Isolate Action should only be available to Platinum+ licenses #102374

paul-tavares · 2021-06-16T16:06:40Z

Summary

Isolate action should not be available for use in the Endpoint List and Endpoint Details flyout unless the license is Platinum+
Un-isolate action will remain available if the Endpoint host is currently isolated

Screen capture below done with License set to basic

Checklist

Unit or functional tests were updated or added to match the most common scenarios

…late-action-is-platinum-only

elasticmachine · 2021-06-16T16:06:43Z

Pinging @elastic/security-onboarding-and-lifecycle-mgt (Team:Onboarding and Lifecycle Mgt)

pzl

looks okay, but see if you can remove the license service mock.

on the server side, it hasn't required any substantial workaround to do, but if there's a problem doing the same front-end, then oh well

pzl · 2021-06-16T16:16:40Z

x-pack/plugins/security_solution/public/common/hooks/__mocks__/use_license.ts

+
+import { createLicenseServiceMock } from '../../../../common/license/mocks';
+
+export const licenseService = createLicenseServiceMock();


LicenseService is a concrete class. It should not need to be mocked. Best practice is to init the real class, and inject any needed/mocked state as necessary into the instance.

A simpler approach can be using a spy for useLicense and return the mocked value for the specific describe.

What do you mean by concrete class?
In order to do this better, we would need to mock the observables that come out of kibana and that this class takes in during .start(). We can track that as tech. debt if needed - but I'm not trying to test LicenseService class here (if that was the case - then yes, totally agree 😄 ).

I'm just trying to mock the instance created by the useLicense hook. The issue is that the hook instantiates and uses a LicenseService instance that is also exported. That exported instance is then used during the UI's Plugin.start() to give it the licensing observable. Because of this, its difficult to avoid the mocking of the hook. the implementation approach would have to be changed to using a React context provider - similar to how we have others context providers defined and then we could instantiate and use a custom LicenseService instance in bootstrapping the UI app.

ok, so part of it is how the frontend is set up here.

Since the frontend/plugin.tsx is starting the service with licenseService.start(plugins.licensing.license$); where licenseService is the imported instance. You don't have great control to supplant with your own instance, or passing in an observable you control (replacing plugins.licensing.license$).

It's still not good to mock value classes (sorry this is what I meant, not concrete), specifically when they are not under test. But the singleton you don't control makes it hard.

Unless you can think of a sane way to replace what's in plugins.licensing.license$. That's really all the control you need to set the 'license state' for a given test.

yeah, another thing I don't like about this mocking of the singleton is that it creates state between tests - I just got a failure here in CI that I think was caused by that.

I'm going to create a refactor issue to revisit this.

pzl · 2021-06-16T16:17:19Z

...ity_solution/public/management/pages/endpoint_hosts/view/hooks/use_endpoint_action_items.tsx

-      return [
-        isIsolated
-          ? {
+      const isolationActions = isIsolated // Un-isolate is always available to users regardless of license level


...ity_solution/public/management/pages/endpoint_hosts/view/hooks/use_endpoint_action_items.tsx

dasansol92

LGTM 🚢

…late-action-is-platinum-only

spalger · 2021-06-16T20:22:06Z

jenkins, test this

(restarting due to jenkins upgrade)

kibanamachine · 2021-06-16T22:26:15Z

💚 Build Succeeded

Metrics [docs]

Async chunks

Total size of all lazy-loaded chunks that will be downloaded as the user navigates the app

id	before	after	diff
`securitySolution`	6.9MB	6.9MB	-122.0B

History

💔 Build #131818 failed 87ea5cb
💔 Build #131748 failed c3540cc

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

cc @paul-tavares

… to Platinum+ licenses (elastic#102374) * Isolate action should only be available for platinum license * Moved `useLicense` hook mock into `__mocks__`

kibanamachine · 2021-06-16T22:48:26Z

💚 Backport successful

Status	Branch	Result
✅	7.x

This backport PR will be merged automatically after passing CI.

… to Platinum+ licenses (#102374) (#102434) * Isolate action should only be available for platinum license * Moved `useLicense` hook mock into `__mocks__` Co-authored-by: Paul Tavares <56442535+paul-tavares@users.noreply.github.com>

…egrations-to-global-search * 'master' of github.com:elastic/kibana: (46 commits) [Lens] Add some more documentation for dynamic coloring (elastic#101369) hide not searchable results when no term (elastic#102401) [Lens] Fix Formula functional test with multiple suggestions (elastic#102378) Fix trusted apps modified by field displayed as a date field (elastic#102377) [Lens] Docs for time shift (elastic#102048) update readme of logs-metrics-ui (elastic#101968) Refactor observability plugin breadcrumbs (elastic#102290) [Index Patterns] Move rollup config to index pattern management v2 (elastic#102285) [Security Solution][Endpoint] Isolate Action should only be available to Platinum+ licenses (elastic#102374) [build] Updates Ironbank templates (elastic#102407) Update security best practices document (elastic#100814) [Enterprise Search] Set up initial KibanaPageTemplate (elastic#102170) [Reporting/Docs] Add section to troubleshooting guide to explain the StatusCodeError logs (elastic#102278) [DOCS] Updating Elastic Security Overview topic (elastic#101922) [Uptime] refactor Synthetics Integration package UI (elastic#102080) [Task Manager] Log at different levels based on the state (elastic#101751) [APM] Fixing time comparison types (elastic#101423) [RAC] Update alert documents in lifecycle rule type helper (elastic#101598) [ML] Functional tests - fix and re-activate alerting flyout test (elastic#102368) [Reporting] remove unused reference to path.data config (elastic#102267) ... # Conflicts: # x-pack/plugins/fleet/kibana.json

paul-tavares added 4 commits June 15, 2021 15:59

Isolate action should only be available for platinum license

70d7732

Moved useLicense hook mock into __mocks__

f7f93ae

Merge remote-tracking branch 'upstream/master' into task/olm-1304-iso…

71ddad3

…late-action-is-platinum-only

Tests for actions menu button to cover license level

c3540cc

paul-tavares added v8.0.0 release_note:skip Skip the PR/issue when compiling release notes Team:Defend Workflows “EDR Workflows” sub-team of Security Solution v7.14.0 auto-backport Deprecated - use backport:version if exact versions are needed labels Jun 16, 2021

paul-tavares self-assigned this Jun 16, 2021

paul-tavares requested a review from a team as a code owner June 16, 2021 16:06

pzl reviewed Jun 16, 2021

View reviewed changes

dasansol92 reviewed Jun 16, 2021

View reviewed changes

...ity_solution/public/management/pages/endpoint_hosts/view/hooks/use_endpoint_action_items.tsx Outdated Show resolved Hide resolved

dasansol92 approved these changes Jun 16, 2021

View reviewed changes

academo approved these changes Jun 16, 2021

View reviewed changes

paul-tavares added 4 commits June 16, 2021 14:19

Fix test (maybe)

b977353

Merge remote-tracking branch 'upstream/master' into task/olm-1304-iso…

5c9905f

…late-action-is-platinum-only

code review suggestion

87ea5cb

Fix test - again

33c69f4

paul-tavares merged commit 2507d37 into elastic:master Jun 16, 2021

paul-tavares deleted the task/olm-1304-isolate-action-is-platinum-only branch June 16, 2021 22:45

kibanamachine mentioned this pull request Jun 16, 2021

[7.x] [Security Solution][Endpoint] Isolate Action should only be available to Platinum+ licenses (#102374) #102434

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Security Solution][Endpoint] Isolate Action should only be available to Platinum+ licenses #102374

[Security Solution][Endpoint] Isolate Action should only be available to Platinum+ licenses #102374

paul-tavares commented Jun 16, 2021

elasticmachine commented Jun 16, 2021

pzl left a comment

pzl Jun 16, 2021

academo Jun 16, 2021

paul-tavares Jun 16, 2021

pzl Jun 16, 2021

paul-tavares Jun 16, 2021

pzl Jun 16, 2021

dasansol92 left a comment

spalger commented Jun 16, 2021

kibanamachine commented Jun 16, 2021

kibanamachine commented Jun 16, 2021


		import { createLicenseServiceMock } from '../../../../common/license/mocks';

		export const licenseService = createLicenseServiceMock();

[Security Solution][Endpoint] Isolate Action should only be available to Platinum+ licenses #102374

[Security Solution][Endpoint] Isolate Action should only be available to Platinum+ licenses #102374

Conversation

paul-tavares commented Jun 16, 2021

Summary

Checklist

elasticmachine commented Jun 16, 2021

pzl left a comment

Choose a reason for hiding this comment

pzl Jun 16, 2021

Choose a reason for hiding this comment

academo Jun 16, 2021

Choose a reason for hiding this comment

paul-tavares Jun 16, 2021

Choose a reason for hiding this comment

pzl Jun 16, 2021

Choose a reason for hiding this comment

paul-tavares Jun 16, 2021

Choose a reason for hiding this comment

pzl Jun 16, 2021

Choose a reason for hiding this comment

dasansol92 left a comment

Choose a reason for hiding this comment

spalger commented Jun 16, 2021

kibanamachine commented Jun 16, 2021

💚 Build Succeeded

Metrics [docs]

Async chunks

History

kibanamachine commented Jun 16, 2021

💚 Backport successful