fix: send output from running console commands to logger

carlalexander · carlalexander · commit cfd246014b82 · 2024-12-19T14:05:41.000-05:00
diff --git a/src/Lambda/Handler/ConsoleCommandLambdaEventHandler.php b/src/Lambda/Handler/ConsoleCommandLambdaEventHandler.php
@@ -18,12 +18,28 @@
 use Ymir\Runtime\Lambda\InvocationEvent\InvocationEventInterface;
 use Ymir\Runtime\Lambda\Response\ProcessResponse;
 use Ymir\Runtime\Lambda\Response\ResponseInterface;
+use Ymir\Runtime\Logger;
 
 /**
  * Lambda invocation event handler for console commands.
  */
 class ConsoleCommandLambdaEventHandler implements LambdaEventHandlerInterface
 {
+    /**
+     * The logger that sends logs to CloudWatch.
+     *
+     * @var Logger
+     */
+    private $logger;
+
+    /**
+     * Constructor.
+     */
+    public function __construct(Logger $logger)
+    {
+        $this->logger = $logger;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -43,7 +59,9 @@ public function handle(InvocationEventInterface $event): ResponseInterface
 
         $process = Process::fromShellCommandline("{$event->getCommand()} 2>&1");
         $process->setTimeout(null);
-        $process->run();
+        $process->run(function ($type, $output) {
+            $this->logger->info($output);
+        });
 
         return new ProcessResponse($process);
     }
diff --git a/src/Runtime.php b/src/Runtime.php
@@ -120,7 +120,7 @@ public static function createFromEnvironmentVariable(): self
             new LambdaEventHandlerCollection($logger, [
                 new PingLambdaEventHandler(),
                 new WarmUpEventHandler(new LambdaClient(['region' => $region], null, null, $logger)),
-                new ConsoleCommandLambdaEventHandler(),
+                new ConsoleCommandLambdaEventHandler($logger),
                 new WordPressLambdaEventHandler($logger, $phpFpmProcess, $rootDirectory),
                 new BedrockLambdaEventHandler($logger, $phpFpmProcess, $rootDirectory),
                 new PhpScriptLambdaEventHandler($logger, $phpFpmProcess, $rootDirectory, getenv('_HANDLER') ?: 'index.php'),
diff --git a/tests/Unit/Lambda/Handler/ConsoleCommandLambdaEventHandlerTest.php b/tests/Unit/Lambda/Handler/ConsoleCommandLambdaEventHandlerTest.php
@@ -18,6 +18,7 @@
 use Ymir\Runtime\Lambda\Response\ProcessResponse;
 use Ymir\Runtime\Tests\Mock\ConsoleCommandEventMockTrait;
 use Ymir\Runtime\Tests\Mock\InvocationEventInterfaceMockTrait;
+use Ymir\Runtime\Tests\Mock\LoggerMockTrait;
 
 /**
  * @covers \Ymir\Runtime\Lambda\Handler\ConsoleCommandLambdaEventHandler
@@ -26,31 +27,31 @@ class ConsoleCommandLambdaEventHandlerTest extends TestCase
 {
     use ConsoleCommandEventMockTrait;
     use InvocationEventInterfaceMockTrait;
+    use LoggerMockTrait;
 
     public function testCanHandlePingEventType()
     {
-        $handler = new ConsoleCommandLambdaEventHandler();
-
-        $this->assertTrue($handler->canHandle($this->getConsoleCommandEventMock()));
+        $this->assertTrue((new ConsoleCommandLambdaEventHandler($this->getLoggerMock()))->canHandle($this->getConsoleCommandEventMock()));
     }
 
     public function testCanHandleWrongEventType()
     {
-        $handler = new ConsoleCommandLambdaEventHandler();
-
-        $this->assertFalse($handler->canHandle($this->getInvocationEventInterfaceMock()));
+        $this->assertFalse((new ConsoleCommandLambdaEventHandler($this->getLoggerMock()))->canHandle($this->getInvocationEventInterfaceMock()));
     }
 
     public function testHandleWithSuccessfulCommand()
     {
         $event = $this->getConsoleCommandEventMock();
-        $handler = new ConsoleCommandLambdaEventHandler();
+        $logger = $this->getLoggerMock();
 
         $event->expects($this->once())
               ->method('getCommand')
               ->willReturn('ls -la');
 
-        $response = $handler->handle($event);
+        $logger->expects($this->once())
+               ->method('info');
+
+        $response = (new ConsoleCommandLambdaEventHandler($logger))->handle($event);
         $responseData = $response->getResponseData();
 
         $this->assertInstanceOf(ProcessResponse::class, $response);
@@ -61,13 +62,16 @@ public function testHandleWithSuccessfulCommand()
     public function testHandleWithUnsuccessfulCommand()
     {
         $event = $this->getConsoleCommandEventMock();
-        $handler = new ConsoleCommandLambdaEventHandler();
+        $logger = $this->getLoggerMock();
 
         $event->expects($this->once())
               ->method('getCommand')
               ->willReturn('foo');
 
-        $response = $handler->handle($event);
+        $logger->expects($this->once())
+               ->method('info');
+
+        $response = (new ConsoleCommandLambdaEventHandler($logger))->handle($event);
         $responseData = $response->getResponseData();
 
         $this->assertInstanceOf(ProcessResponse::class, $response);
@@ -80,8 +84,6 @@ public function testHandleWithWrongEventType()
         $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionMessage('ConsoleCommandLambdaEventHandler can only handle ConsoleCommandEvent objects');
 
-        $handler = new ConsoleCommandLambdaEventHandler();
-
-        $handler->handle($this->getInvocationEventInterfaceMock());
+        (new ConsoleCommandLambdaEventHandler($this->getLoggerMock()))->handle($this->getInvocationEventInterfaceMock());
     }
 }
