Addressed PR comments

Author: nivimsft

src/Sql/Sql/TransparentDataEncryption/Model/ManagedInstanceKeyHelper.cs renamed to src/Sql/Sql/Common/TdeKeyHelper.cs

@@ -12,19 +12,20 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Microsoft.Azure.Commands.Sql.TransparentDataEncryption.Model;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
-namespace Microsoft.Azure.Commands.Sql.TransparentDataEncryption.Model
+namespace Microsoft.Azure.Commands.Sql.Common
 {
     /// <summary>
     /// Helper class for Managed instance key
     /// </summary>
-    class ManagedInstanceKeyHelper
+    class TdeKeyHelper
     {
         /// <summary>
         /// Creates the SQL Server Key Name from an Azure Key Vault KeyId

src/Sql/Sql/ServerKeyVaultKey/Cmdlet/AddAzureSqlServerKeyVaultKey.cs

@@ -15,6 +15,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Management.Automation;
+using Microsoft.Azure.Commands.Sql.Common;
 using Microsoft.Azure.Commands.Sql.ServerKeyVaultKey.Model;
 using Microsoft.Azure.Commands.Sql.ServerKeyVaultKey.Services;
 
@@ -65,7 +66,7 @@ protected override IEnumerable<AzureSqlServerKeyVaultKeyModel> ApplyUserInputToM
             {
                 ResourceGroupName = this.ResourceGroupName,
                 ServerName = this.ServerName,
-                ServerKeyName = AzureSqlServerKeyVaultKeyModel.CreateServerKeyNameFromKeyId(this.KeyId),
+                ServerKeyName = TdeKeyHelper.CreateServerKeyNameFromKeyId(this.KeyId),
                 Uri = this.KeyId,
                 Type = AzureSqlServerKeyVaultKeyModel.ServerKeyType.AzureKeyVault
             });

src/Sql/Sql/ServerKeyVaultKey/Model/AzureSqlServerKeyVaultKeyModel.cs

@@ -61,39 +61,5 @@ public enum ServerKeyType { AzureKeyVault, ServiceManaged };
         /// Gets or sets the creation date of the server key
         /// </summary>
         public DateTime? CreationDate { get; set; }
-
-        /// <summary>
-        /// Creates the SQL Server Key Name from an Azure Key Vault KeyId
-        /// Throws an exception if the provided KeyId is malformed.
-        /// An example of a well formed Azure Key Vault KeyId is: https://YourVaultName.vault.azure.net/keys/YourKeyName/01234567890123456789012345678901
-        /// </summary>
-        /// <param name="keyId">The full Azure Key Vault KeyId</param>
-        /// <returns>The Server Key Name for the provided KeyId</returns>
-        public static string CreateServerKeyNameFromKeyId(string keyId)
-        {
-            if (string.IsNullOrEmpty(keyId))
-            {
-                return ServerKeyType.ServiceManaged.ToString();
-            }
-
-            // Validate that the url is a keyvault url and has a key and version
-            Regex r = new Regex(@"https(.)+\.vault(.)+\/keys\/[^\/]+\/[0-9a-zA-Z]+$", RegexOptions.IgnoreCase);
-            if (!r.IsMatch(keyId))
-            {
-                // Throw an error here, since we don't want to use a non keyvault url
-                //
-                throw new ArgumentException(String.Format("Invalid parameter format for keyId: {0}."
-                + " It should be a well formed Azure Key Vault KeyId like: https://YourVaultName.vault.azure.net/keys/YourKeyName/01234567890123456789012345678901", keyId)
-                , "KeyId");
-            }
-
-            var uri = new Uri(keyId);
-
-            string vault = uri.Host.Split('.').First();
-            string key = uri.Segments[2].TrimEnd('/');
-            string version = uri.Segments.Last();
-
-            return String.Format("{0}_{1}_{2}", vault, key, version);
-        }
     }
 }

src/Sql/Sql/ServerKeyVaultKey/Services/AzureSqlServerKeyVaultKeyAdapter.cs

@@ -14,6 +14,7 @@
 
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
 using Microsoft.Azure.Commands.Common.Authentication.Models;
+using Microsoft.Azure.Commands.Sql.Common;
 using Microsoft.Azure.Commands.Sql.ServerKeyVaultKey.Model;
 using Microsoft.Azure.Commands.Sql.Services;
 using Microsoft.Azure.Management.Sql.LegacySdk.Models;
