Fix condition and adjust tests (#78898)

(cherry picked from commit 676ce45)
elastic · Sep 30, 2020 · f6be7dc · f6be7dc
1 parent a31dd64
commit f6be7dc
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.test.ts b/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.test.ts
@@ -80,7 +80,15 @@ describe('test agent checkin new action services', () => {
       expect(
         await createAgentActionFromPolicyAction(
           mockSavedObjectsClient,
-          { ...mockAgent, local_metadata: { elastic: { agent: { version: '7.10.1-SNAPSHOT' } } } },
+          { ...mockAgent, local_metadata: { elastic: { agent: { version: '7.10.0-SNAPSHOT' } } } },
+          mockPolicyAction
+        )
+      ).toEqual(expectedResult);
+
+      expect(
+        await createAgentActionFromPolicyAction(
+          mockSavedObjectsClient,
+          { ...mockAgent, local_metadata: { elastic: { agent: { version: '7.10.2' } } } },
           mockPolicyAction
         )
       ).toEqual(expectedResult);
@@ -131,15 +139,15 @@ describe('test agent checkin new action services', () => {
       expect(
         await createAgentActionFromPolicyAction(
           mockSavedObjectsClient,
-          { ...mockAgent, local_metadata: { elastic: { agent: { version: '7.9.1-SNAPSHOT' } } } },
+          { ...mockAgent, local_metadata: { elastic: { agent: { version: '7.9.3' } } } },
           mockPolicyAction
         )
       ).toEqual(expectedResult);
 
       expect(
         await createAgentActionFromPolicyAction(
           mockSavedObjectsClient,
-          { ...mockAgent, local_metadata: { elastic: { agent: { version: '7.9.3' } } } },
+          { ...mockAgent, local_metadata: { elastic: { agent: { version: '7.9.1-SNAPSHOT' } } } },
           mockPolicyAction
         )
       ).toEqual(expectedResult);

diff --git a/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts b/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts
@@ -116,10 +116,21 @@ export async function createAgentActionFromPolicyAction(
   agent: Agent,
   policyAction: AgentPolicyAction
 ) {
-  // Transform the policy action for agent version <=  7.9 for BWC
+  // Transform the policy action for agent version <=  7.9.x for BWC
   const agentVersion = semver.parse((agent.local_metadata?.elastic as any)?.agent?.version);
   const agentPolicyAction: AgentPolicyAction | AgentPolicyActionV7_9 =
-    agentVersion && semver.lt(agentVersion, '7.10.0')
+    agentVersion &&
+    semver.lt(
+      agentVersion,
+      // A prerelease tag is added here so that agent versions with prerelease tags can be compared
+      // correctly using `semvar`
+      '7.10.0-SNAPSHOT',
+      // `@types/semvar` is out of date with the version of `semvar` we use and doesn't have a
+      // corresponding release version we can update the typing to :( so, the typing error is
+      // suppressed here even though it is supported by `semvar`
+      // @ts-expect-error
+      { includePrerelease: true }
+    )
       ? {
           ...policyAction,
           type: 'CONFIG_CHANGE',