reduced duplication, separated validate logic

elastic · Feb 23, 2022 · b24fa22 · b24fa22
1 parent 015dec1
commit b24fa22
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/x-pack/plugins/fleet/server/services/package_policy.ts b/x-pack/plugins/fleet/server/services/package_policy.ts
@@ -525,20 +525,23 @@ class PackagePolicyService implements PackagePolicyServiceInterface {
       }
       pkgVersion = installedPackage.version;
     }
-    const packageInfo = await getPackageInfo({
-      savedObjectsClient: soClient,
-      pkgName: packagePolicy!.package!.name,
-      pkgVersion: pkgVersion ?? '',
-    });
+    let packageInfo: PackageInfo | undefined;
+    if (packagePolicy) {
+      packageInfo = await getPackageInfo({
+        savedObjectsClient: soClient,
+        pkgName: packagePolicy!.package!.name,
+        pkgVersion: pkgVersion ?? '',
+      });
+    }
 
     this.validateUpgradePackagePolicy(id, packageInfo, packagePolicy);
 
-    return { packagePolicy: packagePolicy!, packageInfo };
+    return { packagePolicy: packagePolicy!, packageInfo: packageInfo! };
   }
 
   private validateUpgradePackagePolicy(
     id: string,
-    packageInfo: PackageInfo,
+    packageInfo?: PackageInfo,
     packagePolicy?: PackagePolicy
   ) {
     if (!packagePolicy) {