stoobly-agent 1.9.9__tar.gz → 1.9.10__tar.gz

{stoobly_agent-1.9.9 → stoobly_agent-1.9.10}/PKG-INFO

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

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

{stoobly_agent-1.9.9 → stoobly_agent-1.9.10}/stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.9.9'
+VERSION = '1.9.10'

{stoobly_agent-1.9.9 → stoobly_agent-1.9.10}/stoobly_agent/app/cli/scaffold/app.py

@@ -1,3 +1,4 @@
+import hashlib
 import os
 import shutil
 
@@ -73,6 +74,11 @@ class App():
   def data_dir_path(self):
     return self.__data_dir_path
 
+  @property
+  def network(self):
+    # An app may contain one or more context dirs from which services will derive their mocks from
+    return hashlib.md5(self.context_dir_path.encode()).hexdigest()
+
   @property
   def scaffold_namespace_path(self):
     return os.path.join(self.data_dir_path, self.scaffold_namespace)

{stoobly_agent-1.9.9 → stoobly_agent-1.9.10}/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, APP_UI_PORT_ENV
+from .constants import APP_NAME_ENV, APP_UI_PORT_ENV
 
 class AppConfig(Config):
 
@@ -7,7 +7,7 @@ class AppConfig(Config):
     super().__init__(dir)
 
     self.__name = None
-    self.__network = None
+    self.__ui_port = None
 
     self.load()
 
@@ -19,14 +19,6 @@ class AppConfig(Config):
   def name(self, v):
     self.__name = v
 
-  @property
-  def network(self):
-    return self.__network
-
-  @network.setter
-  def network(self, v):
-    self.__network = v
-
   @property
   def ui_port(self):
     return self.__ui_port
@@ -39,7 +31,6 @@ class AppConfig(Config):
     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):
@@ -48,9 +39,6 @@ class AppConfig(Config):
     if self.name:
       config[APP_NAME_ENV] = self.name
 
-    if self.network:
-      config[APP_NETWORK_ENV] = self.network
-
     if self.ui_port:
       config[APP_UI_PORT_ENV] = self.ui_port
 

{stoobly_agent-1.9.9 → stoobly_agent-1.9.10}/stoobly_agent/app/cli/scaffold/app_create_command.py

@@ -19,9 +19,6 @@ class AppCreateCommand(AppCommand):
         if kwargs.get('app_name'):
             self.app_config.name = kwargs['app_name']
 
-        if kwargs.get('network'):
-            self.app_config.network = kwargs['network']
-
         if kwargs.get('ui_port'):
             self.app_config.ui_port = kwargs['ui_port']
 
@@ -29,10 +26,6 @@ class AppCreateCommand(AppCommand):
     def app_name(self):
         return self.app_config.name
 
-    @property
-    def app_network(self):
-        return self.app_config.network
-
     @property
     def app_ui_port(self):
         return self.app_config.ui_port

{stoobly_agent-1.9.9 → stoobly_agent-1.9.10}/stoobly_agent/app/cli/scaffold/constants.py

@@ -21,10 +21,12 @@ NAMESERVERS_FILE = '.nameservers'
 PUBLIC_FOLDER_NAME = 'public'
 SERVICE_DETACHED = '${SERVICE_DETACHED}'
 SERVICE_DETACHED_ENV = 'SERVICE_DETACHED'
-SERVICE_HOSTNAME = '${SERVICE_HOSTNAME}'
-SERVICE_HOSTNAME_ENV = 'SERVICE_HOSTNAME'
 SERVICE_DNS = '${SERVICE_DNS}'
 SERVICE_DNS_ENV = 'SERVICE_DNS'
+SERVICE_HOSTNAME = '${SERVICE_HOSTNAME}'
+SERVICE_HOSTNAME_ENV = 'SERVICE_HOSTNAME'
+SERVICE_ID = '${SERVICE_ID}'
+SERVICE_ID_ENV = 'SERVICE_ID'
 SERVICE_NAME = '${SERVICE_NAME}'
 SERVICE_NAME_ENV = 'SERVICE_NAME'
 SERVICE_PROXY_MODE = '${SERVICE_PROXY_MODE}'

{stoobly_agent-1.9.9 → stoobly_agent-1.9.10}/stoobly_agent/app/cli/scaffold/docker/service/builder.py

