stoobly-agent 1.1.3__py3-none-any.whl → 1.1.4__py3-none-any.whl

stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.1.3'
+VERSION = '1.1.4'

stoobly_agent/app/cli/scaffold/docker/workflow/decorators_factory.py

@@ -1,6 +1,7 @@
 from stoobly_agent.app.cli.scaffold.service_config import ServiceConfig
 
 from ...constants import WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE
+from .development_decorator import DevelopmentDecorator
 from .mock_decorator import MockDecorator
 from .reverse_proxy_decorator import ReverseProxyDecorator
 
@@ -10,6 +11,11 @@ def get_workflow_decorators(workflow: str, service_config: ServiceConfig):
   if workflow == WORKFLOW_RECORD_TYPE:
     if service_config.hostname:
       workflow_decorators.append(ReverseProxyDecorator)
+      workflow_decorators.append(DevelopmentDecorator)
+  elif workflow == WORKFLOW_MOCK_TYPE:
+     if service_config.hostname:
+      workflow_decorators.append(ReverseProxyDecorator if service_config.detached else MockDecorator)    
+      workflow_decorators.append(DevelopmentDecorator)
   else:
     if service_config.hostname:
       workflow_decorators.append(ReverseProxyDecorator if service_config.detached else MockDecorator) 

stoobly_agent/app/cli/scaffold/docker/workflow/development_decorator.py

@@ -0,0 +1,30 @@
+from ...constants import SERVICE_DNS
+
+from .builder import WorkflowBuilder
+
+class DevelopmentDecorator():
+
+  def __init__(self, workflow_builder: WorkflowBuilder):
+    self.__workflow_builder = workflow_builder
+
+  @property
+  def workflow_builder(self):
+    return self.__workflow_builder
+
+  @property
+  def service_builder(self):
+    return self.workflow_builder.service_builder
+
+  def decorate(self):
+    config = self.service_builder.config
+    proxy_name = self.workflow_builder.proxy
+    services = self.workflow_builder.services
+
+    # If we are reverse proxying to potentially an external host,
+    # Docker's embedded DNS will use the host's /etc/host file as part of the resolution process
+    # This can lead the hostname to resolve to localhost instead of the service's actual IP address
+    if not config.detached:
+      if not proxy_name in services:
+        services[proxy_name] = {}
+
+      services[proxy_name]['dns'] = SERVICE_DNS

stoobly_agent/app/cli/scaffold/docker/workflow/reverse_proxy_decorator.py

@@ -2,9 +2,7 @@ import pdb
 
 from urllib.parse import urlparse
 
-from stoobly_agent.config.data_dir import DataDir
-
-from ...constants import SERVICE_DNS, SERVICE_DNS_ENV, SERVICE_HOSTNAME, SERVICE_PORT
+from ...constants import SERVICE_HOSTNAME, SERVICE_PORT
 from .builder import WorkflowBuilder
 
 class ReverseProxyDecorator():
@@ -56,11 +54,5 @@ class ReverseProxyDecorator():
       **additional_properties,
     }
 
-    # If we are reverse proxying to potentially an external host,
-    # Docker's embedded DNS will use the host's /etc/host file as part of the resolution process
-    # This can lead the hostname to resolve to localhost instead of the service's actual IP address
-    if not config.detached:
-      service['dns'] = SERVICE_DNS
-
     services[proxy_name] = service 
 

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

@@ -28,9 +28,11 @@ 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 $(EXEC_WORKFLOW_NAME) -p $(EXEC_WORKFLOW_NAME) up --build --remove-orphans --pull always 
+stoobly_exec_args=--profile $(EXEC_WORKFLOW_NAME) -p $(EXEC_WORKFLOW_NAME) up --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_exec_build_args=--profile $(EXEC_WORKFLOW_NAME) -p $(EXEC_WORKFLOW_NAME) build --pull --quiet
+stoobly_exec_build=$(docker_compose_command) "$(docker_compose_file_path)" $(stoobly_exec_build_args)
+stoobly_exec=$(stoobly_exec_env) && $(source_env) && $(stoobly_exec_build) && $(docker_compose_command) -f "$(docker_compose_file_path)" $(stoobly_exec_args)
 
 # Because scaffold is stored in the APP_DIR, when running a scaffold command from within a container,
 # it needs access to APP_DIR rather than CONTEXT_DIR

stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/bin/.configure

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo "Configuring intercept mode"
-stoobly-agent intercept configure --mode mock --policy found
+stoobly-agent intercept configure --mode mock --policy all
 
 echo "Enabling intercept"
 stoobly-agent intercept enable

stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/bin/.configure

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo "Configuring intercept mode"
-stoobly-agent intercept configure --mode mock --policy found
+stoobly-agent intercept configure --mode mock --policy all
 
 echo "Enabling intercept"
 stoobly-agent intercept enable

stoobly_agent/app/cli/scaffold/workflow_run_command.py

@@ -22,6 +22,8 @@ LOG_ID = 'WorkflowRunCommand'
 class UpOptions(TypedDict):
   attached: bool
   namespace: str
+  no_cache: bool
+  verbose: bool
 
 class WorkflowRunCommand(WorkflowCommand):
   def __init__(self, app: App, **kwargs):
@@ -93,10 +95,12 @@ class WorkflowRunCommand(WorkflowCommand):
     if not os.path.exists(self.compose_path):
       return ''
 
+    build_command = ['docker', 'compose']
     command = ['COMPOSE_IGNORE_ORPHANS=true', 'docker', 'compose']
+    command_options = []
 
     # Add docker compose file
-    command.append(f"-f {os.path.relpath(self.compose_path, self.__current_working_dir)}")
+    command_options.append(f"-f {os.path.relpath(self.compose_path, self.__current_working_dir)}")
 
     # Add custom docker compose file
     custom_services = self.custom_services
@@ -114,16 +118,27 @@ class WorkflowRunCommand(WorkflowCommand):
         # TODO: looking into why warning does not print in docker
         Logger.instance(LOG_ID).error(f"Missing {self.workflow_name} profile in custom compose file")
 
-      command.append(f"-f {os.path.relpath(self.custom_compose_path, self.__current_working_dir)}")
+      command_options.append(f"-f {os.path.relpath(self.custom_compose_path, self.__current_working_dir)}")
 
     if self.extra_compose_path:
-      command.append(f"-f {os.path.relpath(self.extra_compose_path, self.__current_working_dir)}")
+      command_options.append(f"-f {os.path.relpath(self.extra_compose_path, self.__current_working_dir)}")
 
-    command.append(f"--profile {self.workflow_name}") 
+    command_options.append(f"--profile {self.workflow_name}") 
 
     if options.get('namespace'):
-      command.append(f"-p {options['namespace']}")
+      command_options.append(f"-p {options['namespace']}")
+
+    build_command += command_options
+    build_command.append('build')
+    build_command.append('--pull')
+
+    if not options.get('verbose'):
+      build_command.append('--quiet')
+
+    if options.get('no_cache'):
+      build_command.append('--no-cache')
 
+    command += command_options
     command.append('up')
 
     if not options.get('attached'):
@@ -141,13 +156,11 @@ class WorkflowRunCommand(WorkflowCommand):
       # Otherwise, even if a service exits with a non-zero exit code, exit code 0 is returned
       command.append(option)
 
-    command.append('--build')
-
     self.write_env()
 
-    return ' '.join(command)
+    return ' && '.join([' '.join(build_command), ' '.join(command)]) 
 
-  def down(self):
+  def down(self, **options):
     if not os.path.exists(self.compose_path):
       return ''
   
@@ -164,8 +177,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('down')
 
+    if options.get('rmi'):
+      command.append(f"--rmi local")
+
     return ' '.join(command)
 
   def write_nameservers(self):

stoobly_agent/app/cli/scaffold_cli.py

@@ -248,6 +248,8 @@ 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('--rmi', is_flag=True, help='Remove images used by containers.')
 @click.option('--service', multiple=True, help='Select which services to log. Defaults to all.')
 @click.argument('workflow_name')
 def stop(**kwargs):  
@@ -281,7 +283,7 @@ def stop(**kwargs):
   for command in commands:
     __print_header(f"SERVICE {command.service_name}")
 
