Remove appsettings.json, rename CifsShareBasePath to CifsShareName, add CifsShareFolder to CmsInstances, and create a template.yml for Docker configuration.

2026-02-18 16:15:54 -05:00
parent 45c94b6536
commit 4a903bfd2a
32 changed files with 1474 additions and 2289 deletions
--- a/OTSSignsOrchestrator.Desktop/ViewModels/CreateInstanceViewModel.cs
+++ b/OTSSignsOrchestrator.Desktop/ViewModels/CreateInstanceViewModel.cs
@@ -37,7 +37,8 @@ public partial class CreateInstanceViewModel : ObservableObject

    // CIFS / SMB credentials (per-instance, defaults loaded from global settings)
    [ObservableProperty] private string _cifsServer = string.Empty;
-    [ObservableProperty] private string _cifsShareBasePath = string.Empty;
+    [ObservableProperty] private string _cifsShareName = string.Empty;
+    [ObservableProperty] private string _cifsShareFolder = string.Empty;
    [ObservableProperty] private string _cifsUsername = string.Empty;
    [ObservableProperty] private string _cifsPassword = string.Empty;
    [ObservableProperty] private string _cifsExtraOptions = string.Empty;
@@ -110,7 +111,8 @@ public partial class CreateInstanceViewModel : ObservableObject
        using var scope = _services.CreateScope();
        var settings = scope.ServiceProvider.GetRequiredService<SettingsService>();
        CifsServer = await settings.GetAsync(SettingsService.CifsServer) ?? string.Empty;
-        CifsShareBasePath = await settings.GetAsync(SettingsService.CifsShareBasePath) ?? string.Empty;
+        CifsShareName = await settings.GetAsync(SettingsService.CifsShareName) ?? string.Empty;
+        CifsShareFolder = await settings.GetAsync(SettingsService.CifsShareFolder) ?? string.Empty;
        CifsUsername = await settings.GetAsync(SettingsService.CifsUsername) ?? string.Empty;
        CifsPassword = await settings.GetAsync(SettingsService.CifsPassword) ?? string.Empty;
        CifsExtraOptions = await settings.GetAsync(SettingsService.CifsOptions, "file_mode=0777,dir_mode=0777");
@@ -148,7 +150,6 @@ public partial class CreateInstanceViewModel : ObservableObject
            dockerCli.SetHost(SelectedSshHost);
            var dockerSecrets = _services.GetRequiredService<SshDockerSecretsService>();
            dockerSecrets.SetHost(SelectedSshHost);
-            var ssh = _services.GetRequiredService<SshConnectionService>();

            using var scope = _services.CreateScope();
            var instanceSvc = scope.ServiceProvider.GetRequiredService<InstanceService>();
@@ -161,12 +162,11 @@ public partial class CreateInstanceViewModel : ObservableObject
            SetProgress(20, "Generating secrets...");
            var mysqlPassword = GenerateRandomPassword(32);

-            // ── Step 3: Create MySQL database + user via SSH ───────────────
+            // ── Step 3: Create MySQL database + user via direct TCP ────────
            SetProgress(35, "Creating MySQL database and user...");
            var (mysqlOk, mysqlMsg) = await instanceSvc.CreateMySqlDatabaseAsync(
                Abbrev,
-                mysqlPassword,
-                cmd => ssh.RunCommandAsync(SelectedSshHost, cmd));
+                mysqlPassword);

            AppendOutput($"[MySQL] {mysqlMsg}");
            if (!mysqlOk)
@@ -195,7 +195,8 @@ public partial class CreateInstanceViewModel : ObservableObject
                NewtId         = string.IsNullOrWhiteSpace(NewtId) ? null : NewtId.Trim(),
                NewtSecret     = string.IsNullOrWhiteSpace(NewtSecret) ? null : NewtSecret.Trim(),
                CifsServer     = string.IsNullOrWhiteSpace(CifsServer) ? null : CifsServer.Trim(),
-                CifsShareBasePath = string.IsNullOrWhiteSpace(CifsShareBasePath) ? null : CifsShareBasePath.Trim(),
+                CifsShareName  = string.IsNullOrWhiteSpace(CifsShareName) ? null : CifsShareName.Trim(),
+                CifsShareFolder = string.IsNullOrWhiteSpace(CifsShareFolder) ? null : CifsShareFolder.Trim(),
                CifsUsername   = string.IsNullOrWhiteSpace(CifsUsername) ? null : CifsUsername.Trim(),
                CifsPassword   = string.IsNullOrWhiteSpace(CifsPassword) ? null : CifsPassword.Trim(),
                CifsExtraOptions = string.IsNullOrWhiteSpace(CifsExtraOptions) ? null : CifsExtraOptions.Trim(),
--- a/OTSSignsOrchestrator.Desktop/ViewModels/SettingsViewModel.cs
+++ b/OTSSignsOrchestrator.Desktop/ViewModels/SettingsViewModel.cs
@@ -2,6 +2,7 @@ using System.Collections.ObjectModel;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Microsoft.Extensions.DependencyInjection;
+using MySqlConnector;
 using OTSSignsOrchestrator.Core.Services;

 namespace OTSSignsOrchestrator.Desktop.ViewModels;
