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

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}

@@ -12,7 +12,7 @@ from stoobly_agent.app.cli.scaffold.constants import (
 )
 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,13 +81,6 @@ 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, SERVICES_NAMESPACE)

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

@@ -1,9 +1,9 @@
-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 (
@@ -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,7 +133,6 @@ 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, SERVICES_NAMESPACE)
@@ -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)
 
@@ -252,13 +255,25 @@ 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, SERVICES_NAMESPACE)

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,
-      '--upstream-hostname', hostname,
-      '--upstream-port', 80,
-      '--upstream-scheme', 'http',
-      '--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