[SecuritySolution] Fixes deprecated use of Spaces API (elastic#118121)

* Set up our app client in start() instead of setup()

We don't use it during setup, and since the spaces client is now only
available in start(), we need to respond accordingly.

* Move appClientFactory setup back into the setup phase

Albeit in the getStartServices callback, so it's really in the start
phase.

* Use spaces service from start contract in RequestContextFactory

The setup contract variants have been deprecated.

* Remove unused dependency from EndpointAppContextService

It no longer needs the appClientFactory, as that functionality is
provided through securitySolutionRequestContextFactory, which wraps an
instance of that client itself.

x-pack/plugins/security_solution/server/endpoint/endpoint_app_context_services.ts

@@ -25,7 +25,6 @@ import {
   getPackagePolicyDeleteCallback,
 } from '../fleet_integration/fleet_integration';
 import { ManifestManager } from './services/artifacts';
-import { AppClientFactory } from '../client';
 import { ConfigType } from '../config';
 import { IRequestContextFactory } from '../request_context_factory';
 import { LicenseService } from '../../common/license';
@@ -49,7 +48,6 @@ export type EndpointAppContextServiceStartContract = Partial<
   logger: Logger;
   endpointMetadataService: EndpointMetadataService;
   manifestManager?: ManifestManager;
-  appClientFactory: AppClientFactory;
   security: SecurityPluginStart;
   alerting: AlertsPluginStartContract;
   config: ConfigType;

x-pack/plugins/security_solution/server/endpoint/mocks.ts

@@ -18,7 +18,6 @@ import {
   createMockAgentService,
   createArtifactsClientMock,
 } from '../../../fleet/server/mocks';
-import { AppClientFactory } from '../client';
 import { createMockConfig } from '../lib/detection_engine/routes/__mocks__';
 import {
   EndpointAppContextService,
@@ -87,8 +86,6 @@ export const createMockEndpointAppContextServiceSetupContract =
 export const createMockEndpointAppContextServiceStartContract =
   (): jest.Mocked<EndpointAppContextServiceStartContract> => {
     const config = createMockConfig();
-    const factory = new AppClientFactory();
-    factory.setup({ getSpaceId: () => 'mockSpace', config });
 
     const casesClientMock = createCasesClientMock();
     const savedObjectsStart = savedObjectsServiceMock.createStartContract();
@@ -107,7 +104,6 @@ export const createMockEndpointAppContextServiceStartContract =
       packageService: createMockPackageService(),
       logger: loggingSystemMock.create().get('mock_endpoint_app_context'),
       manifestManager: getManifestManagerMock(),
-      appClientFactory: factory,
       security: securityMock.createStart(),
       alerting: alertsMock.createStart(),
       config,

x-pack/plugins/security_solution/server/plugin.ts

@@ -130,15 +130,10 @@ export class Plugin implements ISecuritySolutionPlugin {
   ): SecuritySolutionPluginSetup {
     this.logger.debug('plugin setup');
 
-    const { pluginContext, config, logger, appClientFactory } = this;
+    const { appClientFactory, pluginContext, config, logger } = this;
     const experimentalFeatures = config.experimentalFeatures;
     this.kibanaIndex = core.savedObjects.getKibanaIndex();
 
-    appClientFactory.setup({
-      getSpaceId: plugins.spaces?.spacesService?.getSpaceId,
-      config,
-    });
-
     initSavedObjects(core.savedObjects);
     initUiSettings(core.uiSettings, experimentalFeatures);
 
@@ -308,6 +303,11 @@ export class Plugin implements ISecuritySolutionPlugin {
     }
 
     core.getStartServices().then(([_, depsStart]) => {
+      appClientFactory.setup({
+        getSpaceId: depsStart.spaces?.spacesService?.getSpaceId,
+        config,
+      });
+
       const securitySolutionSearchStrategy = securitySolutionSearchStrategyProvider(
         depsStart.data,
         endpointContext
@@ -339,7 +339,7 @@ export class Plugin implements ISecuritySolutionPlugin {
     core: SecuritySolutionPluginCoreStartDependencies,
     plugins: SecuritySolutionPluginStartDependencies
   ): SecuritySolutionPluginStart {
-    const { config, logger, appClientFactory } = this;
+    const { config, logger } = this;
 
     const savedObjectsClient = new SavedObjectsClient(core.savedObjects.createInternalRepository());
     const registerIngestCallback = plugins.fleet?.registerExternalCallback;
@@ -407,7 +407,6 @@ export class Plugin implements ISecuritySolutionPlugin {
         plugins.fleet?.agentPolicyService!,
         logger
       ),
-      appClientFactory,
       security: plugins.security,
       alerting: plugins.alerting,
       config: this.config,

x-pack/plugins/security_solution/server/plugin_contract.ts

@@ -33,7 +33,7 @@ import {
   RuleRegistryPluginStartContract as RuleRegistryPluginStart,
 } from '../../rule_registry/server';
 import { SecurityPluginSetup, SecurityPluginStart } from '../../security/server';
-import { SpacesPluginSetup } from '../../spaces/server';
+import { SpacesPluginSetup, SpacesPluginStart } from '../../spaces/server';
 import {
   TaskManagerSetupContract as TaskManagerPluginSetup,
   TaskManagerStartContract as TaskManagerPluginStart,
@@ -68,6 +68,7 @@ export interface SecuritySolutionPluginStartDependencies {
   licensing: LicensingPluginStart;
   ruleRegistry: RuleRegistryPluginStart;
   security: SecurityPluginStart;
+  spaces?: SpacesPluginStart;
   taskManager?: TaskManagerPluginStart;
   telemetry?: TelemetryPluginStart;
 }

x-pack/plugins/security_solution/server/request_context_factory.ts

@@ -36,13 +36,7 @@ export class RequestContextFactory implements IRequestContextFactory {
   private readonly appClientFactory: AppClientFactory;
 
   constructor(private readonly options: ConstructorOptions) {
-    const { config, plugins } = options;
-
     this.appClientFactory = new AppClientFactory();
-    this.appClientFactory.setup({
-      getSpaceId: plugins.spaces?.spacesService?.getSpaceId,
-      config,
-    });
   }
 
   public async create(
@@ -51,10 +45,14 @@ export class RequestContextFactory implements IRequestContextFactory {
   ): Promise<SecuritySolutionApiRequestHandlerContext> {
     const { options, appClientFactory } = this;
     const { config, core, plugins } = options;
-    const { lists, ruleRegistry, security, spaces } = plugins;
+    const { lists, ruleRegistry, security } = plugins;
 
     const [, startPlugins] = await core.getStartServices();
     const frameworkRequest = await buildFrameworkRequest(context, security, request);
+    appClientFactory.setup({
+      getSpaceId: startPlugins.spaces?.spacesService?.getSpaceId,
+      config,
+    });
 
     return {
       core: context.core,
@@ -65,7 +63,7 @@ export class RequestContextFactory implements IRequestContextFactory {
 
       getAppClient: () => appClientFactory.create(request),
 
-      getSpaceId: () => spaces?.spacesService?.getSpaceId(request) || DEFAULT_SPACE_ID,
+      getSpaceId: () => startPlugins.spaces?.spacesService?.getSpaceId(request) || DEFAULT_SPACE_ID,
 
       getRuleDataService: () => ruleRegistry.ruleDataService,