Merge pull request #299 from mnapoli/new-runtimes

Update runtimes by adding more extensions and fixing stuff
brefphp · Apr 6, 2019 · dfbf327 · dfbf327
2 parents e8f31ea + 94fd0f1
commit dfbf327
Show file tree

Hide file tree

Showing 16 changed files with 201 additions and 91 deletions.
diff --git a/docs/environment/php.md b/docs/environment/php.md
@@ -48,6 +48,7 @@ Bref strives to include the most common PHP extensions. If a major PHP extension
       <td  align="left" valign="top">
         <ul>
         <li>Core</li>
+        <li><a href="http://php.net/manual/en/book.bc.php">bcmath</a></li>
         <li><a href="http://php.net/manual/en/intro.ctype.php">ctype</a></li>
         <li><a href="http://php.net/manual/en/book.curl.php">curl</a></li>
         <li>date</li>
@@ -66,6 +67,7 @@ Bref strives to include the most common PHP extensions. If a major PHP extension
         <ul>
         <li><a href="http://php.net/manual/en/book.libxml.php">libxml</a></li>
         <li><a href="http://php.net/manual/en/book.mbstring.php">mbstring</a></li>
+        <li><a href="http://php.net/manual/en/book.mysqli.php">mysqli</a></li>
         <li><a href="http://php.net/manual/en/book.mysqlnd.php">mysqlnd</a></li>
         <li><a href="http://php.net/manual/en/book.opcache.php">opcache</a></li>
         <li><a href="http://php.net/manual/en/book.openssl.php">openssl</a></li>
@@ -84,6 +86,7 @@ Bref strives to include the most common PHP extensions. If a major PHP extension
         <li><a href="http://php.net/manual/en/book.session.php">session</a></li>
         <li><a href="http://php.net/manual/en/book.SimpleXML.php">SimpleXML</a></li>
         <li><a href="http://php.net/manual/en/book.sodium.php">sodium</a></li>
+        <li><a href="http://php.net/manual/en/book.soap.php">SOAP</a></li>
         <li><a href="http://php.net/manual/en/book.SPL.php">SPL</a></li>
         <li><a href="http://php.net/manual/en/book.sqlite3.php">sqlite3</a></li>
         <li><a href="http://php.net/manual/en/book.standard.php">standard</a></li>

diff --git a/docs/frameworks/laravel.md b/docs/frameworks/laravel.md
@@ -39,7 +39,7 @@ Resources:
             Timeout: 30 # in seconds (API Gateway has a timeout of 30 seconds)
             Runtime: provided
             Layers:
-                - 'arn:aws:lambda:us-east-1:209497400698:layer:php-72-fpm:1'
+                - 'arn:aws:lambda:us-east-1:209497400698:layer:php-72-fpm:4'
             Events:
                 # The function will match all HTTP URLs
                 HttpRoot:
@@ -62,9 +62,9 @@ Resources:
             Runtime: provided
             Layers:
                 # PHP runtime
-                - 'arn:aws:lambda:us-east-1:209497400698:layer:php-72:1'
+                - 'arn:aws:lambda:us-east-1:209497400698:layer:php-72:4'
                 # Console layer
-                - 'arn:aws:lambda:us-east-1:209497400698:layer:console:1'
+                - 'arn:aws:lambda:us-east-1:209497400698:layer:console:4'
 
 Outputs:
     DemoHttpApi:

diff --git a/docs/frameworks/symfony.md b/docs/frameworks/symfony.md
@@ -39,7 +39,7 @@ Resources:
             MemorySize: 1024
             Runtime: provided
             Layers:
-                - 'arn:aws:lambda:us-east-1:209497400698:layer:php-73-fpm:1'
+                - 'arn:aws:lambda:us-east-1:209497400698:layer:php-73-fpm:4'
             Events:
                 HttpRoot:
                     Type: Api
@@ -61,8 +61,8 @@ Resources:
             Timeout: 120 # in seconds
             Runtime: provided
             Layers:
-                - 'arn:aws:lambda:us-east-1:209497400698:layer:php-73:1' # PHP
-                - 'arn:aws:lambda:us-east-1:209497400698:layer:console:1' # The "console" layer
+                - 'arn:aws:lambda:us-east-1:209497400698:layer:php-73:4' # PHP
+                - 'arn:aws:lambda:us-east-1:209497400698:layer:console:4' # The "console" layer
 
 Outputs:
     DemoApi:

