stoobly-agent 1.2.2__tar.gz → 1.3.0__tar.gz

{stoobly_agent-1.2.2 → stoobly_agent-1.3.0}/PKG-INFO

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

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

{stoobly_agent-1.2.2 → stoobly_agent-1.3.0}/stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.2.2'
+VERSION = '1.3.0'

{stoobly_agent-1.2.2 → stoobly_agent-1.3.0}/stoobly_agent/app/cli/helpers/certificate_authority.py

@@ -23,10 +23,6 @@ class CertificateAuthority():
 
     def __init__(self, certs_dir = DataDir.instance().mitmproxy_conf_dir_path, cn = MITMPROXY_CN):
         self.certs_dir = certs_dir
-
-        if not os.path.exists(certs_dir):
-            self.generate_certs()
-
         self.cn = cn
         self.key_size = 2048
 
@@ -201,5 +197,5 @@ class CertificateAuthority():
             return org_name, alt_names
 
         except Exception as e:
-            Logger.instance(LOG_ID).warn(f"Could not retrieve certificate for {domain}: {e}")
+            Logger.instance(LOG_ID).debug(f"Could not retrieve certificate for {domain}: {e}")
             return None, alt_names

{stoobly_agent-1.2.2 → stoobly_agent-1.3.0}/stoobly_agent/app/cli/scaffold/app.py

@@ -5,20 +5,18 @@ from stoobly_agent.config.data_dir import DataDir, DATA_DIR_NAME
 
 class App():
 
-  def __init__(self, path: str, namespace: str, **kwargs):
+  def __init__(self, path: str, scaffold_namespace: str, **kwargs):
     path = os.path.abspath(path) or os.getcwd()
     data_dir: DataDir = DataDir.instance(path) 
 
-    self.__scaffold_dir_path = data_dir.path
+    self.__data_dir_path = data_dir.path
     self.__ca_certs_dir_path = kwargs.get('ca_certs_dir_path') or data_dir.mitmproxy_conf_dir_path
-    self.__certs_dir_path = data_dir.certs_dir_path
-    self.__context_dir_path = data_dir.context_dir_path
+    self.__certs_dir_path = kwargs.get('certs_dir_path') or data_dir.certs_dir_path
+    self.__context_dir_path = kwargs.get('context_dir_path') or data_dir.context_dir_path
     self.__data_dir = data_dir
     self.__dir_path = path
-    self.__name = os.path.basename(self.__dir_path)
-    self.__network = os.path.basename(self.__dir_path)
-    self.__namespace = namespace
-    self.__skip_validate_path = not not kwargs.get('skip_validate_path')
+    self.__scaffold_namespace = scaffold_namespace
+    self.__skip_validate_path = not not kwargs.get('dry_run')
 
   @property
   def ca_certs_dir_path(self):
@@ -60,40 +58,24 @@ class App():
     return os.path.exists(self.dir_path)
 
   @property
-  def name(self):
-    return self.__name
-
-  @name.setter
-  def name(self, v: str):
-    self.__name = v
-
-  @property
-  def network(self):
-    return self.__network
-
-  @network.setter
-  def network(self, v: str):
-    self.__network = v
+  def scaffold_namespace(self):
+    return self.__scaffold_namespace
 
   @property
-  def namespace(self):
-    return self.__namespace
-
-  @property
-  def namespace_path(self):
-    return os.path.join(self.data_dir_path, self.namespace)
+  def scaffold_namespace_path(self):
+    return os.path.join(self.data_dir_path, self.scaffold_namespace)
 
   @property
   def dir_path(self):
     return self.__dir_path
 
   @property
-  def scaffold_dir_path(self):
-    return self.__scaffold_dir_path
+  def data_dir_path(self):
+    return self.__data_dir_path
 
   @property
   def scaffold_namespace_path(self):
-    return os.path.join(self.scaffold_dir_path, self.namespace)
+    return os.path.join(self.data_dir_path, self.scaffold_namespace)
 
   @property
   def services(self):
