Require output_path, create intermediate paths

Author: rojopolis

README.md

@@ -12,10 +12,12 @@ or .pyc files in the archive so the hash is stable unless the source or dependen
 change. 
 
 ## Example
+
 ```
 module "python_lambda_archive" {
     source = "rojopolis/lambda-python-archive/aws"
     src_dir = "${path.module}/python"
+    output_path = "${path.module}/lambda.zip"
 }
 
 resource "aws_iam_role" "iam_for_lambda" {

examples/lambda_python_archive.tf

@@ -1,6 +1,7 @@
 module "python_lambda_archive" {
-    source = "../"
-    src_dir = "${path.module}/python"
+    source      = "../"
+    src_dir     = "${path.module}/python"
+    output_path = "${path.module}/artifacts/lambda.zip"
 }
 
 resource "aws_iam_role" "iam_for_lambda" {

main.tf

@@ -1,6 +1,7 @@
 data "external" "lambda_archive" {
     program = ["python", "${path.module}/scripts/build_lambda.py"]
     query = {
-        src_dir = "${var.src_dir}"
+        src_dir     = "${var.src_dir}"
+        output_path = "${var.output_path}"
     }
 }

scripts/build_lambda.py

@@ -2,17 +2,18 @@
 from distutils.dir_util import copy_tree
 
 import base64
-import glob
+import errno
 import hashlib
 import json
+import logging
 import os
 import shutil
 import subprocess
 import sys
 import tempfile
 import zipfile
 
-def build(src_dir):
+def build(src_dir, output_path):
     with tempfile.TemporaryDirectory() as build_dir:
         copy_tree(src_dir, build_dir)
         if os.path.exists(os.path.join(src_dir, 'requirements.txt')):
@@ -27,19 +28,26 @@ def build(src_dir):
                  check=True,
                  stdout=subprocess.DEVNULL,
             )
-        artifact=tempfile.NamedTemporaryFile(delete=False)
-        make_archive(build_dir, artifact)
-        return artifact.name
+        make_archive(build_dir, output_path)
+        return output_path
 
 
-def make_archive(src_dir, archive_file):
-    with zipfile.ZipFile(archive_file, 'w') as archive:
+def make_archive(src_dir, output_path):
+    try:
+        os.makedirs(os.path.dirname(output_path))
+    except OSError as e:
+        if e.errno == errno.EEXIST:
+            pass
+        else:
+            raise
+
+    with zipfile.ZipFile(output_path, 'w') as archive:
         for root, dirs, files in os.walk(src_dir):
             for file in files:
                 if file.endswith('.pyc'):
                     break
                 metadata = zipfile.ZipInfo(
-                    os.path.join(root, file).replace(src_dir, '')
+                    os.path.join(root, file).replace(src_dir, '').lstrip(os.sep)
                 )
                 with open(os.path.join(root, file), 'rb') as f:
                     data = f.read()
@@ -48,17 +56,19 @@ def make_archive(src_dir, archive_file):
                     data
                 )
 
-def get_hash(archive_file):
+def get_hash(output_path):
     '''
     Return base64 encoded sha256 hash of archive file
     '''
-    with open(archive_file, 'rb') as f:
+    with open(output_path, 'rb') as f:
         h = hashlib.sha256()
         h.update(f.read())
     return base64.standard_b64encode(h.digest()).decode('utf-8', 'strict')
 
 
 if __name__ == '__main__':
+    logging.basicConfig(level='DEBUG')
     query = json.loads(sys.stdin.read())
-    archive = build(query['src_dir'])
+    logging.debug(query)
+    archive = build(query['src_dir'], query['output_path'])
     print(json.dumps({'archive': archive, "base64sha256":get_hash(archive)}))

variables.tf

@@ -1,4 +1,9 @@
 variable "src_dir" {
     description = "Path to root of Python source to package."
     type        = "string"
+}
+
+variable "output_path" {
+    description = "The output of the archive file."
+    type        = "string"
 }