diff --git a/runtime/php/layers/fpm/php.ini b/runtime/php/layers/fpm/php.ini
@@ -19,6 +19,13 @@ opcache.max_accelerated_files=10000
 
 zend_extension=opcache.so
 
+; This directive determines which super global arrays are registered when PHP
+; starts up. G,P,C,E & S are abbreviations for the following respective super
+; globals: GET, POST, COOKIE, ENV and SERVER.
+; We explicitly populate all variables else ENV is not populated by default.
+; See https://github.com/mnapoli/bref/pull/291
+variables_order="EGPCS"
+
 ; The lambda environment is not compatible with fastcgi_finish_request
 ; See https://github.com/mnapoli/bref/issues/214
 disable_functions=fastcgi_finish_request
diff --git a/runtime/php/layers/function/php.ini b/runtime/php/layers/function/php.ini
@@ -24,3 +24,10 @@ opcache.memory_consumption=128
 opcache.max_accelerated_files=10000
 
 zend_extension=opcache.so
+
+; This directive determines which super global arrays are registered when PHP
+; starts up. G,P,C,E & S are abbreviations for the following respective super
+; globals: GET, POST, COOKIE, ENV and SERVER.
+; We explicitly populate all variables else ENV is not populated by default.
+; See https://github.com/mnapoli/bref/pull/291
+variables_order="EGPCS"
diff --git a/runtime/php/php.Dockerfile b/runtime/php/php.Dockerfile
@@ -408,8 +408,10 @@ RUN set -xe \
         --with-gettext \
         --enable-mbstring \
         --with-pdo-mysql=shared,mysqlnd \
+        --with-mysqli \
         --enable-pcntl \
         --enable-zip \
+        --enable-bcmath \
         --with-pdo-pgsql=shared,${INSTALL_DIR} \
         --enable-intl=shared \
         --enable-opcache-file \

diff --git a/src/Runtime/LambdaRuntime.php b/src/Runtime/LambdaRuntime.php
@@ -22,6 +22,12 @@
  */
 class LambdaRuntime
 {
+    /** @var resource|null */
+    private $handler;
+
+    /** @var resource|null */
+    private $returnHandler;
+
     /** @var string */
     private $apiUrl;
 
@@ -39,6 +45,27 @@ public function __construct(string $apiUrl)
         $this->apiUrl = $apiUrl;
     }
 
