Merge pull request #22 from cfengine/local_module

Fixed issue with undefined functions when adding local files
cfengine · Oct 5, 2021 · d067b2a · d067b2a
2 parents e100d74 + d110912
commit d067b2a
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 44 deletions.
diff --git a/cfbs/commands.py b/cfbs/commands.py
@@ -161,49 +161,6 @@ def local_module_name(module_path):
     return module
 
 
-def local_module_data_cf_file(module):
-    target = os.path.basename(module)
-    return {
-        "description": "Local policy file added using cfbs command line",
-        "tags": ["local"],
-        "dependencies": ["autorun"],
-        "steps": [f"copy {module} services/autorun/{target}"],
-        "added_by": "cfbs add",
-    }
-
-
-def local_module_data_json_file(module):
-    return {
-        "description": "Local augments file added using cfbs command line",
-        "tags": ["local"],
-        "steps": [f"json {module} def.json"],
-        "added_by": "cfbs add",
-    }
-
-
-def local_module_data_subdir(module):
-    return {
-        "description": "Local subdirectory added using cfbs command line",
-        "tags": ["local"],
-        "dependencies": ["autorun"],
-        "steps": [f"copy {module} services/autorun/"],
-        "added_by": "cfbs add",
-    }
-
-
-def local_module_data(module):
-    assert module.startswith("./")
-    assert module.endswith((".cf", ".json", "/"))
-    assert os.path.isfile(module) or os.path.isdir(module)
-
-    if os.path.isdir(module):
-        return local_module_data_subdir(module)
-    if module.endswith(".cf"):
-        return local_module_data_cf_file(module)
-    if module.endswith(".json"):
-        return local_module_data_json_file(module)
-
-
 def prettify_name(name):
     if "/" not in name:
         return name

diff --git a/cfbs/index.py b/cfbs/index.py
@@ -23,6 +23,47 @@
 
 from cfbs.pretty import pretty_file, pretty
 
+def _local_module_data_cf_file(module):
+    target = os.path.basename(module)
+    return {
+        "description": "Local policy file added using cfbs command line",
+        "tags": ["local"],
+        "dependencies": ["autorun"],
+        "steps": [f"copy {module} services/autorun/{target}"],
+        "added_by": "cfbs add",
+    }
+
+
+def _local_module_data_json_file(module):
+    return {
+        "description": "Local augments file added using cfbs command line",
+        "tags": ["local"],
+        "steps": [f"json {module} def.json"],
+        "added_by": "cfbs add",
+    }
+
+
+def _local_module_data_subdir(module):
+    return {
+        "description": "Local subdirectory added using cfbs command line",
+        "tags": ["local"],
+        "dependencies": ["autorun"],
+        "steps": [f"copy {module} services/autorun/"],
+        "added_by": "cfbs add",
+    }
+
+
+def generate_index_for_local_module(module):
+    assert module.startswith("./")
+    assert module.endswith((".cf", ".json", "/"))
+    assert os.path.isfile(module) or os.path.isdir(module)
+
+    if os.path.isdir(module):
+        return _local_module_data_subdir(module)
+    if module.endswith(".cf"):
+        return _local_module_data_cf_file(module)
+    if module.endswith(".json"):
+        return _local_module_data_json_file(module)
 
 class Index:
     def __init__(self, path):
@@ -73,5 +114,5 @@ def get_build_step(self, module):
         return (
             self.get_modules()[module]
             if not module.startswith("./")
-            else local_module_data(module)
+            else generate_index_for_local_module(module)
         )