stoobly-agent 1.6.6__py3-none-any.whl → 1.6.7__py3-none-any.whl

stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.6.6'
+VERSION = '1.6.7'

stoobly_agent/app/cli/scaffold/constants.py

@@ -4,6 +4,7 @@ from typing import Literal
 
 from stoobly_agent.config.data_dir import CERTS_DIR_NAME, DATA_DIR_NAME
 
+APP_DIR = '${APP_DIR}'
 APP_DIR_ENV = 'APP_DIR'
 APP_NETWORK_ENV = 'APP_NETWORK'
 APP_NAME_ENV = 'APP_NAME'

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

@@ -1,8 +1,17 @@
 import os
 import pdb
 
+from typing import List
+
+from stoobly_agent.config.data_dir import DATA_DIR_NAME
+
 from ...app_config import AppConfig
-from ...constants import WORKFLOW_SCRIPTS, WORKFLOW_TEMPLATE
+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, 
+  STOOBLY_HOME_DIR, STOOBLY_HOME_DIR, 
+  WORKFLOW_NAME, WORKFLOW_NAME_ENV, WORKFLOW_SCRIPTS, WORKFLOW_TEMPLATE
+)
 from ...service_config import ServiceConfig
 from ..app_builder import AppBuilder
 from ..builder import Builder
@@ -20,16 +29,16 @@ class ServiceBuilder(Builder):
     self.app_builder = app_builder
 
     self.__config = config
+    self.__env = [SERVICE_NAME_ENV, WORKFLOW_NAME_ENV]
     self.__service_name = os.path.basename(service_path)
+    self.__working_dir = os.path.join(
+      STOOBLY_HOME_DIR, DATA_DIR_NAME, DOCKER_NAMESPACE, SERVICE_NAME, WORKFLOW_NAME
+    )
 
   @property
   def app_base(self):
     return f"{self.service_name}.app_base"
 
-  @property
-  def init_base(self):
-    return f"{self.service_name}.init_base"
-
   @property
   def config(self):
     return self.__config
@@ -49,6 +58,14 @@ class ServiceBuilder(Builder):
     else:
       return self.app_builder.context_base
 
+  @property
+  def init_base(self):
+    return f"{self.service_name}.init_base"
+
+  @property
+  def init_base_service(self):
+    return self.services.get(self.init_base)
+
   @property
   def proxy_base(self):
     return f"{self.service_name}.proxy_base"
@@ -74,15 +91,45 @@ class ServiceBuilder(Builder):
     if not self.config.hostname:
       return
 
-    self.with_service(self.proxy_base, {
+    environment = { **self.env_dict() }
+    volumes = []
+
+    environment['VIRTUAL_HOST'] = SERVICE_HOSTNAME
+    environment['VIRTUAL_PORT'] = SERVICE_PORT
+    environment['VIRTUAL_PROTO'] = SERVICE_SCHEME
+
+    if self.config.detached:
+      volumes.append(f"{self.service_name}:{STOOBLY_HOME_DIR}/{DATA_DIR_NAME}")
+      volumes.append(f"../..:{STOOBLY_HOME_DIR}/{DATA_DIR_NAME}/{DOCKER_NAMESPACE}")
+
+    base = {
+      'environment': environment,
       'extends': {
         'file': os.path.relpath(self.app_builder.compose_file_path, self.dir_path),
         'service': self.extends_service
       },
-    })
+      'working_dir': self.__working_dir,
+    }
+
+    if len(volumes):
+      base['volumes'] = volumes
+
+    self.with_service(self.proxy_base, base)
 
   def build_init_base(self):
-    environment = {}
+    environment = { **self.env_dict() }
+    volumes = [f"{APP_DIR}:/app"]
+
+    if self.config.hostname:
+      self.__with_url_environment(environment)
+
+    if self.config.detached:
+      # Mount named volume
+      volumes.append(f"{self.service_name}:{STOOBLY_HOME_DIR}/{DATA_DIR_NAME}")
+
+      # Mount docker folder
+      volumes.append(f"../..:{STOOBLY_HOME_DIR}/{DATA_DIR_NAME}/{DOCKER_NAMESPACE}")
+
     self.with_service(self.init_base, {
       'command': [f"{WORKFLOW_SCRIPTS}/{WORKFLOW_TEMPLATE}/.init", 'bin/init'],
       'environment': environment,
@@ -90,18 +137,47 @@ class ServiceBuilder(Builder):
         'file': os.path.relpath(self.app_builder.compose_file_path, self.dir_path),
         'service': self.extends_service
       },
+      'volumes': volumes,
+      'working_dir': self.__working_dir,
     })
 
   def build_configure_base(self):
-    environment = {}
-    self.with_service(self.configure_base, {
+    environment = { **self.env_dict() }
+    volumes = []
+
+    if self.config.hostname:
+      self.__with_url_environment(environment)
+
+    if self.config.detached:
+      volumes.append(f"{self.service_name}:{STOOBLY_HOME_DIR}/${DATA_DIR_NAME}")
+      volumes.append(f"../..:{STOOBLY_HOME_DIR}/{DATA_DIR_NAME}/{DOCKER_NAMESPACE}")
+
+    base = {
       'command': [f"{WORKFLOW_SCRIPTS}/{WORKFLOW_TEMPLATE}/.configure", 'bin/configure'],
       'environment': environment,
       'extends': {
         'file': os.path.relpath(self.app_builder.compose_file_path, self.dir_path),
         'service': self.extends_service
-      }
-    })
+      },
+      'working_dir': self.__working_dir,
+    }
+
+    if len(volumes):
+      base['volumes'] = volumes
+
+    self.with_service(self.configure_base, base)
+
+  def env_dict(self):
+    env = {}
+    for e in self.__env:
+      env[e] = '${' + e + '}'
+    return env
+
+  def with_env(self, v: List[str]): 
+    if not isinstance(v, list):
+      return self
+    self.__env += v
+    return self
 
   def write(self):
     self.build_init_base()
@@ -117,4 +193,13 @@ class ServiceBuilder(Builder):
     if self.networks:
       compose['networks'] = self.networks
 
-    super().write(compose)
+    super().write(compose)
+
+  def __with_url_environment(self, environment):
+    environment[SERVICE_HOSTNAME_ENV] = SERVICE_HOSTNAME
+
+    if self.config.scheme:
+      environment[SERVICE_SCHEME_ENV] = SERVICE_SCHEME
+
+    if self.config.port:
+      environment[SERVICE_PORT_ENV] = SERVICE_PORT

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

@@ -1,14 +1,10 @@
 import os
 import pdb
 
-from typing import List
-
-from stoobly_agent.config.data_dir import DATA_DIR_NAME
-
 from ...constants import (
-  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
+  COMPOSE_TEMPLATE, 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, WORKFLOW_NAME_ENV
 )
 from ..builder import Builder
 from ..service.builder import ServiceBuilder
@@ -21,16 +17,13 @@ class WorkflowBuilder(Builder):
     super().__init__(workflow_path, COMPOSE_TEMPLATE.format(workflow=self.__workflow_name))
 
     self.__context = '../'
