stoobly-agent 1.0.8__tar.gz → 1.0.9__tar.gz

{stoobly_agent-1.0.8 → stoobly_agent-1.0.9}/PKG-INFO

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

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

{stoobly_agent-1.0.8 → stoobly_agent-1.0.9}/stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.0.8'
+VERSION = '1.0.9'

{stoobly_agent-1.0.8 → stoobly_agent-1.0.9}/stoobly_agent/app/cli/scaffold/templates/app/.Makefile

@@ -8,7 +8,7 @@
 
 # Constants
 DIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
-WORKFLOW_NAME := exec
+EXEC_WORKFLOW_NAME := exec
 
 CONTEXT_DIR_DEFAULT := $(realpath $(DIR)/../..)
 
@@ -27,7 +27,7 @@ docker_compose_command=docker compose
 source_env=set -a; [ -f .env ] && source .env; set +a
 
 docker_compose_file_path=$(app_data_dir)/docker/stoobly-ui/exec/.docker-compose.exec.yml
-stoobly_exec_args=--profile $(WORKFLOW_NAME) -p $(WORKFLOW_NAME) up --build --remove-orphans
+stoobly_exec_args=--profile $(EXEC_WORKFLOW_NAME) -p $(EXEC_WORKFLOW_NAME) up --build --remove-orphans
 stoobly_exec_env=export CONTEXT_DIR=$(context_dir) && export USER_ID=$$UID && export CA_CERTS_DIR="$(ca_certs_dir)"
 stoobly_exec=$(stoobly_exec_env) && $(source_env) && $(docker_compose_command) -f "$(docker_compose_file_path)" $(stoobly_exec_args)
 

stoobly_agent-1.0.9/stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/docker-compose.yml

@@ -0,0 +1,14 @@
+# Define networks and services here
+#
+# If a container service needs access to a Stoobly defined service, 
+# then the container service needs to add the service name to the 'networks' property
+# e.g. If we have defined a 'upstream' service, then the following should be added
+# networks:
+#   - upstream
+# 
+# Container services that are intended to be run as part of a workflow need to have the workflow name added to the 'profiles' property
+# e.g. If we want to run a service as part of the 'mock' workflow, then the following should be added
+# profiles:
+#   - mock
+networks: {}
+services: {}

stoobly_agent-1.0.9/stoobly_agent/app/cli/scaffold/templates/app/entrypoint/record/docker-compose.yml

@@ -0,0 +1,14 @@
+# Define networks and services here
+#
+# If a container service needs access to a Stoobly defined service, 
+# then the container service needs to add the service name to the 'networks' property
+# e.g. If we have defined a 'upstream' service, then the following should be added
+# networks:
+#   - upstream
+# 
+# Container services that are intended to be run as part of a workflow need to have the workflow name added to the 'profiles' property
+# e.g. If we want to run a service as part of the 'record' workflow, then the following should be added
+# profiles:
+#   - record
+networks: {}
+services: {}

stoobly_agent-1.0.9/stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/docker-compose.yml

@@ -0,0 +1,14 @@
+# Define networks and services here
+#
+# If a container service needs access to a Stoobly defined service, 
+# then the container service needs to add the service name to the 'networks' property
+# e.g. If we have defined a 'upstream' service, then the following should be added
+# networks:
+#   - upstream
+# 
+# Container services that are intended to be run as part of a workflow need to have the workflow name added to the 'profiles' property
+# e.g. If we want to run a service as part of the 'test' workflow, then the following should be added
+# profiles:
+#   - test
+networks: {}
+services: {}

{stoobly_agent-1.0.8 → stoobly_agent-1.0.9}/stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/bin/.run

@@ -3,6 +3,8 @@
 extra_options=$EXEC_OPTIONS
 workflow=$1
 
+mkdir -p .stoobly/tmp
+
 stoobly-agent scaffold workflow run \
   --app-dir-path "$(pwd)" \
   --dry-run \

{stoobly_agent-1.0.8 → stoobly_agent-1.0.9}/stoobly_agent/app/cli/scaffold/workflow_run_command.py

