stoobly-agent 1.9.5__py3-none-any.whl → 1.9.7__py3-none-any.whl

stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.9.5'
+VERSION = '1.9.7'

stoobly_agent/app/cli/ca_cert_cli.py

@@ -15,8 +15,18 @@ def ca_cert(ctx):
     pass
 
 @ca_cert.command()
-@click.option('--ca-certs-dir-path', default=DataDir.instance().ca_certs_dir_path, help='Path to ca certs directory used to sign SSL certs.')
-@click.option('--certs-dir-path', default=DataDir.instance().certs_dir_path, help='Output directory.')
+@click.option(
+    '--ca-certs-dir-path', 
+    default=DataDir.instance().ca_certs_dir_path, 
+    help='Path to ca certs directory used to sign SSL certs.',
+    type=click.Path(exists=True, file_okay=False, dir_okay=True)
+)
+@click.option(
+    '--certs-dir-path',
+    default=DataDir.instance().certs_dir_path,
+    help='Output directory.',
+    type=click.Path(exists=True, file_okay=False, dir_okay=True)
+)
 @click.argument('hostname')
 def mkcert(**kwargs):
     ca_certs_dir_path = kwargs['ca_certs_dir_path']
@@ -30,7 +40,12 @@ def mkcert(**kwargs):
         sys.exit(1)
 
 @ca_cert.command()
-@click.option('--ca-certs-dir-path', default=DataDir.instance().ca_certs_dir_path, help='Path to ca certs directory.')
+@click.option(
+    '--ca-certs-dir-path',
+    default=DataDir.instance().ca_certs_dir_path,
+    help='Path to ca certs directory.',
+    type=click.Path(exists=True, file_okay=False, dir_okay=True)
+)
 def install(**kwargs):
     ca_certs_dir_path = kwargs['ca_certs_dir_path']
     installer = CertificateAuthority(ca_certs_dir_path)

stoobly_agent/app/cli/scaffold/constants.py

@@ -61,4 +61,5 @@ WORKFLOW_TEMPLATE = '${WORKFLOW_TEMPLATE}'
 WORKFLOW_TEMPLATE_ENV = 'WORKFLOW_TEMPLATE'
 WORKFLOW_TEST_TYPE = 'test'
 
+CORE_WORKFLOWS = [WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE, WORKFLOW_TEST_TYPE]
 WORKFLOW_TEMPLATE_OPTION = Literal[WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE, WORKFLOW_TEST_TYPE]

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

@@ -10,7 +10,7 @@ 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
 
-def configure_gateway(workflow_name, service_paths: List[str], no_publish = False):
+def configure_gateway(namespace: str, service_paths: List[str], no_publish = False):
   if len(service_paths) == 0:
     return
 
@@ -36,7 +36,7 @@ def configure_gateway(workflow_name, service_paths: List[str], no_publish = Fals
         gateway_base['ports'] = ports
 
       app_dir_path = os.path.dirname(os.path.dirname(service_dir_path))
-      __with_traefik_config(workflow_name, service_paths, app_dir_path, gateway_base)
+      __with_traefik_config(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(workflow_name: str, service_paths: List[str], app_dir_path: str, compose: dict):
+def __with_traefik_config(namespace: str, service_paths: List[str], app_dir_path: str, compose: dict):
   config_dest = '/etc/traefik/traefik.yml'
 
   if not compose['volumes']:
@@ -98,7 +98,7 @@ def __with_traefik_config(workflow_name: str, service_paths: List[str], app_dir_
       })
 
   # Create traefik.yml in .stoobly/tmp
-  traefik_template_relative_path = os.path.join(DATA_DIR_NAME, TMP_DIR_NAME, workflow_name, 'traefik.yml')
+  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)
 
   if not os.path.exists(os.path.dirname(traefik_template_dest_path)):

stoobly_agent/app/cli/scaffold/service.py

@@ -20,5 +20,11 @@ class Service():
   def service_name(self):
     return self.__service_name
 
