stoobly-agent 1.7.0__py3-none-any.whl → 1.7.1__py3-none-any.whl

stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.7.0'
+VERSION = '1.7.1'

stoobly_agent/app/cli/scaffold/hosts_file_manager.py

@@ -15,21 +15,21 @@ class HostsFileManager():
     ip_address: str
     hostnames: list[str]
 
-  def __get_hosts_file_path(self) -> str:
+  # Split IP address and hostnames. Don't include inline comments
+  def __split_hosts_line(self, line: str) -> list[str]:
+    ip_addr_hosts_split = line.split('#')[0].split()
+    return ip_addr_hosts_split
+
+  def get_hosts_file_path(self) -> str:
     file_path = '/etc/hosts'
     if not os.path.exists(file_path):
       print(f"Error: File {file_path} not found.", file=sys.stderr)
       sys.exit(1)
     return file_path
 
-  # Split IP address and hostnames. Don't include inline comments
-  def __split_hosts_line(self, line: str) -> list[str]:
-    ip_addr_hosts_split = line.split('#')[0].split()
-    return ip_addr_hosts_split
-
   # Parses hosts file and returns a mapping of IP address to hostnames in a list.
   def get_hosts(self) -> list[IpAddressToHostnames]:
-    hosts_file_path = self.__get_hosts_file_path()
+    hosts_file_path = self.get_hosts_file_path()
 
     if not hosts_file_path:
       return []
@@ -64,14 +64,14 @@ class HostsFileManager():
     return None
 
   def install_hostnames(self, hostnames: list[str]) -> None:
-    hosts_file_path = self.__get_hosts_file_path()
+    hosts_file_path = self.get_hosts_file_path()
 
     self.__add_lines_between_markers(
       hosts_file_path, SCAFFOLD_HOSTS_DELIMITTER_BEGIN, SCAFFOLD_HOSTS_DELIMITTER_END, hostnames
     )
 
   def uninstall_hostnames(self, hostnames: list[str] = []) -> None:
-    hosts_file_path = self.__get_hosts_file_path()
+    hosts_file_path = self.get_hosts_file_path()
 
     self.__remove_lines_between_markers(
       hosts_file_path, SCAFFOLD_HOSTS_DELIMITTER_BEGIN, SCAFFOLD_HOSTS_DELIMITTER_END, hostnames
@@ -182,4 +182,4 @@ class HostsFileManager():
       filtered_lines.append(line)
 
     with open(file_path, "w") as file:
-      file.writelines(filtered_lines)
+      file.writelines(filtered_lines)

stoobly_agent/app/cli/scaffold/service_workflow_validate_command.py

@@ -4,6 +4,7 @@ import socket
 import time
 
 from collections import Counter
+from docker import errors as docker_errors
 from pathlib import Path
 
 import yaml
@@ -25,6 +26,7 @@ from stoobly_agent.app.cli.scaffold.service_docker_compose import ServiceDockerC
 from stoobly_agent.app.cli.scaffold.validate_command import ValidateCommand
 from stoobly_agent.app.cli.scaffold.validate_exceptions import ScaffoldValidateException
 from stoobly_agent.config.data_dir import DATA_DIR_NAME
+from stoobly_agent.lib.logger import bcolors
 
 from .app import App
 
@@ -84,7 +86,10 @@ class ServiceWorkflowValidateCommand(ServiceCommand, ValidateCommand):
         if attempt < retries - 1:
           time.sleep(delay)
 
-    raise ScaffoldValidateException(f"Connection failed to hostname: {hostname}, port: {port}")
+    hostname_not_reachable_message = f"{bcolors.FAIL}Connection failed to hostname: {hostname}, port: {port}, num_retries: {retries}{bcolors.ENDC}"
+    suggestion_message = f"{bcolors.BOLD}Try confirming that {hostname} is reachable from your machine or environment.{bcolors.ENDC}"
+    error_message = f"{hostname_not_reachable_message}\n\n{suggestion_message}"
+    raise ScaffoldValidateException(error_message)
 
   # Check if hostname is defined in hosts file
   def hostname_exists(self, hostname: str) -> bool:
@@ -96,7 +101,12 @@ class ServiceWorkflowValidateCommand(ServiceCommand, ValidateCommand):
       print(f"Correct hosts mapping found for {hostname}")
       return True
 
-    raise ScaffoldValidateException(f"Missing hosts mapping for {hostname}")
+    hosts_file_path = hosts_file_manager.get_hosts_file_path()
+
+    missing_host_message = f"{bcolors.FAIL}Missing hosts mapping for {hostname}{bcolors.ENDC}"
+    suggestion_message = f"{bcolors.BOLD}Confirm hostname '{hostname}' is in your hosts file at '{hosts_file_path}'. If not there, please add it{bcolors.ENDC}"
+    error_message = f"{missing_host_message}\n\n{suggestion_message}"
+    raise ScaffoldValidateException(error_message)
  
   def validate_hostname(self, hostname: str, port: int) -> None:
     print(f"Validating hostname: {hostname}")
@@ -188,8 +198,13 @@ class ServiceWorkflowValidateCommand(ServiceCommand, ValidateCommand):
   
   def validate_proxy_container(self, service_proxy_container: Container):
     print(f"Validating proxy container: {service_proxy_container.name}")
+
+    if service_proxy_container.status == 'exited' or service_proxy_container.attrs['State']['ExitCode'] != 0:
+      raise ScaffoldValidateException(f"Proxy container is exited: {service_proxy_container.name}")
+    if service_proxy_container.status != 'running':
+      raise ScaffoldValidateException(f"Proxy container is not running: {service_proxy_container.name}")
     if not service_proxy_container.attrs:
-      raise ScaffoldValidateException(f"Container attributes are missing for: {container.name}")
+      raise ScaffoldValidateException(f"Container attributes are missing for: {service_proxy_container.name}")
 
     if not self.service_config.detached:
       self.validate_public_folder(service_proxy_container)
@@ -219,32 +234,53 @@ class ServiceWorkflowValidateCommand(ServiceCommand, ValidateCommand):
     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)