@@ -101,7 +83,7 @@ class App():
 
   @property
   def service_paths(self):
-    services_dir = os.path.join(self.scaffold_dir_path, self.namespace)
+    services_dir = os.path.join(self.data_dir_path, self.scaffold_namespace)
 
     services = []
     for filename in os.listdir(services_dir):

{stoobly_agent-1.2.2 → stoobly_agent-1.3.0}/stoobly_agent/app/cli/scaffold/app_command.py

@@ -13,9 +13,6 @@ class AppCommand(Command):
 
     self.__config = AppConfig(self.scaffold_namespace_path)
 
-    if not self.__config.network:
-      self.__config.network = app.network
-
   @property
   def app_dir_path(self):
     return self.app.dir_path
@@ -33,16 +30,16 @@ class AppCommand(Command):
     return self.__config.path
 
   @property
-  def app_namespace_path(self):
-    return self.app.namespace_path
+  def scaffold_namespace_path(self):
+    return self.app.scaffold_namespace_path
 
   @property
   def app_templates_root_dir(self):
     return os.path.join(self.templates_root_dir, 'app')
 
   @property
-  def scaffold_dir_path(self):
-    return self.app.scaffold_dir_path
+  def data_dir_path(self):
+    return self.app.data_dir_path
 
   @property
   def scaffold_namespace_path(self):

{stoobly_agent-1.2.2 → stoobly_agent-1.3.0}/stoobly_agent/app/cli/scaffold/app_config.py

@@ -1,15 +1,24 @@
 from .config import Config
-from .constants import APP_NETWORK_ENV
+from .constants import APP_NAME_ENV, APP_NETWORK_ENV
 
 class AppConfig(Config):
 
   def __init__(self, dir: str):
     super().__init__(dir)
 
+    self.__name = None
     self.__network = None
 
     self.load()
 
+  @property
+  def name(self):
+    return self.__name
+
+  @name.setter
+  def name(self, v):
+    self.__name = v
+
   @property
   def network(self):
     return self.__network
@@ -21,11 +30,15 @@ class AppConfig(Config):
   def load(self, config = None):
     config = config or self.read()
 
-    self.__network = config.get(APP_NETWORK_ENV)
+    self.name = config.get(APP_NAME_ENV)
+    self.network = config.get(APP_NETWORK_ENV)
     
   def write(self):
     config = {}
 
+    if self.name:
+      config[APP_NAME_ENV] = self.name
+
     if self.network:
       config[APP_NETWORK_ENV] = self.network
 

stoobly_agent-1.3.0/stoobly_agent/app/cli/scaffold/app_create_command.py

@@ -0,0 +1,40 @@
+import os
+import pdb
+
+from typing import TypedDict
+
+from .app import App
+from .app_command import AppCommand
+
+class AppCreateOptions(TypedDict):
+  name: str
+  network: str
+
+class AppCreateCommand(AppCommand):
+
+    def __init__(self, app: App, **kwargs: AppCreateOptions):
+        super().__init__(app)
+
+        if kwargs.get('app_name'):
+            self.app_config.name = kwargs['app_name']
+
+        if kwargs.get('network'):
+            self.app_config.network = kwargs['network']
+
+    @property
+    def app_name(self):
+        return self.app_config.name
+
+    @property
+    def app_network(self):
+        return self.app_config.network
+
+    def build(self):
+        dest = self.scaffold_namespace_path
+
+        self.app.copy_folders_and_hidden_files(self.app_templates_root_dir, dest)
+
+        with open(os.path.join(dest, '.gitignore'), 'w') as fp:
+            fp.write("\n".join(['gateway/.docker-compose.base.yml', '**/.env']))
+
+        self.app_config.write()

{stoobly_agent-1.2.2 → stoobly_agent-1.3.0}/stoobly_agent/app/cli/scaffold/command.py

@@ -4,7 +4,7 @@ class Command():
 
   def __init__(self, app: App):
     self.__app = app
