stoobly-agent 1.8.1__tar.gz → 1.8.3__tar.gz

{stoobly_agent-1.8.1 → stoobly_agent-1.8.3}/PKG-INFO

@@ -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 → stoobly_agent-1.8.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.8.1"
+version = "1.8.3"
 
 [tool.poetry.dependencies]
 python = "^3.10"

{stoobly_agent-1.8.1 → stoobly_agent-1.8.3}/stoobly_agent/__init__.py

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

{stoobly_agent-1.8.1 → stoobly_agent-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-1.8.1 → stoobly_agent-1.8.3}/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-1.8.1 → stoobly_agent-1.8.3}/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-1.8.1 → stoobly_agent-1.8.3}/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-1.8.1 → stoobly_agent-1.8.3}/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-1.8.1 → stoobly_agent-1.8.3}/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-1.8.1 → stoobly_agent-1.8.3}/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-1.8.1 → stoobly_agent-1.8.3}/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-1.8.1 → stoobly_agent-1.8.3}/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):
     '''