@@ -7,8 +7,12 @@ from stoobly_agent.config.data_dir import DATA_DIR_NAME
 
 from ...app_config import AppConfig
 from ...constants import (
-  APP_DIR, DOCKER_NAMESPACE, SERVICE_NAME, SERVICE_NAME_ENV, 
-  SERVICE_HOSTNAME, SERVICE_HOSTNAME_ENV, SERVICE_NAME_ENV, SERVICE_PORT, SERVICE_PORT_ENV, SERVICE_SCHEME, SERVICE_SCHEME_ENV, 
+  APP_DIR, DOCKER_NAMESPACE, 
+  SERVICE_HOSTNAME, SERVICE_HOSTNAME_ENV,
+  SERVICE_NAME, SERVICE_NAME_ENV, 
+  SERVICE_ID,
+  SERVICE_PORT, SERVICE_PORT_ENV, 
+  SERVICE_SCHEME, SERVICE_SCHEME_ENV, 
   STOOBLY_HOME_DIR, STOOBLY_HOME_DIR, 
   WORKFLOW_NAME, WORKFLOW_NAME_ENV, WORKFLOW_SCRIPTS, WORKFLOW_TEMPLATE
 )
@@ -91,7 +95,7 @@ class ServiceBuilder(Builder):
     if not self.config.hostname:
       return
 