-    self.__namespace = app.namespace
+    self.__namespace = app.scaffold_namespace
 
   @property
   def app(self):

{stoobly_agent-1.2.2 → stoobly_agent-1.3.0}/stoobly_agent/app/cli/scaffold/constants.py

@@ -1,9 +1,11 @@
-from typing import Literal
+import os
 
-from stoobly_agent.config.data_dir import DATA_DIR_NAME
+from typing import Literal
 
+from stoobly_agent.config.data_dir import CERTS_DIR_NAME, DATA_DIR_NAME
 
 APP_NETWORK_ENV = 'APP_NETWORK'
+APP_NAME_ENV = 'APP_NAME'
 BIN_FOLDER_NAME = 'bin'
 CA_CERTS_DIR_ENV = 'CA_CERTS_DIR'
 CERTS_DIR_ENV = 'CERTS_DIR'
@@ -22,6 +24,7 @@ SERVICE_HOSTNAME = '${SERVICE_HOSTNAME}'
 SERVICE_HOSTNAME_ENV = 'SERVICE_HOSTNAME'
 SERVICE_DNS = '${SERVICE_DNS}'
 SERVICE_DNS_ENV = 'SERVICE_DNS'
+SERVICE_NAME = '${SERVICE_NAME}'
 SERVICE_NAME_ENV = 'SERVICE_NAME'
 SERVICE_PROXY_MODE = '${SERVICE_PROXY_MODE}'
 SERVICE_PROXY_MODE_ENV = 'SERVICE_PROXY_MODE'
@@ -31,7 +34,8 @@ SERVICE_PORT = '${SERVICE_PORT}'
 SERVICE_PORT_ENV = 'SERVICE_PORT'
 SERVICE_PRIORITY_ENV = 'SERVICE_PRIORITY'
 STOOBLY_HOME_DIR = '/home/stoobly'
-STOOBLY_DATA_DIR = f"{STOOBLY_HOME_DIR}/{DATA_DIR_NAME}"
+STOOBLY_DATA_DIR = os.path.join(STOOBLY_HOME_DIR, DATA_DIR_NAME)
+STOOBLY_CERTS_DIR = os.path.join(STOOBLY_DATA_DIR, CERTS_DIR_NAME)
 USER_ID_ENV = 'USER_ID'
 VIRTUAL_HOST_ENV = 'VIRTUAL_HOST'
 VIRTUAL_PORT_ENV = 'VIRTUAL_PORT'
@@ -44,7 +48,9 @@ WORKFLOW_CONTAINER_CONFIGURE_TEMPLATE = '{service_name}.' + WORKFLOW_CONTAINER_C
 WORKFLOW_CONTAINER_INIT_TEMPLATE = '{service_name}.' + WORKFLOW_CONTAINER_INIT
 WORKFLOW_CONTAINER_PROXY_TEMPLATE = '{service_name}.' + WORKFLOW_CONTAINER_PROXY
 WORKFLOW_MOCK_TYPE = 'mock'
+WORKFLOW_NAME = '${WORKFLOW_NAME}'
 WORKFLOW_NAME_ENV = 'WORKFLOW_NAME'
+WORKFLOW_NAMESPACE_ENV = 'WORKFLOW_NAMESPACE'
 WORKFLOW_RECORD_TYPE = 'record'
 WORKFLOW_TEST_TYPE = 'test'
 

{stoobly_agent-1.2.2 → stoobly_agent-1.3.0}/stoobly_agent/app/cli/scaffold/docker/app_builder.py

@@ -1,7 +1,7 @@
 import os
 
 from .builder import Builder
-from .constants import DOCKER_COMPOSE_BASE, DOCKERFILE_CONTEXT, DOCKERFILE_PROXY
+from .constants import DOCKER_COMPOSE_BASE, DOCKERFILE_CONTEXT
 from ..app_config import AppConfig
 
 class AppBuilder(Builder):
@@ -18,9 +18,5 @@ class AppBuilder(Builder):
     return os.path.join(self.dir_path, DOCKERFILE_CONTEXT)
 
   @property
