stoobly-agent 1.4.1__py3-none-any.whl → 1.4.2__py3-none-any.whl

stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.4.1'
+VERSION = '1.4.2'

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

@@ -1,7 +1,7 @@
 import os
 import pdb
 
-from ...constants import SERVICE_HOSTNAME, SERVICE_PORT, STOOBLY_CERTS_DIR
+from ...constants import SERVICE_HOSTNAME, SERVICE_PORT, SERVICE_PROXY_MODE, STOOBLY_CERTS_DIR
 from .builder import WorkflowBuilder
 
 class MockDecorator():
@@ -24,7 +24,7 @@ class MockDecorator():
       '--headless',
       '--intercept',
       '--lifecycle-hooks-path', 'lifecycle_hooks.py',
-      '--proxy-mode', config.proxy_mode,
+      '--proxy-mode', SERVICE_PROXY_MODE,
       '--proxy-port', f"{SERVICE_PORT}",
       '--response-fixtures-path', 'fixtures.yml',
       '--ssl-insecure'

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

@@ -3,7 +3,7 @@ import pdb
 
 from urllib.parse import urlparse
 
-from ...constants import SERVICE_HOSTNAME, SERVICE_PORT, STOOBLY_CERTS_DIR
+from ...constants import SERVICE_HOSTNAME, SERVICE_PORT, SERVICE_PROXY_MODE, STOOBLY_CERTS_DIR
 from .builder import WorkflowBuilder
 
 class ReverseProxyDecorator():
@@ -25,7 +25,7 @@ class ReverseProxyDecorator():
     command = [
       '--headless',
       '--lifecycle-hooks-path', 'lifecycle_hooks.py',
-      '--proxy-mode', config.proxy_mode,
+      '--proxy-mode', SERVICE_PROXY_MODE,
       '--proxy-port', f"{SERVICE_PORT}",
       '--ssl-insecure'
     ]

stoobly_agent/app/cli/scaffold/service_config.py

@@ -92,7 +92,21 @@ class ServiceConfig(Config):
     if self.__proxy_mode:
       return (self.__proxy_mode or '').strip()
 
-    return f"reverse:{self.scheme}://{self.hostname}"
+    if not self.hostname:
+      return ''
+
+    _proxy_mode = f"reverse:{self.scheme}://{self.hostname}"
+
+    if not self.port:
+      return _proxy_mode
+
+    if self.scheme == 'http' and self.port == '80': 
+      return _proxy_mode
+
+    if self.scheme == 'https' and self.port == '443':
+      return _proxy_mode
+
+    return f"{_proxy_mode}:{self.port}"
 
   @proxy_mode.setter
   def proxy_mode(self, v):
@@ -123,7 +137,7 @@ class ServiceConfig(Config):
       'port': self.port,
       'priority': self.priority,
       'proxy_mode': self.proxy_mode,
-      'scheme': self.scheme,
+      'scheme': self.scheme if self.hostname else '',
     }
 
   def write(self):

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

@@ -61,8 +61,15 @@ stoobly_exec_run_env=$(source_env) && $(exec_env) && export CONTEXT_DIR="$(app_d
 workflow_run=$(source_env) && bash "$(workflow_run_script)"
 
 ca-cert/install: stoobly/install
-	@echo "Running stoobly-agent ca-cert install..."; \
-	stoobly-agent ca-cert install
+	@if [ ! -d "$$HOME/.mitmproxy" ]; then \
+		read -p "Installing CA certificate is required for $(WORKFLOW)ing requests, continue? (y/N) " confirm && \
+		if [ "$$confirm" = "y" ] || [ "$$confirm" = "Y" ]; then \
+			echo "Running stoobly-agent ca-cert install..."; \
+			stoobly-agent ca-cert install; \
+		else \
+			echo "You can install the CA certificate later by running: stoobly-agent ca-cert install"; \
+		fi \
+	fi
 certs:
 	@export EXEC_COMMAND=bin/.mkcert && \
 	$(stoobly_exec)
@@ -89,7 +96,7 @@ intercept/enable:
 	@export EXEC_COMMAND=bin/.enable && \
 	export EXEC_ARGS=$(scenario_key) && \
 	$(stoobly_exec)
-mock: workflow/mock workflow/hostname/install nameservers workflow/up
+mock: workflow/mock ca-cert/install workflow/hostname/install nameservers workflow/up
 mock/services: workflow/mock workflow/services
 mock/logs: workflow/mock workflow/logs
 mock/down: workflow/mock workflow/down workflow/hostname/uninstall
