Fix type errors with an offering to the CI gods

elastic · Feb 23, 2021 · b4c2267 · b4c2267
1 parent bc57209
commit b4c2267
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 6 deletions.
diff --git a/x-pack/plugins/fleet/common/types/models/epm.ts b/x-pack/plugins/fleet/common/types/models/epm.ts
@@ -36,7 +36,11 @@ export type EpmPackageInstallStatus = 'installed' | 'installing';
 export type DetailViewPanelName = 'overview' | 'policies' | 'settings' | 'custom';
 export type ServiceName = 'kibana' | 'elasticsearch';
 export type AgentAssetType = typeof agentAssetTypes;
-export type AssetType = KibanaAssetType | ElasticsearchAssetType | ValueOf<AgentAssetType> | 'rules';
+export type AssetType =
+ | KibanaAssetType
+ | ElasticsearchAssetType
+ | ValueOf<AgentAssetType>
+ | 'rules';
 
 /*
  Enum mapping of a saved object asset type to how it would appear in a package file path (snake cased)

diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/constants.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/epm/constants.tsx
@@ -31,7 +31,7 @@ export const AssetTitleMap: Record<AssetType, string> = {
  map: 'Map',
  data_stream_ilm_policy: 'Data Stream ILM Policy',
  lens: 'Lens',
- rules: 'Detection Rules'
+ rules: 'Detection Rules',
 };
 
 export const ServiceTitleMap: Record<ServiceName, string> = {

diff --git a/...ns/security_solution/public/detections/containers/detection_engine/rules/__mocks__/api.ts b/...ns/security_solution/public/detections/containers/detection_engine/rules/__mocks__/api.ts
@@ -40,6 +40,7 @@ export const getPrePackagedRulesStatus = async ({
  rules_installed: 12,
  rules_not_installed: 0,
  rules_not_updated: 0,
+ rules_package_version: null,
  timelines_installed: 0,
  timelines_not_installed: 0,
  timelines_not_updated: 0,

diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/api.ts b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/api.ts
@@ -251,10 +251,10 @@ export const duplicateRules = async ({ rules }: DuplicateRulesProps): Promise<Bu
  * @throws An error if response is not OK
  */
 export const createPrepackagedRules = async ({
- pkgVersion,
+ pkgVersion = null,
  signal,
 }: {
- pkgVersion: string | undefined | null;
+ pkgVersion?: string | null | undefined;
  signal: AbortSignal;
 }): Promise<{
  rules_installed: number;

diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/index.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/index.ts
@@ -27,6 +27,7 @@ export const createMockConfig = () => ({
  to: 'now',
  },
  packagerTaskInterval: '60s',
+ usePackageRegistryRules: false,
  validateArtifactDownloads: true,
 });
 

diff --git a/...security_solution/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.ts b/...security_solution/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.ts
@@ -80,7 +80,7 @@ export const addPrepackedRulesRoute = (
  frameworkRequest,
  config.maxTimelineImportExportSize,
  undefined,
- request.body.rules_package_version
+ request.body?.rules_package_version || undefined
  );
  return response.ok({ body: validated ?? {} });
  } catch (err) {

diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_prepackaged_rules.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_prepackaged_rules.ts
@@ -130,7 +130,7 @@ export const checkAndStageUpdate = async () => {
  }
 
  try {
- const registryPackage = await fetchFindLatestPackage(DetectionRulesPackageName);
+ const registryPackage = await fetchFindLatestPackage(DETECTION_RULES_PACKAGE_NAME);
  if (!latestRulesPackageVersion || registryPackage.version !== latestRulesPackageVersion) {
  // automatically download and cache the latest in memory
  const downloaded = await getPackageRegistryRules(registryPackage.version);