-    self.__profiles = [self.__workflow_name]
+    self.__profiles = [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
-    )
 
   @property
   def app(self):
@@ -40,10 +33,6 @@ class WorkflowBuilder(Builder):
   def base_compose_file_path(self):
     return os.path.relpath(self.service_builder.compose_file_path, self.dir_path)
 
-  @property
-  def init(self):
-    return WORKFLOW_CONTAINER_INIT_TEMPLATE.format(service_name=self.namespace)
-
   @property
   def config(self):
     return self.service_builder.config
@@ -60,6 +49,10 @@ class WorkflowBuilder(Builder):
   def context_docker_file_path(self):
     return os.path.relpath(self.service_builder.app_builder.context_docker_file_path, self.service_path)
 
+  @property
+  def init(self):
+    return WORKFLOW_CONTAINER_INIT_TEMPLATE.format(service_name=self.namespace)
+
   @property
   def namespace(self):
     return f"{self.service_builder.service_name}"
@@ -97,26 +90,16 @@ class WorkflowBuilder(Builder):
       self.build_proxy() # Depends on configure, must call build_configure first
 
   def build_init(self):
-    environment = { **self.env_dict() }
-    volumes = []
+    # If the init_base service does not exist, we can't extend from it, return
+    if not self.service_builder.init_base_service:
+      return
 
+      return
     service = {
-      'environment': environment,
       'extends': self.service_builder.build_extends_init_base(self.dir_path),
       'profiles': self.profiles,
-      'volumes': volumes,
-      '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)
 
   def build_configure(self):
@@ -125,30 +108,18 @@ class WorkflowBuilder(Builder):
       return
 
     depends_on = {}
-    environment = { **self.env_dict() }
-    volumes = []
 
     service = {
       '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.__working_dir,
     }
 
-    if self.config.hostname:
-      self.__with_url_environment(environment)
-
     if self.init in self.services:
       depends_on[self.init] = {
         'condition': 'service_completed_successfully',
       }
 
-    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)
 
   def build_proxy(self):
@@ -157,18 +128,13 @@ class WorkflowBuilder(Builder):
       return
 
     depends_on = {}
-    environment = { **self.env_dict() }
     networks = {}
-    volumes = []
 
     service = {
       '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.__working_dir,
     }
 
     if self.configure in self.services:
@@ -180,18 +146,10 @@ class WorkflowBuilder(Builder):
         'condition': 'service_completed_successfully',
       }
 
-    environment['VIRTUAL_HOST'] = SERVICE_HOSTNAME
-    environment['VIRTUAL_PORT'] = SERVICE_PORT
-    environment['VIRTUAL_PROTO'] = SERVICE_SCHEME
-
     # Expose this container service to the public network 
     # so that it is accessible to other Stoobly services
     networks[self.egress_network_name] = {}
 
-    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)
 
   def env_dict(self):
@@ -213,12 +171,6 @@ class WorkflowBuilder(Builder):
 
       super().write(compose, dest)
 