+      try:
+        service_proxy_container = self.docker_client.containers.get(self.service_docker_compose.proxy_container_name)
+      except docker_errors.NotFound:
+        error_message = self._ValidateCommand__generate_container_not_found_error(self.service_docker_compose.proxy_container_name)
+        raise ScaffoldValidateException(error_message)
+
       self.validate_proxy_container(service_proxy_container)
 
+    # External services won't have a container to check
+    if self.is_local() or self.service_config.detached:
+      container_name = self.service_docker_compose.container_name
+      try:
+        service_container = self.docker_client.containers.get(container_name)
+      except docker_errors.NotFound:
+        error_message = self._ValidateCommand__generate_container_not_found_error(container_name)
+        raise ScaffoldValidateException(error_message)
+      if service_container.status == 'exited' or service_container.attrs['State']['ExitCode'] != 0:
+        raise ScaffoldValidateException(f"Custom container is exited: {service_container.name}")
+      if service_container.status != 'running':
+        raise ScaffoldValidateException(f"Custom container is not running: {service_container.name}")
+    
     if self.is_local():
       print(f"Validating local user defined service: {self.service_name}")
       # Validate docker-compose path exists
       docker_compose_path = f"{self.app_dir_path}/{DATA_DIR_NAME}/docker/{self.service_docker_compose.service_name}/{self.workflow_name}/docker-compose.yml"
       destination_path = Path(docker_compose_path)
+
+      if not destination_path.exists():
+        message = f"{bcolors.FAIL}Docker Compose file does not exist: {destination_path}{bcolors.ENDC}"
+        suggestion_message = f"{bcolors.BOLD}A missing Docker Compose file often means it got deleted by accident. Please restore from backup or rerun the scaffold service create command.{bcolors.ENDC}"
+        error_message = f"{message}\n\n{suggestion_message}"
+        raise ScaffoldValidateException(error_message)
       if not destination_path.is_file():
         raise ScaffoldValidateException(f"Docker compose path is not a file: {destination_path}")
 
       # Validate docker-compose.yml file has the service defined
       with open(destination_path) as f:
         if self.service_name not in f.read():
-          raise ScaffoldValidateException(f"Local service is not defined in Docker Compose file: {destination_path}")
-
-      service_container = self.docker_client.containers.get(self.service_docker_compose.container_name)
-      if service_container.status == 'exited':
-        return False
+          message = f"{bcolors.FAIL}Custom container service is not defined in Docker Compose file: {destination_path}{bcolors.ENDC}"
+          suggestion_message = f"{bcolors.BOLD}Please add your service definition. See https://docs.docker.com/reference/compose-file/services {bcolors.ENDC}"
+          error_message = f"{message}\n\n{suggestion_message}"
+          raise ScaffoldValidateException(error_message)
 
     if self.service_config.detached:
-      service_container = self.docker_client.containers.get(self.service_docker_compose.container_name)
       self.validate_detached(service_container)
 
-    print(f"Done validating service: {self.service_name}, success!")
-    print()
+    print(f"{bcolors.OKGREEN}✔ Done validating service: {self.service_name}, success!{bcolors.ENDC}\n")
 
     return True
 

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

@@ -1,4 +1,4 @@
-FROM stoobly/agent:1.6
+FROM stoobly/agent:1.7
 
 ARG USER_ID
 

stoobly_agent/app/cli/scaffold/validate_command.py

@@ -1,6 +1,7 @@
 import pdb
 import re
 from time import sleep
+from typing import Union
 
 import docker
 from docker import errors as docker_errors
@@ -8,14 +9,22 @@ from docker.models.containers import Container
 
 from stoobly_agent.app.cli.scaffold.validate_exceptions import ScaffoldValidateException
 from stoobly_agent.config.data_dir import DATA_DIR_NAME
+from stoobly_agent.lib.logger import bcolors
 
 
 class ValidateCommand():
   def __init__(self):
     self.docker_client = docker.from_env()
 
