Make "type" exhaustive

elastic · May 9, 2023 · ed121b5 · ed121b5
1 parent 8cf8a1e
commit ed121b5
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/x-pack/plugins/fleet/common/types/models/data_stream.ts b/x-pack/plugins/fleet/common/types/models/data_stream.ts
@@ -24,3 +24,5 @@ export interface DataStream {
     serviceName: string;
   } | null;
 }
+
+export type PackageDataStreamTypes = 'logs' | 'metrics' | 'traces' | 'synthetics' | 'profiling';
diff --git a/x-pack/plugins/fleet/server/services/epm/data_streams/get.ts b/x-pack/plugins/fleet/server/services/epm/data_streams/get.ts
@@ -7,11 +7,13 @@
 
 import type { ElasticsearchClient } from '@kbn/core/server';
 
+import type { PackageDataStreamTypes } from '../../../../common/types';
+
 import { dataStreamService } from '../../data_streams';
 
 export async function getDataStreams(options: {
   esClient: ElasticsearchClient;
-  type?: 'logs' | 'metrics' | 'traces';
+  type?: PackageDataStreamTypes;
   datasetQuery?: string;
   sortDirection: 'asc' | 'desc';
   uncategorisedOnly: boolean;

diff --git a/x-pack/plugins/fleet/server/services/epm/packages/get.ts b/x-pack/plugins/fleet/server/services/epm/packages/get.ts
@@ -27,6 +27,7 @@ import type {
   PackageUsageStats,
   PackagePolicySOAttributes,
   Installable,
+  PackageDataStreamTypes,
 } from '../../../../common/types';
 import { PACKAGES_SAVED_OBJECT_TYPE } from '../../../constants';
 import type {
@@ -151,7 +152,7 @@ export async function getPackages(
 
 export async function getInstalledPackages(options: {
   savedObjectsClient: SavedObjectsClientContract;
-  type?: 'logs' | 'metrics' | 'traces';
+  type?: PackageDataStreamTypes;
   nameQuery?: string;
   pageAfter?: SortResults;
   pageSize: number;
@@ -219,7 +220,6 @@ export async function getInstalledPackages(options: {
       });
 
     return {
-      // icons: string; // TODO: implement
       name,
       version,
       status: installStatus,

diff --git a/x-pack/plugins/fleet/server/types/rest_spec/epm.ts b/x-pack/plugins/fleet/server/types/rest_spec/epm.ts
@@ -27,7 +27,13 @@ export const GetPackagesRequestSchema = {
 export const GetInstalledPackagesRequestSchema = {
   query: schema.object({
     type: schema.maybe(
-      schema.oneOf([schema.literal('logs'), schema.literal('metrics'), schema.literal('traces')])
+      schema.oneOf([
+        schema.literal('logs'),
+        schema.literal('metrics'),
+        schema.literal('traces'),
+        schema.literal('synthetics'),
+        schema.literal('profiling'),
+      ])
     ),
     nameQuery: schema.maybe(schema.string()),
     pageAfter: schema.maybe(schema.arrayOf(schema.oneOf([schema.string(), schema.number()]))),
@@ -41,7 +47,13 @@ export const GetInstalledPackagesRequestSchema = {
 export const GetDataStreamsRequestSchema = {
   query: schema.object({
     type: schema.maybe(
-      schema.oneOf([schema.literal('logs'), schema.literal('metrics'), schema.literal('traces')])
+      schema.oneOf([
+        schema.literal('logs'),
+        schema.literal('metrics'),
+        schema.literal('traces'),
+        schema.literal('synthetics'),
+        schema.literal('profiling'),
+      ])
     ),
     datasetQuery: schema.maybe(schema.string()),
     sortDirection: schema.oneOf([schema.literal('asc'), schema.literal('desc')], {