pkgVersion optional

elastic · Dec 7, 2021 · 023af3e · 023af3e
1 parent 9aa9a61
commit 023af3e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/x-pack/plugins/fleet/server/routes/epm/handlers.ts b/x-pack/plugins/fleet/server/routes/epm/handlers.ts
@@ -195,10 +195,14 @@ export const getInfoHandler: FleetRequestHandler<TypeOf<typeof GetInfoRequestSch
     try {
       const savedObjectsClient = context.fleet.epm.internalSoClient;
       const { pkgName, pkgVersion } = request.params;
-      if (!semverValid(pkgVersion)) {
+      if (pkgVersion && !semverValid(pkgVersion)) {
         throw new IngestManagerError('Package version is not a valid semver');
       }
-      const res = await getPackageInfo({ savedObjectsClient, pkgName, pkgVersion });
+      const res = await getPackageInfo({
+        savedObjectsClient,
+        pkgName,
+        pkgVersion: pkgVersion || '',
+      });
       const body: GetInfoResponse = {
         item: res,
       };
@@ -254,7 +258,7 @@ export const installPackageFromRegistryHandler: FleetRequestHandler<
   const res = await installPackage({
     installSource: 'registry',
     savedObjectsClient,
-    pkgkey: `${pkgName}-${pkgVersion}`,
+    pkgkey: pkgVersion ? `${pkgName}-${pkgVersion}` : pkgName,
     esClient,
     force: request.body?.force,
   });

diff --git a/x-pack/plugins/fleet/server/types/rest_spec/epm.ts b/x-pack/plugins/fleet/server/types/rest_spec/epm.ts
@@ -32,7 +32,7 @@ export const GetFileRequestSchema = {
 export const GetInfoRequestSchema = {
   params: schema.object({
     pkgName: schema.string(),
-    pkgVersion: schema.string(),
+    pkgVersion: schema.maybe(schema.string()),
   }),
 };
 
@@ -45,7 +45,7 @@ export const GetInfoRequestSchemaDeprecated = {
 export const UpdatePackageRequestSchema = {
   params: schema.object({
     pkgName: schema.string(),
-    pkgVersion: schema.string(),
+    pkgVersion: schema.maybe(schema.string()),
   }),
   body: schema.object({
     keepPoliciesUpToDate: schema.boolean(),
@@ -70,7 +70,7 @@ export const GetStatsRequestSchema = {
 export const InstallPackageFromRegistryRequestSchema = {
   params: schema.object({
     pkgName: schema.string(),
-    pkgVersion: schema.string(),
+    pkgVersion: schema.maybe(schema.string()),
   }),
   body: schema.nullable(
     schema.object({