feat: set command timeout based on remaining time

Author: carlalexander

src/Lambda/Handler/ConsoleCommandLambdaEventHandler.php

@@ -58,7 +58,7 @@ public function handle(InvocationEventInterface $event): ResponseInterface
         }
 
         $process = Process::fromShellCommandline("{$event->getCommand()} 2>&1");
-        $process->setTimeout(null);
+        $process->setTimeout(max(1, $event->getContext()->getRemainingTimeInMs() / 1000 - 1));
         $process->run(function ($type, $output): void {
             $this->logger->info($output);
         });

tests/Unit/Lambda/Handler/ConsoleCommandLambdaEventHandlerTest.php

@@ -17,15 +17,26 @@
 use Ymir\Runtime\Lambda\Handler\ConsoleCommandLambdaEventHandler;
 use Ymir\Runtime\Lambda\Response\ProcessResponse;
 use Ymir\Runtime\Tests\Mock\ConsoleCommandEventMockTrait;
+use Ymir\Runtime\Tests\Mock\ContextMockTrait;
 use Ymir\Runtime\Tests\Mock\InvocationEventInterfaceMockTrait;
 use Ymir\Runtime\Tests\Mock\LoggerMockTrait;
 
 class ConsoleCommandLambdaEventHandlerTest extends TestCase
 {
     use ConsoleCommandEventMockTrait;
+    use ContextMockTrait;
     use InvocationEventInterfaceMockTrait;
     use LoggerMockTrait;
 
+    public static function provideTimeouts(): \Iterator
+    {
+        yield [60000, 59.0];
+        yield [10000, 9.0];
+        yield [2000, 1.0];
+        yield [1000, 1.0];
+        yield [500, 1.0];
+    }
+
     public function testCanHandlePingEventType(): void
     {
         $this->assertTrue((new ConsoleCommandLambdaEventHandler($this->getLoggerMock()))->canHandle($this->getConsoleCommandEventMock()));
@@ -36,15 +47,56 @@ public function testCanHandleWrongEventType(): void
         $this->assertFalse((new ConsoleCommandLambdaEventHandler($this->getLoggerMock()))->canHandle($this->getInvocationEventInterfaceMock()));
     }
 
+    /**
+     * @dataProvider provideTimeouts
+     */
+    public function testHandleSetsCorrectTimeout(int $remainingTimeInMs, float $expectedTimeout): void
+    {
+        $context = $this->getContextMock();
+        $event = $this->getConsoleCommandEventMock();
+        $logger = $this->getLoggerMock();
+
+        $event->expects($this->once())
+              ->method('getCommand')
+              ->willReturn('ls -la');
+
+        $event->expects($this->once())
+              ->method('getContext')
+              ->willReturn($context);
+
+        $context->expects($this->once())
+                ->method('getRemainingTimeInMs')
+                ->willReturn($remainingTimeInMs);
+
+        $response = (new ConsoleCommandLambdaEventHandler($logger))->handle($event);
+
+        $reflection = new \ReflectionClass(ProcessResponse::class);
+        $property = $reflection->getProperty('process');
+        $property->setAccessible(true);
+
+        $process = $property->getValue($response);
+
+        $this->assertEquals($expectedTimeout, $process->getTimeout());
+    }
+
     public function testHandleWithSuccessfulCommand(): void
     {
+        $context = $this->getContextMock();
         $event = $this->getConsoleCommandEventMock();
         $logger = $this->getLoggerMock();
 
         $event->expects($this->once())
               ->method('getCommand')
               ->willReturn('ls -la');
 
+        $event->expects($this->once())
+              ->method('getContext')
+              ->willReturn($context);
+
+        $context->expects($this->once())
+                ->method('getRemainingTimeInMs')
+                ->willReturn(60000);
+
         $logger->expects($this->once())
                ->method('info');
 
@@ -58,13 +110,22 @@ public function testHandleWithSuccessfulCommand(): void
 
     public function testHandleWithUnsuccessfulCommand(): void
     {
+        $context = $this->getContextMock();
         $event = $this->getConsoleCommandEventMock();
         $logger = $this->getLoggerMock();
 
         $event->expects($this->once())
               ->method('getCommand')
               ->willReturn('foo');
 
+        $event->expects($this->once())
+              ->method('getContext')
+              ->willReturn($context);
+
+        $context->expects($this->once())
+                ->method('getRemainingTimeInMs')
+                ->willReturn(60000);
+
         $logger->expects($this->once())
                ->method('info');