Remove DotMake.CommandLine (#8)

Author: pmdevers

src/K8sOperator.NET/Commands/Install.cs

@@ -1,47 +1,27 @@
-using DotMake.CommandLine;
-using k8s;
+using k8s;
 using k8s.Models;
 using K8sOperator.NET.Builder;
 using K8sOperator.NET.Extensions;
-using K8sOperator.NET.Generator;
 using K8sOperator.NET.Generator.Builders;
 using K8sOperator.NET.Metadata;
-using System;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Xml.Linq;
 
 namespace K8sOperator.NET.Commands;
 
-[CliCommand(
-    Name = "install",
-    Description = "Install or update operator",
-    Parent = typeof(Root)
-    )]
 internal class Install(IServiceProvider serviceProvider, IControllerDataSource dataSource)
 {
-    [CliOption(Description = "export")]
-    public bool Export { get; set; } = true;
-
-    [CliOption(Description = "Name of the operator")]
-    public string Name { get; set; } = Assembly.GetEntryAssembly()?.GetName().Name ?? string.Empty;
-
     public async Task RunAsync()
     {
         var watchers = dataSource.GetWatchers(serviceProvider);
         var clusterrole = CreateClusterRole(dataSource.Metadata, watchers);
         var clusterrolebinding = CreateClusterRoleBinding(dataSource.Metadata);
         var deployment = CreateDeployment(dataSource.Metadata);
 
-
         foreach (var item in watchers)
         {
             var crd = CreateCustomResourceDefinition(item);
-
             Console.WriteLine(KubernetesYaml.Serialize(crd));
             Console.WriteLine("---");
         }
-
         Console.WriteLine(KubernetesYaml.Serialize(clusterrole));
         Console.WriteLine("---");
         Console.WriteLine(KubernetesYaml.Serialize(clusterrolebinding));

src/K8sOperator.NET/Commands/Operator.cs

@@ -1,15 +1,9 @@
-using DotMake.CommandLine;
-using K8sOperator.NET.Builder;
+using K8sOperator.NET.Builder;
 using K8sOperator.NET.Extensions;
 using Microsoft.Extensions.Logging;
 
 namespace K8sOperator.NET.Commands;
 
-[CliCommand(
-    Name = "operator",
-    NamePrefixConvention = CliNamePrefixConvention.DoubleHyphen,
-    Parent = typeof(Root)
-    )]
 internal class Operator(IServiceProvider serviceProvider, IControllerDataSource dataSource, ILoggerFactory loggerFactory)
 {
     private readonly CancellationTokenSource _tokenSource = new();

src/K8sOperator.NET/Commands/Root.cs

@@ -7,7 +7,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DotMake.CommandLine" />
     <PackageReference Include="KubernetesClient" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" />
     <PackageReference Include="Microsoft.Extensions.Hosting" />

src/K8sOperator.NET/K8sOperator.NET.csproj

@@ -1,5 +1,4 @@
-using DotMake.CommandLine;
-using K8sOperator.NET.Builder;
+using K8sOperator.NET.Builder;
 using K8sOperator.NET.Commands;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -52,7 +51,15 @@ internal OperatorHostApplication(IServiceProvider serviceProvider, IControllerDa
 
     public async Task RunAsync()
     {
-        Cli.Ext.SetServiceProvider(ServiceProvider);
-        await Cli.RunAsync<Root>(_args);
+        if (_args.Contains("--operator"))
+        {
+            var oper = ActivatorUtilities.CreateInstance<Operator>(ServiceProvider, DataSource);
+            await oper.RunAsync();
+        } 
+        else if(_args.Contains("install"))
+        {
+            var installer = ActivatorUtilities.CreateInstance<Install>(ServiceProvider, DataSource);
+            await installer.RunAsync();
+        }
     }
 }