stoobly-agent 1.6.2__py3-none-any.whl → 1.6.4__py3-none-any.whl

stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.6.2'
+VERSION = '1.6.4'

stoobly_agent/app/cli/scaffold/app_command.py

@@ -5,6 +5,7 @@ import shutil
 from .app import App
 from .app_config import AppConfig
 from .command import Command
+from .docker.constants import DOCKER_COMPOSE_NETWORKS
 
 class AppCommand(Command):
 
@@ -29,6 +30,20 @@ class AppCommand(Command):
   def app_config_path(self):
     return self.__config.path
 
+  @property
+  def networks_compose_path(self):
+    return os.path.join(
+      self.data_dir_path,
+      self.networks_compose_relative_path
+    )
+
+  @property
+  def networks_compose_relative_path(self):
+    return os.path.join(
+      self.namespace,
+      DOCKER_COMPOSE_NETWORKS
+    )
+
   @property
   def scaffold_namespace_path(self):
     return self.app.scaffold_namespace_path

stoobly_agent/app/cli/scaffold/constants.py

@@ -32,6 +32,9 @@ SERVICE_SCHEME_ENV = 'SERVICE_SCHEME'
 SERVICE_PORT = '${SERVICE_PORT}'
 SERVICE_PORT_ENV = 'SERVICE_PORT'
 SERVICE_PRIORITY_ENV = 'SERVICE_PRIORITY'
+SERVICE_SCRIPTS = '${SERVICE_SCRIPTS}'
+SERVICE_SCRIPTS_DIR = '/usr/local/bin/services'
+SERVICE_SCRIPTS_ENV = 'SERVICE_SCRIPTS'
 STOOBLY_HOME_DIR = '/home/stoobly'
 STOOBLY_DATA_DIR = os.path.join(STOOBLY_HOME_DIR, DATA_DIR_NAME)
 STOOBLY_CERTS_DIR = os.path.join(STOOBLY_DATA_DIR, CERTS_DIR_NAME)
@@ -52,6 +55,9 @@ WORKFLOW_NAME = '${WORKFLOW_NAME}'
 WORKFLOW_NAME_ENV = 'WORKFLOW_NAME'
 WORKFLOW_NAMESPACE_ENV = 'WORKFLOW_NAMESPACE'
 WORKFLOW_RECORD_TYPE = 'record'
+WORKFLOW_SCRIPTS = '${WORKFLOW_SCRIPTS}'
+WORKFLOW_SCRIPTS_DIR = '/usr/local/bin/workflows'
+WORKFLOW_SCRIPTS_ENV = 'WORKFLOW_SCRIPTS'
 WORKFLOW_TEMPLATE = '${WORKFLOW_TEMPLATE}'
 WORKFLOW_TEMPLATE_ENV = 'WORKFLOW_TEMPLATE'
 WORKFLOW_TEST_TYPE = 'test'

stoobly_agent/app/cli/scaffold/docker/builder.py

@@ -3,7 +3,7 @@ import pathlib
 import pdb
 import yaml
 
-from .constants import APP_NETWORK, APP_NETWORK_NAME, DOCKER_COMPOSE_CUSTOM 
+from .constants import APP_EGRESS_NETWORK, APP_EGRESS_NETWORK_NAME, APP_INGRESS_NETWORK, APP_INGRESS_NETWORK_NAME, DOCKER_COMPOSE_CUSTOM 
 
 class Builder():
 
@@ -35,12 +35,12 @@ class Builder():
     return self.__dir_path
 
   @property
-  def public_network(self):
-    return self.__networks.get(APP_NETWORK_NAME)
+  def egress_network(self):
+    return self.__networks.get(APP_EGRESS_NETWORK_NAME)
 
   @property
-  def public_network_name(self):
-    return APP_NETWORK_NAME
+  def egress_network_name(self):
+    return APP_EGRESS_NETWORK_NAME
 
   @property
   def networks(self):
@@ -86,12 +86,19 @@ class Builder():
 
   def with_network(self, network):
     self.__networks[network] = {
-      'name': f"{APP_NETWORK}.{network}"
+      'name': f"{APP_EGRESS_NETWORK}.{network}"
     }
     return self
 
