stoobly-agent 1.5.5__tar.gz → 1.5.6__tar.gz

{stoobly_agent-1.5.5 → stoobly_agent-1.5.6}/PKG-INFO

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

{stoobly_agent-1.5.5 → stoobly_agent-1.5.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.5.5"
+version = "1.5.6"
 
 [tool.poetry.dependencies]
 python = "^3.10"

{stoobly_agent-1.5.5 → stoobly_agent-1.5.6}/stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.5.5'
+VERSION = '1.5.6'

stoobly_agent-1.5.6/stoobly_agent/app/cli/scaffold/containerized_app.py

@@ -0,0 +1,5 @@
+from .app import App
+
+class ContainerizedApp(App):
+  def __init__(self, path: str, scaffold_namespace: str, **kwargs):
+    super().__init__(path, scaffold_namespace, **kwargs)

{stoobly_agent-1.5.5 → stoobly_agent-1.5.6}/stoobly_agent/app/cli/scaffold/templates/app/.Makefile

@@ -23,15 +23,15 @@ workflow_service_options=$(shell echo $$STOOBLY_WORKFLOW_SERVICE_OPTIONS)
 
 user_id_option=--user-id $(USER_ID)
 stoobly_exec_options=--profile $(EXEC_WORKFLOW_NAME) -p $(EXEC_WORKFLOW_NAME)
-workflow_down_options=--from-make $(user_id_option)
-workflow_up_options=--app-dir-path $(app_dir) --context-dir-path $(context_dir) --ca-certs-dir-path $(ca_certs_dir) --certs-dir-path $(certs_dir) --from-make $(user_id_option)
+workflow_run_options=--script-path $(workflow_script) $(workflow_service_options)
+workflow_up_options=--app-dir-path $(app_dir) --context-dir-path $(context_dir) --ca-certs-dir-path $(ca_certs_dir) --certs-dir-path $(certs_dir) $(user_id_option)
 
 app_data_dir=$(app_dir)/.stoobly
 app_namespace_dir=$(app_data_dir)/docker
 app_tmp_dir=$(app_data_dir)/tmp
 dockerfile_path=$(app_namespace_dir)/.Dockerfile.context
 docker_compose_file_path=$(app_namespace_dir)/stoobly-ui/exec/.docker-compose.exec.yml
-workflow_run_script=$(app_data_dir)/tmp/run.sh
+workflow_script=.stoobly/tmp/$(WORKFLOW).sh
 
 # Commands
 docker_command=docker
@@ -55,7 +55,7 @@ stoobly_exec_run=$(stoobly_exec_build) && $(stoobly_exec_run_env) $(exec_up)
 stoobly_exec_run_env=$(source_env) && $(exec_env) CONTEXT_DIR="$(app_dir)"
 
 # Workflow run
-workflow_run=$(source_env) && bash "$(workflow_run_script)"
+workflow_run=$(source_env) && bash "$(app_dir)/$(workflow_script)"
 
 ca-cert/install: stoobly/install
 	@if [ -z "$$(ls $(ca_certs_dir) 2> /dev/null)" ]; then \
@@ -153,7 +153,7 @@ tmpdir:
 	@mkdir -p $(app_tmp_dir)
 workflow/down:
 	@export EXEC_COMMAND=bin/.down && \
-	export EXEC_OPTIONS="$(workflow_down_options) $(workflow_service_options) $(options)" && \
+	export EXEC_OPTIONS="$(user_id_option) $(workflow_run_options) $(options)" && \
 	export EXEC_ARGS="$(WORKFLOW)" && \
 	$(stoobly_exec_run) && \
 	$(workflow_run)
@@ -173,7 +173,7 @@ workflow/hostname/install: command/install workflow/hostname
 workflow/hostname/uninstall: command/uninstall workflow/hostname  
 workflow/logs:
 	@export EXEC_COMMAND=bin/.logs && \
-	export EXEC_OPTIONS="$(workflow_service_options) $(options)" && \
+	export EXEC_OPTIONS="$(workflow_run_options) $(options)" && \
 	export EXEC_ARGS="$(WORKFLOW)" && \
 	$(stoobly_exec_run) && \
 	$(workflow_run)
@@ -190,7 +190,7 @@ workflow/test:
 	$(eval WORKFLOW=test)
 workflow/up:
 	@export EXEC_COMMAND=bin/.up && \
-	export EXEC_OPTIONS="$(workflow_up_options) $(workflow_service_options) $(options)" && \
+	export EXEC_OPTIONS="$(user_id_option) $(workflow_up_options) $(workflow_run_options) $(options)" && \
 	export EXEC_ARGS="$(WORKFLOW)" && \
 	$(stoobly_exec_run) && \
 	$(workflow_run)

{stoobly_agent-1.5.5/stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test → stoobly_agent-1.5.6/stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock}/bin/.configure

@@ -1,9 +1,9 @@
 #!/bin/bash
 
-echo "Configuring intercept mode"
+echo "Configuring intercept..."
 stoobly-agent intercept configure --mode mock --policy all
 
-echo "Enabling intercept"
+echo "Enabling intercept..."
 stoobly-agent intercept enable
 
 entrypoint=$(dirname -- "$0")/configure

{stoobly_agent-1.5.5 → stoobly_agent-1.5.6}/stoobly_agent/app/cli/scaffold/templates/app/entrypoint/record/bin/.configure

@@ -1,9 +1,9 @@
 #!/bin/bash
 
-echo "Configuring intercept mode"
+echo "Configuring intercept..."
 stoobly-agent intercept configure --mode record --policy all
 
-echo "Disabling intercept"
+echo "Disabling intercept..."
 stoobly-agent intercept disable
 
 entrypoint=$(dirname -- "$0")/configure

{stoobly_agent-1.5.5/stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock → stoobly_agent-1.5.6/stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test}/bin/.configure

@@ -1,9 +1,9 @@
 #!/bin/bash
 
-echo "Configuring intercept mode"
+echo "Configuring intercept..."
 stoobly-agent intercept configure --mode mock --policy all
 
-echo "Enabling intercept"
+echo "Enabling intercept..."
 stoobly-agent intercept enable
 
 entrypoint=$(dirname -- "$0")/configure

{stoobly_agent-1.5.5 → stoobly_agent-1.5.6}/stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/bin/.down

@@ -1,13 +1,12 @@
 #!/bin/bash
 
 extra_options=$EXEC_OPTIONS
-workflow=$1
 
 mkdir -p .stoobly/tmp
 
 stoobly-agent scaffold workflow down \
   --app-dir-path "$(pwd)" \
+  --containerized \
   --dry-run \
   --log-level error \
-  $extra_options \
-  $workflow > .stoobly/tmp/run.sh
+  $extra_options $1 > /dev/null

{stoobly_agent-1.5.5 → stoobly_agent-1.5.6}/stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/bin/.logs

@@ -1,11 +1,9 @@
 #!/bin/bash
 
 extra_options=$EXEC_OPTIONS
-workflow=$1
 
 stoobly-agent scaffold workflow logs \
   --app-dir-path "$(pwd)" \
   --dry-run \
   --log-level warning \
-  $extra_options \
-  $workflow > .stoobly/tmp/run.sh
+  $extra_options $1 > /dev/null

{stoobly_agent-1.5.5 → stoobly_agent-1.5.6}/stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/bin/.up

@@ -1,15 +1,12 @@
 #!/bin/bash
 
 extra_options=$EXEC_OPTIONS
-workflow=$1
-
-mkdir -p .stoobly/tmp
-
-stoobly-agent scaffold app mkcert
 
 stoobly-agent scaffold workflow up \
   --app-dir-path "$(pwd)" \
+  --containerized \
   --dry-run \
   --log-level warning \
-  $extra_options \
-  $workflow > .stoobly/tmp/run.sh
+  --mkcert \
+  --without-base \
+  $extra_options $1 > /dev/null

{stoobly_agent-1.5.5 → stoobly_agent-1.5.6}/stoobly_agent/app/cli/scaffold/templates/workflow/record/bin/configure

@@ -13,7 +13,7 @@ if [ "$scheme" = 'http' -a "$port" != '80' ] || [ "$scheme" = 'https' -a "$port"
 fi
 
 # Firewall
-echo "Configuring firewall rules"
+echo "Configuring firewall rules..."
 stoobly-agent config firewall set \
   --action include \
   --method GET --method POST --method OPTIONS --method PUT --method DELETE \
@@ -21,7 +21,7 @@ stoobly-agent config firewall set \
   --pattern "$url/.*?"
 
 # Rewrite
-echo "Configuring rewrite rules"
+echo "Configuring rewrite rules..."
 stoobly-agent config rewrite set \
   --method GET --method POST --method OPTIONS --method PUT --method DELETE \
   --mode record \

{stoobly_agent-1.5.5 → stoobly_agent-1.5.6}/stoobly_agent/app/cli/scaffold_cli.py

@@ -1,9 +1,9 @@
 import click
-import errno
 import os
 import pdb
 import sys
 
+from io import TextIOWrapper
 from typing import List
 
 from stoobly_agent.app.cli.helpers.certificate_authority import CertificateAuthority
@@ -13,6 +13,7 @@ from stoobly_agent.app.cli.scaffold.app_create_command import AppCreateCommand
 from stoobly_agent.app.cli.scaffold.constants import (
   DOCKER_NAMESPACE, WORKFLOW_CONTAINER_PROXY, WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE, WORKFLOW_TEST_TYPE
 )
+from stoobly_agent.app.cli.scaffold.containerized_app import ContainerizedApp
 from stoobly_agent.app.cli.scaffold.docker.service.set_gateway_ports import set_gateway_ports
 from stoobly_agent.app.cli.scaffold.docker.workflow.decorators_factory import get_workflow_decorators
 from stoobly_agent.app.cli.scaffold.hosts_file_manager import HostsFileManager
@@ -117,24 +118,7 @@ def mkcert(**kwargs):
     app, service=kwargs['service'], without_core=True, workflow=kwargs['workflow']
   )
 
-  for service_name in services:
-    service = Service(service_name, app)
-    __validate_service_dir(service.dir_path)
-
-    service_config = ServiceConfig(service.dir_path)
-
-    if service_config.scheme != 'https':
-      continue
-
-    hostname = service_config.hostname
-    
-    if not hostname:
-      continue
-
-    ca = CertificateAuthority(app.ca_certs_dir_path)
-    if not ca.signed(hostname, app.certs_dir_path):
-      Logger.instance(LOG_ID).info(f"Creating cert for {hostname}")
-      ca.sign(hostname, app.certs_dir_path)
+  __services_mkcert(app, services)
 
 @service.command(
   help="Scaffold a service",
@@ -290,15 +274,16 @@ def copy(**kwargs):
 @workflow.command()
 @click.option('--app-dir-path', default=current_working_dir, help='Path to application directory.')
 @click.option('--context-dir-path', default=data_dir.context_dir_path, help='Path to Stoobly data directory.')
+@click.option('--containerized', is_flag=True, help='Set if run from within a container.')
 @click.option('--dry-run', default=False, is_flag=True)
 @click.option('--extra-entrypoint-compose-path', help='Path to extra entrypoint compose file.')
-@click.option('--from-make', is_flag=True, help='Set if run from scaffolded Makefile.')
 @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('--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.')
 @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')
@@ -324,6 +309,8 @@ def down(**kwargs):
     command.current_working_dir = current_working_dir
     commands.append(command)
 
+  script = __build_script(**kwargs)
+
   commands = sorted(commands, key=lambda command: command.service_config.priority)
   for index, command in enumerate(commands):
     __print_header(f"SERVICE {command.service_name}")
@@ -343,11 +330,8 @@ def down(**kwargs):
     )
     if not exec_command:
       continue
-
-    if not kwargs['dry_run']:
-      exec_stream(exec_command)
-    else:
-      print(exec_command)
+    
+    print(exec_command, file=script)
 
   # After services are stopped, their network needs to be removed
   if len(commands) > 0:
@@ -355,19 +339,15 @@ def down(**kwargs):
 
     if kwargs['rmi']:
       remove_image_command = command.remove_image(kwargs['user_id'])
-      if not kwargs['dry_run']:
-        exec_stream(remove_image_command)
-      else:
-        print(remove_image_command)
+      print(remove_image_command, file=script)
 
     remove_network_command = command.remove_network()
-    if not kwargs['dry_run']:
-      exec_stream(remove_network_command)
-    else:
-      print(remove_network_command)
+    print(remove_network_command, file=script)
+
+  __run_script(script, kwargs['dry_run'])
 
   # Options are no longer valid
-  if kwargs['from_make'] and os.path.exists(data_dir.mitmproxy_options_json_path):
+  if kwargs['containerized'] and os.path.exists(data_dir.mitmproxy_options_json_path):
     os.remove(data_dir.mitmproxy_options_json_path)
 
 @workflow.command()
@@ -381,6 +361,7 @@ def down(**kwargs):
     Log levels can be "debug", "info", "warning", or "error"
 ''')
 @click.option('--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')
 def logs(**kwargs):
@@ -412,6 +393,8 @@ def logs(**kwargs):
     command = WorkflowLogCommand(app, **config)
     commands.append(command)
 
+  script = __build_script(**kwargs)
+
   commands = sorted(commands, key=lambda command: command.service_config.priority)
   for index, command in enumerate(commands):
     __print_header(f"SERVICE {command.service_name}")
@@ -422,39 +405,41 @@ def logs(**kwargs):
     )
 
     for shell_command in shell_commands:
-      print(shell_command)
+      print(shell_command, file=script)
 
-      if not kwargs['dry_run']:
-        exec_stream(shell_command)
+  __run_script(script, kwargs['dry_run'])
 
 @workflow.command()
 @click.option('--app-dir-path', default=current_working_dir, help='Path to application directory.')
 @click.option('--build', is_flag=True, help='Build images before starting containers.')
 @click.option('--ca-certs-dir-path', default=data_dir.ca_certs_dir_path, help='Path to ca certs directory used to sign SSL certs.')
 @click.option('--certs-dir-path', help='Path to certs directory. Defaults to the certs dir of the context.')
+@click.option('--containerized', is_flag=True, help='Set if run from within a container.')
 @click.option('--context-dir-path', default=data_dir.context_dir_path, help='Path to Stoobly data directory.')
 @click.option('--detached', is_flag=True, help='If set, will not run the highest priority service in the foreground.')
 @click.option('--dry-run', default=False, is_flag=True, help='If set, prints commands.')
 @click.option('--extra-entrypoint-compose-path', help='Path to extra entrypoint compose file.')
-@click.option('--from-make', is_flag=True, help='Set if run from scaffolded Makefile.')
 @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('--mkcert', is_flag=True, help='Set to generate SSL certs for HTTPS services.')
 @click.option('--namespace', help='Workflow namespace.')
 @click.option('--network', help='Workflow network name.')
 @click.option('--pull', is_flag=True, help='Pull image before running.')
+@click.option('--script-path', help='Path to intermediate script path.')
 @click.option('--service', multiple=True, help='Select which services to run. Defaults to all.')
 @click.option('--user-id', default=os.getuid(), help='OS user ID of the owner of context dir path.')
 @click.option('--verbose', is_flag=True)
+@click.option('--without-base', is_flag=True, help='Disable building Stoobly base image.')
 @click.argument('workflow_name')
 def up(**kwargs):
   os.environ[env_vars.LOG_LEVEL] = kwargs['log_level']
 
-  from_make = kwargs['from_make']
+  containerized = kwargs['containerized']
 
   # Because we are running a docker-compose command which depends on APP_DIR env var
-  # when we are running this command through make, the host's app_dir_path will likely differ
-  app_dir_path = current_working_dir if from_make else kwargs['app_dir_path']
+  # when we are running this command within a container, the host's app_dir_path will likely differ
+  app_dir_path = current_working_dir if containerized else kwargs['app_dir_path']
   app = App(app_dir_path, DOCKER_NAMESPACE, **kwargs)
   __validate_app(app)
 
@@ -466,6 +451,10 @@ def up(**kwargs):
     app, service=kwargs['service'], workflow=[kwargs['workflow_name']]
   )
 
+  if kwargs['mkcert']:
+    _app = ContainerizedApp(app_dir_path, DOCKER_NAMESPACE) if containerized else app
+    __services_mkcert(_app, services)
+
   # Gateway ports are dynamically set depending on the workflow run
   workflow = Workflow(kwargs['workflow_name'], app)
   set_gateway_ports(workflow.service_paths_from_services(services))
@@ -478,23 +467,24 @@ def up(**kwargs):
     command.current_working_dir = current_working_dir
     commands.append(command)
 
+  script = __build_script(**kwargs)
+
   # Before services can be started, their image and network needs to be created
   if len(commands) > 0:
     command: WorkflowRunCommand = commands[0]
 
     init_commands = []
-    if not from_make:
+    if not kwargs['without_base']:
       create_image_command = command.create_image(user_id=kwargs['user_id'], verbose=kwargs['verbose'])
       init_commands.append(create_image_command)
 
     init_commands.append(command.create_network())
     joined_command = ' && '.join(init_commands)
 
-    if not kwargs['dry_run']:
+    if not containerized:
       command.write_nameservers()
-      exec_stream(joined_command)
-    else:
-      print(joined_command)
+
+    print(joined_command, file=script)
 
   commands = sorted(commands, key=lambda command: command.service_config.priority)
   for index, command in enumerate(commands):
@@ -520,10 +510,9 @@ def up(**kwargs):
     if not exec_command:
       continue
 
-    if not kwargs['dry_run']:
-      exec_stream(exec_command)
-    else:
-      print(exec_command)
+    print(exec_command, file=script)
+
+  __run_script(script, kwargs['dry_run'])
 
 @workflow.command(
   help="Validate a scaffold workflow"
@@ -625,6 +614,18 @@ scaffold.add_command(service)
 scaffold.add_command(workflow)
 scaffold.add_command(hostname)
 
+def __build_script(**kwargs):
+  script_path = kwargs['script_path']
+  if not script_path:
+    script_file_name = f"{kwargs['workflow_name']}.sh"
+    script_path = os.path.join(data_dir.tmp_dir_path, script_file_name)
+
+  # Truncate
+  with open(script_path, 'w'):
+    pass
+
+  return open(script_path, 'a')
+
 def __elevate_sudo():
   import subprocess
 
@@ -667,6 +668,16 @@ def __get_services(app: App, **kwargs):
 def __print_header(text: str):
   Logger.instance(LOG_ID).info(f"{bcolors.OKBLUE}{text}{bcolors.ENDC}")
 
+def __run_script(script: TextIOWrapper, dry_run = False):
+  script.close()
+
+  with open(script.name, 'r') as fp:
+    for line in fp:
+      if not dry_run:
+        exec_stream(line.strip())
+      else:
+        print(line.strip())
+
 def __scaffold_build(app, **kwargs):
   command = ServiceCreateCommand(app, **kwargs)
 
@@ -677,6 +688,26 @@ def __scaffold_delete(app, **kwargs):
 
   command.delete()
 
+def __services_mkcert(app: App, services):
+  for service_name in services:
+    service = Service(service_name, app)
+    __validate_service_dir(service.dir_path)
+
+    service_config = ServiceConfig(service.dir_path)
+
+    if service_config.scheme != 'https':
+      continue
+
+    hostname = service_config.hostname
+    
+    if not hostname:
+      continue
+
+    ca = CertificateAuthority(app.ca_certs_dir_path)
+    if not ca.signed(hostname, app.certs_dir_path):
+      Logger.instance(LOG_ID).info(f"Creating cert for {hostname}")
+      ca.sign(hostname, app.certs_dir_path)
+
 def __validate_app(app: App):
   if not app.valid:
     print(f"Error: {app.dir_path} is not a valid scaffold app", file=sys.stderr)

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

@@ -0,0 +1 @@
+1.5.6

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

@@ -1 +0,0 @@
-1.5.5