From 3ca697d752ad546b2d91d025e1bed645bb3c0a6d Mon Sep 17 00:00:00 2001 From: John Schulz Date: Tue, 3 Nov 2020 15:49:34 -0500 Subject: [PATCH] Switch to new 'as const' + typeof + ValueOf approach --- .../ingest_manager/common/constants/agent_policy.ts | 5 +++-- x-pack/plugins/ingest_manager/common/constants/epm.ts | 3 +++ x-pack/plugins/ingest_manager/common/types/models/epm.ts | 7 ++----- .../ingest_manager/server/routes/agent_policy/handlers.ts | 4 ++-- .../ingest_manager/server/services/epm/packages/install.ts | 5 ++--- .../server/usage/endpoints/fleet_saved_objects.ts | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/x-pack/plugins/ingest_manager/common/constants/agent_policy.ts b/x-pack/plugins/ingest_manager/common/constants/agent_policy.ts index ed4b32aeaa50c..3f7b5e83b4ee9 100644 --- a/x-pack/plugins/ingest_manager/common/constants/agent_policy.ts +++ b/x-pack/plugins/ingest_manager/common/constants/agent_policy.ts @@ -3,7 +3,8 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -import { AgentPolicy, DefaultPackages } from '../types'; +import { defaultPackages } from '../constants'; +import { AgentPolicy } from '../types'; export const AGENT_POLICY_SAVED_OBJECT_TYPE = 'ingest-agent-policies'; export const agentPolicyStatuses = { @@ -24,4 +25,4 @@ export const DEFAULT_AGENT_POLICY: Omit< monitoring_enabled: ['logs', 'metrics'] as Array<'logs' | 'metrics'>, }; -export const DEFAULT_AGENT_POLICIES_PACKAGES = [DefaultPackages.system]; +export const DEFAULT_AGENT_POLICIES_PACKAGES = [defaultPackages.System]; diff --git a/x-pack/plugins/ingest_manager/common/constants/epm.ts b/x-pack/plugins/ingest_manager/common/constants/epm.ts index 91b240f75cfbd..4cb7831b7c104 100644 --- a/x-pack/plugins/ingest_manager/common/constants/epm.ts +++ b/x-pack/plugins/ingest_manager/common/constants/epm.ts @@ -14,6 +14,9 @@ export const requiredPackages = { Endpoint: 'endpoint', } as const; +// these are currently identical. we can separate if they later diverge +export const defaultPackages = requiredPackages; + export const agentAssetTypes = { Input: 'input', } as const; diff --git a/x-pack/plugins/ingest_manager/common/types/models/epm.ts b/x-pack/plugins/ingest_manager/common/types/models/epm.ts index 40ae47a2e3fbc..46ee41b516e1d 100644 --- a/x-pack/plugins/ingest_manager/common/types/models/epm.ts +++ b/x-pack/plugins/ingest_manager/common/types/models/epm.ts @@ -7,7 +7,7 @@ // Follow pattern from https://github.com/elastic/kibana/pull/52447 // TODO: Update when https://github.com/elastic/kibana/issues/53021 is closed import { SavedObject, SavedObjectAttributes, SavedObjectReference } from 'src/core/public'; -import { agentAssetTypes, dataTypes, requiredPackages } from '../../constants'; +import { agentAssetTypes, dataTypes, defaultPackages, requiredPackages } from '../../constants'; import { ValueOf } from '../../types'; export enum InstallationStatus { @@ -275,10 +275,7 @@ export type EsAssetReference = Pick & { export type RequiredPackage = typeof requiredPackages; -export enum DefaultPackages { - system = 'system', - endpoint = 'endpoint', -} +export type DefaultPackages = typeof defaultPackages; export interface IndexTemplateMappings { properties: any; diff --git a/x-pack/plugins/ingest_manager/server/routes/agent_policy/handlers.ts b/x-pack/plugins/ingest_manager/server/routes/agent_policy/handlers.ts index 645ae8880fa61..91a033a5379df 100644 --- a/x-pack/plugins/ingest_manager/server/routes/agent_policy/handlers.ts +++ b/x-pack/plugins/ingest_manager/server/routes/agent_policy/handlers.ts @@ -19,7 +19,6 @@ import { DeleteAgentPolicyRequestSchema, GetFullAgentPolicyRequestSchema, AgentPolicy, - DefaultPackages, NewPackagePolicy, } from '../../types'; import { @@ -31,6 +30,7 @@ import { CopyAgentPolicyResponse, DeleteAgentPolicyResponse, GetFullAgentPolicyResponse, + defaultPackages, } from '../../../common'; import { defaultIngestErrorHandler } from '../../errors'; @@ -117,7 +117,7 @@ export const createAgentPolicyHandler: RequestHandler< // successfully withSysMonitoring ? packagePolicyService - .buildPackagePolicyFromPackage(soClient, DefaultPackages.system) + .buildPackagePolicyFromPackage(soClient, defaultPackages.System) .catch(() => undefined) : undefined, ]); diff --git a/x-pack/plugins/ingest_manager/server/services/epm/packages/install.ts b/x-pack/plugins/ingest_manager/server/services/epm/packages/install.ts index fdd6db9396da8..23666162e91ef 100644 --- a/x-pack/plugins/ingest_manager/server/services/epm/packages/install.ts +++ b/x-pack/plugins/ingest_manager/server/services/epm/packages/install.ts @@ -8,13 +8,12 @@ import { SavedObject, SavedObjectsClientContract } from 'src/core/server'; import semver from 'semver'; import Boom from '@hapi/boom'; import { UnwrapPromise } from '@kbn/utility-types'; -import { BulkInstallPackageInfo, InstallSource } from '../../../../common'; +import { BulkInstallPackageInfo, InstallSource, defaultPackages } from '../../../../common'; import { PACKAGES_SAVED_OBJECT_TYPE, MAX_TIME_COMPLETE_INSTALL } from '../../../constants'; import { AssetReference, Installation, CallESAsCurrentUser, - DefaultPackages, AssetType, KibanaAssetReference, EsAssetReference, @@ -65,7 +64,7 @@ export async function ensureInstalledDefaultPackages( const installations = []; const bulkResponse = await bulkInstallPackages({ savedObjectsClient, - packagesToUpgrade: Object.values(DefaultPackages), + packagesToUpgrade: Object.values(defaultPackages), callCluster, }); diff --git a/x-pack/plugins/security_solution/server/usage/endpoints/fleet_saved_objects.ts b/x-pack/plugins/security_solution/server/usage/endpoints/fleet_saved_objects.ts index c46610ec9388e..405339aaf25e2 100644 --- a/x-pack/plugins/security_solution/server/usage/endpoints/fleet_saved_objects.ts +++ b/x-pack/plugins/security_solution/server/usage/endpoints/fleet_saved_objects.ts @@ -10,9 +10,9 @@ import { AGENT_SAVED_OBJECT_TYPE, AGENT_EVENT_SAVED_OBJECT_TYPE, } from './../../../../ingest_manager/common/constants/agent'; -import { Agent, DefaultPackages as FleetDefaultPackages } from '../../../../ingest_manager/common'; +import { Agent, defaultPackages as FleetDefaultPackages } from '../../../../ingest_manager/common'; -export const FLEET_ENDPOINT_PACKAGE_CONSTANT = FleetDefaultPackages.endpoint; +export const FLEET_ENDPOINT_PACKAGE_CONSTANT = FleetDefaultPackages.Endpoint; export const getFleetSavedObjectsMetadata = async (savedObjectsClient: ISavedObjectsRepository) => savedObjectsClient.find({