stoobly-agent 1.0.8__py3-none-any.whl → 1.0.9__py3-none-any.whl

stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.0.8'
+VERSION = '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/app/cli/scaffold/templates/app/entrypoint/mock/docker-compose.yml

@@ -1 +1,14 @@
-# Define services here
+# 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/app/cli/scaffold/templates/app/entrypoint/record/docker-compose.yml

@@ -1 +1,14 @@
-# Define services here
+# 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/app/cli/scaffold/templates/app/entrypoint/test/docker-compose.yml

@@ -1 +1,14 @@
-# Define services here
+# 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/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/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/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/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.dist-info → stoobly_agent-1.0.9.dist-info}/METADATA

@@ -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.dist-info → stoobly_agent-1.0.9.dist-info}/RECORD

@@ -1,4 +1,4 @@
-stoobly_agent/__init__.py,sha256=YRJ2IyOFYfNMitHnDEgevFuLZ3X0HHY8moxXjMFFabk,44
+stoobly_agent/__init__.py,sha256=r0VYJeYLDBgc5UvCAjDPGJ_KS3dTEnx7N7dyr9LmgzI,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=jf4fkqjOiCeI2IM5Ro7ie0v_C6y0-7-5TIE_IKMPOfg,5513
@@ -101,7 +101,7 @@ stoobly_agent/app/cli/scaffold/service_workflow_validate_command.py,sha256=zvqKm
 stoobly_agent/app/cli/scaffold/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/cli/scaffold/templates/app/.Dockerfile.context,sha256=1Zm5_ROKZzFMAkMt8dluEJASI2CBi9d9If_Gch9FMNM,193
 stoobly_agent/app/cli/scaffold/templates/app/.Dockerfile.proxy,sha256=JfZOVALEmRE_hVEMIHTmem9Ln32qnfKOAUO1c5Z9fqw,1027
-stoobly_agent/app/cli/scaffold/templates/app/.Makefile,sha256=JOtlDYzba0phpQdsKcWPbJCS9ZWgoqixq7wwzKTVzj0,4161
+stoobly_agent/app/cli/scaffold/templates/app/.Makefile,sha256=zfa8uZFGZEJV0cnSLvbQ1kctrLu5zuO7Kdpj6yK-yuU,4176
 stoobly_agent/app/cli/scaffold/templates/app/.docker-compose.base.yml,sha256=LNNuygX6hMtmElxaO6jTIYq3psYmxNv7xax7ra6JzO4,407
 stoobly_agent/app/cli/scaffold/templates/app/Makefile,sha256=t7xRaCc9q3k7W34S0h9KX02GljSVwGpPnFmiLUvWxsw,80
 stoobly_agent/app/cli/scaffold/templates/app/build/.config.yml,sha256=8Wt8ZZ5irvBYYS44xGrR_EWlZDuXH9kyWmquzsh7s8g,19