-  def with_env(self, v: List[str]): 
-    if not isinstance(v, list):
-      return self
-    self._env += v
-    return self
-
   def write(self):
     compose = {
       'services': self.services,

stoobly_agent/app/cli/scaffold/service_create_command.py

@@ -27,6 +27,7 @@ class ServiceCreateCommand(ServiceCommand):
 
   def build(self):
     service_builder = ServiceBuilder(self.service_config)
+    service_builder.with_env(list(self.env_vars))
     service_decorators = []
 
     for service_decorator in service_decorators:
@@ -36,7 +37,6 @@ class ServiceCreateCommand(ServiceCommand):
 
     workflow_kwargs = {
       'app_dir_path': self.app_dir_path,
-      'env': self.env_vars,
       'namespace': self.namespace, 
       'service_name': self.service_name,
     }

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

@@ -6,7 +6,7 @@ services:
     extends:
       file: ../.docker-compose.base.yml
       service: context_base
-    working_dir: /home/stoobly/.stoobly/docker/build/${WORKFLOW_NAME}
+    working_dir: /home/stoobly/.stoobly/docker/${SERVICE_NAME}/${WORKFLOW_NAME}
   build.init_base:
     command: 
     - ${SERVICE_SCRIPTS}/${SERVICE_NAME}/${WORKFLOW_TEMPLATE}/.init
@@ -14,4 +14,6 @@ services:
     extends:
       file: ../.docker-compose.base.yml
       service: context_base
-    working_dir: /home/stoobly/.stoobly/docker/build/${WORKFLOW_NAME}
+    volumes:
+    - ${APP_DIR}:/app
+    working_dir: /home/stoobly/.stoobly/docker/${SERVICE_NAME}/${WORKFLOW_NAME}

stoobly_agent/app/cli/scaffold/templates/app/build/mock/.docker-compose.mock.yml

@@ -5,7 +5,7 @@ services:
       service: build.init_base
     image: stoobly.${USER_ID}
     profiles:
-      - mock
+      - ${WORKFLOW_NAME}
   build.configure:
     depends_on:
       build.init:
@@ -15,4 +15,4 @@ services:
       service: build.configure_base
     image: stoobly.${USER_ID}
     profiles:
-      - mock
+      - ${WORKFLOW_NAME}

stoobly_agent/app/cli/scaffold/templates/app/build/mock/docker-compose.yml

@@ -0,0 +1,7 @@
+# Define services here
+#
+# Container services that are intended to be run as part of a workflow need to have the workflow name added to the 'profiles' property
+# e.g. If we want to run a service as part of the 'mock' workflow, then the following should be added
+# profiles:
+#   - mock
+services: {}

stoobly_agent/app/cli/scaffold/templates/app/build/record/.docker-compose.record.yml

@@ -5,7 +5,7 @@ services:
       service: build.init_base
     image: stoobly.${USER_ID}
     profiles:
-      - record
+      - ${WORKFLOW_NAME}
   build.configure:
     depends_on:
       build.init:
@@ -15,4 +15,4 @@ services:
       service: build.configure_base
     image: stoobly.${USER_ID}
     profiles:
-      - record
+      - ${WORKFLOW_NAME}

stoobly_agent/app/cli/scaffold/templates/app/build/record/docker-compose.yml

@@ -0,0 +1,7 @@
+# Define services here
+#
+# Container services that are intended to be run as part of a workflow need to have the workflow name added to the 'profiles' property
+# e.g. If we want to run a service as part of the 'record' workflow, then the following should be added
+# profiles:
+#   - record
+services: {}

stoobly_agent/app/cli/scaffold/templates/app/build/test/.docker-compose.test.yml

@@ -5,7 +5,7 @@ services:
       service: build.init_base
     image: stoobly.${USER_ID}
     profiles:
-      - test
+      - ${WORKFLOW_NAME}
   build.configure:
     depends_on:
       build.init:
@@ -15,4 +15,4 @@ services:
       service: build.configure_base
     image: stoobly.${USER_ID}
     profiles:
-      - test
+      - ${WORKFLOW_NAME}

stoobly_agent/app/cli/scaffold/templates/app/build/test/docker-compose.yml

@@ -0,0 +1,7 @@
+# Define services here
+#
+# Container services that are intended to be run as part of a workflow need to have the workflow name added to the 'profiles' property
+# e.g. If we want to run a service as part of the 'test' workflow, then the following should be added
+# profiles:
+#   - test
+services: {}

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

@@ -1,20 +1,19 @@
-networks: {}
 services:
   entrypoint.configure_base:
     command:
     - ${SERVICE_SCRIPTS}/${SERVICE_NAME}/${WORKFLOW_TEMPLATE}/.configure
     - bin/configure
-    environment: {}
     extends:
       file: ../.docker-compose.base.yml
       service: context_base
-    working_dir: /home/stoobly/.stoobly/docker/entrypoint/${WORKFLOW_NAME}
+    working_dir: /home/stoobly/.stoobly/docker/${SERVICE_NAME}/${WORKFLOW_NAME}
   entrypoint.init_base:
     command:
     - ${SERVICE_SCRIPTS}/${SERVICE_NAME}/${WORKFLOW_TEMPLATE}/.init
     - bin/init
-    environment: {}
     extends:
       file: ../.docker-compose.base.yml
       service: context_base
-    working_dir: /home/stoobly/.stoobly/docker/entrypoint/${WORKFLOW_NAME}
+    volumes:
+    - ${APP_DIR}:/app
+    working_dir: /home/stoobly/.stoobly/docker/${SERVICE_NAME}/${WORKFLOW_NAME}

stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/.docker-compose.mock.yml

@@ -1,25 +1,19 @@
-networks:
-  entrypoint:
-    name: entrypoint
 services:
   entrypoint.configure:
     depends_on:
       entrypoint.init:
         condition: service_completed_successfully
-    environment: {}
     extends:
       file: ../.docker-compose.base.yml
       service: entrypoint.configure_base
     image: stoobly.${USER_ID}
     profiles:
-      - mock
+      - ${WORKFLOW_NAME}
     volumes: []
   entrypoint.init:
-    environment: {}
     extends:
       file: ../.docker-compose.base.yml
       service: entrypoint.init_base
     image: stoobly.${USER_ID}
     profiles:
-      - mock
-volumes: {}
+      - ${WORKFLOW_NAME}

stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/docker-compose.yml

@@ -1,15 +1,8 @@
-# Define custom services here
+# Define services here
 #
-# Container services that need to make request(s) to a Stoobly defined service 
-# need to have either 'app.ingress' or 'app.egress' added to the 'networks' property
-#
-# e.g. If we want to make a request by hostname, then the following should be added
-# networks:
-#   - app.ingress
-#
-# e.g. If we want to make a request by container service name, then the following should be added
-# networks:
-#   - app.egress
+# If a container service needs access to a Stoobly defined service, 
+# then the container service needs to add one of the scaffolded networks to the 'networks' property
+# See https://docs.stoobly.com/core-concepts/scaffold
 # 
 # Container services that are intended to be run as part of a workflow need to have the workflow name added to the 'profiles' property
 # e.g. If we want to run a service as part of the 'mock' workflow, then the following should be added

stoobly_agent/app/cli/scaffold/templates/app/entrypoint/record/.docker-compose.record.yml

@@ -1,25 +1,19 @@
-networks:
-  entrypoint:
-    name: entrypoint
 services:
   entrypoint.configure:
     depends_on:
       entrypoint.init:
         condition: service_completed_successfully
-    environment: {}
     extends:
       file: ../.docker-compose.base.yml
       service: entrypoint.configure_base
     image: stoobly.${USER_ID}
     profiles:
-      - record
+      - ${WORKFLOW_NAME}
     volumes: []
   entrypoint.init:
-    environment: {}
     extends:
       file: ../.docker-compose.base.yml
       service: entrypoint.init_base
     image: stoobly.${USER_ID}
     profiles:
-      - record
-volumes: {}
+      - ${WORKFLOW_NAME}

stoobly_agent/app/cli/scaffold/templates/app/entrypoint/record/docker-compose.yml

@@ -1,14 +1,11 @@
-# Define networks and services here
+# Define services here
 #
 # If a container service needs access to a Stoobly defined service, 
-# then the container service needs to add the service name to the 'networks' property
-# e.g. If we have defined a 'upstream' service, then the following should be added
-# networks:
-#   - upstream
+# then the container service needs to add one of the scaffolded networks to the 'networks' property
+# See https://docs.stoobly.com/core-concepts/scaffold
 # 
 # Container services that are intended to be run as part of a workflow need to have the workflow name added to the 'profiles' property
 # e.g. If we want to run a service as part of the 'record' workflow, then the following should be added
 # profiles:
 #   - record
-networks: {}
 services: {}

stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/.docker-compose.test.yml

@@ -1,25 +1,19 @@
-networks:
-  entrypoint:
-    name: entrypoint
 services:
   entrypoint.configure:
     depends_on:
       entrypoint.init:
         condition: service_completed_successfully
-    environment: {}
     extends:
       file: ../.docker-compose.base.yml
       service: entrypoint.configure_base
     image: stoobly.${USER_ID}
     profiles:
-      - test
+      - ${WORKFLOW_NAME}
     volumes: []
   entrypoint.init:
-    environment: {}
     extends:
       file: ../.docker-compose.base.yml
       service: entrypoint.init_base
     image: stoobly.${USER_ID}
     profiles:
-      - test
-volumes: {}
+      - ${WORKFLOW_NAME}

stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/docker-compose.yml

@@ -1,14 +1,11 @@
-# Define networks and services here
+# Define services here
 #
 # If a container service needs access to a Stoobly defined service, 
-# then the container service needs to add the service name to the 'networks' property
-# e.g. If we have defined a 'upstream' service, then the following should be added
-# networks:
-#   - upstream
+# then the container service needs to add one of the scaffolded networks to the 'networks' property
+# See https://docs.stoobly.com/core-concepts/scaffold
 # 
 # Container services that are intended to be run as part of a workflow need to have the workflow name added to the 'profiles' property
 # e.g. If we want to run a service as part of the 'test' workflow, then the following should be added
 # profiles:
 #   - test
-networks: {}
 services: {}

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

@@ -8,5 +8,5 @@ stoobly-agent snapshot apply
 entrypoint=$1
 
 if [ -e "$entrypoint" ]; then
-  "$entrypoint"
+  "$entrypoint" /app
 fi

stoobly_agent/app/cli/scaffold/templates/build/services/build/record/.init

@@ -8,5 +8,5 @@ stoobly-agent snapshot apply
 entrypoint=$1
 
 if [ -e "$entrypoint" ]; then
-  "$entrypoint"
+  "$entrypoint" /app
 fi

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

@@ -8,5 +8,5 @@ stoobly-agent snapshot apply
 entrypoint=$1
 
 if [ -e "$entrypoint" ]; then
-  "$entrypoint"
+  "$entrypoint" /app
 fi

stoobly_agent/app/cli/scaffold/templates/build/services/entrypoint/mock/.init

@@ -6,5 +6,5 @@
 entrypoint=$1
 
 if [ -e "$entrypoint" ]; then
-  "$entrypoint"
+  "$entrypoint" /app
 fi

stoobly_agent/app/cli/scaffold/templates/build/services/entrypoint/record/.init

@@ -6,5 +6,5 @@
 entrypoint=$1
 
 if [ -e "$entrypoint" ]; then
-  "$entrypoint"
+  "$entrypoint" /app
 fi

stoobly_agent/app/cli/scaffold/templates/build/services/entrypoint/test/.init

@@ -6,5 +6,5 @@
 entrypoint=$1
 
 if [ -e "$entrypoint" ]; then
-  "$entrypoint"
+  "$entrypoint" /app
 fi

stoobly_agent/app/cli/scaffold/templates/build/workflows/mock/.init

@@ -9,5 +9,5 @@ fi
 
 entrypoint=$1
 if [ -e "$entrypoint" ]; then
-  "$entrypoint"
+  "$entrypoint" /app
 fi

stoobly_agent/app/cli/scaffold/templates/build/workflows/record/.init

@@ -9,5 +9,5 @@ fi
 
 entrypoint=$1
 if [ -e "$entrypoint" ]; then
-  "$entrypoint"
+  "$entrypoint" /app
 fi

stoobly_agent/app/cli/scaffold/templates/build/workflows/test/.init

@@ -9,5 +9,5 @@ fi
 
 entrypoint=$1
 if [ -e "$entrypoint" ]; then
-  "$entrypoint"
+  "$entrypoint" /app
 fi

stoobly_agent/app/cli/scaffold/templates/workflow/mock/bin/configure

@@ -6,8 +6,8 @@ scheme=$SERVICE_SCHEME
 hostname=$SERVICE_HOSTNAME
 port=$SERVICE_PORT
 
-url="$scheme://$hostname"
+origin="$scheme://$hostname"
 
 if [ "$scheme" = 'http' -a "$port" != '80' ] || [ "$scheme" = 'https' -a "$port" != '443' ]; then
-  url="$url:$port"
+  origin="$origin:$port"
 fi

stoobly_agent/app/cli/scaffold/templates/workflow/mock/bin/init

@@ -1,3 +1,5 @@
 #! /bin/bash
 
-# Add custom initialization here
+# Add custom initialization here
+
+app_path=$1 # Path to application source files

stoobly_agent/app/cli/scaffold/templates/workflow/record/bin/configure

@@ -6,10 +6,10 @@ scheme=$SERVICE_SCHEME
 hostname=$SERVICE_HOSTNAME
 port=$SERVICE_PORT
 
-url="$scheme://$hostname"
+origin="$scheme://$hostname"
 
 if [ "$scheme" = 'http' -a "$port" != '80' ] || [ "$scheme" = 'https' -a "$port" != '443' ]; then
-  url="$url:$port"
+  origin="$origin:$port"
 fi
 
 # Firewall
@@ -18,7 +18,7 @@ stoobly-agent config firewall set \
   --action include \
   --method GET --method POST --method OPTIONS --method PUT --method DELETE \
   --mode record \
-  --pattern "$url/.*?"
+  --pattern "$origin/?.*?"
 
 # Rewrite
 echo "Configuring rewrite rules..."
@@ -26,6 +26,6 @@ stoobly-agent config rewrite set \
   --method GET --method POST --method OPTIONS --method PUT --method DELETE \
   --mode record \
   --name cookie \
-  --pattern "$host/?.*?" \
+  --pattern "$origin/?.*?" \
   --type Header \
   --value '' \

stoobly_agent/app/cli/scaffold/templates/workflow/record/bin/init

@@ -1,3 +1,5 @@
 #! /bin/bash
 
-# Add custom initialization here
+# Add custom initialization here
+
+app_path=$1 # Path to application source files

stoobly_agent/app/cli/scaffold/templates/workflow/test/bin/configure

@@ -6,8 +6,8 @@ scheme=$SERVICE_SCHEME
 hostname=$SERVICE_HOSTNAME
 port=$SERVICE_PORT
 
-url="$scheme://$hostname"
+origin="$scheme://$hostname"
 
 if [ "$scheme" = 'http' -a "$port" != '80' ] || [ "$scheme" = 'https' -a "$port" != '443' ]; then
-  url="$url:$port"
+  origin="$origin:$port"
 fi

stoobly_agent/app/cli/scaffold/templates/workflow/test/bin/init

@@ -1,3 +1,5 @@
 #! /bin/bash
 
-# Add custom initialization here
+# Add custom initialization here
+
+app_path=$1 # Path to application source files

stoobly_agent/app/cli/scaffold/workflow_create_command.py

@@ -79,11 +79,13 @@ class WorkflowCreateCommand(WorkflowCommand):
 
   def __write_docker_compose_file(self, **kwargs: BuildOptions):
     builder_class = kwargs.get('builder_class') or WorkflowBuilder
-    service_builder = kwargs.get('service_builder') or ServiceBuilder(self.service_config)
+    service_builder = kwargs.get('service_builder') 
+    if not service_builder:
+      service_builder = ServiceBuilder(self.service_config)
+      service_builder.load()
     workflow_decorators: List[Union[MockDecorator, ReverseProxyDecorator]] = kwargs.get('workflow_decorators')
 
     workflow_builder = builder_class(self.workflow_path, service_builder)
-    workflow_builder.with_env(list(self.env_vars))
     workflow_builder.build_all()
 
     if isinstance(workflow_decorators, list):

stoobly_agent/app/cli/scaffold_cli.py

@@ -223,7 +223,6 @@ def update(**kwargs):
 )
 @click.option('--app-dir-path', default=current_working_dir, help='Path to application directory.')
 @click.option('--context-dir-path', default=data_dir.context_dir_path, help='Path to Stoobly data directory.')
