Adding schema to data masking rule and refactoring

Author: yoavrubin

src/ResourceManager/Automation/Commands.Automation.Test/Commands.ResourceManagement.Automation.Test.csproj

@@ -6,7 +6,7 @@
     <ProductVersion>
     </ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6}</ProjectGuid>
+    <ProjectGuid>{59D1B5DC-9175-43EC-90C6-CBA601B3565F}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Azure.Commands.ResourceManager.Automation.Test</RootNamespace>

src/ResourceManager/Sql/Commands.Sql.Test/packages.config

@@ -7,7 +7,7 @@
   <package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Authorization" version="0.19.2-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Resources" version="2.18.1-preview" targetFramework="net45" />
-  <package id="Microsoft.Azure.Management.Sql" version="0.29.0-prerelease" targetFramework="net45" />
+  <package id="Microsoft.Azure.Management.Sql" version="0.31.0-prerelease" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Storage" version="2.4.0-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Test.Framework" version="1.0.5571.32271-prerelease" targetFramework="net45" />
   <package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5571.32271-prerelease" targetFramework="net45" />

src/ResourceManager/Sql/Commands.Sql/Security/Cmdlet/Auditing/GetAzureSqlDatabaseAuditingPolicy.cs renamed to src/ResourceManager/Sql/Commands.Sql/Auditing/Cmdlet/GetAzureSqlDatabaseAuditingPolicy.cs

@@ -12,10 +12,10 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.Azure.Commands.Sql.Security.Model;
+using Microsoft.Azure.Commands.Sql.Auditing.Model;
 using System.Management.Automation;
 
