Merge branch 'main' into functions

Author: sbyrne-sf

README.md

@@ -216,8 +216,10 @@ Options:
 #### `datacustomcode zip`
 Zip a transformation job in preparation to upload to Data Cloud. Make sure to change directory into your code package folder (e.g., `my_package`) before running this command.
 
+Arguments:
+- `PATH`: Path to the code directory i.e. the payload folder (default: "payload")
+
 Options:
-- `--path TEXT`: Path to the code directory i.e. the payload folder (default: ".")
 - `--network TEXT`: docker network (default: "default")
 
 

src/datacustomcode/deploy.py

@@ -427,8 +427,9 @@ def zip(
             # Skip .DS_Store files when adding to zip
             for file in files:
                 if file != ".DS_Store":
-                    file_path = os.path.join(root, file)
-                    zipf.write(file_path)
+                    abs_path = os.path.join(root, file)
+                    arcname = os.path.relpath(abs_path, directory)
+                    zipf.write(abs_path, arcname)
 
     logger.debug(f"Created zip file: {ZIP_FILE_NAME}")
 

src/datacustomcode/templates/script/payload/config.json

@@ -1 +1,3 @@
-{}
+{
+  "dataspace": "default"
+}