stoobly-agent 1.1.2__tar.gz → 1.1.4__tar.gz

{stoobly_agent-1.1.2 → stoobly_agent-1.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: stoobly-agent
-Version: 1.1.2
+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.2 → stoobly_agent-1.1.4}/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.1.2"
+version = "1.1.4"
 
 [tool.poetry.dependencies]
 python = "^3.10"

{stoobly_agent-1.1.2 → stoobly_agent-1.1.4}/stoobly_agent/__init__.py

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

{stoobly_agent-1.1.2 → stoobly_agent-1.1.4}/stoobly_agent/app/cli/helpers/certificate_authority.py

@@ -23,6 +23,10 @@ class CertificateAuthority():
 
     def __init__(self, certs_dir = DataDir.instance().mitmproxy_conf_dir_path, cn = MITMPROXY_CN):
         self.certs_dir = certs_dir
+
+        if not os.path.exists(certs_dir):
+            self.generate_certs()
+
         self.cn = cn
         self.key_size = 2048
 
@@ -55,7 +59,7 @@ class CertificateAuthority():
 
     def generate_certs(self):
         if not os.path.exists(self.certs_dir):
-            os.makedirs(self.certs_dir)
+            os.makedirs(self.certs_dir, exist_ok=True)
 
         path = Path(self.certs_dir)
         CertStore.create_store(path, self.cn, self.key_size)

{stoobly_agent-1.1.2 → stoobly_agent-1.1.4}/stoobly_agent/app/cli/scaffold/app.py

@@ -6,7 +6,7 @@ from stoobly_agent.config.data_dir import DataDir, DATA_DIR_NAME
 class App():
 
   def __init__(self, path: str, namespace: str, **kwargs):
-    path = path or os.getcwd()
+    path = os.path.abspath(path) or os.getcwd()
     data_dir: DataDir = DataDir.instance(path) 
 
     self.__scaffold_dir_path = data_dir.path

{stoobly_agent-1.1.2 → stoobly_agent-1.1.4}/stoobly_agent/app/cli/scaffold/docker/service/builder.py

@@ -54,7 +54,7 @@ class ServiceBuilder(Builder):
 
   @property
   def service_mount(self):
-    return f"{self.dir_path}:{STOOBLY_HOME_DIR}"
+    return f".:{STOOBLY_HOME_DIR}"
 
   @property
   def service_name(self):

{stoobly_agent-1.1.2 → stoobly_agent-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-1.1.4/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-1.1.2 → stoobly_agent-1.1.4}/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-1.1.2 → stoobly_agent-1.1.4}/stoobly_agent/app/cli/scaffold/templates/app/.Makefile

@@ -14,7 +14,7 @@ CONTEXT_DIR_DEFAULT := $(realpath $(DIR)/../..)
 
 # Configuration
 app_dir=$$(realpath "$${STOOBLY_APP_DIR:-$(CONTEXT_DIR_DEFAULT)}")
-ca_certs_dir=$$(realpath "$${STOOBLY_CA_CERTS_DIR:-$$(realpath ~/.mitmproxy)}")
+ca_certs_dir=$$(realpath "$${STOOBLY_CA_CERTS_DIR:-$$(realpath ~)/.mitmproxy}")
 certs_dir=$$(realpath "$${STOOBLY_CERTS_DIR:-$(app_data_dir)/certs}")
 context_dir=$$(realpath "$${STOOBLY_CONTEXT_DIR:-$(CONTEXT_DIR_DEFAULT)}")
 workflow_run_options=$${STOOBLY_WORKFLOW_RUN_OPTIONS:+$$STOOBLY_WORKFLOW_RUN_OPTIONS }
@@ -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
@@ -44,7 +46,7 @@ workflow_run=$(workflow_run_env) && $(source_env) && bash "$(workflow_run_script
 certs:
 	@export EXEC_COMMAND=bin/.mkcert && \
 	$(stoobly_exec)
-nameservers:
+nameservers: tmpdir
 	@if [ -f /etc/resolv.conf ]; then \
 		nameserver=$$(grep -Eo '([0-9]{1,3}\.){3}[0-9]{1,3}' /etc/resolv.conf) && \
 		if [ "$$nameserver" = "127.0.0.53" ]; then \
@@ -144,4 +146,6 @@ test/stop:
 	export EXEC_OPTIONS="$(options)" && \
 	export EXEC_ARGS="test" && \
 	$(stoobly_exec_run) && \
-	$(workflow_run)
+	$(workflow_run)
+tmpdir:
+	@mkdir -p $(app_tmp_dir)

{stoobly_agent-1.1.2/stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test → stoobly_agent-1.1.4/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-1.1.2/stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock → stoobly_agent-1.1.4/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-1.1.2 → stoobly_agent-1.1.4}/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-1.1.2 → stoobly_agent-1.1.4}/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