1a540f4f0a
Replace the CLI's Akka.NET ClusterClient transport with a simple HTTP client targeting a new POST /management endpoint on the Central Host. The endpoint handles Basic Auth, LDAP authentication, role resolution, and ManagementActor dispatch in a single round-trip — eliminating the CLI's Akka, LDAP, and Security dependencies. Also fixes DCL ReSubscribeAll losing subscriptions on repeated reconnect by deriving the tag list from _subscriptionsByInstance instead of _subscriptionIds.
75 lines
3.5 KiB
C#
75 lines
3.5 KiB
C#
using System.CommandLine;
|
|
using System.CommandLine.Parsing;
|
|
using ScadaLink.Commons.Messages.Management;
|
|
|
|
namespace ScadaLink.CLI.Commands;
|
|
|
|
public static class DeployCommands
|
|
{
|
|
public static Command Build(Option<string> urlOption, Option<string> formatOption, Option<string> usernameOption, Option<string> passwordOption)
|
|
{
|
|
var command = new Command("deploy") { Description = "Deployment operations" };
|
|
|
|
command.Add(BuildInstance(urlOption, formatOption, usernameOption, passwordOption));
|
|
command.Add(BuildArtifacts(urlOption, formatOption, usernameOption, passwordOption));
|
|
command.Add(BuildStatus(urlOption, formatOption, usernameOption, passwordOption));
|
|
|
|
return command;
|
|
}
|
|
|
|
private static Command BuildInstance(Option<string> urlOption, Option<string> formatOption, Option<string> usernameOption, Option<string> passwordOption)
|
|
{
|
|
var idOption = new Option<int>("--id") { Description = "Instance ID", Required = true };
|
|
var cmd = new Command("instance") { Description = "Deploy a single instance" };
|
|
cmd.Add(idOption);
|
|
cmd.SetAction(async (ParseResult result) =>
|
|
{
|
|
var id = result.GetValue(idOption);
|
|
return await CommandHelpers.ExecuteCommandAsync(
|
|
result, urlOption, formatOption, usernameOption, passwordOption, new MgmtDeployInstanceCommand(id));
|
|
});
|
|
return cmd;
|
|
}
|
|
|
|
private static Command BuildArtifacts(Option<string> urlOption, Option<string> formatOption, Option<string> usernameOption, Option<string> passwordOption)
|
|
{
|
|
var siteIdOption = new Option<int?>("--site-id") { Description = "Target site ID (all sites if omitted)" };
|
|
var cmd = new Command("artifacts") { Description = "Deploy artifacts to site(s)" };
|
|
cmd.Add(siteIdOption);
|
|
cmd.SetAction(async (ParseResult result) =>
|
|
{
|
|
var siteId = result.GetValue(siteIdOption);
|
|
return await CommandHelpers.ExecuteCommandAsync(
|
|
result, urlOption, formatOption, usernameOption, passwordOption, new MgmtDeployArtifactsCommand(siteId));
|
|
});
|
|
return cmd;
|
|
}
|
|
|
|
private static Command BuildStatus(Option<string> urlOption, Option<string> formatOption, Option<string> usernameOption, Option<string> passwordOption)
|
|
{
|
|
var instanceIdOption = new Option<int?>("--instance-id") { Description = "Filter by instance ID" };
|
|
var statusOption = new Option<string?>("--status") { Description = "Filter by status" };
|
|
var pageOption = new Option<int>("--page") { Description = "Page number" };
|
|
pageOption.DefaultValueFactory = _ => 1;
|
|
var pageSizeOption = new Option<int>("--page-size") { Description = "Page size" };
|
|
pageSizeOption.DefaultValueFactory = _ => 50;
|
|
|
|
var cmd = new Command("status") { Description = "Query deployment status" };
|
|
cmd.Add(instanceIdOption);
|
|
cmd.Add(statusOption);
|
|
cmd.Add(pageOption);
|
|
cmd.Add(pageSizeOption);
|
|
cmd.SetAction(async (ParseResult result) =>
|
|
{
|
|
var instanceId = result.GetValue(instanceIdOption);
|
|
var status = result.GetValue(statusOption);
|
|
var page = result.GetValue(pageOption);
|
|
var pageSize = result.GetValue(pageSizeOption);
|
|
return await CommandHelpers.ExecuteCommandAsync(
|
|
result, urlOption, formatOption, usernameOption, passwordOption,
|
|
new QueryDeploymentsCommand(instanceId, status, page, pageSize));
|
|
});
|
|
return cmd;
|
|
}
|
|
}
|