Merge pull request #44 from ArchetypicalSoftware/feature/update-targetframework-net10-0

Update to .NET 10 and adjust service references

Author: ewassef

.github/workflows/build.yaml

@@ -43,7 +43,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '8.0.x' # Specify the .NET version you are using
+          dotnet-version: '10.0.x' # Specify the .NET version you are using
 
       - name: Restore
         run: dotnet restore ./cli

cli/src/Vdk/Commands/AppCommand.cs

@@ -3,14 +3,14 @@
 
 namespace Vdk.Commands;
 
-public class AppCommand: RootCommand
+public class AppCommand : RootCommand
 {
     public AppCommand(CreateCommand create, RemoveCommand remove, ListCommand list, InitializeCommand init, UpdateCommand update, IHubClient client) : base("Vega CLI - Manage Vega development environment")
     {
-        AddCommand(create);
-        AddCommand(remove);
-        AddCommand(list);
-        AddCommand(init);
-        AddCommand(update);
+        Add(create);
+        Add(remove);
+        Add(list);
+        Add(init);
+        Add(update);
     }
 }

cli/src/Vdk/Commands/CreateCloudProviderKindCommand.cs

@@ -13,7 +13,7 @@ public CreateCloudProviderKindCommand(IConsole console, IHubClient client): base
     {
         _console = console;
         _client = client;
-        this.SetHandler(InvokeAsync);
+        SetAction(_ => InvokeAsync());
     }
 
     public Task InvokeAsync()

cli/src/Vdk/Commands/CreateClusterCommand.cs

