stoobly-agent 1.2.3__py3-none-any.whl → 1.4.0__py3-none-any.whl

stoobly_agent/app/cli/scaffold_cli.py

@@ -1,4 +1,5 @@
 import click
+import errno
 import os
 import pdb
 import sys
@@ -14,6 +15,7 @@ from stoobly_agent.app.cli.scaffold.constants import (
 )
 from stoobly_agent.app.cli.scaffold.docker.service.set_gateway_ports import set_gateway_ports
 from stoobly_agent.app.cli.scaffold.docker.workflow.decorators_factory import get_workflow_decorators
+from stoobly_agent.app.cli.scaffold.hosts_file_manager import HostsFileManager
 from stoobly_agent.app.cli.scaffold.service import Service
 from stoobly_agent.app.cli.scaffold.service_config import ServiceConfig
 from stoobly_agent.app.cli.scaffold.service_create_command import ServiceCreateCommand
@@ -31,8 +33,13 @@ from stoobly_agent.config.constants import env_vars
 from stoobly_agent.config.data_dir import DataDir
 from stoobly_agent.lib.logger import bcolors, DEBUG, ERROR, INFO, Logger, WARNING
 
+from .helpers.print_service import FORMATS, print_services, select_print_options
+
 LOG_ID = 'Scaffold'
 
+current_working_dir = os.getcwd()
+data_dir: DataDir = DataDir.instance()
+
 @click.group(
     epilog="Run 'stoobly-agent project COMMAND --help' for more information on a command.",
     help="Manage scaffold"
@@ -57,42 +64,53 @@ def app(ctx):
 def service(ctx):
     pass
 
+@click.group(
+  epilog="Run 'stoobly-agent request response COMMAND --help' for more information on a command.",
+  help="Manage workflow scaffold"
+)
+@click.pass_context
+def workflow(ctx):
+    pass
+
+@click.group(
+  epilog="Run 'stoobly-agent scaffold hostname COMMAND --help' for more information on a command.",
+  help="Manage scaffold service hostnames"
+)
+@click.pass_context
+def hostname(ctx):
+    pass
+
 @app.command(
   help="Scaffold application"
 )
-@click.option('--app-dir-path', default=os.getcwd(), help='Path to create the app scaffold.')
+@click.option('--app-dir-path', default=current_working_dir, help='Path to create the app scaffold.')
 @click.option('--force', is_flag=True, help='Overwrite maintained scaffolded app files.')
+@click.option('--network', help='App default network name. Defaults to app name.')
 @click.argument('app_name')
 def create(**kwargs):
   __validate_app_dir(kwargs['app_dir_path'])
 
   app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
 
-  if kwargs['force'] or not os.path.exists(app.namespace_path):
-    __app_build(app, **kwargs)
+  if kwargs['force'] or not os.path.exists(app.scaffold_namespace_path):
+    if not kwargs['network']:
+      kwargs['network'] = kwargs['app_name']
+
+    AppCreateCommand(app, **kwargs).build()
   else:
     print(f"{kwargs['app_dir_path']} already exists, use option '--force' to continue ")
 
 @app.command(
   help="Scaffold app service certs"
 )
-@click.option('--app-dir-path', default=os.getcwd(), help='Path to application directory.')
-@click.option('--ca-certs-dir-path', default=DataDir.instance().mitmproxy_conf_dir_path, help='Path to ca certs directory used to sign SSL certs. Defaults to ~/.mitmproxy')
+@click.option('--app-dir-path', default=current_working_dir, help='Path to application directory.')
+@click.option('--ca-certs-dir-path', default=data_dir.mitmproxy_conf_dir_path, help='Path to ca certs directory used to sign SSL certs. Defaults to ~/.mitmproxy')
 @click.option('--certs-dir-path', help='Path to certs directory. Defaults to the certs dir of the context.')
-@click.option('--context-dir-path', default=DataDir.instance().context_dir_path, help='Path to Stoobly data directory.')
+@click.option('--context-dir-path', default=data_dir.context_dir_path, help='Path to Stoobly data directory.')
 @click.option('--service', multiple=True, help='Select which services to run. Defaults to all.')
 def mkcert(**kwargs):
-  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE, ca_certs_dir_path=kwargs['ca_certs_dir_path'])
-
-  if kwargs['certs_dir_path']:
-    app.certs_dir_path = kwargs['certs_dir_path']
-
-  if kwargs['context_dir_path']:
-    app.context_dir_path = kwargs['context_dir_path']
-
-  if not app.exists:
-    print(f"Error: {app.dir_path} does not exist", file=sys.stderr)
-    sys.exit(1)
+  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE, **kwargs)
+  __validate_app(app)
 
   services = __get_services(app.services, service=kwargs['service'])
 
