stoobly-agent 1.4.1__py3-none-any.whl → 1.5.0__py3-none-any.whl

stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.4.1'
+VERSION = '1.5.0'

stoobly_agent/app/cli/helpers/handle_mock_service.py

@@ -6,9 +6,13 @@ from stoobly_agent.app.proxy.record.response_string import ResponseString
 
 RAW_FORMAT = 'raw'
 
-def print_raw_response(response: requests.Response):
+def print_raw_response(response: requests.Response, file_path = None):
   mitmproxy_response = PythonResponseAdapterFactory(response).mitmproxy_response()
   facade = MitmproxyResponseFacade(mitmproxy_response)
   response_string = ResponseString(facade, None)
 
-  print(response_string.get().decode(), end="")
+  if not file_path:
+    print(response_string.get().decode(), end="")
+  else:
+    with open(file_path, 'w') as fp:
+      fp.write(response_string.get().decode()) 

stoobly_agent/app/cli/helpers/request_facade.py

@@ -53,10 +53,14 @@ class RequestFacade(ReplayFacade):
   def replay(self, request_key: str, cli_options: ReplayCliOptions):
     replay_context = self.__build_replay_context(request_key)
     replay_options = {
-      'mode': mode.RECORD if cli_options.get('record') else mode.REPLAY,
+      'mode': mode.REPLAY,
       **self.__common_replay_options(request_key),
       **self.common_replay_cli_options(cli_options)
     }
+
+    if cli_options.get('record'):
+      replay_options['response_mode'] = mode.RECORD
+
     trace_context = replay_options.get('trace_context')
 
     return self.__replay(replay_context, trace_context, replay_options)

stoobly_agent/app/cli/scaffold/constants.py

@@ -14,8 +14,8 @@ CONFIG_FILE = '.config.yml'
 CONTEXT_DIR_ENV = 'CONTEXT_DIR'
 DOCKER_NAMESPACE = 'docker'
 ENV_FILE = '.env'
-FIXTURES_FOLDER_NAME = 'fixtures'
 NAMESERVERS_FILE = '.nameservers'
+PUBLIC_FOLDER_NAME = 'public'
 SERVICE_DETACHED = '${SERVICE_DETACHED}'
 SERVICE_DETACHED_ENV = 'SERVICE_DETACHED'
 SERVICE_HOSTNAME = '${SERVICE_HOSTNAME}'

stoobly_agent/app/cli/scaffold/docker/workflow/mock_decorator.py

@@ -1,7 +1,7 @@
 import os
 import pdb
 
-from ...constants import SERVICE_HOSTNAME, SERVICE_PORT, STOOBLY_CERTS_DIR
+from ...constants import SERVICE_HOSTNAME, SERVICE_PORT, SERVICE_PROXY_MODE, STOOBLY_CERTS_DIR
 from .builder import WorkflowBuilder
 
 class MockDecorator():
@@ -24,8 +24,9 @@ class MockDecorator():
       '--headless',
       '--intercept',
       '--lifecycle-hooks-path', 'lifecycle_hooks.py',
-      '--proxy-mode', config.proxy_mode,
+      '--proxy-mode', SERVICE_PROXY_MODE,
       '--proxy-port', f"{SERVICE_PORT}",
+      '--public-directory-path', 'public',
       '--response-fixtures-path', 'fixtures.yml',
       '--ssl-insecure'
     ]

stoobly_agent/app/cli/scaffold/docker/workflow/reverse_proxy_decorator.py

@@ -3,7 +3,7 @@ import pdb
 
 from urllib.parse import urlparse
 
-from ...constants import SERVICE_HOSTNAME, SERVICE_PORT, STOOBLY_CERTS_DIR
+from ...constants import SERVICE_HOSTNAME, SERVICE_PORT, SERVICE_PROXY_MODE, STOOBLY_CERTS_DIR
 from .builder import WorkflowBuilder
 
 class ReverseProxyDecorator():
