A couple of basic commands implemented

Signed-off-by: Ole Herman Schumacher Elgesem <ole.elgesem@northern.tech>

Author: olehermanse

cfengine_cli/commands.py

@@ -1,13 +1,20 @@
+from cfengine_cli.shell import user_command
+from cfengine_cli.paths import bin
+
+
 def run() -> int:
-    print("RUN")
+    user_command(f"{bin('cf-agent')} -KIf update.cf && {bin('cf-agent')} -KI")
     return 0
 
 
-def update() -> int:
-    print("UPDATE")
+def report() -> int:
+    user_command(f"{bin('cf-agent')} -KIf update.cf && {bin('cf-agent')} -KI")
+    user_command(f"{bin('cf-hub')} --query rebase -H 127.0.0.1")
+    user_command(f"{bin('cf-hub')} --query delta -H 127.0.0.1")
     return 0
 
 
 def help() -> int:
-    print("HELP")
+    print("Example usage:")
+    print("cfengine run")
     return 0

cfengine_cli/main.py

@@ -42,11 +42,12 @@ def _get_arg_parser():
     subp.add_parser("help", help="Print help information")
 
     subp.add_parser(
-        "run", help="Run the CFEngine agent, evaluating and enforcing policy"
+        "run", help="Run the CFEngine agent, fetching, evaluating, and enforcing policy"
     )
 
     subp.add_parser(
-        "update", help="Update the policy, downloading it from the policy server"
+        "report",
+        help="Run the agent and hub commands necessary to get new reporting data",
     )
 
     return ap
@@ -59,12 +60,12 @@ def get_args():
 
 
 def run_command_with_args(command, _) -> int:
-    if command == "info":
-        return commands.info()
     if command == "run":
         return commands.run()
-    if command == "update":
-        return commands.update()
+    if command == "report":
+        return commands.report()
+    if command == "help":
+        return commands.help()
     raise UserError("Unknown command: '{}'".format(command))
 
 

cfengine_cli/paths.py

@@ -1,21 +1,25 @@
+import re
 import os
-from cfengine_cli.utils import user_error
-
-
-def path_append(dir, subdir):
-    dir = os.path.abspath(os.path.expanduser(dir))
-    return dir if not subdir else os.path.join(dir, subdir)
+from cfengine_cli.utils import UserError
+from cf_remote.paths import path_append
 
 
 def cfengine_dir(subdir=None):
-    override_dir = os.getenv("CF_REMOTE_DIR")
+    """
+    Returns the directory used by the Python tools for temporary files,
+    global config, downloads, etc.
+
+    Defaults to ~/.cfengine/, but can be overridden via the CFENGINE_DIR
+    environment variable.
+    """
+    override_dir = os.getenv("CFENGINE_DIR")
 
     if override_dir:
         override_dir = os.path.normpath(override_dir)
         parent = os.path.dirname(override_dir)
 
         if not os.path.exists(parent):
-            user_error(
+            raise UserError(
                 "'{}' doesn't exist. Make sure this path is correct and exists.".format(
                     parent
                 )
@@ -26,19 +30,15 @@ def cfengine_dir(subdir=None):
     return path_append("~/.cfengine/", subdir)
 
 
-def cf_remote_dir(subdir=None):
-    return path_append(cfengine_dir("cf-remote"), subdir)
-
-
-def cf_remote_file(fname=None):
-    return path_append(cfengine_dir("cf-remote"), fname)
-
-
-def cf_remote_packages_dir(subdir=None):
-    return path_append(cf_remote_dir("packages"), subdir)
+def bin(component: str) -> str:
+    """
+    Get the path to a binary for use in a command.
 
+    For example: "cf-agent" -> "/var/cfengine/bin/cf-agent"
 
-CLOUD_CONFIG_FNAME = "cloud_config.json"
-CLOUD_CONFIG_FPATH = cf_remote_file(CLOUD_CONFIG_FNAME)
-CLOUD_STATE_FNAME = "cloud_state.json"
-CLOUD_STATE_FPATH = cf_remote_file(CLOUD_STATE_FNAME)
+    # Warning: Don't use this function with untrusted input.
+    """
+    # Stop things like semicolons, slashes, spaces, etc.
+    # Only letters and dashes allowed currently.
+    assert re.fullmatch(r"[-a-zA-Z]+", component)
+    return f"/var/cfengine/bin/{component}"

cfengine_cli/shell.py

@@ -0,0 +1,27 @@
+import os
+
+
+def user_command(cmd):
+    """Run a command which was requested by the user.
+
+    For example if the user typed cfengine run, we
+    run the shell command `/var/cfengine/bin/cf-agent -KI`.
+
+    Be transparent about the command, printing it first,
+    so the user has visibility of what is happening and
+    can learn the underlying tools over time.
+
+    We might expand this in the future with more logging,
+    confirmation prompts, etc.
+    """
+
+    print(f"Running command: '{cmd}'")
+    os.system(cmd)
+
+
+def silent_command(cmd):
+    """Under-the-hood shell commands which the user does not
+    need to know about.
+    """
+
+    os.system(cmd)