+  def __generate_container_not_found_error(self, container_name: Union[str, None]) -> str:
+    not_found_error_message = f"{bcolors.FAIL}Container not found: {container_name}{bcolors.ENDC}"
+    suggestion_message = f"{bcolors.BOLD}Run 'docker ps -a | grep {container_name}'. If found, then inspect the logs with 'docker logs {container_name}'{bcolors.ENDC}"
+    error_message = f"{not_found_error_message}\n\n{suggestion_message}"
+
+    return error_message
+
   # Some containers like init and configure can take longer than expected to finish so retry
-  def __get_container(self, container_name: str) -> Container:
+  def __get_container_with_retries(self, container_name: str) -> Container:
     tries = 30
     for _ in range(tries):
       try:
@@ -24,20 +33,28 @@ class ValidateCommand():
       except docker_errors.NotFound:
         sleep(0.5)
 
-    raise ScaffoldValidateException(f"Container not found: {container_name}")
+    error_message = self.__generate_container_not_found_error(container_name)
+    raise ScaffoldValidateException(error_message)
 
   def validate_init_containers(self, init_container_name, configure_container_name) -> None:
     print(f"Validating setup containers: {init_container_name}, {configure_container_name}")
 
-
-    init_container = self.__get_container(init_container_name)
+    init_container = self.__get_container_with_retries(init_container_name)
     logs = init_container.logs()
+
     if logs and re.search('error', str(logs), re.IGNORECASE):
-      raise ScaffoldValidateException(f"Error logs potentially detected in: {init_container_name}")
+      error_found_message = f"{bcolors.FAIL}Error logs potentially detected in: {init_container_name}{bcolors.ENDC}"
+      suggestion_message = f"{bcolors.BOLD}Run 'docker logs {init_container_name}'{bcolors.ENDC}"
+      error_message = f"{error_found_message}\n\n{suggestion_message}"
+      raise ScaffoldValidateException(error_message)
+
     if init_container.status != 'exited' or init_container.attrs['State']['ExitCode'] != 0:
-      raise ScaffoldValidateException(f"init container {init_container_name} exited with: {init_container.attrs['State']['ExitCode']}")
+      init_exit_message = f"{bcolors.FAIL}init container {init_container_name} exited with: {init_container.attrs['State']['ExitCode']}{bcolors.ENDC}"
+      suggestion_message = f"{bcolors.BOLD}Run 'docker logs {init_container_name}'{bcolors.ENDC}"
+      error_message = f"{init_exit_message}\n\n{suggestion_message}"
+      raise ScaffoldValidateException(error_message)
 
-    configure_container = self.__get_container(configure_container_name)
+    configure_container = self.__get_container_with_retries(configure_container_name)
 
     configure_container_ran = False
     if configure_container.status == 'exited' and configure_container.attrs['State']['ExitCode'] == 0:
@@ -49,12 +66,17 @@ class ValidateCommand():
     print(f"Validating detached for: {container.name}")
     
     if not container.attrs:
-      raise ScaffoldValidateException(f"Container is missing: {container.name}")
+      error_message = self.__generate_container_not_found_error(container.name)
+      raise ScaffoldValidateException(error_message)
 
     volume_mounts = container.attrs['Mounts']
     for volume_mount in volume_mounts:
       if DATA_DIR_NAME in volume_mount['Source']:
         return
+    
+    message = f"{bcolors.FAIL}Data directory is missing from container: {container.name}{bcolors.ENDC}"
+    suggestion_message = f"{bcolors.BOLD}Data directory might have failed to mount{bcolors.ENDC}"
+    error_message = f"{message}\n\n{suggestion_message}"
 
-    raise ScaffoldValidateException(f"Data directory is missing from container: {container.name}")
+    raise ScaffoldValidateException(error_message)
 

stoobly_agent/app/cli/scaffold/workflow_validate_command.py

