Include again into the hash the content of package.py, ignoring its path

See PR #66

TODO: remove the code and logic for hash_extra_paths?

Author: flora-five

package.py

@@ -1691,7 +1691,7 @@ def prepare_command(args):
         if log.isEnabledFor(DEBUG3):
             log.debug("QUERY: %s", json.dumps(query_data, indent=2))
         else:
-            log_excludes = ("source_path", "hash_extra_paths", "paths")
+            log_excludes = ("source_path", "hash_extra_paths", "hash_internal", "paths")
             qd = {k: v for k, v in query_data.items() if k not in log_excludes}
             log.debug("QUERY (excerpt): %s", json.dumps(qd, indent=2))
 
@@ -1704,6 +1704,7 @@ def prepare_command(args):
     hash_extra_paths = query.hash_extra_paths
     source_path = query.source_path
     hash_extra = query.hash_extra
+    hash_internal = query.hash_internal
     recreate_missing_package = yesno_bool(
         args.recreate_missing_package
         if args.recreate_missing_package is not None
@@ -1723,6 +1724,8 @@ def prepare_command(args):
     content_hash = bpm.hash(hash_extra_paths)
     content_hash.update(json.dumps(build_plan, sort_keys=True).encode())
     content_hash.update(runtime.encode())
+    for c in hash_internal:
+        content_hash.update(c.encode())
     content_hash.update(hash_extra.encode())
     content_hash = content_hash.hexdigest()
 

package.tf

@@ -26,18 +26,13 @@ data "external" "archive_prepare" {
       docker_entrypoint         = var.docker_entrypoint
     }) : null
 
-    artifacts_dir = var.artifacts_dir
-    runtime       = var.runtime
-    source_path   = try(tostring(var.source_path), jsonencode(var.source_path))
-    hash_extra    = var.hash_extra
-    hash_extra_paths = jsonencode(
-      [
-        # Temporary fix when building from multiple locations
-        # We should take into account content of package.py when counting hash
-        # Related issue: https://github.com/terraform-aws-modules/terraform-aws-lambda/issues/63
-        # "${path.module}/package.py"
-      ]
-    )
+    artifacts_dir    = var.artifacts_dir
+    runtime          = var.runtime
+    source_path      = try(tostring(var.source_path), jsonencode(var.source_path))
+    hash_extra       = var.hash_extra
+    hash_extra_paths = jsonencode([])
+    # Include into the hash the module sources that affect the packaging.
+    hash_internal = jsonencode([filesha256("${path.module}/package.py")])
 
     recreate_missing_package = var.recreate_missing_package
     quiet                    = var.quiet_archive_local_exec