stoobly-agent 1.7.0__tar.gz → 1.7.2__tar.gz

{stoobly_agent-1.7.0 → stoobly_agent-1.7.2}/PKG-INFO

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

{stoobly_agent-1.7.0 → stoobly_agent-1.7.2}/pyproject.toml

@@ -10,7 +10,7 @@ description = "Record, mock, and test HTTP(s) requests. CLI agent for Stoobly"
 license = "Apache License 2.0"
 name = "stoobly-agent"
 readme = "README.md"
-version = "1.7.0"
+version = "1.7.2"
 
 [tool.poetry.dependencies]
 python = "^3.10"

{stoobly_agent-1.7.0 → stoobly_agent-1.7.2}/stoobly_agent/__init__.py

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

{stoobly_agent-1.7.0 → stoobly_agent-1.7.2}/stoobly_agent/app/cli/scaffold/docker/service/builder.py

@@ -99,8 +99,7 @@ class ServiceBuilder(Builder):
     environment['VIRTUAL_PROTO'] = SERVICE_SCHEME
 
     if self.config.detached:
-      volumes.append(f"{self.service_name}:{STOOBLY_HOME_DIR}/{DATA_DIR_NAME}")
-      volumes.append(f"../..:{STOOBLY_HOME_DIR}/{DATA_DIR_NAME}/{DOCKER_NAMESPACE}")
+      self.__with_detached_volumes(volumes)
 
     base = {
       'environment': environment,
@@ -124,11 +123,7 @@ class ServiceBuilder(Builder):
       self.__with_url_environment(environment)
 
     if self.config.detached:
-      # Mount named volume
-      volumes.append(f"{self.service_name}:{STOOBLY_HOME_DIR}/{DATA_DIR_NAME}")
-
-      # Mount docker folder
-      volumes.append(f"../..:{STOOBLY_HOME_DIR}/{DATA_DIR_NAME}/{DOCKER_NAMESPACE}")
+      self.__with_detached_volumes(volumes)
 
     self.with_service(self.init_base, {
       'command': [f"{WORKFLOW_SCRIPTS}/{WORKFLOW_TEMPLATE}/.init", 'bin/init'],
@@ -149,8 +144,7 @@ class ServiceBuilder(Builder):
       self.__with_url_environment(environment)
 
     if self.config.detached:
-      volumes.append(f"{self.service_name}:{STOOBLY_HOME_DIR}/${DATA_DIR_NAME}")
-      volumes.append(f"../..:{STOOBLY_HOME_DIR}/{DATA_DIR_NAME}/{DOCKER_NAMESPACE}")
+      self.__with_detached_volumes(volumes)
 
     base = {
       'command': [f"{WORKFLOW_SCRIPTS}/{WORKFLOW_TEMPLATE}/.configure", 'bin/configure'],
@@ -195,6 +189,13 @@ class ServiceBuilder(Builder):
 
     super().write(compose)
 
+  def __with_detached_volumes(self, volumes: list):
+    # Mount named volume
+    volumes.append(f"{self.service_name}:{STOOBLY_HOME_DIR}/{DATA_DIR_NAME}")
+
+    # Mount docker folder
+    volumes.append(f"../:{STOOBLY_HOME_DIR}/{DATA_DIR_NAME}/{DOCKER_NAMESPACE}")
+
   def __with_url_environment(self, environment):
     environment[SERVICE_HOSTNAME_ENV] = SERVICE_HOSTNAME
 

{stoobly_agent-1.7.0 → stoobly_agent-1.7.2}/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-1.7.0 → stoobly_agent-1.7.2}/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-1.7.2/stoobly_agent/app/cli/scaffold/templates/app/.Dockerfile.context

@@ -0,0 +1,6 @@
+FROM stoobly/agent:1.7
+
+ARG USER_ID
+
+# Change user id of stoobly user to that of host's user id
+RUN if [ -n "$USER_ID" ]; then usermod -u $USER_ID stoobly; fi

stoobly_agent-1.7.2/stoobly_agent/app/cli/scaffold/validate_command.py

@@ -0,0 +1,82 @@
+import pdb
+import re
+from time import sleep
+from typing import Union
+
+import docker
+from docker import errors as docker_errors
+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_with_retries(self, container_name: str) -> Container:
+    tries = 30
+    for _ in range(tries):
+      try:
+        container = self.docker_client.containers.get(container_name)
+        return container
+      except docker_errors.NotFound:
+        sleep(0.5)
+
+    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_with_retries(init_container_name)
+    logs = init_container.logs()
+
+    if logs and re.search('error', str(logs), re.IGNORECASE):
+      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:
+      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_with_retries(configure_container_name)
+
+    configure_container_ran = False
+    if configure_container.status == 'exited' and configure_container.attrs['State']['ExitCode'] == 0:
+      configure_container_ran = True
+    if not configure_container_ran:
+      raise ScaffoldValidateException(f"configure container {configure_container_name} exited with: {configure_container.attrs['State']['ExitCode']}")
+  
+  def validate_detached(self, container: Container) -> None:
+    print(f"Validating detached for: {container.name}")
+    
+    if not container.attrs:
+      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(error_message)
+

stoobly_agent-1.7.2/stoobly_agent/app/cli/scaffold/workflow_validate_command.py

@@ -0,0 +1,112 @@
+import pdb
+
+from docker import errors as docker_errors
+
+from stoobly_agent.app.cli.scaffold.constants import WORKFLOW_TEST_TYPE
+from stoobly_agent.app.cli.scaffold.managed_services_docker_compose import (
+  ManagedServicesDockerCompose,
+)
+from stoobly_agent.app.cli.scaffold.templates.constants import (
+  CORE_ENTRYPOINT_SERVICE_NAME,
+  CORE_GATEWAY_SERVICE_NAME,
+  CORE_MOCK_UI_SERVICE_NAME,
+  CORE_SERVICES,
+)
+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
+
+
+class WorkflowValidateCommand(WorkflowCommand, ValidateCommand):
+  def __init__(self, app: App, **kwargs):
+    WorkflowCommand.__init__(self, app, **kwargs)
+    ValidateCommand.__init__(self)
+    self.managed_services_docker_compose = ManagedServicesDockerCompose(target_workflow_name=self.workflow_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
+
+    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}"
+
+    try:
+      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:
+      raise ScaffoldValidateException(error_message)
+
+  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:
+      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}"
+
+    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)
+
+  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:
+      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:
+      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"{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-1.7.0 → stoobly_agent-1.7.2}/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-1.7.0 → stoobly_agent-1.7.2}/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-1.7.0 → stoobly_agent-1.7.2}/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-1.7.2/stoobly_agent/test/app/models/schemas/.stoobly/db/VERSION

@@ -0,0 +1 @@
+1.7.0

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

@@ -1,6 +0,0 @@
-FROM stoobly/agent:1.6
-
-ARG USER_ID
-
-# Change user id of stoobly user to that of host's user id
-RUN if [ -n "$USER_ID" ]; then usermod -u $USER_ID stoobly; fi

stoobly_agent-1.7.0/stoobly_agent/app/cli/scaffold/validate_command.py

@@ -1,60 +0,0 @@
-import pdb
-import re
-from time import sleep
-
-import docker
-from docker import errors as docker_errors
-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
-
-
-class ValidateCommand():
-  def __init__(self):
-    self.docker_client = docker.from_env()
-
-  # Some containers like init and configure can take longer than expected to finish so retry
-  def __get_container(self, container_name: str) -> Container:
-    tries = 30
-    for _ in range(tries):
-      try:
-        container = self.docker_client.containers.get(container_name)
-        return container
-      except docker_errors.NotFound:
-        sleep(0.5)
-
-    raise ScaffoldValidateException(f"Container not found: {container_name}")
-
-  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)
-    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}")
-    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']}")
-
-    configure_container = self.__get_container(configure_container_name)
-
-    configure_container_ran = False
-    if configure_container.status == 'exited' and configure_container.attrs['State']['ExitCode'] == 0:
-      configure_container_ran = True
-    if not configure_container_ran:
-      raise ScaffoldValidateException(f"configure container {configure_container_name} exited with: {configure_container.attrs['State']['ExitCode']}")
-  
-  def validate_detached(self, container: Container) -> None:
-    print(f"Validating detached for: {container.name}")
-    
-    if not container.attrs:
-      raise ScaffoldValidateException(f"Container is missing: {container.name}")
-
-    volume_mounts = container.attrs['Mounts']
-    for volume_mount in volume_mounts:
-      if DATA_DIR_NAME in volume_mount['Source']:
-        return
-
-    raise ScaffoldValidateException(f"Data directory is missing from container: {container.name}")
-