optional absolute paths for validate_extra_files

Author: bcwu

rsconnect/bundle.py

@@ -843,7 +843,6 @@ def make_api_manifest(
 def create_html_manifest(
     path: str,
     entrypoint: str,
-    app_mode: AppMode = AppModes.STATIC,
     extra_files: typing.List[str] = None,
     excludes: typing.List[str] = None,
     image: str = None,
@@ -884,7 +883,7 @@ def create_html_manifest(
             raise RSConnectException("No valid entrypoint found.")
         entrypoint = abs_entrypoint(path, entrypoint)
 
-    extra_files = validate_extra_files(deploy_dir, extra_files)
+    extra_files = validate_extra_files(deploy_dir, extra_files, use_abspath=True)
     excludes = list(excludes) if excludes else []
     excludes.extend(["manifest.json"])
     excludes.extend(list_environment_dirs(deploy_dir))
@@ -1315,7 +1314,7 @@ def validate_file_is_notebook(file_name):
         raise RSConnectException("A Jupyter notebook (.ipynb) file is required here.")
 
 
-def validate_extra_files(directory, extra_files):
+def validate_extra_files(directory, extra_files, use_abspath=False):
     """
     If the user specified a list of extra files, validate that they all exist and are
     beneath the given directory and, if so, return a list of them made relative to that
@@ -1335,6 +1334,7 @@ def validate_extra_files(directory, extra_files):
                 raise RSConnectException("%s must be under %s." % (extra_file, directory))
             if not exists(join(directory, extra_file)):
                 raise RSConnectException("Could not find file %s under %s" % (extra, directory))
+            extra_file = abspath(join(directory, extra_file)) if use_abspath else extra_file
             result.append(extra_file)
     return result
 

tests/test_bundle.py

@@ -835,7 +835,7 @@ def test_guess_deploy_dir(self):
         self.assertEqual(abspath(bqplot_dir), guess_deploy_dir(bqplot_dir, None))
         self.assertEqual(abspath(bqplot_dir), guess_deploy_dir(bqplot_ipynb, None))
         self.assertEqual(abspath(bqplot_dir), guess_deploy_dir(bqplot_ipynb, bqplot_ipynb))
-        self.assertEqual(abspath(bqplot_dir), guess_deploy_dir(bqplot_dir, "bqplot.ipynb"))
+        self.assertEqual(abspath(bqplot_dir), guess_deploy_dir(bqplot_dir, bqplot_ipynb))
 
 
 @pytest.mark.parametrize(
@@ -1357,8 +1357,10 @@ def test_make_voila_bundle_2(
 single_file_nonindex_dir = os.path.join(cur_dir, "./testdata/html_tests/single_file_nonindex")
 multi_file_index_dir = os.path.join(cur_dir, "./testdata/html_tests/multi_file_index")
 multi_file_index_file = os.path.join(cur_dir, "./testdata/html_tests/multi_file_index/index.html")
+multi_file_index_file2 = os.path.join(cur_dir, "./testdata/html_tests/multi_file_index/main.html")
 multi_file_nonindex_dir = os.path.join(cur_dir, "./testdata/html_tests/multi_file_nonindex")
-multi_file_nonindex_file = os.path.join(cur_dir, "./testdata/html_tests/multi_file_nonindex/b.html")
+multi_file_nonindex_fileb = os.path.join(cur_dir, "./testdata/html_tests/multi_file_nonindex/b.html")
+multi_file_nonindex_filea = os.path.join(cur_dir, "./testdata/html_tests/multi_file_nonindex/a.html")
 
 
 def test_create_html_manifest():
@@ -1460,7 +1462,7 @@ def test_create_html_manifest():
     }
 
     manifest = create_html_manifest(
-        multi_file_nonindex_file,
+        multi_file_nonindex_fileb,
         None,
     )
     assert multi_file_nonindex_file_ans == json.loads(manifest.flattened_copy.json)
@@ -1476,6 +1478,37 @@ def test_create_html_manifest():
 
     manifest = create_html_manifest(
         multi_file_nonindex_dir,
-        multi_file_nonindex_file,
+        multi_file_nonindex_fileb,
     )
     assert multi_file_nonindex_dir_and_file_ans == json.loads(manifest.flattened_copy.json)
+
+    multi_file_nonindex_file_extras_ans = {
+        "version": 1,
+        "metadata": {"appmode": "static", "primary_html": "b.html", "entrypoint": "b.html"},
+        "files": {
+            "a.html": {"checksum": "c14bd63e50295f94b761ffe9d41e3742"},
+            "b.html": {"checksum": "c14bd63e50295f94b761ffe9d41e3742"},
+        },
+    }
+    manifest = create_html_manifest(
+        multi_file_nonindex_fileb,
+        None,
+        extra_files=[multi_file_nonindex_filea],
+    )
+    assert multi_file_nonindex_file_extras_ans == json.loads(manifest.flattened_copy.json)
+
+    multi_file_index_dir_extras_ans = {
+        "version": 1,
+        "metadata": {"appmode": "static", "primary_html": "index.html", "entrypoint": "index.html"},
+        "files": {
+            "index.html": {"checksum": "c14bd63e50295f94b761ffe9d41e3742"},
+            "main.html": {"checksum": "c14bd63e50295f94b761ffe9d41e3742"},
+        },
+    }
+
+    manifest = create_html_manifest(
+        multi_file_index_dir,
+        None,
+        extra_files=[multi_file_index_file2],
+    )
+    assert multi_file_index_dir_extras_ans == json.loads(manifest.flattened_copy.json)