change factory pattern

src/AWS.Deploy.CLI/AWSUtilities.cs

@@ -27,36 +27,35 @@ public class AWSUtilities : IAWSUtilities
         private readonly IDirectoryManager _directoryManager;
         private readonly IOptionSettingHandler _optionSettingHandler;
         private readonly IServiceProvider _serviceProvider;
-        private readonly Func<ICredentialProfileStoreChain> _credentialChainFactory;
-        private readonly Func<ISharedCredentialsFile> _sharedCredentialsFileFactory;
-        private readonly IFallbackCredentialsFactory _fallbackCredentialsFactory;
-
+        private readonly ICredentialProfileStoreChainFactory _credentialChainFactory;
+        private readonly ISharedCredentialsFileFactory _sharedCredentialsFileFactory;
+        private readonly IFallbackCredentialsFactoryFactory _fallbackCredentialsFactory;
 
         public AWSUtilities(
             IServiceProvider serviceProvider,
             IToolInteractiveService toolInteractiveService,
             IConsoleUtilities consoleUtilities,
             IDirectoryManager directoryManager,
             IOptionSettingHandler optionSettingHandler,
-            Func<ICredentialProfileStoreChain>? credentialChainFactory = null,
-            Func<ISharedCredentialsFile>? sharedCredentialsFileFactory = null,
-            IFallbackCredentialsFactory? fallbackCredentialsFactory = null)
+            ICredentialProfileStoreChainFactory credentialChainFactory,
+            ISharedCredentialsFileFactory sharedCredentialsFileFactory,
+            IFallbackCredentialsFactoryFactory fallbackCredentialsFactory)
         {
             _serviceProvider = serviceProvider;
             _toolInteractiveService = toolInteractiveService;
             _consoleUtilities = consoleUtilities;
             _directoryManager = directoryManager;
             _optionSettingHandler = optionSettingHandler;
-            _credentialChainFactory = credentialChainFactory ?? (() => new CredentialProfileStoreChainWrapper());
-            _sharedCredentialsFileFactory = sharedCredentialsFileFactory ?? (() => new SharedCredentialsFileWrapper());
-            _fallbackCredentialsFactory = fallbackCredentialsFactory ?? new FallbackCredentialsFactoryWrapper();
+            _credentialChainFactory = credentialChainFactory;
+            _sharedCredentialsFileFactory = sharedCredentialsFileFactory;
+            _fallbackCredentialsFactory = fallbackCredentialsFactory;
         }
 
         public async Task<Tuple<AWSCredentials, string?>> ResolveAWSCredentials(string? profileName)
         {
             async Task<Tuple<AWSCredentials, string?>> Resolve()
             {
-                var chain = _credentialChainFactory();
+                var chain = _credentialChainFactory.Create();
 
                 if (!string.IsNullOrEmpty(profileName))
                 {
@@ -77,7 +76,7 @@ public AWSUtilities(
 
                 try
                 {
-                    var fallbackCredentials = _fallbackCredentialsFactory.GetCredentials();
+                    var fallbackCredentials = _fallbackCredentialsFactory.Create();
 
                     if (await CanLoadCredentials(fallbackCredentials))
                     {
@@ -92,7 +91,7 @@ public AWSUtilities(
                     _toolInteractiveService.WriteDebugLine(ex.PrettyPrint());
                 }
 
-                var sharedCredentials = _sharedCredentialsFileFactory();
+                var sharedCredentials = _sharedCredentialsFileFactory.Create();
                 if (sharedCredentials.ListProfileNames().Count == 0)
                 {
                     throw new NoAWSCredentialsFoundException(DeployToolErrorCode.UnableToResolveAWSCredentials, "Unable to resolve AWS credentials to access AWS.");

src/AWS.Deploy.CLI/ICredentialProfileStoreChain.cs → src/AWS.Deploy.CLI/CredentialProfileStoreChainFactory.cs

@@ -9,9 +9,11 @@
 
 namespace AWS.Deploy.CLI
 {
-    public interface ICredentialProfileStoreChain
+    public class CredentialProfileStoreChainFactory : ICredentialProfileStoreChainFactory
     {
-        bool TryGetAWSCredentials(string profileName, out AWSCredentials credentials);
-        bool TryGetProfile(string profileName, out CredentialProfile profile);
+        public CredentialProfileStoreChain Create()
+        {
+            return new CredentialProfileStoreChain();
+        }
     }
 }

src/AWS.Deploy.CLI/Extensions/CustomServiceCollectionExtension.cs

@@ -71,6 +71,11 @@ public static void AddCustomServices(this IServiceCollection serviceCollection,
             serviceCollection.TryAdd(new ServiceDescriptor(typeof(IEnvironmentVariableManager), typeof(EnvironmentVariableManager), lifetime));
             serviceCollection.TryAdd(new ServiceDescriptor(typeof(IDeployToolWorkspaceMetadata), typeof(DeployToolWorkspaceMetadata), lifetime));
             serviceCollection.TryAdd(new ServiceDescriptor(typeof(IDeploymentSettingsHandler), typeof(DeploymentSettingsHandler), lifetime));
+            serviceCollection.TryAdd(new ServiceDescriptor(typeof(ICredentialProfileStoreChainFactory), typeof(CredentialProfileStoreChainFactory), lifetime));
+            serviceCollection.TryAdd(new ServiceDescriptor(typeof(ISharedCredentialsFileFactory), typeof(SharedCredentialsFileFactory), lifetime));
+            serviceCollection.TryAdd(new ServiceDescriptor(typeof(IFallbackCredentialsFactoryFactory), typeof(FallbackCredentialsFactoryFactory), lifetime));
+
+
 
             var packageJsonTemplate = typeof(PackageJsonGenerator).Assembly.ReadEmbeddedFile(PackageJsonGenerator.TemplateIdentifier);
             serviceCollection.TryAdd(new ServiceDescriptor(typeof(IPackageJsonGenerator), (serviceProvider) => new PackageJsonGenerator(packageJsonTemplate), lifetime));

src/AWS.Deploy.CLI/FallbackCredentialsFactoryFactory.cs

@@ -0,0 +1,15 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using Amazon.Runtime;
+
+namespace AWS.Deploy.CLI
+{
+    public class FallbackCredentialsFactoryFactory : IFallbackCredentialsFactoryFactory
+    {
+        public AWSCredentials Create()
+        {
+            return FallbackCredentialsFactory.GetCredentials();
+        }
+    }
+}

src/AWS.Deploy.CLI/ICredentialProfileStoreChainFactory.cs

@@ -0,0 +1,16 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using Amazon.Runtime.CredentialManagement;
+using Amazon.Runtime;
+
+namespace AWS.Deploy.CLI
+{
+    public interface ICredentialProfileStoreChainFactory
+    {
+        CredentialProfileStoreChain Create();
+    }
+}

src/AWS.Deploy.CLI/IFallbackCredentialsFactory.cs → src/AWS.Deploy.CLI/IFallbackCredentialsFactoryFactory.cs

@@ -5,8 +5,8 @@
 
 namespace AWS.Deploy.CLI
 {
-    public interface IFallbackCredentialsFactory
+    public interface IFallbackCredentialsFactoryFactory
     {
-        AWSCredentials GetCredentials();
+        AWSCredentials Create();
     }
 }

src/AWS.Deploy.CLI/ISharedCredentialsFile.cs → src/AWS.Deploy.CLI/ISharedCredentialsFileFactory.cs

@@ -2,11 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using System.Collections.Generic;
+using Amazon.Runtime.CredentialManagement;
 
 namespace AWS.Deploy.CLI
 {
-    public interface ISharedCredentialsFile
+    public interface ISharedCredentialsFileFactory
     {
-        List<string> ListProfileNames();
+        SharedCredentialsFile Create();
     }
 }

src/AWS.Deploy.CLI/SharedCredentialsFileFactory.cs

@@ -0,0 +1,16 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using System.Collections.Generic;
+using Amazon.Runtime.CredentialManagement;
+
+namespace AWS.Deploy.CLI
+{
+    public class SharedCredentialsFileFactory : ISharedCredentialsFileFactory
+    {
+        public SharedCredentialsFile Create()
+        {
+            return new SharedCredentialsFile();
+        }
+    }
+}