stoobly-agent 1.9.9__py3-none-any.whl → 1.9.11__py3-none-any.whl

stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.9.9'
+VERSION = '1.9.11'

stoobly_agent/app/cli/helpers/shell.py

@@ -1,10 +1,18 @@
+import os
 import subprocess
 import sys
 
 from dotenv import load_dotenv
 
+DOTENV_PATH = 'STOOBLY_DOTENV_PATH'
+
 def exec_stream(command):
-  load_dotenv()
+  dotenv_path = os.environ.get(DOTENV_PATH)
+
+  if dotenv_path and os.path.exists(dotenv_path):
+    load_dotenv(dotenv_path=dotenv_path)
+  else:
+    load_dotenv()
 
   # Start the process
   process = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)

stoobly_agent/app/cli/intercept_cli.py

@@ -8,7 +8,7 @@ from stoobly_agent.lib.api.keys.project_key import ProjectKey
 
 from .helpers.handle_config_update_service import handle_intercept_active_update, handle_order_update
 
-settings = Settings.instance()
+settings: Settings = Settings.instance()
 
 mode_options = [mode.MOCK, mode.RECORD, mode.REPLAY]
 

stoobly_agent/app/cli/scaffold/app.py

@@ -1,3 +1,4 @@
+import hashlib
 import os
 import shutil
 
@@ -73,6 +74,11 @@ class App():
   def data_dir_path(self):
     return self.__data_dir_path
 
+  @property
+  def network(self):
+    # An app may contain one or more context dirs from which services will derive their mocks from
+    return hashlib.md5(self.context_dir_path.encode()).hexdigest()
+
   @property
   def scaffold_namespace_path(self):
     return os.path.join(self.data_dir_path, self.scaffold_namespace)

stoobly_agent/app/cli/scaffold/app_command.py

@@ -40,7 +40,7 @@ class AppCommand(Command):
   @property
   def networks_compose_relative_path(self):
     return os.path.join(
-      self.namespace,
+      self.scaffold_namespace,
       DOCKER_COMPOSE_NETWORKS
     )
 

stoobly_agent/app/cli/scaffold/app_config.py

@@ -1,16 +1,25 @@
 from .config import Config
-from .constants import APP_NAME_ENV, APP_NETWORK_ENV, APP_UI_PORT_ENV
+from .constants import APP_DOCKER_SOCKET_PATH_ENV, APP_NAME_ENV, APP_UI_PORT_ENV
 
 class AppConfig(Config):
 
   def __init__(self, dir: str):
     super().__init__(dir)
 
+    self.__docker_socket_path = '/var/run/docker.sock'
     self.__name = None
-    self.__network = None
+    self.__ui_port = None
 
     self.load()
 
+  @property
+  def docker_socket_path(self):
+    return self.__docker_socket_path
+
+  @docker_socket_path.setter
+  def docker_socket_path(self, v):
+    self.__docker_socket_path = v
+
   @property
   def name(self):
     return self.__name
@@ -19,14 +28,6 @@ class AppConfig(Config):
   def name(self, v):
     self.__name = v
 
-  @property
-  def network(self):
-    return self.__network
-
-  @network.setter
-  def network(self, v):
-    self.__network = v
-
   @property
   def ui_port(self):
     return self.__ui_port
@@ -39,18 +40,17 @@ class AppConfig(Config):
     config = config or self.read()
 
     self.name = config.get(APP_NAME_ENV)
-    self.network = config.get(APP_NETWORK_ENV)
     self.ui_port = config.get(APP_UI_PORT_ENV)
     
   def write(self):
     config = {}
 
+    if self.docker_socket_path:
+      config[APP_DOCKER_SOCKET_PATH_ENV] = self.docker_socket_path
+
     if self.name:
       config[APP_NAME_ENV] = self.name
 
-    if self.network:
-      config[APP_NETWORK_ENV] = self.network
-
     if self.ui_port:
       config[APP_UI_PORT_ENV] = self.ui_port
 

stoobly_agent/app/cli/scaffold/app_create_command.py

@@ -7,8 +7,8 @@ from .app import App
 from .app_command import AppCommand
 
 class AppCreateOptions(TypedDict):
+  docker_socket_path: str
   name: str
-  network: str
   ui_port: int
 
 class AppCreateCommand(AppCommand):
@@ -19,19 +19,19 @@ class AppCreateCommand(AppCommand):
         if kwargs.get('app_name'):
             self.app_config.name = kwargs['app_name']
 
-        if kwargs.get('network'):
-            self.app_config.network = kwargs['network']
+        if kwargs.get('docker_socket_path'):
+            self.app_config.docker_socket_path = kwargs['docker_socket_path']
 
         if kwargs.get('ui_port'):
             self.app_config.ui_port = kwargs['ui_port']
 
     @property
-    def app_name(self):
-        return self.app_config.name
+    def docker_socket_path(self):
+        return self.app_config.docker_socket_path
 
     @property
-    def app_network(self):
-        return self.app_config.network
+    def app_name(self):
+        return self.app_config.name
 
     @property
     def app_ui_port(self):

stoobly_agent/app/cli/scaffold/command.py

@@ -4,12 +4,12 @@ class Command():
 
   def __init__(self, app: App):
     self.__app = app
-    self.__namespace = app.scaffold_namespace
+    self.__scaffold_namespace = app.scaffold_namespace
 
   @property
   def app(self):
     return self.__app
 
   @property
-  def namespace(self):
-    return self.__namespace
+  def scaffold_namespace(self):
+    return self.__scaffold_namespace

stoobly_agent/app/cli/scaffold/constants.py

@@ -6,6 +6,7 @@ from stoobly_agent.config.data_dir import CERTS_DIR_NAME, DATA_DIR_NAME
 
 APP_DIR = '${APP_DIR}'
 APP_DIR_ENV = 'APP_DIR'
+APP_DOCKER_SOCKET_PATH_ENV = 'APP_DOCKER_SOCKET_PATH'
 APP_NETWORK_ENV = 'APP_NETWORK'
 APP_NAME_ENV = 'APP_NAME'
 APP_UI_PORT_ENV = 'APP_UI_PORT'
@@ -16,15 +17,17 @@ COMPOSE_TEMPLATE = '.docker-compose.{workflow}.yml'
 CONFIG_FILE = '.config.yml'
 CONTEXT_DIR_ENV = 'CONTEXT_DIR'
 DOCKER_NAMESPACE = 'docker'