@@ -25,7 +25,7 @@ class ReverseProxyDecorator():
     command = [
       '--headless',
       '--lifecycle-hooks-path', 'lifecycle_hooks.py',
-      '--proxy-mode', config.proxy_mode,
+      '--proxy-mode', SERVICE_PROXY_MODE,
       '--proxy-port', f"{SERVICE_PORT}",
       '--ssl-insecure'
     ]

stoobly_agent/app/cli/scaffold/service_config.py

@@ -92,7 +92,21 @@ class ServiceConfig(Config):
     if self.__proxy_mode:
       return (self.__proxy_mode or '').strip()
 
-    return f"reverse:{self.scheme}://{self.hostname}"
+    if not self.hostname:
+      return ''
+
+    _proxy_mode = f"reverse:{self.scheme}://{self.hostname}"
+
+    if not self.port:
+      return _proxy_mode
+
+    if self.scheme == 'http' and self.port == '80': 
+      return _proxy_mode
+
+    if self.scheme == 'https' and self.port == '443':
+      return _proxy_mode
+
+    return f"{_proxy_mode}:{self.port}"
 
   @proxy_mode.setter
   def proxy_mode(self, v):
@@ -123,7 +137,7 @@ class ServiceConfig(Config):
       'port': self.port,
       'priority': self.priority,
       'proxy_mode': self.proxy_mode,
-      'scheme': self.scheme,
+      'scheme': self.scheme if self.hostname else '',
     }
 
   def write(self):

stoobly_agent/app/cli/scaffold/service_workflow_validate_command.py

@@ -10,7 +10,7 @@ import yaml
 from docker.models.containers import Container
 
 from stoobly_agent.app.cli.scaffold.constants import (
-  FIXTURES_FOLDER_NAME,
+  PUBLIC_FOLDER_NAME,
   STOOBLY_DATA_DIR,
   VIRTUAL_HOST_ENV,
   VIRTUAL_PORT_ENV,
@@ -40,8 +40,8 @@ class ServiceWorkflowValidateCommand(ServiceCommand, ValidateCommand):
     )
 
   @property
-  def fixtures_dir_path(self):
-    return os.path.join(self.workflow_path, FIXTURES_FOLDER_NAME)
+  def public_dir_path(self):
+    return os.path.join(self.workflow_path, PUBLIC_FOLDER_NAME)
   
   @property
   def workflow_path(self):
@@ -124,14 +124,14 @@ class ServiceWorkflowValidateCommand(ServiceCommand, ValidateCommand):
     if ('200 OK' not in logs) and ('499' not in logs):
       raise ScaffoldValidateException(f"Error reaching {url} from inside Docker network")
 
-  # Check fixtures folder mounted into container
-  def validate_fixtures_folder(self, container: Container):
+  # Check public folder exists in container
+  def validate_public_folder(self, container: Container):
     
     if self.workflow_name == WORKFLOW_RECORD_TYPE:
-      print(f"Skipping validating fixtures folder in workflow: {self.workflow_name}, container: {container.name}")
+      print(f"Skipping validating public folder in workflow: {self.workflow_name}, container: {container.name}")
       return
 
-    print(f"Validating fixtures folder in container: {container.name}")
+    print(f"Validating public folder in container: {container.name}")
 
     data_dir_mounted = False
     volume_mounts = container.attrs['Mounts']
@@ -145,21 +145,21 @@ class ServiceWorkflowValidateCommand(ServiceCommand, ValidateCommand):
 
     # Only the running proxy containers will be checkable
     if container.status == 'exited':
-      print(f"Skipping validating fixtures folder contents because container is exited: {container.name}")
+      print(f"Skipping validating public folder contents because container is exited: {container.name}")
       return
 
-    # Check contents of fixtures folder to confirm it's shared
-    fixtures_folder_path = f"{FIXTURES_FOLDER_NAME}"
-    exec_result = container.exec_run(f"ls -A {fixtures_folder_path}")
+    # Check contents of public folder to confirm it's shared
+    public_folder_path = f"{PUBLIC_FOLDER_NAME}"
+    exec_result = container.exec_run(f"ls -A {public_folder_path}")
     output = exec_result.output
 
