stoobly-agent 1.5.8__tar.gz → 1.6.0__tar.gz

{stoobly_agent-1.5.8 → stoobly_agent-1.6.0}/PKG-INFO

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

{stoobly_agent-1.5.8 → stoobly_agent-1.6.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.5.8"
+version = "1.6.0"
 
 [tool.poetry.dependencies]
 python = "^3.10"

{stoobly_agent-1.5.8 → stoobly_agent-1.6.0}/stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.5.8'
+VERSION = '1.6.0'

{stoobly_agent-1.5.8 → stoobly_agent-1.6.0}/stoobly_agent/app/cli/scaffold/constants.py

@@ -46,12 +46,14 @@ WORKFLOW_CONTAINER_TEMPLATE = '{service_name}.{container}'
 WORKFLOW_CONTAINER_CONFIGURE_TEMPLATE = '{service_name}.' + WORKFLOW_CONTAINER_CONFIGURE
 WORKFLOW_CONTAINER_INIT_TEMPLATE = '{service_name}.' + WORKFLOW_CONTAINER_INIT
 WORKFLOW_CONTAINER_PROXY_TEMPLATE = '{service_name}.' + WORKFLOW_CONTAINER_PROXY
+WORKFLOW_EXEC_TYPE = 'exec'
 WORKFLOW_MOCK_TYPE = 'mock'
 WORKFLOW_NAME = '${WORKFLOW_NAME}'
 WORKFLOW_NAME_ENV = 'WORKFLOW_NAME'
 WORKFLOW_NAMESPACE_ENV = 'WORKFLOW_NAMESPACE'
 WORKFLOW_RECORD_TYPE = 'record'
+WORKFLOW_TEMPLATE = '${WORKFLOW_TEMPLATE}'
+WORKFLOW_TEMPLATE_ENV = 'WORKFLOW_TEMPLATE'
 WORKFLOW_TEST_TYPE = 'test'
 
-WORKFLOW_TEMPLATE = Literal[WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE, WORKFLOW_TEST_TYPE]
-
+WORKFLOW_TEMPLATE_OPTION = Literal[WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE, WORKFLOW_TEST_TYPE]

{stoobly_agent-1.5.8 → stoobly_agent-1.6.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, SERVICE_NAME, STOOBLY_HOME_DIR, WORKFLOW_NAME
+from ...constants import SERVICE_HOSTNAME, SERVICE_HOSTNAME_ENV, WORKFLOW_TEMPLATE
 from ...service_config import ServiceConfig
 from ..app_builder import AppBuilder
 from ..builder import Builder
@@ -92,7 +92,7 @@ class ServiceBuilder(Builder):
   def build_init_base(self):
     environment = {}
     self.with_service(self.init_base, {
-      'command': ['bin/.init'],
+      'command': [f"/usr/local/bin/workflows/{WORKFLOW_TEMPLATE}/.init", 'bin/init'],
       'environment': environment,
       'extends': {
         'file': os.path.relpath(self.app_builder.compose_file_path, self.dir_path),
@@ -103,7 +103,7 @@ class ServiceBuilder(Builder):
   def build_configure_base(self):
     environment = {}
     self.with_service(self.configure_base, {
-      'command': ['bin/.configure'],
+      'command': [f"/usr/local/bin/workflows/{WORKFLOW_TEMPLATE}/.configure", 'bin/configure'],
       'environment': environment,
       'extends': {
         'file': os.path.relpath(self.app_builder.compose_file_path, self.dir_path),

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

@@ -0,0 +1,6 @@
+FROM stoobly/agent:1.6
+
+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

{stoobly_agent-1.5.8 → stoobly_agent-1.6.0}/stoobly_agent/app/cli/scaffold/templates/app/.Makefile

@@ -21,8 +21,9 @@ certs_dir=$$(realpath "$${STOOBLY_CERTS_DIR:-$(app_data_dir)/certs}")
 context_dir=$$(realpath "$${STOOBLY_CONTEXT_DIR:-$(CONTEXT_DIR_DEFAULT)}")
 workflow_service_options=$(shell echo $$STOOBLY_WORKFLOW_SERVICE_OPTIONS)
 
+exec_namespace=$(shell echo $(context_dir) | (md5 2>/dev/null || md5sum 2>/dev/null || shasum 2>/dev/null) | awk '{print $$1}')
 user_id_option=--user-id $(USER_ID)
-stoobly_exec_options=--profile $(EXEC_WORKFLOW_NAME) -p "$(shell echo $(context_dir) | md5sum | awk '{print $$1}')"
+stoobly_exec_options=--profile $(EXEC_WORKFLOW_NAME) -p $(exec_namespace)
 workflow_run_options=--script-path $(workflow_script) $(workflow_service_options)
 workflow_up_options=--app-dir-path $(app_dir) --context-dir-path $(context_dir) --ca-certs-dir-path $(ca_certs_dir) --certs-dir-path $(certs_dir) $(user_id_option)
 
@@ -69,7 +70,7 @@ ca-cert/install: stoobly/install
 		fi \
 	fi
 certs:
-	@export EXEC_COMMAND=bin/.mkcert && \
+	@export EXEC_COMMAND=.mkcert && \
 	$(stoobly_exec)
 command/install:
 	$(eval COMMAND=install)
@@ -90,10 +91,10 @@ nameservers: tmpdir
 		exit 1; \
 	fi
 intercept/disable:
-	@export EXEC_COMMAND=bin/.disable && \
+	@export EXEC_COMMAND=.disable && \
 	$(stoobly_exec)
 intercept/enable:
-	@export EXEC_COMMAND=bin/.enable && \
+	@export EXEC_COMMAND=.enable && \
 	export EXEC_ARGS=$(scenario_key) && \
 	$(stoobly_exec)
 mock: workflow/mock ca-cert/install workflow/hostname/install nameservers workflow/up
@@ -116,30 +117,30 @@ record/services: workflow/record workflow/services
 record/logs: workflow/record workflow/logs
 scenario/create:
 # Create a scenario
-	@export EXEC_COMMAND=bin/.create && \
+	@export EXEC_COMMAND=.create && \
 	export EXEC_OPTIONS="$(options)" && \
 	export EXEC_ARGS="$(name)" && \
 	$(stoobly_exec)
 scenario/delete:
 # Delete a scenario
-	@export EXEC_COMMAND=bin/.delete && \
+	@export EXEC_COMMAND=.delete && \
 	export EXEC_OPTIONS="$(options)" && \
 	export EXEC_ARGS="$(key)" && \
 	$(stoobly_exec)
 scenario/list:
 # List scenarios
-	@export EXEC_COMMAND=bin/.list && \
+	@export EXEC_COMMAND=.list && \
 	export EXEC_OPTIONS="$(options)" && \
 	$(stoobly_exec)
 scenario/reset:
 # Resets a scenario to its last snapshot
-	@export EXEC_COMMAND=bin/.reset && \:
+	@export EXEC_COMMAND=.reset && \:
 	export EXEC_OPTIONS="$(options)" && \
 	export EXEC_ARGS="$(key)" && \
 	$(stoobly_exec)
 scenario/snapshot:
 # Create committable files for a scenario
-	@export EXEC_COMMAND=bin/.snapshot && \
+	@export EXEC_COMMAND=.snapshot && \
 	export EXEC_OPTIONS="$(options)" && \
 	export EXEC_ARGS="$(key)" && \
 	$(stoobly_exec)
@@ -155,7 +156,7 @@ test/down: workflow/test workflow/down exec/down
 tmpdir:
 	@mkdir -p $(app_tmp_dir)
 workflow/down:
-	@export EXEC_COMMAND=bin/.down && \
+	@export EXEC_COMMAND=.down && \
 	export EXEC_OPTIONS="$(user_id_option) $(workflow_run_options) $(options)" && \
 	export EXEC_ARGS="$(WORKFLOW)" && \
 	$(stoobly_exec_run) && \
@@ -175,7 +176,7 @@ workflow/hostname: stoobly/install
 workflow/hostname/install: command/install workflow/hostname
 workflow/hostname/uninstall: command/uninstall workflow/hostname  
 workflow/logs:
-	@export EXEC_COMMAND=bin/.logs && \
+	@export EXEC_COMMAND=.logs && \
 	export EXEC_OPTIONS="$(workflow_run_options) $(options)" && \
 	export EXEC_ARGS="$(WORKFLOW)" && \
 	$(stoobly_exec_run) && \
@@ -185,14 +186,14 @@ workflow/mock:
 workflow/record:
 	$(eval WORKFLOW=record)
 workflow/services:
-	@export EXEC_COMMAND=bin/.services && \
+	@export EXEC_COMMAND=.services && \
 	export EXEC_OPTIONS="$(workflow_service_options) $(options)" && \
 	export EXEC_ARGS="$(WORKFLOW)" && \
 	$(stoobly_exec_run)
 workflow/test:
 	$(eval WORKFLOW=test)
 workflow/up:
-	@export EXEC_COMMAND=bin/.up && \
+	@export EXEC_COMMAND=.up && \
 	export EXEC_OPTIONS="$(user_id_option) $(workflow_up_options) $(workflow_run_options) $(options)" && \
 	export EXEC_ARGS="$(WORKFLOW)" && \
 	$(stoobly_exec_run) && \

{stoobly_agent-1.5.8 → stoobly_agent-1.6.0}/stoobly_agent/app/cli/scaffold/templates/app/build/.docker-compose.base.yml

@@ -1,14 +1,16 @@
 services:
-  build.init_base:
+  build.configure_base:
     command: 
-    - bin/.init
+    - /usr/local/bin/services/${SERVICE_NAME}/${WORKFLOW_TEMPLATE}/.configure
+    - bin/configure
     extends:
       file: ../.docker-compose.base.yml
       service: context_base
     working_dir: /home/stoobly/.stoobly/docker/build/${WORKFLOW_NAME}
-  build.configure_base:
+  build.init_base:
     command: 
-    - bin/.configure
+    - /usr/local/bin/services/${SERVICE_NAME}/${WORKFLOW_TEMPLATE}/.init
+    - bin/init
     extends:
       file: ../.docker-compose.base.yml
       service: context_base

stoobly_agent-1.6.0/stoobly_agent/app/cli/scaffold/templates/app/build/mock/bin/configure

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+# Add custom configuration here

stoobly_agent-1.6.0/stoobly_agent/app/cli/scaffold/templates/app/build/test/bin/configure

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+# Add custom configuration here

{stoobly_agent-1.5.8 → stoobly_agent-1.6.0}/stoobly_agent/app/cli/scaffold/templates/app/entrypoint/.docker-compose.base.yml

@@ -2,7 +2,8 @@ networks: {}
 services:
   entrypoint.configure_base:
     command:
-    - bin/.configure
+    - /usr/local/bin/services/${SERVICE_NAME}/${WORKFLOW_TEMPLATE}/.configure
+    - bin/configure
     environment: {}
     extends:
       file: ../.docker-compose.base.yml
@@ -10,7 +11,8 @@ services:
     working_dir: /home/stoobly/.stoobly/docker/entrypoint/${WORKFLOW_NAME}
   entrypoint.init_base:
     command:
-    - bin/.init
+    - /usr/local/bin/services/${SERVICE_NAME}/${WORKFLOW_TEMPLATE}/.init
+    - bin/init
     environment: {}
     extends:
       file: ../.docker-compose.base.yml

stoobly_agent-1.6.0/stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/bin/configure

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+# Add custom configuration here

stoobly_agent-1.6.0/stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/bin/init

@@ -0,0 +1,3 @@
+#! /bin/bash
+
+# Add custom initialization here

stoobly_agent-1.6.0/stoobly_agent/app/cli/scaffold/templates/app/entrypoint/record/bin/configure

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+# Add custom configuration here

stoobly_agent-1.6.0/stoobly_agent/app/cli/scaffold/templates/app/entrypoint/record/bin/init

@@ -0,0 +1,3 @@
+#! /bin/bash
+
+# Add custom initialization here

stoobly_agent-1.6.0/stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/bin/configure

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+# Add custom configuration here

stoobly_agent-1.6.0/stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/bin/init

@@ -0,0 +1,3 @@
+#! /bin/bash
+
+# Add custom initialization here

{stoobly_agent-1.5.8 → stoobly_agent-1.6.0}/stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/.docker-compose.exec.yml

@@ -1,6 +1,6 @@
 services:
   stoobly_ui.command:
-    command: ['.stoobly/docker/stoobly-ui/exec/${EXEC_COMMAND}', '${EXEC_ARGS}']
+    command: ['/usr/local/bin/workflows/exec/${EXEC_COMMAND}', '${EXEC_ARGS}']
     environment:
       EXEC_OPTIONS: ${EXEC_OPTIONS}
     extends:

{stoobly_agent-1.5.8/stoobly_agent/app/cli/scaffold/templates/app/build/record/bin → stoobly_agent-1.6.0/stoobly_agent/app/cli/scaffold/templates/build/services/build/mock}/.configure

@@ -5,4 +5,8 @@
 
 stoobly-agent config reset
 
-cd $(dirname -- "$0") && ./configure
+entrypoint=$1
+
+if [ -e "$entrypoint" ]; then
+  "$entrypoint"
+fi

{stoobly_agent-1.5.8/stoobly_agent/app/cli/scaffold/templates/app/build/mock/bin → stoobly_agent-1.6.0/stoobly_agent/app/cli/scaffold/templates/build/services/build/mock}/.init

@@ -5,4 +5,8 @@
 
 stoobly-agent snapshot apply
 
-cd $(dirname -- "$0") && ./init
+entrypoint=$1
+
+if [ -e "$entrypoint" ]; then
+  "$entrypoint"
+fi

stoobly_agent-1.6.0/stoobly_agent/app/cli/scaffold/templates/build/services/build/record/.configure

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# This file was automatically generated. DO NOT EDIT.
+# Any changes made to this file will be overwritten.
+
+stoobly-agent config reset
+
+entrypoint=$1
+
+if [ -e "$entrypoint" ]; then
+  "$entrypoint"
+fi

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

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# This file was automatically generated. DO NOT EDIT.
+# Any changes made to this file will be overwritten.
+
+stoobly-agent snapshot apply
+
+entrypoint=$1
+
+if [ -e "$entrypoint" ]; then
+  "$entrypoint"
+fi

stoobly_agent-1.6.0/stoobly_agent/app/cli/scaffold/templates/build/services/build/test/.configure

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# This file was automatically generated. DO NOT EDIT.
+# Any changes made to this file will be overwritten.
+
+stoobly-agent config reset
+
+entrypoint=$1
+
+if [ -e "$entrypoint" ]; then
+  "$entrypoint"
+fi

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

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# This file was automatically generated. DO NOT EDIT.
+# Any changes made to this file will be overwritten.
+
+stoobly-agent snapshot apply
+
+entrypoint=$1
+
+if [ -e "$entrypoint" ]; then
+  "$entrypoint"
+fi

{stoobly_agent-1.5.8/stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/bin → stoobly_agent-1.6.0/stoobly_agent/app/cli/scaffold/templates/build/services/entrypoint/mock}/.configure

@@ -1,12 +1,15 @@
 #!/bin/bash
 
+# This file was automatically generated. DO NOT EDIT.
+# Any changes made to this file will be overwritten.
+
 echo "Configuring intercept..."
 stoobly-agent intercept configure --mode mock --policy all
 
 echo "Enabling intercept..."
 stoobly-agent intercept enable
 
-entrypoint=$(dirname -- "$0")/configure
+entrypoint=$1
 
 if [ -e "$entrypoint" ]; then
   "$entrypoint"

{stoobly_agent-1.5.8/stoobly_agent/app/cli/scaffold/templates/app/build/test/bin → stoobly_agent-1.6.0/stoobly_agent/app/cli/scaffold/templates/build/services/entrypoint/mock}/.init

@@ -3,6 +3,8 @@
 # This file was automatically generated. DO NOT EDIT.
 # Any changes made to this file will be overwritten.
 
-stoobly-agent snapshot apply
+entrypoint=$1
 
-cd $(dirname -- "$0") && ./init
+if [ -e "$entrypoint" ]; then
+  "$entrypoint"
+fi

{stoobly_agent-1.5.8/stoobly_agent/app/cli/scaffold/templates/app/entrypoint/record/bin → stoobly_agent-1.6.0/stoobly_agent/app/cli/scaffold/templates/build/services/entrypoint/record}/.configure

@@ -1,12 +1,15 @@
 #!/bin/bash
 
+# This file was automatically generated. DO NOT EDIT.
+# Any changes made to this file will be overwritten.
+
 echo "Configuring intercept..."
 stoobly-agent intercept configure --mode record --policy all
 
 echo "Disabling intercept..."
 stoobly-agent intercept disable
 
-entrypoint=$(dirname -- "$0")/configure
+entrypoint=$1
 
 if [ -e "$entrypoint" ]; then
   "$entrypoint"

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

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# This file was automatically generated. DO NOT EDIT.
+# Any changes made to this file will be overwritten.
+
+entrypoint=$1
+
+if [ -e "$entrypoint" ]; then
+  "$entrypoint"
+fi

{stoobly_agent-1.5.8/stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/bin → stoobly_agent-1.6.0/stoobly_agent/app/cli/scaffold/templates/build/services/entrypoint/test}/.configure

@@ -1,12 +1,15 @@
 #!/bin/bash
 
+# This file was automatically generated. DO NOT EDIT.
+# Any changes made to this file will be overwritten.
+
 echo "Configuring intercept..."
 stoobly-agent intercept configure --mode mock --policy all
 
 echo "Enabling intercept..."
 stoobly-agent intercept enable
 
-entrypoint=$(dirname -- "$0")/configure
+entrypoint=$1
 
 if [ -e "$entrypoint" ]; then
   "$entrypoint"

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

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# This file was automatically generated. DO NOT EDIT.
+# Any changes made to this file will be overwritten.
+
+entrypoint=$1
+
+if [ -e "$entrypoint" ]; then
+  "$entrypoint"
+fi

{stoobly_agent-1.5.8/stoobly_agent/app/cli/scaffold/templates/workflow/record/bin → stoobly_agent-1.6.0/stoobly_agent/app/cli/scaffold/templates/build/workflows/mock}/.configure

@@ -3,7 +3,7 @@
 # This file was automatically generated. DO NOT EDIT.
 # Any changes made to this file will be overwritten.
 
-entrypoint=$(dirname -- "$0")/configure
+entrypoint=$1
 
 if [ -e "$entrypoint" ]; then
   "$entrypoint"

{stoobly_agent-1.5.8/stoobly_agent/app/cli/scaffold/templates/workflow/mock/bin → stoobly_agent-1.6.0/stoobly_agent/app/cli/scaffold/templates/build/workflows/mock}/.init

@@ -7,7 +7,7 @@ if [ -n "$SERVICE_HOSTNAME" ] && [ "$SERVICE_SCHEME" = "https" ]; then
   stoobly-agent ca-cert mkcert $SERVICE_HOSTNAME
 fi
 
-entrypoint=$(dirname -- "$0")/init
+entrypoint=$1
 if [ -e "$entrypoint" ]; then
   "$entrypoint"
 fi

{stoobly_agent-1.5.8/stoobly_agent/app/cli/scaffold/templates/workflow/test/bin → stoobly_agent-1.6.0/stoobly_agent/app/cli/scaffold/templates/build/workflows/record}/.configure

@@ -3,7 +3,7 @@
 # This file was automatically generated. DO NOT EDIT.
 # Any changes made to this file will be overwritten.
 
-entrypoint=$(dirname -- "$0")/configure
+entrypoint=$1
 
 if [ -e "$entrypoint" ]; then
   "$entrypoint"

{stoobly_agent-1.5.8/stoobly_agent/app/cli/scaffold/templates/workflow/record/bin → stoobly_agent-1.6.0/stoobly_agent/app/cli/scaffold/templates/build/workflows/record}/.init

@@ -7,7 +7,7 @@ if [ -n "$SERVICE_HOSTNAME" ] && [ "$SERVICE_SCHEME" = "https" ] ; then
   stoobly-agent ca-cert mkcert $SERVICE_HOSTNAME
 fi
 
-entrypoint=$(dirname -- "$0")/init
+entrypoint=$1
 if [ -e "$entrypoint" ]; then
   "$entrypoint"
 fi

{stoobly_agent-1.5.8/stoobly_agent/app/cli/scaffold/templates/workflow/mock/bin → stoobly_agent-1.6.0/stoobly_agent/app/cli/scaffold/templates/build/workflows/test}/.configure

@@ -3,7 +3,7 @@
 # This file was automatically generated. DO NOT EDIT.
 # Any changes made to this file will be overwritten.
 
-entrypoint=$(dirname -- "$0")/configure
+entrypoint=$1
 
 if [ -e "$entrypoint" ]; then
   "$entrypoint"

{stoobly_agent-1.5.8/stoobly_agent/app/cli/scaffold/templates/workflow/test/bin → stoobly_agent-1.6.0/stoobly_agent/app/cli/scaffold/templates/build/workflows/test}/.init

@@ -7,7 +7,7 @@ if [ -n "$SERVICE_HOSTNAME" ] && [ "$SERVICE_SCHEME" = "https" ]; then
   stoobly-agent ca-cert mkcert $SERVICE_HOSTNAME
 fi
 
-entrypoint=$(dirname -- "$0")/init
+entrypoint=$1
 if [ -e "$entrypoint" ]; then
   "$entrypoint"
 fi

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

@@ -0,0 +1,3 @@
+#! /bin/bash
+
+# Add custom initialization here

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

@@ -0,0 +1,3 @@
+#! /bin/bash
+
+# Add custom initialization here

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

@@ -0,0 +1,3 @@
+#! /bin/bash
+
+# Add custom initialization here

{stoobly_agent-1.5.8 → stoobly_agent-1.6.0}/stoobly_agent/app/cli/scaffold/workflow_command.py

@@ -5,10 +5,10 @@ import yaml
 from stoobly_agent.lib.logger import Logger
 
 from .app import App
-from .config import Config
 from .constants import BIN_FOLDER_NAME, COMPOSE_TEMPLATE, CONFIG_FILE, ENV_FILE, PUBLIC_FOLDER_NAME
 from .docker.constants import DOCKER_COMPOSE_CUSTOM
 from .service_command import ServiceCommand
+from .workflow_config import WorkflowConfig
 
 LOG_ID = 'WorkflowCommand'
 
@@ -18,6 +18,7 @@ class WorkflowCommand(ServiceCommand):
     super().__init__(app, **kwargs)
 
     self.__workflow_name = kwargs['workflow_name']
+    self.__config = WorkflowConfig(self.workflow_path, **kwargs)
 
   @property
   def bin_dir_path(self):
@@ -93,7 +94,7 @@ class WorkflowCommand(ServiceCommand):
 
   @property
   def workflow_config(self):
-    return Config(self.workflow_config_path).read()
+    return self.__config
 
   @property
   def workflow_config_path(self):

stoobly_agent-1.6.0/stoobly_agent/app/cli/scaffold/workflow_config.py

@@ -0,0 +1,47 @@
+# Wraps the .config.yml file in the workflow folder
+import pdb
+
+from .config import Config
+from .constants import WORKFLOW_TEMPLATE_ENV
+
+class WorkflowConfig(Config):
+
+  def __init__(self, dir: str, **kwargs):
+    super().__init__(dir)
+
+    self.__template = None
+
+    self.load()
+
+    if 'template' in kwargs:
+      self.__template = kwargs.get('template')
+
+  @property
+  def empty(self):
+    return not self.template
+
+  @property
+  def template(self):
+    return (self.__template or '').strip()
+
+  @template.setter
+  def template(self, v):
+    self.__template = v
+
+  def load(self, config = None):
+    config = config or self.read()
+
+    self.template = config.get(WORKFLOW_TEMPLATE_ENV)
+
+  def to_dict(self):
+    return {
+      'template': self.template,
+    }
+
+  def write(self):
+    config = {}
+
+    if self.template:
+      config[WORKFLOW_TEMPLATE_ENV] = self.template
+
+    super().write(config)

{stoobly_agent-1.5.8 → stoobly_agent-1.6.0}/stoobly_agent/app/cli/scaffold/workflow_create_command.py

@@ -5,7 +5,7 @@ import shutil
 from typing import List, TypedDict, Union
 
 from .app import App
-from .constants import WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE, WORKFLOW_TEST_TYPE, WORKFLOW_TEMPLATE
+from .constants import WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE, WORKFLOW_TEST_TYPE, WORKFLOW_TEMPLATE_OPTION
 from .docker.service.builder import ServiceBuilder
 from .docker.workflow.mock_decorator import MockDecorator
 from .docker.workflow.reverse_proxy_decorator import ReverseProxyDecorator
@@ -18,7 +18,7 @@ CORE_WORKFLOWS = [WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE, WORKFLOW_TEST_TYPE]
 class BuildOptions(TypedDict):
   builder_class: type 
   service_builder: ServiceBuilder
-  template: WORKFLOW_TEMPLATE
+  template: WORKFLOW_TEMPLATE_OPTION
   workflow_decorators: List[Union[MockDecorator, ReverseProxyDecorator]]
 
 class WorkflowCreateCommand(WorkflowCommand):
@@ -54,10 +54,13 @@ class WorkflowCreateCommand(WorkflowCommand):
     workflow_builder = self.__write_docker_compose_file(**kwargs)
     self.__copy_templates(workflow_builder, kwargs.get('template'))
 
+    if not self.workflow_config.empty:
+      self.workflow_config.write()
+
   def build_workflow_templates_path(self, workflow_name: str):
     return os.path.join(self.workflow_templates_root_dir, workflow_name)
 
-  def __copy_templates(self, workflow_builder: WorkflowBuilder, template: WORKFLOW_TEMPLATE = None):
+  def __copy_templates(self, workflow_builder: WorkflowBuilder, template: WORKFLOW_TEMPLATE_OPTION = None):
     if not template:
       templates_path = self.workflow_templates_path
     else:

{stoobly_agent-1.5.8 → stoobly_agent-1.6.0}/stoobly_agent/app/cli/scaffold/workflow_run_command.py

@@ -12,7 +12,7 @@ from stoobly_agent.lib.logger import Logger
 from .app import App
 from .constants import (
   APP_DIR_ENV, APP_NETWORK_ENV, CA_CERTS_DIR_ENV, CERTS_DIR_ENV, CONTEXT_DIR_ENV, NAMESERVERS_FILE, 
-  SERVICE_DNS_ENV, SERVICE_NAME_ENV, USER_ID_ENV, WORKFLOW_NAME_ENV, WORKFLOW_NAMESPACE_ENV
+  SERVICE_DNS_ENV, SERVICE_NAME_ENV, USER_ID_ENV, WORKFLOW_NAME_ENV, WORKFLOW_NAMESPACE_ENV, WORKFLOW_TEMPLATE_ENV
 )
 from .docker.constants import DOCKERFILE_CONTEXT
 from .workflow_command import WorkflowCommand
@@ -257,6 +257,7 @@ class WorkflowRunCommand(WorkflowCommand):
     _config[SERVICE_NAME_ENV] = self.service_name
     _config[USER_ID_ENV] = user_id or os.getuid()
     _config[WORKFLOW_NAME_ENV] = self.workflow_name
+    _config[WORKFLOW_TEMPLATE_ENV] = self.workflow_name
     
     if namespace:
       _config[WORKFLOW_NAMESPACE_ENV] = namespace