-  def proxy_base(self):
-    return 'proxy_base'
-
-  @property
-  def proxy_docker_file_path(self):
-    return os.path.join(self.dir_path, DOCKERFILE_PROXY)
+  def stoobly_base(self):
+    return 'stoobly_base'

{stoobly_agent-1.2.2 → stoobly_agent-1.3.0}/stoobly_agent/app/cli/scaffold/docker/builder.py

@@ -86,7 +86,7 @@ class Builder():
 
   def with_network(self, network):
     self.__networks[network] = {
-      'name': network
+      'name': f"{APP_NETWORK}.{network}"
     }
     return self
 

{stoobly_agent-1.2.2 → stoobly_agent-1.3.0}/stoobly_agent/app/cli/scaffold/docker/constants.py

@@ -3,7 +3,6 @@ DOCKER_COMPOSE_BASE = '.docker-compose.base.yml'
 DOCKER_COMPOSE_BASE_TEMPLATE = '.docker-compose.base.template.yml'
 DOCKER_COMPOSE_CUSTOM = 'docker-compose.yml'
 DOCKERFILE_CONTEXT = '.Dockerfile.context'
-DOCKERFILE_PROXY = '.Dockerfile.proxy'
 DOCKERFILE_SERVICE = 'Dockerfile.source'
 GATEWAY_NETWORK = 'gateway'
 

{stoobly_agent-1.2.2 → stoobly_agent-1.3.0}/stoobly_agent/app/cli/scaffold/docker/service/builder.py

@@ -2,7 +2,7 @@ import os
 import pdb
 
 from ...app_config import AppConfig
-from ...constants import SERVICE_HOSTNAME, SERVICE_HOSTNAME_ENV, STOOBLY_HOME_DIR
+from ...constants import SERVICE_HOSTNAME, SERVICE_HOSTNAME_ENV, SERVICE_NAME, STOOBLY_HOME_DIR, WORKFLOW_NAME
 from ...service_config import ServiceConfig
 from ..app_builder import AppBuilder
 from ..builder import Builder
@@ -44,6 +44,13 @@ class ServiceBuilder(Builder):
   def configure_base_service(self):
     return self.services.get(self.configure_base)
 
+  @property
+  def extends_service(self):
+    if self.config.detached:
+      return self.app_builder.stoobly_base
+    else:
+      return self.app_builder.context_base
+
   @property
   def proxy_base(self):
     return f"{self.service_name}.proxy_base"
@@ -52,10 +59,6 @@ class ServiceBuilder(Builder):
   def proxy_base_service(self):
     return self.services.get(self.proxy_base)
 
-  @property
-  def service_mount(self):
-    return f".:{STOOBLY_HOME_DIR}"
-
   @property
   def service_name(self):
     return self.__service_name
@@ -80,9 +83,8 @@ class ServiceBuilder(Builder):
       },
       'extends': {
         'file': os.path.relpath(self.app_builder.compose_file_path, self.dir_path),
-        'service': self.app_builder.proxy_base
+        'service': self.extends_service
       },
-      'volumes': [self.service_mount]
     })
 
     args[SERVICE_HOSTNAME_ENV] = f"{SERVICE_HOSTNAME}"
@@ -90,13 +92,12 @@ class ServiceBuilder(Builder):
   def build_init_base(self):
     environment = {}
     self.with_service(self.init_base, {
-      'command': ['bin/.init', 'dist'],
+      'command': ['bin/.init'],
       'environment': environment,
       'extends': {
         'file': os.path.relpath(self.app_builder.compose_file_path, self.dir_path),
-        'service': self.app_builder.context_base
+        'service': self.extends_service
       },
-      'volumes': [self.service_mount]
     })
 
   def build_configure_base(self):
@@ -106,7 +107,7 @@ class ServiceBuilder(Builder):
       'environment': environment,
       'extends': {
         'file': os.path.relpath(self.app_builder.compose_file_path, self.dir_path),
-        'service': self.app_builder.context_base
+        'service': self.extends_service
       }
     })
 

