Merge pull request #199 from MabOneSdk/pragrawa-dev1

Vault Context cleanup

Author: pragrawa

src/ResourceManager/RecoveryServices.Backup/Cmdlets/Vault/SetAzureRmRecoveryServicesVaultContext.cs

@@ -30,6 +30,9 @@ public partial class HydraAdapter
         /// <returns></returns>
         public IEnumerable<ProtectionContainerResource> ListContainers(string resourceGroupName, string resourceName, ProtectionContainerListQueryParams queryParams)
         {
+            resourceName = BmsAdapter.GetResourceName();
+            resourceGroupName = BmsAdapter.GetResourceName();
+
             var listResponse = BmsAdapter.Client.Container.ListAsync(resourceGroupName, resourceName, queryParams,
                 BmsAdapter.GetCustomRequestHeaders(), BmsAdapter.CmdletCancellationToken).Result;
             return listResponse.ItemList.ProtectionContainers;
@@ -39,8 +42,11 @@ public IEnumerable<ProtectionContainerResource> ListContainers(string resourceGr
         /// Triggers refresh of container catalog in service
         /// </summary>
         /// <returns></returns>
-        public BaseRecoveryServicesJobResponse RefreshContainers(string resourceGroupName, string resourceName)
+        public BaseRecoveryServicesJobResponse RefreshContainers()
         {
+            string resourceName = BmsAdapter.GetResourceName();
+            string resourceGroupName = BmsAdapter.GetResourceName();
+            
             var response = BmsAdapter.Client.Container.RefreshAsync(
                 resourceGroupName, resourceName,
                 BmsAdapter.GetCustomRequestHeaders(), AzureFabricName, BmsAdapter.CmdletCancellationToken).Result;

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/ContainerAPIs.cs

@@ -21,6 +21,9 @@ public partial class HydraAdapter
     {
         public JobResponse GetJob(string resourceGroupName, string resourceName, string jobId)
         {
+            resourceName = BmsAdapter.GetResourceName();
+            resourceGroupName = BmsAdapter.GetResourceName();
+
             return BmsAdapter.Client.Job.GetAsync(
                 resourceGroupName, 
                 resourceName, 
@@ -41,6 +44,9 @@ public JobListResponse GetJobs(
             int? top = null,
             string skipToken = null)
         {
+            resourceName = BmsAdapter.GetResourceName();
+            resourceGroupName = BmsAdapter.GetResourceName();
+
             // build pagination request
             PaginationRequest pagReq = new PaginationRequest()
             {
@@ -74,6 +80,9 @@ public BaseRecoveryServicesJobResponse CancelJob(
             string resourceName, 
             string jobId)
         {
+            resourceName = BmsAdapter.GetResourceName();
+            resourceGroupName = BmsAdapter.GetResourceName();
+
             return BmsAdapter.Client.Job.CancelJobAsync(
                 resourceGroupName,
                 resourceName,
@@ -92,6 +101,9 @@ public BaseRecoveryServicesJobResponse ExportJobs(
             DateTime endTime,
             string backupManagementType)
         {
+            resourceName = BmsAdapter.GetResourceName();
+            resourceGroupName = BmsAdapter.GetResourceName();
+
             CommonJobQueryFilters filters = GetQueryObject(
                 backupManagementType,
                 startTime,

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/JobAPIs.cs

@@ -29,6 +29,9 @@ public ProtectionPolicyResponse CreateOrUpdateProtectionPolicy(
                 string policyName,
                 ProtectionPolicyRequest request)
         {
+            resourceName = BmsAdapter.GetResourceName();
+            resourceGroupName = BmsAdapter.GetResourceName();
+
             return BmsAdapter.Client.ProtectionPolicy.CreateOrUpdateAsync(
                                      resourceGroupName,
                                      resourceName, 
@@ -43,6 +46,9 @@ public ProtectionPolicyResponse GetProtectionPolicy(
                 string resourceName,
                 string policyName)
         {
+            resourceName = BmsAdapter.GetResourceName();
+            resourceGroupName = BmsAdapter.GetResourceName();
+
             return BmsAdapter.Client.ProtectionPolicy.GetAsync(
                                      resourceGroupName,
                                      resourceName,
@@ -56,6 +62,9 @@ public ProtectionPolicyListResponse ListProtectionPolicy(
                string resourceName,
                ProtectionPolicyQueryParameters queryFilter)
         {
+            resourceName = BmsAdapter.GetResourceName();
+            resourceGroupName = BmsAdapter.GetResourceName();
+
             return BmsAdapter.Client.ProtectionPolicy.ListAsync(
                                      resourceGroupName,
                                      resourceName,

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/PolicyAPIs.cs

@@ -24,12 +24,7 @@
 namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapter
 {
     public class ClientProxyBase
-    {
-        /// <summary>
-        /// Recovery Services Vault Credentials.
-        /// </summary>
-        protected static AzureRmRecoveryServicesVaultCreds recoveryServicesVaultCreds = new AzureRmRecoveryServicesVaultCreds();
-
+    {   
         protected object[] Parameters;
 
         /// <summary>
@@ -63,23 +58,14 @@ public string GetClientRequestId()
             return ClientRequestId;
         }
 
-        public AzureRmRecoveryServicesVaultCreds GetVaultCredentials()
+        public string GetResourceName()
         {
-            return recoveryServicesVaultCreds;
+            return PSRecoveryServicesClient.arsVaultCreds.Name;
         }
 
-        public static void UpdateCurrentVaultContext(AzureRmRecoveryServicesVaultCreds vaultCreds)
+        public string GetResourceGroupName()
         {
-            object updateVaultContextOneAtATime = new object();
-            lock (updateVaultContextOneAtATime)
-            {
-                recoveryServicesVaultCreds.ResourceName =
-                    vaultCreds.ResourceName;
-                recoveryServicesVaultCreds.ResourceGroupName =
-                    vaultCreds.ResourceGroupName;
-                recoveryServicesVaultCreds.Location =
-                    vaultCreds.Location;                
-            }
+            return PSRecoveryServicesClient.arsVaultCreds.ResouceGroupName;
         }
     }
 }

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/ClientProxyBase.cs

@@ -76,6 +76,10 @@
       <Project>{30b92759-50b3-494e-b9f0-ec9a2ce9d57b}</Project>
       <Name>Commands.RecoveryServices.Backup.Models</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\RecoveryServices\Commands.RecoveryServices\Commands.RecoveryServices.csproj">
+      <Project>{604260dc-b392-4cf4-81ec-34b14591e2d2}</Project>
+      <Name>Commands.RecoveryServices</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/Commands.RecoveryServices.Backup.HydraAdapter.csproj

@@ -26,38 +26,6 @@ public virtual void Validate()
         } 
     }
 
-    /// <summary>
-    /// Represents Recovery Services Vault Credentials Class
-    /// </summary>
-    public class AzureRmRecoveryServicesVaultCreds : AzureRmRecoveryServicesObjectBase
-    {
-        /// <summary>
-        /// Name of the recovery services vault
-        /// </summary>
-        public string ResourceName { get; set; }
-
-        /// <summary>
-        /// Name of the resource group
-        /// </summary>
-        public string ResourceGroupName { get; set; }
-
-        /// <summary>
-        /// Location of the recovery services vault
-        /// </summary>
-        public string Location { get; set; }
-
-        public AzureRmRecoveryServicesVaultCreds()
-        {           
-        }
-
-        public AzureRmRecoveryServicesVaultCreds(string resourceName, string resourceGroupName, string location)
-        {
-            ResourceName = resourceName;
-            ResourceGroupName = resourceGroupName;
-            Location = location;
-        }
-    }
-
     public class AzureRmRecoveryServicesContainerContext : AzureRmRecoveryServicesObjectBase
     {
         public ContainerType ContainerType { get; set; }