Skip to content

Sync tools code from main branch to generation branch #23755

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
Parent: Client Parity Refresh for New Relic
merged 1 commit into from
Dec 18, 2023
Merged

Sync tools code from main branch to generation branch #23755

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
2 changes: 1 addition & 1 deletion tools/Az/Az.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.13.2'; },
@{ModuleName = 'Az.ArcResourceBridge'; RequiredVersion = '1.0.0'; },
@{ModuleName = 'Az.Attestation'; RequiredVersion = '2.0.0'; },
@{ModuleName = 'Az.Automanage'; RequiredVersion = '1.0.0'; },
@{ModuleName = 'Az.Automation'; RequiredVersion = '1.9.1'; },
@{ModuleName = 'Az.Automation'; RequiredVersion = '1.10.0'; },
@{ModuleName = 'Az.Batch'; RequiredVersion = '3.5.0'; },
@{ModuleName = 'Az.Billing'; RequiredVersion = '2.0.3'; },
@{ModuleName = 'Az.Cdn'; RequiredVersion = '3.1.1'; },
Expand Down
2 changes: 1 addition & 1 deletion tools/AzPreview/AzPreview.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.13.2'; },
@{ModuleName = 'Az.ArcResourceBridge'; RequiredVersion = '1.0.0'; },
@{ModuleName = 'Az.Attestation'; RequiredVersion = '2.0.0'; },
@{ModuleName = 'Az.Automanage'; RequiredVersion = '1.0.0'; },
@{ModuleName = 'Az.Automation'; RequiredVersion = '1.9.1'; },
@{ModuleName = 'Az.Automation'; RequiredVersion = '1.10.0'; },
@{ModuleName = 'Az.BareMetal'; RequiredVersion = '0.1.0'; },
@{ModuleName = 'Az.Batch'; RequiredVersion = '3.5.0'; },
@{ModuleName = 'Az.Billing'; RequiredVersion = '2.0.3'; },
Expand Down
2 changes: 1 addition & 1 deletion tools/Docs/az-ps-latest.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pac10,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-relea
pac11,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.ArcResourceBridge.1.0.0.nupkg;sourceType=sa]Az.ArcResourceBridge,1.0.0
pac12,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.Attestation.2.0.0.nupkg;sourceType=sa]Az.Attestation,2.0.0
pac13,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.Automanage.1.0.0.nupkg;sourceType=sa]Az.Automanage,1.0.0
pac14,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.Automation.1.9.1.nupkg;sourceType=sa]Az.Automation,1.9.1
pac14,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.Automation.1.10.0.nupkg;sourceType=sa]Az.Automation,1.10.0
pac15,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.BareMetal.0.1.0.nupkg;sourceType=sa]Az.BareMetal,0.1.0
pac16,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.Batch.3.5.0.nupkg;sourceType=sa]Az.Batch,3.5.0
pac17,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.Billing.2.0.3.nupkg;sourceType=sa]Az.Billing,2.0.3
Expand Down
11 changes: 6 additions & 5 deletions tools/TestFx/Mocks/MockContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public T GetServiceClient<T>(TestEnvironment currentEnvironment, bool internalBa
$"Unable to create Service Client because {nameof(T)} authentication token was not acquired during Login.");
}

return GetServiceClientWithCredentials<T>(currentEnvironment, currentEnvironment.TokenInfo[TokenAudience.Management], internalBaseUri, handlers);
return GetServiceClientWithCredentials<T>(currentEnvironment, currentEnvironment.BaseUri, currentEnvironment.TokenInfo[TokenAudience.Management], internalBaseUri, handlers);
}

/// <summary>
Expand Down Expand Up @@ -135,7 +135,7 @@ public T GetGraphServiceClient<T>(TestEnvironment currentEnvironment, bool inter
"Unable to create Graph Client because Graph authentication token was not acquired during Login.");
}

return GetServiceClientWithCredentials<T>(currentEnvironment, currentEnvironment.TokenInfo[TokenAudience.Graph], internalBaseUri, handlers);
return GetServiceClientWithCredentials<T>(currentEnvironment, currentEnvironment.Endpoints.GraphUri, currentEnvironment.TokenInfo[TokenAudience.Graph], internalBaseUri, handlers);
}

/// <summary>
Expand All @@ -146,14 +146,15 @@ public T GetGraphServiceClient<T>(TestEnvironment currentEnvironment, bool inter
/// <param name="baseUri">Base Uri</param>
/// <param name="handlers">Delegating existingHandlers</param>
/// <returns></returns>
public T GetServiceClientWithCredentials<T>(TestEnvironment currentEnvironment, object credentials, bool internalBaseUri = false, params DelegatingHandler[] handlers) where T : class
public T GetServiceClientWithCredentials<T>(TestEnvironment currentEnvironment, Uri baseUri, object credentials, bool internalBaseUri, params DelegatingHandler[] handlers) where T : class
{
T client;
handlers = AddHandlers(currentEnvironment, handlers);
var constructors = typeof(T).GetConstructors(BindingFlags.Public | BindingFlags.Static | BindingFlags.Instance | BindingFlags.NonPublic);

Uri uri = baseUri ?? currentEnvironment.BaseUri;
ConstructorInfo constructor = null;
if (!internalBaseUri && currentEnvironment.BaseUri != null)
if (!internalBaseUri && uri != null)
{
foreach (var c in constructors)
{
Expand All @@ -173,7 +174,7 @@ public T GetServiceClientWithCredentials<T>(TestEnvironment currentEnvironment,
}
client = constructor.Invoke(new object[]
{
currentEnvironment.BaseUri,
uri,
credentials,
handlers
}) as T;
Expand Down
Loading