@@ -128,19 +128,19 @@ stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/bin/.configure,sha2
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/bin/.init,sha256=5xJbfpwGOmRj5lwK5e0JNlVpNd3WFUkZ0GaCUK40aDk,97
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/bin/configure,sha256=Nme7aSLA-IH1NXgmqRMPzOlKcUSRXqZd-kcuZa47IEk,11
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/bin/init,sha256=O7czui9GFHbcoEC5I9MwkRyZvDGY42IwlyQwIWcgylY,12
-stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/docker-compose.yml,sha256=S-e2LOIwkifAtc-66n8cvvd6dpLtIsHGX1H0W4Nc1Oo,22
+stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/docker-compose.yml,sha256=Zh8h8yUqVXZMi_Y4aUPE48qw2DU-ONO4-rrSTh4E_Ts,591
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/record/.docker-compose.record.yml,sha256=g_tkKEPhwUyg5QbXNBT_bo3CFw9qdhaQyWirMJDS9tc,688
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/record/bin/.configure,sha256=Jp7ozDgj0x9D8PYS8CMhGNs4VfwJhVwBqzss8ygbLJU,258
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/record/bin/.init,sha256=5xJbfpwGOmRj5lwK5e0JNlVpNd3WFUkZ0GaCUK40aDk,97
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/record/bin/configure,sha256=Nme7aSLA-IH1NXgmqRMPzOlKcUSRXqZd-kcuZa47IEk,11
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/record/bin/init,sha256=O7czui9GFHbcoEC5I9MwkRyZvDGY42IwlyQwIWcgylY,12
-stoobly_agent/app/cli/scaffold/templates/app/entrypoint/record/docker-compose.yml,sha256=S-e2LOIwkifAtc-66n8cvvd6dpLtIsHGX1H0W4Nc1Oo,22
+stoobly_agent/app/cli/scaffold/templates/app/entrypoint/record/docker-compose.yml,sha256=5n4bZBHI9MtwBF55ugu1RTdwMy7T6SsYGQ_3sulFUj8,595
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/.docker-compose.test.yml,sha256=ifPMJHPbAf6hI4vS1BWuzPOOt5SCaxHFnWA5BVnM9RY,685
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/bin/.configure,sha256=I4MhiSVbBaQWy056opYfPqnWPZmS5rKBW_Y26nDGMeY,256
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/bin/.init,sha256=5xJbfpwGOmRj5lwK5e0JNlVpNd3WFUkZ0GaCUK40aDk,97
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/bin/configure,sha256=Nme7aSLA-IH1NXgmqRMPzOlKcUSRXqZd-kcuZa47IEk,11
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/bin/init,sha256=O7czui9GFHbcoEC5I9MwkRyZvDGY42IwlyQwIWcgylY,12
-stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/docker-compose.yml,sha256=S-e2LOIwkifAtc-66n8cvvd6dpLtIsHGX1H0W4Nc1Oo,22
+stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/docker-compose.yml,sha256=E4gGJwHfnZoFo9-0vM17-Qg5LPjx7vIPpcz2K7eiZg0,591
 stoobly_agent/app/cli/scaffold/templates/app/gateway/.config.yml,sha256=XnLQZMzzMMIwVycjyPN5QXsmRztkTFAna1kIHYuDfJQ,19
 stoobly_agent/app/cli/scaffold/templates/app/gateway/.docker-compose.base.yml,sha256=L70ReUdGnfCDBxz9urdZoBskyAQ5fZ56KEzqzh6XRbk,257
 stoobly_agent/app/cli/scaffold/templates/app/gateway/mock/.docker-compose.mock.yml,sha256=LiMgBvOozkBH34-72kQXLylmrnERwjQfs8aws6BlZHM,232
@@ -154,7 +154,7 @@ stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/bin/.disable,sha256
 stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/bin/.enable,sha256=sfUSPG4uHdXX95BLgivXQYLbsLBP2DjJIiSTXRtvXuY,188
 stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/bin/.mkcert,sha256=vyHaXmvy-7oL2RD8rIxwT-fdJS5kXmB0yHK5fRMo_cM,46
 stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/bin/.reset,sha256=_pvbLk-ektsCHEh_egDtd6c0sVqCPunwUWggarfoli0,238
-stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/bin/.run,sha256=AporhoTO76u9lexoPJ9XnFsjRnhpPRZdv1g2ri3-V50,210
+stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/bin/.run,sha256=X_fs8iPIjNOD_2XMRIlA4mWtMDLwvp1lxJuPU4cBQYk,233
 stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/bin/.snapshot,sha256=Kav1QNhKG7f0DBzc4-9dmxZMmmVTxmPqakT_W4kVYKk,241
 stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/bin/.stop,sha256=n9k-qnQXfG5J_71FxkteLg962ErT1wTs1juEDtbmUgM,209
 stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/mock/.docker-compose.mock.yml,sha256=Ba-jNMZUcq62kK_hLpaN7dkEwz3_ZS91aJOOJ8U3Ark,257
@@ -187,9 +187,9 @@ stoobly_agent/app/cli/scaffold/workflow_command.py,sha256=V4Wfv9bgh5MlWAaW_68uud
 stoobly_agent/app/cli/scaffold/workflow_copy_command.py,sha256=R9hh5dWVz7vGld7pENAA_a9gW56EkgG2K35nBQYXwyI,1462
 stoobly_agent/app/cli/scaffold/workflow_create_command.py,sha256=5xnRYrVb2KlSDARZFjLGGWeURXRu63OHoRLEhO-EAvw,3401
 stoobly_agent/app/cli/scaffold/workflow_log_command.py,sha256=FN-XyMVnulbassBuqeB21J_PQnOsr_LNs0Dg2tcDkjg,435