+    public function __destruct()
+    {
+        $this->closeHandler();
+        $this->closeReturnHandler();
+    }
+
+    private function closeHandler(): void
+    {
+        if ($this->handler !== null) {
+            curl_close($this->handler);
+            $this->handler = null;
+        }
+    }
+    private function closeReturnHandler(): void
+    {
+        if ($this->returnHandler !== null) {
+            curl_close($this->returnHandler);
+            $this->returnHandler = null;
+        }
+    }
+
     /**
      * Process the next event.
      *
@@ -70,13 +97,15 @@ public function processNextEvent(callable $handler): void
      */
     private function waitNextInvocation(): array
     {
-        $handler = curl_init("http://{$this->apiUrl}/2018-06-01/runtime/invocation/next");
-        curl_setopt($handler, CURLOPT_FOLLOWLOCATION, true);
-        curl_setopt($handler, CURLOPT_FAILONERROR, true);
+        if ($this->handler === null) {
+            $this->handler = curl_init("http://{$this->apiUrl}/2018-06-01/runtime/invocation/next");
+            curl_setopt($this->handler, CURLOPT_FOLLOWLOCATION, true);
+            curl_setopt($this->handler, CURLOPT_FAILONERROR, true);
+        }
 
         // Retrieve invocation ID
         $invocationId = '';
-        curl_setopt($handler, CURLOPT_HEADERFUNCTION, function ($ch, $header) use (&$invocationId) {
+        curl_setopt($this->handler, CURLOPT_HEADERFUNCTION, function ($ch, $header) use (&$invocationId) {
             if (! preg_match('/:\s*/', $header)) {
                 return strlen($header);
             }
@@ -90,23 +119,24 @@ private function waitNextInvocation(): array
 
         // Retrieve body
         $body = '';
-        curl_setopt($handler, CURLOPT_WRITEFUNCTION, function ($ch, $chunk) use (&$body) {
+        curl_setopt($this->handler, CURLOPT_WRITEFUNCTION, function ($ch, $chunk) use (&$body) {
             $body .= $chunk;
 
             return strlen($chunk);
         });
 
-        curl_exec($handler);
-        if (curl_error($handler)) {
-            throw new \Exception('Failed to fetch next Lambda invocation: ' . curl_error($handler));
+        curl_exec($this->handler);
+        if (curl_errno($this->handler) > 0) {
+            $message = curl_error($this->handler);
+            $this->closeHandler();
+            throw new \Exception('Failed to fetch next Lambda invocation: ' . $message);
         }
         if ($invocationId === '') {
             throw new \Exception('Failed to determine the Lambda invocation ID');
         }
         if ($body === '') {
             throw new \Exception('Empty Lambda runtime API response');
         }
-        curl_close($handler);
 
         $event = json_decode($body, true);
 
@@ -160,27 +190,28 @@ private function signalFailure(string $invocationId, \Throwable $error): void
      */
     public function failInitialization(string $message, ?\Throwable $error = null): void
     {
-        if ($error instanceof \Exception) {
-            $errorMessage = get_class($error) . ': ' . $error->getMessage();
-        } else {
-            $errorMessage = $error->getMessage();
-        }
-
         // Log the exception in CloudWatch
         echo "$message\n";
-        printf(
-            "Fatal error: %s in %s:%d\nStack trace:\n%s",
-            $errorMessage,
-            $error->getFile(),
-            $error->getLine(),
-            $error->getTraceAsString()
-        );
+        if ($error) {
+            if ($error instanceof \Exception) {
+                $errorMessage = get_class($error) . ': ' . $error->getMessage();
+            } else {
+                $errorMessage = $error->getMessage();
+            }
+            printf(
+                "Fatal error: %s in %s:%d\nStack trace:\n%s",
+                $errorMessage,
+                $error->getFile(),
+                $error->getLine(),
+                $error->getTraceAsString()
+            );
+        }
 
         $url = "http://{$this->apiUrl}/2018-06-01/runtime/init/error";
         $this->postJson($url, [
             'errorMessage' => $message . ' ' . $error->getMessage(),
-            'errorType' => get_class($error),
-            'stackTrace' => explode(PHP_EOL, $error->getTraceAsString()),
+            'errorType' => $error ? get_class($error) : 'Internal',
+            'stackTrace' => $error ? explode(PHP_EOL, $error->getTraceAsString()) : [],
         ]);
 
         exit(1);
@@ -196,21 +227,24 @@ private function postJson(string $url, $data): void
             throw new \Exception('Failed encoding Lambda JSON response: ' . json_last_error_msg());
         }
 
-        $handler = curl_init($url);
-        curl_setopt($handler, CURLOPT_CUSTOMREQUEST, 'POST');
-        curl_setopt($handler, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($handler, CURLOPT_FAILONERROR, true);
-        curl_setopt($handler, CURLOPT_POSTFIELDS, $jsonData);
-        curl_setopt($handler, CURLOPT_HTTPHEADER, [
+        if ($this->returnHandler === null) {
+            $this->returnHandler = curl_init();
+            curl_setopt($this->returnHandler, CURLOPT_CUSTOMREQUEST, 'POST');
+            curl_setopt($this->returnHandler, CURLOPT_RETURNTRANSFER, true);
+            curl_setopt($this->returnHandler, CURLOPT_FAILONERROR, true);
+        }
+
+        curl_setopt($this->returnHandler, CURLOPT_URL, $url);
+        curl_setopt($this->returnHandler, CURLOPT_POSTFIELDS, $jsonData);
+        curl_setopt($this->returnHandler, CURLOPT_HTTPHEADER, [
             'Content-Type: application/json',
             'Content-Length: ' . strlen($jsonData),
         ]);
-        curl_exec($handler);
-        if (curl_error($handler)) {
-            $errorMessage = curl_error($handler);
-            curl_close($handler);
+        curl_exec($this->returnHandler);
+        if (curl_errno($this->returnHandler) > 0) {
+            $errorMessage = curl_error($this->returnHandler);
+            $this->closeReturnHandler();
             throw new \Exception('Error while calling the Lambda runtime API: ' . $errorMessage);
         }
-        curl_close($handler);
     }
 }
diff --git a/template.yaml b/template.yaml
@@ -16,7 +16,7 @@ Resources:
             Handler: demo/function.php
             Runtime: provided
             Layers:
-                - 'arn:aws:lambda:us-east-2:209497400698:layer:php-72:3'
+                - 'arn:aws:lambda:us-east-2:209497400698:layer:php-72:4'
 
     HttpFunction:
         Type: AWS::Serverless::Function
@@ -29,7 +29,7 @@ Resources:
             MemorySize: 1024 # The memory size is related to the pricing and CPU power
             Runtime: provided
             Layers:
-                - 'arn:aws:lambda:us-east-2:209497400698:layer:php-72-fpm:3'
+                - 'arn:aws:lambda:us-east-2:209497400698:layer:php-72-fpm:4'
             Events:
                 HttpRoot:
                     Type: Api
@@ -51,8 +51,8 @@ Resources:
             Handler: demo/console.php
             Runtime: provided
             Layers:
-                - 'arn:aws:lambda:us-east-2:209497400698:layer:php-72:3'
-                - 'arn:aws:lambda:us-east-2:209497400698:layer:console:3'
+                - 'arn:aws:lambda:us-east-2:209497400698:layer:php-72:4'
+                - 'arn:aws:lambda:us-east-2:209497400698:layer:console:4'
 
 Outputs:
     DemoHttpApi:

diff --git a/template/console/template.yaml b/template/console/template.yaml
@@ -14,5 +14,5 @@ Resources:
             MemorySize: 1024 # The memory size is related to the pricing and CPU power
             Runtime: provided
             Layers:
-                - 'arn:aws:lambda:us-east-1:209497400698:layer:php-73:1' # PHP
-                - 'arn:aws:lambda:us-east-1:209497400698:layer:console:1' # The "console" layer
+                - 'arn:aws:lambda:us-east-1:209497400698:layer:php-73:4' # PHP
+                - 'arn:aws:lambda:us-east-1:209497400698:layer:console:4' # The "console" layer
diff --git a/template/default/template.yaml b/template/default/template.yaml
@@ -14,4 +14,4 @@ Resources:
             MemorySize: 1024 # The memory size is related to the pricing and CPU power
             Runtime: provided
             Layers:
-                - 'arn:aws:lambda:us-east-1:209497400698:layer:php-73:1'
+                - 'arn:aws:lambda:us-east-1:209497400698:layer:php-73:4'
diff --git a/template/http/template.yaml b/template/http/template.yaml
@@ -14,7 +14,7 @@ Resources:
             MemorySize: 1024 # The memory size is related to the pricing and CPU power
             Runtime: provided
             Layers:
-                - 'arn:aws:lambda:us-east-1:209497400698:layer:php-73-fpm:1'
+                - 'arn:aws:lambda:us-east-1:209497400698:layer:php-73-fpm:4'
             Events:
                 # The function will match all HTTP URLs
                 HttpRoot:

diff --git a/tests/Sam/Php/function.php b/tests/Sam/Php/function.php
@@ -11,6 +11,14 @@
         return ini_get_all(null, false);
     }
 
+    if ($event['env'] ?? false) {
+        return [
+            '$_ENV' => $_ENV['FOO'] ?? null,
+            '$_SERVER' => $_SERVER['FOO'] ?? null,
+            'getenv' => getenv('FOO'),
+        ];
+    }
+
     if ($event['stdout'] ?? false) {
         echo 'This is a test log by writing to stdout';
     }

diff --git a/tests/Sam/PhpFpm/index.php b/tests/Sam/PhpFpm/index.php
@@ -12,6 +12,16 @@
     return;
 }
 
+if ($_GET['env'] ?? false) {
+    header('Content-Type: application/json');
+    echo json_encode([
+        '$_ENV' => $_ENV['FOO'] ?? null,
+        '$_SERVER' => $_SERVER['FOO'] ?? null,
+        'getenv' => getenv('FOO'),
+    ], JSON_PRETTY_PRINT);
+    return;
+}
+
 if ($_GET['stderr'] ?? false) {
     $stderr = fopen('php://stderr', 'a');
     fwrite($stderr, 'This is a test log into stderr');