@@ -42,7 +43,8 @@ public partial class SettingsViewModel : ObservableObject

    // ── CIFS ────────────────────────────────────────────────────────────────
    [ObservableProperty] private string _cifsServer = string.Empty;
-    [ObservableProperty] private string _cifsShareBasePath = string.Empty;
+    [ObservableProperty] private string _cifsShareName = string.Empty;
+    [ObservableProperty] private string _cifsShareFolder = string.Empty;
    [ObservableProperty] private string _cifsUsername = string.Empty;
    [ObservableProperty] private string _cifsPassword = string.Empty;
    [ObservableProperty] private string _cifsOptions = "file_mode=0777,dir_mode=0777";
@@ -100,7 +102,8 @@ public partial class SettingsViewModel : ObservableObject

            // CIFS
            CifsServer = await svc.GetAsync(SettingsService.CifsServer, string.Empty);
-            CifsShareBasePath = await svc.GetAsync(SettingsService.CifsShareBasePath, string.Empty);
+            CifsShareName = await svc.GetAsync(SettingsService.CifsShareName, string.Empty);
+            CifsShareFolder = await svc.GetAsync(SettingsService.CifsShareFolder, string.Empty);
            CifsUsername = await svc.GetAsync(SettingsService.CifsUsername, string.Empty);
            CifsPassword = await svc.GetAsync(SettingsService.CifsPassword, string.Empty);
            CifsOptions = await svc.GetAsync(SettingsService.CifsOptions, "file_mode=0777,dir_mode=0777");
@@ -166,7 +169,8 @@ public partial class SettingsViewModel : ObservableObject

                // CIFS
                (SettingsService.CifsServer, NullIfEmpty(CifsServer), SettingsService.CatCifs, false),
-                (SettingsService.CifsShareBasePath, NullIfEmpty(CifsShareBasePath), SettingsService.CatCifs, false),
+                (SettingsService.CifsShareName, NullIfEmpty(CifsShareName), SettingsService.CatCifs, false),
+                (SettingsService.CifsShareFolder, NullIfEmpty(CifsShareFolder), SettingsService.CatCifs, false),
                (SettingsService.CifsUsername, NullIfEmpty(CifsUsername), SettingsService.CatCifs, false),
                (SettingsService.CifsPassword, NullIfEmpty(CifsPassword), SettingsService.CatCifs, true),
                (SettingsService.CifsOptions, NullIfEmpty(CifsOptions), SettingsService.CatCifs, false),
@@ -208,30 +212,34 @@ public partial class SettingsViewModel : ObservableObject
        }

        IsBusy = true;
-        StatusMessage = "Testing MySQL connection via SSH...";
+        StatusMessage = "Testing MySQL connection...";
        try
        {
-            // The test runs a mysql --version or a simple SELECT 1 query via SSH
-            // We need an SshHost to route through — use the first available
-            using var scope = _services.CreateScope();
-            var db = scope.ServiceProvider.GetRequiredService<OTSSignsOrchestrator.Core.Data.XiboContext>();
-            var host = await Microsoft.EntityFrameworkCore.EntityFrameworkQueryableExtensions
-                .FirstOrDefaultAsync(db.SshHosts);
+            if (!int.TryParse(MySqlPort, out var port))
+                port = 3306;

-            if (host == null)
+            var csb = new MySqlConnectionStringBuilder
            {
-                StatusMessage = "No SSH hosts configured. Add one in the Hosts page first.";
-                return;
-            }
+                Server = MySqlHost,
+                Port = (uint)port,
+                UserID = MySqlAdminUser,
+                Password = MySqlAdminPassword,
+                ConnectionTimeout = 10,
+                SslMode = MySqlSslMode.Preferred,
+            };

-            var ssh = _services.GetRequiredService<Services.SshConnectionService>();
-            var port = int.TryParse(MySqlPort, out var p) ? p : 3306;
-            var cmd = $"mysql -h {MySqlHost} -P {port} -u {MySqlAdminUser} -p'{MySqlAdminPassword.Replace("'", "'\\''")}' -e 'SELECT 1' 2>&1";
-            var (exitCode, stdout, stderr) = await ssh.RunCommandAsync(host, cmd);
+            await using var connection = new MySqlConnection(csb.ConnectionString);
+            await connection.OpenAsync();

-            StatusMessage = exitCode == 0
-                ? $"MySQL connection successful via {host.Label}."
-                : $"MySQL connection failed: {(string.IsNullOrWhiteSpace(stderr) ? stdout : stderr).Trim()}";
+            await using var cmd = connection.CreateCommand();
+            cmd.CommandText = "SELECT 1";
+            await cmd.ExecuteScalarAsync();
+
+            StatusMessage = $"MySQL connection successful ({MySqlHost}:{port}).";
+        }
+        catch (MySqlException ex)
+        {
+            StatusMessage = $"MySQL connection failed: {ex.Message}";
        }
        catch (Exception ex)
        {