-ENV_FILE = '.env'
+DOTENV_FILE = '.env'
 NAMESERVERS_FILE = '.nameservers'
 PUBLIC_FOLDER_NAME = 'public'
 SERVICE_DETACHED = '${SERVICE_DETACHED}'
 SERVICE_DETACHED_ENV = 'SERVICE_DETACHED'
-SERVICE_HOSTNAME = '${SERVICE_HOSTNAME}'
-SERVICE_HOSTNAME_ENV = 'SERVICE_HOSTNAME'
 SERVICE_DNS = '${SERVICE_DNS}'
 SERVICE_DNS_ENV = 'SERVICE_DNS'
+SERVICE_HOSTNAME = '${SERVICE_HOSTNAME}'
+SERVICE_HOSTNAME_ENV = 'SERVICE_HOSTNAME'
+SERVICE_ID = '${SERVICE_ID}'
+SERVICE_ID_ENV = 'SERVICE_ID'
 SERVICE_NAME = '${SERVICE_NAME}'
 SERVICE_NAME_ENV = 'SERVICE_NAME'
 SERVICE_PROXY_MODE = '${SERVICE_PROXY_MODE}'

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

@@ -7,8 +7,12 @@ from stoobly_agent.config.data_dir import DATA_DIR_NAME
 
 from ...app_config import AppConfig
 from ...constants import (
-  APP_DIR, DOCKER_NAMESPACE, SERVICE_NAME, SERVICE_NAME_ENV, 
-  SERVICE_HOSTNAME, SERVICE_HOSTNAME_ENV, SERVICE_NAME_ENV, SERVICE_PORT, SERVICE_PORT_ENV, SERVICE_SCHEME, SERVICE_SCHEME_ENV, 
+  APP_DIR, DOCKER_NAMESPACE, 
+  SERVICE_HOSTNAME, SERVICE_HOSTNAME_ENV,
+  SERVICE_NAME, SERVICE_NAME_ENV, 
+  SERVICE_ID,
+  SERVICE_PORT, SERVICE_PORT_ENV, 
+  SERVICE_SCHEME, SERVICE_SCHEME_ENV, 
   STOOBLY_HOME_DIR, STOOBLY_HOME_DIR, 
   WORKFLOW_NAME, WORKFLOW_NAME_ENV, WORKFLOW_SCRIPTS, WORKFLOW_TEMPLATE
 )
@@ -91,7 +95,7 @@ class ServiceBuilder(Builder):
     if not self.config.hostname:
       return
 
-    service_id = self.config.id
+    service_id = SERVICE_ID
     environment = { **self.env_dict() }
     labels = [
       'traefik.enable=true',

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

@@ -4,13 +4,13 @@ import yaml
 
 from typing import List
 
-from stoobly_agent.config.data_dir import DATA_DIR_NAME, TMP_DIR_NAME
 from stoobly_agent.app.cli.scaffold.constants import APP_DIR
 from stoobly_agent.app.cli.scaffold.service_config import ServiceConfig
 from stoobly_agent.app.cli.scaffold.docker.constants import APP_INGRESS_NETWORK_NAME, APP_EGRESS_NETWORK_NAME, DOCKER_COMPOSE_BASE, DOCKER_COMPOSE_BASE_TEMPLATE
 from stoobly_agent.app.cli.scaffold.templates.constants import CORE_GATEWAY_SERVICE_NAME
+from stoobly_agent.app.cli.scaffold.workflow_namesapce import WorkflowNamespace
 
-def configure_gateway(namespace: str, service_paths: List[str], no_publish = False):
+def configure_gateway(workflow_namespace: WorkflowNamespace, service_paths: List[str], no_publish = False):
   if len(service_paths) == 0:
     return
 
@@ -36,7 +36,7 @@ def configure_gateway(namespace: str, service_paths: List[str], no_publish = Fal
         gateway_base['ports'] = ports
 
       app_dir_path = os.path.dirname(os.path.dirname(service_dir_path))
-      __with_traefik_config(namespace, service_paths, app_dir_path, gateway_base)
+      __with_traefik_config(workflow_namespace, service_paths, app_dir_path, gateway_base)
       __with_networks(gateway_base, hostnames) 
 
   with open(docker_compose_dest_path, 'w') as fp:
@@ -50,7 +50,7 @@ def __with_networks(config: dict, hostnames: List[str]):
     'aliases': hostnames
   }
 
-def __with_traefik_config(namespace: str, service_paths: List[str], app_dir_path: str, compose: dict):
+def __with_traefik_config(workflow_namespace: WorkflowNamespace, service_paths: List[str], app_dir_path: str, compose: dict):
   config_dest = '/etc/traefik/traefik.yml'
 
   if not compose['volumes']:
@@ -98,8 +98,8 @@ def __with_traefik_config(namespace: str, service_paths: List[str], app_dir_path
       })
 
   # Create traefik.yml in .stoobly/tmp
-  traefik_template_relative_path = os.path.join(DATA_DIR_NAME, TMP_DIR_NAME, namespace, 'traefik.yml')
-  traefik_template_dest_path = os.path.join(app_dir_path, traefik_template_relative_path)
+  traefik_template_relative_path = workflow_namespace.traefik_config_relative_path(app_dir_path)
+  traefik_template_dest_path = workflow_namespace.traefik_config_path
 
   if not os.path.exists(os.path.dirname(traefik_template_dest_path)):
     os.makedirs(os.path.dirname(traefik_template_dest_path), exist_ok=True)

stoobly_agent/app/cli/scaffold/env.py

@@ -1,7 +1,5 @@
 import os
 
-from .constants import ENV_FILE
-
 DELIMITTER = "\n"
 
 class Env():

stoobly_agent/app/cli/scaffold/service_command.py

@@ -48,7 +48,7 @@ class ServiceCommand(AppCommand):
   @property
   def service_relative_path(self):
     return os.path.join(
-      self.namespace,
+      self.scaffold_namespace,
       self.service_name,
     )
 

stoobly_agent/app/cli/scaffold/service_config.py

