Taking offline pr comments

Author: NehaRaje

src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/PSRecoveryServicesClient/PSRecoveryServicesClientHelper.cs

@@ -146,6 +146,8 @@ public void ValidateStorageAccountAssociation(
             catch (Exception)
             {
                 validationSuccessful = false;
+                locationValid = false;
+                return;
             }
 
             foreach (var storage in azureStorageListResponse.StorageAccounts)
@@ -164,20 +166,26 @@ public void ValidateStorageAccountAssociation(
             if (!associatedAccount)
             {
                 validationSuccessful = false;
+                locationValid = false;
+                return;
             }
 
             // Validate that the Geo Location of the storage account is the same as that of the vault.
             if (string.IsNullOrEmpty(currentStorageAccount.Properties.Location))
             {
                 validationSuccessful = false;
+                locationValid = false;
+                return;
             }
 
             if (0 != string.Compare(
                 currentStorageAccount.Properties.Location,
                 vaultLocation,
                 StringComparison.OrdinalIgnoreCase))
             {
+                validationSuccessful = true;
                 locationValid = true;
+                return;
             }
 
             validationSuccessful = true;

src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Properties/Resources.Designer.cs

@@ -253,7 +253,4 @@ Please provide a storage account with the same location as that of the vault.</v
   <data name="StorageAccountValidationUnsuccessful" xml:space="preserve">
     <value>The Subscription or Storage account couldn’t be validated. For failovers to be successful, the Subscription should belong to your account, the Storage account to the Subscription and Storage account location must be the same as location of your Vault.</value>
   </data>
-  <data name="LocationInvalidWarning" xml:space="preserve">
-    <value>The Location couldn’t be validated. For failovers to be successful, Storage account location must be the same as location of your Vault.</value>
-  </data>
 </root>

src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Properties/Resources.resx

@@ -216,20 +216,18 @@ private void EnterpriseToAzureProtectionProfileObject()
                 out validationSuccessful,
                 out locationValid);
 
+            if (!validationSuccessful)
+            {
+                this.WriteWarning(string.Format(Properties.Resources.StorageAccountValidationUnsuccessful));
+            }
+
             if (!locationValid)
             {
                 this.WriteWarning(string.Format(Properties.Resources.StorageIsNotInTheSameLocationAsVault));
-                this.ConfirmAction(
-                    this.Force.IsPresent,
-                    string.Format(Properties.Resources.LocationInvalidWarning, this.targetName),
-                    string.Format(Properties.Resources.NewProtectionProfileObjectWhatIfMessage),
-                    this.targetName,
-                    new Action(this.ProceedToCreateProtectionProfileObject));
             }
-            else if (!validationSuccessful)
-            {
-                this.WriteWarning(string.Format(Properties.Resources.StorageAccountValidationUnsuccessful));
 
+            if (!validationSuccessful || !locationValid)
+            {
                 this.ConfirmAction(
                     this.Force.IsPresent,
                     string.Format(Properties.Resources.ValidationUnsuccessfulWarning, this.targetName),