Fix test

elastic · May 12, 2022 · aca1c0b · aca1c0b
1 parent 9781294
commit aca1c0b
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 12 deletions.
diff --git a/x-pack/plugins/fleet/server/routes/agent/upgrade_handler.ts b/x-pack/plugins/fleet/server/routes/agent/upgrade_handler.ts
@@ -170,21 +170,33 @@ const checkFleetServerVersion = async (
   soClient: SavedObjectsClientContract,
   esClient: ElasticsearchClient
 ) => {
-  const packagePolicyData = await packagePolicyService.list(soClient, {
-    perPage: SO_SEARCH_LIMIT,
-    kuery: `${PACKAGE_POLICY_SAVED_OBJECT_TYPE}.package.name: fleet_server`,
-  });
+  let packagePolicyData;
+  try {
+    packagePolicyData = await packagePolicyService.list(soClient, {
+      perPage: SO_SEARCH_LIMIT,
+      kuery: `${PACKAGE_POLICY_SAVED_OBJECT_TYPE}.package.name: fleet_server`,
+    });
+  } catch (error) {
+    throw new Error(error.message);
+  }
   const agentPoliciesIds = packagePolicyData?.items.map((item) => item.policy_id);
 
   if (agentPoliciesIds.length === 0) {
     return;
   }
 
-  const { agents: fleetServerAgents } = await getAgentsByKuery(esClient, {
-    showInactive: false,
-    perPage: SO_SEARCH_LIMIT,
-    kuery: `${AGENTS_PREFIX}.policy_id:${agentPoliciesIds.map((id) => `"${id}"`).join(' or ')}`,
-  });
+  let agentsResponse;
+  try {
+    agentsResponse = await getAgentsByKuery(esClient, {
+      showInactive: false,
+      perPage: SO_SEARCH_LIMIT,
+      kuery: `${AGENTS_PREFIX}.policy_id:${agentPoliciesIds.map((id) => `"${id}"`).join(' or ')}`,
+    });
+  } catch (error) {
+    throw new Error(error.message);
+  }
+
+  const { agents: fleetServerAgents } = agentsResponse;
 
   if (fleetServerAgents.length === 0) {
     return;
@@ -207,8 +219,9 @@ const checkFleetServerVersion = async (
 
   const maxFleetServerVersion = getMaxVersion(fleetServerVersions);
 
-  if (semverGt(versionToUpgradeNumber, maxFleetServerVersion))
+  if (semverGt(versionToUpgradeNumber, maxFleetServerVersion)) {
     throw new Error(
       `cannot upgrade agent to ${versionToUpgradeNumber} because it is higher than the latest fleet server version ${maxFleetServerVersion}`
     );
+  }
 };
diff --git a/x-pack/test/fleet_api_integration/apis/agents/upgrade.ts b/x-pack/test/fleet_api_integration/apis/agents/upgrade.ts
@@ -584,7 +584,8 @@ export default function (providerContext: FtrProviderContext) {
           index: AGENTS_INDEX,
           body: {
             doc: {
-              local_metadata: { elastic: { agent: { upgradeable: true, version: '0.0.0' } } },
+              policy_id: `agent-policy-1`,
+              local_metadata: { elastic: { agent: { upgradeable: true, version: '6.0.0' } } },
             },
           },
         });
@@ -594,7 +595,8 @@ export default function (providerContext: FtrProviderContext) {
           index: AGENTS_INDEX,
           body: {
             doc: {
-              local_metadata: { elastic: { agent: { upgradeable: true, version: '0.0.0' } } },
+              policy_id: `agent-policy-2`,
+              local_metadata: { elastic: { agent: { upgradeable: true, version: '6.0.0' } } },
             },
           },
         });