-    fixtures_folder_contents_container = output.decode('ascii').split('\n')
-    if fixtures_folder_contents_container[-1] == '':
-      fixtures_folder_contents_container.pop()
-    fixtures_folder_contents_scaffold = os.listdir(self.fixtures_dir_path)
+    public_folder_contents_container = output.decode('ascii').split('\n')
+    if public_folder_contents_container[-1] == '':
+      public_folder_contents_container.pop()
+    public_folder_contents_scaffold = os.listdir(self.public_dir_path)
 
-    if Counter(fixtures_folder_contents_container) != Counter(fixtures_folder_contents_scaffold):
-      raise ScaffoldValidateException(f"Fixtures was not mounted properly, expected {self.fixtures_dir_path} to exist in container path {fixtures_folder_path}")
+    if Counter(public_folder_contents_container) != Counter(public_folder_contents_scaffold):
+      raise ScaffoldValidateException(f"public folder was not mounted properly, expected {self.public_dir_path} to exist in container path {public_folder_path}")
 
   # Note: might not need this if the hostname is reachable and working
   def proxy_environment_variables_exist(self, container: Container) -> None:
@@ -191,7 +191,7 @@ class ServiceWorkflowValidateCommand(ServiceCommand, ValidateCommand):
       raise ScaffoldValidateException(f"Container attributes are missing for: {container.name}")
 
     if not self.service_config.detached:
-      self.validate_fixtures_folder(service_proxy_container)
+      self.validate_public_folder(service_proxy_container)
 
     self.proxy_environment_variables_exist(service_proxy_container)
 
@@ -215,7 +215,7 @@ class ServiceWorkflowValidateCommand(ServiceCommand, ValidateCommand):
 
     # Service init containers have a mounted dist folder unlike the core init container
     init_container = self.docker_client.containers.get(self.service_docker_compose.init_container_name)
-    self.validate_fixtures_folder(init_container)
+    self.validate_public_folder(init_container)
 
     if self.service_config.hostname:
       service_proxy_container = self.docker_client.containers.get(self.service_docker_compose.proxy_container_name)

stoobly_agent/app/cli/scaffold/templates/app/.Dockerfile.context

@@ -1,4 +1,4 @@
-FROM stoobly/agent:1.4
+FROM stoobly/agent:1.5
 
 ARG USER_ID
 

stoobly_agent/app/cli/scaffold/templates/app/.Makefile

@@ -61,8 +61,15 @@ stoobly_exec_run_env=$(source_env) && $(exec_env) && export CONTEXT_DIR="$(app_d
 workflow_run=$(source_env) && bash "$(workflow_run_script)"
 
 ca-cert/install: stoobly/install
-	@echo "Running stoobly-agent ca-cert install..."; \
-	stoobly-agent ca-cert install
+	@if [ ! -d "$$HOME/.mitmproxy" ]; then \
+		read -p "Installing CA certificate is required for $(WORKFLOW)ing requests, continue? (y/N) " confirm && \
+		if [ "$$confirm" = "y" ] || [ "$$confirm" = "Y" ]; then \
+			echo "Running stoobly-agent ca-cert install..."; \
+			stoobly-agent ca-cert install; \
+		else \
+			echo "You can install the CA certificate later by running: stoobly-agent ca-cert install"; \
+		fi \
+	fi
 certs:
 	@export EXEC_COMMAND=bin/.mkcert && \
 	$(stoobly_exec)
@@ -89,7 +96,7 @@ intercept/enable:
 	@export EXEC_COMMAND=bin/.enable && \
 	export EXEC_ARGS=$(scenario_key) && \
 	$(stoobly_exec)
-mock: workflow/mock workflow/hostname/install nameservers workflow/up
+mock: workflow/mock ca-cert/install workflow/hostname/install nameservers workflow/up
 mock/services: workflow/mock workflow/services
 mock/logs: workflow/mock workflow/logs
 mock/down: workflow/mock workflow/down workflow/hostname/uninstall
