Test packaging folders with symlinks to other folders

Author: thekid

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

@@ -43,9 +43,11 @@ private function add(ZipArchiveWriter $zip, Path $path, Path $base, $prefix= '')
     // - Files: Add to ZIP
     // - Folders: Recursively add all subfolders and files therein
     if (self::IS_LINK === ($stat['mode'] & self::IS_LINK)) {
-      $resolved= new Path(readlink($path));
-      $base= $resolved->isFile() ? new Path(dirname($resolved)) : $resolved;
-      yield from $this->add($zip, $resolved, $base, $relative.DIRECTORY_SEPARATOR);
+      $resolved= Path::real([dirname($path), readlink($path)], $base);
+      if ($resolved->exists()) {
+        $base= $resolved->isFile() ? new Path(dirname($resolved)) : $resolved;
+        yield from $this->add($zip, $resolved, $base, $relative.DIRECTORY_SEPARATOR);
+      }
     } else if (self::IS_FILE === ($stat['mode'] & self::IS_FILE)) {
       $file= $zip->add(new ZipFileEntry($relative));
 

src/test/php/com/amazon/aws/lambda/unittest/PackagingTest.class.php

@@ -18,8 +18,15 @@ private function tempDir() {
   }
 
   #[After]
-  private function cleanup() {
-    $this->tempDir->unlink();
+  private function cleanup(Folder $folder= null) {
+    $folder ?? $folder= $this->tempDir;
+    foreach ($folder->entries() as $entry) {
+      switch ($m= lstat($entry)['mode'] & 0170000) {
+        case PackageLambda::IS_LINK: unlink($entry); break;
+        case PackageLambda::IS_FILE: $entry->asFile()->unlink(); break;
+        case PackageLambda::IS_FOLDER: $this->cleanup($entry->asFolder()); break;
+      }
+    }
   }
 
   /** Creates files and directory from given definitions */
@@ -28,13 +35,17 @@ private function create(array $definitions): Path {
     // Create sources from definitions
     foreach ($definitions as $name => $definition) {
       switch ($definition[0]) {
-        case 'file':
+        case PackageLambda::IS_FILE:
           Files::write(new File($this->tempDir, $name), $definition[1]);
           break;
 
-        case 'dir':
+        case PackageLambda::IS_FOLDER:
           (new Folder($this->tempDir, $name))->create($definition[1]);
           break;
+
+        case PackageLambda::IS_LINK:
+          symlink($definition[1], new Path($this->tempDir, $name));
+          break;
       }
     }
 
@@ -60,7 +71,7 @@ private function package(Sources $sources): ZipIterator {
 
   #[Test]
   public function single_file() {
-    $zip= $this->package(new Sources($this->create(['file.txt' => ['file', 'Test']]), ['file.txt']));
+    $zip= $this->package(new Sources($this->create(['file.txt' => [PackageLambda::IS_FILE, 'Test']]), ['file.txt']));
 
     $file= $zip->next();
     Assert::equals('file.txt', $file->getName());
@@ -70,7 +81,7 @@ public function single_file() {
 
   #[Test]
   public function single_directory() {
-    $zip= $this->package(new Sources($this->create(['src' => ['dir', 0755]]), ['src']));
+    $zip= $this->package(new Sources($this->create(['src' => [PackageLambda::IS_FOLDER, 0755]]), ['src']));
 
     $dir= $zip->next();
     Assert::equals('src/', $dir->getName());
@@ -81,8 +92,8 @@ public function single_directory() {
   #[Test]
   public function file_inside_directory() {
     $path= $this->create([
-      'src'          => ['dir', 0755],
-      'src/file.txt' => ['file', 'Test']
+      'src'          => [PackageLambda::IS_FOLDER, 0755],
+      'src/file.txt' => [PackageLambda::IS_FILE, 'Test']
     ]);
     $zip= $this->package(new Sources($path, ['src']));
 
@@ -96,4 +107,40 @@ public function file_inside_directory() {
 
     Assert::false($zip->hasNext());
   }
+
+  #[Test]
+  public function link_inside_directory() {
+    $path= $this->create([
+      'core/'                => [PackageLambda::IS_FOLDER, 0755],
+      'core/composer.json'   => [PackageLambda::IS_FILE, '{"require":{"php":">=7.0"}}'],
+      'project'              => [PackageLambda::IS_FOLDER, 0755],
+      'project/src'          => [PackageLambda::IS_FOLDER, 0755],
+      'project/src/file.txt' => [PackageLambda::IS_FILE, 'Test'],
+      'project/lib'          => [PackageLambda::IS_FOLDER, 0755],
+      'project/lib/core'     => [PackageLambda::IS_LINK, '../../core'],
+    ]);
+    $zip= $this->package(new Sources(new Path($path, 'project'), ['src', 'lib']));
+
+    $dir= $zip->next();
+    Assert::equals('src/', $dir->getName());
+    Assert::true($dir->isDirectory());
+
+    $file= $zip->next();
+    Assert::equals('src/file.txt', $file->getName());
+    Assert::equals(4, $file->getSize());
+
+    $lib= $zip->next();
+    Assert::equals('lib/', $lib->getName());
+    Assert::true($lib->isDirectory());
+
+    $core= $zip->next();
+    Assert::equals('lib/core/', $core->getName());
+    Assert::true($core->isDirectory());
+
+    $composer= $zip->next();
+    Assert::equals('lib/core/composer.json', $composer->getName());
+    Assert::equals(27, $composer->getSize());
+
+    Assert::false($zip->hasNext());
+  }
 }