-    service_id = self.config.id
+    service_id = SERVICE_ID
     environment = { **self.env_dict() }
     labels = [
       'traefik.enable=true',

{stoobly_agent-1.9.9 → stoobly_agent-1.9.10}/stoobly_agent/app/cli/scaffold/service_config.py

@@ -7,6 +7,7 @@ from .config import Config
 from .constants import (
   SERVICE_DETACHED_ENV,
   SERVICE_HOSTNAME_ENV,
+  SERVICE_ID_ENV,
   SERVICE_PRIORITY_ENV,
   SERVICE_PORT_ENV,
   SERVICE_PROXY_MODE_ENV,
@@ -55,7 +56,7 @@ class ServiceConfig(Config):
 
   @property
   def id(self):
-    return hashlib.md5(os.path.basename(self.dir).encode()).hexdigest()
+    return hashlib.md5(self.dir.encode()).hexdigest()
 
   @property
   def hostname(self):
@@ -171,7 +172,7 @@ class ServiceConfig(Config):
       config[SERVICE_SCHEME_ENV] = self.scheme
 
     config[SERVICE_DETACHED_ENV] = bool(self.detached)
-
+    config[SERVICE_ID_ENV] = self.id
     config[SERVICE_PROXY_MODE_ENV] = self.proxy_mode
 
     super().write(config)

{stoobly_agent-1.9.9 → stoobly_agent-1.9.10}/stoobly_agent/app/cli/scaffold/service_workflow_validate_command.py

@@ -116,8 +116,9 @@ class ServiceWorkflowValidateCommand(ServiceCommand, ValidateCommand):
 
   def validate_internal_hostname(self, url: str) -> None:
     print(f"Validating hostname inside Docker network, url: {url}")
-
-    network = f"{self.workflow_name}.{self.app_config.network}" 
+    
+    # See WorkflowRunCommand for how 'network' is generated
+    network = f"{self.workflow_name}.{self.app.network}" 
     timeout_seconds = 1
     output = self.docker_client.containers.run(
       image='curlimages/curl:8.11.0',

{stoobly_agent-1.9.9 → stoobly_agent-1.9.10}/stoobly_agent/app/cli/scaffold/templates/app/.Makefile

@@ -44,7 +44,7 @@ workflow_script=.stoobly/tmp/$(workflow_namespace)/run.sh
 certs_dir_options=--ca-certs-dir-path $(ca_certs_dir) --certs-dir-path $(certs_dir)
 working_dir_options=--app-dir-path $(app_dir) --context-dir-path $(context_dir)
 
-workflow_down_options=--user-id $(USER_ID) $(workflow_down_extra_options)
+workflow_down_options=$(working_dir_options) --user-id $(USER_ID) $(workflow_down_extra_options)
 workflow_log_options=$(workflow_log_extra_options)
 workflow_run_options=--namespace $(workflow_namespace) --script-path $(workflow_script) $(workflow_service_options)
 workflow_up_options=$(working_dir_options) $(certs_dir_options) --user-id $(USER_ID) $(workflow_up_extra_options)

{stoobly_agent-1.9.9 → stoobly_agent-1.9.10}/stoobly_agent/app/cli/scaffold/workflow_run_command.py

@@ -1,11 +1,9 @@
 import dns.resolver
+import hashlib
 import os
 import pdb
 import subprocess
 import re
-import yaml
-
-from typing import TypedDict
 
 from stoobly_agent.config.data_dir import DataDir
 from stoobly_agent.lib.logger import Logger
@@ -19,26 +17,10 @@ from .constants import (
 from .docker.constants import APP_EGRESS_NETWORK_TEMPLATE, APP_INGRESS_NETWORK_TEMPLATE, DOCKERFILE_CONTEXT
 from .workflow_command import WorkflowCommand
 from .workflow_env import WorkflowEnv
+from ..types.workflow_run_command import BuildOptions, ComposeOptions, DownOptions, UpOptions
 
 LOG_ID = 'WorkflowRunCommand'
 
-class ComposeOptions(TypedDict):
-  namespace: str
-  user_id: str
-
-class BuildOptions(ComposeOptions):
-  user_id: str
-  verbose: bool
-
-class DownOptions(ComposeOptions):
-  extra_compose_path: str
-  rmi: bool
-
-class UpOptions(ComposeOptions):
-  attached: bool
-  extra_compose_path: str
-  pull: bool
-
 class WorkflowRunCommand(WorkflowCommand):
   def __init__(self, app: App, **kwargs):
     super().__init__(app, **kwargs)
@@ -48,7 +30,7 @@ class WorkflowRunCommand(WorkflowCommand):
     self.__ca_certs_dir_path = kwargs.get('ca_certs_dir_path') or app.ca_certs_dir_path
     self.__certs_dir_path = kwargs.get('certs_dir_path') or app.certs_dir_path
     self.__context_dir_path = kwargs.get('context_dir_path') or app.context_dir_path
-    self.__network = f"{kwargs.get('network') or {self.workflow_name}}.{self.app_config.network}"
+    self.__network = f"{kwargs.get('namespace') or self.workflow_name}.{kwargs.get('network') or app.network}"
     
   @property
   def app_dir_path(self):

{stoobly_agent-1.9.9 → stoobly_agent-1.9.10}/stoobly_agent/app/cli/scaffold_cli.py

@@ -88,7 +88,6 @@ def hostname(ctx):
   help="Scaffold application"
 )
 @click.option('--app-dir-path', default=current_working_dir, help='Path to create the app scaffold.')
-@click.option('--network', callback=validate_network, help='App default network name. Defaults to app name.')
 @click.option('--quiet', is_flag=True, help='Disable log output.')
 @click.option('--ui-port', default=4200, type=click.IntRange(1, 65535), help='UI service port.')
 @click.argument('app_name', callback=validate_app_name)
@@ -100,9 +99,6 @@ def create(**kwargs):
   if not kwargs['quiet'] and os.path.exists(app.scaffold_namespace_path):
     print(f"{kwargs['app_dir_path']} already exists, updating scaffold maintained files...")
 
-  if not kwargs['network']:
-    kwargs['network'] = kwargs['app_name']
-
   AppCreateCommand(app, **kwargs).build()
 
 @app.command(
@@ -344,7 +340,10 @@ def copy(**kwargs):
 def down(**kwargs):  
   os.environ[env_vars.LOG_LEVEL] = kwargs['log_level']
 
-  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE, **kwargs)
+  containerized = kwargs['containerized']
+
+  app_dir_path = current_working_dir if containerized else kwargs['app_dir_path']
+  app = App(app_dir_path, DOCKER_NAMESPACE, **kwargs)
   __validate_app(app)
 
   __with_namespace_defaults(kwargs)
@@ -827,10 +826,6 @@ def __with_namespace_defaults(kwargs):
   if not kwargs.get('namespace'):
     kwargs['namespace'] = kwargs.get('workflow_name')
 
-  # If network there was a network option, but it is not set, default network to namespace
-  if 'network' in kwargs and not kwargs['network']:
-    kwargs['network'] = kwargs['namespace']
-
 def __workflow_create(app, **kwargs):
   command = WorkflowCreateCommand(app, **kwargs)
 

stoobly_agent-1.9.10/stoobly_agent/app/cli/types/workflow_run_command.py

@@ -0,0 +1,18 @@
+from typing import TypedDict
+
+class ComposeOptions(TypedDict):
+  namespace: str
+  user_id: str
+
+class BuildOptions(ComposeOptions):
+  user_id: str
+  verbose: bool
+
+class DownOptions(ComposeOptions):
+  extra_compose_path: str
+  rmi: bool
+
+class UpOptions(ComposeOptions):
+  attached: bool
+  extra_compose_path: str
+  pull: bool