stoobly-agent 1.8.1__py3-none-any.whl → 1.8.3__py3-none-any.whl

stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.8.1'
+VERSION = '1.8.3'

stoobly_agent/app/cli/scaffold/docker/service/builder.py

@@ -96,6 +96,7 @@ class ServiceBuilder(Builder):
     labels = [
       'traefik.enable=true',
       f"traefik.http.routers.{service_id}.rule=Host(`{SERVICE_HOSTNAME}`)",
+      f"traefik.http.routers.{service_id}.entrypoints={SERVICE_PORT}",
       f"traefik.http.services.{service_id}.loadbalancer.server.port={SERVICE_PORT}"
     ]
     volumes = []

stoobly_agent/app/cli/scaffold/docker/service/configure_gateway.py

@@ -81,7 +81,7 @@ def __with_traefik_config(service_paths: str, compose: dict, app_dir_path: str):
     if not config.hostname:
       continue
 
-    entry_points[config.port] = {
+    entry_points[str(config.port)] = {
       'address': f":{config.port}"
     }
 

stoobly_agent/app/cli/scaffold/service_config.py

@@ -66,18 +66,23 @@ class ServiceConfig(Config):
     self.__hostname = v
 
   @property
-  def port(self):
+  def port(self) -> int:
     if not self.__port:
       if self.scheme == 'https':
-        return '443' 
+        return 443
       elif self.scheme == 'http':
-        return '80'
+        return 80
 
     return self.__port
 
   @port.setter
-  def port(self, v):
-    self.__port = v
+  def port(self, v: int):
+    if v == None:
+      self.__port = v
+    else:
+      v = int(v)
+      if v > 0 and v <= 65535:
+        self.__port = v
 
   @property
   def priority(self):
@@ -106,10 +111,10 @@ class ServiceConfig(Config):
     if not self.port:
       return _proxy_mode
 
-    if self.scheme == 'http' and self.port == '80': 
+    if self.scheme == 'http' and self.port == 80: 
       return _proxy_mode
 
-    if self.scheme == 'https' and self.port == '443':
+    if self.scheme == 'https' and self.port == 443:
       return _proxy_mode
 
     return f"{_proxy_mode}:{self.port}"

stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/.docker-compose.base.yml

@@ -1,5 +1,8 @@
 services:
   stoobly_ui.base:
+    environment:
+      SERVICE_NAME: ${SERVICE_NAME}
+      WORKFLOW_NAME: ${WORKFLOW_NAME}
     extends:
       file: ../.docker-compose.base.yml
       service: context_base 

stoobly_agent/app/cli/scaffold/templates/build/services/build/mock/.configure

@@ -6,6 +6,9 @@
 echo "Configuring intercept..."
 stoobly-agent intercept configure --mode mock --policy all
 
+echo "Enabling intercept..."
+stoobly-agent intercept enable
+
 entrypoint=$1
 
 if [ -e "$entrypoint" ]; then

stoobly_agent/app/cli/scaffold/templates/build/services/build/test/.configure

@@ -6,6 +6,9 @@
 echo "Configuring intercept..."
 stoobly-agent intercept configure --mode mock --policy all
 
+echo "Enabling intercept..."
+stoobly-agent intercept enable
+
 entrypoint=$1
 
 if [ -e "$entrypoint" ]; then

stoobly_agent/app/cli/scaffold_cli.py

@@ -129,7 +129,7 @@ def mkcert(**kwargs):
 @click.option('--env', multiple=True, help='Specify an environment variable.')
 @click.option('--force', is_flag=True, help='Overwrite maintained scaffolded service files.')
 @click.option('--hostname', help='Service hostname.')
-@click.option('--port', help='Service port.')
+@click.option('--port', type=click.IntRange(1, 65535), help='Service port.')
 @click.option('--priority', default=5, type=click.FloatRange(1.0, 9.0), help='Determines the service run order. Lower values run first.')
 @click.option('--proxy-mode', help='''
   Proxy mode can be "regular", "transparent", "socks5",
@@ -212,7 +212,10 @@ def delete(**kwargs):
   help="Update a service config"
 )
 @click.option('--app-dir-path', default=current_working_dir, help='Path to application directory.')
-@click.option('--priority', help='Determines the service run order.')
+@click.option('--hostname', help='Service hostname.')
+@click.option('--port', type=click.IntRange(1, 65535), help='Service port.')
+@click.option('--priority', default=5, type=click.FloatRange(1.0, 9.0), help='Determines the service run order. Lower values run first.')
+@click.option('--scheme', type=click.Choice(['http', 'https']), help='Defaults to https if hostname is set.')
 @click.argument('service_name')
 def update(**kwargs):
   app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
@@ -224,9 +227,18 @@ def update(**kwargs):
 
   service_config = ServiceConfig(service.dir_path)
 
+  if kwargs['hostname']:
+    service_config.hostname = kwargs['hostname']
+
   if kwargs['priority']:
     service_config.priority = kwargs['priority']
 
+  if kwargs['port']:
+    service_config.port = kwargs['port']
+
+  if kwargs['scheme']:
+    service_config.scheme = kwargs['scheme']
+
   service_config.write()
 
 @workflow.command(

stoobly_agent/app/proxy/mock/custom_not_found_response_builder.py

@@ -11,7 +11,7 @@ class CustomNotFoundResponseBuilder():
 
   def build(self):
     self.__response.status_code = custom_response_codes.NOT_FOUND
-    self.__response.raw = BytesIO('Request not found'.encode()) 
+    self.__response.raw = BytesIO('Request not found. To troubleshoot see https://docs.stoobly.com/guides/how-to-mock-apis/troubleshooting'.encode()) 
     self.__response.headers = {
       'Access-Control-Allow-Origin': '*',
       'Access-Control-Allow-Methods': 'GET, OPTIONS, POST, PATCH, PUT, DELETE',

stoobly_agent/app/proxy/run.py

@@ -5,6 +5,8 @@ import signal
 
 from mitmproxy.net import tls
 
+from stoobly_agent.app.cli.scaffold.constants import SERVICE_NAME_ENV
+from stoobly_agent.app.cli.scaffold.templates.constants import CORE_MOCK_UI_SERVICE_NAME
 from stoobly_agent.config.mitmproxy import MitmproxyConfig
 
 # Monkey patch for OpenSSL unsafe legacy renegotiation disabled
@@ -85,16 +87,29 @@ def __with_cli_options(config: MitmproxyConfig, cli_options: dict):
     config.set(tuple(options))
 
 def __commit_options(options: dict):
+    changed = False
+    service_name = os.environ.get(SERVICE_NAME_ENV)
     settings = Settings.instance()
 
-    settings.proxy.intercept.active = not not options.get('intercept')
+    if not service_name or options.get('intercept'):
+        # In the case when service name is set,
+        # only update if intercept is explicitly enabled
+        intercept = not not options.get('intercept')
+        changed = settings.proxy.intercept.active != intercept
+        settings.proxy.intercept.active = intercept
 
-    if options.get('proxy_host') and options.get('proxy_port'):
-        settings.proxy.url = f"http://{options.get('proxy_host')}:{options.get('proxy_port')}"
+    if not service_name or service_name == CORE_MOCK_UI_SERVICE_NAME:
+        # Causes potentially unintended side effects when run as part of scaffold
+        # Defer to ui service for configuration in this case
+        if options.get('proxy_host') and options.get('proxy_port'):
+            settings.proxy.url = f"http://{options.get('proxy_host')}:{options.get('proxy_port')}"
 
-    settings.ui.active = not options.get('headless')
+        settings.ui.active = not options.get('headless')
 
-    settings.commit()
+        changed = True
+
+    if changed:
+        settings.commit()
 
 def __filter_options(options):
     ''' 

{stoobly_agent-1.8.1.dist-info → stoobly_agent-1.8.3.dist-info}/METADATA

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

{stoobly_agent-1.8.1.dist-info → stoobly_agent-1.8.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-stoobly_agent/__init__.py,sha256=-pR52NA8t3qmcLZZmZyqkvCEMnoglpgGrKb6iyh9Ws8,44
+stoobly_agent/__init__.py,sha256=J2JqrH2GFu96vjqCEMJ_KNcQvXZMEz3kpPg-23ehEjo,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=Vvz53yB0bR7J-QqMAkLlhcZrA4P64ZEN7w8cMbgl6o0,5261
@@ -81,8 +81,8 @@ stoobly_agent/app/cli/scaffold/docker/builder.py,sha256=uiGqhxBHEasZAqLzjKUGUs-1
 stoobly_agent/app/cli/scaffold/docker/constants.py,sha256=1khQdgTaQ89ykGRNdTQh_ejFOdjNFGaZ_3cOGda6y7Y,692
 stoobly_agent/app/cli/scaffold/docker/service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/cli/scaffold/docker/service/build_decorator.py,sha256=ZU7z4bkvdS3OK5O4fJhlA9_PNwnFtZW6t7vNF7V5obQ,1003
-stoobly_agent/app/cli/scaffold/docker/service/builder.py,sha256=HJ4XOjno-Jecrlo2m0eZwNt2zvZreG32Zzo1AfT8Kq4,5786
-stoobly_agent/app/cli/scaffold/docker/service/configure_gateway.py,sha256=kKJDxbjV9cy5JIvnKKdVppdmlagvtTZ3z1j9-sS3Qic,3728
+stoobly_agent/app/cli/scaffold/docker/service/builder.py,sha256=4cIMSYvgrkGWVuuYymiwlrR829O91qQl9ML8FhaDMj4,5857
+stoobly_agent/app/cli/scaffold/docker/service/configure_gateway.py,sha256=avGKpxOTXtIvFguSAaihxQwRzUm6I7UfeZ9_WzvwXuA,3733
 stoobly_agent/app/cli/scaffold/docker/service/types.py,sha256=qB-yYHlu-PZDc0HYgTUvE5bWNpHxaSThC3JUG8okR1k,88
 stoobly_agent/app/cli/scaffold/docker/workflow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/cli/scaffold/docker/workflow/build_decorator.py,sha256=VKD9hXbJGRIWHS5IeYXeX0-FQ0F43zG8VmsegL6eYwA,703
@@ -96,7 +96,7 @@ stoobly_agent/app/cli/scaffold/hosts_file_manager.py,sha256=zNX5wh6zXQ4J2BA0YYdD
 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=aM9x_LQVl9MJyO7yqzwiXWlbbNg9FJA-Tk9IwVINLok,3798
+stoobly_agent/app/cli/scaffold/service_config.py,sha256=edL356wqpfJgFdeSrWof-CAUB1Tgi4nO1Jx9nkql9Qc,3903
 stoobly_agent/app/cli/scaffold/service_create_command.py,sha256=1B6TK3JDAjouikCV84WDrX7b0crdPMPIo1caMwhi-L8,2815
 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
@@ -142,15 +142,15 @@ stoobly_agent/app/cli/scaffold/templates/app/gateway/mock/.docker-compose.mock.y
 stoobly_agent/app/cli/scaffold/templates/app/gateway/record/.docker-compose.record.yml,sha256=eyLH2h33Peunus8M1sUKL9AALCG2ABhV_heiJKhvgwo,138
 stoobly_agent/app/cli/scaffold/templates/app/gateway/test/.docker-compose.test.yml,sha256=oJO6i0lsuQaQeIH80yoPZo3Vs0LzUAH2WRl853yLq6g,136
 stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/.config.yml,sha256=XnLQZMzzMMIwVycjyPN5QXsmRztkTFAna1kIHYuDfJQ,19
-stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/.docker-compose.base.yml,sha256=bxrtZqf3YtaJCukzScslh5PgWC5q8xkGIP1wKJf33LA,111
+stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/.docker-compose.base.yml,sha256=bEmlH0ga_p3vsYZFagMGxvw47KscURmbYrfegMZb1CI,202
 stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/.docker-compose.exec.yml,sha256=JN89sU5uRf6YqHvN_O63K8rwQIAPJHbhFDLFmuUjKNM,304
 stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/mock/.docker-compose.mock.yml,sha256=FnCn64DjxyAiB2P_1JUwFmXslMR961nVZHkYiEXytlg,232
 stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/record/.docker-compose.record.yml,sha256=t34FNYZboJSfrKnIB2oJ3UuE_mJaW77-hcbSn3sfWec,235
-stoobly_agent/app/cli/scaffold/templates/build/services/build/mock/.configure,sha256=ZL-39jgiP8X01rE3DJ8rN-BxEy-srYxjj-CGJhQH278,276
+stoobly_agent/app/cli/scaffold/templates/build/services/build/mock/.configure,sha256=SKvht2K_3tW08K24rl8_j0jMYOhq1k-GsVwhoHwjxYA,337
 stoobly_agent/app/cli/scaffold/templates/build/services/build/mock/.init,sha256=ecmyS6EZpa3op0CmO7bvd3pmAwRb0oLwj1qsTkee9_o,247
 stoobly_agent/app/cli/scaffold/templates/build/services/build/record/.configure,sha256=eXp9eKJ-TORE5B0zLW4-t43ogS3nxtj2SmSeDALbi1U,278
 stoobly_agent/app/cli/scaffold/templates/build/services/build/record/.init,sha256=ecmyS6EZpa3op0CmO7bvd3pmAwRb0oLwj1qsTkee9_o,247
-stoobly_agent/app/cli/scaffold/templates/build/services/build/test/.configure,sha256=ZL-39jgiP8X01rE3DJ8rN-BxEy-srYxjj-CGJhQH278,276
+stoobly_agent/app/cli/scaffold/templates/build/services/build/test/.configure,sha256=SKvht2K_3tW08K24rl8_j0jMYOhq1k-GsVwhoHwjxYA,337
 stoobly_agent/app/cli/scaffold/templates/build/services/build/test/.init,sha256=ecmyS6EZpa3op0CmO7bvd3pmAwRb0oLwj1qsTkee9_o,247
 stoobly_agent/app/cli/scaffold/templates/build/services/entrypoint/mock/.configure,sha256=xWJGhCKQejtVLFAOEZMWnaCeGAc9tuqEh_WsG3xfA_0,184
 stoobly_agent/app/cli/scaffold/templates/build/services/entrypoint/mock/.init,sha256=AcM6SLUsZa6BOLDjxteDR_AXIco47GZNkWQCGPhPDAY,189
@@ -202,7 +202,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=eF3aaK4OIZXYuSBEAeBnhAL7EZrS1G4mSYrJbEiXt2o,11082
 stoobly_agent/app/cli/scaffold/workflow_validate_command.py,sha256=Uo_yo6rVR1ZR7xpvsQvlH48AyMBVLRupd4G-bRjzm_Q,5584
-stoobly_agent/app/cli/scaffold_cli.py,sha256=g6LEBiL1Lz0IQwlohpz8LFkhoaQukRtnQHgjzwAiASs,29528
+stoobly_agent/app/cli/scaffold_cli.py,sha256=zrXf2nUI5jRnf6x-j3kKmia8vH_AngjpweVnjdD_R3Q,30075
 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
@@ -324,7 +324,7 @@ stoobly_agent/app/proxy/mitmproxy/response_body_facade.py,sha256=vIu6cuCSiZDocvn
 stoobly_agent/app/proxy/mitmproxy/response_facade.py,sha256=0wCSzUULUhDDV93QXUgzMNxiiSZwcu-kUB2C5z1Ck0Y,4311
 stoobly_agent/app/proxy/mock/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/proxy/mock/context.py,sha256=vDo5_3WBL73mVFnsmQWvcxvPg5nWtRJbigSrE3zGc-o,794
-stoobly_agent/app/proxy/mock/custom_not_found_response_builder.py,sha256=xHjA2CNhW5A4NyPkDzws6DY5YQeJqF6b3Y3k0iJKNss,611
+stoobly_agent/app/proxy/mock/custom_not_found_response_builder.py,sha256=0KWB3KFxVrnJOKDaYxm5eoJEccw7IpJZRyUvBX61-8k,697
 stoobly_agent/app/proxy/mock/eval_fixtures_service.py,sha256=hc4VLnN50HBaWvFnrhQUJqdH-r3jBu9DHrpt8gbvkHY,3847
 stoobly_agent/app/proxy/mock/eval_request_service.py,sha256=A1tcE3wmrC1HwLpz0aRuRw-Nucn0dyHD_yHw5BeQEJU,8146
 stoobly_agent/app/proxy/mock/hashed_request_decorator.py,sha256=h1ma90fdaYI9LBWpMWMqWBz-RjNwI628O4VuS_uUBX4,5061
@@ -353,7 +353,7 @@ stoobly_agent/app/proxy/replay/replay_request_service.py,sha256=UuTPPef6jchrJSjV
 stoobly_agent/app/proxy/replay/replay_scenario_service.py,sha256=9jV-iO5EBg8geUblEtjjWRFIkom_Pqmo7P-lTc3S4Xw,2824
 stoobly_agent/app/proxy/replay/rewrite_params_service.py,sha256=jEHlT6_OHq_VBa09Hd6QaRyErv7tZnziDvW7m3Q8CQg,2234
 stoobly_agent/app/proxy/replay/trace_context.py,sha256=lKpnQWVCUTcMPE-SOi90za3U1yL0VeBlIgj_KP63VsE,10435
-stoobly_agent/app/proxy/run.py,sha256=SfzMsaY6Ugsg4XEkQeU25lTyiMC0GRDEiYR70GUUaN4,4145
+stoobly_agent/app/proxy/run.py,sha256=RKq5vha8jQNlQaLGrijSg79AIDAmVoIGvCr9qZ0FDOo,4900
 stoobly_agent/app/proxy/settings.py,sha256=R0LkSa9HrkUXvCd-nur4syJePjbQZdlnAnOPpGnCx38,2172
 stoobly_agent/app/proxy/simulate_intercept_service.py,sha256=R-L2dh2dfYFebttWXU0NwyxFI_jP6Ud36oKPC-T8HiI,1942
 stoobly_agent/app/proxy/test/__init__.py,sha256=uW0Ab27oyH2odTeVRjcuUJF8A1FLbTT5sBMzhGZr1so,89
@@ -743,8 +743,8 @@ stoobly_agent/test/mock_data/scaffold/docker-compose-local-service.yml,sha256=1W
 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.8.1.dist-info/LICENSE,sha256=o93sj12cdoEOsTCjPaPFsw3Xq0SXs3pPcY-9reE2sEw,548
-stoobly_agent-1.8.1.dist-info/METADATA,sha256=H5ERJq8XRbJ5SGJOsCaLlCu2sfEeQ92RF92cQfUg9js,3087
-stoobly_agent-1.8.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-stoobly_agent-1.8.1.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
-stoobly_agent-1.8.1.dist-info/RECORD,,
+stoobly_agent-1.8.3.dist-info/LICENSE,sha256=o93sj12cdoEOsTCjPaPFsw3Xq0SXs3pPcY-9reE2sEw,548
+stoobly_agent-1.8.3.dist-info/METADATA,sha256=SanBD75sF3pN2uha2WNqODn0sk_nbx_0lPmFmfrIKNo,3087
+stoobly_agent-1.8.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+stoobly_agent-1.8.3.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
+stoobly_agent-1.8.3.dist-info/RECORD,,