stoobly-agent 1.10.4__tar.gz → 1.10.5__tar.gz

{stoobly_agent-1.10.4 → stoobly_agent-1.10.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: stoobly-agent
-Version: 1.10.4
+Version: 1.10.5
 Summary: Record, mock, and test HTTP(s) requests. CLI agent for Stoobly
 License: Apache-2.0
 License-File: LICENSE

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

{stoobly_agent-1.10.4 → stoobly_agent-1.10.5}/stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.10.4'
+VERSION = '1.10.5'

{stoobly_agent-1.10.4 → stoobly_agent-1.10.5}/stoobly_agent/app/cli/scaffold/docker/workflow/run_command.py

@@ -57,29 +57,17 @@ class DockerWorkflowRunCommand(WorkflowRunCommand):
   def timestamp_file_name(self, workflow_name: str):
     return f"{workflow_name}{self.timestamp_file_extension}"
 
-  def __create_timestamp_file(self):
-    # Create timestamp file to indicate workflow is starting
-    timestamp_file = self.timestamp_file_path
-
-    try:
-      with open(timestamp_file, 'w') as f:
-        f.write(str(time.time()))
-      Logger.instance(LOG_ID).debug(f"Created timestamp file: {timestamp_file}")
-    except Exception as e:
-      Logger.instance(LOG_ID).error(f"Failed to create timestamp file: {e}")
-      sys.exit(1)
-    
-    return timestamp_file
-
   def up(self, **options: WorkflowUpOptions):
     """Execute the complete Docker workflow up process."""
 
     no_publish = options.get('no_publish', False)
     print_service_header = options.get('print_service_header')
+    timestamp_file = None
 
-    self.__iterate_active_workflows(handle_active=self.__handle_up_active)
+    if not self.dry_run:
+      self.__iterate_active_workflows(handle_active=self.__handle_up_active)
 
-    timestamp_file = self.__create_timestamp_file()
+      timestamp_file = self.__create_timestamp_file()
 
     try:
       # Create individual service commands
@@ -132,18 +120,17 @@ class DockerWorkflowRunCommand(WorkflowRunCommand):
           self.exec(exec_command)
     
     except Exception as e:
-      # Clean up timestamp file on error
-      if os.path.exists(timestamp_file):
-        try:
-          os.remove(timestamp_file)
-          Logger.instance(LOG_ID).info(f"Removed timestamp file due to error: {timestamp_file}")
-        except Exception as cleanup_error:
-          Logger.instance(LOG_ID).warning(f"Failed to remove timestamp file after error: {cleanup_error}")
+      if timestamp_file:
+        # Clean up timestamp file on error
+        self.__remove_timestamp_file(timestamp_file) 
       raise e
 
   def down(self, **options: WorkflowDownOptions):
     """Execute the complete Docker workflow down process."""
-    timestamp_file = self.__find_and_verify_timestamp_file()
+
+    timestamp_file = None
+    if not self.dry_run: 
+      timestamp_file = self.__find_and_verify_timestamp_file()
     
     print_service_header = options.get('print_service_header')
     
@@ -197,17 +184,15 @@ class DockerWorkflowRunCommand(WorkflowRunCommand):
       remove_ingress_network_command = command.remove_ingress_network()
       if remove_ingress_network_command:
         self.exec(remove_ingress_network_command, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
-    
-    # Clean up timestamp file
-    if os.path.exists(timestamp_file):
-      try:
-        os.remove(timestamp_file)
-      except Exception as e:
-        Logger.instance(LOG_ID).warning(f"Failed to remove timestamp file: {e}")
+
+    if timestamp_file:
+      self.__remove_timestamp_file(timestamp_file)
 
   def logs(self, **options: WorkflowLogsOptions):
     """Execute the complete Docker workflow logs process."""
-    timestamp_file = self.__find_and_verify_timestamp_file()
+
+    if not self.dry_run:
+      self.__find_and_verify_timestamp_file()
      
     print_service_header = options.get('print_service_header')
     
@@ -418,7 +403,7 @@ class DockerWorkflowRunCommand(WorkflowRunCommand):
     if self.script:
       print(command, file=self.script)
 
-    if self.dry_run:
+    if self.dry_run or self.containerized:
       print(command)
     else:
       result = subprocess.run(command, shell=True, **options)
@@ -430,6 +415,7 @@ class DockerWorkflowRunCommand(WorkflowRunCommand):
     # Check if workflow is running (timestamp file exists)
 
     timestamp_file = self.timestamp_file_path
+
     if not os.path.exists(timestamp_file):
       Logger.instance(LOG_ID).error(f"Workflow '{self.workflow_name}' is not running.")
 
@@ -483,4 +469,26 @@ class DockerWorkflowRunCommand(WorkflowRunCommand):
           continue
 
         if handle_active:
-          handle_active(folder, timestamp_file_path)
+          handle_active(folder, timestamp_file_path)
+
+  def __create_timestamp_file(self):
+    # Create timestamp file to indicate workflow is starting
+    timestamp_file = self.timestamp_file_path
+
+    try:
+      with open(timestamp_file, 'w') as f:
+        f.write(str(time.time()))
+      Logger.instance(LOG_ID).debug(f"Created timestamp file: {timestamp_file}")
+    except Exception as e:
+      Logger.instance(LOG_ID).error(f"Failed to create timestamp file: {e}")
+      sys.exit(1)
+    
+    return timestamp_file
+
+  def __remove_timestamp_file(self, timestamp_file: str):
+    # Clean up timestamp file
+    if os.path.exists(timestamp_file):
+      try:
+        os.remove(timestamp_file)
+      except Exception as e:
+        Logger.instance(LOG_ID).warning(f"Failed to remove timestamp file: {e}")

{stoobly_agent-1.10.4 → stoobly_agent-1.10.5}/stoobly_agent/app/cli/scaffold/local/workflow/run_command.py

@@ -3,6 +3,7 @@ import pdb
 import signal
 import subprocess
 import sys
+import time
 
 from types import FunctionType
 from typing import Optional, List
@@ -49,12 +50,6 @@ class LocalWorkflowRunCommand(WorkflowRunCommand):
   def pid_file_name(self, workflow_name: str):
     return f"{workflow_name}{self.pid_file_extension}"
 
-  def _write_pid(self, pid: int):
-    """Write the process PID to the PID file."""
-    os.makedirs(os.path.dirname(self.pid_file_path), exist_ok=True)
-    with open(self.pid_file_path, 'w') as f:
-      f.write(str(pid))
-
   def _read_pid(self, file_path = None) -> Optional[int]:
     """Read the process PID from the PID file."""
     file_path = file_path or self.pid_file_path
@@ -139,7 +134,8 @@ class LocalWorkflowRunCommand(WorkflowRunCommand):
     """Start the workflow using local stoobly-agent run."""
     detached = options.get('detached', False)
 
-    self.__iterate_active_workflows(handle_active=self.__handle_up_active, handle_stale=self.__handle_up_stale)
+    if not self.dry_run:
+      self.__iterate_active_workflows(handle_active=self.__handle_up_active, handle_stale=self.__handle_up_stale)
 
     # iterate through each service in the workflow
     commands = self.workflow_service_commands(**options)
@@ -167,6 +163,7 @@ class LocalWorkflowRunCommand(WorkflowRunCommand):
   def down(self, **options: WorkflowDownOptions):
     """Stop the workflow by killing the local process."""
 
+    # Intentially run this during dry run, we need the PID to be returned
     pid = self.__find_and_verify_workflow_pid()
     if not pid:
       return
@@ -204,8 +201,7 @@ class LocalWorkflowRunCommand(WorkflowRunCommand):
           Logger.instance(LOG_ID).info(f"Successfully stopped process {pid} for {self.workflow_name}")
         
         # Clean up PID file
-        if os.path.exists(self.pid_file_path):
-          os.remove(self.pid_file_path)
+        self.__remove_pid_file()
           
       except Exception as e:
         Logger.instance(LOG_ID).error(f"Failed to stop {self.workflow_name}: {e}")
@@ -213,9 +209,9 @@ class LocalWorkflowRunCommand(WorkflowRunCommand):
   def logs(self, **options: WorkflowLogsOptions):
     """Show logs for the local workflow process."""
     follow = options.get('follow', False)
-    
-    # Find and verify the workflow PID
-    self.__find_and_verify_workflow_pid()
+
+    if not self.dry_run:
+      self.__find_and_verify_workflow_pid()
     
     # Build log command
     log_file = f"{self.log_file_path}"
@@ -238,6 +234,12 @@ class LocalWorkflowRunCommand(WorkflowRunCommand):
     commands.sort(key=lambda command: command.service_config.priority)
     return commands
 
+  def __create_pid_file(self, pid: int):
+    """Write the process PID to the PID file."""
+    os.makedirs(os.path.dirname(self.pid_file_path), exist_ok=True)
+    with open(self.pid_file_path, 'w') as f:
+      f.write(str(pid))
+
   def __dry_run_down(self, pid: int, output_file: str):
     print(f"# Stop {self.workflow_name} (PID: {pid})", file=output_file)
     print(f"kill {pid} || true", file=output_file)
@@ -253,7 +255,9 @@ class LocalWorkflowRunCommand(WorkflowRunCommand):
       print(f"cat {log_file}", file=output_file)
 
   def __find_and_verify_workflow_pid(self):
+    # Find and verify the workflow PID
     pid = self._read_pid()
+
     if not pid:
       Logger.instance(LOG_ID).error(f"Workflow {self.workflow_name} is not running.")
 
@@ -268,9 +272,7 @@ class LocalWorkflowRunCommand(WorkflowRunCommand):
     if not self._is_process_running(pid):
       Logger.instance(LOG_ID).info(f"Process {pid} for {self.workflow_name} is not running")
       # Clean up PID file
-      if os.path.exists(self.pid_file_path):
-        os.remove(self.pid_file_path)
-      return
+      return self.__remove_pid_file()
 
     return pid
 
@@ -325,6 +327,10 @@ class LocalWorkflowRunCommand(WorkflowRunCommand):
           if handle_stale:
             handle_stale(folder, pid, pid_file_path)
 
+  def __remove_pid_file(self):
+    if os.path.exists(self.pid_file_path):
+      os.remove(self.pid_file_path)
+
   def __up_command(self, public_directory_paths: List[str], response_fixtures_paths: List[str], **options: WorkflowUpOptions):
     # Build the stoobly-agent run command
     command = ['stoobly-agent', 'run']
@@ -359,7 +365,7 @@ class LocalWorkflowRunCommand(WorkflowRunCommand):
       for line in script_lines:
         print(line, file=self.script)
 
-    if self.dry_run:
+    if self.dry_run or self.containerized:
       print(command_str)
     else:
       # Execute directly
@@ -372,20 +378,31 @@ class LocalWorkflowRunCommand(WorkflowRunCommand):
           check=True
         )
 
+        time.sleep(1) # Wait for the process to start
+
         if result.returncode != 0:
-          Logger.instance(LOG_ID).error(f"Failed to start agent, run `stoobly-agent workflow logs {self.workflow_name}` to see the error")
-          sys.exit(1)
+          self.__handle_up_error()
         
         # The --detached option prints the PID to stdout
         pid = int(result.stdout.strip())
+
+        if not self._is_process_running(pid):
+          self.__handle_up_error()
         
         # Write PID to file
-        self._write_pid(pid)
+        self.__create_pid_file(pid)
         
         Logger.instance(LOG_ID).info(f"Started {self.workflow_name} with PID: {pid}")
       except subprocess.CalledProcessError as e:
-        Logger.instance(LOG_ID).error(f"Failed to start {self.workflow_name}: {e}")
-        return None
+        self.__handle_up_error()
       except ValueError as e:
         Logger.instance(LOG_ID).error(f"Failed to parse PID from output: {e}")
-        return None
+        return None
+
+  def __handle_up_error(self):
+    log_file = f"{self.log_file_path}"
+    # Read log file it exists and print to stderr
+    if os.path.exists(log_file):
+      with open(log_file, 'r') as f:
+        print(f.read(), file=sys.stderr)
+    sys.exit(1)

{stoobly_agent-1.10.4 → stoobly_agent-1.10.5}/stoobly_agent/app/cli/scaffold/templates/app/.Makefile

@@ -2,9 +2,11 @@
 #
 # STOOBLY_APP_DIR: path to the application source code directory, defaults to $(pwd)
 # STOOBLY_CA_CERTS_DIR: path to folder where ca certs are stored, defaults to $(pwd)/.stoobly/ca_certs
+# STOOBLY_CA_CERTS_INSTALL_CONFIRM: confirm answer to CA certificate installation prompt
 # STOOBLY_CERTS_DIR: path to a folder to store certs, defaults to $(pwd)/.stoobly/certs
 # STOOBLY_CONTEXT_DIR: path to the folder containing the .stoobly folder, defaults to $(pwd)
 # STOOBLY_DOTENV_FILE: path to dotenv file, defaults to $(pwd)/.env
+# STOOBLY_HOSTNAME_INSTALL_CONFIRM: confirm answer to hostname installation prompt
 # STOOBLY_WORKFLOW_SERVICE_OPTIONS: extra --service options to pass 'stoobly-agent scaffold workflow' commands
 
 # Overridable Options
@@ -68,16 +70,17 @@ stoobly_exec_env=$(exec_env) CONTEXT_DIR="$(context_dir)"
 stoobly_exec_run=$(stoobly_exec_build) && $(stoobly_exec_run_env) $(exec_up)
 stoobly_exec_run_env=$(exec_env) CONTEXT_DIR="$(app_dir)"
 
-# Workflow run
-workflow_run=bash "$(app_dir)/$(workflow_script)"
-
 action/install:
 	$(eval action=install)
 action/uninstall:
 	$(eval action=uninstall)
 ca-cert/install: stoobly/install
 	@if [ -z "$$(ls $(ca_certs_dir) 2> /dev/null)" ]; then \
-		read -p "Installing CA certificate is required for $(workflow)ing requests, continue? (y/N) " confirm && \
+		if [ -n "$$STOOBLY_CA_CERTS_INSTALL_CONFIRM" ]; then \
+			confirm="$$STOOBLY_CA_CERTS_INSTALL_CONFIRM"; \
+		else \
+			read -p "Installing CA certificate is required for $(workflow)ing requests, continue? (y/N) " confirm; \
+		fi && \
 		if [ "$$confirm" = "y" ] || [ "$$confirm" = "Y" ]; then \
 			echo "Running stoobly-agent ca-cert install..."; \
 			stoobly-agent ca-cert install --ca-certs-dir-path $(ca_certs_dir); \
@@ -107,10 +110,10 @@ intercept/disable:
 intercept/enable:
 	@export EXEC_COMMAND=intercept/.enable EXEC_OPTIONS="" EXEC_ARGS=$(scenario_key) && \
 	$(stoobly_exec)
-mock: workflow/mock ca-cert/install workflow/hostname/install nameservers workflow/up
+mock: workflow/mock ca-cert/install workflow/up nameservers workflow/hostname/install workflow/run
 mock/services: workflow/mock workflow/services
-mock/logs: workflow/mock workflow/logs
-mock/down: workflow/mock workflow/down workflow/hostname/uninstall
+mock/logs: workflow/mock workflow/logs workflow/run
+mock/down: workflow/mock workflow/down workflow/run workflow/hostname/uninstall
 pipx/install:
 	@if ! command -v pipx >/dev/null 2>&1; then \
 		echo "pipx is not installed. Installing pipx..."; \
@@ -121,10 +124,10 @@ python/validate:
 		echo "Error: Python 3.10, 3.11, or 3.12 is required."; \
 		exit 1; \
 	fi
-record: workflow/record ca-cert/install workflow/hostname/install nameservers workflow/up
-record/down: workflow/record workflow/down workflow/hostname/uninstall
+record: workflow/record ca-cert/install workflow/up nameservers workflow/hostname/install workflow/run
+record/down: workflow/record workflow/down workflow/run workflow/hostname/uninstall
 record/services: workflow/record workflow/services
-record/logs: workflow/record workflow/logs
+record/logs: workflow/record workflow/logs workflow/run
 scenario/create:
 # Create a scenario
 	@export EXEC_COMMAND=scenario/.create EXEC_OPTIONS="$(options)" EXEC_ARGS="$(name)" && \
@@ -154,18 +157,21 @@ stoobly/install: python/validate pipx/install
 		echo "stoobly-agent not found. Installing..."; \
 		pipx install stoobly-agent || { echo "Failed to install stoobly-agent"; exit 1; }; \
 	fi
-test: workflow/test workflow/up
+test: workflow/test workflow/up workflow/run
 test/services: workflow/test workflow/services
-test/logs: workflow/test workflow/logs
-test/down: workflow/test workflow/down
+test/logs: workflow/test workflow/logs workflow/run
+test/down: workflow/test workflow/down workflow/run
 tmpdir:
 	@mkdir -p $(app_tmp_dir)
 workflow/down: dotenv
 	@export EXEC_COMMAND=scaffold/.down EXEC_OPTIONS="$(workflow_down_options) $(workflow_run_options) $(options)" EXEC_ARGS="$(workflow)" && \
-	$(stoobly_exec_run) && \
-	$(workflow_run)
+	$(stoobly_exec_run)
 workflow/hostname: stoobly/install
-	@read -p "Do you want to $(action) hostname(s) in /etc/hosts? (y/N) " confirm && \
+	@if [ -n "$$STOOBLY_HOSTNAME_INSTALL_CONFIRM" ]; then \
+		confirm="$$STOOBLY_HOSTNAME_INSTALL_CONFIRM"; \
+	else \
+		read -p "Do you want to $(action) hostname(s) in /etc/hosts? (y/N) " confirm; \
+	fi && \
 	if [ "$$confirm" = "y" ] || [ "$$confirm" = "Y" ]; then \
 		CURRENT_VERSION=$$(stoobly-agent --version); \
 		REQUIRED_VERSION="1.4.0"; \
@@ -180,14 +186,15 @@ workflow/hostname/install: action/install workflow/hostname
 workflow/hostname/uninstall: action/uninstall workflow/hostname  
 workflow/logs:
 	@export EXEC_COMMAND=scaffold/.logs EXEC_OPTIONS="$(workflow_log_options) $(workflow_run_options) $(options)" EXEC_ARGS="$(workflow)" && \
-	$(stoobly_exec_run) && \
-	$(workflow_run)
+	$(stoobly_exec_run)
 workflow/mock:
 	$(eval workflow=mock)
 workflow/namespace: tmpdir
 	@mkdir -p $(workflow_namespace_dir)
 workflow/record:
 	$(eval workflow=record)
+workflow/run:
+	@bash "$(app_dir)/$(workflow_script)"
 workflow/services:
 	@export EXEC_COMMAND=scaffold/.services EXEC_OPTIONS="$(workflow_service_options) $(options)" EXEC_ARGS="$(workflow)" && \
 	$(stoobly_exec_run)
@@ -195,5 +202,4 @@ workflow/test:
 	$(eval workflow=test) $(eval workflow_up_extra_options=$(workflow_up_extra_options) --no-publish)
 workflow/up: dotenv
 	@export EXEC_COMMAND=scaffold/.up EXEC_OPTIONS="$(workflow_up_options) $(workflow_run_options) $(options)" EXEC_ARGS="$(workflow)" && \
-	$(stoobly_exec_run) && \
-	$(workflow_run)
+	$(stoobly_exec_run)

{stoobly_agent-1.10.4 → stoobly_agent-1.10.5}/stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/scaffold/.down

@@ -7,6 +7,5 @@ mkdir -p .stoobly/tmp
 stoobly-agent scaffold workflow down \
   --app-dir-path "$(pwd)" \
   --containerized \
-  --dry-run \
   --log-level error \
   $extra_options $1 > /dev/null

{stoobly_agent-1.10.4 → stoobly_agent-1.10.5}/stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/scaffold/.logs

@@ -4,6 +4,6 @@ extra_options=$EXEC_OPTIONS
 
 stoobly-agent scaffold workflow logs \
   --app-dir-path "$(pwd)" \
-  --dry-run \
+  --containerized \
   --log-level warning \
   $extra_options $1 > /dev/null

{stoobly_agent-1.10.4 → stoobly_agent-1.10.5}/stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/scaffold/.up

@@ -5,7 +5,6 @@ extra_options=$EXEC_OPTIONS
 stoobly-agent scaffold workflow up \
   --app-dir-path "$(pwd)" \
   --containerized \
-  --dry-run \
   --log-level warning \
   --mkcert \
   $extra_options $1 > /dev/null

{stoobly_agent-1.10.4 → stoobly_agent-1.10.5}/stoobly_agent/app/cli/scaffold/templates/plugins/cypress/test/.run

@@ -3,6 +3,8 @@
 # This file was automatically generated. DO NOT EDIT.
 # Any changes made to this file will be overwritten.
 
+npx cypress run --project .
+
 if [ -f .env ]; then
   set -a; . ./.env; set +a;
 fi
@@ -12,8 +14,6 @@ export http_proxy=http://localhost:$APP_PROXY_PORT
 export HTTPS_PROXY=http://localhost:$APP_PROXY_PORT
 export https_proxy=http://localhost:$APP_PROXY_PORT
 
-npx cypress run --project .
-
 entrypoint=$1
 
 if [ -e "$entrypoint" ]; then

{stoobly_agent-1.10.4 → stoobly_agent-1.10.5}/stoobly_agent/app/cli/scaffold/templates/plugins/playwright/test/.run

@@ -3,6 +3,8 @@
 # This file was automatically generated. DO NOT EDIT.
 # Any changes made to this file will be overwritten.
 
+npx playwright test --reporter dot
+
 if [ -f .env ]; then
   set -a; . ./.env; set +a;
 fi
@@ -12,8 +14,6 @@ export http_proxy=http://localhost:$APP_PROXY_PORT
 export HTTPS_PROXY=http://localhost:$APP_PROXY_PORT
 export https_proxy=http://localhost:$APP_PROXY_PORT
 
-npx playwright test --reporter dot
-
 entrypoint=$1
 
 if [ -e "$entrypoint" ]; then

{stoobly_agent-1.10.4 → stoobly_agent-1.10.5}/stoobly_agent/app/cli/scaffold/workflow_run_command.py

@@ -28,6 +28,7 @@ class WorkflowRunCommand(WorkflowCommand):
     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.__containerized = kwargs.get('containerized') or False
     self.__context_dir_path = kwargs.get('context_dir_path') or app.context_dir_path
     self.__dry_run = kwargs.get('dry_run', False)
     self.__namespace = kwargs.get('namespace') or self.workflow_name
@@ -48,6 +49,10 @@ class WorkflowRunCommand(WorkflowCommand):
   def certs_dir_path(self):
     return self.__certs_dir_path
 
+  @property
+  def containerized(self):
+    return self.__containerized
+
   @property
   def context_dir_path(self):
     if not self.__context_dir_path: