From b24fa2269ab27ef981dc88743bd95cc47439b3c3 Mon Sep 17 00:00:00 2001
From: Julia Bardi <julia.bardi@elastic.co>
Date: Wed, 23 Feb 2022 10:06:56 +0100
Subject: [PATCH] reduced duplication, separated validate logic

---
 .../fleet/server/services/package_policy.ts     | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/x-pack/plugins/fleet/server/services/package_policy.ts b/x-pack/plugins/fleet/server/services/package_policy.ts
index e69693b8902ae..99a888d55c4ec 100644
--- 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) {