+  @property
+  def workflows(self):
+    # Each directory in the service directory path is a workflow
+    workflows = [ f.name for f in os.scandir(self.dir_path) if f.is_dir() ]
+    return workflows
+
   def workflow_dir_path(self, workflow_name: str):
     return os.path.join(self.dir_path, workflow_name)

stoobly_agent/app/cli/scaffold/service_command.py

@@ -18,6 +18,10 @@ class ServiceCommand(AppCommand):
   def service_config(self):
     return self.__config
 
+  @service_config.setter
+  def service_config(self, value):
+    self.__config = value
+
   @property
   def service_config_path(self):
     return self.__config.path
@@ -26,6 +30,10 @@ class ServiceCommand(AppCommand):
   def service_name(self):
     return self.__service_name
 
+  @service_name.setter
+  def service_name(self, value):
+    self.__service_name = value
+
   @property
   def service_exists(self):
     return os.path.exists(self.service_path)

stoobly_agent/app/cli/scaffold/service_update_command.py

@@ -0,0 +1,70 @@
+import os
+import pdb
+
+from stoobly_agent.app.cli.scaffold.app import App
+from stoobly_agent.app.cli.scaffold.constants import CORE_WORKFLOWS
+from stoobly_agent.app.cli.scaffold.docker.workflow.decorators_factory import get_workflow_decorators
+from stoobly_agent.app.cli.scaffold.service import Service
+from stoobly_agent.app.cli.scaffold.service_command import ServiceCommand
+from stoobly_agent.app.cli.scaffold.service_create_command import ServiceCreateCommand
+from stoobly_agent.app.cli.scaffold.service_config import ServiceConfig
+from stoobly_agent.app.cli.scaffold.workflow_config import WorkflowConfig
+from stoobly_agent.app.cli.scaffold.workflow_create_command import WorkflowCreateCommand
+
+from stoobly_agent.lib.logger import Logger
+
+
+LOG_ID = 'ServiceUpdateCommand'
+
+class ServiceUpdateCommand(ServiceCommand):
+
+  def __init__(self, app: App, **kwargs):
+    super().__init__(app, **kwargs)
+
+  def rename(self, new_service_name: str) -> Service:
+    self.__rename_service_dir(self.service_path, new_service_name)
+
+    self.service = Service(new_service_name, self.app)
+    self.service_config = ServiceConfig(self.service.dir_path)
+
+    self.__update_internal_container_specs(new_service_name)
+
+    return self.service
+
+  def __rename_service_dir(self, dir_path: str, new_name: str) -> None:
+    new_dir_path = os.path.join(self.app.scaffold_namespace_path, new_name)
+    os.rename(dir_path, new_dir_path)
+
+  def __update_internal_container_specs(self, new_service_name: str) -> None:
+    workflows = self.service.workflows
+
+    kwargs = {}
+    kwargs['app_dir_path'] = self.app.dir_path
+    kwargs['service_name'] = new_service_name
+    kwargs['workflow'] = workflows
+    command = ServiceCreateCommand(self.app, **kwargs)
+    command.build()
+
+    custom_workflows_set = set(workflows) - set(CORE_WORKFLOWS)
+    custom_workflows = list(custom_workflows_set)
+
+    for workflow in custom_workflows:
+      kwargs = {}
+      kwargs['app_dir_path'] = self.app.dir_path
+      kwargs['force'] = True
+      kwargs['service_name'] = new_service_name
+      kwargs['workflow_name'] = workflow
+
+      workflow_path = self.service.workflow_dir_path(workflow)
+      workflow_config = WorkflowConfig(workflow_path, **kwargs)
+      kwargs['template'] = workflow_config.template
+
+      command = WorkflowCreateCommand(self.app, **kwargs)
+
+      service_config = self.service_config
+      workflow_decorators = get_workflow_decorators(kwargs['template'], service_config)
+
+      command.build(
+        template=kwargs['template'],
+        workflow_decorators=workflow_decorators
+      )

stoobly_agent/app/cli/scaffold/service_workflow_validate_command.py

