stoobly-agent 1.9.5__tar.gz → 1.9.6__tar.gz

{stoobly_agent-1.9.5 → stoobly_agent-1.9.6}/PKG-INFO

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

{stoobly_agent-1.9.5 → stoobly_agent-1.9.6}/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.5"
+version = "1.9.6"
 
 [tool.poetry.dependencies]
 python = "^3.10"

{stoobly_agent-1.9.5 → stoobly_agent-1.9.6}/stoobly_agent/__init__.py

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

{stoobly_agent-1.9.5 → stoobly_agent-1.9.6}/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-1.9.5 → stoobly_agent-1.9.6}/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-1.9.5 → stoobly_agent-1.9.6}/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
@@ -37,6 +36,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 +90,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 +129,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,7 +141,7 @@ 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'])
 
@@ -149,9 +149,6 @@ def create(**kwargs):
     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,7 +211,7 @@ 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.')
@@ -237,8 +234,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']:
@@ -329,7 +324,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.')
@@ -412,7 +407,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')
@@ -474,7 +469,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.')
@@ -677,7 +672,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,12 +813,6 @@ 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 __workflow_create(app, **kwargs):
   command = WorkflowCreateCommand(app, **kwargs)
 

stoobly_agent-1.9.6/stoobly_agent/app/cli/validators/scaffold.py

@@ -0,0 +1,34 @@
+import re
+import sys
+
+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:
+  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-1.9.6/stoobly_agent/test/app/models/schemas/.stoobly/db/VERSION

@@ -0,0 +1 @@
+1.9.6

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

@@ -1 +0,0 @@
-1.9.4