@@ -103,7 +110,7 @@ python/validate:
 		echo "Error: Python 3.10, 3.11, or 3.12 is required."; \
 		exit 1; \
 	fi
-record: workflow/record workflow/hostname/install nameservers workflow/up
+record: workflow/record ca-cert/install workflow/hostname/install nameservers workflow/up
 record/down: workflow/record workflow/down workflow/hostname/uninstall
 record/services: workflow/record workflow/services
 record/logs: workflow/record workflow/logs
@@ -139,7 +146,7 @@ scenario/snapshot:
 stoobly/install: python/validate pipx/install 
 	@if ! pipx list 2> /dev/null | grep -q 'stoobly-agent'; then \
 		echo "stoobly-agent not found. Installing..."; \
-		pipx install stoobly-agent; \
+		pipx install stoobly-agent || { echo "Failed to install stoobly-agent"; exit 1; }; \
 	fi
 test: workflow/test workflow/up
 test/services: workflow/test workflow/services

stoobly_agent/app/cli/scaffold/templates/constants.py

@@ -18,12 +18,12 @@ CUSTOM_FIXTURES = 'fixtures.yml'
 CUSTOM_LIFECYCLE_HOOKS = os.path.join('lifecycle_hooks.py')
 MAINTAINED_CONFIGURE = os.path.join('bin', '.configure')
 MAINTAINED_INIT = os.path.join('bin', '.init')