-@click.option('--env', multiple=True, help='Specify an environment variable.')
 @click.option('--force', is_flag=True, help='Overwrite maintained scaffolded workflow files.')
 @click.option('--service', multiple=True, help='Specify the service(s) to create the workflow for.')
 @click.option('--template', required=True, type=click.Choice([WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE, WORKFLOW_TEST_TYPE]), help='Select which workflow to use as a template.')
@@ -740,7 +739,8 @@ def __workflow_create(app, **kwargs):
 
   service_config = command.service_config
   workflow_decorators = get_workflow_decorators(kwargs['template'], service_config)
+
   command.build(
     template=kwargs['template'],
     workflow_decorators=workflow_decorators
-  )
+  )

stoobly_agent/test/app/models/schemas/.stoobly/db/VERSION

@@ -1 +1 @@
-1.6.6
+1.6.7

{stoobly_agent-1.6.6.dist-info → stoobly_agent-1.6.7.dist-info}/METADATA

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

{stoobly_agent-1.6.6.dist-info → stoobly_agent-1.6.7.dist-info}/RECORD

@@ -1,4 +1,4 @@
-stoobly_agent/__init__.py,sha256=ryopjMmwo0h1WRzdE5l_rrULPanQfcjHdwKg8dojjdQ,44
+stoobly_agent/__init__.py,sha256=qAODERPgUB3TSB-LNb9TyckC9zmRfUbQVpVPBVi1GUk,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
@@ -73,7 +73,7 @@ stoobly_agent/app/cli/scaffold/app_config.py,sha256=Gs-BynV1vY7_PpTOenn2mqc7lBIu
 stoobly_agent/app/cli/scaffold/app_create_command.py,sha256=sy4017eiir9MK0TEbTi1NyG9mhOGlenGGVnq0GsGUrQ,966
 stoobly_agent/app/cli/scaffold/command.py,sha256=aoTsdkkBzyu7TkVSMdNQQGk0Gj874jNgFcjR14y3TuM,254
 stoobly_agent/app/cli/scaffold/config.py,sha256=HZU5tkvr3dkPr4JMXZtrJlu2wxxO-134Em6jReFFcq0,688