@@ -116,12 +116,13 @@ 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}" 
     timeout_seconds = 1
     output = self.docker_client.containers.run(
       image='curlimages/curl:8.11.0',
       command=f"curl --max-time {timeout_seconds} {url} --verbose",
-      network=APP_EGRESS_NETWORK_TEMPLATE.format(network=self.app_config.network),
+      network=APP_EGRESS_NETWORK_TEMPLATE.format(network=network),
       stderr=True,
       remove=True,
     )

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

@@ -35,7 +35,7 @@ dockerfile_path=$(app_namespace_dir)/.Dockerfile.context
 exec_docker_compose_file_path=$(app_namespace_dir)/stoobly-ui/exec/.docker-compose.exec.yml
 exec_namespace=$(shell echo "$(workflow_namespace).$(context_dir)" | (md5 2>/dev/null || md5sum 2>/dev/null || shasum 2>/dev/null) | awk '{print $$1}')
 workflow_namespace=$(if $(namespace),$(namespace),$(workflow))
-workflow_script=.stoobly/tmp/$(workflow)/run.sh
+workflow_script=.stoobly/tmp/$(workflow_namespace)/run.sh
 
 # Options
 certs_dir_options=--ca-certs-dir-path $(ca_certs_dir) --certs-dir-path $(certs_dir)
@@ -52,8 +52,8 @@ docker_command=docker
 docker_compose_command=$(docker_command) compose
 exec_down=$(docker_compose_command) -f "$(exec_docker_compose_file_path)" $(stoobly_exec_options) down
 exec_env=APP_DIR="$(app_dir)" CA_CERTS_DIR="$(ca_certs_dir)" USER_ID="$(USER_ID)"
-exec_up=$(docker_compose_command) -f "$(exec_docker_compose_file_path)" $(stoobly_exec_options) up --remove-orphans
-source_env=set -a; [ -f .env ] && source .env; set +a
+exec_up=$(docker_compose_command) -f "$(exec_docker_compose_file_path)" $(stoobly_exec_options) up --abort-on-container-exit --remove-orphans
+source_env=(set -a; [ -f .env ] && source .env; set +a)
 
 # Build base image
 stoobly_exec_build=$(docker_command) build $(stoobly_exec_build_args) $(app_namespace_dir)

stoobly_agent/app/cli/scaffold/workflow_copy_command.py

@@ -3,11 +3,10 @@ import pdb
 import shutil
 
 from .app import App
-from .constants import COMPOSE_TEMPLATE, WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE, WORKFLOW_TEST_TYPE
+from .constants import COMPOSE_TEMPLATE
 from .service_workflow import ServiceWorkflow
 from .workflow_command import WorkflowCommand
 
-CORE_WORKFLOWS = [WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE, WORKFLOW_TEST_TYPE]
 
 class WorkflowCopyCommand(WorkflowCommand):
 

stoobly_agent/app/cli/scaffold/workflow_create_command.py

@@ -5,7 +5,7 @@ import shutil
 from typing import List, TypedDict, Union
 
 from .app import App
-from .constants import WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE, WORKFLOW_TEST_TYPE, WORKFLOW_TEMPLATE_OPTION
+from .constants import WORKFLOW_TEMPLATE_OPTION
 from .docker.service.builder import ServiceBuilder
 from .docker.workflow.mock_decorator import MockDecorator
 from .docker.workflow.reverse_proxy_decorator import ReverseProxyDecorator
@@ -13,7 +13,6 @@ from .docker.workflow.builder import WorkflowBuilder
 from .templates.factory import custom_files, maintained_files
 from .workflow_command import WorkflowCommand
 
-CORE_WORKFLOWS = [WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE, WORKFLOW_TEST_TYPE]
 
 class BuildOptions(TypedDict):
   builder_class: type 

stoobly_agent/app/cli/scaffold/workflow_run_command.py

@@ -48,8 +48,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 = kwargs.get('network') or self.app_config.network
-
+    self.__network = f"{kwargs.get('network') or {self.workflow_name}}.{self.app_config.network}"
+    
   @property
   def app_dir_path(self):
     return self.__app_dir_path