@@ -103,7 +110,7 @@ python/validate:
 		echo "Error: Python 3.10, 3.11, or 3.12 is required."; \
 		exit 1; \
 	fi
-record: workflow/record workflow/hostname/install nameservers workflow/up
+record: workflow/record ca-cert/install workflow/hostname/install nameservers workflow/up
 record/down: workflow/record workflow/down workflow/hostname/uninstall
 record/services: workflow/record workflow/services
 record/logs: workflow/record workflow/logs
@@ -139,7 +146,7 @@ scenario/snapshot:
 stoobly/install: python/validate pipx/install 
 	@if ! pipx list 2> /dev/null | grep -q 'stoobly-agent'; then \
 		echo "stoobly-agent not found. Installing..."; \
-		pipx install stoobly-agent; \
+		pipx install stoobly-agent || { echo "Failed to install stoobly-agent"; exit 1; }; \
 	fi
 test: workflow/test workflow/up
 test/services: workflow/test workflow/services

stoobly_agent/app/cli/scaffold_cli.py

@@ -108,14 +108,19 @@ def create(**kwargs):
 @click.option('--certs-dir-path', help='Path to certs directory. Defaults to the certs dir of the context.')
 @click.option('--context-dir-path', default=data_dir.context_dir_path, help='Path to Stoobly data directory.')
 @click.option('--service', multiple=True, help='Select which services to run. Defaults to all.')
+@click.option('--workflow', multiple=True, help='Specify services by workflow(s). Defaults to all.')
 def mkcert(**kwargs):
   app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE, **kwargs)
   __validate_app(app)
 
-  services = __get_services(app.services, service=kwargs['service'])
+  services = __get_services(
+    app, service=kwargs['service'], without_core=True, workflow=kwargs['workflow']
+  )
 
   for service_name in services:
     service = Service(service_name, app)
+    __validate_service_dir(service.dir_path)
+
     service_config = ServiceConfig(service.dir_path)
 
     if service_config.scheme != 'https':
@@ -170,19 +175,23 @@ def create(**kwargs):
 @click.option('--select', multiple=True, help='Select column(s) to display.')
 @click.option('--service', multiple=True, help='Select specific services.')
 @click.option('--without-headers', is_flag=True, default=False, help='Disable printing column headers.')
-@click.option('--workflow', multiple=True, help='Specify workflow(s) to filter the services by.')
+@click.option('--workflow', multiple=True, help='Specify workflow(s) to filter the services by. Defaults to all.')
 def _list(**kwargs):
-  __validate_app_dir(kwargs['app_dir_path'])
-
   app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
   __validate_app(app)
 
+  services = __get_services(app, service=kwargs['service'], workflow=kwargs['workflow'])
+
   rows = []
-  for service_name in __get_workflow_services(app, **kwargs): 
+  for service_name in services: 
     service = Service(service_name, app)
     __validate_service_dir(service.dir_path)
+
     service_config = ServiceConfig(service.dir_path)
-    rows.append(service_config.to_dict())
+    rows.append({
+      'name': service_name,
+      **service_config.to_dict()
+    })
 
   print_services(rows, **select_print_options(kwargs))
 
@@ -192,9 +201,9 @@ def _list(**kwargs):
 @click.option('--app-dir-path', default=current_working_dir, help='Path to application directory.')
 @click.argument('service_name')
 def delete(**kwargs):
-  __validate_app_dir(kwargs['app_dir_path'])
-
   app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
+  __validate_app(app)
+
   service = Service(kwargs['service_name'], app)
 
   if not os.path.exists(service.dir_path):
@@ -211,9 +220,9 @@ def delete(**kwargs):
 @click.option('--priority', help='Determines the service run order.')
 @click.argument('service_name')
 def update(**kwargs):
-  __validate_app_dir(kwargs['app_dir_path'])
-
   app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
+  __validate_app(app)
+
   service = Service(kwargs['service_name'], app)
 
   __validate_service_dir(service.dir_path)
@@ -304,8 +313,9 @@ def down(**kwargs):
   if kwargs['namespace'] and not kwargs['network']:
     kwargs['network'] = kwargs['namespace']
 
-  workflow = Workflow(kwargs['workflow_name'], app)
-  services = __get_services(workflow.services, service=kwargs['service'])
+  services = __get_services(
+    app, service=kwargs['service'], workflow=[kwargs['workflow_name']]
+  )
 
   commands: List[WorkflowRunCommand] = []
   for service in services:
@@ -379,8 +389,9 @@ def logs(**kwargs):
   if len(kwargs['container']) == 0:
     kwargs['container'] = [WORKFLOW_CONTAINER_PROXY]
 
-  workflow = Workflow(kwargs['workflow_name'], app)
-  services = __get_services(workflow.services, service=kwargs['service'], without_core=True)
+  services = __get_services(
+    app, service=kwargs['service'], without_core=True, workflow=[kwargs['workflow_name']]
+  )
 
   commands: List[WorkflowLogCommand] = []
   for service in services:
@@ -445,10 +456,12 @@ def up(**kwargs):
   if kwargs['namespace'] and not kwargs['network']:
     kwargs['network'] = kwargs['namespace']
 
-  workflow = Workflow(kwargs['workflow_name'], app)
-  services = __get_services(workflow.services, service=kwargs['service'])
+  services = __get_services(
+    app, service=kwargs['service'], workflow=[kwargs['workflow_name']]
+  )
 
   # Gateway ports are dynamically set depending on the workflow run
+  workflow = Workflow(kwargs['workflow_name'], app)
   set_gateway_ports(workflow.service_paths_from_services(services))
 
   commands: List[WorkflowRunCommand] = []
@@ -541,13 +554,15 @@ def validate(**kwargs):
   help="Update the system hosts file for all scaffold service hostnames"
 )
 @click.option('--app-dir-path', default=current_working_dir, help='Path to application directory.')
-@click.option('--service', multiple=True, help='Select specific services.')
-@click.option('--workflow', multiple=True, help='Specify services by workflow(s).')
+@click.option('--service', multiple=True, help='Select specific services. Defaults to all.')
+@click.option('--workflow', multiple=True, help='Specify services by workflow(s). Defaults to all.')
 def install(**kwargs):
   app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
   __validate_app(app)
 
-  services = __get_workflow_services(app, **kwargs)
+  services = __get_services(
+    app, service=kwargs['service'], without_core=True, workflow=kwargs['workflow']
+  )
 
   hostnames = []
   for service_name in services: 
@@ -571,13 +586,15 @@ def install(**kwargs):
   help="Delete from the system hosts file all scaffold service hostnames"
 )
 @click.option('--app-dir-path', default=current_working_dir, help='Path to application directory.')
-@click.option('--service', multiple=True, help='Select specific services.')
-@click.option('--workflow', multiple=True, help='Specify services by workflow(s).')
+@click.option('--service', multiple=True, help='Select specific services. Defaults to all.')
+@click.option('--workflow', multiple=True, help='Specify services by workflow(s). Defaults to all.')
 def uninstall(**kwargs):
   app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
   __validate_app(app)
 
-  services = __get_workflow_services(app, **kwargs)
+  services = __get_services(
+    app, service=kwargs['service'], without_core=True, workflow=kwargs['workflow']
+  )
 
   hostnames = []
   for service_name in services: 
@@ -609,39 +626,37 @@ def __elevate_sudo():
     subprocess.run(["sudo", sys.executable] + sys.argv)
     sys.exit(0)
 
-def __get_services(services: List[str], **kwargs) -> List[str]:
+def __get_services(app: App, **kwargs):
   selected_services = list(kwargs['service'])
 
-  # If service is specified, run only those services
-  if selected_services:
-    missing_services = [service for service in selected_services if service not in services]
+  if not selected_services:
+    selected_services = app.services
+  else:
+    selected_services += CORE_SERVICES
+    missing_services = [service for service in selected_services if service not in app.services]
 
-    # Remove services that don't exist
     if missing_services:
+      # Warn if an invalid service is provided
       Logger.instance(LOG_ID).warn(f"Service(s) {','.join(missing_services)} are not found")
-      selected_services = list(set(selected_services) - set(missing_services))
 
-    services = selected_services
+    # Remove services that don't exist
+      selected_services = list(set(selected_services) - set(missing_services))
 
-  services += CORE_SERVICES
+  # If without_score is set, filter out CORE_SERVICES
+  if kwargs.get('without_core'):
+    selected_services = list(set(selected_services) - set(CORE_SERVICES))
 