-MAINTAINED_FIXTURES = os.path.join('fixtures', '.keep')
+MAINTAINED_PUBLIC = os.path.join('public', '.gitignore')
 
 MOCK_WORKFLOW_MAINTAINED_FILES = [
   MAINTAINED_CONFIGURE,
   MAINTAINED_INIT,
-  MAINTAINED_FIXTURES
+  MAINTAINED_PUBLIC
 ]
 
 MOCK_WORKFLOW_CUSTOM_FILES = [
@@ -49,7 +49,7 @@ RECORD_WORKFLOW_CUSTOM_FILES = [
 TEST_WORKFLOW_MAINTAINED_FILES = [
   MAINTAINED_CONFIGURE,
   MAINTAINED_INIT,
-  MAINTAINED_FIXTURES
+  MAINTAINED_PUBLIC
 ]
 
 TEST_WORKFLOW_CUSTOM_FILES = [

stoobly_agent/app/cli/scaffold/templates/factory.py

@@ -1,7 +1,7 @@
 from ..constants import WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE, WORKFLOW_TEST_TYPE
 from ..docker.workflow.builder import WorkflowBuilder
 from .constants import (
-  CUSTOM_CONFIGURE, CUSTOM_INIT, MAINTAINED_CONFIGURE, MAINTAINED_FIXTURES, MOCK_WORKFLOW_CUSTOM_FILES, MOCK_WORKFLOW_MAINTAINED_FILES, RECORD_WORKFLOW_CUSTOM_FILES, RECORD_WORKFLOW_MAINTAINED_FILES, TEST_WORKFLOW_CUSTOM_FILES, TEST_WORKFLOW_MAINTAINED_FILES
+  CUSTOM_CONFIGURE, CUSTOM_INIT, MAINTAINED_CONFIGURE, MAINTAINED_PUBLIC, MOCK_WORKFLOW_CUSTOM_FILES, MOCK_WORKFLOW_MAINTAINED_FILES, RECORD_WORKFLOW_CUSTOM_FILES, RECORD_WORKFLOW_MAINTAINED_FILES, TEST_WORKFLOW_CUSTOM_FILES, TEST_WORKFLOW_MAINTAINED_FILES
 )
 
 def custom_files(workflow: str, workflow_builder: WorkflowBuilder):
@@ -21,8 +21,8 @@ def custom_files(workflow: str, workflow_builder: WorkflowBuilder):
 
   # Fixtures are only relevant if the workflow is mock/test and if the service has a hostname
   if not workflow_builder.config.hostname:
-    if MAINTAINED_FIXTURES in files:
-      files.remove(MAINTAINED_FIXTURES)
+    if MAINTAINED_PUBLIC in files:
+      files.remove(MAINTAINED_PUBLIC)
 
   return files
 
@@ -40,7 +40,7 @@ def maintained_files(workflow: str, workflow_builder: WorkflowBuilder):
       files.append(MAINTAINED_CONFIGURE)
 
   if not workflow_builder.config.hostname:
-    if MAINTAINED_FIXTURES in files:
-      files.remove(MAINTAINED_FIXTURES)
+    if MAINTAINED_PUBLIC in files:
+      files.remove(MAINTAINED_PUBLIC)
 
   return files

stoobly_agent/app/cli/scaffold/templates/workflow/mock/bin/configure

@@ -10,11 +10,4 @@ url="$scheme://$hostname"
 
 if [ "$scheme" = 'http' -a "$port" != '80' ] || [ "$scheme" = 'https' -a "$port" != '443' ]; then
   url="$url:$port"
-fi
-
-# Match Rules
-echo "Configuring match rules"
-stoobly-agent config match set \
-  --method GET --method POST --method OPTIONS --method PUT --method DELETE \
-  --mode mock \
-  --pattern ".*?"
+fi

stoobly_agent/app/cli/scaffold/templates/workflow/mock/fixtures.yml

@@ -1,5 +1,5 @@
 # The following example matches requests for GET /users/d+ (e.g. /users/1) with the contents of user-1.json
-# Assumes that 'user-1.json' is created in the 'fixtures' folder
+# Assumes that 'user-1.json' is created in a 'fixtures' folder in the same directory as this file
 #GET:
 #  /users/d+:
 #    path: ./fixtures/user-1.json

stoobly_agent/app/cli/scaffold/templates/workflow/test/bin/configure

@@ -10,11 +10,4 @@ url="$scheme://$hostname"
 
 if [ "$scheme" = 'http' -a "$port" != '80' ] || [ "$scheme" = 'https' -a "$port" != '443' ]; then
   url="$url:$port"
-fi
-
-# Match
-echo "Configuring match rules"
-stoobly-agent config match set \
-  --method GET --method POST --method OPTIONS --method PUT --method DELETE \
-  --mode mock \
-  --pattern ".*?"
+fi

stoobly_agent/app/cli/scaffold/templates/workflow/test/fixtures.yml

@@ -1,5 +1,5 @@
 # The following example matches requests for GET /users/d+ (e.g. /users/1) with the contents of user-1.json
-# Assumes that 'user-1.json' is created in the 'fixtures' folder
+# Assumes that 'user-1.json' is created in a 'fixtures' folder in the same directory as this file
 #GET:
 #  /users/d+:
 #    path: ./fixtures/user-1.json

stoobly_agent/app/cli/scaffold/workflow_command.py

@@ -6,7 +6,7 @@ from stoobly_agent.lib.logger import Logger
 
 from .app import App
 from .config import Config
-from .constants import BIN_FOLDER_NAME, COMPOSE_TEMPLATE, CONFIG_FILE, ENV_FILE, FIXTURES_FOLDER_NAME
+from .constants import BIN_FOLDER_NAME, COMPOSE_TEMPLATE, CONFIG_FILE, ENV_FILE, PUBLIC_FOLDER_NAME
 from .docker.constants import DOCKER_COMPOSE_CUSTOM
 from .service_command import ServiceCommand
 
@@ -88,8 +88,8 @@ class WorkflowCommand(ServiceCommand):
     return services
 
   @property
-  def fixtures_dir_path(self):
-    return os.path.join(self.workflow_path, FIXTURES_FOLDER_NAME)
+  def public_dir_path(self):
+    return os.path.join(self.workflow_path, PUBLIC_FOLDER_NAME)
 
   @property
   def workflow_config(self):

stoobly_agent/app/cli/scaffold/workflow_create_command.py

@@ -67,11 +67,11 @@ class WorkflowCreateCommand(WorkflowCommand):
       return
 
     # Maintained files are files that will always be overwritten
-    maintained_workflow_files = maintained_files(self.workflow_name, workflow_builder)
+    maintained_workflow_files = maintained_files(template or self.workflow_name, workflow_builder)
     self.copy_files(templates_path, maintained_workflow_files, self.workflow_path)
 
     # Custom files are files that may be modified by the user
-    custom_workflow_files = custom_files(self.workflow_name, workflow_builder)
+    custom_workflow_files = custom_files(template or self.workflow_name, workflow_builder)
     self.copy_files_no_replace(templates_path, custom_workflow_files, self.workflow_path)
 
   def __write_docker_compose_file(self, **kwargs: BuildOptions):

stoobly_agent/app/cli/scaffold_cli.py

@@ -108,14 +108,19 @@ def create(**kwargs):
 @click.option('--certs-dir-path', help='Path to certs directory. Defaults to the certs dir of the context.')
 @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.')
+@click.option('--workflow', multiple=True, help='Specify services by workflow(s). Defaults to all.')
 def mkcert(**kwargs):
   app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE, **kwargs)
   __validate_app(app)
 
-  services = __get_services(app.services, service=kwargs['service'])
+  services = __get_services(
+    app, service=kwargs['service'], without_core=True, workflow=kwargs['workflow']
+  )
 
   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.scheme != 'https':
@@ -135,19 +140,19 @@ def mkcert(**kwargs):
   help="Scaffold a service",
 )
 @click.option('--app-dir-path', default=current_working_dir, help='Path to application directory.')
-@click.option('--detached', is_flag=True)
+@click.option('--detached', is_flag=True, help='Use isolated and non-persistent context directory.')
 @click.option('--env', multiple=True, help='Specify an environment variable.')
 @click.option('--force', is_flag=True, help='Overwrite maintained scaffolded service files.')
-@click.option('--hostname')
-@click.option('--port')
-@click.option('--priority', default='5.0', help='Determines the service run order.')
+@click.option('--hostname', help='Service hostname.')
+@click.option('--port', help='Service port.')
+@click.option('--priority', default=5, type=click.FloatRange(1.0, 9.0), help='Determines the service run order. Lower values run first.')
 @click.option('--proxy-mode', help='''
   Proxy mode can be "regular", "transparent", "socks5",
   "reverse:SPEC", or "upstream:SPEC". For reverse and
   upstream proxy modes, SPEC is host specification in
   the form of "http[s]://host[:port]".
 ''')
-@click.option('--scheme', type=click.Choice(['http', 'https']))
+@click.option('--scheme', type=click.Choice(['http', 'https']), help='Defaults to https if hostname is set.')
 @click.option('--workflow', multiple=True, type=click.Choice([WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE, WORKFLOW_TEST_TYPE]), help='Include pre-defined workflows.')
 @click.argument('service_name')
 def create(**kwargs):
@@ -170,19 +175,23 @@ def create(**kwargs):
 @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.')
+@click.option('--workflow', multiple=True, help='Specify workflow(s) to filter the services by. Defaults to all.')
 def _list(**kwargs):
-  __validate_app_dir(kwargs['app_dir_path'])
-
   app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
   __validate_app(app)
 
+  services = __get_services(app, service=kwargs['service'], workflow=kwargs['workflow'])
+
   rows = []
-  for service_name in __get_workflow_services(app, **kwargs): 
+  for service_name in services: 
     service = Service(service_name, app)
     __validate_service_dir(service.dir_path)
+
     service_config = ServiceConfig(service.dir_path)
-    rows.append(service_config.to_dict())
+    rows.append({
+      'name': service_name,
+      **service_config.to_dict()
+    })
 
   print_services(rows, **select_print_options(kwargs))
 
@@ -192,9 +201,9 @@ def _list(**kwargs):
 @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'])
-
   app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
+  __validate_app(app)
+
   service = Service(kwargs['service_name'], app)
 
   if not os.path.exists(service.dir_path):
@@ -211,9 +220,9 @@ def delete(**kwargs):
 @click.option('--priority', help='Determines the service run order.')
 @click.argument('service_name')
 def update(**kwargs):
-  __validate_app_dir(kwargs['app_dir_path'])
-
   app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
+  __validate_app(app)
+
   service = Service(kwargs['service_name'], app)
 
   __validate_service_dir(service.dir_path)
@@ -304,8 +313,9 @@ def down(**kwargs):
   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'])
+  services = __get_services(
+    app, service=kwargs['service'], workflow=[kwargs['workflow_name']]
+  )
 
   commands: List[WorkflowRunCommand] = []
   for service in services:
@@ -379,8 +389,9 @@ def logs(**kwargs):
   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)