@@ -116,7 +134,7 @@ def mkcert(**kwargs):
 @service.command(
   help="Scaffold a service",
 )
-@click.option('--app-dir-path', default=os.getcwd(), help='Path to application directory.')
+@click.option('--app-dir-path', default=current_working_dir, help='Path to application directory.')
 @click.option('--detached', is_flag=True)
 @click.option('--env', multiple=True, help='Specify an environment variable.')
 @click.option('--force', is_flag=True, help='Overwrite maintained scaffolded service files.')
@@ -144,9 +162,34 @@ def create(**kwargs):
     print(f"{service.dir_path} already exists, use option '--force' to continue")
 
 @service.command(
-  help="Delete a service",
+  help="List services",
+  name="list"
 )
 @click.option('--app-dir-path', default=os.getcwd(), help='Path to application directory.')
+@click.option('--format', type=click.Choice(FORMATS), help='Format output.')
+@click.option('--select', multiple=True, help='Select column(s) to display.')
+@click.option('--service', multiple=True, help='Select specific services.')
+@click.option('--without-headers', is_flag=True, default=False, help='Disable printing column headers.')
+@click.option('--workflow', multiple=True, help='Specify workflow(s) to filter the services by.')
+def _list(**kwargs):
+  __validate_app_dir(kwargs['app_dir_path'])
+
+  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
+  __validate_app(app)
+
+  rows = []
+  for service_name in __get_workflow_services(app, **kwargs): 
+    service = Service(service_name, app)
+    __validate_service_dir(service.dir_path)
+    service_config = ServiceConfig(service.dir_path)
+    rows.append(service_config.to_dict())
+
+  print_services(rows, **select_print_options(kwargs))
+
+@service.command(
+  help="Delete a service",
+)
+@click.option('--app-dir-path', default=current_working_dir, help='Path to application directory.')
 @click.argument('service_name')
 def delete(**kwargs):
   __validate_app_dir(kwargs['app_dir_path'])
@@ -164,7 +207,7 @@ def delete(**kwargs):
 @service.command(
   help="Update a service config"
 )
-@click.option('--app-dir-path', default=os.getcwd(), help='Path to application directory.')
+@click.option('--app-dir-path', default=current_working_dir, help='Path to application directory.')
 @click.option('--priority', help='Determines the service run order.')
 @click.argument('service_name')
 def update(**kwargs):
@@ -182,18 +225,11 @@ def update(**kwargs):
 
   service_config.write()
 
-@click.group(
-  epilog="Run 'stoobly-agent request response COMMAND --help' for more information on a command.",
-  help="Manage service scaffold"
-)
-@click.pass_context
-def workflow(ctx):
-    pass
-
 @workflow.command(
   help="Create workflow for service(s)"
 )
-@click.option('--app-dir-path', default=os.getcwd(), help='Path to application directory.')
+@click.option('--app-dir-path', default=current_working_dir, help='Path to application directory.')
+@click.option('--context-dir-path', default=data_dir.context_dir_path, help='Path to Stoobly data directory.')
 @click.option('--env', multiple=True, help='Specify an environment variable.')
 @click.option('--force', is_flag=True, help='Overwrite maintained scaffolded workflow files.')
 @click.option('--service', multiple=True, help='Specify the service(s) to create the workflow for.')
@@ -202,7 +238,7 @@ def workflow(ctx):
 def create(**kwargs):
   __validate_app_dir(kwargs['app_dir_path'])
 
