MFH

Author: thekid

ChangeLog.md

@@ -3,10 +3,25 @@ AWS Lambda change log
 
 ## ?.?.? / ????-??-??
 
-## 2.4.0 / 2021-11-11
+## 3.1.0 / 2021-11-11
 
 * Enabled SimpleXML extension in order to be able to support AWS SDK
   see https://github.com/xp-forge/lambda/issues/8#issuecomment-966308720
+
+## 3.0.2 / 2021-10-21
+
+* Made library compatible with new major release of `xp-forge/json`
+  (@thekid)
+
+## 3.0.1 / 2021-10-21
+
+* Made library compatible with XP 11, newer `xp-framework/zip` library
+  (@thekid)
+
+## 3.0.0 / 2021-09-26
+
+* Merged PR #13: Refactor container execution to Process API provided by
+  XP 10.14. Drops BC with XP 9 and lower, see xp-framework/rfc#341.
   (@thekid)
 
 ## 2.3.0 / 2021-09-24

composer.json

@@ -6,14 +6,14 @@
   "description" : "AWS Lambda for the XP Framework",
   "keywords": ["module", "xp"],
   "require" : {
-    "xp-framework/core": "^10.0 | ^9.0 | ^8.0 | ^7.0",
-    "xp-framework/http": "^10.0 | ^9.0 | ^8.0 | ^7.0",
-    "xp-framework/zip": "^9.0 | ^8.0 | ^7.0",
-    "xp-forge/json": "^4.0",
+    "xp-framework/core": "^11.0 | ^10.14",
+    "xp-framework/http": "^10.0 | ^9.0",
+    "xp-framework/zip": "^10.0 | ^9.0",
+    "xp-forge/json": "^5.0 | ^4.0",
     "php": ">=7.0.0"
   },
   "require-dev" : {
-    "xp-framework/unittest": "^11.0 | ^10.0 | ^9.0 | ^8.0 |^7.0"
+    "xp-framework/unittest": "^11.0 | ^10.0"
   },
   "bin": ["bin/xp.xp-forge.lambda"],
   "autoload" : {

src/main/php/xp/lambda/CreateRuntime.class.php

@@ -15,7 +15,6 @@ public function __construct(string $version, Path $target, bool $rebuild= false)
   }
 
   public function run(): int {
-    $docker= $this->command();
 
     // Build test and runtime containers when -b is given
     if ($this->rebuild) {
@@ -29,20 +28,20 @@ public function run(): int {
     $code= "echo ' => PHP ', PHP_VERSION, ' & Zend ', zend_version(), ' @ ', php_uname(), PHP_EOL, ' => ', implode(' ', get_loaded_extensions()), PHP_EOL;";
     Console::writeLine();
     Console::writeLine("[+] Running {$runtime}\e[34m");
-    passthru("{$docker} run --rm {$runtime} /opt/php/bin/php -r \"{$code}\"", $result);
+    $this->passthru(['run', '--rm', $runtime, '/opt/php/bin/php', '-r', $code]);
     Console::writeLine("\e[0m");
 
     // Extract runtime
     $container= uniqid();
     $commands= [
-      "{$docker} create --name {$container} {$runtime}",
-      "{$docker} cp {$container}:/opt/php/runtime.zip {$this->target}",
-      "{$docker} rm -f {$container}",
+      ['create', '--name', $container, $runtime],
+      ['cp', "{$container}:/opt/php/runtime.zip", $this->target],
+      ['rm', '-f', $container],
     ];
     Console::writeLine('[+] Creating ', $this->target);
     foreach ($commands as $command) {
-      Console::writeLinef("\e[34m => %s\e[0m", $command);
-      exec($command, $out, $result);
+      Console::writeLinef("\e[34m => %s\e[0m", implode(' ', $command));
+      $result= $this->passthru($command);
     }
 
     Console::writeLine();

src/main/php/xp/lambda/Docker.class.php

@@ -1,48 +1,24 @@
 <?php namespace xp\lambda;
 
 use io\Path;
-use lang\CommandLine;
+use lang\{CommandLine, Process};
 
 trait Docker {
   private $command= null;
 
   /**
-   * Resolves a list of commands. Copy of `lang.Process::resolve()` from
-   * XP 10.14 in order to be compatible with older XP versions.
+   * Resolves a list of commands. Raises an exception if none of the passed
+   * commands is found.
    *
-   * @see    https://github.com/xp-framework/core/pull/279
    * @param  string[] $commands
    * @return string
    * @throws lang.IllegalStateException
    */
   private function resolve($commands) {
-    clearstatcache();
-
-    // PATHEXT is in form ".{EXT}[;.{EXT}[;...]]"
-    $extensions= array_merge([''], explode(PATH_SEPARATOR, getenv('PATHEXT')));
-    $paths= $paths= explode(PATH_SEPARATOR, getenv('PATH'));
+    $c= CommandLine::forName(PHP_OS);
     foreach ($commands as $command) {
-
-      // If the command is in fully qualified form and refers to a file
-      // that does not exist (e.g. "C:\DoesNotExist.exe", "\DoesNotExist.com"
-      // or /usr/bin/doesnotexist), do not attempt to search for it.
-      if ((DIRECTORY_SEPARATOR === $command[0]) || ((strncasecmp(PHP_OS, 'Win', 3) === 0) &&
-        strlen($command) > 1 && (':' === $command[1] || '/' === $command[0])
-      )) {
-        foreach ($extensions as $ext) {
-          $q= $command.$ext;
-          if (file_exists($q) && !is_dir($q)) return realpath($q);
-        }
-        continue;
-      }
-
-      // Check the PATH environment setting for possible locations of the
-      // executable if its name is not a fully qualified path name.
-      foreach ($paths as $path) {
-        foreach ($extensions as $ext) {
-          $q= $path.DIRECTORY_SEPARATOR.$command.$ext;
-          if (file_exists($q) && !is_dir($q)) return realpath($q);
-        }
+      foreach ($c->resolve($command) as $resolved) {
+        return $resolved;
       }
     }
 
@@ -51,15 +27,27 @@ private function resolve($commands) {
 
   /** Returns docker runtime */
   private function command() {
-    return $this->command ?? $this->command= CommandLine::forName(PHP_OS)->compose($this->resolve(['docker', 'podman']));
+    return $this->command ?? $this->command= $this->resolve(['docker', 'podman']);
+  }
+
+  /** Runs docker with arguments */
+  private function passthru($arguments) {
+    return (new Process($this->command(), $arguments, null, null, [STDIN, STDOUT, STDERR]))->close();
   }
 
   /** Returns a given docker image, building it if necessary */
   private function image(string $name, string $version, array $dependencies= [], bool $rebuild= false): array {
     $image= "lambda-xp-{$name}:{$version}";
     $images= [$name => $image];
 
-    $rebuild ? $out= [] : exec("{$this->command()} image ls -q {$image}", $out, $result);
+    if ($rebuild) {
+      $out= null;
+    } else {
+      $p= new Process($this->command(), ['image', 'ls', '-q', $image], null, null, [0 => STDIN, 2 => STDERR]);
+      $out= $p->out->readLine();
+      $p->close();
+    }
+
     if (empty($out)) {
 
       // Support 3-digit `6.1.0` as well as 4-digit `6.1.0.1234` formats
@@ -71,8 +59,14 @@ private function image(string $name, string $version, array $dependencies= [], b
       }
 
       // Build this
-      $file= new Path(__DIR__, 'Dockerfile.'.$name);
-      passthru("{$this->command()} build -t {$image} --build-arg php_version={$version} --build-arg xp_version={$runners} -f {$file} .", $result);
+      $result= $this->passthru([
+        'build',
+        '-t', $image,
+        '--build-arg', "php_version={$version}",
+        '--build-arg', "xp_version={$runners}",
+        '-f', new Path(__DIR__, 'Dockerfile.'.$name),
+        '.'
+      ]);
       0 === $result || $images[$name]= null;
     }
 

src/main/php/xp/lambda/TestLambda.class.php

@@ -16,12 +16,9 @@ public function __construct(string $version, Path $path, string $handler, string
   }
 
   public function run(): int {
-    $docker= $this->command();
     $test= $this->image('test', $this->version, ['runtime' => []])['test'];
     if (null === $test) return 1;
 
-    $payload= '"'.str_replace('"', '\\"', $this->payload).'"';
-    passthru("{$docker} run --rm -v {$this->path}:/var/task:ro {$test} {$this->handler} {$payload}", $result);
-    return $result;
+    return $this->passthru(['run', '--rm', '-v', "{$this->path}:/var/task:ro", $test, $this->handler, $this->payload]);
   }
 }