-stoobly_agent/app/cli/scaffold/workflow_run_command.py,sha256=DxbcJ-Z7lFobwW9YUp82d2gyRqUk5RzMRmOoMYdX6Eg,4222
+stoobly_agent/app/cli/scaffold/workflow_run_command.py,sha256=WmEA0TZtEajKhbaauBLqTuH3--ODXtQ5-A33VqaEWoI,4463
 stoobly_agent/app/cli/scaffold/workflow_validate_command.py,sha256=fhHciJXg_u32Wmh8us8LhgQj8D1SxkBADtuBBF4K0FM,4377
-stoobly_agent/app/cli/scaffold_cli.py,sha256=JjmChiUiZ1j_QoJKlvoZ3Hl9YibswRYjjYMhuXHmujU,18053
+stoobly_agent/app/cli/scaffold_cli.py,sha256=sB12SJIGDpz-_HuMjWMnA-psfggR2DyMsIw8E-ZQWpg,18513
 stoobly_agent/app/cli/scenario_cli.py,sha256=3J1EiJOvunkfWrEkOsanw-XrKkOk78ij_GjBlE9p7CE,8229
 stoobly_agent/app/cli/snapshot_cli.py,sha256=XNxpTm5z3bnBGNGI3_XZIif0ypN62WqYfDmShL5fXg4,9965
 stoobly_agent/app/cli/trace_cli.py,sha256=K7E-vx3JUcqEDSWOdIOi_AieKNQz7dBfmRrVvKDkzFI,4605
@@ -416,7 +416,7 @@ stoobly_agent/config/constants/statuses.py,sha256=dR88qHHnDR_5ppuKijwc0R24D_fWc6
 stoobly_agent/config/constants/test_filter.py,sha256=rQ-eMZ8kpq49pqS1PQhaRx59dlRicd-Ag4sjgoXfpY8,109
 stoobly_agent/config/constants/test_output_level.py,sha256=yrn8cs-lexrK0Ckpc_SX3NhsZPfVhNpmjzjSP62LCro,135
 stoobly_agent/config/constants/test_strategy.py,sha256=d6-WgKqElB3q_csP-QYFkhR4XvlPGfGdCJ-SBEDEoL4,152
-stoobly_agent/config/data_dir.py,sha256=W-J3DPB3ImP6Vir279hC5knw-744vfgjMkKNxG6ZpIY,7712
+stoobly_agent/config/data_dir.py,sha256=xlNP9b9of0zPSjfDRL_YcmdZ6JJ7DMgqwlXe3dTagqI,7745
 stoobly_agent/config/mitmproxy.py,sha256=z9L1JSWwQFsn4gMZk8Dcz5mOcUc6dYnW1ZugrYTEttw,1902
 stoobly_agent/config/schema.yml,sha256=b4I8utMrUrMSr86UbXgYYxt2-TJynQA9oQtOQ7CM-PE,1963
 stoobly_agent/config/settings.yml.sample,sha256=muxP1bWrtknVaSgdseFaw23tuwduILNdQTVy7aB519M,404
@@ -720,8 +720,8 @@ stoobly_agent/test/mock_data/scaffold/docker-compose-local-service.yml,sha256=x7
 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.0.8.dist-info/LICENSE,sha256=8QKGyy45eN76Zk52h8gu1DKX2B_gbWgZ3nzDLofEbaE,548
-stoobly_agent-1.0.8.dist-info/METADATA,sha256=w_KU9407lw_67FBJdjJGDJ1gnyDrJYPfU-g1OOVFI38,3425
-stoobly_agent-1.0.8.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-stoobly_agent-1.0.8.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
-stoobly_agent-1.0.8.dist-info/RECORD,,
+stoobly_agent-1.0.9.dist-info/LICENSE,sha256=8QKGyy45eN76Zk52h8gu1DKX2B_gbWgZ3nzDLofEbaE,548
+stoobly_agent-1.0.9.dist-info/METADATA,sha256=UfKvxrEkLC-N9EWc4jXE4NIpWWurBq8hqznXxJRNjWI,3425
+stoobly_agent-1.0.9.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+stoobly_agent-1.0.9.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
+stoobly_agent-1.0.9.dist-info/RECORD,,