-  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
+  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE, **kwargs)
 
   for service_name in kwargs['service']:
     config = { **kwargs }
@@ -214,19 +250,20 @@ def create(**kwargs):
 
     workflow_dir_path = service.workflow_dir_path(kwargs['workflow_name'])
     if kwargs['force'] or not os.path.exists(workflow_dir_path):
-      __workflow_build(app, **config)
+      __workflow_create(app, **config)
     else:
       print(f"{workflow_dir_path} already exists, use option '--force' to continue")
 
 @workflow.command(
   help="Copy a workflow for service(s)",
 )
-@click.option('--app-dir-path', default=os.getcwd(), help='Path to application directory.')
+@click.option('--app-dir-path', default=current_working_dir, help='Path to application directory.')
+@click.option('--context-dir-path', default=data_dir.context_dir_path, help='Path to Stoobly data directory.')
 @click.option('--service', multiple=True, help='Specify service(s) to add the workflow to.')
 @click.argument('workflow_name')
 @click.argument('destination_workflow_name')
 def copy(**kwargs):
-  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
+  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE, **kwargs)
 
   for service_name in kwargs['service']:
     config = { **kwargs }
@@ -242,31 +279,30 @@ def copy(**kwargs):
     command.copy(kwargs['destination_workflow_name'])
 
 @workflow.command()
-@click.option('--app-dir-path', default=os.getcwd(), help='Path to application directory.')
-@click.option('--context-dir-path', default=DataDir.instance().context_dir_path, help='Path to Stoobly data directory.')
+@click.option('--app-dir-path', default=current_working_dir, help='Path to application directory.')
+@click.option('--context-dir-path', default=data_dir.context_dir_path, help='Path to Stoobly data directory.')
 @click.option('--dry-run', default=False, is_flag=True)
+@click.option('--extra-entrypoint-compose-path', help='Path to extra entrypoint compose file.')
 @click.option('--log-level', default=INFO, type=click.Choice([DEBUG, INFO, WARNING, ERROR]), help='''
     Log levels can be "debug", "info", "warning", or "error"
 ''')
 @click.option('--namespace', help='Workflow namespace.')
-@click.option('--network', help='Workflow network namespace.')
+@click.option('--network', help='Workflow network name.')
 @click.option('--rmi', is_flag=True, help='Remove images used by containers.')
 @click.option('--service', multiple=True, help='Select which services to log. Defaults to all.')
+@click.option('--user-id', default=os.getuid(), help='OS user ID of the owner of context dir path.')
 @click.argument('workflow_name')
 def down(**kwargs):  
   cwd = os.getcwd()
 
-  if not os.getenv(env_vars.LOG_LEVEL):
-    os.environ[env_vars.LOG_LEVEL] = kwargs['log_level']
+  os.environ[env_vars.LOG_LEVEL] = kwargs['log_level']
 
-  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE, skip_validate_path=True)
+  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE, **kwargs)
+  __validate_app(app)
 
-  if kwargs['context_dir_path']:
-    app.context_dir_path = kwargs['context_dir_path']
-
-  if not app.exists:
-    print(f"Error: {app.dir_path} does not exist", file=sys.stderr)
-    sys.exit(1)
+  # If namespace is set, default network to namespace
+  if kwargs['namespace'] and not kwargs['network']:
+    kwargs['network'] = kwargs['namespace']
 
   workflow = Workflow(kwargs['workflow_name'], app)
   services = __get_services(workflow.services, service=kwargs['service'])
@@ -280,10 +316,22 @@ def down(**kwargs):
     commands.append(command)
 
   commands = sorted(commands, key=lambda command: command.service_config.priority)
-  for command in commands:
+  for index, command in enumerate(commands):
     __print_header(f"SERVICE {command.service_name}")
 