-stoobly_agent/app/cli/scaffold/constants.py,sha256=s5SBy8Xs4-Lg4tYEVBTiDIzeWwerrnz8qHXbXQtXH5U,2465
+stoobly_agent/app/cli/scaffold/constants.py,sha256=Mc4eaBicnzvXWjt1vqSmJ8csNyFLcAQLBj9uMH8QZ7A,2488
 stoobly_agent/app/cli/scaffold/containerized_app.py,sha256=dAjn4RwcZV3aEL0POUmrbF_DC-r9h6s1zx7gT2t45v0,175
 stoobly_agent/app/cli/scaffold/docker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/cli/scaffold/docker/app_builder.py,sha256=7z5pk5JKlRDHx2USxY-WurttLyyUkIVYfl34_u1x9dE,501
@@ -81,12 +81,12 @@ 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=AE0tEHKeDM3dDMSjaqUwJA9ZLgzeyr0ErMAhOzNuaSI,3190
+stoobly_agent/app/cli/scaffold/docker/service/builder.py,sha256=T1wE3DU-vLNRipBHiG1uxlVLXcLZ2My7LuFfVU2wY9g,5733
 stoobly_agent/app/cli/scaffold/docker/service/configure_gateway.py,sha256=bdqY9jESbyGEwPW5cwb51oznYFlzK4MUP770zxxgrds,1701
 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
-stoobly_agent/app/cli/scaffold/docker/workflow/builder.py,sha256=i2T3TvWlXBT2O4wqwMcwsN55-4VzAblo36dEwCPf8yU,6736
+stoobly_agent/app/cli/scaffold/docker/workflow/builder.py,sha256=WmqH7skXJlsBEhqAMYUEhMRnEjjb-l0CzFOpNOE2ssI,5116
 stoobly_agent/app/cli/scaffold/docker/workflow/decorators_factory.py,sha256=gU4RfuZ13r_YoB4eLS6FuiB1A4kfuLrWLPmYjZ0EJJw,955
 stoobly_agent/app/cli/scaffold/docker/workflow/dns_decorator.py,sha256=nlDPbyF1hkVItzFH3bk9KlqfDC8usyFZs353-ibqxvA,938
 stoobly_agent/app/cli/scaffold/docker/workflow/mock_decorator.py,sha256=DcBnwA8YhE-VdrUiWf2xPcqirEMZEQm3AwssAg9CxLo,1226
@@ -97,7 +97,7 @@ stoobly_agent/app/cli/scaffold/managed_services_docker_compose.py,sha256=-wLBXUi
 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=NwJL4gwWQ_9B0fHrit1QekR6rSMg40m1CDizWxUNWCM,3598
-stoobly_agent/app/cli/scaffold/service_create_command.py,sha256=bmLGgx9qnh-X_i2_XfdWSQIer0gGkaQx6lXZSIzy-LI,2793
+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
 stoobly_agent/app/cli/scaffold/service_workflow.py,sha256=sQ_Edy_wGHKMXpD0DmhnOWkGEKz7gSgEGNI8f7aXOdg,444
@@ -109,30 +109,33 @@ stoobly_agent/app/cli/scaffold/templates/app/.docker-compose.base.yml,sha256=6tF
 stoobly_agent/app/cli/scaffold/templates/app/.docker-compose.networks.yml,sha256=I4PbJpQjFHb5IbAUWNvYM6okDEtmwtKFDQg-yog05WM,141
 stoobly_agent/app/cli/scaffold/templates/app/Makefile,sha256=TEmPG7Bf0KZOnmfsgdzza3UdwcVMmM5Lj1YdLc4cgjA,79
 stoobly_agent/app/cli/scaffold/templates/app/build/.config.yml,sha256=8Wt8ZZ5irvBYYS44xGrR_EWlZDuXH9kyWmquzsh7s8g,19
-stoobly_agent/app/cli/scaffold/templates/app/build/.docker-compose.base.yml,sha256=SBjI-5APmzvzQafHzRahH_xcoXEEV9M9GIeEmXSwnAU,559
-stoobly_agent/app/cli/scaffold/templates/app/build/mock/.docker-compose.mock.yml,sha256=3DJ8LTq3QScaz0SA_tXQqJ0kljSCeqkPyDbhLOxBJvc,414
+stoobly_agent/app/cli/scaffold/templates/app/build/.docker-compose.base.yml,sha256=ECc2t_85UULEciNYFSuuQW2hdd6nSFEkrlHE-bY5q3E,614
+stoobly_agent/app/cli/scaffold/templates/app/build/mock/.docker-compose.mock.yml,sha256=s-QRSUM44USYt395XR2o4lTjaXPcuIRHjjQ0ALfRj2k,438
 stoobly_agent/app/cli/scaffold/templates/app/build/mock/bin/configure,sha256=dEOGIKUKJf5kjOwJRdTgZkS0ZjmQHWVuAmKrWUjPij4,44
 stoobly_agent/app/cli/scaffold/templates/app/build/mock/bin/init,sha256=YxWVVQMEdGarcMtBcE1Sj2kdLgUgwY9kXp3MjPsVcmg,46
-stoobly_agent/app/cli/scaffold/templates/app/build/record/.docker-compose.record.yml,sha256=hgPOxIInxGAzGr28-ytB4tVfmsqgpZdPMOpMRbV2R0g,418
+stoobly_agent/app/cli/scaffold/templates/app/build/mock/docker-compose.yml,sha256=DhQzbaBXvnBfojLBRl5ZXdY1yqqq2FIaN9_tXQtfzs0,297
+stoobly_agent/app/cli/scaffold/templates/app/build/record/.docker-compose.record.yml,sha256=s-QRSUM44USYt395XR2o4lTjaXPcuIRHjjQ0ALfRj2k,438
 stoobly_agent/app/cli/scaffold/templates/app/build/record/bin/configure,sha256=KBgjZlP3-FEhhflopx50EabXhyF98Mv0u_YrfmxMznE,52
 stoobly_agent/app/cli/scaffold/templates/app/build/record/bin/init,sha256=YxWVVQMEdGarcMtBcE1Sj2kdLgUgwY9kXp3MjPsVcmg,46