-namespace Microsoft.Azure.Commands.Sql.Security.Cmdlet.Auditing
+namespace Microsoft.Azure.Commands.Sql.Auditing.Cmdlet
 {
     /// <summary>
     /// Returns the auditing policy of a specific database.

src/ResourceManager/Sql/Commands.Sql/Security/Cmdlet/Auditing/GetAzureSqlServerAuditingPolicy.cs renamed to src/ResourceManager/Sql/Commands.Sql/Auditing/Cmdlet/GetAzureSqlServerAuditingPolicy.cs

@@ -12,10 +12,10 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.Azure.Commands.Sql.Security.Model;
+using Microsoft.Azure.Commands.Sql.Auditing.Model;
 using System.Management.Automation;
 
-namespace Microsoft.Azure.Commands.Sql.Security.Cmdlet.Auditing
+namespace Microsoft.Azure.Commands.Sql.Auditing.Cmdlet
 {
     /// <summary>
     /// Returns the auditing policy of a specific database server.

src/ResourceManager/Sql/Commands.Sql/Security/Cmdlet/Auditing/RemoveSqlDatabaseAuditing.cs renamed to src/ResourceManager/Sql/Commands.Sql/Auditing/Cmdlet/RemoveSqlDatabaseAuditing.cs

@@ -12,10 +12,10 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.Azure.Commands.Sql.Security.Model;
+using Microsoft.Azure.Commands.Sql.Auditing.Model;
 using System.Management.Automation;
 
-namespace Microsoft.Azure.Commands.Sql.Security.Cmdlet.Auditing
+namespace Microsoft.Azure.Commands.Sql.Auditing.Cmdlet
 {
     /// <summary>
     /// Disables auditing on a specific database.

src/ResourceManager/Sql/Commands.Sql/Security/Cmdlet/Auditing/RemoveSqlServerAuditing.cs renamed to src/ResourceManager/Sql/Commands.Sql/Auditing/Cmdlet/RemoveSqlServerAuditing.cs

@@ -12,10 +12,10 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.Azure.Commands.Sql.Security.Model;
+using Microsoft.Azure.Commands.Sql.Auditing.Model;
 using System.Management.Automation;
 
-namespace Microsoft.Azure.Commands.Sql.Security.Cmdlet.Auditing
+namespace Microsoft.Azure.Commands.Sql.Auditing.Cmdlet
 {
     /// <summary>
     /// Disables auditing on a specific database server.

src/ResourceManager/Sql/Commands.Sql/Security/Cmdlet/Auditing/SetAzureSqlDatabaseAuditingPolicy.cs renamed to src/ResourceManager/Sql/Commands.Sql/Auditing/Cmdlet/SetAzureSqlDatabaseAuditingPolicy.cs

@@ -13,15 +13,16 @@
 // ----------------------------------------------------------------------------------
 
 using Microsoft.Azure.Commands.Sql.Properties;
-using Microsoft.Azure.Commands.Sql.Security.Model;
-using Microsoft.Azure.Commands.Sql.Security.Services;
+using Microsoft.Azure.Commands.Sql.Auditing.Model;
+using Microsoft.Azure.Commands.Sql.Auditing.Services;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Management.Automation;
 using Microsoft.Azure.Commands.Sql.Services;
+using Microsoft.Azure.Commands.Sql.Common;
 
-namespace Microsoft.Azure.Commands.Sql.Security.Cmdlet.Auditing
+namespace Microsoft.Azure.Commands.Sql.Auditing.Cmdlet
 {
     /// <summary>
     /// Sets the auditing policy properties for a specific database.

src/ResourceManager/Sql/Commands.Sql/Security/Cmdlet/Auditing/SetAzureSqlServerAuditingPolicy.cs renamed to src/ResourceManager/Sql/Commands.Sql/Auditing/Cmdlet/SetAzureSqlServerAuditingPolicy.cs

@@ -13,15 +13,16 @@
 // ----------------------------------------------------------------------------------
 
 using Microsoft.Azure.Commands.Sql.Properties;
-using Microsoft.Azure.Commands.Sql.Security.Model;
-using Microsoft.Azure.Commands.Sql.Security.Services;
+using Microsoft.Azure.Commands.Sql.Auditing.Model;
+using Microsoft.Azure.Commands.Sql.Auditing.Services;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Management.Automation;
 using Microsoft.Azure.Commands.Sql.Services;
+using Microsoft.Azure.Commands.Sql.Common;
 
-namespace Microsoft.Azure.Commands.Sql.Security.Cmdlet.Auditing
+namespace Microsoft.Azure.Commands.Sql.Auditing.Cmdlet
 {
     /// <summary>
     /// Sets the auditing policy properties for a specific database server.

src/ResourceManager/Sql/Commands.Sql/Security/Cmdlet/Auditing/SqlDatabaseAuditingCmdletBase.cs renamed to src/ResourceManager/Sql/Commands.Sql/Auditing/Cmdlet/SqlDatabaseAuditingCmdletBase.cs

@@ -13,11 +13,11 @@
 // ----------------------------------------------------------------------------------
 
 using Microsoft.Azure.Commands.Sql.Common;
-using Microsoft.Azure.Commands.Sql.Security.Model;
-using Microsoft.Azure.Commands.Sql.Security.Services;
+using Microsoft.Azure.Commands.Sql.Auditing.Model;
+using Microsoft.Azure.Commands.Sql.Auditing.Services;
 using Microsoft.Azure.Common.Authentication.Models;
 
-namespace Microsoft.Azure.Commands.Sql.Security.Cmdlet.Auditing
+namespace Microsoft.Azure.Commands.Sql.Auditing.Cmdlet
 {
     /// <summary>
     /// The base class for all Azure Sql Database security Management Cmdlets

src/ResourceManager/Sql/Commands.Sql/Security/Cmdlet/Auditing/SqlDatabaseServerAuditingCmdletBase.cs renamed to src/ResourceManager/Sql/Commands.Sql/Auditing/Cmdlet/SqlDatabaseServerAuditingCmdletBase.cs

@@ -14,11 +14,11 @@
 
 using System.Management.Automation;
 using Microsoft.Azure.Commands.Sql.Common;
-using Microsoft.Azure.Commands.Sql.Security.Model;
-using Microsoft.Azure.Commands.Sql.Security.Services;
+using Microsoft.Azure.Commands.Sql.Auditing.Model;
+using Microsoft.Azure.Commands.Sql.Auditing.Services;
 using Microsoft.Azure.Common.Authentication.Models;
 
-namespace Microsoft.Azure.Commands.Sql.Security.Cmdlet.Auditing
+namespace Microsoft.Azure.Commands.Sql.Auditing.Cmdlet
 {
     /// <summary>
     /// The base class for all SQL server auditing Management Cmdlets

src/ResourceManager/Sql/Commands.Sql/Security/Cmdlet/Auditing/UseAzureSqlServerAuditingPolicy.cs renamed to src/ResourceManager/Sql/Commands.Sql/Auditing/Cmdlet/UseAzureSqlServerAuditingPolicy.cs

@@ -13,11 +13,11 @@
 // ----------------------------------------------------------------------------------
 
 using Microsoft.Azure.Commands.Sql.Properties;
-using Microsoft.Azure.Commands.Sql.Security.Model;
+using Microsoft.Azure.Commands.Sql.Auditing.Model;
 using System;
 using System.Management.Automation;
 
-namespace Microsoft.Azure.Commands.Sql.Security.Cmdlet.Auditing
+namespace Microsoft.Azure.Commands.Sql.Auditing.Cmdlet
 {
     /// <summary>
     /// Marks the given database as using its server's default policy instead of its own policy.

src/ResourceManager/Sql/Commands.Sql/Security/Model/BaseAuditingPolicyModel.cs renamed to src/ResourceManager/Sql/Commands.Sql/Auditing/Model/BaseAuditingPolicyModel.cs

@@ -12,7 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-namespace Microsoft.Azure.Commands.Sql.Security.Model
+namespace Microsoft.Azure.Commands.Sql.Auditing.Model
 {
     /// <summary>
     /// types of storage keys
@@ -22,7 +22,7 @@ public enum StorageKeyKind { Primary, Secondary };
     /// <summary>
     /// The possible audit event types
     /// </summary> 
-    public enum AuditEventType { DataAccess, DataChanges, RevokePermissions, SchemaChanges, SecurityExceptions, PlainSQL_Success, PlainSQL_Failure, ParameterizedSQL_Success, ParameterizedSQL_Failure, StoredProcedure_Success, StoredProcedure_Failure, Login_Success, Login_Failure, TransactionManagement_Success, TransactionManagement_Failure };
+    public enum AuditEventType { PlainSQL_Success, PlainSQL_Failure, ParameterizedSQL_Success, ParameterizedSQL_Failure, StoredProcedure_Success, StoredProcedure_Failure, Login_Success, Login_Failure, TransactionManagement_Success, TransactionManagement_Failure };
 
     /// <summary>
     /// The possible states in which an auditing policy may be in

src/ResourceManager/Sql/Commands.Sql/Security/Model/DatabaseAuditingPolicyModel.cs renamed to src/ResourceManager/Sql/Commands.Sql/Auditing/Model/DatabaseAuditingPolicyModel.cs

@@ -12,7 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-namespace Microsoft.Azure.Commands.Sql.Security.Model
+namespace Microsoft.Azure.Commands.Sql.Auditing.Model
 {
     /// <summary>
     /// The possible states in which the user server's policy property may be in

src/ResourceManager/Sql/Commands.Sql/Security/Model/ServerAuditingPolicyModel.cs renamed to src/ResourceManager/Sql/Commands.Sql/Auditing/Model/ServerAuditingPolicyModel.cs

@@ -12,7 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-namespace Microsoft.Azure.Commands.Sql.Security.Model
+namespace Microsoft.Azure.Commands.Sql.Auditing.Model
 { 
     /// <summary>
     /// A class representing A server's auditing policy

src/ResourceManager/Sql/Commands.Sql/Security/Services/AuditingEndpointsCommunicator.cs renamed to src/ResourceManager/Sql/Commands.Sql/Auditing/Services/AuditingEndpointsCommunicator.cs

@@ -19,7 +19,7 @@
 using System;
 using Microsoft.Azure.Commands.Sql.Common;
 
-namespace Microsoft.Azure.Commands.Sql.Security.Services
+namespace Microsoft.Azure.Commands.Sql.Auditing.Services
 {
     /// <summary>
     /// This class is responsible for all the REST communication with the audit REST endpoints

src/ResourceManager/Sql/Commands.Sql/Security/Services/SqlAuditAdapter.cs renamed to src/ResourceManager/Sql/Commands.Sql/Auditing/Services/SqlAuditAdapter.cs

@@ -13,7 +13,7 @@
 // ----------------------------------------------------------------------------------
 
 using Microsoft.Azure.Commands.Sql.Properties;
-using Microsoft.Azure.Commands.Sql.Security.Model;
+using Microsoft.Azure.Commands.Sql.Auditing.Model;
 using Microsoft.Azure.Common.Authentication.Models;
 using Microsoft.Azure.Management.Sql.Models;
 using System;
@@ -24,7 +24,7 @@
 using Microsoft.Azure.Commands.Sql.Database.Services;
 using Microsoft.Azure.Commands.Sql.Database.Model;
 
-namespace Microsoft.Azure.Commands.Sql.Security.Services
+namespace Microsoft.Azure.Commands.Sql.Auditing.Services
 {
     /// <summary>
     /// The SqlAuditClient class is responsible for transforming the data that was received form the endpoints to the cmdlets model of auditing policy and vice versa