stoobly-agent 1.0.0__py3-none-any.whl → 1.0.2__py3-none-any.whl

stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.0.0'
+VERSION = '1.0.2'

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

@@ -1,6 +1,6 @@
 import pdb
 
-from ...constants import SERVICE_HOSTNAME, SERVICE_PORT, SERVICE_SCHEME
+from ...constants import SERVICE_HOSTNAME, SERVICE_PORT
 from .builder import WorkflowBuilder
 
 class MockDecorator():

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

@@ -1,5 +1,7 @@
 import pdb
 
+from urllib.parse import urlparse
+
 from ...constants import SERVICE_DNS, SERVICE_HOSTNAME, SERVICE_PORT
 from .builder import WorkflowBuilder
 
@@ -32,12 +34,24 @@ class ReverseProxyDecorator():
     proxy_name = self.workflow_builder.proxy
     proxy_service = services.get(proxy_name) or {}
 
-    # proxying forwards requests to the actual service
+    additional_properties = { 'command': command }
+
+    # Proxying forwards requests to the actual service
+    # If the destination hostname is the same as the service's hostname, then
     # If we set the 'hostname' property, this will cause an "infinite loop"
+    proxy_mode_toks = config.proxy_mode.split(':', 1)
+
+    if len(proxy_mode_toks) > 1:
+      directed = proxy_mode_toks[0] == 'reverse' or proxy_mode_toks[0] == 'upstream'
+      if directed:
+        spec = proxy_mode_toks[1]
+        uri = urlparse(spec)
+        if uri.hostname != self.service_builder.config.hostname:
+          additional_properties['hostname'] = f"{SERVICE_HOSTNAME}"
 
     service = { 
       **proxy_service,
-      **{ 'command': command },
+      **additional_properties,
     }
 
     # If we are reverse proxying to potentially an external host,

stoobly_agent/app/cli/scaffold/service_config.py

@@ -52,8 +52,8 @@ class ServiceConfig(Config):
       self.__scheme = kwargs.get('scheme')
 
   @property
-  def detached(self):
-    return self.__detached
+  def detached(self) -> bool:
+    return not not self.__detached
 
   @detached.setter
   def detached(self, v):
@@ -69,7 +69,7 @@ class ServiceConfig(Config):
 
   @property
   def hostname(self):
-    return self.__hostname
+    return (self.__hostname or '').strip()
 
   @hostname.setter
   def hostname(self, v):
@@ -99,6 +99,12 @@ class ServiceConfig(Config):
 
   @property
   def port(self):
+    if not self.__port:
+      if self.scheme == 'https':
+        return '443' 
+      elif self.scheme == 'http':
+        return '80'
+
     return self.__port
 
   @port.setter
@@ -120,9 +126,9 @@ class ServiceConfig(Config):
     self.__priority = v
 
   @property
-  def proxy_mode(self):
+  def proxy_mode(self) -> str:
     if self.__proxy_mode:
-      return self.__proxy_mode
+      return (self.__proxy_mode or '').strip()
 
     return f"reverse:{self.scheme}://{self.hostname}"
 
@@ -132,7 +138,7 @@ class ServiceConfig(Config):
 
   @property
   def scheme(self):
-    return self.__scheme or 'https'
+    return (self.__scheme or 'https').strip()
 
   @scheme.setter
   def scheme(self, v):

stoobly_agent/app/cli/scaffold/templates/app/.Dockerfile.context

@@ -1,4 +1,4 @@
-FROM stoobly/agent:0.34
+FROM stoobly/agent:1.0
 
 ARG USER_ID
 

stoobly_agent/app/cli/scaffold/templates/app/.Dockerfile.proxy

@@ -1,4 +1,4 @@
-FROM ubuntu:23.10 AS build
+FROM ubuntu:24.04 AS build
 
 WORKDIR /tmp
 
@@ -6,7 +6,7 @@ RUN apt-get update && apt-get install -y curl
 RUN curl -JLO "https://dl.filippo.io/mkcert/v1.4.4?for=linux/amd64" && \
   chmod +x mkcert-v1.4.4-linux-amd64
 
-FROM ubuntu:23.10 AS cert
+FROM ubuntu:24.04 AS cert
 
 ARG SERVICE_HOSTNAME
 
@@ -19,14 +19,14 @@ WORKDIR /home/mkcert
 
 RUN mkcert $SERVICE_HOSTNAME && mkcert -pkcs12 $SERVICE_HOSTNAME && cat $SERVICE_HOSTNAME.pem >> $SERVICE_HOSTNAME-joined.pem && cat $SERVICE_HOSTNAME-key.pem >> $SERVICE_HOSTNAME-joined.pem
 
-FROM stoobly/agent:0.34
+FROM stoobly/agent:1.0
 
-ARG USER_ID
 ARG SERVICE_HOSTNAME
