fixed some missing types and unused imports

Author: gmmorris

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

@@ -7,10 +7,7 @@
 import { first, map } from 'rxjs/operators';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import { SecurityPluginSetup } from '../../security/server';
-import {
-  EncryptedSavedObjectsPluginSetup,
-  EncryptedSavedObjectsPluginStart,
-} from '../../encrypted_saved_objects/server';
+import { EncryptedSavedObjectsPluginSetup } from '../../encrypted_saved_objects/server';
 import { TaskManagerSetupContract, TaskManagerStartContract } from '../../task_manager/server';
 import { SpacesPluginSetup, SpacesServiceSetup } from '../../spaces/server';
 import { AlertsClient } from './alerts_client';
@@ -203,7 +200,7 @@ export class AlertingPlugin {
       security,
     } = this;
 
-    const encryptedSavedObjectsPlugin = this.encryptedSavedObjects.startWithHiddenTypes(['alert']);
+    const encryptedSavedObjectsPlugin = this.encryptedSavedObjects!.startWithHiddenTypes(['alert']);
 
     alertsClientFactory.initialize({
       alertTypeRegistry: alertTypeRegistry!,

x-pack/plugins/encrypted_saved_objects/server/mocks.ts

@@ -11,6 +11,7 @@ function createEncryptedSavedObjectsSetupMock() {
     registerType: jest.fn(),
     __legacyCompat: { registerLegacyAPI: jest.fn() },
     usingEphemeralEncryptionKey: true,
+    startWithHiddenTypes: jest.fn(),
   } as jest.Mocked<EncryptedSavedObjectsPluginSetup>;
 }
 

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

@@ -4,12 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
-  Logger,
-  SavedObjectsBaseOptions,
-  PluginInitializerContext,
-  CoreSetup,
-} from 'src/core/server';
+import { Logger, PluginInitializerContext, CoreSetup } from 'src/core/server';
 import { first } from 'rxjs/operators';
 import { createConfig$ } from './config';
 import {
@@ -46,7 +41,7 @@ export interface LegacyAPI {
  */
 export class Plugin {
   private readonly logger: Logger;
-  private savedObjectsSetup!: SavedObjectsSetup;
+  private savedObjectsSetup!: (includedHiddenTypes?: string[]) => SavedObjectsSetup;
 
   private legacyAPI?: LegacyAPI;
   private readonly getLegacyAPI = () => {

x-pack/test/alerting_api_integration/common/fixtures/plugins/aad/server/plugin.ts

@@ -21,11 +21,8 @@ interface FixtureSetupDeps {
   encryptedSavedObjects: EncryptedSavedObjectsPluginSetup;
 }
 
-export class FixturePlugin implements Plugin<void, void, FixtureSetupDeps, FixtureStartDeps> {
-  public setup(
-    core: CoreSetup<FixtureStartDeps>,
-    { spaces, encryptedSavedObjects }: FixtureSetupDeps
-  ) {
+export class FixturePlugin implements Plugin<void, void, FixtureSetupDeps> {
+  public setup(core: CoreSetup, { spaces, encryptedSavedObjects }: FixtureSetupDeps) {
     core.http.createRouter().post(
       {
         path: '/api/check_aad',

x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/alert_types.ts

@@ -8,10 +8,12 @@ import { CoreSetup } from 'kibana/server';
 import { schema } from '@kbn/config-schema';
 import { times } from 'lodash';
 import { FixtureStartDeps, FixtureSetupDeps } from './plugin';
+import { ActionType, ActionTypeExecutorOptions } from '../../../../../../../plugins/actions/server';
+import { AlertType, AlertExecutorOptions } from '../../../../../../../plugins/alerting/server';
 
 export function defineAlertTypes(
   core: CoreSetup<FixtureStartDeps>,
-  { actions, alerting }: FixtureSetupDeps
+  { actions, alerting }: Pick<FixtureSetupDeps, 'actions' | 'alerting'>
 ) {
   const clusterClient = core.elasticsearch.adminClient;
 

x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/plugin.ts

@@ -5,14 +5,10 @@
  */
 
 import { Plugin, CoreSetup } from 'kibana/server';
-import { schema } from '@kbn/config-schema';
-import { times } from 'lodash';
 import { PluginSetupContract as ActionsPluginSetup } from '../../../../../../../plugins/actions/server/plugin';
 import { PluginSetupContract as AlertingPluginSetup } from '../../../../../../../plugins/alerting/server/plugin';
 import { EncryptedSavedObjectsPluginStart } from '../../../../../../../plugins/encrypted_saved_objects/server';
 import { PluginSetupContract as FeaturesPluginSetup } from '../../../../../../../plugins/features/server';
-import { ActionType, ActionTypeExecutorOptions } from '../../../../../../../plugins/actions/server';
-import { AlertType, AlertExecutorOptions } from '../../../../../../../plugins/alerting/server';
 import { defineAlertTypes } from './alert_types';
 import { defineRoutes } from './routes';