-  def with_public_network(self, network = APP_NETWORK):
-    self.__networks[APP_NETWORK_NAME] = {
+  def with_egress_network(self, network = APP_EGRESS_NETWORK):
+    self.__networks[APP_EGRESS_NETWORK_NAME] = {
+      'external': True,
+      'name': network,
+    }
+    return self
+
+  def with_ingress_network(self, network = APP_INGRESS_NETWORK):
+    self.__networks[APP_INGRESS_NETWORK_NAME] = {
       'external': True,
       'name': network,
     }

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

@@ -1,8 +1,13 @@
-APP_NETWORK_NAME = 'app'
-APP_NETWORK = '${APP_NETWORK}'
+APP_EGRESS_NETWORK = '${APP_NETWORK}.egress'
+APP_EGRESS_NETWORK_NAME = 'app.egress'
+APP_EGRESS_NETWORK_TEMPLATE = '{network}.egress'
+APP_INGRESS_NETWORK = '${APP_NETWORK}.ingress'
+APP_INGRESS_NETWORK_NAME = 'app.ingress'
+APP_INGRESS_NETWORK_TEMPLATE = '{network}.ingress'
 DOCKER_COMPOSE_BASE = '.docker-compose.base.yml'
 DOCKER_COMPOSE_BASE_TEMPLATE = '.docker-compose.base.template.yml'
 DOCKER_COMPOSE_CUSTOM = 'docker-compose.yml'
+DOCKER_COMPOSE_NETWORKS = '.docker-compose.networks.yml'
 DOCKERFILE_CONTEXT = '.Dockerfile.context'
 DOCKERFILE_SERVICE = 'Dockerfile.source'
 

stoobly_agent/app/cli/scaffold/docker/service/builder.py

@@ -2,7 +2,7 @@ import os
 import pdb
 
 from ...app_config import AppConfig
-from ...constants import SERVICE_HOSTNAME, SERVICE_HOSTNAME_ENV, WORKFLOW_TEMPLATE
+from ...constants import WORKFLOW_SCRIPTS, WORKFLOW_TEMPLATE
 from ...service_config import ServiceConfig
 from ..app_builder import AppBuilder
 from ..builder import Builder
@@ -22,8 +22,6 @@ class ServiceBuilder(Builder):
     self.__config = config
     self.__service_name = os.path.basename(service_path)
 
-    self.load()
-
   @property
   def app_base(self):
     return f"{self.service_name}.app_base"
@@ -86,7 +84,7 @@ class ServiceBuilder(Builder):
   def build_init_base(self):
     environment = {}
     self.with_service(self.init_base, {
-      'command': [f"/usr/local/bin/workflows/{WORKFLOW_TEMPLATE}/.init", 'bin/init'],
+      'command': [f"{WORKFLOW_SCRIPTS}/{WORKFLOW_TEMPLATE}/.init", 'bin/init'],
       'environment': environment,
       'extends': {
         'file': os.path.relpath(self.app_builder.compose_file_path, self.dir_path),
@@ -97,7 +95,7 @@ class ServiceBuilder(Builder):
   def build_configure_base(self):
     environment = {}
     self.with_service(self.configure_base, {
-      'command': [f"/usr/local/bin/workflows/{WORKFLOW_TEMPLATE}/.configure", 'bin/configure'],
+      'command': [f"{WORKFLOW_SCRIPTS}/{WORKFLOW_TEMPLATE}/.configure", 'bin/configure'],
       'environment': environment,
       'extends': {
         'file': os.path.relpath(self.app_builder.compose_file_path, self.dir_path),
@@ -112,7 +110,11 @@ class ServiceBuilder(Builder):
     if self.config.hostname:
       self.build_proxy_base()
 
-    super().write({
-      'networks': self.networks,
+    compose = {
       'services': self.services,
-    })
+    }
+
+    if self.networks:
+      compose['networks'] = self.networks
+
+    super().write(compose)

stoobly_agent/app/cli/scaffold/docker/service/{set_gateway_ports.py → configure_gateway.py}

@@ -8,14 +8,18 @@ from stoobly_agent.app.cli.scaffold.service_config import ServiceConfig
 from stoobly_agent.app.cli.scaffold.docker.constants import DOCKER_COMPOSE_BASE, DOCKER_COMPOSE_BASE_TEMPLATE
 from stoobly_agent.app.cli.scaffold.templates.constants import CORE_GATEWAY_SERVICE_NAME
 
-def set_gateway_ports(service_paths: List[str]):
+def configure_gateway(service_paths: List[str], no_publish = False):
   if len(service_paths) == 0:
     return
 
   ports = []
+  hostnames = []
   for path in service_paths:
     config = ServiceConfig(path)
 
+    if not config.hostname:
+      continue
+
     try:
       port = int(config.port)
     except Exception:
@@ -25,6 +29,8 @@ def set_gateway_ports(service_paths: List[str]):
     if port > 0 and port <= 65535 and port_mapping not in ports:
       ports.append(port_mapping)
 
+    hostnames.append(config.hostname) 
+
   app_dir_path = os.path.dirname(service_paths[0])
   gateway_service_path = os.path.join(app_dir_path, CORE_GATEWAY_SERVICE_NAME)
   docker_compose_src_path = os.path.join(gateway_service_path, DOCKER_COMPOSE_BASE_TEMPLATE)
@@ -41,7 +47,15 @@ def set_gateway_ports(service_paths: List[str]):
     gateway_base = services.get('gateway_base')
 
     if gateway_base:
-      gateway_base['ports'] = ports
+      if not no_publish:
+        gateway_base['ports'] = ports
+
+      gateway_base['networks'] = {
+        'app.egress': {},
+        'app.ingress': {
+          'aliases': hostnames
+        }
+      }
 
   with open(docker_compose_dest_path, 'w') as fp:
     yaml.dump(compose, fp)

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

@@ -22,7 +22,6 @@ class BuildDecorator():
       **app_service,
       **{ 
           'extends': service_builder.build_extends_proxy_base(self.workflow_builder.dir_path),
-          'hostname': service_builder.config.hostname,
           'profiles': self.workflow_builder.profiles,
         } 
     }

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

@@ -32,11 +32,6 @@ class WorkflowBuilder(Builder):
       STOOBLY_HOME_DIR, DATA_DIR_NAME, DOCKER_NAMESPACE, self.service_builder.service_name, self.workflow_name
     )
 
-    if self.config.hostname:
-      self.with_public_network()
-
-    self.load()
-  
   @property
   def app(self):
     return f"{self.namespace}.app"
@@ -91,8 +86,6 @@ class WorkflowBuilder(Builder):
 
   def build_all(self):
     # Resources
-    self.with_network(self.service_builder.service_name)
-    
     if self.config.detached:
       self.with_volume(self.service_builder.service_name)
 
@@ -101,7 +94,6 @@ class WorkflowBuilder(Builder):
     self.build_configure()
 
     if self.config.hostname:
-      self.with_public_network()
       self.build_proxy() # Depends on configure, must call build_configure first
 
   def build_init(self):
@@ -166,7 +158,7 @@ class WorkflowBuilder(Builder):
 
     depends_on = {}
     environment = { **self.env_dict() }
-    networks = [self.service_builder.service_name]
+    networks = {}
     volumes = []
 
     service = {
@@ -188,14 +180,13 @@ class WorkflowBuilder(Builder):
         'condition': 'service_completed_successfully',
       }
 
-    if self.config.hostname:
-      environment['VIRTUAL_HOST'] = SERVICE_HOSTNAME
-      environment['VIRTUAL_PORT'] = SERVICE_PORT
-      environment['VIRTUAL_PROTO'] = SERVICE_SCHEME
+    environment['VIRTUAL_HOST'] = SERVICE_HOSTNAME
+    environment['VIRTUAL_PORT'] = SERVICE_PORT
+    environment['VIRTUAL_PROTO'] = SERVICE_SCHEME
 
-      # Expose this container service to the public network 
-      # so that it is accessible to other Stoobly services
-      networks.append(self.public_network_name)
+    # Expose this container service to the public network 
+    # so that it is accessible to other Stoobly services
+    networks[self.egress_network_name] = {}
 
     if self.config.detached:
       volumes.append(f"{self.service_builder.service_name}:{STOOBLY_HOME_DIR}/.stoobly")
@@ -213,10 +204,14 @@ class WorkflowBuilder(Builder):
     dest = self.custom_compose_file_path
 
     if not os.path.exists(dest):
-      super().write({
-        'networks': self.networks,
+      compose = {
         'services': {}
-      }, dest)
+      }
+
+      if self.networks:
+        compose['networks'] = self.networks
+
+      super().write(compose, dest)
 
   def with_env(self, v: List[str]): 
     if not isinstance(v, list):
@@ -225,11 +220,17 @@ class WorkflowBuilder(Builder):
     return self
 
   def write(self):
-    super().write({
-      'networks': self.networks,
+    compose = {
       'services': self.services,
-      'volumes': self.volumes,
-    })
+    }
+
+    if self.networks:
+      compose['networks'] = self.networks
+
+    if self.volumes:
+      compose['volumes'] = self.volumes
+
+    super().write(compose)
 
   def __with_url_environment(self, environment):
     environment[SERVICE_HOSTNAME_ENV] = SERVICE_HOSTNAME

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

@@ -1,7 +1,7 @@
 from stoobly_agent.app.cli.scaffold.service_config import ServiceConfig
 
 from ...constants import WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE
-from .development_decorator import DevelopmentDecorator
+from .dns_decorator import DnsDecorator
 from .mock_decorator import MockDecorator
 from .reverse_proxy_decorator import ReverseProxyDecorator
 
@@ -11,11 +11,11 @@ def get_workflow_decorators(workflow: str, service_config: ServiceConfig):
   if workflow == WORKFLOW_RECORD_TYPE:
     if service_config.hostname:
       workflow_decorators.append(ReverseProxyDecorator)
-      workflow_decorators.append(DevelopmentDecorator)
+      workflow_decorators.append(DnsDecorator)
   elif workflow == WORKFLOW_MOCK_TYPE:
      if service_config.hostname:
       workflow_decorators.append(ReverseProxyDecorator if service_config.detached else MockDecorator)    
-      workflow_decorators.append(DevelopmentDecorator)
+      workflow_decorators.append(DnsDecorator)
   else:
     if service_config.hostname:
       workflow_decorators.append(ReverseProxyDecorator if service_config.detached else MockDecorator) 

stoobly_agent/app/cli/scaffold/docker/workflow/{development_decorator.py → dns_decorator.py}

@@ -2,7 +2,7 @@ from ...constants import SERVICE_DNS
 
 from .builder import WorkflowBuilder
 
-class DevelopmentDecorator():
+class DnsDecorator():
 
   def __init__(self, workflow_builder: WorkflowBuilder):
     self.__workflow_builder = workflow_builder

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

@@ -41,5 +41,5 @@ class MockDecorator():
 
     services[proxy_name] = { 
       **proxy_service,
-      **{ 'command': command, 'hostname': f"{SERVICE_HOSTNAME}" },
+      **{ 'command': command },
     }

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

@@ -40,19 +40,6 @@ class ReverseProxyDecorator():
 
     additional_properties = { 'command': command }
 
-    # Proxying forwards requests to the actual service
-    # If the destination hostname is the same as the service's hostname, then
-    # If we set the 'hostname' property, this will cause an "infinite loop"
-    proxy_mode_toks = config.proxy_mode.split(':', 1)
-
-    if len(proxy_mode_toks) > 1:
-      directed = proxy_mode_toks[0] == 'reverse' or proxy_mode_toks[0] == 'upstream'
-      if directed:
-        spec = proxy_mode_toks[1]
-        uri = urlparse(spec)
-        if uri.hostname != self.service_builder.config.hostname:
-          additional_properties['hostname'] = f"{SERVICE_HOSTNAME}"
-
     service = { 
       **proxy_service,
       **additional_properties,

stoobly_agent/app/cli/scaffold/service_workflow_validate_command.py

@@ -18,6 +18,7 @@ from stoobly_agent.app.cli.scaffold.constants import (
   WORKFLOW_RECORD_TYPE,
   WORKFLOW_TEST_TYPE,
 )
+from stoobly_agent.app.cli.scaffold.docker.constants import APP_EGRESS_NETWORK_TEMPLATE
 from stoobly_agent.app.cli.scaffold.hosts_file_manager import HostsFileManager
 from stoobly_agent.app.cli.scaffold.service_command import ServiceCommand
 from stoobly_agent.app.cli.scaffold.service_docker_compose import ServiceDockerCompose
@@ -113,7 +114,7 @@ class ServiceWorkflowValidateCommand(ServiceCommand, ValidateCommand):
     output = self.docker_client.containers.run(
       image='curlimages/curl:8.11.0',
       command=f"curl --max-time {timeout_seconds} {url} --verbose",
-      network=self.app_config.network,
+      network=APP_EGRESS_NETWORK_TEMPLATE.format(network=self.app_config.network),
       stderr=True,
       remove=True,
     )

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

@@ -88,7 +88,6 @@ nameservers: tmpdir
 		echo "$$nameserver" > $(app_tmp_dir)/.nameservers; \
 	else \
 		echo "/etc/resolv.conf not found." >&2; \
-		exit 1; \
 	fi
 intercept/disable:
 	@export EXEC_COMMAND=.disable && \
@@ -191,7 +190,7 @@ workflow/services:
 	export EXEC_ARGS="$(WORKFLOW)" && \
 	$(stoobly_exec_run)
 workflow/test:
-	$(eval WORKFLOW=test)
+	$(eval WORKFLOW=test) $(eval options=$(options) --no-publish)
 workflow/up:
 	@export EXEC_COMMAND=.up && \
 	export EXEC_OPTIONS="$(user_id_option) $(workflow_up_options) $(workflow_run_options) $(options)" && \

stoobly_agent/app/cli/scaffold/templates/app/.docker-compose.networks.yml

@@ -0,0 +1,7 @@
+networks:
+  app.egress:
+    external: true
+    name: ${APP_NETWORK}.egress
+  app.ingress:
+    external: true
+    name: ${APP_NETWORK}.ingress

stoobly_agent/app/cli/scaffold/templates/app/build/.docker-compose.base.yml

@@ -1,7 +1,7 @@
 services:
   build.configure_base:
     command: 
-    - /usr/local/bin/services/${SERVICE_NAME}/${WORKFLOW_TEMPLATE}/.configure
+    - ${SERVICE_SCRIPTS}/${SERVICE_NAME}/${WORKFLOW_TEMPLATE}/.configure
     - bin/configure
     extends:
       file: ../.docker-compose.base.yml
@@ -9,7 +9,7 @@ services:
     working_dir: /home/stoobly/.stoobly/docker/build/${WORKFLOW_NAME}
   build.init_base:
     command: 
-    - /usr/local/bin/services/${SERVICE_NAME}/${WORKFLOW_TEMPLATE}/.init
+    - ${SERVICE_SCRIPTS}/${SERVICE_NAME}/${WORKFLOW_TEMPLATE}/.init
     - bin/init
     extends:
       file: ../.docker-compose.base.yml

stoobly_agent/app/cli/scaffold/templates/app/entrypoint/.docker-compose.base.yml

@@ -2,7 +2,7 @@ networks: {}
 services:
   entrypoint.configure_base:
     command:
-    - /usr/local/bin/services/${SERVICE_NAME}/${WORKFLOW_TEMPLATE}/.configure
+    - ${SERVICE_SCRIPTS}/${SERVICE_NAME}/${WORKFLOW_TEMPLATE}/.configure
     - bin/configure
     environment: {}
     extends:
@@ -11,7 +11,7 @@ services:
     working_dir: /home/stoobly/.stoobly/docker/entrypoint/${WORKFLOW_NAME}
   entrypoint.init_base:
     command:
-    - /usr/local/bin/services/${SERVICE_NAME}/${WORKFLOW_TEMPLATE}/.init
+    - ${SERVICE_SCRIPTS}/${SERVICE_NAME}/${WORKFLOW_TEMPLATE}/.init
     - bin/init
     environment: {}
     extends:

stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/docker-compose.yml

@@ -1,14 +1,18 @@
-# Define networks and services here
+# Define custom services here
 #
-# If a container service needs access to a Stoobly defined service, 
-# then the container service needs to add the service name to the 'networks' property
-# e.g. If we have defined a 'upstream' service, then the following should be added
+# Container services that need to make request(s) to a Stoobly defined service 
+# need to have either 'app.ingress' or 'app.egress' added to the 'networks' property
+#
+# e.g. If we want to make a request by hostname, then the following should be added
+# networks:
+#   - app.ingress
+#
+# e.g. If we want to make a request by container service name, then the following should be added
 # networks:
-#   - upstream
+#   - app.egress
 # 
 # Container services that are intended to be run as part of a workflow need to have the workflow name added to the 'profiles' property
 # e.g. If we want to run a service as part of the 'mock' workflow, then the following should be added
 # profiles:
 #   - mock
-networks: {}
 services: {}

stoobly_agent/app/cli/scaffold/templates/app/gateway/mock/.docker-compose.mock.yml

@@ -3,11 +3,5 @@ services:
     extends:
       file: ../.docker-compose.base.yml
       service: gateway_base
-    networks:
-      - app
     profiles:
-      - mock
-networks:
-  app:
-    name: ${APP_NETWORK}
-    external: true
+      - mock

stoobly_agent/app/cli/scaffold/templates/app/gateway/record/.docker-compose.record.yml

@@ -3,11 +3,5 @@ services:
     extends:
       file: ../.docker-compose.base.yml
       service: gateway_base
-    networks:
-      - app
     profiles:
-      - record
-networks:
-  app:
-    name: ${APP_NETWORK}
-    external: true
+      - record

stoobly_agent/app/cli/scaffold/templates/app/gateway/test/.docker-compose.test.yml

@@ -0,0 +1,7 @@
+services:
+  gateway.service:
+    extends:
+      file: ../.docker-compose.base.yml
+      service: gateway_base
+    profiles:
+      - test

stoobly_agent/app/cli/scaffold/workflow_run_command.py

@@ -13,9 +13,10 @@ from stoobly_agent.lib.logger import Logger
 from .app import App
 from .constants import (
   APP_DIR_ENV, APP_NETWORK_ENV, CA_CERTS_DIR_ENV, CERTS_DIR_ENV, CONTEXT_DIR_ENV, NAMESERVERS_FILE, 
-  SERVICE_DNS_ENV, SERVICE_NAME_ENV, USER_ID_ENV, WORKFLOW_NAME_ENV, WORKFLOW_NAMESPACE_ENV, WORKFLOW_TEMPLATE_ENV
+  SERVICE_DNS_ENV, SERVICE_NAME_ENV, SERVICE_SCRIPTS_DIR,  SERVICE_SCRIPTS_ENV, USER_ID_ENV, 
+  WORKFLOW_NAME_ENV, WORKFLOW_NAMESPACE_ENV, WORKFLOW_SCRIPTS_DIR, WORKFLOW_SCRIPTS_ENV, WORKFLOW_TEMPLATE_ENV
 )
-from .docker.constants import DOCKERFILE_CONTEXT
+from .docker.constants import APP_EGRESS_NETWORK_TEMPLATE, APP_INGRESS_NETWORK_TEMPLATE, DOCKERFILE_CONTEXT
 from .workflow_command import WorkflowCommand
 from .workflow_env import WorkflowEnv
 
@@ -122,11 +123,17 @@ class WorkflowRunCommand(WorkflowCommand):
     command.append('|| true')
     return ' '.join(command)
 
-  def create_network(self):
-    return f"docker network create {self.network} &> /dev/null"
+  def create_egress_network(self):
+    return f"docker network create {APP_EGRESS_NETWORK_TEMPLATE.format(network=self.network)} &> /dev/null"
 
-  def remove_network(self):
-    return f"docker network rm {self.network} &> /dev/null || true"
+  def create_ingress_network(self):
+    return f"docker network create {APP_INGRESS_NETWORK_TEMPLATE.format(network=self.network)} &> /dev/null"
+
+  def remove_egress_network(self):
+    return f"docker network rm {APP_EGRESS_NETWORK_TEMPLATE.format(network=self.network)} &> /dev/null || true"
+
+  def remove_ingress_network(self):
+    return f"docker network rm {APP_INGRESS_NETWORK_TEMPLATE.format(network=self.network)} &> /dev/null || true"
 
   def up(self, **options: UpOptions):
     if not os.path.exists(self.compose_path):
@@ -138,6 +145,9 @@ class WorkflowRunCommand(WorkflowCommand):
     # Add docker compose file
     command_options.append(f"-f {os.path.relpath(self.compose_path, self.__current_working_dir)}")
 
+    # Add docker compose networks file
+    command_options.append(f"-f {os.path.relpath(self.networks_compose_path, os.getcwd())}")
+
     # Add custom docker compose file
     custom_services = self.custom_services
     if custom_services:
@@ -203,6 +213,9 @@ class WorkflowRunCommand(WorkflowCommand):
     # Add docker compose file
     command.append(f"-f {os.path.relpath(self.compose_path, os.getcwd())}")
 
+    # Add docker compose networks file
+    command.append(f"-f {os.path.relpath(self.networks_compose_path, os.getcwd())}")
+
     # Add custom docker compose file
     if self.custom_services:
       command.append(f"-f {os.path.relpath(self.custom_compose_path, self.__current_working_dir)}")
@@ -257,8 +270,10 @@ class WorkflowRunCommand(WorkflowCommand):
     _config[CERTS_DIR_ENV] = self.certs_dir_path
     _config[CONTEXT_DIR_ENV] = self.context_dir_path
     _config[SERVICE_NAME_ENV] = self.service_name
+    _config[SERVICE_SCRIPTS_ENV] = SERVICE_SCRIPTS_DIR
     _config[USER_ID_ENV] = user_id or os.getuid()
     _config[WORKFLOW_NAME_ENV] = self.workflow_name
+    _config[WORKFLOW_SCRIPTS_ENV] = WORKFLOW_SCRIPTS_DIR
     _config[WORKFLOW_TEMPLATE_ENV] = self.workflow_name
     
     if namespace:
@@ -267,9 +282,12 @@ class WorkflowRunCommand(WorkflowCommand):
     if self.network:
       _config[APP_NETWORK_ENV] = self.network
 
+    # Specified DNS should prioritized, otherwise defaults to internal DNS
     nameservers = self.nameservers
     if nameservers:
       _config[SERVICE_DNS_ENV] = nameservers[0]
+    else:
+      _config[SERVICE_DNS_ENV] = '8.8.8.8'
 
     env_vars = self.config(_config)
     WorkflowEnv(self.workflow_path).write(env_vars)

stoobly_agent/app/cli/scaffold/workflow_validate_command.py

@@ -39,13 +39,6 @@ class WorkflowValidateCommand(WorkflowCommand, ValidateCommand):
       raise ScaffoldValidateException(f"Container '{mock_ui_container_name}' not found for service '{CORE_MOCK_UI_SERVICE_NAME}'")
 
   def validate_no_core_components(self):
-    try:
-      core_gateway_container = self.docker_client.containers.get(self.managed_services_docker_compose.gateway_container_name)
-      if core_gateway_container:
-        raise ScaffoldValidateException(f"Gateway container is running when it shouldn't: {core_gateway_container.name}")
-    except docker_errors.NotFound:
-      pass
-    
     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:

stoobly_agent/app/cli/scaffold_cli.py

@@ -14,7 +14,7 @@ from stoobly_agent.app.cli.scaffold.constants import (
   DOCKER_NAMESPACE, WORKFLOW_CONTAINER_PROXY, WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE, WORKFLOW_TEST_TYPE
 )
 from stoobly_agent.app.cli.scaffold.containerized_app import ContainerizedApp
-from stoobly_agent.app.cli.scaffold.docker.service.set_gateway_ports import set_gateway_ports
+from stoobly_agent.app.cli.scaffold.docker.service.configure_gateway import configure_gateway
 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
@@ -341,8 +341,11 @@ def down(**kwargs):
       remove_image_command = command.remove_image(kwargs['user_id'])
       print(remove_image_command, file=script)
 
-    remove_network_command = command.remove_network()
-    print(remove_network_command, file=script)
+    remove_egress_network_command = command.remove_egress_network()
+    print(remove_egress_network_command, file=script)
+
+    remove_ingress_network_command = command.remove_ingress_network()
+    print(remove_ingress_network_command, file=script)
 
   __run_script(script, kwargs['dry_run'])
 
@@ -425,6 +428,7 @@ def logs(**kwargs):
 @click.option('--namespace', help='Workflow namespace.')
 @click.option('--network', help='Workflow network name.')
 @click.option('--no-build', is_flag=True, help='Do not build images before starting containers.')
+@click.option('--no-publish', is_flag=True, help='Do not publish all ports.')
 @click.option('--pull', is_flag=True, help='Pull image before running.')
 @click.option('--script-path', help='Path to intermediate script path.')
 @click.option('--service', multiple=True, help='Select which services to run. Defaults to all.')
@@ -457,7 +461,7 @@ def up(**kwargs):
 
   # 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))
+  configure_gateway(workflow.service_paths_from_services(services), kwargs['no_publish'])
 
   commands: List[WorkflowRunCommand] = []
   for service in services:
@@ -478,7 +482,8 @@ def up(**kwargs):
       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())
+    init_commands.append(command.create_egress_network())
+    init_commands.append(command.create_ingress_network())
     joined_command = ' && '.join(init_commands)
 
     if not containerized:
@@ -666,8 +671,11 @@ def __get_services(app: App, **kwargs):
 
     # Intersection
     selected_services = list(filter(lambda x: x in workflow_services, selected_services))
+
+  services = list(set(selected_services))
+  services.sort()
   
-  return list(set(selected_services))
+  return services
 
 def __print_header(text: str):
   Logger.instance(LOG_ID).info(f"{bcolors.OKBLUE}{text}{bcolors.ENDC}")

stoobly_agent/app/proxy/mock/eval_request_service.py

@@ -15,12 +15,16 @@ from stoobly_agent.app.settings.match_rule import MatchRule
 from stoobly_agent.config.constants import custom_headers, query_params as request_query_params
 from stoobly_agent.lib.api.param_builder import ParamBuilder
 from stoobly_agent.lib.api.interfaces.requests import RequestResponseShowQueryParams
-from stoobly_agent.lib.logger import Logger
+from stoobly_agent.lib.api.keys.project_key import InvalidProjectKey
+from stoobly_agent.lib.api.keys.scenario_key import InvalidScenarioKey
+from stoobly_agent.lib.logger import bcolors, Logger
 
 from .hashed_request_decorator import HashedRequestDecorator
 from .search_endpoint import inject_search_endpoint
 from ..mitmproxy.request_facade import MitmproxyRequestFacade
 
+LOG_ID = 'EvalRequest'
+
 class EvalRequestOptions(TypedDict):
     infer: bool
     retry: int
@@ -49,10 +53,19 @@ def eval_request(
     **options: EvalRequestOptions
 ) -> Response:
     query_params_builder = ParamBuilder({})
+    scenario_key = intercept_settings.scenario_key
+
+    if not scenario_key:
+        Logger.instance(LOG_ID).info(f"{bcolors.WARNING}Missing{bcolors.ENDC} scenario key, defaulting to all requests for mocking")
 
     try:
-        query_params_builder.with_resource_scoping(intercept_settings.project_key, intercept_settings.scenario_key)
-    except:
+        query_params_builder.with_resource_scoping(intercept_settings.project_key, scenario_key)
+    except InvalidScenarioKey:
+        Logger.instance(LOG_ID).warn(f"{bcolors.WARNING}Invalid{bcolors.ENDC} scenario key ${scenario_key}")
+        # If project_key or scenario_key are invalid, assume custom not found
+        return CustomNotFoundResponseBuilder().build()
+    except InvalidProjectKey:
+        Logger.instance(LOG_ID).warn(f"{bcolors.WARNING}Invalid{bcolors.ENDC} project key ${intercept_settings.project_key}")
         # If project_key or scenario_key are invalid, assume custom not found
         return CustomNotFoundResponseBuilder().build()
 

stoobly_agent/lib/api/param_builder.py

@@ -1,6 +1,5 @@
 import pdb
 
-from stoobly_agent.app.proxy.intercept_settings import InterceptSettings
 from stoobly_agent.lib.api.keys.project_key import ProjectKey
 from stoobly_agent.lib.api.keys.scenario_key import ScenarioKey
 

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

@@ -292,7 +292,6 @@ class TestScaffoldE2e():
       pass
 
     def test_assets(self, app_dir_path, target_workflow_name):
-
       app = App(app_dir_path, DOCKER_NAMESPACE)
       config = {
         'workflow_name': target_workflow_name,
@@ -300,5 +299,4 @@ class TestScaffoldE2e():
       }
 
       command = ServiceWorkflowValidateCommand(app, **config)
-      command.validate()
-
+      command.validate()

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

@@ -1 +1 @@
-1.6.1
+1.6.4

stoobly_agent/test/mock_data/scaffold/docker-compose-assets-service.yml

@@ -1,15 +1,10 @@
 # Define services here
-networks:
-  app:
-    external: true
-    name: ${APP_NETWORK}
-
 services:
   assets:
     hostname: assets
     image: nginx:1.27
     networks:
-      - app
+      - app.egress
     volumes:
       - ./index.html:/usr/share/nginx/html/index.html
     profiles: &id001

stoobly_agent/test/mock_data/scaffold/docker-compose-local-service.yml

@@ -1,16 +1,10 @@
 # Define services here
-
-networks:
-  app:
-    external: true
-    name: ${APP_NETWORK}
-
 services:
   my-httpbin:
     image: kennethreitz/httpbin:latest
     hostname: my-httpbin.com
     networks:
-      - app
+      - app.egress
     profiles: &id001
       - record
 

{stoobly_agent-1.6.2.dist-info → stoobly_agent-1.6.4.dist-info}/METADATA

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

{stoobly_agent-1.6.2.dist-info → stoobly_agent-1.6.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-stoobly_agent/__init__.py,sha256=YgNv7ZVr561UUQVGUuChJX5OTSxwob_6G7Si3HBAKk0,44
+stoobly_agent/__init__.py,sha256=ftbaOUQT2yhRxLPO2HWJBT3dcSrAFLEftXLYmnaHuBg,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
@@ -68,29 +68,29 @@ stoobly_agent/app/cli/report_cli.py,sha256=ZxJw0Xkx7KFZJn9e45BSKRKon8AD0Msrwy1fb
 stoobly_agent/app/cli/request_cli.py,sha256=THNloW111l9MLE0oPg4y7hVXL1U7OXoz760g0A1CtJ0,7747
 stoobly_agent/app/cli/scaffold/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/cli/scaffold/app.py,sha256=bgNc_dWZtgkuDAkS9aHSCMxCrjX907Phlfb2bOasswI,3435
-stoobly_agent/app/cli/scaffold/app_command.py,sha256=qtOdG08ehdRk1wujiTL7LCQXoJkGpwExepO2qYBXBNA,2027
+stoobly_agent/app/cli/scaffold/app_command.py,sha256=sliaYulMNmaxbRXpJIDtBDWEBGEv5Tht4rpErzC_xxw,2368
 stoobly_agent/app/cli/scaffold/app_config.py,sha256=Gs-BynV1vY7_PpTOenn2mqc7lBIu0vBx6as9vtEU1sk,818
 stoobly_agent/app/cli/scaffold/app_create_command.py,sha256=sy4017eiir9MK0TEbTi1NyG9mhOGlenGGVnq0GsGUrQ,966
 stoobly_agent/app/cli/scaffold/command.py,sha256=aoTsdkkBzyu7TkVSMdNQQGk0Gj874jNgFcjR14y3TuM,254
 stoobly_agent/app/cli/scaffold/config.py,sha256=HZU5tkvr3dkPr4JMXZtrJlu2wxxO-134Em6jReFFcq0,688
-stoobly_agent/app/cli/scaffold/constants.py,sha256=s6AR9p9fVsPukfcCQ2QIGPtPKMbXkGnZ5a5CJGwou5E,2205
+stoobly_agent/app/cli/scaffold/constants.py,sha256=s5SBy8Xs4-Lg4tYEVBTiDIzeWwerrnz8qHXbXQtXH5U,2465
 stoobly_agent/app/cli/scaffold/containerized_app.py,sha256=dAjn4RwcZV3aEL0POUmrbF_DC-r9h6s1zx7gT2t45v0,175
 stoobly_agent/app/cli/scaffold/docker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/cli/scaffold/docker/app_builder.py,sha256=7z5pk5JKlRDHx2USxY-WurttLyyUkIVYfl34_u1x9dE,501
-stoobly_agent/app/cli/scaffold/docker/builder.py,sha256=BQzjpDZmkUrii3VDcRCBXQkocxRwdS1omJFy5AkzJzw,2856
-stoobly_agent/app/cli/scaffold/docker/constants.py,sha256=xfFBSF-1GQKNnUPTlz08Nm9HZDspUnvPvjwaLViQwVw,419
+stoobly_agent/app/cli/scaffold/docker/builder.py,sha256=uiGqhxBHEasZAqLzjKUGUs-1QEZiMsJQYn4mdJ2jy3A,3137
+stoobly_agent/app/cli/scaffold/docker/constants.py,sha256=1khQdgTaQ89ykGRNdTQh_ejFOdjNFGaZ_3cOGda6y7Y,692
 stoobly_agent/app/cli/scaffold/docker/service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/cli/scaffold/docker/service/build_decorator.py,sha256=ZU7z4bkvdS3OK5O4fJhlA9_PNwnFtZW6t7vNF7V5obQ,1003
-stoobly_agent/app/cli/scaffold/docker/service/builder.py,sha256=RnX0KESc6kxV3oyiSmS4JqIXZNMDVMLVGg34c024cm0,3186
-stoobly_agent/app/cli/scaffold/docker/service/set_gateway_ports.py,sha256=MH71h24nX5lAd6xNfSjjNyw6PjBsAXv-3kOFEe86huk,1417
+stoobly_agent/app/cli/scaffold/docker/service/builder.py,sha256=AE0tEHKeDM3dDMSjaqUwJA9ZLgzeyr0ErMAhOzNuaSI,3190
+stoobly_agent/app/cli/scaffold/docker/service/configure_gateway.py,sha256=bdqY9jESbyGEwPW5cwb51oznYFlzK4MUP770zxxgrds,1701
 stoobly_agent/app/cli/scaffold/docker/service/types.py,sha256=qB-yYHlu-PZDc0HYgTUvE5bWNpHxaSThC3JUG8okR1k,88
 stoobly_agent/app/cli/scaffold/docker/workflow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-stoobly_agent/app/cli/scaffold/docker/workflow/build_decorator.py,sha256=vbmME0cbN2EnNRlzQ2umj7Y3L7aZT-EHqEpkBFMfe8U,758
-stoobly_agent/app/cli/scaffold/docker/workflow/builder.py,sha256=G9zyw_jS0HEHtzl0EvoDQ9MlpTavlyWz0xFpgEZoyVc,6844
-stoobly_agent/app/cli/scaffold/docker/workflow/decorators_factory.py,sha256=oi0Hkii2W9338IeG7BG2medQxqZUbBp71Cvj-qDunII,987
-stoobly_agent/app/cli/scaffold/docker/workflow/development_decorator.py,sha256=cs00Cc2DuOYrGD8W9849PjHz6k2xyx0fSizqJlM7yR8,946
-stoobly_agent/app/cli/scaffold/docker/workflow/mock_decorator.py,sha256=iRHmUPnHaxAVL5ithFf5Mw0WQdogWsVcLkTeCOStDqg,1261
-stoobly_agent/app/cli/scaffold/docker/workflow/reverse_proxy_decorator.py,sha256=eeB1Y7L6xYlD9w7oO7a4Ou0Gvfvvd2znnqrZQQz6IlQ,1825
+stoobly_agent/app/cli/scaffold/docker/workflow/build_decorator.py,sha256=VKD9hXbJGRIWHS5IeYXeX0-FQ0F43zG8VmsegL6eYwA,703
+stoobly_agent/app/cli/scaffold/docker/workflow/builder.py,sha256=i2T3TvWlXBT2O4wqwMcwsN55-4VzAblo36dEwCPf8yU,6736
+stoobly_agent/app/cli/scaffold/docker/workflow/decorators_factory.py,sha256=gU4RfuZ13r_YoB4eLS6FuiB1A4kfuLrWLPmYjZ0EJJw,955
+stoobly_agent/app/cli/scaffold/docker/workflow/dns_decorator.py,sha256=nlDPbyF1hkVItzFH3bk9KlqfDC8usyFZs353-ibqxvA,938
+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/managed_services_docker_compose.py,sha256=-wLBXUi7DCWsfm5KzZzd_kdJKOTl1NT924XR7dyjbSY,574
@@ -101,14 +101,15 @@ stoobly_agent/app/cli/scaffold/service_create_command.py,sha256=bmLGgx9qnh-X_i2_
 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=iORyPZEQurgWVxrdMgkdD3VsCz3ar2D15dmyY3RoeKw,9904
+stoobly_agent/app/cli/scaffold/service_workflow_validate_command.py,sha256=M5fc9RiCgN9ReCXsb3KIVJIKo0aSIOv28Q3izLkEQTo,10036
 stoobly_agent/app/cli/scaffold/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/cli/scaffold/templates/app/.Dockerfile.context,sha256=xnUFSlP8YvEs04lTh1Jj_ggNcwyVjyzZjzF0Vh9pris,158
-stoobly_agent/app/cli/scaffold/templates/app/.Makefile,sha256=zXj6WEYfFhgxB9BioUIlXxOAGI1gpDVWpc57K4AamE4,8390
+stoobly_agent/app/cli/scaffold/templates/app/.Makefile,sha256=_krOdKu4LX9C_UvWuJeyD7VhWVs0aZtuDNxwlzvvsBY,8418
 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
 stoobly_agent/app/cli/scaffold/templates/app/Makefile,sha256=TEmPG7Bf0KZOnmfsgdzza3UdwcVMmM5Lj1YdLc4cgjA,79
 stoobly_agent/app/cli/scaffold/templates/app/build/.config.yml,sha256=8Wt8ZZ5irvBYYS44xGrR_EWlZDuXH9kyWmquzsh7s8g,19
-stoobly_agent/app/cli/scaffold/templates/app/build/.docker-compose.base.yml,sha256=A9TI3J6182Bg9YH0GqetEqBz5_5Lf99XLHgHDuesK64,569
+stoobly_agent/app/cli/scaffold/templates/app/build/.docker-compose.base.yml,sha256=SBjI-5APmzvzQafHzRahH_xcoXEEV9M9GIeEmXSwnAU,559
 stoobly_agent/app/cli/scaffold/templates/app/build/mock/.docker-compose.mock.yml,sha256=3DJ8LTq3QScaz0SA_tXQqJ0kljSCeqkPyDbhLOxBJvc,414
 stoobly_agent/app/cli/scaffold/templates/app/build/mock/bin/configure,sha256=dEOGIKUKJf5kjOwJRdTgZkS0ZjmQHWVuAmKrWUjPij4,44
 stoobly_agent/app/cli/scaffold/templates/app/build/mock/bin/init,sha256=YxWVVQMEdGarcMtBcE1Sj2kdLgUgwY9kXp3MjPsVcmg,46
@@ -119,11 +120,11 @@ stoobly_agent/app/cli/scaffold/templates/app/build/test/.docker-compose.test.yml
 stoobly_agent/app/cli/scaffold/templates/app/build/test/bin/configure,sha256=dEOGIKUKJf5kjOwJRdTgZkS0ZjmQHWVuAmKrWUjPij4,44
 stoobly_agent/app/cli/scaffold/templates/app/build/test/bin/init,sha256=YxWVVQMEdGarcMtBcE1Sj2kdLgUgwY9kXp3MjPsVcmg,46
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/.config.yml,sha256=T9VQz6OwAQpKdIoFrnfKAxuX_to0c6EhuWRLKM34Sr4,22
-stoobly_agent/app/cli/scaffold/templates/app/entrypoint/.docker-compose.base.yml,sha256=FzDOFouP61eSeklhjQ7qpsE8rSc8r3DuT8aytIiZwN8,640
+stoobly_agent/app/cli/scaffold/templates/app/entrypoint/.docker-compose.base.yml,sha256=Sl_E6IUaHSR_Av_Tm3FzCJ6w5qjtR2LiJfiQJAMZUFI,630
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/.docker-compose.mock.yml,sha256=-YbHd6BrAlBpT8PYg8kOsq0GyDeZ3g_q8IB0B0rGluU,551
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/bin/configure,sha256=dEOGIKUKJf5kjOwJRdTgZkS0ZjmQHWVuAmKrWUjPij4,44
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/bin/init,sha256=YxWVVQMEdGarcMtBcE1Sj2kdLgUgwY9kXp3MjPsVcmg,46
-stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/docker-compose.yml,sha256=Zh8h8yUqVXZMi_Y4aUPE48qw2DU-ONO4-rrSTh4E_Ts,591
+stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/docker-compose.yml,sha256=JZztRTAEd_byGjhBbI_TOrj7CML8l5lV4tYOM2syHUw,717
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/record/.docker-compose.record.yml,sha256=aIcgjelss4V86lxS3-xN8j_2eR-0YkzhtN_b-g3Y0nE,555
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/record/bin/configure,sha256=dEOGIKUKJf5kjOwJRdTgZkS0ZjmQHWVuAmKrWUjPij4,44
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/record/bin/init,sha256=YxWVVQMEdGarcMtBcE1Sj2kdLgUgwY9kXp3MjPsVcmg,46
@@ -134,8 +135,9 @@ stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/bin/init,sha256=YxW
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/docker-compose.yml,sha256=E4gGJwHfnZoFo9-0vM17-Qg5LPjx7vIPpcz2K7eiZg0,591
 stoobly_agent/app/cli/scaffold/templates/app/gateway/.config.yml,sha256=XnLQZMzzMMIwVycjyPN5QXsmRztkTFAna1kIHYuDfJQ,19
 stoobly_agent/app/cli/scaffold/templates/app/gateway/.docker-compose.base.template.yml,sha256=bgBvyDhyehS75D2ObEi7sl9DLGV6U3c9JhCAncsvjq8,251
-stoobly_agent/app/cli/scaffold/templates/app/gateway/mock/.docker-compose.mock.yml,sha256=_nlhrpml5dm9AWqgDIaEPwrQiD1vAKVHSsY2mTIds2k,224
-stoobly_agent/app/cli/scaffold/templates/app/gateway/record/.docker-compose.record.yml,sha256=FvPqOUs1k6Vc-rncnpgiRTZeEQlrizmcGkT8a4HdvUE,226
+stoobly_agent/app/cli/scaffold/templates/app/gateway/mock/.docker-compose.mock.yml,sha256=CDL5x18-ues4F_ujqpNef_zJTG6PyDOkQ11cIHBOW5k,136
+stoobly_agent/app/cli/scaffold/templates/app/gateway/record/.docker-compose.record.yml,sha256=eyLH2h33Peunus8M1sUKL9AALCG2ABhV_heiJKhvgwo,138
+stoobly_agent/app/cli/scaffold/templates/app/gateway/test/.docker-compose.test.yml,sha256=oJO6i0lsuQaQeIH80yoPZo3Vs0LzUAH2WRl853yLq6g,136
 stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/.config.yml,sha256=XnLQZMzzMMIwVycjyPN5QXsmRztkTFAna1kIHYuDfJQ,19
 stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/.docker-compose.base.yml,sha256=bxrtZqf3YtaJCukzScslh5PgWC5q8xkGIP1wKJf33LA,111
 stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/.docker-compose.exec.yml,sha256=JN89sU5uRf6YqHvN_O63K8rwQIAPJHbhFDLFmuUjKNM,304
@@ -195,9 +197,9 @@ stoobly_agent/app/cli/scaffold/workflow_copy_command.py,sha256=R9hh5dWVz7vGld7pE
 stoobly_agent/app/cli/scaffold/workflow_create_command.py,sha256=WmGKoqJqOkhL40oLCo8PnWhBKdfbY0dO2UtRn1IKynE,3504
 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=bbz1QcY5nr7VwPdofngX7yVUk8yVdGLckwlbXq0ozhE,10037
-stoobly_agent/app/cli/scaffold/workflow_validate_command.py,sha256=fhHciJXg_u32Wmh8us8LhgQj8D1SxkBADtuBBF4K0FM,4377
-stoobly_agent/app/cli/scaffold_cli.py,sha256=nvM1hawDtL9OHKQlCRpXJjcBh_E_MIQz69MkBpLDEjg,28332
+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=qR1AvPbUFsn9QL_QrWVFxW77n4yMVI7DVwiV2ylRcOM,28686
 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
@@ -321,7 +323,7 @@ stoobly_agent/app/proxy/mock/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 stoobly_agent/app/proxy/mock/context.py,sha256=vDo5_3WBL73mVFnsmQWvcxvPg5nWtRJbigSrE3zGc-o,794
 stoobly_agent/app/proxy/mock/custom_not_found_response_builder.py,sha256=xHjA2CNhW5A4NyPkDzws6DY5YQeJqF6b3Y3k0iJKNss,611
 stoobly_agent/app/proxy/mock/eval_fixtures_service.py,sha256=hc4VLnN50HBaWvFnrhQUJqdH-r3jBu9DHrpt8gbvkHY,3847
-stoobly_agent/app/proxy/mock/eval_request_service.py,sha256=EKHZT_sKZhGcGFCDa3XOSzYkSJIfJJUg4164BTxKUeY,7365
+stoobly_agent/app/proxy/mock/eval_request_service.py,sha256=A1tcE3wmrC1HwLpz0aRuRw-Nucn0dyHD_yHw5BeQEJU,8146
 stoobly_agent/app/proxy/mock/hashed_request_decorator.py,sha256=h1ma90fdaYI9LBWpMWMqWBz-RjNwI628O4VuS_uUBX4,5061
 stoobly_agent/app/proxy/mock/ignored_components_response_builder.py,sha256=E32_E1eSdmPn2SeM_e1jWnqu4xh5w_SnmOs32Shx99E,501
 stoobly_agent/app/proxy/mock/request_hasher.py,sha256=WeOeksmW_b5Ql0Xb0fL2WMH3MVHrm-9GYWYoKYS1teg,3755
@@ -481,7 +483,7 @@ stoobly_agent/lib/api/keys/resource_key.py,sha256=9qrkp3t8iJsScZvKVcBDvVbcfwmP0y
 stoobly_agent/lib/api/keys/scenario_key.py,sha256=VAc6gayvJS7shWgDL3SAqVET3fmgBefcygXTsKot07U,629
 stoobly_agent/lib/api/keys/test_key.py,sha256=-MCWp1oYLkJ3S_Pqs62j8KkkssXpT9quKb4YqMSq1Ks,438
 stoobly_agent/lib/api/keys/uuid_key.py,sha256=7_aL5wVTKF68bESHvqeQ2RUeC-Fw9-zpSrl8EWuFTJw,603
-stoobly_agent/lib/api/param_builder.py,sha256=sCx_m-apHTi5VBd4cvQtrFslxePUHd1CFs2-o_hCgJA,1069
+stoobly_agent/lib/api/param_builder.py,sha256=50eq0zkqRz5MVezPZMIu69fYSB6z4CD5FG26_IU3eq0,996
 stoobly_agent/lib/api/projects_resource.py,sha256=7leBuQnlpgUwbYUX445lUC3jy-dzLMpTumeNPrqRc5c,1166
 stoobly_agent/lib/api/query_param_names_resource.py,sha256=k-3nlyfCOa_Vwj-TMI7v8_4g9qAs50baP073gkStAKE,1710
 stoobly_agent/lib/api/reports_resource.py,sha256=Dtw-96J99u0AEJRYYNUA1awPAneg2Y0IOHyjvuF6juQ,601
@@ -671,7 +673,7 @@ 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=rTPxC72Qh54qW5AmDQwVAyI9bj6i1rD5LOFGm0XdLrE,12974
+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/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
@@ -697,7 +699,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=_f4T1QzFg0lLC81UhhuJRJ7MIzez92MEH4M0zL1X0Wc,5
+stoobly_agent/test/app/models/schemas/.stoobly/db/VERSION,sha256=1-dHLCYhhLoNpJuXwyP9qKDsvu4z17NNtIQF76_WVd4,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
@@ -733,13 +735,13 @@ stoobly_agent/test/mock_data/petstore-references.yaml,sha256=OpNrCSb5-qKmUBIO9oG
 stoobly_agent/test/mock_data/petstore-swagger-io.yaml,sha256=FbOEaArZKl1dV7jEf1hyJQv9jdAb5jXfsRRZB5i4-0Y,22094
 stoobly_agent/test/mock_data/petstore.yaml,sha256=CCdliJky04Az4FIOkFA883uunwFDHLr2Y8ohtozFi_Q,2714
 stoobly_agent/test/mock_data/request_show_response.py,sha256=K_a0fP0QT58T8sX9PaM6hqtX1A1depZsqg_GsNPf--k,707
-stoobly_agent/test/mock_data/scaffold/docker-compose-assets-service.yml,sha256=TJpkkkSjUlfz3t8Oxsz6Ery1JX7Ed79Fh6oiEuKI4i0,275
-stoobly_agent/test/mock_data/scaffold/docker-compose-local-service.yml,sha256=_tCvHxpIKcKMWKrtTvJgqSfkzcaNvJN1w7Yb9OUOzLU,241
+stoobly_agent/test/mock_data/scaffold/docker-compose-assets-service.yml,sha256=m2eN4XZLHnUMDq9wub34Yv9rh8GUWOUgJjY6U3wAljQ,220
+stoobly_agent/test/mock_data/scaffold/docker-compose-local-service.yml,sha256=1WGJJzb8tO13RH5toF4g8km0vItksnO2RIjE36nnp-8,185
 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.6.2.dist-info/LICENSE,sha256=o93sj12cdoEOsTCjPaPFsw3Xq0SXs3pPcY-9reE2sEw,548
-stoobly_agent-1.6.2.dist-info/METADATA,sha256=FcqFwOK8OzH1zHTeVf-dAQ0VPOiUsJJvXw4CY0j4H00,3087
-stoobly_agent-1.6.2.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-stoobly_agent-1.6.2.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
-stoobly_agent-1.6.2.dist-info/RECORD,,
+stoobly_agent-1.6.4.dist-info/LICENSE,sha256=o93sj12cdoEOsTCjPaPFsw3Xq0SXs3pPcY-9reE2sEw,548
+stoobly_agent-1.6.4.dist-info/METADATA,sha256=Yx-Gc2cFV8iqjcfH8XeqLd3dc1IRPhKkJ5hYKbtVUCU,3087
+stoobly_agent-1.6.4.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+stoobly_agent-1.6.4.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
+stoobly_agent-1.6.4.dist-info/RECORD,,