-  services_index = {}
-  for service in services:
-    if kwargs.get('without_core') and service in CORE_SERVICES:
-        continue
-    services_index[service] = True
- 
-  return services_index.keys()
-
-def __get_workflow_services(app: App, **kwargs):
-  selected_services = []
-  if not kwargs['workflow']:
-    selected_services += __get_services(app.services, service=kwargs['service'], without_core=True)
-  else:
+  # If workflow is set, keep only services in the workflow
+  if kwargs.get('workflow'):
+    workflow_services = []
     for workflow_name in kwargs['workflow']:
       workflow = Workflow(workflow_name, app)
-      selected_services += __get_services(workflow.services, service=kwargs['service'], without_core=True)
-  return set(selected_services)
+      workflow_services += workflow.services
+
+    # Intersection
+    selected_services = list(filter(lambda x: x in workflow_services, selected_services))
+  
+  return list(set(selected_services))
 
 def __print_header(text: str):
   Logger.instance(LOG_ID).info(f"{bcolors.OKBLUE}{text}{bcolors.ENDC}")

{stoobly_agent-1.4.1.dist-info → stoobly_agent-1.4.2.dist-info}/METADATA

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

{stoobly_agent-1.4.1.dist-info → stoobly_agent-1.4.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-stoobly_agent/__init__.py,sha256=WY71ZV8dbTRkfHb3ftjHsgTWeLuG9efgIYp8xc2A8Qk,44
+stoobly_agent/__init__.py,sha256=fihCDP2FvrNTuWxSlgwYRREc1dhd8hCm3TlzVPcHgx4,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=ZgCfmdr5um-OFAiuRHdBxFqPIeph9WqYkVg-oVQWw-E,5543
@@ -88,14 +88,14 @@ stoobly_agent/app/cli/scaffold/docker/workflow/build_decorator.py,sha256=vbmME0c
 stoobly_agent/app/cli/scaffold/docker/workflow/builder.py,sha256=G9zyw_jS0HEHtzl0EvoDQ9MlpTavlyWz0xFpgEZoyVc,6844
 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=V9y4RIyEIT8SiGm3U9OcmU1dr22wqpbSbGO_Z2EMYEI,1197
-stoobly_agent/app/cli/scaffold/docker/workflow/reverse_proxy_decorator.py,sha256=s1l99Y-2h-sSLVtPhcgaa1YRTbSvb6QdgaUeBLHYc4w,1804
+stoobly_agent/app/cli/scaffold/docker/workflow/mock_decorator.py,sha256=A0MvgT3nTB2SjBVwcpq1_AggWb8gU9HHD64E9JbhpDc,1218
+stoobly_agent/app/cli/scaffold/docker/workflow/reverse_proxy_decorator.py,sha256=eeB1Y7L6xYlD9w7oO7a4Ou0Gvfvvd2znnqrZQQz6IlQ,1825
 stoobly_agent/app/cli/scaffold/env.py,sha256=e-Ve4p3RUgzFx22B3SIYttvJ_yLuDtA27oDACZ8n-6E,1140
 stoobly_agent/app/cli/scaffold/hosts_file_manager.py,sha256=FiX1hYEWN4cJiCOV4h6wOOlY7t71uwIwe6t2upS65aQ,5006
 stoobly_agent/app/cli/scaffold/managed_services_docker_compose.py,sha256=-wLBXUi7DCWsfm5KzZzd_kdJKOTl1NT924XR7dyjbSY,574
 stoobly_agent/app/cli/scaffold/service.py,sha256=L9K6QE0k5KSEC8_fSwtdwwTSO_DsIpqSPW-AG7Bg76o,501
 stoobly_agent/app/cli/scaffold/service_command.py,sha256=9kIKiFC5Jo425VWYD4NDvUOdMP-pNyq2D5Ip1ZAPj3A,1054
-stoobly_agent/app/cli/scaffold/service_config.py,sha256=SRtBxdLLa4omAd0JaXsPoyAUu9_PdJ4aVxZOiFMMH8o,3275
+stoobly_agent/app/cli/scaffold/service_config.py,sha256=NwJL4gwWQ_9B0fHrit1QekR6rSMg40m1CDizWxUNWCM,3598
 stoobly_agent/app/cli/scaffold/service_create_command.py,sha256=bmLGgx9qnh-X_i2_XfdWSQIer0gGkaQx6lXZSIzy-LI,2793
 stoobly_agent/app/cli/scaffold/service_delete_command.py,sha256=_nBDQjm8eL62MQpzSCxgUHlW04ZXKG8MDlN1BXxlqww,986
 stoobly_agent/app/cli/scaffold/service_docker_compose.py,sha256=OMUN1-ujQYIZXxDvS4XBf5C9wGalQULkwOiBBQPZbHY,820
@@ -103,7 +103,7 @@ stoobly_agent/app/cli/scaffold/service_workflow.py,sha256=sQ_Edy_wGHKMXpD0DmhnOW
 stoobly_agent/app/cli/scaffold/service_workflow_validate_command.py,sha256=hF3c6cFRaKH01BfwdrCJdX8SEbsfD5CCG8W_yZU4FK4,9948
 stoobly_agent/app/cli/scaffold/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/cli/scaffold/templates/app/.Dockerfile.context,sha256=PRNYTWYYcLfcyrZ5h5u2I7dAJdeFmmxRFpAj_8243Bw,158
-stoobly_agent/app/cli/scaffold/templates/app/.Makefile,sha256=GSghwhsDq4w9UsZuAc_Ozau5hHrOIJSh9B8yhtSOwH4,7649
+stoobly_agent/app/cli/scaffold/templates/app/.Makefile,sha256=F1OIlNw87Vw3HZqWeW908PVEnUtuIWC2gb6Bmivkr5A,8069
 stoobly_agent/app/cli/scaffold/templates/app/.docker-compose.base.yml,sha256=YblNDTUPndYNxupgZ3X8RP6NS4c0u_QwLklyWrpq_qs,295
 stoobly_agent/app/cli/scaffold/templates/app/Makefile,sha256=TEmPG7Bf0KZOnmfsgdzza3UdwcVMmM5Lj1YdLc4cgjA,79
 stoobly_agent/app/cli/scaffold/templates/app/build/.config.yml,sha256=8Wt8ZZ5irvBYYS44xGrR_EWlZDuXH9kyWmquzsh7s8g,19
@@ -195,7 +195,7 @@ stoobly_agent/app/cli/scaffold/workflow_env.py,sha256=x8V5pJmIiklD3f2q2-qq-CORf4
 stoobly_agent/app/cli/scaffold/workflow_log_command.py,sha256=Bke4lMOMxuDUFuAx9nlXHbKgYMO4KAg9ASHvjz4aVWc,1372
 stoobly_agent/app/cli/scaffold/workflow_run_command.py,sha256=DJNyhPrvvZgOwFnPKi5Z3VdrAWfaZW_XbGfgFcnh5QM,9608
 stoobly_agent/app/cli/scaffold/workflow_validate_command.py,sha256=fhHciJXg_u32Wmh8us8LhgQj8D1SxkBADtuBBF4K0FM,4377
-stoobly_agent/app/cli/scaffold_cli.py,sha256=T6kunIY8hMjBhvOydYRKWBjrmOs4X5FXcf-blOKGvyM,25977
+stoobly_agent/app/cli/scaffold_cli.py,sha256=1AjgMhHfjt9HEdShmYLVFhruJ0f2VZyUSvpJycTtGdM,26307
 stoobly_agent/app/cli/scenario_cli.py,sha256=3J1EiJOvunkfWrEkOsanw-XrKkOk78ij_GjBlE9p7CE,8229
 stoobly_agent/app/cli/snapshot_cli.py,sha256=cpCjxFYBuVwLuq_b2lIUu-5zWqupRlrp4xWgDytirSM,10047
 stoobly_agent/app/cli/trace_cli.py,sha256=K7E-vx3JUcqEDSWOdIOi_AieKNQz7dBfmRrVvKDkzFI,4605
@@ -730,8 +730,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.4.1.dist-info/LICENSE,sha256=8QKGyy45eN76Zk52h8gu1DKX2B_gbWgZ3nzDLofEbaE,548
-stoobly_agent-1.4.1.dist-info/METADATA,sha256=LSnoRzku6oP5q5Vy9KIfdSOlYldZLc4wlcvuJYHIbWA,3384
-stoobly_agent-1.4.1.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-stoobly_agent-1.4.1.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
-stoobly_agent-1.4.1.dist-info/RECORD,,
+stoobly_agent-1.4.2.dist-info/LICENSE,sha256=8QKGyy45eN76Zk52h8gu1DKX2B_gbWgZ3nzDLofEbaE,548
+stoobly_agent-1.4.2.dist-info/METADATA,sha256=s7d8HJFX_n4hI7qcFJ3pFkoF-tmRNMIyOAq-CI59vKQ,3384
+stoobly_agent-1.4.2.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+stoobly_agent-1.4.2.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
+stoobly_agent-1.4.2.dist-info/RECORD,,