stoobly-agent 1.5.1__tar.gz → 1.5.3__tar.gz

{stoobly_agent-1.5.1 → stoobly_agent-1.5.3}/PKG-INFO

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

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

{stoobly_agent-1.5.1 → stoobly_agent-1.5.3}/stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.5.1'
+VERSION = '1.5.3'

{stoobly_agent-1.5.1 → stoobly_agent-1.5.3}/stoobly_agent/app/cli/scaffold/constants.py

@@ -4,6 +4,7 @@ from typing import Literal
 
 from stoobly_agent.config.data_dir import CERTS_DIR_NAME, DATA_DIR_NAME
 
+APP_DIR_ENV = 'APP_DIR'
 APP_NETWORK_ENV = 'APP_NETWORK'
 APP_NAME_ENV = 'APP_NAME'
 BIN_FOLDER_NAME = 'bin'

{stoobly_agent-1.5.1 → stoobly_agent-1.5.3}/stoobly_agent/app/cli/scaffold/templates/app/.Makefile

@@ -20,17 +20,15 @@ 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)}")
 
-context_dir_option=--context-dir-path $(context_dir)
 user_id_option=--user-id $(USER_ID)
 stoobly_exec_options=--profile $(EXEC_WORKFLOW_NAME) -p $(EXEC_WORKFLOW_NAME)
 workflow_down_options=$(user_id_option)
 workflow_service_options=$(shell echo $$STOOBLY_WORKFLOW_SERVICE_OPTIONS)
-workflow_up_options=$(context_dir_option) --ca-certs-dir-path $(ca_certs_dir) --certs-dir-path $(certs_dir) --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)
 
 app_data_dir=$(app_dir)/.stoobly
 app_namespace_dir=$(app_data_dir)/docker
 app_tmp_dir=$(app_data_dir)/tmp
-data_dir=$(context_dir)/.stoobly
 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
@@ -38,7 +36,7 @@ workflow_run_script=$(app_data_dir)/tmp/run.sh
 # Commands
 docker_command=docker
 docker_compose_command=$(docker_command) compose
-exec_env=export CA_CERTS_DIR="$(ca_certs_dir)" && export USER_ID=$(USER_ID)
+exec_env=APP_DIR="$(app_dir)" CA_CERTS_DIR="$(ca_certs_dir)" USER_ID="$(USER_ID)"
 exec_up=$(docker_compose_command) -f "$(docker_compose_file_path)" $(stoobly_exec_options) up --remove-orphans
 source_env=set -a; [ -f .env ] && source .env; set +a
 
@@ -47,15 +45,14 @@ stoobly_exec_build=$(docker_command) build $(stoobly_exec_build_args) $(app_name
 stoobly_exec_build_args=-f "$(dockerfile_path)" -t stoobly.$(USER_ID) --build-arg USER_ID=$(USER_ID) $(PULL_OPTION) --quiet
 
 # Exec any
-stoobly_exec=$(stoobly_exec_build) && $(stoobly_exec_env) && $(exec_up)
-stoobly_exec_env=$(source_env) && $(exec_env) && export CONTEXT_DIR="$(context_dir)" 
+stoobly_exec=$(stoobly_exec_build) && $(stoobly_exec_env) $(exec_up)
+stoobly_exec_env=$(source_env) && $(exec_env) CONTEXT_DIR="$(context_dir)" 
 
 # Exec workflow run
 # Because scaffold is stored in the application source code directory, 
-# when running a scaffold command from within a container,
-# it needs access to $(app_dir) rather than $(context_dir)
-stoobly_exec_run=$(stoobly_exec_build) && $(stoobly_exec_run_env) && $(exec_up)
-stoobly_exec_run_env=$(source_env) && $(exec_env) && export CONTEXT_DIR="$(app_dir)"
+# when running a scaffold command from within a container, it needs access to $(app_dir) rather than $(context_dir)
+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)"

{stoobly_agent-1.5.1 → stoobly_agent-1.5.3}/stoobly_agent/app/cli/scaffold/templates/app/.docker-compose.base.yml

@@ -4,6 +4,7 @@ services:
       service: stoobly_base
     volumes:
       - ${CONTEXT_DIR}/.stoobly:/home/stoobly/.stoobly