@@ -15,6 +15,7 @@ from stoobly_agent.app.cli.scaffold.templates.constants import (
 from stoobly_agent.app.cli.scaffold.validate_command import ValidateCommand
 from stoobly_agent.app.cli.scaffold.validate_exceptions import ScaffoldValidateException
 from stoobly_agent.app.cli.scaffold.workflow_command import WorkflowCommand
+from stoobly_agent.lib.logger import bcolors
 
 from .app import App
 
@@ -25,62 +26,86 @@ class WorkflowValidateCommand(WorkflowCommand, ValidateCommand):
     ValidateCommand.__init__(self)
     self.managed_services_docker_compose = ManagedServicesDockerCompose(target_workflow_name=self.workflow_name)
 
-  def validate_core_components(self):
-    print(f"Validating core component: {CORE_GATEWAY_SERVICE_NAME}")
+  # Gateway core service runs in all workflows
+  def validate_gateway_service(self):
+    print(f"Validating core service: {CORE_GATEWAY_SERVICE_NAME}")
     gateway_container_name = self.managed_services_docker_compose.gateway_container_name
-    gateway_container = self.docker_client.containers.get(gateway_container_name)
-    if not gateway_container or (gateway_container.status != 'running'):
-      raise ScaffoldValidateException(f"Container '{gateway_container_name}' not found for service '{CORE_GATEWAY_SERVICE_NAME}'")
 
-    print(f"Validating core component: {CORE_MOCK_UI_SERVICE_NAME}")
-    mock_ui_container_name = self.managed_services_docker_compose.mock_ui_container_name
-    mock_ui_container = self.docker_client.containers.get(mock_ui_container_name)
-    if not mock_ui_container or (mock_ui_container.status != 'running'):
-      raise ScaffoldValidateException(f"Container '{mock_ui_container_name}' not found for service '{CORE_MOCK_UI_SERVICE_NAME}'")
+    container_missing_message = f"{bcolors.FAIL}Container '{gateway_container_name}' not found for service '{CORE_GATEWAY_SERVICE_NAME}'{bcolors.ENDC}"
+    suggestion_message = f"{bcolors.BOLD}Workflow might not be running yet. Try running 'scaffold workflow up <WORKFLOW_NAME>'{bcolors.ENDC}"
+    error_message = f"{container_missing_message}\n\n{suggestion_message}"
 
-  def validate_no_core_components(self):
     try:
-      core_mock_ui_container_name = self.docker_client.containers.get(self.managed_services_docker_compose.mock_ui_container_name)
-      if core_mock_ui_container_name:
-        raise ScaffoldValidateException(f"Stoobly UI container is running when it shouldn't: {core_mock_ui_container_name.name}")
+      gateway_container = self.docker_client.containers.get(gateway_container_name)
+      if not gateway_container or (gateway_container.status != 'running'):
+        raise ScaffoldValidateException(error_message)
     except docker_errors.NotFound:
-      pass
-    
-    print(f"Skipping validating core component: {CORE_GATEWAY_SERVICE_NAME}")
-    print(f"Skipping validating core component: {CORE_MOCK_UI_SERVICE_NAME}")
+      raise ScaffoldValidateException(error_message)
 
-  
-  def validate(self) -> bool:
-    print(f"Validating workflow: {self.workflow_name}")
-    print(f"Validating core components: {CORE_SERVICES}")
+  def validate_mock_ui_service(self):
+    mock_ui_container_name = self.managed_services_docker_compose.mock_ui_container_name
 
+    # The stoobly-ui service does not run in test workflows
     if self.workflow_name == WORKFLOW_TEST_TYPE:
-      # Don't validate the gateway and mock_ui core components in the "test" workflow 
-      self.validate_no_core_components()
-    else:
-      self.validate_core_components()
+      try:
+        mock_ui_container = self.docker_client.containers.get(mock_ui_container_name)
+
+        if mock_ui_container:
+          ui_found_message = f"{bcolors.FAIL}Stoobly UI container is running when it shouldn't: {mock_ui_container_name}{bcolors.ENDC}"
+          suggestion_message = f"{bcolors.BOLD}Run 'docker ps | grep stoobly_ui' to check if the Stoobly UI is running during the test workflow. Did you stop the record or mock workflow yet?{bcolors.ENDC}"
+          error_message = f"{ui_found_message}\n\n{suggestion_message}"
+          raise ScaffoldValidateException(error_message)
+      except docker_errors.NotFound:
+        print(f"Skipping validating core service: {CORE_MOCK_UI_SERVICE_NAME}")
+        return
+
+    print(f"Validating core service: {CORE_MOCK_UI_SERVICE_NAME}")
+    container_missing_message = f"{bcolors.FAIL}Container '{mock_ui_container_name}' not found for service '{CORE_MOCK_UI_SERVICE_NAME}'{bcolors.ENDC}"
+    suggestion_message = f"{bcolors.BOLD}Stoobly UI is not running. Check if the container is up with 'docker ps -a | grep {mock_ui_container_name}'{bcolors.ENDC}"
+    mock_ui_missing_error_message = f"{container_missing_message}\n\n{suggestion_message}"
 
-    self.validate_init_containers(self.managed_services_docker_compose.init_container_name, self.managed_services_docker_compose.configure_container_name)
+    try:
+      mock_ui_container = self.docker_client.containers.get(mock_ui_container_name)
+      if not mock_ui_container or (mock_ui_container.status != 'running'):
+        raise ScaffoldValidateException(mock_ui_missing_error_message)
+    except docker_errors.NotFound:
+      raise ScaffoldValidateException(mock_ui_missing_error_message)
 
-    print(f"Validating core component: {CORE_ENTRYPOINT_SERVICE_NAME}")
+  def validate_entrypoint_service(self):
+    print(f"Validating core service: {CORE_ENTRYPOINT_SERVICE_NAME}")
 
+    core_entrypoint_init_container_name = None
     try:
       core_entrypoint_init_container_name = self.managed_services_docker_compose.entrypoint_init_container_name
       entrypoint_init_container = self.docker_client.containers.get(core_entrypoint_init_container_name)
     except docker_errors.NotFound:
-      raise ScaffoldValidateException(f"Container not found: {core_entrypoint_init_container_name}")
-
+      error_message = self._ValidateCommand__generate_container_not_found_error(core_entrypoint_init_container_name)
+      raise ScaffoldValidateException(error_message)
+    
+    core_entrypoint_configure_container_name = None
     try:
       core_entrypoint_configure_container_name = self.managed_services_docker_compose.entrypoint_configure_container_name
       entrypoint_configure_container = self.docker_client.containers.get(core_entrypoint_configure_container_name)
     except docker_errors.NotFound:
-      raise ScaffoldValidateException(f"Container not found: {core_entrypoint_configure_container_name}")
+      error_message = self._ValidateCommand__generate_container_not_found_error(core_entrypoint_configure_container_name)
+      raise ScaffoldValidateException(error_message)
 
     # NOTE: we should check the correct workflow mode is enabled one day
     # That's not currently queryable
 
-    print(f"Done validating workflow: {self.workflow_name}, success!")
-    print()
+    print(f"{bcolors.OKGREEN}✔ Done validating core services for workflow: {self.workflow_name}, success!\n{bcolors.ENDC}")
+
+  def validate_core_services(self):
+    self.validate_gateway_service()
+    self.validate_mock_ui_service()
+    self.validate_init_containers(self.managed_services_docker_compose.init_container_name, self.managed_services_docker_compose.configure_container_name)
+    self.validate_entrypoint_service()
+
+  def validate(self) -> bool:
+    print(f"Validating workflow: {self.workflow_name}\n")
+    print(f"Validating core services: {CORE_SERVICES}")
+
+    self.validate_core_services()
 
     return True
 

stoobly_agent/app/cli/scaffold_cli.py

@@ -518,6 +518,7 @@ def up(**kwargs):
 
   __run_script(script, kwargs['dry_run'])
 
+
 @workflow.command(
   help="Validate a scaffold workflow"
 )
@@ -536,7 +537,8 @@ def validate(**kwargs):
     command = WorkflowValidateCommand(app, **config)
     command.validate()
   except ScaffoldValidateException as sve:
-    print(f"\nFatal Scaffold Validation Exception: {sve}", file=sys.stderr)
+    print(f"{bcolors.FAIL}\nFatal scaffold validation exception:{bcolors.ENDC}\n{sve}", file=sys.stderr)
+    print("\nSee the scaffold workflow troubleshooting guide at: https://docs.stoobly.com/guides/how-to-integrate-e2e-testing/how-to-run-a-workflow/troubleshooting", file=sys.stderr)
     sys.exit(1)
 
   try:
@@ -546,9 +548,12 @@ def validate(**kwargs):
         command = ServiceWorkflowValidateCommand(app, **config)
         command.validate()
   except ScaffoldValidateException as sve:
-    print(f"\nFatal Scaffold Validation Exception: {sve}", file=sys.stderr)
+    print(f"{bcolors.FAIL}\nFatal scaffold validation exception:{bcolors.ENDC}\n{sve}", file=sys.stderr)
+    print("\nSee the scaffold workflow troubleshooting guide at: https://docs.stoobly.com/guides/how-to-integrate-e2e-testing/how-to-run-a-workflow/troubleshooting", file=sys.stderr)
     sys.exit(1)
 
+  print(f"{bcolors.OKCYAN}✔ Done validating Stoobly scaffold and services, success!{bcolors.ENDC}")
+
 @hostname.command(
   help="Update the system hosts file for all scaffold service hostnames"
 )

stoobly_agent/test/app/cli/scaffold/e2e_test.py

@@ -121,7 +121,7 @@ class TestScaffoldE2e():
       # Validate docker-compose path exists
       destination_path = Path(local_service_docker_compose.docker_compose_path)
       assert destination_path.is_file()
-      # Add user defined Docker Compose file for the local service
+      # Add user defined Docker Compose file for the custom container service
       shutil.copyfile(local_service_mock_docker_compose_path, destination_path)
 
       # Record workflow doesn't have a public folder
@@ -137,7 +137,7 @@ class TestScaffoldE2e():
       ScaffoldCliInvoker.cli_workflow_down(runner, app_dir_path, target_workflow_name)
       shutil.rmtree(app_dir_path)
 
-    def test_core_components(self, app_dir_path, target_workflow_name):
+    def test_core_services(self, app_dir_path, target_workflow_name):
       app = App(app_dir_path, DOCKER_NAMESPACE)
       config = {
         'workflow_name': target_workflow_name,
@@ -260,7 +260,7 @@ class TestScaffoldE2e():
       ScaffoldCliInvoker.cli_workflow_down(runner, app_dir_path, target_workflow_name)
       shutil.rmtree(app_dir_path)
 
-    def test_no_core_components(self, app_dir_path, target_workflow_name):
+    def test_no_core_services(self, app_dir_path, target_workflow_name):
       app = App(app_dir_path, DOCKER_NAMESPACE)
       config = {
         'workflow_name': target_workflow_name,

stoobly_agent/test/app/cli/scaffold/hosts_file_manager_test.py

@@ -11,7 +11,7 @@ class TestHostsFileManager():
     yield HostsFileManager()
 
   def test_get_hosts_file_path(self, hosts_file_manager):
-    hosts_file_path = hosts_file_manager._HostsFileManager__get_hosts_file_path()
+    hosts_file_path = hosts_file_manager.get_hosts_file_path()
 
     # Test runners are all Linux distros for now
     assert hosts_file_path == '/etc/hosts'

stoobly_agent/test/app/models/schemas/.stoobly/db/VERSION

@@ -1 +1 @@
-1.7.0
+1.7.0

{stoobly_agent-1.7.0.dist-info → stoobly_agent-1.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: stoobly-agent
-Version: 1.7.0
+Version: 1.7.1
 Summary: Record, mock, and test HTTP(s) requests. CLI agent for Stoobly
 License: Apache-2.0
 Author: Matt Le

{stoobly_agent-1.7.0.dist-info → stoobly_agent-1.7.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-stoobly_agent/__init__.py,sha256=zQauQ1qcCYeR8Q0sZDvwYQ0y7_-8jFQeYex6fFUoY4M,44
+stoobly_agent/__init__.py,sha256=lW3HNRv30I4AZM5G54ri20nFb4CRG36fCUHauTdkLFQ,44
 stoobly_agent/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/api/__init__.py,sha256=ctkB8KR-eXO0SFhj602huHiyvQ3PslFWd8fkcufgrAI,1000
 stoobly_agent/app/api/application_http_request_handler.py,sha256=Vvz53yB0bR7J-QqMAkLlhcZrA4P64ZEN7w8cMbgl6o0,5261
@@ -92,7 +92,7 @@ stoobly_agent/app/cli/scaffold/docker/workflow/dns_decorator.py,sha256=nlDPbyF1h
 stoobly_agent/app/cli/scaffold/docker/workflow/mock_decorator.py,sha256=DcBnwA8YhE-VdrUiWf2xPcqirEMZEQm3AwssAg9CxLo,1226
 stoobly_agent/app/cli/scaffold/docker/workflow/reverse_proxy_decorator.py,sha256=zD4FEtBMiPEtvEb798LOfFH8sJhTWQYpA9THLq5UMbg,1227
 stoobly_agent/app/cli/scaffold/env.py,sha256=e-Ve4p3RUgzFx22B3SIYttvJ_yLuDtA27oDACZ8n-6E,1140
-stoobly_agent/app/cli/scaffold/hosts_file_manager.py,sha256=FiX1hYEWN4cJiCOV4h6wOOlY7t71uwIwe6t2upS65aQ,5006
+stoobly_agent/app/cli/scaffold/hosts_file_manager.py,sha256=zNX5wh6zXQ4J2BA0YYdD7_CPqDz02b_ghXsY3oTjjB4,4999
 stoobly_agent/app/cli/scaffold/managed_services_docker_compose.py,sha256=-wLBXUi7DCWsfm5KzZzd_kdJKOTl1NT924XR7dyjbSY,574
 stoobly_agent/app/cli/scaffold/service.py,sha256=L9K6QE0k5KSEC8_fSwtdwwTSO_DsIpqSPW-AG7Bg76o,501
 stoobly_agent/app/cli/scaffold/service_command.py,sha256=9kIKiFC5Jo425VWYD4NDvUOdMP-pNyq2D5Ip1ZAPj3A,1054
@@ -101,9 +101,9 @@ stoobly_agent/app/cli/scaffold/service_create_command.py,sha256=1B6TK3JDAjouikCV
 stoobly_agent/app/cli/scaffold/service_delete_command.py,sha256=_nBDQjm8eL62MQpzSCxgUHlW04ZXKG8MDlN1BXxlqww,986
 stoobly_agent/app/cli/scaffold/service_docker_compose.py,sha256=OMUN1-ujQYIZXxDvS4XBf5C9wGalQULkwOiBBQPZbHY,820
 stoobly_agent/app/cli/scaffold/service_workflow.py,sha256=sQ_Edy_wGHKMXpD0DmhnOWkGEKz7gSgEGNI8f7aXOdg,444
-stoobly_agent/app/cli/scaffold/service_workflow_validate_command.py,sha256=M5fc9RiCgN9ReCXsb3KIVJIKo0aSIOv28Q3izLkEQTo,10036
+stoobly_agent/app/cli/scaffold/service_workflow_validate_command.py,sha256=RxPJollW_FQjlPcIbvqGRVH2adJYPcLNCsVMpW5wjxs,12740
 stoobly_agent/app/cli/scaffold/templates/__init__.py,sha256=p-23uLU2QGksJASDD13soldc0vr_AOS3QdGlSnbs3bM,167
-stoobly_agent/app/cli/scaffold/templates/app/.Dockerfile.context,sha256=xnUFSlP8YvEs04lTh1Jj_ggNcwyVjyzZjzF0Vh9pris,158
+stoobly_agent/app/cli/scaffold/templates/app/.Dockerfile.context,sha256=AK8j4JWDmQxfsOX-Ysp-LNckPGhp-tiDOdPMdYItmso,158
 stoobly_agent/app/cli/scaffold/templates/app/.Makefile,sha256=hree9QL8xl7v_Yzv40bcO4-ZDlyA4Qnm-VWU2dnMuXQ,8955
 stoobly_agent/app/cli/scaffold/templates/app/.docker-compose.base.yml,sha256=6tFqXh3ine8vaD0FCL5TMoY5NjKx2wLUR8XpW3tJtew,245
 stoobly_agent/app/cli/scaffold/templates/app/.docker-compose.networks.yml,sha256=I4PbJpQjFHb5IbAUWNvYM6okDEtmwtKFDQg-yog05WM,141
@@ -192,7 +192,7 @@ stoobly_agent/app/cli/scaffold/templates/workflow/test/bin/init,sha256=EaoFDyoJb
 stoobly_agent/app/cli/scaffold/templates/workflow/test/fixtures.yml,sha256=CJlZ_kugygZpmyqIauBjNZxqk7XyLaa3yl3AWj8KV28,259
 stoobly_agent/app/cli/scaffold/templates/workflow/test/lifecycle_hooks.py,sha256=U7mlzT_wBR3uhHSG6CAyt5tBUNAvdIrCw33gdB-F294,467
 stoobly_agent/app/cli/scaffold/templates/workflow/test/public/.gitignore,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-stoobly_agent/app/cli/scaffold/validate_command.py,sha256=OjAbX-YNx165od6HCwKmgdyF3upNdyQsL_vXTsOK2mo,2426
+stoobly_agent/app/cli/scaffold/validate_command.py,sha256=BEDcF5qPDbMjWe-SCAr5jxcrVMZlV3ciLa89TDDENmM,3787
 stoobly_agent/app/cli/scaffold/validate_exceptions.py,sha256=Jtjl4OkbbSRWm0hy7Kf_50zcFh2J324HhNcnwJKH_Oc,54
 stoobly_agent/app/cli/scaffold/workflow.py,sha256=KlbWT9CIo9EpZxKU1WVZtmodhxK7CpmLUHPNk4Mh6DA,1570
 stoobly_agent/app/cli/scaffold/workflow_command.py,sha256=eI9I5LLgO0U3b46QhHusy-4BV2zUDVai6jErcluYCRI,3344
@@ -202,8 +202,8 @@ stoobly_agent/app/cli/scaffold/workflow_create_command.py,sha256=R3L1obUTidGngbI
 stoobly_agent/app/cli/scaffold/workflow_env.py,sha256=x8V5pJmIiklD3f2q2-qq-CORf4YaXYq_r2JpR2MmSwk,416
 stoobly_agent/app/cli/scaffold/workflow_log_command.py,sha256=Bke4lMOMxuDUFuAx9nlXHbKgYMO4KAg9ASHvjz4aVWc,1372
 stoobly_agent/app/cli/scaffold/workflow_run_command.py,sha256=eF3aaK4OIZXYuSBEAeBnhAL7EZrS1G4mSYrJbEiXt2o,11082
-stoobly_agent/app/cli/scaffold/workflow_validate_command.py,sha256=wv1Zrq0GoYO8ryac3oGno0C282c6UjMtniO19mBSyrE,4036
-stoobly_agent/app/cli/scaffold_cli.py,sha256=kD_2YbtdcMjFzJ2u8lBchL5vo0ey4_a_HXmE3V3Quuw,28607
+stoobly_agent/app/cli/scaffold/workflow_validate_command.py,sha256=Uo_yo6rVR1ZR7xpvsQvlH48AyMBVLRupd4G-bRjzm_Q,5584
+stoobly_agent/app/cli/scaffold_cli.py,sha256=FfI_v_Rpzoieou8W3l640zUrmGSAnBDSdp_h4ND8tGU,29135
 stoobly_agent/app/cli/scenario_cli.py,sha256=3J1EiJOvunkfWrEkOsanw-XrKkOk78ij_GjBlE9p7CE,8229
 stoobly_agent/app/cli/snapshot_cli.py,sha256=cpCjxFYBuVwLuq_b2lIUu-5zWqupRlrp4xWgDytirSM,10047
 stoobly_agent/app/cli/trace_cli.py,sha256=K7E-vx3JUcqEDSWOdIOi_AieKNQz7dBfmRrVvKDkzFI,4605
@@ -677,8 +677,8 @@ stoobly_agent/test/app/cli/request/request_snapshot_test.py,sha256=0013aoiMZin-2
 stoobly_agent/test/app/cli/request/request_test_test.py,sha256=-cJNXKjgryVVfVt-7IN5fIhBwe3NjFoPmeavDH8lAjU,5527
 stoobly_agent/test/app/cli/scaffold/cli_invoker.py,sha256=_nGDLUsYxqkeqs5DdhvAeXy3IuotpgqKHXKVzu6GDF4,3700
 stoobly_agent/test/app/cli/scaffold/cli_test.py,sha256=sMNvO845MIu5DVGa1HmwXQDmKDcwrfNTdEb3fK5886w,4557
-stoobly_agent/test/app/cli/scaffold/e2e_test.py,sha256=Zq0nYPObbH6tYjuGHrT2hOT71FO6kDnvRQWGDK1yK4M,12971
-stoobly_agent/test/app/cli/scaffold/hosts_file_manager_test.py,sha256=sVFHHYBxzyfRbVIe3gnToQ-6JPy71BCBjdQDnboYzac,2306
+stoobly_agent/test/app/cli/scaffold/e2e_test.py,sha256=IGWT0EXrMtB8i8kdLFbN7O8NvLrJYTi-iQ_GRiUoA94,12978
+stoobly_agent/test/app/cli/scaffold/hosts_file_manager_test.py,sha256=ztcPh1x0ZCW1FWA5YL4ulEVjfbW9TOPgk1bnSDPNmCw,2287
 stoobly_agent/test/app/cli/scenario/scenario_create_test.py,sha256=fGqcjO1_1OvdpUMQfGRVkSyFe61u8WIcp_ndLFrf33A,3962
 stoobly_agent/test/app/cli/scenario/scenario_replay_integration_test.py,sha256=NbGJzmvPsNLBR0ac65yt_cOTfpnsST1IG7i3F0euwAk,7031
 stoobly_agent/test/app/cli/scenario/scenario_replay_test.py,sha256=XqR-GDrR8uUtxvukBuIFJ4GsOzBj9WWi4b0VKmfhFyE,6874
@@ -703,7 +703,7 @@ stoobly_agent/test/app/models/factories/resource/local_db/helpers/log_test.py,sh
 stoobly_agent/test/app/models/factories/resource/local_db/helpers/tiebreak_scenario_request_test.py,sha256=a1SFLyEyRRLuADvAw6ckQQKORFXvyK1lyrbkaLWx8oU,3399
 stoobly_agent/test/app/models/factories/resource/local_db/request_adapter_test.py,sha256=Pzq1cBPnP9oSWG-p0c-VoymoHxgp483QmNwmV1b78RA,8453
 stoobly_agent/test/app/models/factories/resource/local_db/response_adapter_test.py,sha256=9P95EKH5rZGOrmRkRIDlQZqtiLJHk9735og18Ffwpfw,2204
-stoobly_agent/test/app/models/schemas/.stoobly/db/VERSION,sha256=LBlAk30Td33A8sWokJIf8T6YuRqenUQ6QmUdjQ2LRI0,5
+stoobly_agent/test/app/models/schemas/.stoobly/db/VERSION,sha256=u3Mg2DHnoVGqkBw15zJsdS-i71Ak8wdoxCMZuL7Rce0,6
 stoobly_agent/test/app/models/schemas/.stoobly/db/stoobly_agent.sqlite3,sha256=ch8gNx6zIelLKQx65gwFx_LRNqUD3EC5xcHZ0ukIQiU,188416
 stoobly_agent/test/app/models/schemas/.stoobly/settings.yml,sha256=vLwMjweKOdod6tSLtIlyBefPQuNXq9wio4kBaODKtAU,726
 stoobly_agent/test/app/models/schemas/.stoobly/tmp/options.json,sha256=OTRzarwus48CTrItedXCrgQttJHSEZonEYc7R_knvYg,2212
@@ -744,8 +744,8 @@ stoobly_agent/test/mock_data/scaffold/docker-compose-local-service.yml,sha256=1W
 stoobly_agent/test/mock_data/scaffold/index.html,sha256=qJwuYajKZ4ihWZrJQ3BNObV5kf1VGnnm_vqlPJzdqLE,258
 stoobly_agent/test/mock_data/uspto.yaml,sha256=6U5se7C3o-86J4m9xpOk9Npias399f5CbfWzR87WKwE,7835
 stoobly_agent/test/test_helper.py,sha256=m_oAI7tmRYCNZdKfNqISWhMv3e44tjeYViQ3nTUfnos,1007
-stoobly_agent-1.7.0.dist-info/LICENSE,sha256=o93sj12cdoEOsTCjPaPFsw3Xq0SXs3pPcY-9reE2sEw,548
-stoobly_agent-1.7.0.dist-info/METADATA,sha256=81lb4fSP6TTy7PKZT_a2oILcBUvP94_wCxF40qOyw74,3087
-stoobly_agent-1.7.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-stoobly_agent-1.7.0.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
-stoobly_agent-1.7.0.dist-info/RECORD,,
+stoobly_agent-1.7.1.dist-info/LICENSE,sha256=o93sj12cdoEOsTCjPaPFsw3Xq0SXs3pPcY-9reE2sEw,548
+stoobly_agent-1.7.1.dist-info/METADATA,sha256=ljJB5pxOKkbXohMwMwaOTX5_5rRkxDJYtX2-tzM3kgY,3087
+stoobly_agent-1.7.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+stoobly_agent-1.7.1.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
+stoobly_agent-1.7.1.dist-info/RECORD,,