stoobly-agent 1.9.3__tar.gz → 1.9.4__tar.gz

{stoobly_agent-1.9.3 → stoobly_agent-1.9.4}/PKG-INFO

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

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

{stoobly_agent-1.9.3 → stoobly_agent-1.9.4}/stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.9.3'
+VERSION = '1.9.4'

{stoobly_agent-1.9.3 → stoobly_agent-1.9.4}/stoobly_agent/app/cli/scaffold/app_config.py

@@ -1,5 +1,5 @@
 from .config import Config
-from .constants import APP_NAME_ENV, APP_NETWORK_ENV
+from .constants import APP_NAME_ENV, APP_NETWORK_ENV, APP_UI_PORT_ENV
 
 class AppConfig(Config):
 
@@ -27,11 +27,20 @@ class AppConfig(Config):
   def network(self, v):
     self.__network = v
 
+  @property
+  def ui_port(self):
+    return self.__ui_port
+
+  @ui_port.setter
+  def ui_port(self, v):
+    self.__ui_port = v
+
   def load(self, config = None):
     config = config or self.read()
 
     self.name = config.get(APP_NAME_ENV)
     self.network = config.get(APP_NETWORK_ENV)
+    self.ui_port = config.get(APP_UI_PORT_ENV)
     
   def write(self):
     config = {}
@@ -42,4 +51,7 @@ class AppConfig(Config):
     if self.network:
       config[APP_NETWORK_ENV] = self.network
 
+    if self.ui_port:
+      config[APP_UI_PORT_ENV] = self.ui_port
+
     super().write(config)

{stoobly_agent-1.9.3 → stoobly_agent-1.9.4}/stoobly_agent/app/cli/scaffold/app_create_command.py

@@ -9,6 +9,7 @@ from .app_command import AppCommand
 class AppCreateOptions(TypedDict):
   name: str
   network: str
+  ui_port: int
 
 class AppCreateCommand(AppCommand):
 
@@ -21,6 +22,9 @@ class AppCreateCommand(AppCommand):
         if kwargs.get('network'):
             self.app_config.network = kwargs['network']
 
+        if kwargs.get('ui_port'):
+            self.app_config.ui_port = kwargs['ui_port']
+
     @property
     def app_name(self):
         return self.app_config.name
@@ -29,6 +33,10 @@ class AppCreateCommand(AppCommand):
     def app_network(self):
         return self.app_config.network
 
+    @property
+    def app_ui_port(self):
+        return self.app_config.ui_port
+
     def build(self):
         dest = self.scaffold_namespace_path
 

{stoobly_agent-1.9.3 → stoobly_agent-1.9.4}/stoobly_agent/app/cli/scaffold/constants.py

@@ -8,6 +8,7 @@ APP_DIR = '${APP_DIR}'
 APP_DIR_ENV = 'APP_DIR'
 APP_NETWORK_ENV = 'APP_NETWORK'
 APP_NAME_ENV = 'APP_NAME'
+APP_UI_PORT_ENV = 'APP_UI_PORT'
 BIN_FOLDER_NAME = 'bin'
 CA_CERTS_DIR_ENV = 'CA_CERTS_DIR'
 CERTS_DIR_ENV = 'CERTS_DIR'

{stoobly_agent-1.9.3 → stoobly_agent-1.9.4}/stoobly_agent/app/cli/scaffold/docker/service/configure_gateway.py

@@ -51,6 +51,8 @@ def __with_networks(config: dict, hostnames: List[str]):
   }
 
 def __with_traefik_config(service_paths: str, compose: dict, app_dir_path: str):
+  config_dest = '/etc/traefik/traefik.yml'
+
   if not compose['volumes']:
     compose['volumes'] = []
 
@@ -68,11 +70,15 @@ def __with_traefik_config(service_paths: str, compose: dict, app_dir_path: str):
     'providers': {
       'docker': {
         'exposedByDefault': False
+      },
+      'file': {
+        'fileName': config_dest,
+        'watch': False
       }
     },
     'tls': {
-      'certificates': certificates
-    }
+      'certificates': certificates,
+    },
   }
 
   for path in service_paths:
@@ -88,7 +94,7 @@ def __with_traefik_config(service_paths: str, compose: dict, app_dir_path: str):
     if config.scheme == 'https':
       certificates.append({
         'certFile': f"/certs/{config.hostname}.crt",
-        'keyFile': f"/certs/{config.hostname}.key"
+        'keyFile': f"/certs/{config.hostname}.key",
       })
 
   # Create traefik.yml in .stoobly/tmp
@@ -102,7 +108,7 @@ def __with_traefik_config(service_paths: str, compose: dict, app_dir_path: str):
     fp.write(yaml.dump(traefik_config))
 
   compose['volumes'].append(
-    f"{os.path.join(APP_DIR, traefik_template_relative_path)}:/etc/traefik/traefik.yml:ro"
+    f"{os.path.join(APP_DIR, traefik_template_relative_path)}:{config_dest}:ro"
   )
 
 def __find_hosts(service_paths):

{stoobly_agent-1.9.3 → stoobly_agent-1.9.4}/stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/mock/.docker-compose.mock.yml

@@ -6,6 +6,6 @@ services:
       service: stoobly_ui.base
     image: stoobly.${USER_ID}
     ports:
-      - '4200:4200'
+      - '${APP_UI_PORT}:4200'
     profiles:
       - mock

{stoobly_agent-1.9.3 → stoobly_agent-1.9.4}/stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/record/.docker-compose.record.yml

@@ -6,7 +6,7 @@ services:
       service: stoobly_ui.base
     image: stoobly.${USER_ID}
     ports:
-      - '4200:4200'
+      - '${APP_UI_PORT}:4200'
     profiles:
       - record
 

{stoobly_agent-1.9.3 → stoobly_agent-1.9.4}/stoobly_agent/app/cli/scaffold_cli.py

@@ -89,6 +89,7 @@ def hostname(ctx):
 @click.option('--app-dir-path', default=current_working_dir, help='Path to create the app scaffold.')
 @click.option('--force', is_flag=True, help='Overwrite maintained scaffolded app files.')
 @click.option('--network', help='App default network name. Defaults to app name.')
+@click.option('--ui-port', default=4200, type=click.IntRange(1, 65535), help='UI service port.')
 @click.argument('app_name')
 def create(**kwargs):
   __validate_app_dir(kwargs['app_dir_path'])

{stoobly_agent-1.9.3 → stoobly_agent-1.9.4}/stoobly_agent/cli.py

@@ -115,12 +115,12 @@ def init(**kwargs):
   upstream proxy modes, SPEC is host specification in
   the form of "http[s]://host[:port]".
 ''')
-@click.option('--proxy-port', default=8080, help='Proxy service port.')
+@click.option('--proxy-port', default=8080, type=click.IntRange(1, 65535), help='Proxy service port.')
 @click.option('--public-directory-path', help='Path to public files. Used for mocking requests.')
 @click.option('--response-fixtures-path', help='Path to response fixtures yaml. Used for mocking requests.')
 @click.option('--ssl-insecure', is_flag=True, default=False, help='Do not verify upstream server SSL/TLS certificates.')
 @click.option('--ui-host', default='0.0.0.0', help='Address to bind UI to.')
-@click.option('--ui-port', default=4200, help='UI service port.')
+@click.option('--ui-port', default=4200, type=click.IntRange(1, 65535), help='UI service port.')
 def run(**kwargs):
     from .app.proxy.run import run as run_proxy