+  services = __get_services(
+    app, service=kwargs['service'], without_core=True, workflow=[kwargs['workflow_name']]
+  )
 
   commands: List[WorkflowLogCommand] = []
   for service in services:
@@ -445,10 +456,12 @@ def up(**kwargs):
   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'])
+  services = __get_services(
+    app, service=kwargs['service'], workflow=[kwargs['workflow_name']]
+  )
 
   # Gateway ports are dynamically set depending on the workflow run
+  workflow = Workflow(kwargs['workflow_name'], app)
   set_gateway_ports(workflow.service_paths_from_services(services))
 
   commands: List[WorkflowRunCommand] = []
@@ -541,13 +554,15 @@ def validate(**kwargs):
   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).')
+@click.option('--service', multiple=True, help='Select specific services. Defaults to all.')
+@click.option('--workflow', multiple=True, help='Specify services by workflow(s). Defaults to all.')
 def install(**kwargs):
   app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
   __validate_app(app)
 
-  services = __get_workflow_services(app, **kwargs)
+  services = __get_services(
+    app, service=kwargs['service'], without_core=True, workflow=kwargs['workflow']
+  )
 
   hostnames = []
   for service_name in services: 
@@ -571,13 +586,15 @@ def install(**kwargs):
   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.')
-@click.option('--service', multiple=True, help='Select specific services.')
-@click.option('--workflow', multiple=True, help='Specify services by workflow(s).')
+@click.option('--service', multiple=True, help='Select specific services. Defaults to all.')
+@click.option('--workflow', multiple=True, help='Specify services by workflow(s). Defaults to all.')
 def uninstall(**kwargs):
   app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
   __validate_app(app)
 