stoobly_agent/app/cli/scaffold_cli.py

@@ -1,7 +1,6 @@
 import click
 import os
 import pdb
-import re
 import sys
 
 from io import TextIOWrapper
@@ -23,6 +22,7 @@ from stoobly_agent.app.cli.scaffold.service import Service
 from stoobly_agent.app.cli.scaffold.service_config import ServiceConfig
 from stoobly_agent.app.cli.scaffold.service_create_command import ServiceCreateCommand
 from stoobly_agent.app.cli.scaffold.service_delete_command import ServiceDeleteCommand
+from stoobly_agent.app.cli.scaffold.service_update_command import ServiceUpdateCommand
 from stoobly_agent.app.cli.scaffold.service_workflow_validate_command import ServiceWorkflowValidateCommand
 from stoobly_agent.app.cli.scaffold.templates.constants import CORE_SERVICES
 from stoobly_agent.app.cli.scaffold.validate_exceptions import ScaffoldValidateException
@@ -37,6 +37,7 @@ from stoobly_agent.config.data_dir import DataDir
 from stoobly_agent.lib.logger import bcolors, DEBUG, ERROR, INFO, Logger, WARNING
 
 from .helpers.print_service import FORMATS, print_services, select_print_options
+from .validators.scaffold import validate_app_name, validate_hostname, validate_namespace, validate_service_name
 
 LOG_ID = 'Scaffold'
 
@@ -90,7 +91,7 @@ def hostname(ctx):
 @click.option('--network', help='App default network name. Defaults to app name.')
 @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')
+@click.argument('app_name', callback=validate_app_name)
 def create(**kwargs):
   __validate_app_dir(kwargs['app_dir_path'])
 
@@ -129,7 +130,7 @@ def mkcert(**kwargs):
 @click.option('--app-dir-path', default=current_working_dir, help='Path to application directory.')
 @click.option('--detached', is_flag=True, help='Use isolated and non-persistent context directory.')
 @click.option('--env', multiple=True, help='Specify an environment variable.')
