Skip to content

Expose [Try]AddAWSCredentials extension methods #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
chase-miller wants to merge 1 commit into
base: add-credentials-factory-extensions-v2-3
Choose a base branch
from
Draft

Expose [Try]AddAWSCredentials extension methods #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions extensions/src/AWSSDK.Extensions.NETCore.Setup/ClientFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ internal ClientFactory(AWSOptions awsOptions, IAWSCredentialsFactory credentials
/// Creates the AWS service client that implements the service client interface.
/// </summary>
/// <returns>The AWS service client</returns>
internal IAmazonService CreateServiceClient()
internal IAmazonService CreateServiceClient(AWSCredentials credentials = null)
{
PerformGlobalConfig(_logger, _options);
var credentials = _credentialsFactory.Create();
credentials = credentials ?? _credentialsFactory.Create();

if (!string.IsNullOrEmpty(_options?.SessionRoleArn))
{
Expand Down
98 changes: 96 additions & 2 deletions extensions/src/AWSSDK.Extensions.NETCore.Setup/ServiceCollectionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,94 @@ public static IServiceCollection AddDefaultAWSOptions(
return collection;
}

/// <summary>
///
/// </summary>
/// <param name="collection"></param>
/// <param name="lifetime"></param>
/// <returns></returns>
public static IServiceCollection AddAWSCredentials(
this IServiceCollection collection,
ServiceLifetime lifetime = ServiceLifetime.Singleton)
{
collection.Add(new ServiceDescriptor(typeof(AWSCredentials), sp => sp.CreateDefaultAWSCredentials(), lifetime));
return collection;
}

/// <summary>
///
/// </summary>
/// <param name="collection"></param>
/// <param name="credentials"></param>
/// <returns></returns>
public static IServiceCollection AddAWSCredentials(
this IServiceCollection collection,
AWSCredentials credentials)
{
collection.Add(new ServiceDescriptor(typeof(AWSCredentials), credentials));
return collection;
}

/// <summary>
///
/// </summary>
/// <param name="collection"></param>
/// <param name="credentialsFunc"></param>
/// <param name="lifetime"></param>
/// <returns></returns>
public static IServiceCollection AddAWSCredentials(
this IServiceCollection collection,
Func<IServiceProvider, AWSCredentials> credentialsFunc,
ServiceLifetime lifetime = ServiceLifetime.Singleton)
{
collection.Add(new ServiceDescriptor(typeof(AWSCredentials), credentialsFunc, lifetime));
return collection;
}

/// <summary>
///
/// </summary>
/// <param name="collection"></param>
/// <param name="lifetime"></param>
/// <returns></returns>
public static IServiceCollection TryAddAWSCredentials(
this IServiceCollection collection,
ServiceLifetime lifetime = ServiceLifetime.Singleton)
{
collection.TryAdd(new ServiceDescriptor(typeof(AWSCredentials), sp => sp.CreateDefaultAWSCredentials(), lifetime));
return collection;
}

/// <summary>
///
/// </summary>
/// <param name="collection"></param>
/// <param name="credentials"></param>
/// <returns></returns>
public static IServiceCollection TryAddAWSCredentials(
this IServiceCollection collection,
AWSCredentials credentials)
{
collection.TryAdd(new ServiceDescriptor(typeof(AWSCredentials), credentials));
return collection;
}

/// <summary>
///
/// </summary>
/// <param name="collection"></param>
/// <param name="credentialsFunc"></param>
/// <param name="lifetime"></param>
/// <returns></returns>
public static IServiceCollection TryAddAWSCredentials(
this IServiceCollection collection,
Func<IServiceProvider, AWSCredentials> credentialsFunc,
ServiceLifetime lifetime = ServiceLifetime.Singleton)
{
collection.TryAdd(new ServiceDescriptor(typeof(AWSCredentials), credentialsFunc, lifetime));
return collection;
}

/// <summary>
///
/// </summary>
Expand Down Expand Up @@ -394,13 +482,19 @@ private static object CreateServiceClient<T>(AWSOptions options, IServiceProvide

var factory = new ClientFactory<T>(awsOptions, credentialsFactory, logger);

return factory.CreateServiceClient();
return factory.CreateServiceClient(sp.GetService<AWSCredentials>());
}

private static IAWSCredentialsFactory CreateDefaultCredentialsFactory(IServiceProvider sp)
private static IAWSCredentialsFactory CreateDefaultCredentialsFactory(this IServiceProvider sp)
{
var options = sp.GetService<AWSOptions>() ?? new AWSOptions();
return new DefaultAWSCredentialsFactory(options, sp.GetService<ILogger>());
}

private static AWSCredentials CreateDefaultAWSCredentials(this IServiceProvider sp)
{
var credentialsFactory = sp.GetService<IAWSCredentialsFactory>() ?? sp.CreateDefaultCredentialsFactory();
return credentialsFactory.Create();
}
}
}