-  services = __get_workflow_services(app, **kwargs)
+  services = __get_services(
+    app, service=kwargs['service'], without_core=True, workflow=kwargs['workflow']
+  )
 
   hostnames = []
   for service_name in services: 
@@ -609,39 +626,37 @@ def __elevate_sudo():
     subprocess.run(["sudo", sys.executable] + sys.argv)
     sys.exit(0)
 
-def __get_services(services: List[str], **kwargs) -> List[str]:
+def __get_services(app: App, **kwargs):
   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]
+  if not selected_services:
+    selected_services = app.services
+  else:
+    selected_services += CORE_SERVICES
+    missing_services = [service for service in selected_services if service not in app.services]
 
-    # Remove services that don't exist
     if missing_services:
+      # Warn if an invalid service is provided
       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
+    # Remove services that don't exist
+      selected_services = list(set(selected_services) - set(missing_services))
 
-  services += CORE_SERVICES
+  # If without_score is set, filter out CORE_SERVICES
+  if kwargs.get('without_core'):
+    selected_services = list(set(selected_services) - set(CORE_SERVICES))
 
-  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()
-
-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 workflow is set, keep only services in the workflow
+  if kwargs.get('workflow'):
+    workflow_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)
+      workflow_services += workflow.services
+
+    # Intersection
+    selected_services = list(filter(lambda x: x in workflow_services, selected_services))
+  
+  return list(set(selected_services))
 
 def __print_header(text: str):
   Logger.instance(LOG_ID).info(f"{bcolors.OKBLUE}{text}{bcolors.ENDC}")

stoobly_agent/app/proxy/context.py

@@ -12,6 +12,10 @@ class InterceptContext():
   def flow(self):
     return self.__flow
 
+  @flow.setter
+  def flow(self, v: MitmproxyHTTPFlow):
+    self.__flow = v
+
   @property
   def intercept_settings(self):
     return self.__intercept_settings