stoobly-agent 1.10.0__py3-none-any.whl → 1.10.2__py3-none-any.whl

stoobly_agent/public/runtime-es2015.77bcd31efed9e5d5d431.js

@@ -0,0 +1 @@
+!function(e){function r(r){for(var t,n,o=r[0],d=r[1],b=r[2],i=0,l=[];i<o.length;i++)n=o[i],Object.prototype.hasOwnProperty.call(c,n)&&c[n]&&l.push(c[n][0]),c[n]=0;for(t in d)Object.prototype.hasOwnProperty.call(d,t)&&(e[t]=d[t]);for(u&&u(r);l.length;)l.shift()();return f.push.apply(f,b||[]),a()}function a(){for(var e,r=0;r<f.length;r++){for(var a=f[r],t=!0,o=1;o<a.length;o++)0!==c[a[o]]&&(t=!1);t&&(f.splice(r--,1),e=n(n.s=a[0]))}return e}var t={},c={11:0},f=[];function n(r){if(t[r])return t[r].exports;var a=t[r]={i:r,l:!1,exports:{}};return e[r].call(a.exports,a,a.exports,n),a.l=!0,a.exports}n.e=function(e){var r=[],a=c[e];if(0!==a)if(a)r.push(a[2]);else{var t=new Promise(function(r,t){a=c[e]=[r,t]});r.push(a[2]=t);var f,o=document.createElement("script");o.charset="utf-8",o.timeout=120,n.nc&&o.setAttribute("nonce",n.nc),o.src=function(e){return n.p+""+({3:"common"}[e]||e)+"-es2015."+{0:"c7c5a6d51b98cb85b9fc",1:"bb4492eeabe1fe937ada",2:"51eb8544ea9a21f2874c",3:"388805227aa99c527fba",4:"f8ac5475bf103969b2d2",5:"90ea7bd4439d9749e052",6:"5fb726c0555664300974",7:"ba9f789e186a8e3962d3",8:"b901639e2aeff1358c3d",9:"1d75413af5d96b4ff1e5",10:"56da22458086513ba0c7",12:"618ecfd5f735b801b50f",13:"6d3a4fd76d46bfa5f200",14:"b6619d7742671d2a37fb",15:"d8855701408b0e1d7a3e",16:"98fa59c2c96d2caac3c3",17:"7f60b56d1fd66d4d5544",18:"beb31fe4a4dee3007cb2",19:"e5acb2c1e0e91717efc2",20:"90544c488f1f0900bab4",21:"63ed4e6b242fbc047bd6",22:"1e96ef651f96d51191e2",23:"6d3052555b4fac38f16d",28:"a2bf42f38e4dd771ccea",29:"18b515f07c88753c7eb6",30:"d4d3dc4101400cadf3f3",31:"e3ea815f75c19c217b7d",32:"57553995bff0ae518501",33:"da5ba1e5baa164921198",34:"87acbb95cfb824650157",35:"4ffe6f7a196ed1a87fc7",36:"e3a104020eeec02cb8c4",37:"3b472e6cf303201bbf2c",38:"39dbf43d46cdc94f78c6",39:"e5475ea4fb6ec5c60741",40:"47b2873a8439717af6a7",41:"69f2771002745c066976",42:"b590b92ede890155dcd6",43:"ad1d956bffba561ba64c",44:"3ef2c17996ed5be95ced",45:"3d65d27e0a7085e96356",46:"e4f0a5b127eae13c27c0",47:"c7d45334a70131f133b5"}[e]+".js"}(e);var d=new Error;f=function(r){o.onerror=o.onload=null,clearTimeout(b);var a=c[e];if(0!==a){if(a){var t=r&&("load"===r.type?"missing":r.type),f=r&&r.target&&r.target.src;d.message="Loading chunk "+e+" failed.\n("+t+": "+f+")",d.name="ChunkLoadError",d.type=t,d.request=f,a[1](d)}c[e]=void 0}};var b=setTimeout(function(){f({type:"timeout",target:o})},12e4);o.onerror=o.onload=f,document.head.appendChild(o)}return Promise.all(r)},n.m=e,n.c=t,n.d=function(e,r,a){n.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:a})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,r){if(1&r&&(e=n(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var a=Object.create(null);if(n.r(a),Object.defineProperty(a,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var t in e)n.d(a,t,(function(r){return e[r]}).bind(null,t));return a},n.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(r,"a",r),r},n.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},n.p="",n.oe=function(e){throw console.error(e),e};var o=window.webpackJsonp=window.webpackJsonp||[],d=o.push.bind(o);o.push=r,o=o.slice();for(var b=0;b<o.length;b++)r(o[b]);var u=d;a()}([]);

stoobly_agent/public/runtime-es5.77bcd31efed9e5d5d431.js

@@ -0,0 +1 @@
+!function(e){function r(r){for(var t,n,o=r[0],d=r[1],b=r[2],i=0,l=[];i<o.length;i++)n=o[i],Object.prototype.hasOwnProperty.call(c,n)&&c[n]&&l.push(c[n][0]),c[n]=0;for(t in d)Object.prototype.hasOwnProperty.call(d,t)&&(e[t]=d[t]);for(u&&u(r);l.length;)l.shift()();return f.push.apply(f,b||[]),a()}function a(){for(var e,r=0;r<f.length;r++){for(var a=f[r],t=!0,o=1;o<a.length;o++)0!==c[a[o]]&&(t=!1);t&&(f.splice(r--,1),e=n(n.s=a[0]))}return e}var t={},c={11:0},f=[];function n(r){if(t[r])return t[r].exports;var a=t[r]={i:r,l:!1,exports:{}};return e[r].call(a.exports,a,a.exports,n),a.l=!0,a.exports}n.e=function(e){var r=[],a=c[e];if(0!==a)if(a)r.push(a[2]);else{var t=new Promise(function(r,t){a=c[e]=[r,t]});r.push(a[2]=t);var f,o=document.createElement("script");o.charset="utf-8",o.timeout=120,n.nc&&o.setAttribute("nonce",n.nc),o.src=function(e){return n.p+""+({3:"common"}[e]||e)+"-es5."+{0:"c7c5a6d51b98cb85b9fc",1:"bb4492eeabe1fe937ada",2:"51eb8544ea9a21f2874c",3:"388805227aa99c527fba",4:"f8ac5475bf103969b2d2",5:"90ea7bd4439d9749e052",6:"5fb726c0555664300974",7:"ba9f789e186a8e3962d3",8:"b901639e2aeff1358c3d",9:"1d75413af5d96b4ff1e5",10:"56da22458086513ba0c7",12:"618ecfd5f735b801b50f",13:"6d3a4fd76d46bfa5f200",14:"b6619d7742671d2a37fb",15:"d8855701408b0e1d7a3e",16:"98fa59c2c96d2caac3c3",17:"7f60b56d1fd66d4d5544",18:"beb31fe4a4dee3007cb2",19:"e5acb2c1e0e91717efc2",20:"90544c488f1f0900bab4",21:"63ed4e6b242fbc047bd6",22:"1e96ef651f96d51191e2",23:"6d3052555b4fac38f16d",28:"a2bf42f38e4dd771ccea",29:"18b515f07c88753c7eb6",30:"d4d3dc4101400cadf3f3",31:"e3ea815f75c19c217b7d",32:"57553995bff0ae518501",33:"da5ba1e5baa164921198",34:"87acbb95cfb824650157",35:"4ffe6f7a196ed1a87fc7",36:"e3a104020eeec02cb8c4",37:"3b472e6cf303201bbf2c",38:"39dbf43d46cdc94f78c6",39:"e5475ea4fb6ec5c60741",40:"47b2873a8439717af6a7",41:"69f2771002745c066976",42:"b590b92ede890155dcd6",43:"ad1d956bffba561ba64c",44:"3ef2c17996ed5be95ced",45:"3d65d27e0a7085e96356",46:"e4f0a5b127eae13c27c0",47:"c7d45334a70131f133b5"}[e]+".js"}(e);var d=new Error;f=function(r){o.onerror=o.onload=null,clearTimeout(b);var a=c[e];if(0!==a){if(a){var t=r&&("load"===r.type?"missing":r.type),f=r&&r.target&&r.target.src;d.message="Loading chunk "+e+" failed.\n("+t+": "+f+")",d.name="ChunkLoadError",d.type=t,d.request=f,a[1](d)}c[e]=void 0}};var b=setTimeout(function(){f({type:"timeout",target:o})},12e4);o.onerror=o.onload=f,document.head.appendChild(o)}return Promise.all(r)},n.m=e,n.c=t,n.d=function(e,r,a){n.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:a})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,r){if(1&r&&(e=n(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var a=Object.create(null);if(n.r(a),Object.defineProperty(a,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var t in e)n.d(a,t,(function(r){return e[r]}).bind(null,t));return a},n.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(r,"a",r),r},n.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},n.p="",n.oe=function(e){throw console.error(e),e};var o=window.webpackJsonp=window.webpackJsonp||[],d=o.push.bind(o);o.push=r,o=o.slice();for(var b=0;b<o.length;b++)r(o[b]);var u=d;a()}([]);

stoobly_agent/test/app/cli/intercept/intercept_configure_test.py

@@ -1,8 +1,12 @@
+import importlib
+import os
 import pdb
+from click import Group
 import pytest
 
 from click.testing import CliRunner
 
+from stoobly_agent.app.cli import intercept_cli
 from stoobly_agent.test.test_helper import reset
 
 from stoobly_agent.cli import config, intercept, scenario
@@ -10,7 +14,7 @@ from stoobly_agent.lib.orm.scenario import Scenario
 from stoobly_agent.app.settings import Settings
 from stoobly_agent.lib.api.keys.project_key import ProjectKey
 
-from stoobly_agent.config.constants import mode, mock_policy, record_order, record_policy, record_strategy, replay_policy, test_strategy
+from stoobly_agent.config.constants import env_vars, mode, mock_policy, record_order, record_policy, record_strategy, replay_policy, test_strategy
 
 @pytest.fixture(scope='module')
 def runner():
@@ -20,6 +24,14 @@ def runner():
 def settings():
   return reset()
 
+@pytest.fixture(scope='module')
+def intercept_cli():
+  from stoobly_agent.app.cli import intercept_cli as _intercept_cli
+  os.environ[env_vars.AGENT_REMOTE_ENABLED] = '1'
+  importlib.reload(_intercept_cli)
+  del os.environ[env_vars.AGENT_REMOTE_ENABLED]
+  return _intercept_cli.intercept
+
 class TestInterceptConfigure():
 
   class TestRecordOrder():
@@ -156,9 +168,8 @@ class TestInterceptConfigure():
         assert data_rule.replay_policy == replay_policy.ALL
 
     class TestTestPolicy():
-
-      def test_policy_test_mode_found(self, runner: CliRunner):
-        configure_result = runner.invoke(intercept, ['configure', '--mode', mode.TEST, '--policy', mock_policy.FOUND])
+      def test_policy_test_mode_found(self, runner: CliRunner, intercept_cli: Group):
+        configure_result = runner.invoke(intercept_cli, ['configure', '--mode', mode.TEST, '--policy', mock_policy.FOUND])
         assert configure_result.exit_code == 0
 
         settings = Settings.instance()
@@ -196,9 +207,9 @@ class TestInterceptConfigure():
         assert configure_result.exit_code == 1
         assert "Error: Valid policies for" in configure_result.output
 
-      def test_policy_invalid_for_test_mode(self, runner: CliRunner):
+      def test_policy_invalid_for_test_mode(self, runner: CliRunner, intercept_cli: Group):
         # Use record_policy.API which is not valid for TEST mode
-        configure_result = runner.invoke(intercept, ['configure', '--mode', mode.TEST, '--policy', record_policy.API])
+        configure_result = runner.invoke(intercept_cli, ['configure', '--mode', mode.TEST, '--policy', record_policy.API])
         assert configure_result.exit_code == 1
         assert "Error: Valid policies for" in configure_result.output
 

stoobly_agent/test/app/cli/scaffold/docker/cli_invoker.py

@@ -0,0 +1,177 @@
+import os
+import pathlib
+import pdb
+import subprocess
+
+from click.testing import CliRunner
+
+from stoobly_agent.app.cli import scaffold
+from stoobly_agent.config.data_dir import DATA_DIR_NAME
+
+
+class ScaffoldCliInvoker():
+
+  @staticmethod
+  def cli_app_create(runner: CliRunner, app_dir_path: str, app_name: str):
+    pathlib.Path(f"{app_dir_path}/{DATA_DIR_NAME}").mkdir(parents=True, exist_ok=True)
+
+    result = runner.invoke(scaffold, ['app', 'create',
+      '--app-dir-path', app_dir_path,
+      '--quiet',
+      app_name
+    ])
+
+    if result.exit_code != 0:
+      print(f"Command failed with exit code {result.exit_code}")
+      print(f"Output: {result.output}")
+      print(f"Exception: {result.exception}")
+
+    assert result.exit_code == 0
+    output = result.stdout
+    assert not output
+
+  @staticmethod
+  def cli_app_mkcert(runner: CliRunner, app_dir_path: str):
+    result = runner.invoke(scaffold, ['app', 'mkcert',
+      '--app-dir-path', app_dir_path,
+      '--context-dir-path', app_dir_path,
+    ])
+
+    assert result.exit_code == 0
+    output = result.stdout
+    assert not output
+
+  @staticmethod
+  def cli_service_create(runner: CliRunner, app_dir_path: str, hostname: str, service_name: str, https: bool):
+    scheme = 'http'
+    port = '80'
+    if https == True:
+      scheme = 'https'
+      port = '443'
+
+    result = runner.invoke(scaffold, ['service', 'create',
+      '--app-dir-path', app_dir_path,
+      '--env', 'TEST',
+      '--hostname', hostname,
+      '--scheme', scheme,
+      '--port', port,
+      '--quiet',
+      '--workflow', 'mock',
+      '--workflow', 'record',
+      '--workflow', 'test',
+      service_name
+    ])
+    assert result.exit_code == 0
+    output = result.stdout
+    assert not output
+
+  # Specific flags for assets
+  @staticmethod
+  def cli_service_create_assets(runner: CliRunner, app_dir_path: str, hostname: str, service_name: str, https: bool):
+    scheme = 'http'
+    port = '80'
+    if https == True:
+      scheme = 'https'
+      port = '443'
+
+    result = runner.invoke(scaffold, ['service', 'create',
+      '--app-dir-path', app_dir_path,
+      '--hostname', hostname,
+      '--scheme', scheme,
+      '--port', port,
+      '--upstream-hostname', hostname,
+      '--upstream-port', 80,
+      '--upstream-scheme', 'http',
+      '--detached',
+      '--quiet',
+      '--workflow', 'test',
+      service_name
+    ])
+    assert result.exit_code == 0
+    output = result.stdout
+    assert not output
+
+  @staticmethod
+  def cli_service_delete(runner: CliRunner, app_dir_path: str, service_name: str):
+    result = runner.invoke(scaffold, ['service', 'delete',
+      '--app-dir-path', app_dir_path,
+      service_name
+    ])
+    assert result.exit_code == 0
+    output = result.stdout
+    assert 'error' not in output.lower()
+
+  @staticmethod
+  def cli_workflow_create(runner: CliRunner, app_dir_path: str, service_name: str):
+    result = runner.invoke(scaffold, ['workflow', 'create',
+      '--app-dir-path', app_dir_path,
+      '--service', service_name,
+      '--template', 'mock',
+      'ci',
+    ])
+
+    assert result.exit_code == 0
+
+  @staticmethod
+  def cli_workflow_up(runner: CliRunner, app_dir_path: str, target_workflow_name: str):
+    command = ['workflow', 'up',
+      '--app-dir-path', app_dir_path,
+      '--context-dir-path', app_dir_path,
+      '--yes',
+      target_workflow_name,
+    ]
+    result = runner.invoke(scaffold, command)
+
+    if result.exit_code != 0:
+      print(f"Command failed with exit code {result.exit_code}")
+      print(f"Output: {result.output}")
+      print(f"Exception: {result.exception}")
+
+    assert result.exit_code == 0
+
+  @staticmethod
+  def cli_workflow_down(runner: CliRunner, app_dir_path: str, target_workflow_name: str):
+    command = ['workflow', 'down',
+      '--app-dir-path', app_dir_path,
+      '--context-dir-path', app_dir_path,
+      target_workflow_name,
+    ]
+    result = runner.invoke(scaffold, command)
+
+    if result.exit_code != 0:
+      print(f"Down command failed with exit code {result.exit_code}")
+      print(f"Output: {result.output}")
+      print(f"Exception: {result.exception}")
+
+    assert result.exit_code == 0
+
+  @staticmethod
+  def makefile_workflow_up(runner: CliRunner, app_dir_path: str, target_workflow_name: str):
+    command = ['make', '-f', os.path.join(app_dir_path, '.stoobly', 'services', 'Makefile'),
+      target_workflow_name,
+    ]
+
+    # Run the command using subprocess
+    # Instead of piping, print to stdout and stderr
+    result = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+    if result.returncode != 0:
+      print(f"Command failed with exit code {result.returncode}")
+      print(f"Output: {result.stdout}")
+      print(f"Exception: {result.stderr}")
+
+    assert result.returncode == 0
+
+  @staticmethod
+  def makefile_workflow_down(runner: CliRunner, app_dir_path: str, target_workflow_name: str):
+    command = ['make', '-f', os.path.join(app_dir_path, '.stoobly', 'services', 'Makefile'),
+      f"{target_workflow_name}/down"
+    ]
+    result = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+    if result.returncode != 0:
+      print(f"Command failed with exit code {result.returncode}")
+      print(f"Output: {result.stdout}")
+      print(f"Exception: {result.stderr}")
+
+    assert result.returncode == 0

stoobly_agent/test/app/cli/scaffold/{cli_test.py → docker/cli_test.py}

@@ -7,12 +7,12 @@ import pytest
 
 from stoobly_agent.app.cli.scaffold.app import App
 from stoobly_agent.app.cli.scaffold.constants import (
-  DOCKER_NAMESPACE,
+  SERVICES_NAMESPACE,
   WORKFLOW_RECORD_TYPE,
 )
 from stoobly_agent.app.cli.scaffold.service_docker_compose import ServiceDockerCompose
 from stoobly_agent.config.data_dir import DataDir
-from stoobly_agent.test.app.cli.scaffold.e2e_test import ScaffoldCliInvoker
+from stoobly_agent.test.app.cli.scaffold.docker.e2e_test import ScaffoldCliInvoker
 from stoobly_agent.test.test_helper import reset
 
 
@@ -81,16 +81,9 @@ class TestScaffoldCli():
 
       # Generate certs
       ScaffoldCliInvoker.cli_app_mkcert(runner, app_dir_path)
-    
-    @pytest.fixture(scope="class", autouse=True)
-    def cleanup_after_all(self, runner, app_dir_path, target_workflow_name):
-      yield
-      ScaffoldCliInvoker.cli_workflow_down(runner, app_dir_path, target_workflow_name)
-      shutil.rmtree(app_dir_path)
-    
  
     def test_service_delete(self, runner, app_dir_path, external_service_docker_compose):
-      app = App(app_dir_path, DOCKER_NAMESPACE)
+      app = App(app_dir_path, SERVICES_NAMESPACE)
       service_name = external_service_docker_compose.service_name
       
       ScaffoldCliInvoker.cli_service_delete(runner, app_dir_path, service_name)
@@ -105,7 +98,7 @@ class TestScaffoldCli():
         assert False
 
     def test_service_delete_https(self, runner, app_dir_path, external_https_service_docker_compose):
-      app = App(app_dir_path, DOCKER_NAMESPACE)
+      app = App(app_dir_path, SERVICES_NAMESPACE)
       service_name = external_https_service_docker_compose.service_name
       hostname = external_https_service_docker_compose.hostname
 

stoobly_agent/test/app/cli/scaffold/{e2e_test.py → docker/e2e_test.py}

@@ -1,13 +1,13 @@
-from pathlib import Path
 import pdb
+import pytest
 import shutil
 
 from click.testing import CliRunner
-import pytest
+from pathlib import Path
 
 from stoobly_agent.app.cli.scaffold.app import App
 from stoobly_agent.app.cli.scaffold.constants import (
-  DOCKER_NAMESPACE,
+  SERVICES_NAMESPACE,
   WORKFLOW_RECORD_TYPE,
   WORKFLOW_TEST_TYPE,
 )
@@ -22,10 +22,9 @@ from stoobly_agent.app.cli.scaffold.workflow_validate_command import (
   WorkflowValidateCommand,
 )
 from stoobly_agent.config.data_dir import DataDir
-from stoobly_agent.test.app.cli.scaffold.cli_invoker import ScaffoldCliInvoker
+from stoobly_agent.test.app.cli.scaffold.docker.cli_invoker import ScaffoldCliInvoker
 from stoobly_agent.test.test_helper import reset
 
-
 @pytest.mark.e2e
 class TestScaffoldE2e():
 
@@ -49,12 +48,12 @@ class TestScaffoldE2e():
     yield tmp_path
 
   @pytest.fixture(scope='class', autouse=True)
-  def app_dir_path(self, temp_dir, app_name):
+  def app_dir_path(self, temp_dir):
     yield temp_dir
 
   @pytest.fixture(scope='class')
   def mock_data_directory_path(self):
-    yield Path(__file__).parent.parent.parent.parent / 'mock_data'
+    yield Path(__file__).parent.parent.parent.parent.parent / 'mock_data'
   
   @pytest.fixture(scope='class')
   def local_service_mock_docker_compose_path(self, mock_data_directory_path):
@@ -85,7 +84,6 @@ class TestScaffoldE2e():
   def local_service_name(self):
     yield "my-httpbin"
 
-  
   class TestRecordWorkflow():
     @pytest.fixture(scope='class', autouse=True)
     def target_workflow_name(self):
@@ -135,10 +133,9 @@ class TestScaffoldE2e():
     def cleanup_after_all(self, runner, app_dir_path, target_workflow_name):
       yield
       ScaffoldCliInvoker.cli_workflow_down(runner, app_dir_path, target_workflow_name)
-      shutil.rmtree(app_dir_path)
 
     def test_core_services(self, app_dir_path, target_workflow_name):
-      app = App(app_dir_path, DOCKER_NAMESPACE)
+      app = App(app_dir_path, SERVICES_NAMESPACE)
       config = {
         'workflow_name': target_workflow_name,
         'service_name': 'build'
@@ -148,7 +145,7 @@ class TestScaffoldE2e():
       command.validate()
 
     def test_external_service(self, external_service_docker_compose: ServiceDockerCompose, app_dir_path, target_workflow_name):
-      app = App(app_dir_path, DOCKER_NAMESPACE)
+      app = App(app_dir_path, SERVICES_NAMESPACE)
       config = {
         'workflow_name': target_workflow_name,
         'service_name': external_service_docker_compose.service_name 
@@ -158,7 +155,7 @@ class TestScaffoldE2e():
       command.validate()
 
     def test_local_service(self, app_dir_path, target_workflow_name, local_service_docker_compose: ServiceDockerCompose):
-      app = App(app_dir_path, DOCKER_NAMESPACE)
+      app = App(app_dir_path, SERVICES_NAMESPACE)
       config = {
         'workflow_name': target_workflow_name,
         'service_name': local_service_docker_compose.service_name 
@@ -197,15 +194,21 @@ class TestScaffoldE2e():
     
     @pytest.fixture(scope='class')
     def external_service_docker_compose(self, app_dir_path, target_workflow_name, external_service_name, hostname):
-      yield ServiceDockerCompose(app_dir_path=app_dir_path, target_workflow_name=target_workflow_name, service_name=external_service_name, hostname=hostname)
+      yield ServiceDockerCompose(
+        app_dir_path=app_dir_path, target_workflow_name=target_workflow_name, service_name=external_service_name, hostname=hostname
+      )
 
     @pytest.fixture(scope='class')
     def local_service_docker_compose(self, app_dir_path, target_workflow_name, local_service_name, local_hostname):
-      yield ServiceDockerCompose(app_dir_path=app_dir_path, target_workflow_name=target_workflow_name, service_name=local_service_name, hostname=local_hostname)
+      yield ServiceDockerCompose(
+        app_dir_path=app_dir_path, target_workflow_name=target_workflow_name, service_name=local_service_name, hostname=local_hostname
+      )
     
     @pytest.fixture(scope='class')
     def assets_service_docker_compose(self, app_dir_path, target_workflow_name, assets_service_name, assets_hostname):
-      yield ServiceDockerCompose(app_dir_path=app_dir_path, target_workflow_name=target_workflow_name, service_name=assets_service_name, hostname=assets_hostname)
+      yield ServiceDockerCompose(
+        app_dir_path=app_dir_path, target_workflow_name=target_workflow_name, service_name=assets_service_name, hostname=assets_hostname
+      )
 
     @pytest.fixture(scope='class', autouse=True)
     def setup_docker_composes(self, managed_services_docker_compose, external_service_docker_compose, local_service_docker_compose, assets_service_docker_compose):
@@ -215,7 +218,7 @@ class TestScaffoldE2e():
       self.assets_service_docker_compose = assets_service_docker_compose
 
     @pytest.fixture(scope="class", autouse=True)
-    def create_scaffold_setup(self, runner, app_name, app_dir_path, target_workflow_name, external_service_docker_compose, local_service_docker_compose, assets_service_docker_compose, mock_data_directory_path, assets_service_mock_docker_compose_path):
+    def create_scaffold_setup(self, runner, app_name, app_dir_path, target_workflow_name, external_service_docker_compose, local_service_docker_compose, assets_service_docker_compose, mock_data_directory_path, assets_service_mock_docker_compose_path, workflow_up_method: str):
 
       ScaffoldCliInvoker.cli_app_create(runner, app_dir_path, app_name)
 
@@ -223,7 +226,7 @@ class TestScaffoldE2e():
       ScaffoldCliInvoker.cli_service_create(runner, app_dir_path, external_service_docker_compose.hostname, external_service_docker_compose.service_name, False)
       # Create local user defined services
       ScaffoldCliInvoker.cli_service_create(runner, app_dir_path, local_service_docker_compose.hostname, local_service_docker_compose.service_name, False)
-      ScaffoldCliInvoker.cli_service_create_assets(runner, app_dir_path, assets_service_docker_compose.hostname, assets_service_docker_compose.service_name, False)
+      ScaffoldCliInvoker.cli_service_create_assets(runner, app_dir_path, assets_service_docker_compose.hostname, assets_service_docker_compose.service_name, True)
 
       # Don't run the local user defined service in the 'test' workflow
       # So don't copy the Docker Compose file over
@@ -233,17 +236,17 @@ class TestScaffoldE2e():
       assert destination_path.is_file()
       shutil.copyfile(assets_service_mock_docker_compose_path, destination_path)
 
-      ScaffoldCliInvoker.cli_service_create_assets(runner, app_dir_path, assets_service_docker_compose.hostname, assets_service_docker_compose.service_name, False)
+      ScaffoldCliInvoker.cli_service_create_assets(runner, app_dir_path, assets_service_docker_compose.hostname, assets_service_docker_compose.service_name, True)
 
       # Add assets for assets service
       data_dir_path = DataDir.instance().path
-      destination_assets_path = f"{data_dir_path}/docker/{assets_service_docker_compose.service_name}/{target_workflow_name}/index.html"
+      destination_assets_path = f"{data_dir_path}/{SERVICES_NAMESPACE}/{assets_service_docker_compose.service_name}/{target_workflow_name}/index.html"
       destination_path = Path(destination_assets_path)
       assets_mock_path = mock_data_directory_path / "scaffold" / "index.html"
       shutil.copyfile(assets_mock_path, destination_path)
 
       # Created shared file in fixtures folder
-      app = App(app_dir_path, DOCKER_NAMESPACE)
+      app = App(app_dir_path, SERVICES_NAMESPACE)
       config = {
         'workflow_name': target_workflow_name,
         'service_name': external_service_docker_compose.service_name 
@@ -252,16 +255,28 @@ class TestScaffoldE2e():
       with open(f"{command.public_dir_path}/shared_file.txt", 'w') as file:
         file.write('this is a shared file')
 
-      ScaffoldCliInvoker.cli_workflow_up(runner, app_dir_path, target_workflow_name=target_workflow_name)
+      # Use parameterized workflow up method
+      if workflow_up_method == 'cli':
+        ScaffoldCliInvoker.cli_workflow_up(runner, app_dir_path, target_workflow_name)
+      else:  # makefile
+        ScaffoldCliInvoker.makefile_workflow_up(runner, app_dir_path, target_workflow_name)
     
     @pytest.fixture(scope="class", autouse=True)
-    def cleanup_after_all(self, runner, app_dir_path, target_workflow_name):
+    def cleanup_after_all(self, runner, app_dir_path, target_workflow_name, workflow_up_method):
       yield
-      ScaffoldCliInvoker.cli_workflow_down(runner, app_dir_path, target_workflow_name)
-      shutil.rmtree(app_dir_path)
+      # Use the same method for down as was used for up
+      if workflow_up_method == 'cli':
+        ScaffoldCliInvoker.cli_workflow_down(runner, app_dir_path, target_workflow_name)
+      else:  # makefile
+        ScaffoldCliInvoker.makefile_workflow_down(runner, app_dir_path, target_workflow_name)
+
+    @pytest.fixture(scope='class', params=['cli', 'makefile'])
+    def workflow_up_method(self, request):
+      """Parameterized fixture that alternates between CLI and Makefile workflow up methods."""
+      return request.param
 
     def test_no_core_services(self, app_dir_path, target_workflow_name):
-      app = App(app_dir_path, DOCKER_NAMESPACE)
+      app = App(app_dir_path, SERVICES_NAMESPACE)
       config = {
         'workflow_name': target_workflow_name,
         'service_name': 'build'
@@ -271,7 +286,7 @@ class TestScaffoldE2e():
       command.validate()
 
     def test_user_services(self, app_dir_path, target_workflow_name, external_service_docker_compose, local_service_docker_compose):
-      app = App(app_dir_path, DOCKER_NAMESPACE)
+      app = App(app_dir_path, SERVICES_NAMESPACE)
 
       config = {
         'workflow_name': target_workflow_name,
@@ -292,7 +307,7 @@ class TestScaffoldE2e():
       pass
 
     def test_assets(self, app_dir_path, target_workflow_name):
-      app = App(app_dir_path, DOCKER_NAMESPACE)
+      app = App(app_dir_path, SERVICES_NAMESPACE)
       config = {
         'workflow_name': target_workflow_name,
         'service_name': 'assets'

stoobly_agent/test/app/cli/scaffold/{cli_invoker.py → local/cli_invoker.py}

@@ -7,7 +7,7 @@ from stoobly_agent.app.cli import scaffold
 from stoobly_agent.config.data_dir import DATA_DIR_NAME
 
 
-class ScaffoldCliInvoker():
+class LocalScaffoldCliInvoker():
 
   @staticmethod
   def cli_app_create(runner: CliRunner, app_dir_path: str, app_name: str):
@@ -15,6 +15,8 @@ class ScaffoldCliInvoker():
 
     result = runner.invoke(scaffold, ['app', 'create',
       '--app-dir-path', app_dir_path,
+      '--proxy-port', '8081',
+      '--run-on', 'local',
       '--quiet',
       app_name
     ])
@@ -23,17 +25,6 @@ class ScaffoldCliInvoker():
     output = result.stdout
     assert not output
 
-  @staticmethod
-  def cli_app_mkcert(runner: CliRunner, app_dir_path: str):
-    result = runner.invoke(scaffold, ['app', 'mkcert',
-      '--app-dir-path', app_dir_path,
-      '--context-dir-path', app_dir_path,
-    ])
-
-    assert result.exit_code == 0
-    output = result.stdout
-    assert not output
-
   @staticmethod
   def cli_service_create(runner: CliRunner, app_dir_path: str, hostname: str, service_name: str, https: bool):
     scheme = 'http'
@@ -58,25 +49,17 @@ class ScaffoldCliInvoker():
     output = result.stdout
     assert not output
 
-  # Specific flags for assets
   @staticmethod
-  def cli_service_create_assets(runner: CliRunner, app_dir_path: str, hostname: str, service_name: str, https: bool):
-    scheme = 'http'
-    port = '80'
-    if https == True:
-      scheme = 'https'
-      port = '443'
-
+  def cli_service_create_local(runner: CliRunner, app_dir_path: str, hostname: str, service_name: str):
+    """Create a local service (not external)"""
     result = runner.invoke(scaffold, ['service', 'create',
       '--app-dir-path', app_dir_path,
       '--hostname', hostname,
-      '--scheme', scheme,
-      '--port', port,
-      '--proxy-mode', 'reverse',
-      '--upstream-hostname', hostname,
-      '--upstream-port', 8080,
-      '--detached',
+      '--scheme', 'http',
+      '--port', '3000',  
       '--quiet',
+      '--workflow', 'mock',
+      '--workflow', 'record',
       '--workflow', 'test',
       service_name
     ])
@@ -104,21 +87,40 @@ class ScaffoldCliInvoker():
     ])
 
     assert result.exit_code == 0
-    output = result.stdout
-    assert not output
 
   @staticmethod
   def cli_workflow_up(runner: CliRunner, app_dir_path: str, target_workflow_name: str):
     command = ['workflow', 'up',
       '--app-dir-path', app_dir_path,
       '--context-dir-path', app_dir_path,
+      '--yes',
       target_workflow_name,
     ]
     result = runner.invoke(scaffold, command)
 
+    if result.exit_code != 0:
+      print(f"Command failed with exit code {result.exit_code}")
+      print(f"Output: {result.output}")
+      print(f"Exception: {result.exception}")
+
     assert result.exit_code == 0
-    output = result.stdout
-    assert output
+    return result
+
+  @staticmethod
+  def cli_workflow_logs(runner: CliRunner, app_dir_path: str, target_workflow_name: str):
+    command = ['workflow', 'logs',
+      '--app-dir-path', app_dir_path,
+      target_workflow_name,
+    ]
+    result = runner.invoke(scaffold, command)
+
+    if result.exit_code != 0:
+      print(f"Logs command failed with exit code {result.exit_code}")
+      print(f"Output: {result.output}")
+      print(f"Exception: {result.exception}")
+
+    assert result.exit_code == 0
+    return result
 
   @staticmethod
   def cli_workflow_down(runner: CliRunner, app_dir_path: str, target_workflow_name: str):
@@ -129,6 +131,10 @@ class ScaffoldCliInvoker():
     ]
     result = runner.invoke(scaffold, command)
 
+    if result.exit_code != 0:
+      print(f"Down command failed with exit code {result.exit_code}")
+      print(f"Output: {result.output}")
+      print(f"Exception: {result.exception}")
+
     assert result.exit_code == 0
-    output = result.stdout
-    assert output
+    return result