@@ -11,16 +11,16 @@ namespace Vdk.Commands;
 
 public class CreateClusterCommand : Command
 {
+    private readonly Func<string, IKubernetesClient> _clientFunc;
+    private readonly GlobalConfiguration _configs;
     private readonly IConsole _console;
-    private readonly IKindVersionInfoService _kindVersionInfo;
-    private readonly IYamlObjectSerializer _yaml;
     private readonly IFileSystem _fileSystem;
-    private readonly IKindClient _kind;
-    private readonly IHubClient _hub;
     private readonly IFluxClient _flux;
+    private readonly IHubClient _hub;
+    private readonly IKindClient _kind;
+    private readonly IKindVersionInfoService _kindVersionInfo;
     private readonly IReverseProxyClient _reverseProxy;
-    private readonly Func<string, IKubernetesClient> _clientFunc;
-    private readonly GlobalConfiguration _configs;
+    private readonly IYamlObjectSerializer _yaml;
 
     public CreateClusterCommand(
         IConsole console,
@@ -45,15 +45,24 @@ public CreateClusterCommand(
         _reverseProxy = reverseProxy;
         _clientFunc = clientFunc;
         _configs = configs;
-        var nameOption = new Option<string>(new[] { "-n", "--Name" }, () => Defaults.ClusterName, "The name of the kind cluster to create.");
-        var controlNodes = new Option<int>(new[] { "-c", "--ControlPlaneNodes" }, () => Defaults.ControlPlaneNodes, "The number of control plane nodes in the cluster.");
-        var workers = new Option<int>(new[] { "-w", "--Workers" }, () => Defaults.WorkerNodes, "The number of worker nodes in the cluster.");
-        var kubeVersion = new Option<string>(new[] { "-k", "--KubeVersion" }, () => "1.29", "The kubernetes api version.");
-        AddOption(nameOption);
-        AddOption(controlNodes);
-        AddOption(workers);
-        AddOption(kubeVersion);
-        this.SetHandler(InvokeAsync, nameOption, controlNodes, workers, kubeVersion);
+        var nameOption = new Option<string>("--Name") { DefaultValueFactory = _ => Defaults.ClusterName, Description = "The name of the kind cluster to create." };
+        nameOption.Aliases.Add("-n");
+        var controlNodes = new Option<int>("--ControlPlaneNodes") { DefaultValueFactory = _ => Defaults.ControlPlaneNodes, Description = "The number of control plane nodes in the cluster." };
+        controlNodes.Aliases.Add("-c");
+        var workers = new Option<int>("--Workers") { DefaultValueFactory = _ => Defaults.WorkerNodes, Description = "The number of worker nodes in the cluster." };
+        workers.Aliases.Add("-w");
+        var kubeVersion = new Option<string>("--KubeVersion") { DefaultValueFactory = _ => "1.29", Description = "The kubernetes api version." };
+        kubeVersion.Aliases.Add("-k");
+
+        Options.Add(nameOption);
+        Options.Add(controlNodes);
+        Options.Add(workers);
+        Options.Add(kubeVersion);
+        SetAction(parseResult => InvokeAsync(
+            parseResult.GetValue(nameOption) ?? Defaults.ClusterName,
+            parseResult.GetValue(controlNodes),
+            parseResult.GetValue(workers),
+            parseResult.GetValue(kubeVersion)));
     }
 
     public async Task InvokeAsync(string name = Defaults.ClusterName, int controlPlaneNodes = 1, int workerNodes = 2, string? kubeVersionRequested = null)

cli/src/Vdk/Commands/CreateCommand.cs

@@ -4,12 +4,12 @@ namespace Vdk.Commands;
 
 public class CreateCommand: Command
 {
-    public CreateCommand(CreateClusterCommand createCluster, CreateRegistryCommand createRegistry, CreateProxyCommand createProxy, CreateCloudProviderKindCommand createCloudProviderKindCommand) 
+    public CreateCommand(CreateClusterCommand createCluster, CreateRegistryCommand createRegistry, CreateProxyCommand createProxy, CreateCloudProviderKindCommand createCloudProviderKindCommand)
         : base("create", "Create vega development resources")
     {
-        AddCommand(createCluster);
-        AddCommand(createRegistry);
-        AddCommand(createProxy);
-        AddCommand(createCloudProviderKindCommand);
+        Subcommands.Add(createCluster);
+        Subcommands.Add(createRegistry);
+        Subcommands.Add(createProxy);
+        Subcommands.Add(createCloudProviderKindCommand);
     }
 }

cli/src/Vdk/Commands/CreateProxyCommand.cs

@@ -13,7 +13,7 @@ public CreateProxyCommand(IConsole console, IReverseProxyClient client) : base("
     {
         _console = console;
         _client = client;
-        this.SetHandler(InvokeAsync);
+        SetAction(_ => InvokeAsync());
     }
 
     public Task InvokeAsync()

cli/src/Vdk/Commands/CreateRegistryCommand.cs

@@ -13,7 +13,7 @@ public CreateRegistryCommand(IConsole console, IHubClient client): base("registr
     {
         _console = console;
         _client = client;
-        this.SetHandler(InvokeAsync);
+        SetAction(_ => InvokeAsync());
     }
 
     public Task InvokeAsync()

cli/src/Vdk/Commands/InitializeCommand.cs

@@ -24,7 +24,7 @@ public InitializeCommand(CreateClusterCommand createCluster, CreateProxyCommand
         _kind = kind;
         _console = console;
         _kindVersionInfo = kindVersionInfo;
-        this.SetHandler(InvokeAsync);
+        SetAction(_ => InvokeAsync());
     }
 
     public async Task InvokeAsync()

cli/src/Vdk/Commands/ListClustersCommand.cs

@@ -13,7 +13,7 @@ public ListClustersCommand(IConsole console, IKindClient client) : base("cluster
     {
         _console = console;
         _client = client;
-        this.SetHandler(InvokeAsync);
+        SetAction(_ => InvokeAsync());
     }
 
     public Task InvokeAsync()

cli/src/Vdk/Commands/ListCommand.cs

@@ -6,7 +6,7 @@ public class ListCommand: Command
 {
     public ListCommand(ListClustersCommand clustersCommand, ListKubernetesVersions kubernetesVersions) : base("list", "List Vega development resources")
     {
-        AddCommand(clustersCommand);
-        AddCommand(kubernetesVersions);
+        Subcommands.Add(clustersCommand);
+        Subcommands.Add(kubernetesVersions);
     }
 }