-    exec_command = command.down(namespace=kwargs['namespace'], rmi=kwargs['rmi'])
+    extra_compose_path = None
+
+    # By default, the entrypoint service should be last
+    # However, this can change if the user has configured a service's priority to be higher
+    if index == len(commands) - 1:
+      extra_compose_path = kwargs['extra_entrypoint_compose_path']
+
+    exec_command = command.down(
+      extra_compose_path=extra_compose_path,
+      namespace=kwargs['namespace'],
+      rmi=kwargs['rmi'],
+      user_id=kwargs['user_id']
+    )
     if not exec_command:
       continue
 
@@ -295,34 +343,41 @@ def down(**kwargs):
   # After services are stopped, their network needs to be removed
   if len(commands) > 0:
     command: WorkflowRunCommand = commands[0]
-    remove_network_command = command.remove_network()
 
-    if not kwargs['dry_run']:
-      command.write_nameservers()
+    if kwargs['rmi']:
+      remove_image_command = command.remove_image(kwargs['user_id'])
+      if not kwargs['dry_run']:
+        exec_stream(remove_image_command)
+      else:
+        print(remove_image_command)
 
+    remove_network_command = command.remove_network()
+    if not kwargs['dry_run']:
       exec_stream(remove_network_command)
     else:
       print(remove_network_command)
 
 @workflow.command()
-@click.option('--app-dir-path', default=os.getcwd(), help='Path to application directory.')
+@click.option('--app-dir-path', default=current_working_dir, help='Path to application directory.')
 @click.option(
   '--container', multiple=True, help=f"Select which containers to log. Defaults to '{WORKFLOW_CONTAINER_PROXY}'"
 )
 @click.option('--dry-run', default=False, is_flag=True, help='If set, prints commands.')
 @click.option('--follow', is_flag=True, help='Follow last container log output.')
+@click.option('--log-level', default=INFO, type=click.Choice([DEBUG, INFO, WARNING, ERROR]), help='''
+    Log levels can be "debug", "info", "warning", or "error"
+''')
 @click.option('--namespace', help='Workflow namespace.')
 @click.option('--service', multiple=True, help='Select which services to log. Defaults to all.')
 @click.argument('workflow_name')
 def logs(**kwargs):
-  if len(kwargs['container']) == 0:
-    kwargs['container'] = [WORKFLOW_CONTAINER_PROXY]
+  os.environ[env_vars.LOG_LEVEL] = kwargs['log_level']
 
   app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
+  __validate_app(app)
 
-  if not app.exists:
-    print(f"Error: {app.dir_path} does not exist", file=sys.stderr)
-    sys.exit(1)
+  if len(kwargs['container']) == 0:
+    kwargs['container'] = [WORKFLOW_CONTAINER_PROXY]
 
   workflow = Workflow(kwargs['workflow_name'], app)
   services = __get_services(workflow.services, service=kwargs['service'], without_core=True)
@@ -357,47 +412,38 @@ def logs(**kwargs):
 
       if not kwargs['dry_run']:
         exec_stream(shell_command)
- 
+
 @workflow.command()
-@click.option('--app-dir-path', default=os.getcwd(), help='Path to application directory.')
-@click.option('--ca-certs-dir-path', default=DataDir.instance().mitmproxy_conf_dir_path, help='Path to ca certs directory used to sign SSL certs. Defaults to ~/.mitmproxy')
+@click.option('--app-dir-path', default=current_working_dir, help='Path to application directory.')
+@click.option('--build', is_flag=True, help='Build images before starting containers.')
+@click.option('--ca-certs-dir-path', default=data_dir.mitmproxy_conf_dir_path, help='Path to ca certs directory used to sign SSL certs. Defaults to ~/.mitmproxy')
 @click.option('--certs-dir-path', help='Path to certs directory. Defaults to the certs dir of the context.')
-@click.option('--context-dir-path', default=DataDir.instance().context_dir_path, help='Path to Stoobly data directory.')
+@click.option('--context-dir-path', default=data_dir.context_dir_path, help='Path to Stoobly data directory.')
 @click.option('--detached', is_flag=True, help='If set, will not run the highest priority service in the foreground.')
 @click.option('--dry-run', default=False, is_flag=True, help='If set, prints commands.')