+ARG USER_ID
 
 # Allow running stoobly on port 443
 RUN apt-get update && apt-get install -y curl libcap2-bin
-RUN setcap 'cap_net_bind_service=+ep' /usr/local/bin/python3.8
+RUN setcap 'cap_net_bind_service=+ep' /usr/local/bin/python3.12
 
 # Change user id of stoobly user to that of host's user id
 RUN if [ -n "$USER_ID" ]; then groupmod -g $USER_ID stoobly; usermod -u $USER_ID stoobly; fi

stoobly_agent/app/cli/scaffold_cli.py

@@ -274,7 +274,7 @@ def logs(**kwargs):
 @workflow.command()
 @click.option('--app-dir-path', default=os.getcwd(), help='Path to application directory.')
 @click.option('--certs-dir-path', default=DataDir.instance().certs_dir_path, help='Path to certs directory.')
-@click.option('--context-dir-path', default=DataDir.instance().path, help='Path to Stoobly data directory.')
+@click.option('--context-dir-path', default=DataDir.instance().context_dir_path, help='Path to Stoobly data directory.')
 @click.option('--filter', multiple=True, type=click.Choice([WORKFLOW_CUSTOM_FILTER]), help='Select which service groups to run. Defaults to all.')
 @click.option('--dry-run', default=False, is_flag=True, help='If set, prints commands.')
 @click.option('--extra-compose-path', help='Path to extra compose configuration files.')

{stoobly_agent-1.0.0.dist-info → stoobly_agent-1.0.2.dist-info}/METADATA

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