-@click.option('--hostname', help='Service hostname.')
+@click.option('--hostname', callback=validate_hostname, help='Service hostname.')
 @click.option('--port', type=click.IntRange(1, 65535), help='Service port.')
 @click.option('--priority', default=5, type=click.FloatRange(1.0, 9.0), help='Determines the service run order. Lower values run first.')
 @click.option('--proxy-mode', help='''
@@ -141,17 +142,10 @@ def mkcert(**kwargs):
 @click.option('--quiet', is_flag=True, help='Disable log output.')
 @click.option('--scheme', type=click.Choice(['http', 'https']), help='Defaults to https if hostname is set.')
 @click.option('--workflow', multiple=True, type=click.Choice([WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE, WORKFLOW_TEST_TYPE]), help='Include pre-defined workflows.')
-@click.argument('service_name')
+@click.argument('service_name', callback=validate_service_name)
 def create(**kwargs):
   __validate_app_dir(kwargs['app_dir_path'])
 
-  if '/' in kwargs['service_name']:
-    print(f"Error: {kwargs['service_name']} is invalid. It cannot container '/", file=sys.stderr)
-    sys.exit(1)
-
-  if kwargs.get('hostname'):
-    __validate_hostname(kwargs.get('hostname'))
-
   if kwargs.get("proxy_mode"):
     __validate_proxy_mode(kwargs.get("proxy_mode"))
 
@@ -214,11 +208,11 @@ def delete(**kwargs):
   help="Update a service config"
 )
 @click.option('--app-dir-path', default=current_working_dir, help='Path to application directory.')
-@click.option('--hostname', help='Service hostname.')
+@click.option('--hostname', callback=validate_hostname, help='Service hostname.')
 @click.option('--port', type=click.IntRange(1, 65535), help='Service port.')
 @click.option('--priority', default=5, type=click.FloatRange(1.0, 9.0), help='Determines the service run order. Lower values run first.')
 @click.option('--scheme', type=click.Choice(['http', 'https']), help='Defaults to https if hostname is set.')
-@click.option('--name', type=click.STRING, help='New name of the service to update to.')
+@click.option('--name', callback=validate_service_name, type=click.STRING, help='New name of the service to update to.')
 @click.option('--proxy-mode', help='''
   Proxy mode can be "regular", "transparent", "socks5",
   "reverse:SPEC", or "upstream:SPEC". For reverse and
@@ -237,8 +231,6 @@ def update(**kwargs):
   service_config = ServiceConfig(service.dir_path)
 
   if kwargs['hostname']:
-    __validate_hostname(kwargs['hostname'])
-
     old_hostname = service_config.hostname
 
     if old_hostname != kwargs['hostname']:
@@ -261,6 +253,19 @@ def update(**kwargs):
   if kwargs['scheme']:
     service_config.scheme = kwargs['scheme']
 
+  if kwargs['name']:
+    old_service_name = service.service_name
+    new_service_name = kwargs['name']
+
+    print(f"Renaming service from: {old_service_name}, to: {new_service_name}")
+
+    kwargs['service_path'] = service.dir_path
+    command = ServiceUpdateCommand(app, **kwargs)
+    service = command.rename(new_service_name)
+    service_config = command.service_config
+
+    print(f"Successfully renamed service to: {new_service_name}")
+
   if kwargs['proxy_mode']:
     __validate_proxy_mode(kwargs['proxy_mode'])
     service_config.proxy_mode = kwargs['proxy_mode']
@@ -329,7 +334,7 @@ def copy(**kwargs):
 @click.option('--log-level', default=INFO, type=click.Choice([DEBUG, INFO, WARNING, ERROR]), help='''
     Log levels can be "debug", "info", "warning", or "error"
 ''')
-@click.option('--namespace', help='Workflow namespace.')
+@click.option('--namespace', callback=validate_namespace, help='Workflow namespace.')
 @click.option('--network', help='Workflow network name.')
 @click.option('--rmi', is_flag=True, help='Remove images used by containers.')
 @click.option('--script-path', help='Path to intermediate script path.')
@@ -342,9 +347,7 @@ def down(**kwargs):
   app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE, **kwargs)
   __validate_app(app)
 
