feat: add merge migration for volume cleanup and secrets

Author: haydnli-shopify

src/dstack/_internal/server/migrations/versions/d268739bd76b_merge_volume_cleanup_and_secrets_.py

@@ -0,0 +1,21 @@
+"""merge volume cleanup and secrets migrations
+
+Revision ID: d268739bd76b
+Revises: 09f10d63c924, 644b8a114187
+Create Date: 2025-07-07 10:22:50.061037
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = "d268739bd76b"
+down_revision = ("09f10d63c924", "644b8a114187")
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    pass
+
+
+def downgrade() -> None:
+    pass

src/tests/_internal/server/services/test_fleets_yaml.py

@@ -0,0 +1,55 @@
+from dstack._internal.core.models.fleets import FleetConfiguration, FleetSpec
+from dstack._internal.core.models.profiles import Profile
+from dstack._internal.server.services.fleets import fleet_configuration_to_yaml
+
+
+def test_fleet_configuration_to_yaml():
+    """Test that fleet configuration is correctly converted to YAML."""
+    # Create a simple fleet configuration
+    config = FleetConfiguration(
+        name="test-fleet",
+        nodes=2,
+        resources={"gpu": "24GB"},
+    )
+
+    spec = FleetSpec(
+        configuration=config,
+        profile=Profile(name="test-profile"),
+    )
+
+    # Convert to YAML
+    yaml_content = fleet_configuration_to_yaml(spec)
+
+    # Verify the YAML contains expected content
+    assert "name: test-fleet" in yaml_content
+    assert "min: 2" in yaml_content  # nodes.min
+    assert "max: 2" in yaml_content  # nodes.max
+    assert "gpu:" in yaml_content
+    assert "type: fleet" in yaml_content
+
+
+def test_fleet_configuration_to_yaml_with_ssh():
+    """Test that SSH fleet configuration is correctly converted to YAML."""
+    # Create an SSH fleet configuration
+    config = FleetConfiguration(
+        name="ssh-fleet",
+        ssh_config={
+            "user": "ubuntu",
+            "hosts": ["192.168.1.100", "192.168.1.101"],
+        },
+    )
+
+    spec = FleetSpec(
+        configuration=config,
+        profile=Profile(name="test-profile"),
+    )
+
+    # Convert to YAML
+    yaml_content = fleet_configuration_to_yaml(spec)
+
+    # Verify the YAML contains expected content
+    assert "name: ssh-fleet" in yaml_content
+    assert "user: ubuntu" in yaml_content
+    assert "192.168.1.100" in yaml_content
+    assert "192.168.1.101" in yaml_content
+    assert "type: fleet" in yaml_content

src/tests/_internal/server/services/test_runs_yaml.py

@@ -0,0 +1,87 @@
+from dstack._internal.core.models.configurations import (
+    DevEnvironmentConfiguration,
+    ServiceConfiguration,
+    TaskConfiguration,
+)
+from dstack._internal.core.models.runs import RunSpec
+from dstack._internal.server.services.runs import run_configuration_to_yaml
+
+
+class TestRunConfigurationYaml:
+    def test_task_configuration_to_yaml(self):
+        """Test converting task configuration to YAML"""
+        config = TaskConfiguration(
+            name="test-task",
+            commands=["echo 'Hello World'"],
+            resources={"cpu": 1, "memory": "1GB"},
+            image="python:3.9",
+        )
+
+        run_spec = RunSpec(
+            run_name="test-run", configuration=config, ssh_key_pub="ssh-rsa test-key"
+        )
+
+        yaml_content = run_configuration_to_yaml(run_spec)
+
+        assert "name: test-run" in yaml_content
+        assert "type: task" in yaml_content
+        assert "commands:" in yaml_content
+        assert "echo 'Hello World'" in yaml_content
+        assert "image: python:3.9" in yaml_content
+
+    def test_service_configuration_to_yaml(self):
+        """Test converting service configuration to YAML"""
+        config = ServiceConfiguration(
+            name="test-service",
+            commands=["python app.py"],
+            port=8080,
+            resources={"cpu": 2, "memory": "2GB"},
+            image="python:3.9",
+        )
+
+        run_spec = RunSpec(
+            run_name="test-service-run", configuration=config, ssh_key_pub="ssh-rsa test-key"
+        )
+
+        yaml_content = run_configuration_to_yaml(run_spec)
+
+        assert "name: test-service-run" in yaml_content
+        assert "type: service" in yaml_content
+        assert "commands:" in yaml_content
+        assert "python app.py" in yaml_content
+        assert "port:" in yaml_content
+
+    def test_dev_environment_configuration_to_yaml(self):
+        """Test converting dev environment configuration to YAML"""
+        config = DevEnvironmentConfiguration(
+            name="test-dev",
+            ide="vscode",
+            resources={"cpu": 1, "memory": "1GB"},
+            image="python:3.9",
+        )
+
+        run_spec = RunSpec(
+            run_name="test-dev-run", configuration=config, ssh_key_pub="ssh-rsa test-key"
+        )
+
+        yaml_content = run_configuration_to_yaml(run_spec)
+
+        assert "name: test-dev-run" in yaml_content
+        assert "type: dev-environment" in yaml_content
+        assert "ide: vscode" in yaml_content
+
+    def test_configuration_without_run_name(self):
+        """Test converting configuration when run_name is not set"""
+        config = TaskConfiguration(
+            name="test-task",
+            commands=["echo 'Hello World'"],
+            resources={"cpu": 1, "memory": "1GB"},
+            image="python:3.9",
+        )
+
+        run_spec = RunSpec(configuration=config, ssh_key_pub="ssh-rsa test-key")
+
+        yaml_content = run_configuration_to_yaml(run_spec)
+
+        assert "name: test-task" in yaml_content
+        assert "type: task" in yaml_content

~/.dstack/server/config.yml

@@ -0,0 +1,7 @@
+projects:
+- name: main
+  backends:
+  - type: local
+    name: local
+encryption:
+  keys: []