Code review fix - Changing specific exceptions to generic ones

Author: ramyapri

src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/BackupPolicy/GetAzureStorSimpleDeviceBackupPolicy.cs

@@ -20,7 +20,6 @@
 using System.Collections.Generic;
 using Microsoft.WindowsAzure.Commands.Utilities.CloudService;
 using Microsoft.WindowsAzure.Commands.StorSimple.Properties;
-using Microsoft.WindowsAzure.Commands.StorSimple.Exceptions;
 
 namespace Microsoft.WindowsAzure.Commands.StorSimple.Cmdlets
 {

src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/GetAzureStorSimpleResourceContext.cs

@@ -12,7 +12,6 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.WindowsAzure.Commands.StorSimple.Exceptions;
 using Microsoft.WindowsAzure.Commands.StorSimple.Properties;
 using System;
 using System.Management.Automation;
@@ -25,20 +24,11 @@ namespace Microsoft.WindowsAzure.Commands.StorSimple.Cmdlets
     [Cmdlet(VerbsCommon.Get, "AzureStorSimpleResourceContext"),OutputType(typeof(StorSimpleResourceContext))]
     public class GetAzureStorSimpleResourceContext : StorSimpleCmdletBase
     {
-        //suppress resource check for this commandlet
-        public GetAzureStorSimpleResourceContext() : base(false) { }
-
         public override void ExecuteCmdlet()
         {
             try
             {
                 var currentContext = StorSimpleClient.GetResourceContext();
-                if(currentContext == null)
-                {
-                    ResourceContextNotFoundException notFoundEx = new ResourceContextNotFoundException();
-                    throw notFoundEx;
-                }
-
                 this.WriteObject(currentContext);
                 this.WriteVerbose(string.Format(Resources.ResourceContextFound,currentContext.ResourceName, currentContext.ResourceId));
             }

src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/SelectAzureStorSimpleResource.cs

@@ -17,7 +17,6 @@
 using Microsoft.WindowsAzure.Commands.StorSimple.Encryption;
 using Microsoft.WindowsAzure.Commands.StorSimple.Properties;
 using System.Management.Automation;
-using Microsoft.WindowsAzure.Commands.StorSimple.Exceptions;
 
 namespace Microsoft.WindowsAzure.Commands.StorSimple.Cmdlets
 {
@@ -50,15 +49,15 @@ public override void ExecuteCmdlet()
                 if (resCred == null)
                 {
                     this.WriteVerbose(Resources.NotFoundMessageResource);
-                    throw new StorSimpleResourceNotFoundException();
+                    throw GetGenericException(Resources.NotFoundMessageResource, null);
                 }
 
                 StorSimpleClient.SetResourceContext(resCred);
                 var deviceInfos = StorSimpleClient.GetAllDevices();
                 if (!deviceInfos.Any())
                 {
                     StorSimpleClient.ResetResourceContext();
-                    throw new NoDeviceRegisteredException();
+                    throw base.GetGenericException(Resources.DeviceNotRegisteredMessage, null);
                 }
 
                 //now check for the key

src/ServiceManagement/StorSimple/Commands.StorSimple/Commands.StorSimple.csproj

@@ -142,12 +142,6 @@
     <Compile Include="Cmdlets\Volume\SetAzureStorSimpleDeviceVolume.cs" />
     <Compile Include="Encryption\EncryptionCmdLetHelper.cs" />
     <Compile Include="Encryption\StorSimpleKeyManager.cs" />
-    <Compile Include="Exceptions\DeviceNotYetConfiguredException.cs" />
-    <Compile Include="Exceptions\NoDeviceRegisteredException.cs" />
-    <Compile Include="Exceptions\RegistrationKeyException.cs" />
-    <Compile Include="Exceptions\StorSimpleSecretManagementException.cs" />
-    <Compile Include="Exceptions\ResourceContextNotFoundException.cs" />
-    <Compile Include="Exceptions\ResourceNotFoundException.cs" />
     <Compile Include="Library\CryptoHelper.cs" />
     <Compile Include="Library\IKeyManager.cs" />
     <Compile Include="Library\LocalKeyStoreManager.cs" />

src/ServiceManagement/StorSimple/Commands.StorSimple/Encryption/EncryptionCmdLetHelper.cs

@@ -14,7 +14,6 @@
 
 using System;
 using Microsoft.WindowsAzure.Commands.StorSimple.Cmdlets.Library;
-using Microsoft.WindowsAzure.Commands.StorSimple.Exceptions;
 using Microsoft.WindowsAzure.Commands.StorSimple.Properties;
 
 namespace Microsoft.WindowsAzure.Commands.StorSimple.Encryption
@@ -30,7 +29,7 @@ public static void PersistCIK(StorSimpleCmdletBase cmdlet, string resourceId, st
 
             if (string.IsNullOrEmpty(cik))
             {
-                throw new StorSimpleSecretManagementException(Resources.CIKInvalid, KeyStoreOperationStatus.PERSIST_EMPTY_KEY);
+                throw new Exception(Resources.CIKInvalid);
             }
 
             StorSimpleKeyManager mgr = cmdlet.StorSimpleClient.GetResourceContext().StorSimpleKeyManager;
@@ -45,8 +44,8 @@ public static void PersistCIK(StorSimpleCmdletBase cmdlet, string resourceId, st
 
             // other error codes are NOT expected - those validations have been done already
             if (status != KeyStoreOperationStatus.PERSIST_SUCCESS)
-            {   
-                throw new StorSimpleSecretManagementException(Resources.PersistSecretFailed, status);
+            {
+                throw new Exception(Resources.PersistSecretFailed);
             }
         }
 
@@ -61,25 +60,25 @@ public static string RetrieveCIK(StorSimpleCmdletBase cmdlet, string resourceId)
                 status == KeyStoreOperationStatus.RETRIEVE_FILESTREAM_INVALID)
             {
                 // CIK was persisted, but has been corrupted
-                throw new StorSimpleSecretManagementException(Resources.PersistedCIKCorrupted, status);
+                throw new Exception(Resources.PersistedCIKCorrupted);
             }
 
             if (status == KeyStoreOperationStatus.RETRIEVE_FILE_DOES_NOT_EXIST)
             {
                 // CIK was never persisted
-                throw new StorSimpleSecretManagementException(Resources.CIKNotPersisted, status);
+                throw new Exception(Resources.CIKNotPersisted);
             }
 
             // other error codes are NOT expected - those validations have been done already
             if (status != KeyStoreOperationStatus.RETRIEVE_SUCCESS)
             {
-                throw new StorSimpleSecretManagementException(Resources.CIKFetchFailed, status);
+                throw new Exception(Resources.CIKFetchFailed);
             }
 
             if (string.IsNullOrEmpty(cik))
             {
                 // CIK retrieved successfully, but is NULL :(
-                throw new StorSimpleSecretManagementException(Resources.PersistedCIKIsNull, KeyStoreOperationStatus.RETRIEVE_EMPTY_KEY);
+                throw new Exception(Resources.PersistedCIKIsNull);
             }
 
             return cik;
@@ -94,7 +93,7 @@ public static void ValidatePersistedCIK(StorSimpleCmdletBase cmdlet, string reso
 
             if (string.IsNullOrEmpty(rakPub))
             {
-                throw new StorSimpleSecretManagementException(Resources.PersistedCIKValidationFailed, KeyStoreOperationStatus.VALIDATE_FAILED);
+                throw new Exception(Resources.PersistedCIKValidationFailed);
             }
         }
     }

src/ServiceManagement/StorSimple/Commands.StorSimple/Exceptions/DeviceNotYetConfiguredException.cs

@@ -397,7 +397,7 @@
     <value>Could not retrieve secret. Please use Select-AzureStorSimpleResource and provide the Registration key once again.</value>
   </data>
   <data name="CIKInvalid" xml:space="preserve">
-    <value>Invalid arguments - CIK is NULL</value>
+    <value>Invalid value for Registration Key. CIK could not be retrieved from Registration Key. Please provide the value as such from the portal!</value>
   </data>
   <data name="CIKNotPersisted" xml:space="preserve">
     <value>Could not find the persisted secret. Please use Select-AzureStorSimpleResource and provide the Registration key once again.</value>

src/ServiceManagement/StorSimple/Commands.StorSimple/Exceptions/NoDeviceRegisteredException.cs

@@ -16,7 +16,6 @@
 using System.Linq;
 using System.Collections.Generic;
 using Microsoft.WindowsAzure.Commands.StorSimple.Encryption;
-using Microsoft.WindowsAzure.Commands.StorSimple.Exceptions;
 using Microsoft.WindowsAzure.Commands.StorSimple.Properties;
 using Microsoft.WindowsAzure.Management.Scheduler;
 
@@ -133,7 +132,7 @@ public string ParseCIKFromRegistrationKey(string registrationKey)
             }
             catch (Exception ex)
             {
-                throw new RegistrationKeyException(Resources.IncorrectFormatInRegistrationKey, ex);
+                throw new Exception(Resources.IncorrectFormatInRegistrationKey, ex);
             }
         }
     }