[Fleet] Fix formatNonFatal error typings and avoid type error (elasti…

…c#119203) (elastic#119241) Co-authored-by: Nicolas Chaulet <[email protected]>
kibanamachine · Nov 19, 2021 · f70af1a · f70af1a
1 parent db0ccdd
commit f70af1a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/x-pack/plugins/fleet/server/services/managed_package_policies.ts b/x-pack/plugins/fleet/server/services/managed_package_policies.ts
@@ -74,7 +74,7 @@ export const upgradeManagedPackagePolicies = async (
       if (dryRunResults.hasErrors) {
         const errors = dryRunResults.diff
           ? dryRunResults.diff?.[1].errors
-          : dryRunResults.body?.message;
+          : [dryRunResults.body?.message];
 
         appContextService
           .getLogger()

diff --git a/x-pack/plugins/fleet/server/services/setup.ts b/x-pack/plugins/fleet/server/services/setup.ts
@@ -220,8 +220,15 @@ export function formatNonFatalErrors(
         name: e.error.name,
         message: e.error.message,
       };
-    } else {
+    } else if ('errors' in e) {
       return e.errors.map((upgradePackagePolicyError: any) => {
+        if (typeof upgradePackagePolicyError === 'string') {
+          return {
+            name: 'SetupNonFatalError',
+            message: upgradePackagePolicyError,
+          };
+        }
+
         return {
           name: upgradePackagePolicyError.key,
           message: upgradePackagePolicyError.message,