{stoobly_agent-1.2.2 → stoobly_agent-1.3.0}/stoobly_agent/app/cli/scaffold/docker/workflow/builder.py

@@ -3,12 +3,13 @@ import pdb
 
 from typing import List
 
+from stoobly_agent.config.data_dir import DATA_DIR_NAME
+
 from ...constants import (
-  COMPOSE_TEMPLATE, STOOBLY_HOME_DIR, SERVICE_HOSTNAME, SERVICE_HOSTNAME_ENV, SERVICE_NAME_ENV, 
+  COMPOSE_TEMPLATE, DOCKER_NAMESPACE, STOOBLY_HOME_DIR, SERVICE_HOSTNAME, SERVICE_HOSTNAME_ENV, SERVICE_NAME_ENV, 
   SERVICE_PORT, SERVICE_PORT_ENV, SERVICE_SCHEME, SERVICE_SCHEME_ENV, 
   WORKFLOW_CONTAINER_CONFIGURE_TEMPLATE, WORKFLOW_CONTAINER_INIT_TEMPLATE, WORKFLOW_CONTAINER_PROXY_TEMPLATE, WORKFLOW_NAME_ENV
 )
-from ...templates.constants import SERVICE_HOSTNAME_BUILD_ARG
 from ..builder import Builder
 from ..service.builder import ServiceBuilder
 
@@ -21,13 +22,15 @@ class WorkflowBuilder(Builder):
 
     self.__context = '../'
     self.__profiles = [self.__workflow_name]
-    self.__workdir = os.path.join(STOOBLY_HOME_DIR, self.workflow_name)
 
     if not service_builder:
       service_path = os.path.dirname(workflow_path)
       service_builder = ServiceBuilder(service_path)
 
     self.__service_builder = service_builder
+    self.__working_dir = os.path.join(
+      STOOBLY_HOME_DIR, DATA_DIR_NAME, DOCKER_NAMESPACE, self.service_builder.service_name, self.workflow_name
+    )
 
     if self.config.hostname:
       self.with_public_network()
@@ -58,13 +61,6 @@ class WorkflowBuilder(Builder):
   def context(self):
     return self.__context
 
-  @property
-  def context_build(self):
-    return {
-      'context': self.context,
-      'dockerfile': self.context_docker_file_path,
-    }
-
   @property
   def context_docker_file_path(self):
     return os.path.relpath(self.service_builder.app_builder.context_docker_file_path, self.service_path)
@@ -81,21 +77,6 @@ class WorkflowBuilder(Builder):
   def proxy(self):
     return WORKFLOW_CONTAINER_PROXY_TEMPLATE.format(service_name=self.namespace)
 
-  @property
-  def proxy_build(self):
-    args = {}
-    args[SERVICE_HOSTNAME_BUILD_ARG] = SERVICE_HOSTNAME
-
-    return {
-      'args': args,
-      'context': self.context,
-      'dockerfile': self.proxy_docker_file_path,
-    }
-
-  @property
-  def proxy_docker_file_path(self):
-    return os.path.relpath(self.service_builder.app_builder.proxy_docker_file_path, self.service_path)
-
   @property
   def service_builder(self):
     return self.__service_builder
@@ -128,19 +109,21 @@ class WorkflowBuilder(Builder):
     volumes = []
 
     service = {
-      'build': self.context_build,
       'environment': environment,
       'extends': self.service_builder.build_extends_init_base(self.dir_path),
       'profiles': self.profiles,
       'volumes': volumes,
-      'working_dir': self.__workdir,
+      'working_dir': self.__working_dir,
     }
 
     if self.config.hostname:
       self.__with_url_environment(environment)
 
     if self.config.detached:
+      # Mount named volume
       volumes.append(f"{self.service_builder.service_name}:{STOOBLY_HOME_DIR}/.stoobly")
