Skip to content
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

Jump to bottom

update armclient to support extension mock #39631

Merged
merged 3 commits into from
Nov 1, 2023
Merged

update armclient to support extension mock #39631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9722849
update armclient
ArcturusZhang Oct 31, 2023
f15d2fa
update changelog and version number
ArcturusZhang Nov 1, 2023
078613b
Update CHANGELOG.md
ArcturusZhang Nov 1, 2023
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
8 changes: 2 additions & 6 deletions sdk/resourcemanager/Azure.ResourceManager/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
# Release History

## 1.8.0-beta.1 (Unreleased)
## 1.8.0 (2023-11-02)

### Features Added

### Breaking Changes

### Bugs Fixed

### Other Changes
- Add a new method `GetCachedClient` in `ArmClient` class to unify the mocking experience.

## 1.7.0 (2023-07-13)

Expand Down
2 changes: 2 additions & 0 deletions sdk/resourcemanager/Azure.ResourceManager/api/Azure.ResourceManager.netstandard2.0.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ protected ArmClient() { }
public ArmClient(Azure.Core.TokenCredential credential) { }
public ArmClient(Azure.Core.TokenCredential credential, string defaultSubscriptionId) { }
public ArmClient(Azure.Core.TokenCredential credential, string defaultSubscriptionId, Azure.ResourceManager.ArmClientOptions options) { }
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public virtual T GetCachedClient<T>(System.Func<Azure.ResourceManager.ArmClient, T> clientFactory) where T : class { throw null; }
public virtual Azure.ResourceManager.Resources.DataPolicyManifestResource GetDataPolicyManifestResource(Azure.Core.ResourceIdentifier id) { throw null; }
public virtual Azure.ResourceManager.Resources.SubscriptionResource GetDefaultSubscription(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.SubscriptionResource> GetDefaultSubscriptionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
Expand Down
14 changes: 14 additions & 0 deletions sdk/resourcemanager/Azure.ResourceManager/src/ArmClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,5 +297,19 @@ public virtual T GetResourceClient<T>(Func<T> resourceFactory)
{
return resourceFactory();
}

private readonly ConcurrentDictionary<Type, object> _clientCache = new ConcurrentDictionary<Type, object>();

/// <summary>
/// Gets a cached client to use for extension methods.
/// </summary>
/// <typeparam name="T"> The type of client to get. </typeparam>
/// <param name="clientFactory"> The constructor factory for the client. </param>
[EditorBrowsable(EditorBrowsableState.Never)]
public virtual T GetCachedClient<T>(Func<ArmClient, T> clientFactory)
where T : class
{
return _clientCache.GetOrAdd(typeof(T), (type) => { return clientFactory(this); }) as T;
}
}
}
2 changes: 1 addition & 1 deletion sdk/resourcemanager/Azure.ResourceManager/src/Azure.ResourceManager.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Version>1.8.0-beta.1</Version>
<Version>1.8.0</Version>
<!--The ApiCompatVersion is managed automatically and should not generally be modified manually.-->
<ApiCompatVersion>1.7.0</ApiCompatVersion>
<PackageId>Azure.ResourceManager</PackageId>
Expand Down