-stoobly_agent/app/cli/scaffold/templates/app/build/test/.docker-compose.test.yml,sha256=Rn_7qL1MVK1jNlRepSvNHH9_iFrlE86_aRxjwIim0mY,414
+stoobly_agent/app/cli/scaffold/templates/app/build/record/docker-compose.yml,sha256=wQHPL62dqQWBHfMbdXPB9rU9HnBFhQRDSo9T_BNie10,301
+stoobly_agent/app/cli/scaffold/templates/app/build/test/.docker-compose.test.yml,sha256=s-QRSUM44USYt395XR2o4lTjaXPcuIRHjjQ0ALfRj2k,438
 stoobly_agent/app/cli/scaffold/templates/app/build/test/bin/configure,sha256=dEOGIKUKJf5kjOwJRdTgZkS0ZjmQHWVuAmKrWUjPij4,44
 stoobly_agent/app/cli/scaffold/templates/app/build/test/bin/init,sha256=YxWVVQMEdGarcMtBcE1Sj2kdLgUgwY9kXp3MjPsVcmg,46
+stoobly_agent/app/cli/scaffold/templates/app/build/test/docker-compose.yml,sha256=HrJwBVx_n4EmC1F1kWXSr7Py9Kx87Cc8x6V0IPKAydo,297
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/.config.yml,sha256=T9VQz6OwAQpKdIoFrnfKAxuX_to0c6EhuWRLKM34Sr4,22
-stoobly_agent/app/cli/scaffold/templates/app/entrypoint/.docker-compose.base.yml,sha256=Sl_E6IUaHSR_Av_Tm3FzCJ6w5qjtR2LiJfiQJAMZUFI,630
-stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/.docker-compose.mock.yml,sha256=-YbHd6BrAlBpT8PYg8kOsq0GyDeZ3g_q8IB0B0rGluU,551
+stoobly_agent/app/cli/scaffold/templates/app/entrypoint/.docker-compose.base.yml,sha256=8LLUmoCOvNeVB1uUTKd3TmotM__CmG44z_E_O6zuNQQ,622
+stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/.docker-compose.mock.yml,sha256=KFWtuPS1JcQQHKN1yTMJHWHm3_1ihz7UTs_FHEQJfGI,478
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/bin/configure,sha256=dEOGIKUKJf5kjOwJRdTgZkS0ZjmQHWVuAmKrWUjPij4,44
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/bin/init,sha256=YxWVVQMEdGarcMtBcE1Sj2kdLgUgwY9kXp3MjPsVcmg,46
-stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/docker-compose.yml,sha256=JZztRTAEd_byGjhBbI_TOrj7CML8l5lV4tYOM2syHUw,717
-stoobly_agent/app/cli/scaffold/templates/app/entrypoint/record/.docker-compose.record.yml,sha256=aIcgjelss4V86lxS3-xN8j_2eR-0YkzhtN_b-g3Y0nE,555
+stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/docker-compose.yml,sha256=BwPDVngZ9dcXrb3NhthsRUIN2ciuygj4eA7-TYJK1J8,523
+stoobly_agent/app/cli/scaffold/templates/app/entrypoint/record/.docker-compose.record.yml,sha256=KFWtuPS1JcQQHKN1yTMJHWHm3_1ihz7UTs_FHEQJfGI,478
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/record/bin/configure,sha256=dEOGIKUKJf5kjOwJRdTgZkS0ZjmQHWVuAmKrWUjPij4,44
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/record/bin/init,sha256=YxWVVQMEdGarcMtBcE1Sj2kdLgUgwY9kXp3MjPsVcmg,46
-stoobly_agent/app/cli/scaffold/templates/app/entrypoint/record/docker-compose.yml,sha256=5n4bZBHI9MtwBF55ugu1RTdwMy7T6SsYGQ_3sulFUj8,595
-stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/.docker-compose.test.yml,sha256=9-qPnSisun4adnrDcZsJiyeMjhIlCHBJap_cmdzUPVg,552
+stoobly_agent/app/cli/scaffold/templates/app/entrypoint/record/docker-compose.yml,sha256=mgI6XZ8Ql7WxgIrtiFC4PP09Q0bPoMDaAIenJva3JoE,527
+stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/.docker-compose.test.yml,sha256=KFWtuPS1JcQQHKN1yTMJHWHm3_1ihz7UTs_FHEQJfGI,478
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/bin/configure,sha256=dEOGIKUKJf5kjOwJRdTgZkS0ZjmQHWVuAmKrWUjPij4,44
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/bin/init,sha256=YxWVVQMEdGarcMtBcE1Sj2kdLgUgwY9kXp3MjPsVcmg,46
-stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/docker-compose.yml,sha256=E4gGJwHfnZoFo9-0vM17-Qg5LPjx7vIPpcz2K7eiZg0,591
+stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/docker-compose.yml,sha256=JpWLQrW69EatLD3HPHpmi3Y6n7cjlrUgekYVbJ4ngSY,523
 stoobly_agent/app/cli/scaffold/templates/app/gateway/.config.yml,sha256=XnLQZMzzMMIwVycjyPN5QXsmRztkTFAna1kIHYuDfJQ,19
 stoobly_agent/app/cli/scaffold/templates/app/gateway/.docker-compose.base.template.yml,sha256=bgBvyDhyehS75D2ObEi7sl9DLGV6U3c9JhCAncsvjq8,251
 stoobly_agent/app/cli/scaffold/templates/app/gateway/mock/.docker-compose.mock.yml,sha256=CDL5x18-ues4F_ujqpNef_zJTG6PyDOkQ11cIHBOW5k,136
@@ -144,17 +147,17 @@ stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/.docker-compose.exe
 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=006exiS9OpKavy4fNWioWo0d8hrulQiWjaB3yXHdGig,212
-stoobly_agent/app/cli/scaffold/templates/build/services/build/mock/.init,sha256=HRAXOsnAKhYw2giorsQA2Dvli4J5xJpvv-79yFgSszM,214
+stoobly_agent/app/cli/scaffold/templates/build/services/build/mock/.init,sha256=5eg3Glb3_T-RTwU6tTSerFLQKsL93LtsnmR1B0vRjBw,219
 stoobly_agent/app/cli/scaffold/templates/build/services/build/record/.configure,sha256=006exiS9OpKavy4fNWioWo0d8hrulQiWjaB3yXHdGig,212
-stoobly_agent/app/cli/scaffold/templates/build/services/build/record/.init,sha256=HRAXOsnAKhYw2giorsQA2Dvli4J5xJpvv-79yFgSszM,214
+stoobly_agent/app/cli/scaffold/templates/build/services/build/record/.init,sha256=5eg3Glb3_T-RTwU6tTSerFLQKsL93LtsnmR1B0vRjBw,219
 stoobly_agent/app/cli/scaffold/templates/build/services/build/test/.configure,sha256=006exiS9OpKavy4fNWioWo0d8hrulQiWjaB3yXHdGig,212
