Merge pull request #235 from MabOneSdk/pragrawa-dev1

Protection fixes

Author: pragrawa

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Utils.cs

@@ -53,23 +53,22 @@ public static List<string> GetStringListFromEnumList<T>(IList<T> enumList)
             Dictionary<CmdletModel.UriEnums, string> keyValuePairDict = new Dictionary<CmdletModel.UriEnums, string>();
             if (!string.IsNullOrEmpty(id))
             {
-                string pattern = @"/[a-zA-Z]*/[a-zA-Z0-9-;.]*";
-                Regex reg = new Regex(pattern, RegexOptions.IgnoreCase);
+                string idPattern = @"/[a-zA-Z]*/[a-zA-Z0-9-;.]*";
+                string uriPattern = @"/";                    
+                Regex reg = new Regex(idPattern, RegexOptions.IgnoreCase);
 
                 // Match the regular expression pattern against a uri string.
                 Match match = reg.Match(id);
 
                 while (match.Success)
                 {
-                    Console.WriteLine(match.Value);
-                    string pat = @"/";
-                    string[] keyValuePair = match.Value.Split(new string[] { pat }, StringSplitOptions.RemoveEmptyEntries);
+                    string[] keyValuePair = match.Value.Split(new string[] { uriPattern }, StringSplitOptions.RemoveEmptyEntries);
                     CmdletModel.UriEnums key;
                     CmdletModel.UriEnums value;
                     if (keyValuePair.Length == 2)
                     {
                         if (Enum.TryParse<CmdletModel.UriEnums>(keyValuePair[0], true, out key) &&
-                            Enum.TryParse<CmdletModel.UriEnums>(keyValuePair[1], true, out value))
+                            !Enum.TryParse<CmdletModel.UriEnums>(keyValuePair[1], true, out value))
                         {
                             keyValuePairDict.Add(key, keyValuePair[1]);
                         }

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

@@ -20,6 +20,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
+using Microsoft.Azure.Commands.RecoveryServices.Backup.Properties;
 
 namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapter
 {
@@ -60,16 +61,28 @@ public string GetClientRequestId()
 
         public string GetResourceName()
         {
+            if (string.IsNullOrEmpty(PSRecoveryServicesClient.arsVault.Name))
+            {
+                throw new ArgumentException(Resources.SetVaultContextFirst);
+            }
             return PSRecoveryServicesClient.arsVault.Name;
         }
 
         public string GetResourceGroupName()
         {
+            if (string.IsNullOrEmpty(PSRecoveryServicesClient.arsVault.ResouceGroupName))
+            {
+                throw new ArgumentException(Resources.SetVaultContextFirst);
+            }
             return PSRecoveryServicesClient.arsVault.ResouceGroupName;
         }
 
         public string GetResourceLocation()
         {
+            if (string.IsNullOrEmpty(PSRecoveryServicesClient.arsVault.Location))
+            {
+                throw new ArgumentException(Resources.SetVaultContextFirst);
+            }
             return PSRecoveryServicesClient.arsVault.Location;
         }
     }

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/Properties/Resources.Designer.cs

@@ -368,4 +368,10 @@ Please contact Microsoft for further assistant.</value>
   <data name="TriggerBackupOperation" xml:space="preserve">
     <value>Trigger Backup Operation</value>
   </data>
+  <data name="URIValueNotFound" xml:space="preserve">
+    <value>{0} Uri value not found in Id {1}</value>
+  </data>
+  <data name="SetVaultContextFirst" xml:space="preserve">
+    <value>Set vault context first using cmdlet Set-AzureRmRecoveryServicesVaultContext</value>
+  </data>
 </root>