-@click.option('--extra-compose-path', help='Path to extra compose configuration files.')
+@click.option('--extra-entrypoint-compose-path', help='Path to extra entrypoint compose file.')
+@click.option('--from-make', is_flag=True, help='Set if run from scaffolded Makefile.')
 @click.option('--log-level', default=INFO, type=click.Choice([DEBUG, INFO, WARNING, ERROR]), help='''
     Log levels can be "debug", "info", "warning", or "error"
 ''')
 @click.option('--namespace', help='Workflow namespace.')
-@click.option('--network', help='Workflow network namespace.')
-@click.option('--no-cache', is_flag=True, help='Do not use cache when building images.')
+@click.option('--network', help='Workflow network name.')
+@click.option('--pull', is_flag=True, help='Pull image before running.')
 @click.option('--service', multiple=True, help='Select which services to run. Defaults to all.')
+@click.option('--user-id', default=os.getuid(), help='OS user ID of the owner of context dir path.')
 @click.option('--verbose', is_flag=True)
 @click.argument('workflow_name')
 def up(**kwargs):
   cwd = os.getcwd()
 
-  # Create the certs_dir_path if it doesn't exist
-  DataDir.instance().certs_dir_path
+  os.environ[env_vars.LOG_LEVEL] = kwargs['log_level']
 
-  if not os.getenv(env_vars.LOG_LEVEL):
-    os.environ[env_vars.LOG_LEVEL] = kwargs['log_level']
+  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE, **kwargs)
+  __validate_app(app)
 
-  app = App(
-    kwargs['app_dir_path'], DOCKER_NAMESPACE, 
-    ca_certs_dir_path=kwargs['ca_certs_dir_path'], skip_validate_path=kwargs['dry_run']
-  )
-
-  if kwargs['certs_dir_path']:
-    app.certs_dir_path = kwargs['certs_dir_path']
-
-  if kwargs['context_dir_path']:
-    app.context_dir_path = kwargs['context_dir_path']
-
-  if not app.exists:
-    print(f"Error: {app.dir_path} does not exist", file=sys.stderr)
-    sys.exit(1)
+  # If namespace is set, default network to namespace
+  if kwargs['namespace'] and not kwargs['network']:
+    kwargs['network'] = kwargs['namespace']
 
   workflow = Workflow(kwargs['workflow_name'], app)
   services = __get_services(workflow.services, service=kwargs['service'])
@@ -413,27 +459,44 @@ def up(**kwargs):
     command.current_working_dir = cwd
     commands.append(command)
 
-  # Before services can be started, their network needs to be created
+  # Before services can be started, their image and network needs to be created
   if len(commands) > 0:
     command: WorkflowRunCommand = commands[0]
-    create_network_command = command.create_network()
+
+    init_commands = []
+    if not kwargs['from_make']:
+      create_image_command = command.create_image(user_id=kwargs['user_id'], verbose=kwargs['verbose'])
+      init_commands.append(create_image_command)
+
+    init_commands.append(command.create_network())
+    joined_command = ' && '.join(init_commands)
 
     if not kwargs['dry_run']:
       command.write_nameservers()
-
-      exec_stream(create_network_command)
+      exec_stream(joined_command)
     else:
-      print(create_network_command)
+      print(joined_command)
 
   commands = sorted(commands, key=lambda command: command.service_config.priority)
   for index, command in enumerate(commands):
     __print_header(f"SERVICE {command.service_name}")
 
+    attached = False
+    extra_compose_path = None
+
     # By default, the entrypoint service should be last
     # However, this can change if the user has configured a service's priority to be higher
-    attached = not kwargs['detached'] and index == len(commands) - 1
+    if index == len(commands) - 1:
+      attached = not kwargs['detached']
+      extra_compose_path = kwargs['extra_entrypoint_compose_path']
+
     exec_command = command.up(
-      attached=attached, namespace=kwargs['namespace'], no_cache=kwargs['no_cache'], verbose=kwargs['verbose']
+      attached=attached,
+      build=kwargs['build'],
+      extra_compose_path=extra_compose_path,
+      namespace=kwargs['namespace'],
+      pull=kwargs['pull'],
+      user_id=kwargs['user_id']
     )
     if not exec_command:
       continue
