fix: fix merge conflicts

Author: edersonbrilhante

lambdas/functions/control-plane/src/scale-runners/scale-up.test.ts

@@ -2219,7 +2219,6 @@ describe('scaleUp with Github Data Residency', () => {
   });
 });
 
-<<<<<<< HEAD
 describe('Retry mechanism tests', () => {
   beforeEach(() => {
     process.env.ENABLE_ORGANIZATION_RUNNERS = 'true';
@@ -2361,7 +2360,30 @@ describe('Retry mechanism tests', () => {
           id: msg.id,
           messageId: msg.messageId,
         }),
-=======
+      );
+    });
+  });
+
+  it('calls publishRetryMessage after runner creation', async () => {
+    const messages = createTestMessages(1);
+    mockCreateRunner.mockResolvedValue(['i-12345']); // Create the requested runner
+
+    const callOrder: string[] = [];
+    mockPublishRetryMessage.mockImplementation(() => {
+      callOrder.push('publishRetryMessage');
+      return Promise.resolve();
+    });
+    mockCreateRunner.mockImplementation(async () => {
+      callOrder.push('createRunner');
+      return ['i-12345'];
+    });
+
+    await scaleUpModule.scaleUp(messages);
+
+    expect(callOrder).toEqual(['createRunner', 'publishRetryMessage']);
+  });
+});
+
 describe('parseEc2OverrideConfig', () => {
   describe('Basic Fleet Overrides', () => {
     it('should parse instance-type label', () => {
@@ -2858,30 +2880,10 @@ describe('parseEc2OverrideConfig', () => {
       );
       expect(result?.InstanceRequirements?.BaselinePerformanceFactors?.Cpu?.References?.[1]?.InstanceFamily).toBe(
         'amd',
->>>>>>> 44df86d7 (test: fix test cases)
       );
     });
   });
 
-<<<<<<< HEAD
-  it('calls publishRetryMessage after runner creation', async () => {
-    const messages = createTestMessages(1);
-    mockCreateRunner.mockResolvedValue(['i-12345']); // Create the requested runner
-
-    const callOrder: string[] = [];
-    mockPublishRetryMessage.mockImplementation(() => {
-      callOrder.push('publishRetryMessage');
-      return Promise.resolve();
-    });
-    mockCreateRunner.mockImplementation(async () => {
-      callOrder.push('createRunner');
-      return ['i-12345'];
-    });
-
-    await scaleUpModule.scaleUp(messages);
-
-    expect(callOrder).toEqual(['createRunner', 'publishRetryMessage']);
-=======
   describe('Edge Cases', () => {
     it('should return undefined when empty array is provided', () => {
       const result = scaleUpModule.parseEc2OverrideConfig([]);
@@ -3078,7 +3080,6 @@ describe('parseEc2OverrideConfig', () => {
       expect(result?.InstanceRequirements?.SpotMaxPricePercentageOverLowestPrice).toBe(100);
       expect(result?.InstanceRequirements?.OnDemandMaxPricePercentageOverLowestPrice).toBe(150);
     });
->>>>>>> 44df86d7 (test: fix test cases)
   });
 });
 

lambdas/functions/control-plane/src/scale-runners/scale-up.ts

@@ -7,9 +7,7 @@ import { createGithubAppAuth, createGithubInstallationAuth, createOctokitClient
 import { createRunner, listEC2Runners, tag, terminateRunner } from './../aws/runners';
 import { Ec2OverrideConfig, RunnerInputParameters } from './../aws/runners.d';
 import { metricGitHubAppRateLimit } from '../github/rate-limit';
-<<<<<<< HEAD
 import { publishRetryMessage } from './job-retry';
-=======
 import {
   _InstanceType,
   Tenancy,
@@ -40,7 +38,6 @@ import {
   TotalLocalStorageGBRequest,
   BaselineEbsBandwidthMbpsRequest,
 } from '@aws-sdk/client-ec2';
->>>>>>> 44df86d7 (test: fix test cases)
 
 const logger = createChildLogger('scale-up');