fix(assets): support exceptions to exclude patterns

packages/@aws-cdk/assets/lib/fs/copy.ts

@@ -2,56 +2,45 @@ import fs = require('fs');
 import path = require('path');
 import { CopyOptions } from './copy-options';
 import { FollowMode } from './follow-mode';
-import { shouldExclude, shouldFollow } from './utils';
+import { listFilesRecursively, shouldFollow } from './utils';
 
 export function copyDirectory(srcDir: string, destDir: string, options: CopyOptions = { }, rootDir?: string) {
   const follow = options.follow !== undefined ? options.follow : FollowMode.EXTERNAL;
-  const exclude = options.exclude || [];
 
   rootDir = rootDir || srcDir;
 
   if (!fs.statSync(srcDir).isDirectory()) {
     throw new Error(`${srcDir} is not a directory`);
   }
 
-  const files = fs.readdirSync(srcDir);
-  for (const file of files) {
-    const sourceFilePath = path.join(srcDir, file);
+  for (const sourceFilePath of listFilesRecursively(srcDir, {...options, follow}, rootDir)) {
+    const filePath = path.relative(rootDir, sourceFilePath);
+    const destFilePath = path.join(destDir, filePath);
 
-    if (shouldExclude(exclude, path.relative(rootDir, sourceFilePath))) {
-      continue;
-    }
-
-    const destFilePath = path.join(destDir, file);
-
-    let stat: fs.Stats | undefined = follow === FollowMode.ALWAYS
-      ? fs.statSync(sourceFilePath)
-      : fs.lstatSync(sourceFilePath);
-
-    if (stat && stat.isSymbolicLink()) {
-      const target = fs.readlinkSync(sourceFilePath);
+    if (follow !== FollowMode.ALWAYS) {
+      const stat = fs.lstatSync(sourceFilePath);
 
-      // determine if this is an external link (i.e. the target's absolute path
-      // is outside of the root directory).
-      const targetPath = path.normalize(path.resolve(srcDir, target));
+      if (stat && stat.isSymbolicLink()) {
+        const target = fs.readlinkSync(sourceFilePath);
+        const targetPath = path.normalize(path.resolve(srcDir, target));
+        if (!shouldFollow(follow, rootDir, targetPath)) {
+          fs.symlinkSync(target, destFilePath);
 
-      if (shouldFollow(follow, rootDir, targetPath)) {
-        stat = fs.statSync(sourceFilePath);
-      } else {
-        fs.symlinkSync(target, destFilePath);
-        stat = undefined;
+          continue;
+        }
       }
     }
 
-    if (stat && stat.isDirectory()) {
-      fs.mkdirSync(destFilePath);
-      copyDirectory(sourceFilePath, destFilePath, options, rootDir);
-      stat = undefined;
-    }
+    {
+      const destFileDir = path.dirname(destFilePath);
 
-    if (stat && stat.isFile()) {
-      fs.copyFileSync(sourceFilePath, destFilePath);
-      stat = undefined;
+      if (!fs.existsSync(destFileDir)) {
+        // FIXME fs.mkdirpSync(destFileDir);
+        fs.mkdirSync(destFileDir);
+      }
     }
+
+    console.log(sourceFilePath, destFilePath);
+    fs.copyFileSync(sourceFilePath, destFilePath);
   }
 }

packages/@aws-cdk/assets/lib/fs/fingerprint.ts

@@ -39,7 +39,11 @@ export function fingerprint(fileOrDirectory: string, options: FingerprintOptions
     ? fileOrDirectory
     : path.dirname(fileOrDirectory);
   const exclude = options.exclude || [];
-  _processFileOrDirectory(fileOrDirectory);
+  // _processFileOrDirectory(fileOrDirectory);
+
+  for (const file of listFilesRecursively(fileOrDirectory, {...options, follow}, exclude)) {
+    // TODO process
+  }
 
   return hash.digest('hex');
 

packages/@aws-cdk/assets/lib/fs/utils.ts

@@ -1,6 +1,7 @@
 import fs = require('fs');
 import minimatch = require('minimatch');
 import path = require('path');
+import { CopyOptions } from './copy-options';
 import { FollowMode } from './follow-mode';
 
 /**
@@ -58,3 +59,82 @@ export function shouldFollow(mode: FollowMode, sourceRoot: string, realPath: str
     return path.resolve(realPath).startsWith(path.resolve(sourceRoot));
   }
 }
+
+export function listFilesRecursively(
+  dir: string,
+  options: CopyOptions = {},
+  rootDir?: string,
+  files: string[] = []
+): string[] {
+  let exclude = [...(options.exclude || [])];
+  rootDir = rootDir || dir;
+  {
+    const stat = fs.statSync(dir);
+    if (!stat) {
+      return [];
+    }
+
+    if (!stat.isDirectory()) {
+      return [dir];
+    }
+  }
+
+  for (const file of fs.readdirSync(dir)) {
+    let fullFilePath = path.join(dir, file);
+
+    let stat: fs.Stats | undefined = follow === FollowMode.ALWAYS
+      ? fs.statSync(fullFilePath)
+      : fs.lstatSync(fullFilePath);
+
+    if (!stat) {
+      continue;
+    }
+
+    if (stat.isSymbolicLink()) {
+      const target = fs.readlinkSync(fullFilePath);
+
+      // determine if this is an external link (i.e. the target's absolute path
+      // is outside of the root directory).
+      const targetPath = path.normalize(path.resolve(dir, target));
+
+      if (shouldFollow(follow, rootDir, targetPath)) {
+        stat = fs.statSync(fullFilePath);
+        if (!stat) {
+          continue;
+        }
+
+        fullFilePath = target;
+      }
+    }
+
+    const relativeFilePath = path.relative(rootDir, fullFilePath);
+
+    // we've just discovered that we have a directory
+    if (stat.isDirectory()) {
+      // to help future shouldExclude calls, we're changing the exlusion patterns
+      // by expliciting "dir" exclusions to "dir/*" (same with "!dir" -> "!dir/*")
+      exclude = exclude.reduce<string[]>((res, pattern) => {
+        res.push(pattern);
+        if (pattern.trim().replace(/^!/, '') === relativeFilePath) {
+          // we add the pattern immediately after to preserve the exclusion order
+          res.push(`${pattern}/*`);
+        }
+
+        return res;
+      }, []);
+    }
+
+    const isExcluded = shouldExclude(exclude, relativeFilePath);
+    if (isExcluded && !stat.isDirectory()) {
+      continue;
+    }
+
+    if (stat.isFile()) {
+      files.push(fullFilePath);
+    } else if (stat.isDirectory()) {
+      files.push(...listFilesRecursively(fullFilePath, { ...options, exclude }, rootDir));
+    }
+  }
+
+  return files;
+}

packages/@aws-cdk/aws-ecr-assets/lib/image-asset.ts

@@ -80,7 +80,12 @@ export class DockerImageAsset extends Construct implements assets.IAsset {
     const ignore = path.join(dir, '.dockerignore');
 
     if (fs.existsSync(ignore)) {
-      exclude = [...exclude, ...fs.readFileSync(ignore).toString().split('\n').filter(e => !!e)];
+      exclude = [
+        ...exclude,
+        ...fs.readFileSync(ignore).toString().split('\n').filter(e => !!e),
+        // prevents accidentally excluding Dockerfile with a "*"
+        '!Dockerfile',
+      ];
     }
 
     const staging = new assets.Staging(this, 'Staging', {

packages/@aws-cdk/aws-ecr-assets/test/dockerignore-image-advanced/.dockerignore

@@ -0,0 +1,22 @@
+# This a comment, followed by an empty line
+
+# The following line should be ignored
+#index.py
+
+# This shouldn't ignore foo.txt
+foo.?
+# This shoul ignore foobar.txt
+foobar.???
+# This should catch qux.txt
+deep/**/*.txt
+# but quuz should be added back
+!deep/include_me/**
+
+# baz and quux should be ignored
+subdirectory/**
+# but baz should be added back
+!subdirectory/baz*
+
+config/config*.txt
+!config/config-*.txt
+config/config-test.txt

packages/@aws-cdk/aws-ecr-assets/test/dockerignore-image-advanced/Dockerfile

@@ -0,0 +1,5 @@
+FROM python:3.6
+EXPOSE 8000
+WORKDIR /src
+ADD . /src
+CMD python3 index.py

packages/@aws-cdk/aws-ecr-assets/test/dockerignore-image-advanced/index.py

@@ -0,0 +1,33 @@
+#!/usr/bin/python
+import sys
+import textwrap
+import http.server
+import socketserver
+
+PORT = 8000
+
+
+class Handler(http.server.SimpleHTTPRequestHandler):
+    def do_GET(self):
+        self.send_response(200)
+        self.send_header('Content-Type', 'text/html')
+        self.end_headers()
+        self.wfile.write(textwrap.dedent('''\
+            <!doctype html>
+            <html><head><title>It works</title></head>
+            <body>
+                <h1>Hello from the integ test container</h1>
+                <p>This container got built and started as part of the integ test.</p>
+                <img src="https://media.giphy.com/media/nFjDu1LjEADh6/giphy.gif">
+            </body>
+            ''').encode('utf-8'))
+
+
+def main():
+    httpd = http.server.HTTPServer(("", PORT), Handler)
+    print("serving at port", PORT)
+    httpd.serve_forever()
+
+
+if __name__ == '__main__':
+    main()

packages/@aws-cdk/aws-ecr-assets/test/dockerignore-image-negative/.dockerignore

@@ -0,0 +1,8 @@
+# Comment
+
+*
+!index.py
+!subdirectory
+subdirectory/foo.txt
+
+# Dockerfile isn't explicitly included, but we'll add it anyway to build the image

packages/@aws-cdk/aws-ecr-assets/test/dockerignore-image-negative/Dockerfile

@@ -0,0 +1,5 @@
+FROM python:3.6
+EXPOSE 8000
+WORKDIR /src
+ADD . /src
+CMD python3 index.py

packages/@aws-cdk/aws-ecr-assets/test/dockerignore-image-negative/index.py

@@ -0,0 +1,33 @@
+#!/usr/bin/python
+import sys
+import textwrap
+import http.server
+import socketserver
+
+PORT = 8000
+
+
+class Handler(http.server.SimpleHTTPRequestHandler):
+    def do_GET(self):
+        self.send_response(200)
+        self.send_header('Content-Type', 'text/html')
+        self.end_headers()
+        self.wfile.write(textwrap.dedent('''\
+            <!doctype html>
+            <html><head><title>It works</title></head>
+            <body>
+                <h1>Hello from the integ test container</h1>
+                <p>This container got built and started as part of the integ test.</p>
+                <img src="https://media.giphy.com/media/nFjDu1LjEADh6/giphy.gif">
+            </body>
+            ''').encode('utf-8'))
+
+
+def main():
+    httpd = http.server.HTTPServer(("", PORT), Handler)
+    print("serving at port", PORT)
+    httpd.serve_forever()
+
+
+if __name__ == '__main__':
+    main()