+      # Mount docker folder
+      volumes.append(f"../..:{STOOBLY_HOME_DIR}/.stoobly/docker")
 
     self.with_service(self.init, service)
 
@@ -154,13 +137,12 @@ class WorkflowBuilder(Builder):
     volumes = []
 
     service = {
-      'build': self.context_build,
       'depends_on': depends_on,
       'environment': environment,
       'extends': self.service_builder.build_extends_configure_base(self.dir_path),
       'profiles': self.profiles,
       'volumes': volumes,
-      'working_dir': self.__workdir,
+      'working_dir': self.__working_dir,
     }
 
     if self.config.hostname:
@@ -173,6 +155,7 @@ class WorkflowBuilder(Builder):
 
     if self.config.detached:
       volumes.append(f"{self.service_builder.service_name}:{STOOBLY_HOME_DIR}/.stoobly")
+      volumes.append(f"../..:{STOOBLY_HOME_DIR}/.stoobly/docker")
 
     self.with_service(self.configure, service)
 
@@ -187,14 +170,13 @@ class WorkflowBuilder(Builder):
     volumes = []
 
     service = {
-      'build': self.proxy_build, 
       'depends_on': depends_on,
       'environment': environment,
       'extends': self.service_builder.build_extends_proxy_base(self.dir_path),
       'networks': networks,
       'profiles': self.profiles,
       'volumes': volumes,
-      'working_dir': self.__workdir,
+      'working_dir': self.__working_dir,
     }
 
     if self.configure in self.services:
@@ -217,6 +199,7 @@ class WorkflowBuilder(Builder):
 
     if self.config.detached:
       volumes.append(f"{self.service_builder.service_name}:{STOOBLY_HOME_DIR}/.stoobly")
+      volumes.append(f"../..:{STOOBLY_HOME_DIR}/.stoobly/docker")
 
     self.with_service(self.proxy, service)
 

{stoobly_agent-1.2.2 → stoobly_agent-1.3.0}/stoobly_agent/app/cli/scaffold/docker/workflow/mock_decorator.py

@@ -1,6 +1,7 @@
+import os
 import pdb
 
-from ...constants import SERVICE_HOSTNAME, SERVICE_PORT
+from ...constants import SERVICE_HOSTNAME, SERVICE_PORT, STOOBLY_CERTS_DIR
 from .builder import WorkflowBuilder
 
 class MockDecorator():
@@ -20,7 +21,6 @@ class MockDecorator():
     config = self.service_builder.config
 
     command = [
-      '--certs', f"/etc/ssl/certs/{SERVICE_HOSTNAME}-joined.pem",
       '--headless',
       '--intercept',
       '--lifecycle-hooks-path', 'lifecycle_hooks.py',
@@ -30,6 +30,10 @@ class MockDecorator():
       '--ssl-insecure'
     ]
 
+    if config.scheme == 'https':
+      command.append('--certs')
+      command.append(os.path.join(STOOBLY_CERTS_DIR, f"{SERVICE_HOSTNAME}-joined.pem"))
+
     services = self.__workflow_builder.services
     proxy_name = self.__workflow_builder.proxy
     proxy_service = services.get(proxy_name) or {}

{stoobly_agent-1.2.2 → stoobly_agent-1.3.0}/stoobly_agent/app/cli/scaffold/docker/workflow/reverse_proxy_decorator.py

@@ -1,8 +1,9 @@
+import os
 import pdb
 
 from urllib.parse import urlparse
 
-from ...constants import SERVICE_HOSTNAME, SERVICE_PORT
+from ...constants import SERVICE_HOSTNAME, SERVICE_PORT, STOOBLY_CERTS_DIR
 from .builder import WorkflowBuilder
 
 class ReverseProxyDecorator():
@@ -22,7 +23,6 @@ class ReverseProxyDecorator():
     config = self.service_builder.config
 
     command = [
-      '--certs', f"/etc/ssl/certs/{SERVICE_HOSTNAME}-joined.pem",
       '--headless',
       '--lifecycle-hooks-path', 'lifecycle_hooks.py',
       '--proxy-mode', config.proxy_mode,
@@ -30,6 +30,10 @@ class ReverseProxyDecorator():
       '--ssl-insecure'
     ]
 
+    if config.scheme == 'https':
+      command.append('--certs')
+      command.append(os.path.join(STOOBLY_CERTS_DIR, f"{SERVICE_HOSTNAME}-joined.pem"))
+
     services = self.workflow_builder.services
     proxy_name = self.workflow_builder.proxy
     proxy_service = services.get(proxy_name) or {}

{stoobly_agent-1.2.2 → stoobly_agent-1.3.0}/stoobly_agent/app/cli/scaffold/service.py

@@ -14,7 +14,7 @@ class Service():
 
   @property
   def dir_path(self):
-    return os.path.join(self.app.namespace_path, self.service_name)
+    return os.path.join(self.app.scaffold_namespace_path, self.service_name)
 
   @property
   def service_name(self):

{stoobly_agent-1.2.2 → stoobly_agent-1.3.0}/stoobly_agent/app/cli/scaffold/service_command.py

@@ -33,7 +33,7 @@ class ServiceCommand(AppCommand):
   @property
   def service_path(self):
     return os.path.join(
-      self.scaffold_dir_path,
+      self.data_dir_path,
       self.service_relative_path
     )
 

{stoobly_agent-1.2.2 → stoobly_agent-1.3.0}/stoobly_agent/app/cli/scaffold/service_workflow_validate_command.py

@@ -1,21 +1,17 @@
 import os
 import pdb
 import socket
-import ssl
 import time
+
 from collections import Counter
 from pathlib import Path
 
-import requests
 import yaml
 from docker.models.containers import Container
-from requests.adapters import HTTPAdapter
-from urllib3 import Retry
 
 from stoobly_agent.app.cli.scaffold.constants import (
   FIXTURES_FOLDER_NAME,
   STOOBLY_DATA_DIR,
-  STOOBLY_HOME_DIR,
   VIRTUAL_HOST_ENV,
   VIRTUAL_PORT_ENV,
   VIRTUAL_PROTO_ENV,
@@ -39,7 +35,9 @@ class ServiceWorkflowValidateCommand(ServiceCommand, ValidateCommand):
 
     self.workflow_name = kwargs['workflow_name']
     self.hostname = self.service_config.hostname
-    self.service_docker_compose = ServiceDockerCompose(app_dir_path=app.dir_path, target_workflow_name=self.workflow_name, service_name=self.service_name, hostname=self.hostname)
+    self.service_docker_compose = ServiceDockerCompose(
+      app_dir_path=app.dir_path, target_workflow_name=self.workflow_name, service_name=self.service_name, hostname=self.hostname
+    )
 
   @property
   def fixtures_dir_path(self):
@@ -48,7 +46,7 @@ class ServiceWorkflowValidateCommand(ServiceCommand, ValidateCommand):
   @property
   def workflow_path(self):
     return os.path.join(
-      self.scaffold_dir_path,
+      self.data_dir_path,
       self.workflow_relative_path
     )
   @property
@@ -151,7 +149,7 @@ class ServiceWorkflowValidateCommand(ServiceCommand, ValidateCommand):
       return
 
     # Check contents of fixtures folder to confirm it's shared
-    fixtures_folder_path = f"{STOOBLY_HOME_DIR}/{self.workflow_name}/{FIXTURES_FOLDER_NAME}"
+    fixtures_folder_path = f"{FIXTURES_FOLDER_NAME}"
     exec_result = container.exec_run(f"ls -A {fixtures_folder_path}")
     output = exec_result.output
 

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

@@ -0,0 +1,6 @@
+FROM stoobly/agent:1.3
+
+ARG USER_ID
+
+# Change user id of stoobly user to that of host's user id
+RUN if [ -n "$USER_ID" ]; then usermod -u $USER_ID stoobly; fi