Change Register DataProvider to Lazyi and remove use Activator for CF…

…G command, change it to DI

clio.tests/Command/BaseClioModuleTests.cs

@@ -18,7 +18,7 @@ public virtual void Setup(){
 		FileSystem = CreateFs();
 
 		BindingsModule bindingModule = new(FileSystem);
-		Container = bindingModule.Register(EnvironmentSettings, true, AdditionalRegistrations);
+		Container = bindingModule.Register(EnvironmentSettings, AdditionalRegistrations);
 	}
 
 	#endregion

clio.tests/Command/DownloadSettingsToManifestCommand.cs

@@ -411,7 +411,6 @@ private IContainer InternalGetContainer() {
 		};
 		IContainer container = bm.Register(
 		settings: environmentSettings,
-		registerNullSettingsForTest: false,
 		additionalRegistrations: builder => {
 			builder.RegisterInstance(dataProviderMock).As<IDataProvider>();
 		});

clio.tests/Command/PingAppCommandTests.cs

@@ -27,7 +27,7 @@ public void PingAppCommandShouldBeUsesAllRetryOptions(bool isNetCore) {
 			EnvironmentSettings.IsNetCore = isNetCore;
 			FileSystem = CreateFs();
 			BindingsModule bindingModule = new(FileSystem);
-			Container = bindingModule.Register(EnvironmentSettings, true, AdditionalRegistrations);
+			Container = bindingModule.Register(EnvironmentSettings, AdditionalRegistrations);
 
 			PingAppCommand command = Container.Resolve<PingAppCommand>();
 			PingAppOptions options = new PingAppOptions() { TimeOut = 1, RetryCount = 2, RetryDelay = 3 };
@@ -52,7 +52,7 @@ public void PingAppCommandShouldBeUsesAllRetryOptionsOnNet6Environment(bool isNe
 			//Arrange
 			FileSystem = CreateFs();
 			BindingsModule bindingModule = new(FileSystem);
-			Container = bindingModule.Register(EnvironmentSettings, true, AdditionalRegistrations);
+			Container = bindingModule.Register(EnvironmentSettings, AdditionalRegistrations);
 			PingAppCommand command = Container.Resolve<PingAppCommand>();
 			PingAppOptions options = new PingAppOptions() {
 				TimeOut = 1,

clio.tests/Command/RegWebAppCommandTests.cs

@@ -0,0 +1,36 @@
+using Autofac;
+using Clio.Command;
+using Clio.UserEnvironment;
+using NSubstitute;
+using NUnit.Framework;
+
+namespace Clio.Tests.Command
+{
+	[TestFixture]
+	public class RegAppCommandTests: BaseClioModuleTests
+	{
+		private ISettingsRepository _settingsRepository;
+
+		protected override void AdditionalRegistrations(ContainerBuilder containerBuilder) {
+			base.AdditionalRegistrations(containerBuilder);
+			_settingsRepository = Substitute.For<ISettingsRepository>();
+			containerBuilder.RegisterInstance(_settingsRepository).As<ISettingsRepository>();
+		}
+
+		[Test]
+		public void RegAppCommandTests_ActivateFromDI_ShouldReturnInstance() {
+			var command = Container.Resolve<RegAppCommand>();
+			Assert.That(command != null);
+		}
+
+		[Test]
+		public void RegAppCommand_ShouldNotThrowException_WithCfgOpenParaameters() {
+			var command = Container.Resolve<RegAppCommand>();
+			RegAppOptions openCfgOpts = new RegAppOptions() {
+				EnvironmentName = "open"
+			};
+			Assert.DoesNotThrow(() => command.Execute(openCfgOpts));
+			_settingsRepository.Received(1).OpenFile();
+		}
+	}
+}

clio/BindingsModule.cs

@@ -38,7 +38,7 @@ public BindingsModule(IFileSystem fileSystem = null){
 			_fileSystem = fileSystem;
 		}
 
-		public IContainer Register(EnvironmentSettings settings = null, bool registerNullSettingsForTest = false,
+		public IContainer Register(EnvironmentSettings settings = null,
 			Action<ContainerBuilder> additionalRegistrations = null) {
 
 			var containerBuilder = new ContainerBuilder();
@@ -50,18 +50,17 @@ public IContainer Register(EnvironmentSettings settings = null, bool registerNul
 
 			containerBuilder.RegisterInstance(ConsoleLogger.Instance).As<ILogger>().SingleInstance();
 
-			if (settings != null || registerNullSettingsForTest) {
-				containerBuilder.RegisterInstance(settings);
-				if (!registerNullSettingsForTest) {
+			if (settings != null) {
+				containerBuilder.Register<IDataProvider>(provider => {
 					var creatioClientInstance = new ApplicationClientFactory().CreateClient(settings);
 					containerBuilder.RegisterInstance(creatioClientInstance).As<IApplicationClient>();
-					IDataProvider provider = string.IsNullOrEmpty(settings.Login) switch {
+					IDataProvider dataProvider = string.IsNullOrEmpty(settings.Login) switch {
 						true => new RemoteDataProvider(settings.Uri, settings.AuthAppUri, settings.ClientId, settings.ClientSecret, settings.IsNetCore),
 						false => new RemoteDataProvider(settings.Uri, settings.Login, settings.Password, settings.IsNetCore)
 					};
-					containerBuilder.RegisterInstance(provider).As<IDataProvider>();
-				}
-
+					return dataProvider;
+				});
+				containerBuilder.RegisterInstance(settings);
 			}
 
 			containerBuilder.Register<Kubernetes>( provider => {

clio/Program.cs

@@ -640,8 +640,9 @@ private static int ConvertPackage(ConvertOptions opts) {
 			ExecuteAssemblyOptions opts => CreateRemoteCommand<AssemblyCommand>(opts).Execute(opts),
 			RestartOptions opts => CreateRemoteCommand<RestartCommand>(opts).Execute(opts),
 			ClearRedisOptions opts => CreateRemoteCommand<RedisCommand>(opts).Execute(opts),
-			RegAppOptions opts => CreateCommand<RegAppCommand>(
-				new SettingsRepository(), new ApplicationClientFactory(), new PowerShellFactory()).Execute(opts),
+			RegAppOptions opts => Resolve<RegAppCommand>(opts).Execute(opts),           
+			//RegAppOptions opts => CreateCommand<RegAppCommand>(
+			//	new SettingsRepository(), new ApplicationClientFactory(), new PowerShellFactory()).Execute(opts),
 			AppListOptions opts => CreateCommand<ShowAppListCommand>(new SettingsRepository()).Execute(opts),
 			UnregAppOptions opts => CreateCommand<UnregAppCommand>(new SettingsRepository()).Execute(opts),
 			GeneratePkgZipOptions opts => Resolve<CompressPackageCommand>().Execute(opts),