commit 8

Author: philasmar

test/AWS.Deploy.CLI.IntegrationTests/ServerModeTests.cs

@@ -13,20 +13,16 @@
 using System.Threading.Tasks;
 using Amazon.CloudFormation;
 using Amazon.ECS;
-using Amazon.Runtime;
 using AWS.Deploy.CLI.Commands;
 using AWS.Deploy.CLI.Commands.Settings;
 using AWS.Deploy.CLI.Common.UnitTests.IO;
-using AWS.Deploy.CLI.Extensions;
 using AWS.Deploy.CLI.IntegrationTests.Extensions;
 using AWS.Deploy.CLI.IntegrationTests.Helpers;
 using AWS.Deploy.CLI.IntegrationTests.Services;
 using AWS.Deploy.CLI.IntegrationTests.Utilities;
 using AWS.Deploy.CLI.ServerMode;
-using AWS.Deploy.Orchestration.Utilities;
 using AWS.Deploy.ServerMode.Client;
 using AWS.Deploy.ServerMode.Client.Utilities;
-using Microsoft.Extensions.DependencyInjection;
 using Newtonsoft.Json;
 using Xunit;
 
@@ -36,7 +32,6 @@ public class ServerModeTests : IDisposable
     {
         private bool _isDisposed;
         private string _stackName;
-        private readonly IServiceProvider _serviceProvider;
         private readonly CloudFormationHelper _cloudFormationHelper;
 
         private readonly string _awsRegion;
@@ -50,13 +45,6 @@ public ServerModeTests()
             var cloudFormationClient = new AmazonCloudFormationClient(Amazon.RegionEndpoint.USWest2);
             _cloudFormationHelper = new CloudFormationHelper(cloudFormationClient);
 
-            var serviceCollection = new ServiceCollection();
-
-            serviceCollection.AddCustomServices();
-            serviceCollection.AddTestServices();
-
-            _serviceProvider = serviceCollection.BuildServiceProvider();
-
             _awsRegion = "us-west-2";
 
             _testAppManager = new TestAppManager();
@@ -77,7 +65,7 @@ public async Task ConfirmLocalhostOnly()
                 ParentPid = null,
                 UnsecureMode = true
             };
-            var serverCommand = new ServerModeCommand(_serviceProvider.GetRequiredService<IToolInteractiveService>());
+            var serverCommand = new ServerModeCommand(_interactiveService);
             var cancelSource = new CancellationTokenSource();
 
             _ = serverCommand.ExecuteAsync(null!, serverCommandSettings, cancelSource);
@@ -114,7 +102,7 @@ public async Task GetRecommendations()
                 ParentPid = null,
                 UnsecureMode = true
             };
-            var serverCommand = new ServerModeCommand(_serviceProvider.GetRequiredService<IToolInteractiveService>());
+            var serverCommand = new ServerModeCommand(_interactiveService);
             var cancelSource = new CancellationTokenSource();
 
             _ = serverCommand.ExecuteAsync(null!, serverCommandSettings, cancelSource);
@@ -177,7 +165,7 @@ public async Task GetRecommendationsWithEncryptedCredentials()
                 ParentPid = null,
                 UnsecureMode = false
             };
-            var serverCommand = new ServerModeCommand(_serviceProvider.GetRequiredService<IToolInteractiveService>());
+            var serverCommand = new ServerModeCommand(_interactiveService);
             var cancelSource = new CancellationTokenSource();
 
             _ = serverCommand.ExecuteAsync(null!, serverCommandSettings, cancelSource);
@@ -224,7 +212,7 @@ public async Task AppRunnerRedeployment_VisibleOnRedeploymentSettings()
                 ParentPid = null,
                 UnsecureMode = true
             };
-            var serverCommand = new ServerModeCommand(_serviceProvider.GetRequiredService<IToolInteractiveService>());
+            var serverCommand = new ServerModeCommand(_interactiveService);
             var cancelSource = new CancellationTokenSource();
 
             _ = serverCommand.ExecuteAsync(null!, serverCommandSettings, cancelSource);
@@ -312,7 +300,7 @@ public async Task WebFargateDeploymentNoConfigChanges()
                 ParentPid = null,
                 UnsecureMode = true
             };
-            var serverCommand = new ServerModeCommand(_serviceProvider.GetRequiredService<IToolInteractiveService>());
+            var serverCommand = new ServerModeCommand(_interactiveService);
             var cancelSource = new CancellationTokenSource();
 
             _ = serverCommand.ExecuteAsync(null!, serverCommandSettings, cancelSource);
@@ -447,7 +435,7 @@ public async Task RecommendationsForNewDeployments_DoesNotIncludeExistingBeansta
                 ParentPid = null,
                 UnsecureMode = true
             };
-            var serverCommand = new ServerModeCommand(_serviceProvider.GetRequiredService<IToolInteractiveService>());
+            var serverCommand = new ServerModeCommand(_interactiveService);
             var cancelSource = new CancellationTokenSource();
 
             _ = serverCommand.ExecuteAsync(null!, serverCommandSettings, cancelSource);
@@ -491,7 +479,7 @@ public async Task ShutdownViaRestClient()
                 ParentPid = null,
                 UnsecureMode = true
             };
-            var serverCommand = new ServerModeCommand(_serviceProvider.GetRequiredService<IToolInteractiveService>());
+            var serverCommand = new ServerModeCommand(_interactiveService);
             var cancelSource = new CancellationTokenSource();
 
             _ = serverCommand.ExecuteAsync(null!, serverCommandSettings, cancelSource);
@@ -532,7 +520,7 @@ public async Task InvalidStackName_ThrowsException(string invalidStackName)
                 ParentPid = null,
                 UnsecureMode = true
             };
-            var serverCommand = new ServerModeCommand(_serviceProvider.GetRequiredService<IToolInteractiveService>());
+            var serverCommand = new ServerModeCommand(_interactiveService);
             var cancelSource = new CancellationTokenSource();
 
             _ = serverCommand.ExecuteAsync(null!, serverCommandSettings, cancelSource);
@@ -583,7 +571,7 @@ public async Task CheckCategories()
                 ParentPid = null,
                 UnsecureMode = true
             };
-            var serverCommand = new ServerModeCommand(_serviceProvider.GetRequiredService<IToolInteractiveService>());
+            var serverCommand = new ServerModeCommand(_interactiveService);
             var cancelSource = new CancellationTokenSource();
 
             _ = serverCommand.ExecuteAsync(null!, serverCommandSettings, cancelSource);