@@ -446,10 +509,12 @@ def up(**kwargs):
 @workflow.command(
   help="Validate a scaffold workflow"
 )
-@click.option('--app-dir-path', default=os.getcwd(), help='Path to validate the app scaffold.')
+@click.option('--app-dir-path', default=current_working_dir, help='Path to validate the app scaffold.')
 @click.argument('workflow_name')
 def validate(**kwargs):
   app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
+  __validate_app(app)
+
   workflow = Workflow(kwargs['workflow_name'], app)
   
   config = { **kwargs }
@@ -472,35 +537,103 @@ def validate(**kwargs):
     print(f"\nFatal Scaffold Validation Exception: {sve}", file=sys.stderr)
     sys.exit(1)
 
+@hostname.command(
+  help="Update the system hosts file for all scaffold service hostnames"
+)
+@click.option('--app-dir-path', default=current_working_dir, help='Path to application directory.')
+@click.option('--service', multiple=True, help='Select specific services.')
+@click.option('--workflow', multiple=True, help='Specify services by workflow(s).')
+def install(**kwargs):
+  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
+  __validate_app(app)
+
+  services = __get_workflow_services(app, **kwargs)
+
+  hostnames = []
+  for service_name in services: 
+    service = Service(service_name, app)
+    __validate_service_dir(service.dir_path)
+
+    service_config = ServiceConfig(service.dir_path)
+    if service_config.hostname:
+      hostnames.append(service_config.hostname)
+
+  __elevate_sudo()
+
+  try:
+    hosts_file_manager = HostsFileManager()
+    hosts_file_manager.install_hostnames(hostnames)
+  except PermissionError:
+    print("Permission denied. Please run this command with sudo.", file=sys.stderr)
+
+@hostname.command(
+  help="Delete from the system hosts file all scaffold service hostnames"
+)
+@click.option('--app-dir-path', default=current_working_dir, help='Path to application directory.')
+def uninstall(**kwargs):
+  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
+  __validate_app(app)
+
+  __elevate_sudo()
+
+  try:
+    hosts_file_manager = HostsFileManager()
+    hosts_file_manager.uninstall_hostnames()
+  except OSError as e:
+    if e.errno == errno.EACCES or e.errno == errno.EPERM:
+      print("Permission denied. Please run this command with sudo.", file=sys.stderr)
+    else:
+      print(f"An unexpected error occurred: {e}", file=sys.stderr)
+
 scaffold.add_command(app)
 scaffold.add_command(service)
 scaffold.add_command(workflow)
+scaffold.add_command(hostname)
+
+def __elevate_sudo():
+  import subprocess
+
+  if os.geteuid() != 0:
+    subprocess.run(["sudo", sys.executable] + sys.argv)
+    sys.exit(0)
+
+def __get_services(services: List[str], **kwargs) -> List[str]:
+  selected_services = list(kwargs['service'])
+
+  # If service is specified, run only those services
+  if selected_services:
+    missing_services = [service for service in selected_services if service not in services]
+
+    # Remove services that don't exist
+    if missing_services:
+      Logger.instance(LOG_ID).warn(f"Service(s) {','.join(missing_services)} are not found")
+      selected_services = list(set(selected_services) - set(missing_services))
+
+    services = selected_services
 
-def __get_services(services: List[str], **kwargs):
-  # Log services that don't exist
-  missing_services = [service for service in kwargs['service'] if service not in services]
-  if missing_services:
-    Logger.instance(LOG_ID).warn(f"Service(s) {','.join(missing_services)} are not found")
+  services += CORE_SERVICES
 
-  if kwargs['service']:
-    # If service is specified, run only those services
-    services = list(kwargs['service'])
+  services_index = {}
+  for service in services:
+    if kwargs.get('without_core') and service in CORE_SERVICES:
+        continue
+    services_index[service] = True
+ 
+  return services_index.keys()
 