-stoobly_agent/app/cli/scaffold/templates/build/services/build/test/.init,sha256=HRAXOsnAKhYw2giorsQA2Dvli4J5xJpvv-79yFgSszM,214
+stoobly_agent/app/cli/scaffold/templates/build/services/build/test/.init,sha256=5eg3Glb3_T-RTwU6tTSerFLQKsL93LtsnmR1B0vRjBw,219
 stoobly_agent/app/cli/scaffold/templates/build/services/entrypoint/mock/.configure,sha256=SKvht2K_3tW08K24rl8_j0jMYOhq1k-GsVwhoHwjxYA,337
-stoobly_agent/app/cli/scaffold/templates/build/services/entrypoint/mock/.init,sha256=xWJGhCKQejtVLFAOEZMWnaCeGAc9tuqEh_WsG3xfA_0,184
+stoobly_agent/app/cli/scaffold/templates/build/services/entrypoint/mock/.init,sha256=AcM6SLUsZa6BOLDjxteDR_AXIco47GZNkWQCGPhPDAY,189
 stoobly_agent/app/cli/scaffold/templates/build/services/entrypoint/record/.configure,sha256=dnbPZUrYZDCEx0MxhIsrY-lTgH_9tN_Iixy3XrPIW8w,341
-stoobly_agent/app/cli/scaffold/templates/build/services/entrypoint/record/.init,sha256=xWJGhCKQejtVLFAOEZMWnaCeGAc9tuqEh_WsG3xfA_0,184
+stoobly_agent/app/cli/scaffold/templates/build/services/entrypoint/record/.init,sha256=AcM6SLUsZa6BOLDjxteDR_AXIco47GZNkWQCGPhPDAY,189
 stoobly_agent/app/cli/scaffold/templates/build/services/entrypoint/test/.configure,sha256=SKvht2K_3tW08K24rl8_j0jMYOhq1k-GsVwhoHwjxYA,337
-stoobly_agent/app/cli/scaffold/templates/build/services/entrypoint/test/.init,sha256=xWJGhCKQejtVLFAOEZMWnaCeGAc9tuqEh_WsG3xfA_0,184
+stoobly_agent/app/cli/scaffold/templates/build/services/entrypoint/test/.init,sha256=AcM6SLUsZa6BOLDjxteDR_AXIco47GZNkWQCGPhPDAY,189
 stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/.create,sha256=EZe84bLAKB-mrB9PGMx-amyMjp6x-ESUZKC8wxrWdLE,245
 stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/.delete,sha256=RspRDQ7WT5jpN2o-6qXOlH-A2VpN4981pD4ZJljk9Rw,260
 stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/.disable,sha256=xVf4Pk1RLvJm7Ff0rbGoWhYHPv0ME5e93fxS2yFqLnE,45
@@ -168,23 +171,23 @@ stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/.services,sha256=s
 stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/.snapshot,sha256=Kav1QNhKG7f0DBzc4-9dmxZMmmVTxmPqakT_W4kVYKk,241
 stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/.up,sha256=S88O31UgsabaMvSwkQJjLF9C7mrFkyEk9x6JDE6qSXI,228
 stoobly_agent/app/cli/scaffold/templates/build/workflows/mock/.configure,sha256=xWJGhCKQejtVLFAOEZMWnaCeGAc9tuqEh_WsG3xfA_0,184
-stoobly_agent/app/cli/scaffold/templates/build/workflows/mock/.init,sha256=_gFs--JjDN1G0VpswmPegKYU9ozwLnvWOKj__V_VoB4,307
+stoobly_agent/app/cli/scaffold/templates/build/workflows/mock/.init,sha256=el5LYLY-7P3-EuxZ8dAFgGNU_4zDhyA4D_iS6D4fvps,312
 stoobly_agent/app/cli/scaffold/templates/build/workflows/record/.configure,sha256=xWJGhCKQejtVLFAOEZMWnaCeGAc9tuqEh_WsG3xfA_0,184
-stoobly_agent/app/cli/scaffold/templates/build/workflows/record/.init,sha256=5sH8Ft7N_cyFgTBknJWOjIMd5A2RZexRTeUkhKxSzx0,308
+stoobly_agent/app/cli/scaffold/templates/build/workflows/record/.init,sha256=q2dL6DmIM8re149WwyeZvwttjU6KqBXO2-9zVKKqtM0,313
 stoobly_agent/app/cli/scaffold/templates/build/workflows/test/.configure,sha256=xWJGhCKQejtVLFAOEZMWnaCeGAc9tuqEh_WsG3xfA_0,184
-stoobly_agent/app/cli/scaffold/templates/build/workflows/test/.init,sha256=_gFs--JjDN1G0VpswmPegKYU9ozwLnvWOKj__V_VoB4,307
+stoobly_agent/app/cli/scaffold/templates/build/workflows/test/.init,sha256=el5LYLY-7P3-EuxZ8dAFgGNU_4zDhyA4D_iS6D4fvps,312
 stoobly_agent/app/cli/scaffold/templates/constants.py,sha256=EXBiBB_gnSINGrIqfXMaJ2w0HEaICw4FxVjwIHPBqYw,1457
 stoobly_agent/app/cli/scaffold/templates/factory.py,sha256=t7QExf7o22oAiw05XFBWTfoTcuQqK33gQZHo3j1dzTY,1749
-stoobly_agent/app/cli/scaffold/templates/workflow/mock/bin/configure,sha256=2cpOVTA0Tm8s8cIhbrFAsYe5A1JXa8vVtGwoPCwVB_g,270
-stoobly_agent/app/cli/scaffold/templates/workflow/mock/bin/init,sha256=YxWVVQMEdGarcMtBcE1Sj2kdLgUgwY9kXp3MjPsVcmg,46
+stoobly_agent/app/cli/scaffold/templates/workflow/mock/bin/configure,sha256=GAU7AfSPcyDSI9RJ7mynT83YqgN9r_E9HZYx0RXE1lU,279
+stoobly_agent/app/cli/scaffold/templates/workflow/mock/bin/init,sha256=EaoFDyoJbHc9Ui8ELYKmfweXAycJptVOQblszeh3XTE,94
 stoobly_agent/app/cli/scaffold/templates/workflow/mock/fixtures.yml,sha256=CJlZ_kugygZpmyqIauBjNZxqk7XyLaa3yl3AWj8KV28,259
 stoobly_agent/app/cli/scaffold/templates/workflow/mock/lifecycle_hooks.py,sha256=U7mlzT_wBR3uhHSG6CAyt5tBUNAvdIrCw33gdB-F294,467
 stoobly_agent/app/cli/scaffold/templates/workflow/mock/public/.gitignore,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-stoobly_agent/app/cli/scaffold/templates/workflow/record/bin/configure,sha256=bkMZexceMEfoh5AqybtzpGPBrCGxl7Azn6QbR-qAuWM,750
