Report silent build command failures

Author: ChiragAgg5k

app/config/errors.php

@@ -24,6 +24,14 @@
         'message' => 'You are not authorized to access this resource.',
         'code' => 401,
     ],
+    /* Build */
+    Exception::BUILD_FAILED  => [
+        'name' => Exception::BUILD_FAILED,
+        'short' => 'Build failed',
+        'message' => 'Build failed.',
+        'code' => 400,
+        'publish' => false,
+    ],
     /* Runtime */
     Exception::RUNTIME_FAILED  => [
         'name' => Exception::RUNTIME_FAILED,

src/Executor/Exception.php

@@ -24,6 +24,8 @@ class Exception extends \RuntimeException
 
     public const string EXECUTION_BAD_JSON    = 'execution_bad_json';
 
+    public const string BUILD_FAILED       = 'build_failed';
+
     public const string RUNTIME_NOT_FOUND    = 'runtime_not_found';
 
     public const string RUNTIME_CONFLICT     = 'runtime_conflict';

src/Executor/Runner/Docker.php

@@ -376,8 +376,9 @@ public function createRuntime(
              * Execute any commands if they were provided
              */
             if ($command !== '' && $command !== '0') {
+                $stdout = '';
+
                 try {
-                    $stdout = '';
                     $status = $this->orchestration->execute(
                         name: $runtimeName,
                         command: $this->getBuildCommands($command, $version),
@@ -386,7 +387,12 @@ public function createRuntime(
                     );
 
                     if (!$status) {
-                        throw new ExecutorException(ExecutorException::RUNTIME_FAILED, 'Failed to create runtime: ' . $stdout);
+                        $message = \trim($stdout);
+
+                        throw new ExecutorException(
+                            ExecutorException::BUILD_FAILED,
+                            $message === '' ? 'Build command failed.' : $message
+                        );
                     }
 
                     if ($version === 'v2') {
@@ -398,6 +404,16 @@ public function createRuntime(
                     } elseif (!$cacheEnabled) {
                         $output = Logs::get($runtimeName);
                     }
+                } catch (ExecutorException $err) {
+                    throw $err;
+                } catch (OrchestrationException $err) {
+                    $message = \trim($stdout);
+
+                    throw new ExecutorException(
+                        ExecutorException::BUILD_FAILED,
+                        $message === '' ? 'Build command failed.' : $message,
+                        previous: $err
+                    );
                 } catch (Throwable $err) {
                     throw new ExecutorException(ExecutorException::RUNTIME_FAILED, $err->getMessage(), null, $err);
                 }
@@ -511,6 +527,26 @@ public function createRuntime(
                 $message .= $chunk['content'];
             }
 
+            if ($throwable instanceof ExecutorException) {
+                $throwableMessage = \trim($throwable->getMessage());
+
+                if ($message !== '' && \str_starts_with($throwableMessage, $message)) {
+                    $throwableMessage = \trim(\substr($throwableMessage, \strlen($message)));
+                }
+
+                if ($throwableMessage !== '' && ! \str_contains($message, $throwableMessage)) {
+                    $remaining = MAX_BUILD_LOG_SIZE - \strlen($message);
+                    $remaining -= $message === '' ? 0 : 1;
+
+                    if ($remaining > 0) {
+                        $throwableMessage = \mb_strcut($throwableMessage, 0, $remaining);
+                        $message .= $message === '' ? $throwableMessage : "\n" . $throwableMessage;
+                    }
+                }
+
+                throw new ExecutorException($throwable->getType(), $message, $throwable->getCode(), $throwable);
+            }
+
             throw new \Exception($message, $throwable->getCode() ?: 500, $throwable);
         }
 
@@ -545,14 +581,14 @@ private function getBuildCommands(string $command, string $version): array
             return [
                 'sh',
                 '-c',
-                'touch /var/tmp/logs.txt && (' . $command . ') >> /var/tmp/logs.txt 2>&1 && cat /var/tmp/logs.txt'
+                'touch /var/tmp/logs.txt && (' . $command . ') >> /var/tmp/logs.txt 2>&1; status=$?; cat /var/tmp/logs.txt; if [ $status -ne 0 ]; then echo "Build command exited with code $status."; fi; exit $status'
             ];
         }
 
         return [
             'bash',
             '-c',
-            'mkdir -p /tmp/logging && touch /tmp/logging/timings.txt && touch /tmp/logging/logs.txt && script --log-out /tmp/logging/logs.txt --flush --log-timing /tmp/logging/timings.txt --return --quiet --command "' . \str_replace('"', '\"', $command) . '"'
+            'mkdir -p /tmp/logging && touch /tmp/logging/timings.txt && touch /tmp/logging/logs.txt && script --log-out /tmp/logging/logs.txt --flush --log-timing /tmp/logging/timings.txt --return --quiet --command "' . \str_replace('"', '\"', $command) . '"; status=$?; if [ $status -ne 0 ]; then echo "Build command exited with code $status."; fi; exit $status'
         ];
     }
 

tests/e2e/ExecutorTest.php

@@ -299,6 +299,7 @@ public function testBuild(): void
 
         $response = $this->client->call(Client::METHOD_POST, '/runtimes', [], $params);
         $this->assertEquals(400, $response['headers']['status-code']);
+        $this->assertEquals('build_failed', $response['body']['type']);
 
         /** Invalid cache key */
         $params = [

tests/unit/Executor/Runner/DockerTest.php

@@ -44,6 +44,19 @@ public function testNoCacheLifecycleShellCommandsAreGenerated(): void
         $this->assertStringNotContainsString('build-cache-save.sh', $command);
     }
 
+    public function testBuildCommandsReportSilentNonZeroExit(): void
+    {
+        $docker = $this->createDocker();
+
+        foreach (['v2', 'v5'] as $version) {
+            $commands = $this->invokeGetBuildCommands($docker, 'exit 1', $version);
+            $command = \implode(' ', $commands);
+
+            $this->assertStringContainsString('Build command exited with code $status.', $command);
+            $this->assertStringContainsString('exit $status', $command);
+        }
+    }
+
     public function testInvalidBuildCacheKeyIsRejected(): void
     {
         $this->expectException(\Exception::class);