+      - ${APP_DIR}/.stoobly/docker:/home/stoobly/.stoobly/docker
   stoobly_base:
     image: stoobly.${USER_ID}
   ui_base:

{stoobly_agent-1.5.1 → stoobly_agent-1.5.3}/stoobly_agent/app/cli/scaffold/workflow_run_command.py

@@ -11,7 +11,7 @@ from stoobly_agent.lib.logger import Logger
 
 from .app import App
 from .constants import (
-  APP_NETWORK_ENV, CA_CERTS_DIR_ENV, CERTS_DIR_ENV, CONTEXT_DIR_ENV, NAMESERVERS_FILE, 
+  APP_DIR_ENV, APP_NETWORK_ENV, CA_CERTS_DIR_ENV, CERTS_DIR_ENV, CONTEXT_DIR_ENV, NAMESERVERS_FILE, 
   SERVICE_DNS_ENV, SERVICE_NAME_ENV, USER_ID_ENV, WORKFLOW_NAME_ENV, WORKFLOW_NAMESPACE_ENV
 )
 from .docker.constants import DOCKERFILE_CONTEXT
@@ -41,12 +41,17 @@ class WorkflowRunCommand(WorkflowCommand):
   def __init__(self, app: App, **kwargs):
     super().__init__(app, **kwargs)
 
+    self.__app_dir_path = os.path.abspath(kwargs.get('app_dir_path') or app.dir_path)
     self.__current_working_dir = os.getcwd()
     self.__ca_certs_dir_path = kwargs.get('ca_certs_dir_path') or app.ca_certs_dir_path
     self.__certs_dir_path = kwargs.get('certs_dir_path') or app.certs_dir_path
     self.__context_dir_path = kwargs.get('context_dir_path') or app.context_dir_path
     self.__network = kwargs.get('network') or self.app_config.network
 
+  @property
+  def app_dir_path(self):
+    return self.__app_dir_path
+
   @property
   def ca_certs_dir_path(self):
     return self.__ca_certs_dir_path
@@ -244,6 +249,7 @@ class WorkflowRunCommand(WorkflowCommand):
     user_id = options.get('user_id')
 
     _config = {}
+    _config[APP_DIR_ENV] = self.app_dir_path
     _config[CA_CERTS_DIR_ENV] = self.ca_certs_dir_path
     _config[CERTS_DIR_ENV] = self.certs_dir_path
     _config[CONTEXT_DIR_ENV] = self.context_dir_path

{stoobly_agent-1.5.1 → stoobly_agent-1.5.3}/stoobly_agent/app/cli/scaffold_cli.py

@@ -170,7 +170,7 @@ def create(**kwargs):
   help="List services",
   name="list"
 )
-@click.option('--app-dir-path', default=os.getcwd(), help='Path to application directory.')
+@click.option('--app-dir-path', default=current_working_dir, help='Path to application directory.')
 @click.option('--format', type=click.Choice(FORMATS), help='Format output.')
 @click.option('--select', multiple=True, help='Select column(s) to display.')
 @click.option('--service', multiple=True, help='Select specific services.')
@@ -302,8 +302,6 @@ def copy(**kwargs):
 @click.option('--user-id', default=os.getuid(), help='OS user ID of the owner of context dir path.')
 @click.argument('workflow_name')
 def down(**kwargs):  
-  cwd = os.getcwd()
-
   os.environ[env_vars.LOG_LEVEL] = kwargs['log_level']
 
   app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE, **kwargs)
@@ -322,7 +320,7 @@ def down(**kwargs):
     config = { **kwargs }
     config['service_name'] = service
     command = WorkflowRunCommand(app, **config)
-    command.current_working_dir = cwd
+    command.current_working_dir = current_working_dir
     commands.append(command)
 
   commands = sorted(commands, key=lambda command: command.service_config.priority)
@@ -445,11 +443,14 @@ def logs(**kwargs):
 @click.option('--verbose', is_flag=True)
 @click.argument('workflow_name')
 def up(**kwargs):
-  cwd = os.getcwd()
-
   os.environ[env_vars.LOG_LEVEL] = kwargs['log_level']
 