-stoobly_agent/app/cli/scaffold/templates/workflow/record/bin/init,sha256=YxWVVQMEdGarcMtBcE1Sj2kdLgUgwY9kXp3MjPsVcmg,46
+stoobly_agent/app/cli/scaffold/templates/workflow/record/bin/configure,sha256=fBQXJpPZJr5H79zFOmEERM6DpELm8GGC8ATKc2JpKSQ,765
+stoobly_agent/app/cli/scaffold/templates/workflow/record/bin/init,sha256=EaoFDyoJbHc9Ui8ELYKmfweXAycJptVOQblszeh3XTE,94
 stoobly_agent/app/cli/scaffold/templates/workflow/record/lifecycle_hooks.py,sha256=4vaVc_gnDTCLEqtcZybIk5dcmXrKmGuesF6gc3-_kX8,473
-stoobly_agent/app/cli/scaffold/templates/workflow/test/bin/configure,sha256=2cpOVTA0Tm8s8cIhbrFAsYe5A1JXa8vVtGwoPCwVB_g,270
-stoobly_agent/app/cli/scaffold/templates/workflow/test/bin/init,sha256=YxWVVQMEdGarcMtBcE1Sj2kdLgUgwY9kXp3MjPsVcmg,46
+stoobly_agent/app/cli/scaffold/templates/workflow/test/bin/configure,sha256=GAU7AfSPcyDSI9RJ7mynT83YqgN9r_E9HZYx0RXE1lU,279
+stoobly_agent/app/cli/scaffold/templates/workflow/test/bin/init,sha256=EaoFDyoJbHc9Ui8ELYKmfweXAycJptVOQblszeh3XTE,94
 stoobly_agent/app/cli/scaffold/templates/workflow/test/fixtures.yml,sha256=CJlZ_kugygZpmyqIauBjNZxqk7XyLaa3yl3AWj8KV28,259
 stoobly_agent/app/cli/scaffold/templates/workflow/test/lifecycle_hooks.py,sha256=U7mlzT_wBR3uhHSG6CAyt5tBUNAvdIrCw33gdB-F294,467
 stoobly_agent/app/cli/scaffold/templates/workflow/test/public/.gitignore,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -194,12 +197,12 @@ stoobly_agent/app/cli/scaffold/workflow.py,sha256=KlbWT9CIo9EpZxKU1WVZtmodhxK7Cp
 stoobly_agent/app/cli/scaffold/workflow_command.py,sha256=eI9I5LLgO0U3b46QhHusy-4BV2zUDVai6jErcluYCRI,3344
 stoobly_agent/app/cli/scaffold/workflow_config.py,sha256=ghnbcnCyb6ECdylUJCAJ6A8ulzaFY9bu7RvRuYeiRkk,901
 stoobly_agent/app/cli/scaffold/workflow_copy_command.py,sha256=R9hh5dWVz7vGld7pENAA_a9gW56EkgG2K35nBQYXwyI,1462
-stoobly_agent/app/cli/scaffold/workflow_create_command.py,sha256=WmGKoqJqOkhL40oLCo8PnWhBKdfbY0dO2UtRn1IKynE,3504
+stoobly_agent/app/cli/scaffold/workflow_create_command.py,sha256=R3L1obUTidGngbIaRlVjt_Rjkw9qOPze_p5plHc8JHs,3532
 stoobly_agent/app/cli/scaffold/workflow_env.py,sha256=x8V5pJmIiklD3f2q2-qq-CORf4YaXYq_r2JpR2MmSwk,416
 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=wv1Zrq0GoYO8ryac3oGno0C282c6UjMtniO19mBSyrE,4036
-stoobly_agent/app/cli/scaffold_cli.py,sha256=qR1AvPbUFsn9QL_QrWVFxW77n4yMVI7DVwiV2ylRcOM,28686
+stoobly_agent/app/cli/scaffold_cli.py,sha256=kD_2YbtdcMjFzJ2u8lBchL5vo0ey4_a_HXmE3V3Quuw,28607
 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
@@ -699,7 +702,7 @@ stoobly_agent/test/app/models/factories/resource/local_db/helpers/log_test.py,sh
 stoobly_agent/test/app/models/factories/resource/local_db/helpers/tiebreak_scenario_request_test.py,sha256=a1SFLyEyRRLuADvAw6ckQQKORFXvyK1lyrbkaLWx8oU,3399
 stoobly_agent/test/app/models/factories/resource/local_db/request_adapter_test.py,sha256=Pzq1cBPnP9oSWG-p0c-VoymoHxgp483QmNwmV1b78RA,8453
 stoobly_agent/test/app/models/factories/resource/local_db/response_adapter_test.py,sha256=9P95EKH5rZGOrmRkRIDlQZqtiLJHk9735og18Ffwpfw,2204
-stoobly_agent/test/app/models/schemas/.stoobly/db/VERSION,sha256=uGiTynl24ZAartFJQ0TJAZFa3EBS21MnE-XvhATnY64,5
+stoobly_agent/test/app/models/schemas/.stoobly/db/VERSION,sha256=SJuufShOhhiSZOph-xt0K0zwmxbI8S1OvfGbFa7G5fA,5
 stoobly_agent/test/app/models/schemas/.stoobly/db/stoobly_agent.sqlite3,sha256=ch8gNx6zIelLKQx65gwFx_LRNqUD3EC5xcHZ0ukIQiU,188416
 stoobly_agent/test/app/models/schemas/.stoobly/settings.yml,sha256=vLwMjweKOdod6tSLtIlyBefPQuNXq9wio4kBaODKtAU,726
 stoobly_agent/test/app/models/schemas/.stoobly/tmp/options.json,sha256=OTRzarwus48CTrItedXCrgQttJHSEZonEYc7R_knvYg,2212
@@ -740,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.6.6.dist-info/LICENSE,sha256=o93sj12cdoEOsTCjPaPFsw3Xq0SXs3pPcY-9reE2sEw,548
-stoobly_agent-1.6.6.dist-info/METADATA,sha256=Pq3u98yhvcG83VsoM5ng6YTI28e457gUWjKl3B1Nu0s,3087
-stoobly_agent-1.6.6.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-stoobly_agent-1.6.6.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
-stoobly_agent-1.6.6.dist-info/RECORD,,
+stoobly_agent-1.6.7.dist-info/LICENSE,sha256=o93sj12cdoEOsTCjPaPFsw3Xq0SXs3pPcY-9reE2sEw,548
+stoobly_agent-1.6.7.dist-info/METADATA,sha256=qdGza9KAifMv5H2jjIj-CQGutb0ZIYnMpC20T7thyeU,3087
+stoobly_agent-1.6.7.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+stoobly_agent-1.6.7.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
+stoobly_agent-1.6.7.dist-info/RECORD,,

{stoobly_agent-1.6.6.dist-info → stoobly_agent-1.6.7.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.2
+Generator: poetry-core 2.1.3
 Root-Is-Purelib: true
 Tag: py3-none-any