@@ -7,6 +7,7 @@ from .config import Config
 from .constants import (
   SERVICE_DETACHED_ENV,
   SERVICE_HOSTNAME_ENV,
+  SERVICE_ID_ENV,
   SERVICE_PRIORITY_ENV,
   SERVICE_PORT_ENV,
   SERVICE_PROXY_MODE_ENV,
@@ -55,7 +56,7 @@ class ServiceConfig(Config):
 
   @property
   def id(self):
-    return hashlib.md5(os.path.basename(self.dir).encode()).hexdigest()
+    return hashlib.md5(self.url.encode()).hexdigest()
 
   @property
   def hostname(self):
@@ -106,18 +107,22 @@ class ServiceConfig(Config):
     if not self.hostname:
       return ''
 
-    _proxy_mode = f"reverse:{self.scheme}://{self.hostname}"
+    return f"reverse:{self.url}"
+
+  @property
+  def url(self):
+    _url = f"{self.scheme}://{self.hostname}"
 
     if not self.port:
-      return _proxy_mode
+      return _url
 
     if self.scheme == 'http' and self.port == 80: 
-      return _proxy_mode
+      return _url
 
     if self.scheme == 'https' and self.port == 443:
-      return _proxy_mode
+      return _url
 
-    return f"{_proxy_mode}:{self.port}"
+    return f"{_url}:{self.port}"
 
   @proxy_mode.setter
   def proxy_mode(self, v):
@@ -171,7 +176,7 @@ class ServiceConfig(Config):
       config[SERVICE_SCHEME_ENV] = self.scheme
 
     config[SERVICE_DETACHED_ENV] = bool(self.detached)
-
+    config[SERVICE_ID_ENV] = self.id
     config[SERVICE_PROXY_MODE_ENV] = self.proxy_mode
 
     super().write(config)

stoobly_agent/app/cli/scaffold/service_create_command.py

@@ -37,7 +37,7 @@ class ServiceCreateCommand(ServiceCommand):
 
     workflow_kwargs = {
       'app_dir_path': self.app_dir_path,
-      'namespace': self.namespace, 
+      'namespace': self.scaffold_namespace, 
       'service_name': self.service_name,
     }
 

stoobly_agent/app/cli/scaffold/service_workflow_validate_command.py

@@ -116,8 +116,9 @@ class ServiceWorkflowValidateCommand(ServiceCommand, ValidateCommand):
 
   def validate_internal_hostname(self, url: str) -> None:
     print(f"Validating hostname inside Docker network, url: {url}")
-
-    network = f"{self.workflow_name}.{self.app_config.network}" 
+    
+    # See WorkflowRunCommand for how 'network' is generated
+    network = f"{self.workflow_name}.{self.app.network}" 
     timeout_seconds = 1
     output = self.docker_client.containers.run(
       image='curlimages/curl:8.11.0',

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

@@ -4,7 +4,7 @@
 # STOOBLY_CA_CERTS_DIR: path to folder where ca certs are stored, defaults to $(pwd)/.stoobly/ca_certs
 # STOOBLY_CERTS_DIR: path to a folder to store certs, defaults to $(pwd)/.stoobly/certs
 # STOOBLY_CONTEXT_DIR: path to the folder containing the .stoobly folder, defaults to $(pwd)
-# STOOBLY_ENV_FILE: path to dotenv file, defaults to $(pwd)/.env
+# STOOBLY_DOTENV_FILE: path to dotenv file, defaults to $(pwd)/.env
 # STOOBLY_WORKFLOW_SERVICE_OPTIONS: extra --service options to pass 'stoobly-agent scaffold workflow' commands
 
 # Overridable Options
@@ -28,7 +28,7 @@ app_dir=$$(realpath "$${STOOBLY_APP_DIR:-$(CONTEXT_DIR_DEFAULT)}")
 ca_certs_dir=$$(realpath "$${STOOBLY_CA_CERTS_DIR:-$(app_data_dir)/ca_certs}")
 certs_dir=$$(realpath "$${STOOBLY_CERTS_DIR:-$(app_data_dir)/certs}")
 context_dir=$$(realpath "$${STOOBLY_CONTEXT_DIR:-$(CONTEXT_DIR_DEFAULT)}")
-env_file=$$(realpath "$${STOOBLY_ENV_FILE:-.env}" 2> /dev/null || echo '')
+dotenv_file=$$(realpath "$${STOOBLY_DOTENV_FILE:-.env}" 2> /dev/null || echo '')
 workflow=record
 workflow_service_options=$(shell echo $$STOOBLY_WORKFLOW_SERVICE_OPTIONS)
 
@@ -38,34 +38,34 @@ app_tmp_dir=$(app_data_dir)/tmp
 dockerfile_path=$(app_namespace_dir)/.Dockerfile.context
 exec_docker_compose_file_path=$(app_namespace_dir)/stoobly-ui/exec/.docker-compose.exec.yml
 workflow_namespace=$(if $(namespace),$(namespace),$(workflow))
+workflow_namespace_dir=$(app_tmp_dir)/$(workflow_namespace)
 workflow_script=.stoobly/tmp/$(workflow_namespace)/run.sh
 
 # Options
 certs_dir_options=--ca-certs-dir-path $(ca_certs_dir) --certs-dir-path $(certs_dir)
 working_dir_options=--app-dir-path $(app_dir) --context-dir-path $(context_dir)
 
-workflow_down_options=--user-id $(USER_ID) $(workflow_down_extra_options)
+workflow_down_options=$(working_dir_options) --user-id $(USER_ID) $(workflow_down_extra_options)
 workflow_log_options=$(workflow_log_extra_options)
 workflow_run_options=--namespace $(workflow_namespace) --script-path $(workflow_script) $(workflow_service_options)
 workflow_up_options=$(working_dir_options) $(certs_dir_options) --user-id $(USER_ID) $(workflow_up_extra_options)
-
+ 
 # Commands
 exec_env=APP_DIR="$(app_dir)" CA_CERTS_DIR="$(ca_certs_dir)" USER_ID="$(USER_ID)"
 exec_up=$(DOCKER_BIN) compose -f "$(exec_docker_compose_file_path)" run --rm stoobly_ui.command
-source_env=set -a; [ -f "$(env_file)" ] && . "$(env_file)"; set +a
 
 # Build base image
 stoobly_exec_build=$(DOCKER_BIN) build $(stoobly_exec_build_args) $(app_namespace_dir) > /dev/null
 stoobly_exec_build_args=-f "$(dockerfile_path)" -t stoobly.$(USER_ID) --build-arg USER_ID=$(USER_ID) $(PULL_OPTION) --quiet
 
 # Exec any
-stoobly_exec=$(source_env); $(stoobly_exec_build) && $(stoobly_exec_env) $(exec_up)
+stoobly_exec=$(stoobly_exec_build) && $(stoobly_exec_env) $(exec_up)
 stoobly_exec_env=$(exec_env) CONTEXT_DIR="$(context_dir)" 
 
 # Exec workflow run
 # Scaffold is stored in the application source code directory. 
 # When running a scaffold command from within a container, it needs access to $(app_dir) rather than $(context_dir)
-stoobly_exec_run=$(source_env); $(stoobly_exec_build) && $(stoobly_exec_run_env) $(exec_up)
+stoobly_exec_run=$(stoobly_exec_build) && $(stoobly_exec_run_env) $(exec_up)
 stoobly_exec_run_env=$(exec_env) CONTEXT_DIR="$(app_dir)"
 
 # Workflow run
@@ -88,14 +88,16 @@ ca-cert/install: stoobly/install
 certs:
 	@export EXEC_COMMAND=scaffold/.mkcert EXEC_OPTIONS="" EXEC_ARGS="" && \
 	$(stoobly_exec)
-nameservers: tmpdir
+dotenv: workflow/namespace
+	@if [ -f "$(dotenv_file)" ]; then cp "$(dotenv_file)" $(workflow_namespace_dir)/.env; fi
+nameservers: workflow/namespace
 	@if [ -f /etc/resolv.conf ]; then \
 		nameserver=$$(grep -Eo '([0-9]{1,3}\.){3}[0-9]{1,3}' /etc/resolv.conf) && \
 		if [ "$$nameserver" = "127.0.0.53" ]; then \
 			echo "Nameserver is 127.0.0.53. Checking resolvectl status..."; \
 			nameserver=$$(resolvectl status | sed -n '/DNS Servers:/s/.*DNS Servers:\s*\([^ ]*\).*/\1/p' | head -n 1); \
 		fi; \
-		echo "$$nameserver" > $(app_tmp_dir)/.nameservers; \
+		echo "$$nameserver" > $(workflow_namespace_dir)/.nameservers; \
 	else \
 		echo "/etc/resolv.conf not found." >&2; \
 	fi
@@ -158,7 +160,7 @@ test/logs: workflow/test workflow/logs
 test/down: workflow/test workflow/down
 tmpdir:
 	@mkdir -p $(app_tmp_dir)
-workflow/down:
+workflow/down: dotenv
 	@export EXEC_COMMAND=scaffold/.down EXEC_OPTIONS="$(workflow_down_options) $(workflow_run_options) $(options)" EXEC_ARGS="$(workflow)" && \
 	$(stoobly_exec_run) && \
 	$(workflow_run)
@@ -182,6 +184,8 @@ workflow/logs:
 	$(workflow_run)
 workflow/mock:
 	$(eval workflow=mock)
+workflow/namespace: tmpdir
+	@mkdir -p $(workflow_namespace_dir)
 workflow/record:
 	$(eval workflow=record)
 workflow/services:
@@ -189,7 +193,7 @@ workflow/services:
 	$(stoobly_exec_run)
 workflow/test:
 	$(eval workflow=test) $(eval workflow_up_extra_options=$(workflow_up_extra_options) --no-publish)
-workflow/up:
+workflow/up: dotenv
 	@export EXEC_COMMAND=scaffold/.up EXEC_OPTIONS="$(workflow_up_options) $(workflow_run_options) $(options)" EXEC_ARGS="$(workflow)" && \
 	$(stoobly_exec_run) && \
 	$(workflow_run)

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

@@ -6,5 +6,5 @@ services:
     profiles:
       - gateway_base
     volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
+      - ${APP_DOCKER_SOCKET_PATH}:/var/run/docker.sock:ro
       - ${CERTS_DIR}:/certs:ro

stoobly_agent/app/cli/scaffold/workflow_command.py

@@ -5,7 +5,7 @@ import yaml
 from stoobly_agent.lib.logger import Logger
 
 from .app import App
-from .constants import BIN_FOLDER_NAME, COMPOSE_TEMPLATE, CONFIG_FILE, ENV_FILE, PUBLIC_FOLDER_NAME
+from .constants import BIN_FOLDER_NAME, COMPOSE_TEMPLATE, CONFIG_FILE, DOTENV_FILE, PUBLIC_FOLDER_NAME
 from .docker.constants import DOCKER_COMPOSE_CUSTOM
 from .service_command import ServiceCommand
 from .workflow_config import WorkflowConfig
@@ -101,8 +101,8 @@ class WorkflowCommand(ServiceCommand):
     return os.path.join(self.workflow_path, CONFIG_FILE)
 
   @property
-  def workflow_env_path(self):
-    return os.path.join(self.workflow_path, ENV_FILE)
+  def workflow_dotenv_path(self):
+    return os.path.join(self.workflow_path, DOTENV_FILE)
 
   @property
   def workflow_exists(self):

stoobly_agent/app/cli/scaffold/workflow_env.py

@@ -1,11 +1,15 @@
+import os
+
+from dotenv import dotenv_values
+
 from .config import Config
-from .constants import ENV_FILE
+from .constants import DOTENV_FILE
 from .env import Env
 
 class WorkflowEnv(Config):
 
   def __init__(self, dir: str):
-    super().__init__(dir, ENV_FILE)
+    super().__init__(dir, DOTENV_FILE)
 
     self.__env_vars = {}
 
@@ -15,6 +19,9 @@ class WorkflowEnv(Config):
   def load(self):
     self.__env_vars = self.read()
 
-  def write(self, env_vars: dict):
+  def write(self, env_vars: dict, dotenv_path: str = None):
+    if dotenv_path and os.path.exists(dotenv_path):
+      env_vars = { **env_vars, **dotenv_values(dotenv_path) }
+
     Env(self.path).write(env_vars)
     self.__env_vars = env_vars

stoobly_agent/app/cli/scaffold/workflow_namesapce.py

@@ -0,0 +1,41 @@
+import os
+
+
+from .app import App
+from .constants import DOTENV_FILE, NAMESERVERS_FILE
+
+class WorkflowNamespace():
+
+  def __init__(self, app: App, namespace: str = None):
+    self._app = app
+    self._namespace = namespace
+    self._path = os.path.join(app.data_dir.tmp_dir_path, namespace or '')
+
+  @property
+  def dotenv_path(self):
+    return os.path.join(self.path, DOTENV_FILE)
+
+  @property
+  def nameservers_path(self):
+    return os.path.join(self.path, NAMESERVERS_FILE)
+
+  @property
+  def namespace(self):
+    return self._namespace
+
+  @property
+  def path(self):
+    return self._path
+
+  @property
+  def run_script_path(self):
+    return os.path.join(self.path, 'run.sh')
+
+  @property
+  def traefik_config_path(self):
+    return os.path.join(self.path, 'traefik.yml')
+
+  def traefik_config_relative_path(self, path: str):
+    if not path:
+      return path
+    return self.traefik_config_path.replace(path if path[len(path) - 1] == '/' else path + '/', '', 1)

stoobly_agent/app/cli/scaffold/workflow_run_command.py

@@ -3,42 +3,25 @@ import os
 import pdb
 import subprocess
 import re
-import yaml
 
-from typing import TypedDict
 
 from stoobly_agent.config.data_dir import DataDir
 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, 
+  APP_DIR_ENV, APP_NETWORK_ENV, CA_CERTS_DIR_ENV, CERTS_DIR_ENV, CONTEXT_DIR_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 APP_EGRESS_NETWORK_TEMPLATE, APP_INGRESS_NETWORK_TEMPLATE, DOCKERFILE_CONTEXT
 from .workflow_command import WorkflowCommand
 from .workflow_env import WorkflowEnv
+from .workflow_namesapce import WorkflowNamespace
+from ..types.workflow_run_command import BuildOptions, ComposeOptions, DownOptions, UpOptions
 
 LOG_ID = 'WorkflowRunCommand'
 
-class ComposeOptions(TypedDict):
-  namespace: str
-  user_id: str
-
-class BuildOptions(ComposeOptions):
-  user_id: str
-  verbose: bool
-
-class DownOptions(ComposeOptions):
-  extra_compose_path: str
-  rmi: bool
-
-class UpOptions(ComposeOptions):
-  attached: bool
-  extra_compose_path: str
-  pull: bool
-
 class WorkflowRunCommand(WorkflowCommand):
   def __init__(self, app: App, **kwargs):
     super().__init__(app, **kwargs)
@@ -48,7 +31,8 @@ class WorkflowRunCommand(WorkflowCommand):
     self.__ca_certs_dir_path = kwargs.get('ca_certs_dir_path') or app.ca_certs_dir_path
     self.__certs_dir_path = kwargs.get('certs_dir_path') or app.certs_dir_path
     self.__context_dir_path = kwargs.get('context_dir_path') or app.context_dir_path
-    self.__network = f"{kwargs.get('network') or {self.workflow_name}}.{self.app_config.network}"
+    self.__namespace = kwargs.get('namespace') or self.workflow_name
+    self.__network = f"{self.__namespace}.{kwargs.get('network') or app.network}"
     
   @property
   def app_dir_path(self):
@@ -78,6 +62,10 @@ class WorkflowRunCommand(WorkflowCommand):
   def current_working_dir(self, v):
     self.__current_working_dir = v
 
+  @property
+  def dotenv_path(self):
+    return WorkflowNamespace(self.app, self.namespace).dotenv_path
+
   @property
   def nameservers(self):
     path = self.nameservers_path
@@ -90,7 +78,11 @@ class WorkflowRunCommand(WorkflowCommand):
 
   @property
   def nameservers_path(self):
-    return os.path.join(self.app.data_dir.tmp_dir_path, NAMESERVERS_FILE)
+    return WorkflowNamespace(self.app, self.namespace).nameservers_path
+
+  @property
+  def namespace(self):
+    return self.__namespace
 
   @property
   def network(self):
@@ -290,7 +282,7 @@ class WorkflowRunCommand(WorkflowCommand):
       _config[SERVICE_DNS_ENV] = '8.8.8.8'
 
     env_vars = self.config(_config)
-    WorkflowEnv(self.workflow_path).write(env_vars)
+    WorkflowEnv(self.workflow_path).write(env_vars, self.dotenv_path)
     return env_vars
 
   def __find_nameservers(self, dns_resolver: dns.resolver.Resolver):

stoobly_agent/app/cli/scaffold_cli.py

@@ -30,6 +30,7 @@ from stoobly_agent.app.cli.scaffold.workflow import Workflow
 from stoobly_agent.app.cli.scaffold.workflow_create_command import WorkflowCreateCommand
 from stoobly_agent.app.cli.scaffold.workflow_copy_command import WorkflowCopyCommand
 from stoobly_agent.app.cli.scaffold.workflow_log_command import WorkflowLogCommand
+from stoobly_agent.app.cli.scaffold.workflow_namesapce import WorkflowNamespace
 from stoobly_agent.app.cli.scaffold.workflow_run_command import WorkflowRunCommand
 from stoobly_agent.app.cli.scaffold.workflow_validate_command import WorkflowValidateCommand
 from stoobly_agent.config.constants import env_vars
@@ -88,7 +89,7 @@ def hostname(ctx):
   help="Scaffold application"
 )
 @click.option('--app-dir-path', default=current_working_dir, help='Path to create the app scaffold.')
-@click.option('--network', callback=validate_network, help='App default network name. Defaults to app name.')
+@click.option('--docker-socket-path', default='/var/run/docker.sock', help='Path to Docker socket.')
 @click.option('--quiet', is_flag=True, help='Disable log output.')
 @click.option('--ui-port', default=4200, type=click.IntRange(1, 65535), help='UI service port.')
 @click.argument('app_name', callback=validate_app_name)
@@ -100,9 +101,6 @@ def create(**kwargs):
   if not kwargs['quiet'] and os.path.exists(app.scaffold_namespace_path):
     print(f"{kwargs['app_dir_path']} already exists, updating scaffold maintained files...")
 
-  if not kwargs['network']:
-    kwargs['network'] = kwargs['app_name']
-
   AppCreateCommand(app, **kwargs).build()
 
 @app.command(
@@ -344,7 +342,10 @@ def copy(**kwargs):
 def down(**kwargs):  
   os.environ[env_vars.LOG_LEVEL] = kwargs['log_level']
 
-  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE, **kwargs)
+  containerized = kwargs['containerized']
+
+  app_dir_path = current_working_dir if containerized else kwargs['app_dir_path']
+  app = App(app_dir_path, DOCKER_NAMESPACE, **kwargs)
   __validate_app(app)
 
   __with_namespace_defaults(kwargs)
@@ -361,7 +362,7 @@ def down(**kwargs):
     command.current_working_dir = current_working_dir
     commands.append(command)
 
-  script = __build_script(**kwargs)
+  script = __build_script(app, **kwargs)
 
   commands = sorted(commands, key=lambda command: command.service_config.priority)
   for index, command in enumerate(commands):
@@ -450,7 +451,7 @@ def logs(**kwargs):
     command = WorkflowLogCommand(app, **config)
     commands.append(command)
 
-  script = __build_script(**kwargs)
+  script = __build_script(app, **kwargs)
 
   commands = sorted(commands, key=lambda command: command.service_config.priority)
   for index, command in enumerate(commands):
@@ -514,7 +515,9 @@ def up(**kwargs):
   # Gateway ports are dynamically set depending on the workflow run
   workflow = Workflow(kwargs['workflow_name'], app)
   configure_gateway(
-    kwargs['namespace'] or workflow.workflow_name, workflow.service_paths_from_services(services), kwargs['no_publish']
+    WorkflowNamespace(app, kwargs['namespace'] or workflow.workflow_name), 
+    workflow.service_paths_from_services(services), 
+    kwargs['no_publish']
   )
 
   commands: List[WorkflowRunCommand] = []
@@ -525,7 +528,7 @@ def up(**kwargs):
     command.current_working_dir = current_working_dir
     commands.append(command)
 
-  script = __build_script(**kwargs)
+  script = __build_script(app, **kwargs)
 
   # Before services can be started, their image and network needs to be created
   if len(commands) > 0:
@@ -678,11 +681,11 @@ scaffold.add_command(service)
 scaffold.add_command(workflow)
 scaffold.add_command(hostname)
 
-def __build_script(**kwargs):
+def __build_script(app: App, **kwargs):
   script_path = kwargs['script_path']
   if not script_path:
-    script_file_name = 'run.sh'
-    script_path = os.path.join(data_dir.tmp_dir_path, kwargs.get('namespace') or kwargs['workflow_name'] or '', script_file_name)
+    workflow_namespace = WorkflowNamespace(app, kwargs.get('namespace') or kwargs['workflow_name'])
+    script_path = workflow_namespace.run_script_path
   
   script_dir = os.path.dirname(script_path)
   if not os.path.exists(script_dir):
@@ -827,10 +830,6 @@ def __with_namespace_defaults(kwargs):
   if not kwargs.get('namespace'):
     kwargs['namespace'] = kwargs.get('workflow_name')
 
-  # If network there was a network option, but it is not set, default network to namespace
-  if 'network' in kwargs and not kwargs['network']:
-    kwargs['network'] = kwargs['namespace']
-
 def __workflow_create(app, **kwargs):
   command = WorkflowCreateCommand(app, **kwargs)
 

stoobly_agent/app/cli/types/workflow_run_command.py

@@ -0,0 +1,18 @@
+from typing import TypedDict
+
+class ComposeOptions(TypedDict):
+  namespace: str
+  user_id: str
+
+class BuildOptions(ComposeOptions):
+  user_id: str
+  verbose: bool
+
+class DownOptions(ComposeOptions):
+  extra_compose_path: str
+  rmi: bool
+
+class UpOptions(ComposeOptions):
+  attached: bool
+  extra_compose_path: str
+  pull: bool

{stoobly_agent-1.9.9.dist-info → stoobly_agent-1.9.11.dist-info}/METADATA

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

{stoobly_agent-1.9.9.dist-info → stoobly_agent-1.9.11.dist-info}/RECORD

@@ -1,4 +1,4 @@
-stoobly_agent/__init__.py,sha256=ynj3t69d_GKqdl_NzWnMm4vXo8bYFLqoXtgFzDp3BXk,44
+stoobly_agent/__init__.py,sha256=T0T5meojgC4kb3-HURdzQoFWyRESweACkhTLNw5Rsnk,45
 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
@@ -52,7 +52,7 @@ stoobly_agent/app/cli/helpers/request_synchronize_handler.py,sha256=wawAL8hoZLqO
 stoobly_agent/app/cli/helpers/run_command_service.py,sha256=w9CNDZDj_gxCCXAFFOLONuOVu6_W9f8z1RX3-5RKuTM,731
 stoobly_agent/app/cli/helpers/scenario_facade.py,sha256=nWcycEZBL87OFCCQx85-5QaK0Q9XXk2-RMeC1uef2_Y,3134
 stoobly_agent/app/cli/helpers/schema_builder.py,sha256=-R_oU_d8nPNdNA31WDp8lCh7XpCeazLm_1dl_Kq8DLU,1127
-stoobly_agent/app/cli/helpers/shell.py,sha256=iBzZEgmB7fBsKxF1rm7i_pjCPOiE5LcMD-W1CsX4Yhg,645
+stoobly_agent/app/cli/helpers/shell.py,sha256=pnztxQjm8kdeVZH40PlTSuiGB_yaSP8PXRS15MoUxtE,838
 stoobly_agent/app/cli/helpers/synchronize_request_service.py,sha256=pwsILyrR6XPBJAIVaato0tRrbCT4z5-FymJgfeWTsVw,6018
 stoobly_agent/app/cli/helpers/tabulate_print_service.py,sha256=d4xtJgn9sueL8nAwOSIyiyzuY1ptsD1wxEdLQe0X2tc,964
 stoobly_agent/app/cli/helpers/test_facade.py,sha256=gRnbjYNxnzPmtvFp2J6TZgxaMSzDjpAWdb79kaFBt_I,2227
@@ -61,19 +61,19 @@ stoobly_agent/app/cli/helpers/trace_aliases.py,sha256=8N8pnsnONwVv-fabCTvDlXec-W
 stoobly_agent/app/cli/helpers/trace_context_facade.py,sha256=3MDjY_bdhvE2dad_B_w9gemCZZoiVjotbE8o9hrmVYo,1027
 stoobly_agent/app/cli/helpers/validations.py,sha256=nvcrEHvjMOAyHlJK0bQIwyzBUciJ0qNkNESa2zZ5ZFo,6232
 stoobly_agent/app/cli/helpers/verify_raw_request_service.py,sha256=tmLeRBYhNgAQeJD-rF6Nj22F_TfVktVSb1wjRPFblBQ,658
-stoobly_agent/app/cli/intercept_cli.py,sha256=UswnJJiBV7FKWaxIpiOYrwPSfMTPeg8UO_h_3gUxdD4,5106
+stoobly_agent/app/cli/intercept_cli.py,sha256=LNHfAec6Tf_cFNwuNvcvig-k9lKi7kVsMGIDC0fWp2o,5116
 stoobly_agent/app/cli/main_group.py,sha256=3UzBxin2f2p5KNqo6Oayo_I1VI2pHpqOoRexUnJ74a4,2187
 stoobly_agent/app/cli/project_cli.py,sha256=EXjeLjbnq9PhfCjvyfZ0UnJ2tejeCS0SIAo3Nc4fKOc,3852
 stoobly_agent/app/cli/report_cli.py,sha256=ZxJw0Xkx7KFZJn9e45BSKRKon8AD0Msrwy1fbPfbv0c,2543
 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=sliaYulMNmaxbRXpJIDtBDWEBGEv5Tht4rpErzC_xxw,2368
-stoobly_agent/app/cli/scaffold/app_config.py,sha256=UGVJ7DVmXh-o_gYBlAAEjngNIUZPQUiXXk2oMStcsPg,1075
-stoobly_agent/app/cli/scaffold/app_create_command.py,sha256=0ogYliGbq1PYP5rFs-ML33q_Z4t_rAgPWjhk7rhnGw0,1153
-stoobly_agent/app/cli/scaffold/command.py,sha256=aoTsdkkBzyu7TkVSMdNQQGk0Gj874jNgFcjR14y3TuM,254
+stoobly_agent/app/cli/scaffold/app.py,sha256=0HJm8cdyIBAdOBr18499MkZGhmEFu6I7GSZXR7pKxkw,3650
+stoobly_agent/app/cli/scaffold/app_command.py,sha256=w15VCsyefIE9HfzpIRMrv2BEep46ZSPgvsjZmFOMPZs,2377
+stoobly_agent/app/cli/scaffold/app_config.py,sha256=z4sxZcXZTEoXyUZajUuffuWQN8x8eovu-TBtgoTMXEE,1182
+stoobly_agent/app/cli/scaffold/app_create_command.py,sha256=HOlXL6Ugid2qHagqDVGl3ksjLKE4WF_3Dji8FoQlpuM,1215
+stoobly_agent/app/cli/scaffold/command.py,sha256=G4Zp647cuviaEXUdcl7Rbx_qQAr0Z_DS7-Y3MWDC1Qc,281
 stoobly_agent/app/cli/scaffold/config.py,sha256=HZU5tkvr3dkPr4JMXZtrJlu2wxxO-134Em6jReFFcq0,688
-stoobly_agent/app/cli/scaffold/constants.py,sha256=e0aKyB80i1heJCubAvxt8DlzykAvYH37xeAcl9UTTgI,2496
+stoobly_agent/app/cli/scaffold/constants.py,sha256=VuCpzeGxlFEQuX6WEK5D_4ih8-S-iotwOny458K85_c,2612
 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
@@ -81,8 +81,8 @@ stoobly_agent/app/cli/scaffold/docker/builder.py,sha256=uiGqhxBHEasZAqLzjKUGUs-1
 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=4cIMSYvgrkGWVuuYymiwlrR829O91qQl9ML8FhaDMj4,5857
-stoobly_agent/app/cli/scaffold/docker/service/configure_gateway.py,sha256=8GQ2wUBwb45uSxhzkEMloezJT1hVu8v_3PudWLTU9ig,3910
+stoobly_agent/app/cli/scaffold/docker/service/builder.py,sha256=u3_YNuxX8TT4TvhzTqe5b2Zvi9fF7TLWJFepkBSXwhk,5857
+stoobly_agent/app/cli/scaffold/docker/service/configure_gateway.py,sha256=jbMaa08R2EoZ2esoC4uREfPoBK9b5vyPRuTNOT0QDjE,3949
 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=VKD9hXbJGRIWHS5IeYXeX0-FQ0F43zG8VmsegL6eYwA,703
@@ -91,21 +91,21 @@ stoobly_agent/app/cli/scaffold/docker/workflow/decorators_factory.py,sha256=bjQ8
 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/env.py,sha256=dT33tHoQaUxfsFCYm8kfaAv-qPVrUPmNFQmLnFQhZeQ,1107
 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=74JwjTRRkk6lo-k9hre1iGztbKa9zDqjPVx3Qgpze-s,699
-stoobly_agent/app/cli/scaffold/service_command.py,sha256=NxJakoq1Dy79LEIJ8QSsKEwsofIfN13GN0UGpp9i6qY,1230
-stoobly_agent/app/cli/scaffold/service_config.py,sha256=edL356wqpfJgFdeSrWof-CAUB1Tgi4nO1Jx9nkql9Qc,3903
-stoobly_agent/app/cli/scaffold/service_create_command.py,sha256=1B6TK3JDAjouikCV84WDrX7b0crdPMPIo1caMwhi-L8,2815
+stoobly_agent/app/cli/scaffold/service_command.py,sha256=n5tVp8jIypnNO9uxtaMt33lX5ho0xhV6A53HDN2Yet4,1239
+stoobly_agent/app/cli/scaffold/service_config.py,sha256=WCHy1bZ8-nlVwCWdOWKXrdIVTtjye8XStA1bqvbRgZ0,3959
+stoobly_agent/app/cli/scaffold/service_create_command.py,sha256=nCONco0ducMcX4rsdFe3A-iRiySyUnu-T6bTb312XP0,2824
 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_update_command.py,sha256=oWusBKfvjt4RnK03_V3CJYWrfsCI4_LcR7W12eLXMR4,2579
 stoobly_agent/app/cli/scaffold/service_workflow.py,sha256=sQ_Edy_wGHKMXpD0DmhnOWkGEKz7gSgEGNI8f7aXOdg,444
-stoobly_agent/app/cli/scaffold/service_workflow_validate_command.py,sha256=veigidzR4EwGi8dc0v_l4Ik7cZikDBnLcvwcHNc1Wzg,11457
+stoobly_agent/app/cli/scaffold/service_workflow_validate_command.py,sha256=-hdg7RLsoEQXCI9rebIXyO3d8JbpyTxGnhpjaPQfmFk,11514
 stoobly_agent/app/cli/scaffold/templates/__init__.py,sha256=x8C_a0VoO_vUbosp4_6IC1U7Ge9NnUdVKDPpVMtMkeY,171
 stoobly_agent/app/cli/scaffold/templates/app/.Dockerfile.context,sha256=Okk4Q0Fj7Wi5NU58gQfpjpFwAL3RUBJyRe56kteQfcA,158
-stoobly_agent/app/cli/scaffold/templates/app/.Makefile,sha256=VGtO-dz0tXHfUN9MMkc3Lqfqg6Vhdb_aiz7cxiot3DE,8950
+stoobly_agent/app/cli/scaffold/templates/app/.Makefile,sha256=uV-xqit3fz3tfcU6sbBOxK0Zon11v-fydfuYLSxS7jQ,9164
 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
@@ -138,7 +138,7 @@ stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/bin/configure,sha25
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/bin/init,sha256=YxWVVQMEdGarcMtBcE1Sj2kdLgUgwY9kXp3MjPsVcmg,46
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/docker-compose.yml,sha256=JpWLQrW69EatLD3HPHpmi3Y6n7cjlrUgekYVbJ4ngSY,523
 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=0A08JbYpa7LGv9SphRwCgkvy5y4_T74LoWiV-NyCmyA,241
+stoobly_agent/app/cli/scaffold/templates/app/gateway/.docker-compose.base.template.yml,sha256=QipWNy2mEbJuceiNfRbv6L3ARk1lMkD1gE4l_Z0PrPU,246
 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
@@ -196,15 +196,16 @@ stoobly_agent/app/cli/scaffold/templates/workflow/test/public/.gitignore,sha256=
 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
+stoobly_agent/app/cli/scaffold/workflow_command.py,sha256=sGe5uVr34P6IZ0qfCTgM8sQ7LkvdvymM2LmBzXpw1ZY,3353
 stoobly_agent/app/cli/scaffold/workflow_config.py,sha256=ghnbcnCyb6ECdylUJCAJ6A8ulzaFY9bu7RvRuYeiRkk,901
 stoobly_agent/app/cli/scaffold/workflow_copy_command.py,sha256=wi8qHH_M2e6jXIPuumx65Zd4Zt7hTBb6b3Z4vt4xYeQ,1320
 stoobly_agent/app/cli/scaffold/workflow_create_command.py,sha256=-fwsr6_LvGT8BbBWdGY3Qd8cSQhBOSJiMr1r8s2R86w,3390
-stoobly_agent/app/cli/scaffold/workflow_env.py,sha256=x8V5pJmIiklD3f2q2-qq-CORf4YaXYq_r2JpR2MmSwk,416
+stoobly_agent/app/cli/scaffold/workflow_env.py,sha256=shPjoX1SWe7K6pGpZvw2fPVHWd6j_azTe58jvOjGUns,607
 stoobly_agent/app/cli/scaffold/workflow_log_command.py,sha256=Bke4lMOMxuDUFuAx9nlXHbKgYMO4KAg9ASHvjz4aVWc,1372
-stoobly_agent/app/cli/scaffold/workflow_run_command.py,sha256=AZhLd1N260RjXEiUSRppqfhQMwVyRnn0jpapRu4FwyM,11114
+stoobly_agent/app/cli/scaffold/workflow_namesapce.py,sha256=DXPCjfY6LAJDHy1ZlKVhVgp2aX97TmQK78lmgzBRN20,968
+stoobly_agent/app/cli/scaffold/workflow_run_command.py,sha256=H9s0F8LaoB7ZLUVXWP6M6yPLYk5IE4JD8qgGXntwtMc,11138
 stoobly_agent/app/cli/scaffold/workflow_validate_command.py,sha256=Uo_yo6rVR1ZR7xpvsQvlH48AyMBVLRupd4G-bRjzm_Q,5584
-stoobly_agent/app/cli/scaffold_cli.py,sha256=PmFDxe0pACL7hdyf7bPlol3xxGkOS4VES92HTAnga6Y,32622
+stoobly_agent/app/cli/scaffold_cli.py,sha256=v4b8jCopSbCUv8rpPqqeC-NeziqD8mWbiF3nOZWQ77Y,32598
 stoobly_agent/app/cli/scenario_cli.py,sha256=3J1EiJOvunkfWrEkOsanw-XrKkOk78ij_GjBlE9p7CE,8229
 stoobly_agent/app/cli/snapshot_cli.py,sha256=1Dw5JgDlmG6vctrawIRO7CdB73vAQk_wRBnPG2lVOrQ,11929
 stoobly_agent/app/cli/trace_cli.py,sha256=K7E-vx3JUcqEDSWOdIOi_AieKNQz7dBfmRrVvKDkzFI,4605
@@ -215,6 +216,7 @@ stoobly_agent/app/cli/types/request.py,sha256=QthojE5sfx7OvKu-vVNnSUfGk8n4pLzuBQ
 stoobly_agent/app/cli/types/scenario.py,sha256=28WxmOlbm2Bsek1uu7yc4hJGz-d5oHbYAro7LlFWRoc,81
 stoobly_agent/app/cli/types/snapshot_migration.py,sha256=4_Re46FKjsflcTOO3qhNsbWWmdEU67SFsF-XE_FKG3M,1859
 stoobly_agent/app/cli/types/test.py,sha256=1c458B7DFBWsEk5Q1CrZ2CUi84YzEzcs-W4qTcudwAk,714
+stoobly_agent/app/cli/types/workflow_run_command.py,sha256=SQ5PGpoqIEQ7w9xeSQE1FBqelnVfsdlRXXaODDW4yPY,326
 stoobly_agent/app/cli/validators/scaffold.py,sha256=Y2XQrN2RFMcBh228q6inTwZGoN0K5FmXO8JfrgKVwJA,1669
 stoobly_agent/app/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/models/adapters/__init__.py,sha256=cEEE--Bvrvk6DAsHx_uPgFhLnZJETP4zSBtWjMqyIKc,233
@@ -751,8 +753,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.9.9.dist-info/LICENSE,sha256=o93sj12cdoEOsTCjPaPFsw3Xq0SXs3pPcY-9reE2sEw,548
-stoobly_agent-1.9.9.dist-info/METADATA,sha256=P2fxdK2aPocPzJHjKZKqyFF4xz9zhyeERR-EylS6FLA,3087
-stoobly_agent-1.9.9.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-stoobly_agent-1.9.9.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
-stoobly_agent-1.9.9.dist-info/RECORD,,
+stoobly_agent-1.9.11.dist-info/LICENSE,sha256=o93sj12cdoEOsTCjPaPFsw3Xq0SXs3pPcY-9reE2sEw,548
+stoobly_agent-1.9.11.dist-info/METADATA,sha256=BhaA2CQUDiNOSEBokPAeKi22VSZyNFl6A8Aqx5oPGUg,3088
+stoobly_agent-1.9.11.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+stoobly_agent-1.9.11.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
+stoobly_agent-1.9.11.dist-info/RECORD,,