Merge branch 'main' of github.com:xp-forge/lambda

Author: thekid

ChangeLog.md

@@ -3,6 +3,17 @@ AWS Lambda change log
 
 ## ?.?.? / ????-??-??
 
+## 3.2.0 / 2021-11-15
+
+* Merged PR #14: Add ability to pass environment variables to tested lambda
+  (@thekid)
+
+## 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
+  (@thekid)
+
 ## 3.0.2 / 2021-10-21
 
 * Made library compatible with new major release of `xp-forge/json`

src/main/php/xp/lambda/Dockerfile.runtime

@@ -26,7 +26,6 @@ RUN cd php-src-php-${php_version} && ./buildconf --force && ./configure \
   --without-sqlite3 \
   --with-openssl \
   --enable-bcmath \
-  --disable-simplexml \
   --disable-pdo && \
   make -j $(nproc) all install
 

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

@@ -24,6 +24,10 @@
  *   ```sh
  *   $ xp lambda test Greet '{"name":"Test"}'
  *   ```
+ * - Test lambda, pass environment variables:
+ *   ```sh
+ *   $ xp lambda test -e PROFILE=prod Audit
+ *   ```
  * - Package single file in `function.zip` file for deployment:
  *   ```sh
  *   $ xp lambda package Greet.class.php
@@ -63,7 +67,7 @@ private static function command(string $name, array $args): object {
     switch ($command) {
       case 'package': return new PackageLambda(new Path('function.zip'), new Sources(new Path('.'), [...$args, 'vendor']));
       case 'runtime': return new CreateRuntime(self::resolve($version), new Path('runtime-%s.zip'), in_array('-b', $args));
-      case 'test': return new TestLambda(self::resolve($version), new Path('.'), $args[0] ?? 'Handler', $args[1] ?? '{}');
+      case 'test': return new TestLambda(self::resolve($version), new Path('.'), $args);
       default: return new DisplayError('Unknown command "'.$args[0].'"');
     }
   }

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

@@ -6,19 +6,50 @@
 class TestLambda {
   use Docker;
 
-  private $version, $path, $handler, $payload;
+  private $version, $path;
+  private $environment= [];
+  private $handler= 'Handler';
+  private $payload= '{}';
 
-  public function __construct(string $version, Path $path, string $handler, string $payload) {
+  public function __construct(string $version, Path $path, array $args) {
     $this->version= $version;
     $this->path= $path->asRealpath();
-    $this->handler= $handler;
-    $this->payload= $payload;
+
+    // Separate `-e NAME=VALUE` from handler and payload
+    for ($i= 0, $s= sizeof($args); $i < $s; $i++) {
+      if ('-e' === $args[$i]) {
+        $this->environment[]= $args[++$i];
+      } else {
+        $this->handler= $args[$i];
+        $this->payload= $args[++$i] ?? '{}';
+        break;
+      }
+    }
+  }
+
+  /** Passes multiple arguments via command line */
+  private function pass($flag, $list) {
+    $r= [];
+    foreach ($list as $element) {
+      $r[]= $flag;
+      $r[]= $element;
+    }
+    return $r;
   }
 
+  /** Runs this command */
   public function run(): int {
-    $test= $this->image('test', $this->version, ['runtime' => []])['test'];
-    if (null === $test) return 1;
+    $image= $this->image('test', $this->version, ['runtime' => []])['test'];
+    if (null === $image) return 1;
 
-    return $this->passthru(['run', '--rm', '-v', "{$this->path}:/var/task:ro", $test, $this->handler, $this->payload]);
+    return $this->passthru([
+      'run',
+      '--rm',
+      '-v', "{$this->path}:/var/task:ro",
+      ...$this->pass('-e', $this->environment),
+      $image,
+      $this->handler,
+      $this->payload
+    ]);
   }
 }