-  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE, **kwargs)
+  from_make = kwargs['from_make']
+
+  # 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']
+  app = App(app_dir_path, DOCKER_NAMESPACE, **kwargs)
   __validate_app(app)
 
   # If namespace is set, default network to namespace
@@ -469,7 +470,7 @@ def up(**kwargs):
     config = { **kwargs }
     config['service_name'] = service
     command = WorkflowRunCommand(app, **config)
-    command.current_working_dir = cwd
+    command.current_working_dir = current_working_dir
     commands.append(command)
 
   # Before services can be started, their image and network needs to be created
@@ -477,7 +478,7 @@ def up(**kwargs):
     command: WorkflowRunCommand = commands[0]
 
     init_commands = []
-    if not kwargs['from_make']:
+    if not from_make:
       create_image_command = command.create_image(user_id=kwargs['user_id'], verbose=kwargs['verbose'])
       init_commands.append(create_image_command)
 

{stoobly_agent-1.5.1 → stoobly_agent-1.5.3}/stoobly_agent/app/models/factories/resource/local_db/helpers/tiebreak_scenario_request.py

@@ -5,7 +5,7 @@ from typing import List
 from stoobly_agent.lib.cache import Cache
 from stoobly_agent.lib.orm.request import Request
 
-PREFIX = 'last_request_id'
+SUFFIX = 'last_request_id'
 
 def access_request(session_id: str, request_id: int, timeout = None):
   cache = Cache.instance()
@@ -21,7 +21,7 @@ def generate_session_id(query: dict):
   return hashlib.md5(b'.'.join(toks)).hexdigest()
 
 def reset_sessions():
-  Cache.instance().clear(f".+\.{PREFIX}")
+  Cache.instance().clear(f".+\\.{SUFFIX}")
 
 def tiebreak_scenario_request(session_id: str, requests: List[Request]):
   if len(requests) == 0:
@@ -48,4 +48,4 @@ def tiebreak_scenario_request(session_id: str, requests: List[Request]):
 
 def __last_request_id_key(_key = None):
   _key = _key or generate_session_id()
-  return f"{_key}.{PREFIX}"
+  return f"{_key}.{SUFFIX}"

{stoobly_agent-1.5.1 → stoobly_agent-1.5.3}/stoobly_agent/app/proxy/handle_mock_service.py

@@ -95,11 +95,11 @@ def handle_request_mock_generic(context: MockContext, **options: MockOptions):
 
         if res.status_code in [custom_response_codes.NOT_FOUND, custom_response_codes.IGNORE_COMPONENTS]:
             try:
-                res = __handle_found_policy(context)
+                return __handle_found_policy(context) # Continue proxying the request
             except RuntimeError:
                 # Do nothing, return custom error response
                 pass
-        
+    
     if res.status_code == custom_response_codes.NOT_FOUND:
         if handle_failure:
             res = handle_failure(context) or res
@@ -150,7 +150,7 @@ def handle_response_mock(context: MockContext):
 
     if request_key:
         request = context.flow.request
-        Logger.instance(LOG_ID).info(f"{bcolors.OKCYAN}Mocked{bcolors.ENDC} {request.url} -> {request_key}")
+        Logger.instance(LOG_ID).info(f"{bcolors.OKBLUE}Mocked{bcolors.ENDC} {request.url} -> {request_key}")
 
         __rewrite_response(context)
         __mock_hook(lifecycle_hooks.AFTER_MOCK, context)

{stoobly_agent-1.5.1 → stoobly_agent-1.5.3}/stoobly_agent/app/proxy/mitmproxy/request_facade.py

@@ -138,8 +138,9 @@ class MitmproxyRequestFacade(Request):
         rewrites = self.__url_rules
 
         if len(rewrites):
+            url_before = self.url
             self.__rewrite_url(rewrites)
-            Logger.instance(LOG_ID).debug(f"{bcolors.OKBLUE} Rewritten URL{bcolors.ENDC} {self.url}")
+            Logger.instance(LOG_ID).info(f"{bcolors.OKCYAN} Rewriting URL{bcolors.ENDC} {url_before} => {self.url}")
 
     # Find all the rules that match request url and method
     def select_rewrite_rules(self, rules: List[RewriteRule]) -> List[RewriteRule]: