stoobly-agent 1.9.10__tar.gz → 1.9.12__tar.gz

{stoobly_agent-1.9.10 → stoobly_agent-1.9.12}/PKG-INFO

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

{stoobly_agent-1.9.10 → stoobly_agent-1.9.12}/pyproject.toml

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

{stoobly_agent-1.9.10 → stoobly_agent-1.9.12}/stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.9.10'
+VERSION = '1.9.12'

{stoobly_agent-1.9.10 → stoobly_agent-1.9.12}/stoobly_agent/app/cli/helpers/shell.py

@@ -1,11 +1,9 @@
 import subprocess
 import sys
 
-from dotenv import load_dotenv
+DOTENV_PATH = 'STOOBLY_DOTENV_PATH'
 
 def exec_stream(command):
-  load_dotenv()
-
   # Start the process
   process = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
   

{stoobly_agent-1.9.10 → stoobly_agent-1.9.12}/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-1.9.10 → stoobly_agent-1.9.12}/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-1.9.10 → stoobly_agent-1.9.12}/stoobly_agent/app/cli/scaffold/app_config.py

@@ -1,16 +1,25 @@
 from .config import Config
-from .constants import APP_NAME_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.__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
@@ -36,6 +45,9 @@ class AppConfig(Config):
   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
 

{stoobly_agent-1.9.10 → stoobly_agent-1.9.12}/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,9 +19,16 @@ class AppCreateCommand(AppCommand):
         if kwargs.get('app_name'):
             self.app_config.name = kwargs['app_name']
 
+        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 docker_socket_path(self):
+        return self.app_config.docker_socket_path
+
     @property
     def app_name(self):
         return self.app_config.name

{stoobly_agent-1.9.10 → stoobly_agent-1.9.12}/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-1.9.10 → stoobly_agent-1.9.12}/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,7 +17,8 @@ COMPOSE_TEMPLATE = '.docker-compose.{workflow}.yml'
 CONFIG_FILE = '.config.yml'
 CONTEXT_DIR_ENV = 'CONTEXT_DIR'
 DOCKER_NAMESPACE = 'docker'
-ENV_FILE = '.env'
+DOTENV_FILE = '.env'
+DOTENV_PATH_ENV = 'STOOBLY_DOTENV_PATH'
 NAMESERVERS_FILE = '.nameservers'
 PUBLIC_FOLDER_NAME = 'public'
 SERVICE_DETACHED = '${SERVICE_DETACHED}'

{stoobly_agent-1.9.10 → stoobly_agent-1.9.12}/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-1.9.10 → stoobly_agent-1.9.12}/stoobly_agent/app/cli/scaffold/env.py

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

{stoobly_agent-1.9.10 → stoobly_agent-1.9.12}/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-1.9.10 → stoobly_agent-1.9.12}/stoobly_agent/app/cli/scaffold/service_config.py

@@ -56,7 +56,7 @@ class ServiceConfig(Config):
 
   @property
   def id(self):
-    return hashlib.md5(self.dir.encode()).hexdigest()
+    return hashlib.md5(self.url.encode()).hexdigest()
 
   @property
   def hostname(self):
@@ -107,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):

{stoobly_agent-1.9.10 → stoobly_agent-1.9.12}/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-1.9.10 → stoobly_agent-1.9.12}/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,6 +38,7 @@ 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
@@ -48,24 +49,23 @@ workflow_down_options=$(working_dir_options) --user-id $(USER_ID) $(workflow_dow
 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-1.9.10 → stoobly_agent-1.9.12}/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-1.9.10 → stoobly_agent-1.9.12}/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-1.9.12/stoobly_agent/app/cli/scaffold/workflow_env.py

@@ -0,0 +1,27 @@
+import os
+
+from dotenv import dotenv_values
+
+from .config import Config
+from .constants import DOTENV_FILE
+from .env import Env
+
+class WorkflowEnv(Config):
+
+  def __init__(self, dir: str):
+    super().__init__(dir, DOTENV_FILE)
+
+    self.__env_vars = {}
+
+  def get(self, key):
+    return self.__env_vars.get(key)
+
+  def load(self):
+    self.__env_vars = self.read()
+
+  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-1.9.12/stoobly_agent/app/cli/scaffold/workflow_namesapce.py

@@ -0,0 +1,47 @@
+import os
+import shutil
+
+from .app import App
+from .constants import DOTENV_PATH_ENV, 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 copy_dotenv(self):
+    dotenv_path = os.environ.get(DOTENV_PATH_ENV) or '.env'
+
+    if os.path.isfile(dotenv_path):
+      shutil.copy(dotenv_path, self.dotenv_path)
+
+  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-1.9.10 → stoobly_agent-1.9.12}/stoobly_agent/app/cli/scaffold/workflow_run_command.py

@@ -1,22 +1,23 @@
 import dns.resolver
-import hashlib
 import os
 import pdb
 import subprocess
 import re
 
+
 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'
@@ -30,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('namespace') or self.workflow_name}.{kwargs.get('network') or app.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):
@@ -60,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
@@ -72,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):
@@ -272,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-1.9.10 → stoobly_agent-1.9.12}/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,6 +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('--docker-socket-path', default='/var/run/docker.sock', type=click.Path(exists=True, file_okay=True, dir_okay=False), 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)
@@ -337,7 +339,7 @@ def copy(**kwargs):
 @click.option('--service', multiple=True, help='Select which services to log. Defaults to all.')
 @click.option('--user-id', default=os.getuid(), help='OS user ID of the owner of context dir path.')
 @click.argument('workflow_name')
-def down(**kwargs):  
+def down(**kwargs):
   os.environ[env_vars.LOG_LEVEL] = kwargs['log_level']
 
   containerized = kwargs['containerized']
@@ -347,6 +349,7 @@ def down(**kwargs):
   __validate_app(app)
 
   __with_namespace_defaults(kwargs)
+  __with_workflow_namespace(app, kwargs['namespace'])
 
   services = __get_services(
     app, service=kwargs['service'], workflow=[kwargs['workflow_name']]
@@ -360,7 +363,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):
@@ -449,7 +452,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):
@@ -501,6 +504,7 @@ def up(**kwargs):
   __validate_app(app)
 
   __with_namespace_defaults(kwargs)
+  workflow_namespace = __with_workflow_namespace(app, kwargs['namespace'])
 
   services = __get_services(
     app, service=kwargs['service'], workflow=[kwargs['workflow_name']]
@@ -512,9 +516,7 @@ 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']
-  )
+  configure_gateway(workflow_namespace, workflow.service_paths_from_services(services), kwargs['no_publish'])
 
   commands: List[WorkflowRunCommand] = []
   for service in services:
@@ -524,7 +526,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:
@@ -677,11 +679,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):
@@ -836,3 +838,8 @@ def __workflow_create(app, **kwargs):
     template=kwargs['template'],
     workflow_decorators=workflow_decorators
   )
+
+def __with_workflow_namespace(app: App, namespace: str):
+  workflow_namespace = WorkflowNamespace(app, namespace)
+  workflow_namespace.copy_dotenv()
+  return workflow_namespace