Skip to content

Make the Parent of ResourceContainerBase to be the OperationsBase type #22589

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
fengzhou-msft merged 9 commits into from
Jul 13, 2021
Merged

Make the Parent of ResourceContainerBase to be the OperationsBase type #22589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5508f5f
make the type of Parent of ResourceContainerBase to be OperationsBase
fengzhou-msft Jul 10, 2021
1712f4e
make TenantOperations the parent of SubscriptionContainer
fengzhou-msft Jul 12, 2021
3b4fd59
Merge branch 'feature/mgmt-track2' of github.com:Azure/azure-sdk-for-…
fengzhou-msft Jul 12, 2021
f9cdf04
merge upstream
fengzhou-msft Jul 12, 2021
ce302e5
fix validation
fengzhou-msft Jul 12, 2021
03c1ce2
fix the ValidResourceType for SubscriptionContainer
fengzhou-msft Jul 12, 2021
fd201b4
merge upstream
fengzhou-msft Jul 13, 2021
e80a100
refactor GetSubscriptions
fengzhou-msft Jul 13, 2021
ebcffa0
override Parent for ManagementGroupContainer
fengzhou-msft Jul 13, 2021
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: 2 additions & 5 deletions sdk/resourcemanager/Azure.ResourceManager.Core/src/ArmClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@ public ArmClient(
ClientOptions = options?.Clone() ?? new ArmClientOptions();
Pipeline = ManagementPipelineBuilder.Build(Credential, BaseUri, options ?? ClientOptions);

_tenant = new TenantOperations(ClientOptions, Credential, BaseUri, Pipeline);
DefaultSubscription = string.IsNullOrWhiteSpace(defaultSubscriptionId)
? GetDefaultSubscription()
: GetSubscriptions().TryGet(defaultSubscriptionId);
Comment on lines +95 to 98
Copy link
Copy Markdown
Member Author

@fengzhou-msft fengzhou-msft Jul 12, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

_tenant is now used when creating SusbcriptionContainer, so move the initialization upward.

_tenant = new TenantOperations(ClientOptions, Credential, BaseUri, Pipeline);
ClientOptions.ApiVersions.SetProviderClient(this);
}

Expand Down Expand Up @@ -128,10 +128,7 @@ public ArmClient(
/// Gets the Azure subscriptions.
/// </summary>
/// <returns> Subscription container. </returns>
public virtual SubscriptionContainer GetSubscriptions()
{
return new SubscriptionContainer(new ClientContext(ClientOptions, Credential, BaseUri, Pipeline));
}
public virtual SubscriptionContainer GetSubscriptions() => _tenant.GetSubscriptions();

/// <summary>
/// Gets the tenants.
Expand Down
5 changes: 5 additions & 0 deletions sdk/resourcemanager/Azure.ResourceManager.Core/src/Generated/FeatureContainer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions ...ager/Azure.ResourceManager.Core/src/Generated/ManagementGroup/ManagementGroupContainer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions sdk/resourcemanager/Azure.ResourceManager.Core/src/Generated/ResourceGroupContainer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 9 additions & 14 deletions sdk/resourcemanager/Azure.ResourceManager.Core/src/Generated/SubscriptionContainer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions sdk/resourcemanager/Azure.ResourceManager.Core/src/Generated/TenantOperations.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions sdk/resourcemanager/Azure.ResourceManager.Core/src/ResourceContainerBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,6 @@ protected ResourceContainerBase(OperationsBase parent)
{
}

/// <summary>
/// Gets the parent resource of this resource.
/// </summary>
protected new ResourceOperationsBase Parent { get {return base.Parent as ResourceOperationsBase;} }

/// <summary>
/// Verify that the input resource Id is a valid container for this type.
/// </summary>
Expand Down