nibhati 5401 - add CancellationToken to GetResource() (#20396)

* Change the accessbility to virtual for Resource.Id * add token Co-authored-by: YalinLi0312 <yall@microsoft.com>
Azure · Apr 14, 2021 · f88ab1b · f88ab1b
1 parent 5e40926
commit f88ab1b
Show file tree

Hide file tree

Showing 17 changed files with 32 additions and 32 deletions.
diff --git a/sdk/resourcemanager/Azure.ResourceManager.Core/src/ExtensionResourceOperationsBase.cs b/sdk/resourcemanager/Azure.ResourceManager.Core/src/ExtensionResourceOperationsBase.cs
@@ -77,9 +77,9 @@ protected ExtensionResourceOperationsBase(OperationsBase genericOperations, Reso
         /// Get details for this resource from the service or can be overriden to provide a cached instance.
         /// </summary>
         /// <returns> A <see cref="ArmResponse{TOperations}"/> operation for this resource. </returns>
-        protected virtual TOperations GetResource()
+        protected virtual TOperations GetResource(CancellationToken cancellationToken = default)
         {
-            return Get().Value;
+            return Get(cancellationToken).Value;
         }
 
         /// <summary>

diff --git a/sdk/resourcemanager/Azure.ResourceManager.Core/src/GenericResource.cs b/sdk/resourcemanager/Azure.ResourceManager.Core/src/GenericResource.cs
@@ -31,7 +31,7 @@ internal GenericResource(ResourceOperationsBase operations, GenericResourceData
         public virtual GenericResourceData Data { get; }
 
         /// <inheritdoc/>
-        protected override GenericResource GetResource()
+        protected override GenericResource GetResource(CancellationToken cancellation = default)
         {
             return this;
         }

diff --git a/sdk/resourcemanager/Azure.ResourceManager.Core/src/GenericResourceOperations.cs b/sdk/resourcemanager/Azure.ResourceManager.Core/src/GenericResourceOperations.cs
@@ -102,7 +102,7 @@ public async Task<ArmOperation<Response>> StartDeleteAsync(CancellationToken can
         /// <inheritdoc/>
         public ArmResponse<GenericResource> AddTag(string key, string value, CancellationToken cancellationToken = default)
         {
-            GenericResource resource = GetResource();
+            GenericResource resource = GetResource(cancellationToken);
             // Potential optimization on tags set, remove NOOP to bypass the call.
             resource.Data.Tags[key] = value;
             var apiVersion = GetApiVersion(cancellationToken);
@@ -126,7 +126,7 @@ await op.WaitForCompletionAsync(cancellationToken).ConfigureAwait(false),
         /// <inheritdoc/>
         public ArmOperation<GenericResource> StartAddTag(string key, string value, CancellationToken cancellationToken = default)
         {
-            GenericResource resource = GetResource();
+            GenericResource resource = GetResource(cancellationToken);
             resource.Data.Tags[key] = value;
             var apiVersion = GetApiVersion(cancellationToken);
             return new PhArmOperation<GenericResource, ResourceManager.Resources.Models.GenericResource>(
@@ -177,7 +177,7 @@ protected override void Validate(ResourceIdentifier identifier)
         /// <inheritdoc/>
         public ArmResponse<GenericResource> SetTags(IDictionary<string, string> tags, CancellationToken cancellationToken = default)
         {
-            GenericResource resource = GetResource();
+            GenericResource resource = GetResource(cancellationToken);
             resource.Data.Tags.ReplaceWith(tags);
             var apiVersion = GetApiVersion(cancellationToken);
             return new PhArmResponse<GenericResource, ResourceManager.Resources.Models.GenericResource>(
@@ -200,7 +200,7 @@ await op.WaitForCompletionAsync(cancellationToken).ConfigureAwait(false),
         /// <inheritdoc/>
         public ArmOperation<GenericResource> StartSetTags(IDictionary<string, string> tags, CancellationToken cancellationToken = default)
         {
-            GenericResource resource = GetResource();
+            GenericResource resource = GetResource(cancellationToken);
             resource.Data.Tags.ReplaceWith(tags);
             var apiVersion = GetApiVersion(cancellationToken);
             return new PhArmOperation<GenericResource, ResourceManager.Resources.Models.GenericResource>(
@@ -223,7 +223,7 @@ await op.WaitForCompletionAsync(cancellationToken).ConfigureAwait(false),
         /// <inheritdoc/>
         public ArmResponse<GenericResource> RemoveTag(string key, CancellationToken cancellationToken = default)
         {
-            GenericResource resource = GetResource();
+            GenericResource resource = GetResource(cancellationToken);
             resource.Data.Tags.Remove(key);
             var apiVersion = GetApiVersion(cancellationToken);
             return new PhArmResponse<GenericResource, ResourceManager.Resources.Models.GenericResource>(
@@ -246,7 +246,7 @@ await op.WaitForCompletionAsync(cancellationToken).ConfigureAwait(false),
         /// <inheritdoc/>
         public ArmOperation<GenericResource> StartRemoveTag(string key, CancellationToken cancellationToken = default)
         {
-            GenericResource resource = GetResource();
+            GenericResource resource = GetResource(cancellationToken);
             resource.Data.Tags.Remove(key);
             var apiVersion = GetApiVersion(cancellationToken);
             return new PhArmOperation<GenericResource, ResourceManager.Resources.Models.GenericResource>(

diff --git a/sdk/resourcemanager/Azure.ResourceManager.Core/src/ResourceGroup.cs b/sdk/resourcemanager/Azure.ResourceManager.Core/src/ResourceGroup.cs
@@ -35,7 +35,7 @@ internal ResourceGroup(ResourceOperationsBase operations, ResourceGroupData reso
         public virtual ResourceGroupData Data { get; }
 
         /// <inheritdoc />
-        protected override ResourceGroup GetResource()
+        protected override ResourceGroup GetResource(CancellationToken cancellation = default)
         {
             return this;
         }

diff --git a/sdk/resourcemanager/Azure.ResourceManager.Core/src/ResourceGroupOperations.cs b/sdk/resourcemanager/Azure.ResourceManager.Core/src/ResourceGroupOperations.cs
@@ -209,7 +209,7 @@ public virtual ArmResponse<ResourceGroup> AddTag(string key, string value, Cance
 
             try
             {
-                var resource = GetResource();
+                var resource = GetResource(cancellationToken);
                 var patch = new ResourceGroupPatchable();
                 patch.Tags.ReplaceWith(resource.Data.Tags);
                 patch.Tags[key] = value;
@@ -264,7 +264,7 @@ public virtual ArmOperation<ResourceGroup> StartAddTag(string key, string value,
 
             try
             {
-                var resource = GetResource();
+                var resource = GetResource(cancellationToken);
                 var patch = new ResourceGroupPatchable();
                 patch.Tags.ReplaceWith(resource.Data.Tags);
                 patch.Tags[key] = value;
@@ -380,7 +380,7 @@ public virtual ArmResponse<ResourceGroup> SetTags(IDictionary<string, string> ta
 
             try
             {
-                var resource = GetResource();
+                var resource = GetResource(cancellationToken);
                 var patch = new ResourceGroupPatchable();
                 patch.Tags.ReplaceWith(tags);
                 return new PhArmResponse<ResourceGroup, ResourceManager.Resources.Models.ResourceGroup>(Operations.Update(Id.Name, patch, cancellationToken), g =>
@@ -434,7 +434,7 @@ public virtual ArmOperation<ResourceGroup> StartSetTags(IDictionary<string, stri
 
             try
             {
-                var resource = GetResource();
+                var resource = GetResource(cancellationToken);
                 var patch = new ResourceGroupPatchable();
                 patch.Tags.ReplaceWith(tags);
                 return new PhArmOperation<ResourceGroup, ResourceManager.Resources.Models.ResourceGroup>(Operations.Update(Id.Name, patch, cancellationToken), g =>
@@ -488,7 +488,7 @@ public virtual ArmResponse<ResourceGroup> RemoveTag(string key, CancellationToke
 
             try
             {
-                var resource = GetResource();
+                var resource = GetResource(cancellationToken);
                 var patch = new ResourceGroupPatchable();
                 patch.Tags.ReplaceWith(resource.Data.Tags);
                 patch.Tags.Remove(key);
@@ -544,7 +544,7 @@ public virtual ArmOperation<ResourceGroup> StartRemoveTag(string key, Cancellati
 
             try
             {
-                var resource = GetResource();
+                var resource = GetResource(cancellationToken);
                 var patch = new ResourceGroupPatchable();
                 patch.Tags.ReplaceWith(resource.Data.Tags);
                 patch.Tags.Remove(key);
@@ -571,7 +571,7 @@ public virtual async Task<ArmOperation<ResourceGroup>> StartRemoveTagAsync(strin
 
             try
             {
-                var resource = GetResource();
+                var resource = GetResource(cancellationToken);
                 var patch = new ResourceGroupPatchable();
                 patch.Tags.ReplaceWith(resource.Data.Tags);
                 patch.Tags.Remove(key);

diff --git a/sdk/resourcemanager/Azure.ResourceManager.Core/src/ResourceOperationsBase.cs b/sdk/resourcemanager/Azure.ResourceManager.Core/src/ResourceOperationsBase.cs
@@ -98,9 +98,9 @@ internal ResourceOperationsBase(ClientContext clientContext, ResourceIdentifier
         /// Get details for this resource from the service or can be overriden to provide a cached instance.
         /// </summary>
         /// <returns> A <see cref="ArmResponse{TOperations}"/> operation for this resource. </returns>
-        protected virtual TOperations GetResource()
+        protected virtual TOperations GetResource(CancellationToken cancellationToken = default)
         {
-            return Get().Value;
+            return Get(cancellationToken).Value;
         }
 
         /// <summary>

diff --git a/sdk/resourcemanager/Azure.ResourceManager.Core/src/Subscription.cs b/sdk/resourcemanager/Azure.ResourceManager.Core/src/Subscription.cs
@@ -35,7 +35,7 @@ internal Subscription(SubscriptionOperations subscription, SubscriptionData subs
         public virtual SubscriptionData Data { get; }
 
         /// <inheritdoc />
-        protected override Subscription GetResource()
+        protected override Subscription GetResource(CancellationToken cancellation = default)
         {
             return this;
         }

diff --git a/sdk/resourcemanager/Proto.Client/authorization/RoleAssignment.cs b/sdk/resourcemanager/Proto.Client/authorization/RoleAssignment.cs
@@ -29,7 +29,7 @@ internal RoleAssignment(OperationsBase operations, RoleAssignmentData data)
         public RoleAssignmentData Data { get; }
 
         /// <inheritdoc />
-        protected override RoleAssignment GetResource()
+        protected override RoleAssignment GetResource(CancellationToken cancellationToken = default)
         {
             return this;
         }

diff --git a/sdk/resourcemanager/Proto.Client/billing/BillingAccount.cs b/sdk/resourcemanager/Proto.Client/billing/BillingAccount.cs
@@ -29,7 +29,7 @@ internal BillingAccount(ResourceOperationsBase options, BillingAccountData resou
         public BillingAccountData Data { get; private set; }
 
         /// <inheritdoc />
-        protected override BillingAccount GetResource()
+        protected override BillingAccount GetResource(CancellationToken cancellation = default)
         {
             return this;
         }

diff --git a/sdk/resourcemanager/Proto.Client/compute/AvailabilitySet.cs b/sdk/resourcemanager/Proto.Client/compute/AvailabilitySet.cs
@@ -1,6 +1,6 @@
-using System.Threading;
+using Azure.ResourceManager.Core;
+using System.Threading;
 using System.Threading.Tasks;
-using Azure.ResourceManager.Core;
 
 namespace Proto.Compute
 {
@@ -26,7 +26,7 @@ internal AvailabilitySet(ResourceOperationsBase options, AvailabilitySetData res
         public AvailabilitySetData Data { get; private set; }
 
         /// <inheritdoc />
-        protected override AvailabilitySet GetResource()
+        protected override AvailabilitySet GetResource(CancellationToken cancellation = default)
         {
             return this;
         }

diff --git a/sdk/resourcemanager/Proto.Client/compute/VirtualMachine.cs b/sdk/resourcemanager/Proto.Client/compute/VirtualMachine.cs
@@ -26,7 +26,7 @@ internal VirtualMachine(ResourceOperationsBase operations, VirtualMachineData re
         }
 
         /// <inheritdoc />
-        protected override VirtualMachine GetResource()
+        protected override VirtualMachine GetResource(CancellationToken cancellation = default)
         {
             return this;
         }

diff --git a/sdk/resourcemanager/Proto.Client/network/NetworkInterface.cs b/sdk/resourcemanager/Proto.Client/network/NetworkInterface.cs
@@ -21,7 +21,7 @@ internal NetworkInterface(ResourceOperationsBase options, NetworkInterfaceData r
         public NetworkInterfaceData Data { get; private set; }
 
         /// <inheritdoc />
-        protected override NetworkInterface GetResource()
+        protected override NetworkInterface GetResource(CancellationToken cancellation = default)
         {
             return this;
         }

diff --git a/sdk/resourcemanager/Proto.Client/network/NetworkSecurityGroup.cs b/sdk/resourcemanager/Proto.Client/network/NetworkSecurityGroup.cs
@@ -29,7 +29,7 @@ internal NetworkSecurityGroup(ResourceOperationsBase operations, NetworkSecurity
         public NetworkSecurityGroupData Data { get; private set; }
 
         /// <inheritdoc />
-        protected override NetworkSecurityGroup GetResource()
+        protected override NetworkSecurityGroup GetResource(CancellationToken cancellation = default)
         {
             return this;
         }

diff --git a/sdk/resourcemanager/Proto.Client/network/NetworkSecurityGroupOperations.cs b/sdk/resourcemanager/Proto.Client/network/NetworkSecurityGroupOperations.cs
@@ -192,7 +192,7 @@ public async Task<ArmOperation<Response>> StartDeleteAsync(CancellationToken can
         }
 
         /// <inheritdoc/>
-        protected override NetworkSecurityGroup GetResource()
+        protected override NetworkSecurityGroup GetResource(CancellationToken cancellationToken = default)
         {
             return Get().Value;
         }

diff --git a/sdk/resourcemanager/Proto.Client/network/PublicIpAddress.cs b/sdk/resourcemanager/Proto.Client/network/PublicIpAddress.cs
@@ -26,7 +26,7 @@ internal PublicIpAddress(ResourceOperationsBase options, PublicIPAddressData res
         public PublicIPAddressData Data { get; private set; }
 
         /// <inheritdoc />
-        protected override PublicIpAddress GetResource()
+        protected override PublicIpAddress GetResource(CancellationToken cancellation = default)
         {
             return this;
         }

diff --git a/sdk/resourcemanager/Proto.Client/network/Subnet.cs b/sdk/resourcemanager/Proto.Client/network/Subnet.cs
@@ -24,7 +24,7 @@ internal Subnet(ResourceOperationsBase options, SubnetData resource)
         public SubnetData Data { get; private set; }
 
         /// <inheritdoc />
-        protected override Subnet GetResource()
+        protected override Subnet GetResource(CancellationToken cancellation = default)
         {
             return this;
         }

diff --git a/sdk/resourcemanager/Proto.Client/network/VirtualNetwork.cs b/sdk/resourcemanager/Proto.Client/network/VirtualNetwork.cs
@@ -26,7 +26,7 @@ internal VirtualNetwork(ResourceOperationsBase options, VirtualNetworkData resou
         public VirtualNetworkData Data { get; private set; }
 
         /// <inheritdoc />
-        protected override VirtualNetwork GetResource()
+        protected override VirtualNetwork GetResource(CancellationToken cancellation = default)
         {
             return this;
         }