@@ -1,6 +1,8 @@
 import os
 import pdb
 
+from typing import TypedDict
+
 from stoobly_agent.config.data_dir import DataDir
 from stoobly_agent.lib.logger import Logger
 
@@ -11,6 +13,10 @@ from .workflow_command import WorkflowCommand
 
 LOG_ID = 'WorkflowRunCommand'
 
+class UpOptions(TypedDict):
+  attached: bool
+  namespace: str
+
 class WorkflowRunCommand(WorkflowCommand):
   def __init__(self, app: App, **kwargs):
     super().__init__(app, **kwargs)
@@ -63,7 +69,7 @@ class WorkflowRunCommand(WorkflowCommand):
   def create_network(self):
     return f"docker network create {self.network} 2> /dev/null"
 
-  def up(self):
+  def up(self, **options: UpOptions):
     if not os.path.exists(self.compose_path):
       return ''
 
@@ -94,8 +100,15 @@ class WorkflowRunCommand(WorkflowCommand):
       command.append(f"-f {os.path.relpath(self.extra_compose_path, self.__current_working_dir)}")
 
     command.append(f"--profile {self.workflow_name}") 
+
+    if options.get('namespace'):
+      command.append(f"-p {options['namespace']}")
+
     command.append('up')
-    command.append('-d')
+
+    if not options.get('attached'):
+      command.append('-d')
+
     command.append('--build')
 
     self.write_env()

{stoobly_agent-1.0.8 → stoobly_agent-1.0.9}/stoobly_agent/app/cli/scaffold_cli.py

@@ -316,13 +316,15 @@ def logs(**kwargs):
 @click.option('--ca-certs-dir-path', default=DataDir.instance().mitmproxy_conf_dir_path, help='Path to ca certs directory used to sign SSL certs. Defaults to ~/.mitmproxy')
 @click.option('--certs-dir-path', help='Path to certs directory. Defaults to the certs dir of the context.')
 @click.option('--context-dir-path', default=DataDir.instance().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('--filter', multiple=True, type=click.Choice([WORKFLOW_CUSTOM_FILTER]), help='Select which service groups to run. Defaults to all.')
 @click.option('--dry-run', default=False, is_flag=True, help='If set, prints commands.')
 @click.option('--extra-compose-path', help='Path to extra compose configuration files.')
 @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('--network', help='Name of network namespace.')
+@click.option('--namespace', help='Workflow namespace.')
+@click.option('--network', help='Workflow network namespace.')
 @click.option('--service', multiple=True, help='Select which services to run. Defaults to all.')
 @click.argument('workflow_name')
 def run(**kwargs):
@@ -372,10 +374,13 @@ def run(**kwargs):
       print(create_network_command)
 
   commands = sorted(commands, key=lambda command: command.service_config.priority)
-  for command in commands:
+  for index, command in enumerate(commands):
     __print_header(f"SERVICE {command.service_name}")
 
-    exec_command = command.up()
+    # By default, the entrypoint service should be last
+    # However, this can change if the user has configured a service's priority to be higher
+    attached = not kwargs['detached'] and index == len(commands) - 1
+    exec_command = command.up(attached=attached, namespace=kwargs['namespace'])
     if not exec_command:
       continue
 

{stoobly_agent-1.0.8 → stoobly_agent-1.0.9}/stoobly_agent/config/data_dir.py

@@ -226,6 +226,7 @@ class DataDir:
             with open(os.path.join(self.__data_dir_path, '.gitignore'), 'w') as fp:
                 fp.write(
                     "\n".join([
+                        'certs',
                         'db',
                         'settings.yml',
                         os.path.join('snapshots', 'log'),

stoobly_agent-1.0.8/stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/docker-compose.yml

@@ -1 +0,0 @@
-# Define services here

stoobly_agent-1.0.8/stoobly_agent/app/cli/scaffold/templates/app/entrypoint/record/docker-compose.yml

@@ -1 +0,0 @@
-# Define services here

stoobly_agent-1.0.8/stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/docker-compose.yml

@@ -1 +0,0 @@
-# Define services here