{stoobly_agent-1.0.0.dist-info → stoobly_agent-1.0.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-stoobly_agent/__init__.py,sha256=g07ijCq1Ne99trefCfylko8K4RwfuxTQjI0P3u1lImc,44
+stoobly_agent/__init__.py,sha256=AewfG39HNAz5wMih3ASPkjYwMTZ40BC3bWka806550w,44
 stoobly_agent/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/api/__init__.py,sha256=FFSlVoTgjPfUNlYPr_7u6-P5Y4WOKyaUfAHtUcB-Xio,810
 stoobly_agent/app/api/application_http_request_handler.py,sha256=jf4fkqjOiCeI2IM5Ro7ie0v_C6y0-7-5TIE_IKMPOfg,5513
@@ -87,17 +87,17 @@ stoobly_agent/app/cli/scaffold/docker/workflow/__init__.py,sha256=47DEQpj8HBSa-_
 stoobly_agent/app/cli/scaffold/docker/workflow/build_decorator.py,sha256=vbmME0cbN2EnNRlzQ2umj7Y3L7aZT-EHqEpkBFMfe8U,758
 stoobly_agent/app/cli/scaffold/docker/workflow/builder.py,sha256=51uGZt9CydBzRwR9aB6uDXuJ2QNm6Iql3AMWv6AtCtw,6919
 stoobly_agent/app/cli/scaffold/docker/workflow/decorators_factory.py,sha256=Mi6SEFpG2MG9pymPLbPTWBMfosi1ThRAs5DXfjBz4Iw,643
-stoobly_agent/app/cli/scaffold/docker/workflow/mock_decorator.py,sha256=-gq0v6iIURWEWCv1eZjLev9ePMAJM21Tlw0NKRpKw9w,1083
-stoobly_agent/app/cli/scaffold/docker/workflow/reverse_proxy_decorator.py,sha256=xuM2AABMbSJGywaOUFY9kUG36OL2mJLFAkIDRCsE2fg,1479
+stoobly_agent/app/cli/scaffold/docker/workflow/mock_decorator.py,sha256=pOvyrauHRB1cOB0OKBA3MQnM-Iwfbuwwop2TDSWs_jo,1067
+stoobly_agent/app/cli/scaffold/docker/workflow/reverse_proxy_decorator.py,sha256=RiNOXaCj_TM-NkFVtu-jnZEIeG8HBKPrVqBbnfRNzio,2031
 stoobly_agent/app/cli/scaffold/env.py,sha256=e-Ve4p3RUgzFx22B3SIYttvJ_yLuDtA27oDACZ8n-6E,1140
 stoobly_agent/app/cli/scaffold/service.py,sha256=HzYTiQGfReYXEY0Iv4YjGpu5fjCicV61Wst4khmmURs,504
 stoobly_agent/app/cli/scaffold/service_command.py,sha256=VtXrgiNO6kD4Oi_alHrJWQhkho3oI-yqs1fe8BPDW6M,1055
-stoobly_agent/app/cli/scaffold/service_config.py,sha256=L9DtG_IwRs8BbN-YImMY_kzz6VkrKVuBj1L_ICP3LPA,5416
+stoobly_agent/app/cli/scaffold/service_config.py,sha256=nXopRnHHw6o4Qh1ekYIJCT8hLIMY0QBN4PAXTCL4qFI,5615
 stoobly_agent/app/cli/scaffold/service_create_command.py,sha256=bmLGgx9qnh-X_i2_XfdWSQIer0gGkaQx6lXZSIzy-LI,2793
 stoobly_agent/app/cli/scaffold/service_workflow.py,sha256=sQ_Edy_wGHKMXpD0DmhnOWkGEKz7gSgEGNI8f7aXOdg,444
 stoobly_agent/app/cli/scaffold/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-stoobly_agent/app/cli/scaffold/templates/app/.Dockerfile.context,sha256=BOwWLDlabphqEDFYp2qC_1MsBcUzvX3lcANW-OQe25w,194
-stoobly_agent/app/cli/scaffold/templates/app/.Dockerfile.proxy,sha256=Lf_lA_izSac50JsOKmU6mGHgj9N4vyXZfynSk1Rpq5c,1047
+stoobly_agent/app/cli/scaffold/templates/app/.Dockerfile.context,sha256=1Zm5_ROKZzFMAkMt8dluEJASI2CBi9d9If_Gch9FMNM,193
+stoobly_agent/app/cli/scaffold/templates/app/.Dockerfile.proxy,sha256=g4FSTh8tlyweisTO29Ci6c1GsPm154RsE1K4EHRgQkg,1047
 stoobly_agent/app/cli/scaffold/templates/app/.Makefile,sha256=di-KeT_8vHlz86wqJeEx_jwbJrC3bSK_RHgJCGYrlpg,4114
 stoobly_agent/app/cli/scaffold/templates/app/.docker-compose.base.yml,sha256=jDEG7TkEyHhlt33H5JC-jD0nwdFk2rsDcaS6N9yjYRk,359
 stoobly_agent/app/cli/scaffold/templates/app/Makefile,sha256=t7xRaCc9q3k7W34S0h9KX02GljSVwGpPnFmiLUvWxsw,80
@@ -182,7 +182,7 @@ 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_log_command.py,sha256=FN-XyMVnulbassBuqeB21J_PQnOsr_LNs0Dg2tcDkjg,435
 stoobly_agent/app/cli/scaffold/workflow_run_command.py,sha256=quPMwahE7TQozbzntIQJRoEhNjv0e_QfpYZnbWQV1iE,4025
-stoobly_agent/app/cli/scaffold_cli.py,sha256=YQ3o6dVICigeeLgouyLT9xAsHhqAxHXQrppHXjziHX8,14753
+stoobly_agent/app/cli/scaffold_cli.py,sha256=5facvX1S-SnJWWe644_8bBV4ytLQlj25RYDiiselvcU,14765
 stoobly_agent/app/cli/scenario_cli.py,sha256=3J1EiJOvunkfWrEkOsanw-XrKkOk78ij_GjBlE9p7CE,8229
 stoobly_agent/app/cli/snapshot_cli.py,sha256=ngEuNxQPBY9YhoBosPXIQ-vWnZQaivjxeT25ObxJeuI,9951
 stoobly_agent/app/cli/trace_cli.py,sha256=K7E-vx3JUcqEDSWOdIOi_AieKNQz7dBfmRrVvKDkzFI,4605
@@ -707,8 +707,8 @@ stoobly_agent/test/mock_data/petstore.yaml,sha256=CCdliJky04Az4FIOkFA883uunwFDHL
 stoobly_agent/test/mock_data/request_show_response.py,sha256=K_a0fP0QT58T8sX9PaM6hqtX1A1depZsqg_GsNPf--k,707
 stoobly_agent/test/mock_data/uspto.yaml,sha256=6U5se7C3o-86J4m9xpOk9Npias399f5CbfWzR87WKwE,7835
 stoobly_agent/test/test_helper.py,sha256=m_oAI7tmRYCNZdKfNqISWhMv3e44tjeYViQ3nTUfnos,1007
-stoobly_agent-1.0.0.dist-info/LICENSE,sha256=8QKGyy45eN76Zk52h8gu1DKX2B_gbWgZ3nzDLofEbaE,548
-stoobly_agent-1.0.0.dist-info/METADATA,sha256=pAJm9wy5Zr4nz3OjofAOO-K_kbhBbkVizMClrkmvvc4,3388
-stoobly_agent-1.0.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-stoobly_agent-1.0.0.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
-stoobly_agent-1.0.0.dist-info/RECORD,,
+stoobly_agent-1.0.2.dist-info/LICENSE,sha256=8QKGyy45eN76Zk52h8gu1DKX2B_gbWgZ3nzDLofEbaE,548
+stoobly_agent-1.0.2.dist-info/METADATA,sha256=4aAEZsGJjZfyGGtfTyuiWVxgKjiB-SdON5oA5Y2RmjU,3388
+stoobly_agent-1.0.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+stoobly_agent-1.0.2.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
+stoobly_agent-1.0.2.dist-info/RECORD,,