-    exec_command = command.down()
+    exec_command = command.down(namespace=kwargs['namespace'], rmi=kwargs['rmi'])
     if not exec_command:
       continue
 
@@ -358,7 +360,9 @@ def logs(**kwargs):
 ''')
 @click.option('--namespace', help='Workflow namespace.')
 @click.option('--network', help='Workflow network namespace.')
+@click.option('--no-cache', is_flag=True, help='Do not use cache when building images.')
 @click.option('--service', multiple=True, help='Select which services to run. Defaults to all.')
+@click.option('--verbose', is_flag=True)
 @click.argument('workflow_name')
 def run(**kwargs):
   cwd = os.getcwd()
@@ -417,7 +421,9 @@ def run(**kwargs):
     # 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'])
+    exec_command = command.up(
+      attached=attached, namespace=kwargs['namespace'], no_cache=kwargs['no_cache'], verbose=kwargs['verbose']
+    )
     if not exec_command:
       continue
 

{stoobly_agent-1.1.3.dist-info → stoobly_agent-1.1.4.dist-info}/METADATA

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

{stoobly_agent-1.1.3.dist-info → stoobly_agent-1.1.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-stoobly_agent/__init__.py,sha256=RDVATMzONZZkAKiL7eEYtrHytxhxShWZgElMHXzqw3w,44
+stoobly_agent/__init__.py,sha256=Yo6V8wUKHZVrGSNKqSTOAnMe9-EQ8shkE9omphzkopM,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
@@ -86,9 +86,10 @@ stoobly_agent/app/cli/scaffold/docker/service/types.py,sha256=qB-yYHlu-PZDc0HYgT
 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=vbmME0cbN2EnNRlzQ2umj7Y3L7aZT-EHqEpkBFMfe8U,758
 stoobly_agent/app/cli/scaffold/docker/workflow/builder.py,sha256=bnKOqqoKEYzmJkIJwDoNz60doE-nf1GlDC9BqciUtkg,7107
-stoobly_agent/app/cli/scaffold/docker/workflow/decorators_factory.py,sha256=Mi6SEFpG2MG9pymPLbPTWBMfosi1ThRAs5DXfjBz4Iw,643
+stoobly_agent/app/cli/scaffold/docker/workflow/decorators_factory.py,sha256=oi0Hkii2W9338IeG7BG2medQxqZUbBp71Cvj-qDunII,987
+stoobly_agent/app/cli/scaffold/docker/workflow/development_decorator.py,sha256=cs00Cc2DuOYrGD8W9849PjHz6k2xyx0fSizqJlM7yR8,946
 stoobly_agent/app/cli/scaffold/docker/workflow/mock_decorator.py,sha256=D8PgYULERvWLaW1Vn3qspRTuNBoicuP2M1EZnQyvD_M,1080
-stoobly_agent/app/cli/scaffold/docker/workflow/reverse_proxy_decorator.py,sha256=d2E0ba0ga2IjIE3v1VnLmZLgKiyBB15BerCtL0FyndI,2095
+stoobly_agent/app/cli/scaffold/docker/workflow/reverse_proxy_decorator.py,sha256=C7cHNmnqgvDCZh2gor1LvNicOL02_3L2bVx_DWIH2aA,1687
 stoobly_agent/app/cli/scaffold/env.py,sha256=e-Ve4p3RUgzFx22B3SIYttvJ_yLuDtA27oDACZ8n-6E,1140
 stoobly_agent/app/cli/scaffold/hosts_file_reader.py,sha256=gYkkrOlY7QG2JNsET6DKq4djrQAH0UGJtTkF7UwYT5o,1748
 stoobly_agent/app/cli/scaffold/managed_services_docker_compose.py,sha256=-wLBXUi7DCWsfm5KzZzd_kdJKOTl1NT924XR7dyjbSY,574
@@ -103,7 +104,7 @@ stoobly_agent/app/cli/scaffold/service_workflow_validate_command.py,sha256=z7Z_v
 stoobly_agent/app/cli/scaffold/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/cli/scaffold/templates/app/.Dockerfile.context,sha256=qvZFhJxfGAYMKr2VfYye5LX264phfl4cIfkS-TJs2-w,193
 stoobly_agent/app/cli/scaffold/templates/app/.Dockerfile.proxy,sha256=HN2tv7dfJL9riJUrrtQRHZTC2QeSTf06tQ8aBhdHAaw,1027
-stoobly_agent/app/cli/scaffold/templates/app/.Makefile,sha256=PcprOXanBlsMCswcip0QDBLvaUiHD-1gSxhgUOoDfVA,5372
+stoobly_agent/app/cli/scaffold/templates/app/.Makefile,sha256=bgTrBzD5S5ulLtwJe2qS4YmFz8ev_uAM4KbPfaEDSBg,5578
 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
@@ -126,7 +127,7 @@ stoobly_agent/app/cli/scaffold/templates/app/build/test/bin/init,sha256=O7czui9G
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/.config.yml,sha256=T9VQz6OwAQpKdIoFrnfKAxuX_to0c6EhuWRLKM34Sr4,22
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/.docker-compose.base.yml,sha256=ZekJ2lHjnPPI7hV44x3_2JzJFbn2iao9ZLWCgENfTOo,341
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/.docker-compose.mock.yml,sha256=cxAJ7CrI3AeuzQs9qw3fDSHTfYTQ1Bw_0egfy_FYRJ8,684
-stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/bin/.configure,sha256=I4MhiSVbBaQWy056opYfPqnWPZmS5rKBW_Y26nDGMeY,256
+stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/bin/.configure,sha256=XuPxv-MprVjmv3S6WbJy9WsC3wizlx8TkFvNNhGyEJ8,254
 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
@@ -138,7 +139,7 @@ stoobly_agent/app/cli/scaffold/templates/app/entrypoint/record/bin/configure,sha
 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=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/.configure,sha256=XuPxv-MprVjmv3S6WbJy9WsC3wizlx8TkFvNNhGyEJ8,254
 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
@@ -192,9 +193,9 @@ stoobly_agent/app/cli/scaffold/workflow_copy_command.py,sha256=R9hh5dWVz7vGld7pE
 stoobly_agent/app/cli/scaffold/workflow_create_command.py,sha256=5xnRYrVb2KlSDARZFjLGGWeURXRu63OHoRLEhO-EAvw,3401
 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=ounJeIp1_baB5baWPyAvudI9PJZ4tuJ_BPnVdjvzkqo,7685
+stoobly_agent/app/cli/scaffold/workflow_run_command.py,sha256=ICJZXBa93GwDmMqk_dWU6ACnpPUUa4YJcpFxozRCtDc,8283
 stoobly_agent/app/cli/scaffold/workflow_validate_command.py,sha256=fhHciJXg_u32Wmh8us8LhgQj8D1SxkBADtuBBF4K0FM,4377
-stoobly_agent/app/cli/scaffold_cli.py,sha256=RaJD3EwCKYLFHWd1tSTcf_0hK4tGvTGB078LdPreDPM,19437
+stoobly_agent/app/cli/scaffold_cli.py,sha256=3u5sj_bHW8AjokFNCeoX52hbLWB8gstXJjL26FiXZIM,19819
 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
@@ -728,8 +729,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.1.3.dist-info/LICENSE,sha256=8QKGyy45eN76Zk52h8gu1DKX2B_gbWgZ3nzDLofEbaE,548
-stoobly_agent-1.1.3.dist-info/METADATA,sha256=y124kMIiYQVNrhZKo3lOwJ3wbiprV1vBqF_4wYhPEgc,3384
-stoobly_agent-1.1.3.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-stoobly_agent-1.1.3.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
-stoobly_agent-1.1.3.dist-info/RECORD,,
+stoobly_agent-1.1.4.dist-info/LICENSE,sha256=8QKGyy45eN76Zk52h8gu1DKX2B_gbWgZ3nzDLofEbaE,548
+stoobly_agent-1.1.4.dist-info/METADATA,sha256=9i8olIJjI1kvmd2QFzku6bBYHov7OrXzfSrnpoerF2c,3384
+stoobly_agent-1.1.4.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+stoobly_agent-1.1.4.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
+stoobly_agent-1.1.4.dist-info/RECORD,,