@@ -57,7 +58,7 @@ public AzureSqlServerKeyVaultKeyAdapter(IAzureContext context)
         /// <returns>The Server Key Vault Key</returns>
         public AzureSqlServerKeyVaultKeyModel Get(string resourceGroupName, string serverName, string keyId)
         {
-            string keyName = AzureSqlServerKeyVaultKeyModel.CreateServerKeyNameFromKeyId(keyId);
+            string keyName = TdeKeyHelper.CreateServerKeyNameFromKeyId(keyId);
             var resp = Communicator.Get(resourceGroupName, serverName, keyName);
             return CreateServerKeyModelFromResponse(resourceGroupName, serverName, keyName, resp);
         }
@@ -104,7 +105,7 @@ public AzureSqlServerKeyVaultKeyModel CreateOrUpdate(AzureSqlServerKeyVaultKeyMo
         /// <param name="keyId">KeyId of the Server Key Vault Key</param>
         public void Delete(string resourceGroupName, string serverName, string keyId)
         {
-            string keyName = AzureSqlServerKeyVaultKeyModel.CreateServerKeyNameFromKeyId(keyId);
+            string keyName = TdeKeyHelper.CreateServerKeyNameFromKeyId(keyId);
             Communicator.Delete(resourceGroupName, serverName, keyName);
         }
 

src/Sql/Sql/TransparentDataEncryption/Cmdlet/SetAzureSqlServerTransparentDataEncryptionProtector.cs

@@ -12,6 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Microsoft.Azure.Commands.Sql.Common;
 using Microsoft.Azure.Commands.Sql.ServerKeyVaultKey.Model;
 using Microsoft.Azure.Commands.Sql.TransparentDataEncryption.Model;
 using System.Collections.Generic;
@@ -82,7 +83,7 @@ public class SetAzureSqlServerTransparentDataEncryptionProtector : AzureSqlServe
                 ResourceGroupName = this.ResourceGroupName,
                 ServerName = this.ServerName,
                 Type = this.Type,
-                ServerKeyVaultKeyName = AzureSqlServerKeyVaultKeyModel.CreateServerKeyNameFromKeyId(this.KeyId),
+                ServerKeyVaultKeyName = TdeKeyHelper.CreateServerKeyNameFromKeyId(this.KeyId),
                 KeyId = this.KeyId
             });
             return newEntity;

src/Sql/Sql/TransparentDataEncryption/Model/AzureRmSqlManagedInstanceKeyVaultKeyModel.cs

@@ -15,6 +15,7 @@
 using System;
 using System.Linq;
 using System.Text.RegularExpressions;
+using Microsoft.Azure.Commands.Sql.Common;
 using Microsoft.Azure.Management.Sql.Models;
 
 namespace Microsoft.Azure.Commands.Sql.TransparentDataEncryption.Model
@@ -29,7 +30,7 @@ public AzureRmSqlManagedInstanceKeyVaultKeyModel(string resourceGroupName, strin
             ResourceGroupName = resourceGroupName;
             ManagedInstanceName = managedInstanceName;
             KeyId = keyId;
-            ManagedInstanceKeyName = ManagedInstanceKeyHelper.CreateServerKeyNameFromKeyId(keyId);
+            ManagedInstanceKeyName = TdeKeyHelper.CreateServerKeyNameFromKeyId(keyId);
         }
 
         private AzureRmSqlManagedInstanceKeyVaultKeyModel() { }

src/Sql/Sql/TransparentDataEncryption/Services/AzureSqlDatabaseTransparentDataEncryptionArmAdapter.cs

@@ -26,6 +26,7 @@
 using Microsoft.Rest.Azure;
 using Microsoft.WindowsAzure.Commands.Common;
 using ServerKeyType = Microsoft.Azure.Management.Sql.Models.ServerKeyType;
+using Microsoft.Azure.Commands.Sql.Common;
 
 namespace Microsoft.Azure.Commands.Sql.TransparentDataEncryption.Adapter
 {
@@ -156,7 +157,7 @@ public AzureRmSqlManagedInstanceTransparentDataEncryptionProtectorModel CreateOr
                 managedInstanceEncryptionProtector: new ManagedInstanceEncryptionProtector()
                 {
                     ServerKeyType = model.Type.ToString(),
-                    ServerKeyName = ManagedInstanceKeyHelper.CreateServerKeyNameFromKeyId(model.KeyId)
+                    ServerKeyName = TdeKeyHelper.CreateServerKeyNameFromKeyId(model.KeyId)
                 });
 
             return AzureRmSqlManagedInstanceTransparentDataEncryptionProtectorModel