-  # If namespace is set, default network to namespace
-  if kwargs['namespace'] and not kwargs['network']:
-    kwargs['network'] = kwargs['namespace']
+  __with_namespace_defaults(kwargs)
 
   services = __get_services(
     app, service=kwargs['service'], workflow=[kwargs['workflow_name']]
@@ -412,7 +415,7 @@ def down(**kwargs):
 @click.option('--log-level', default=INFO, type=click.Choice([DEBUG, INFO, WARNING, ERROR]), help='''
     Log levels can be "debug", "info", "warning", or "error"
 ''')
-@click.option('--namespace', help='Workflow namespace.')
+@click.option('--namespace', callback=validate_namespace, help='Workflow namespace.')
 @click.option('--script-path', help='Path to intermediate script path.')
 @click.option('--service', multiple=True, help='Select which services to log. Defaults to all.')
 @click.argument('workflow_name')
@@ -422,6 +425,8 @@ def logs(**kwargs):
   app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
   __validate_app(app)
 
+  __with_namespace_defaults(kwargs)
+
   if len(kwargs['container']) == 0:
     kwargs['container'] = [WORKFLOW_CONTAINER_PROXY]
 
@@ -474,7 +479,7 @@ def logs(**kwargs):
     Log levels can be "debug", "info", "warning", or "error"
 ''')
 @click.option('--mkcert', is_flag=True, help='Set to generate SSL certs for HTTPS services.')
-@click.option('--namespace', help='Workflow namespace.')
+@click.option('--namespace', callback=validate_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.')
@@ -496,9 +501,7 @@ def up(**kwargs):
   app = App(app_dir_path, DOCKER_NAMESPACE, **kwargs)
   __validate_app(app)
 
-  # If namespace is set, default network to namespace
-  if kwargs['namespace'] and not kwargs['network']:
-    kwargs['network'] = kwargs['namespace']
+  __with_namespace_defaults(kwargs)
 
   services = __get_services(
     app, service=kwargs['service'], workflow=[kwargs['workflow_name']]
@@ -677,7 +680,7 @@ def __build_script(**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['workflow_name'], script_file_name)
+    script_path = os.path.join(data_dir.tmp_dir_path, kwargs.get('namespace') or kwargs['workflow_name'] or '', script_file_name)
   
   script_dir = os.path.dirname(script_path)
   if not os.path.exists(script_dir):
@@ -818,11 +821,13 @@ def __validate_proxy_mode(proxy_mode: str) -> None:
 
   # TODO: validate SPEC
 
-def __validate_hostname(hostname: str) -> None:
-  hostname_regex = re.compile(r'^[a-zA-Z0-9.-]+$')
-  if not re.search(hostname_regex, hostname):
-    print(f"Error: {hostname} is invalid.", file=sys.stderr)
-    sys.exit(1)
+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)
@@ -833,4 +838,4 @@ def __workflow_create(app, **kwargs):
   command.build(
     template=kwargs['template'],
     workflow_decorators=workflow_decorators
-  )
+  )

stoobly_agent/app/cli/validators/scaffold.py

@@ -0,0 +1,39 @@
+import re
+import sys
+
+from stoobly_agent.app.cli.scaffold.templates.constants import CORE_SERVICES
+
+def validate_app_name(ctx, param, app_name: str) -> str:
+  app_name_regex = re.compile(r'^[a-zA-Z0-9._-]+$')
+  if not re.search(app_name_regex, app_name):
+    print(f"Error: app name {app_name} is invalid.", file=sys.stderr)
+    sys.exit(1)
+  return app_name
+
+def validate_hostname(ctx, param, hostname: str) -> str:
+  if not hostname:
+    return
+  hostname_regex = re.compile(r'^[a-zA-Z0-9.-]+$')
+  if not re.search(hostname_regex, hostname):
+    print(f"Error: hostname {hostname} is invalid.", file=sys.stderr)
+    sys.exit(1)
+  return hostname
+
+def validate_namespace(ctx, param, namespace: str) -> str:
+  if not namespace:
+    return
+  namespace_regex = re.compile(r'^[a-z0-9_-]+$')
+  if not re.search(namespace_regex, namespace) or namespace[0] in ['-', '_']:
+    print(f"Error: namespace {namespace} is invalid.", file=sys.stderr)
+    sys.exit(1)
+  return namespace
+
+def validate_service_name(ctx, param, service_name: str) -> str:
+  if service_name in CORE_SERVICES:
+    print(f"Error: {service_name} is a core service", file=sys.stderr)
+    sys.exit(1)
+  service_name_regex = re.compile(r'^[a-zA-Z0-9._-]+$')
+  if not re.search(service_name_regex, service_name):
+    print(f"Error: service name {service_name} is invalid.", file=sys.stderr)
+    sys.exit(1)
+  return service_name

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

@@ -1 +1 @@
-1.9.4
+1.9.6

{stoobly_agent-1.9.5.dist-info → stoobly_agent-1.9.7.dist-info}/METADATA

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

{stoobly_agent-1.9.5.dist-info → stoobly_agent-1.9.7.dist-info}/RECORD

@@ -1,4 +1,4 @@
-stoobly_agent/__init__.py,sha256=IIieB06ghDX3rkbVoznhopSYzZNIgt8A-_fJzdVS7i4,44
+stoobly_agent/__init__.py,sha256=Hl61BiQl9f9AF1FOpbPAtXQt4rJsqBc_U216ZisxBQU,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
@@ -17,7 +17,7 @@ stoobly_agent/app/api/scenarios_controller.py,sha256=zJViyme9l36mlJDQONRu4N-A0kd
 stoobly_agent/app/api/simple_http_request_handler.py,sha256=ZdJ4kKEcPDpck74dJu--M7zw76wQzpo_AQArZwN9Bes,4466
 stoobly_agent/app/api/statuses_controller.py,sha256=gQsl28h-3mZ_bByEHpc4mRy3KFvUz5PeAgVB0cPx_Ao,1791
 stoobly_agent/app/cli/__init__.py,sha256=uS4KJgMAhm0JVnEUC-ONW-Bq6A8I9v7Fk-_Ka7gXlrU,470
-stoobly_agent/app/cli/ca_cert_cli.py,sha256=qwuNXRJTi4hLHObv8uVKd2XeSsS3A_T-OjztjVctrkI,1387
+stoobly_agent/app/cli/ca_cert_cli.py,sha256=KVIUmmZcMHW2UXZJTmXqTVk2lEbp0YbxB6C4EL5t2Q4,1629
 stoobly_agent/app/cli/config_cli.py,sha256=Ljr2Ir8P0dhGXALQQcq7fwthrcipPlvxS2G_0bNE6fY,15727
 stoobly_agent/app/cli/decorators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/cli/decorators/config.py,sha256=AWrDGZm_gjCWFYlRwdla3iE6H7OSlM4FxkaXRNovBZA,2428
@@ -73,7 +73,7 @@ stoobly_agent/app/cli/scaffold/app_config.py,sha256=UGVJ7DVmXh-o_gYBlAAEjngNIUZP
 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/config.py,sha256=HZU5tkvr3dkPr4JMXZtrJlu2wxxO-134Em6jReFFcq0,688
-stoobly_agent/app/cli/scaffold/constants.py,sha256=dpCGvKzNtGQyaZfghfy0F6bJsZNp1KPACX3Z3rd13sw,2416
+stoobly_agent/app/cli/scaffold/constants.py,sha256=e0aKyB80i1heJCubAvxt8DlzykAvYH37xeAcl9UTTgI,2496
 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
@@ -82,7 +82,7 @@ stoobly_agent/app/cli/scaffold/docker/constants.py,sha256=1khQdgTaQ89ykGRNdTQh_e
 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=jtx8lhvKHl0ubSHaQpE8m9lCYnOJ6Qju-SBJPBs0l7I,3921
+stoobly_agent/app/cli/scaffold/docker/service/configure_gateway.py,sha256=8GQ2wUBwb45uSxhzkEMloezJT1hVu8v_3PudWLTU9ig,3910
 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
@@ -94,17 +94,18 @@ stoobly_agent/app/cli/scaffold/docker/workflow/reverse_proxy_decorator.py,sha256
 stoobly_agent/app/cli/scaffold/env.py,sha256=e-Ve4p3RUgzFx22B3SIYttvJ_yLuDtA27oDACZ8n-6E,1140
 stoobly_agent/app/cli/scaffold/hosts_file_manager.py,sha256=zNX5wh6zXQ4J2BA0YYdD7_CPqDz02b_ghXsY3oTjjB4,4999
 stoobly_agent/app/cli/scaffold/managed_services_docker_compose.py,sha256=-wLBXUi7DCWsfm5KzZzd_kdJKOTl1NT924XR7dyjbSY,574
-stoobly_agent/app/cli/scaffold/service.py,sha256=L9K6QE0k5KSEC8_fSwtdwwTSO_DsIpqSPW-AG7Bg76o,501
-stoobly_agent/app/cli/scaffold/service_command.py,sha256=9kIKiFC5Jo425VWYD4NDvUOdMP-pNyq2D5Ip1ZAPj3A,1054
+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_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=xONRUtfC3IBd-Kr4wdUKWgx9ppSsbu2H72pb2VinizQ,11412
+stoobly_agent/app/cli/scaffold/service_workflow_validate_command.py,sha256=veigidzR4EwGi8dc0v_l4Ik7cZikDBnLcvwcHNc1Wzg,11457
 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=zifPWDDZ9RPz0p872Kl00pnmFY3jMHulp84tYXhfSwg,9240
+stoobly_agent/app/cli/scaffold/templates/app/.Makefile,sha256=4CTrKRHho9fl7NOGrQM0lJTfn-X09ddQKBq9Zsbjbww,9278
 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
@@ -197,13 +198,13 @@ stoobly_agent/app/cli/scaffold/validate_exceptions.py,sha256=Jtjl4OkbbSRWm0hy7Kf
 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_config.py,sha256=ghnbcnCyb6ECdylUJCAJ6A8ulzaFY9bu7RvRuYeiRkk,901
-stoobly_agent/app/cli/scaffold/workflow_copy_command.py,sha256=R9hh5dWVz7vGld7pENAA_a9gW56EkgG2K35nBQYXwyI,1462
-stoobly_agent/app/cli/scaffold/workflow_create_command.py,sha256=R3L1obUTidGngbIaRlVjt_Rjkw9qOPze_p5plHc8JHs,3532
+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_log_command.py,sha256=Bke4lMOMxuDUFuAx9nlXHbKgYMO4KAg9ASHvjz4aVWc,1372
-stoobly_agent/app/cli/scaffold/workflow_run_command.py,sha256=eF3aaK4OIZXYuSBEAeBnhAL7EZrS1G4mSYrJbEiXt2o,11082
+stoobly_agent/app/cli/scaffold/workflow_run_command.py,sha256=AZhLd1N260RjXEiUSRppqfhQMwVyRnn0jpapRu4FwyM,11114
 stoobly_agent/app/cli/scaffold/workflow_validate_command.py,sha256=Uo_yo6rVR1ZR7xpvsQvlH48AyMBVLRupd4G-bRjzm_Q,5584
-stoobly_agent/app/cli/scaffold_cli.py,sha256=NXlLuqAwv9p0dflksswAtgJPTfojvJDDHIdJ71-BCSE,31965
+stoobly_agent/app/cli/scaffold_cli.py,sha256=3V4F_Bd8th6p_nu6u82qzncVBdqNd5cRJZaj7tyIdxA,32492
 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
@@ -214,6 +215,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/validators/scaffold.py,sha256=ERmdjcryf8YmTHNTHyptKjomATpZo-17bPAPb_ps8ao,1388
 stoobly_agent/app/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/models/adapters/__init__.py,sha256=cEEE--Bvrvk6DAsHx_uPgFhLnZJETP4zSBtWjMqyIKc,233
 stoobly_agent/app/models/adapters/joined_request_adapter.py,sha256=fSq16n3AAlxi8KJdBESHp3JGio_M9uzMnHbnQU8VI3w,3598
@@ -708,7 +710,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=MvlkhO5KUUDkZHqygfa1PgGkfddFw7TZAu1qTt_cq-g,5
+stoobly_agent/test/app/models/schemas/.stoobly/db/VERSION,sha256=0vY2lU8oU9tB_UhSABsgfVlYkLE7wf6JMFZoxaKHBS0,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
@@ -749,8 +751,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.5.dist-info/LICENSE,sha256=o93sj12cdoEOsTCjPaPFsw3Xq0SXs3pPcY-9reE2sEw,548
-stoobly_agent-1.9.5.dist-info/METADATA,sha256=Ar6dgljQ63YgEG_psjAkNEVUpGuRpudvTxCY4fAebgQ,3087
-stoobly_agent-1.9.5.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-stoobly_agent-1.9.5.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
-stoobly_agent-1.9.5.dist-info/RECORD,,
+stoobly_agent-1.9.7.dist-info/LICENSE,sha256=o93sj12cdoEOsTCjPaPFsw3Xq0SXs3pPcY-9reE2sEw,548
+stoobly_agent-1.9.7.dist-info/METADATA,sha256=cd9Awg6zQx8UUifbVQnobldsJhRQOXPJWEljsP1I7_0,3087
+stoobly_agent-1.9.7.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+stoobly_agent-1.9.7.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
+stoobly_agent-1.9.7.dist-info/RECORD,,