-    if not kwargs.get('without_core'):
-      services += CORE_SERVICES
+def __get_workflow_services(app: App, **kwargs):
+  selected_services = []
+  if not kwargs['workflow']:
+    selected_services += __get_services(app.services, service=kwargs['service'], without_core=True)
   else:
-    # If set, filter out core services
-    if kwargs.get('without_core'):
-      services = list(filter(lambda service: service not in CORE_SERVICES, services))
-    
-  return list(set(services))
+    for workflow_name in kwargs['workflow']:
+      workflow = Workflow(workflow_name, app)
+      selected_services += __get_services(workflow.services, service=kwargs['service'], without_core=True)
+  return set(selected_services)
 
 def __print_header(text: str):
   Logger.instance(LOG_ID).info(f"{bcolors.OKBLUE}{text}{bcolors.ENDC}")
 
-def __app_build(app, **kwargs):
-  AppCreateCommand(app, **kwargs).build()
-
 def __scaffold_build(app, **kwargs):
   command = ServiceCreateCommand(app, **kwargs)
 
@@ -511,6 +644,11 @@ def __scaffold_delete(app, **kwargs):
 
   command.delete()
 
+def __validate_app(app: App):
+  if not app.valid:
+    print(f"Error: {app.dir_path} is not a valid scaffold app", file=sys.stderr)
+    sys.exit(1)
+
 def __validate_app_dir(app_dir_path):
   if not os.path.exists(app_dir_path):
     print(f"Error: {app_dir_path} does not exist", file=sys.stderr)
@@ -521,13 +659,12 @@ def __validate_service_dir(service_dir_path):
     print(f"Error: {service_dir_path} does not exist, please scaffold this service", file=sys.stderr)
     sys.exit(1)
 
-def __workflow_build(app, **kwargs):
+def __workflow_create(app, **kwargs):
   command = WorkflowCreateCommand(app, **kwargs)
 
   service_config = command.service_config
   workflow_decorators = get_workflow_decorators(kwargs['template'], service_config)
   command.build(
-    headless=kwargs['headless'],
     template=kwargs['template'],
     workflow_decorators=workflow_decorators
   )

stoobly_agent/app/cli/snapshot_cli.py

@@ -36,11 +36,15 @@ def snapshot(ctx):
 @click.argument('uuid', required=False)
 def apply(**kwargs):
   apply = Apply(force=kwargs['force']).with_logger(print)
+  completed = True
 
   if kwargs.get('uuid'):
-    apply.single(kwargs['uuid'])
+    completed = apply.single(kwargs['uuid'])
   else:
-    apply.all()
+    completed = apply.all()
+
+  if not completed:
+    sys.exit(1)
 
 @snapshot.command(
   help="Copy snapshots to a different data directory."
@@ -96,7 +100,7 @@ def prune(**kwargs):
   log.prune(kwargs['dry_run'])
 
 @snapshot.command(
-  help="Update snapshot.",
+  help="Update a snapshot.",
 )
 @click.option('--format', type=click.Choice(FORMATS), help='Format output.')
 @click.option('--select', multiple=True, help='Select column(s) to display.')

stoobly_agent/app/models/adapters/joined_request_adapter.py

@@ -18,6 +18,12 @@ class JoinedRequestAdapter():
       payloads_delimitter = payloads_delimitter.encode()
       
     self.__split_joined_request_string = joined_request_string.split(payloads_delimitter)
+    if len(self.__split_joined_request_string) != 2:
+      self.__split_joined_request_string = joined_request_string.split(payloads_delimitter.replace(b"\n", b"\r\n"))
+
+    if len(self.__split_joined_request_string) != 2:
+      raise ValueError(f"Could not split by {payloads_delimitter}")
+
     self.__raw_request_string = None
     self.__raw_response_string = None
 

stoobly_agent/app/models/factories/resource/local_db/helpers/scenario_snapshot.py

@@ -34,7 +34,9 @@ class ScenarioSnapshot(Snapshot):
       try:
         return json.loads(fp.read())
       except Exception:
-        return {}
+        return {
+          'name': self.uuid
+        }
 
   @property
   def metadata_backup(self):