Skip to content

Support SM/RM cmdlets execution with RP registration #1089

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

Merged
hovsepm merged 1 commit into from
Oct 8, 2015
Merged

Support SM/RM cmdlets execution with RP registration #1089

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
7 changes: 6 additions & 1 deletion src/ResourceManager/Common/Commands.ResourceManager.Common/AzureRMCmdlet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,16 @@ static AzureRMCmdlet()
}
}

/// <summary>
/// Creates new instance from AzureRMCmdlet and add the RPRegistration handler.
/// </summary>
public AzureRMCmdlet()
{
AzureSession.ClientFactory.RemoveHandler(typeof(RPRegistrationDelegatingHandler));
AzureSession.ClientFactory.AddHandler(new RPRegistrationDelegatingHandler(
() => AzureSession.ClientFactory.CreateClient<ResourceManagementClient>(DefaultContext, AzureEnvironment.Endpoint.ResourceManager),
() => new ResourceManagementClient(
AzureSession.AuthenticationFactory.GetSubscriptionCloudCredentials(DefaultContext, AzureEnvironment.Endpoint.ResourceManager),
DefaultContext.Environment.GetEndpointAsUri(AzureEnvironment.Endpoint.ResourceManager)),
s => _debugMessages.Enqueue(s)));
}

Expand Down
3 changes: 1 addition & 2 deletions ...ResourceManager/Common/Commands.ResourceManager.Common/RPRegistrationDelegatingHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@ public RPRegistrationDelegatingHandler(Func<ResourceManagementClient> createClie

protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
{
ResourceManagementClient = createClient();

HttpResponseMessage responseMessage = await base.SendAsync(request, cancellationToken).ConfigureAwait(false);
if (IsProviderNotRegistereError(responseMessage))
{
Expand All @@ -61,6 +59,7 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
registeredProviders.Add(providerName);
try
{
ResourceManagementClient = createClient();
writeDebug(string.Format(Resources.ResourceProviderRegisterAttempt, providerName));
ResourceManagementClient.Providers.Register(providerName);
Provider provider = null;
Expand Down