Revert "Support inhering TD policy from server cmdlet"

This reverts commit 0740a8c.

Author: ayeletshpigelman

src/ResourceManager/Sql/Commands.Sql/Auditing/Model/DatabaseAuditingPolicyModel.cs

@@ -12,10 +12,13 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.Azure.Commands.Sql.Common;
-
 namespace Microsoft.Azure.Commands.Sql.Auditing.Model
 {
+    /// <summary>
+    /// The possible states in which the user server's policy property may be in
+    /// </summary>
+    public enum UseServerDefaultOptions { Enabled, Disabled }
+
     /// <summary>
     /// A class representing a database auditing policy
     /// </summary>
@@ -29,6 +32,6 @@ public class DatabaseAuditingPolicyModel : BaseTableAuditingPolicyModel
         /// <summary>
         /// Gets or sets the use server default property
         /// </summary>
-        public SecurityConstants.UseServerDefaultOptions UseServerDefault { get; set; }
+        public UseServerDefaultOptions UseServerDefault { get; set; }
     }
 }

src/ResourceManager/Sql/Commands.Sql/Auditing/Services/SqlAuditAdapter.cs

@@ -180,7 +180,7 @@ private DatabaseAuditingPolicyModel ModelizeDatabaseAuditPolicy(DatabaseAuditing
             var dbPolicyModel = new DatabaseAuditingPolicyModel();
             var properties = policy.Properties;
             dbPolicyModel.AuditState = ModelizeAuditState(properties.AuditingState);
-            dbPolicyModel.UseServerDefault = properties.UseServerDefault == SecurityConstants.AuditingEndpoint.Enabled ? SecurityConstants.UseServerDefaultOptions.Enabled : SecurityConstants.UseServerDefaultOptions.Disabled;
+            dbPolicyModel.UseServerDefault = properties.UseServerDefault == SecurityConstants.AuditingEndpoint.Enabled ? UseServerDefaultOptions.Enabled : UseServerDefaultOptions.Disabled;
             ModelizeStorageInfo(dbPolicyModel, properties.StorageAccountName, properties.StorageAccountKey, properties.StorageAccountSecondaryKey);
             ModelizeEventTypesInfo(dbPolicyModel, properties.EventTypesToAudit);
             ModelizeRetentionInfo(dbPolicyModel, properties.RetentionDays, properties.AuditLogsTableName, properties.FullAuditLogsTableName);
@@ -406,7 +406,7 @@ private DatabaseAuditingPolicyCreateOrUpdateParameters PolicizeDatabaseAuditingM
             var properties = new DatabaseAuditingPolicyProperties();
             updateParameters.Properties = properties;
             properties.AuditingState = model.AuditState.ToString();
-            properties.UseServerDefault = (model.UseServerDefault == SecurityConstants.UseServerDefaultOptions.Enabled) ? SecurityConstants.AuditingEndpoint.Enabled : SecurityConstants.AuditingEndpoint.Disabled;
+            properties.UseServerDefault = (model.UseServerDefault == UseServerDefaultOptions.Enabled) ? SecurityConstants.AuditingEndpoint.Enabled : SecurityConstants.AuditingEndpoint.Disabled;
             properties.StorageAccountName = ExtractStorageAccountName(model);
             properties.StorageAccountResourceGroupName = ExtractStorageAccountResourceGroup(properties.StorageAccountName);
             properties.StorageAccountSubscriptionId = ExtractStorageAccountSubscriptionId(properties.StorageAccountName);

src/ResourceManager/Sql/Commands.Sql/Commands.Sql.csproj

@@ -173,7 +173,6 @@
     <Compile Include="Auditing\Cmdlet\SqlDatabaseAuditingCmdletBase.cs" />
     <Compile Include="Auditing\Cmdlet\SqlDatabaseServerAuditingCmdletBase.cs" />
     <Compile Include="Auditing\Cmdlet\UseAzureSqlServerAuditingPolicy.cs" />
-    <Compile Include="ThreatDetection\Cmdlet\UseAzureSqlServerThreatDetection.cs" />
     <Compile Include="ThreatDetection\Model\BaseThreatDetectionPolicyModel.cs" />
     <Compile Include="ThreatDetection\Model\ServerThreatDetectionPolicyModel.cs" />
     <Compile Include="ThreatDetection\Model\DatabaseThreatDetectionPolicyModel .cs" />

src/ResourceManager/Sql/Commands.Sql/Common/SecurityConstants.cs

@@ -23,11 +23,6 @@ namespace Microsoft.Azure.Commands.Sql.Common
     /// </summary>
     public class SecurityConstants
     {
-        /// <summary>
-        /// The possible states in which the user server's policy property may be in
-        /// </summary>
-        public enum UseServerDefaultOptions { Enabled, Disabled }
-
         // Audit Events:
         public const string PlainSQL_Success = "PlainSQL_Success";
         public const string PlainSQL_Failure = "PlainSQL_Failure";

src/ResourceManager/Sql/Commands.Sql/ThreatDetection/Cmdlet/RemoveSqlDatabaseThreatDetection.cs

@@ -46,7 +46,6 @@ protected override DatabaseThreatDetectionPolicyModel ApplyUserInputToModel(
         {
             model = base.ApplyUserInputToModel(model);
             model.ThreatDetectionState = ThreatDetectionStateType.Disabled;
-            model.UseServerDefault = UseServerDefaultOptions.Disabled;
             return model;
         }
     }

src/ResourceManager/Sql/Commands.Sql/ThreatDetection/Cmdlet/SetAzureSqlDatabaseThreatDetection.cs

@@ -84,7 +84,6 @@ protected override DatabaseThreatDetectionPolicyModel ApplyUserInputToModel(Data
             base.ApplyUserInputToModel(model);
 
             model.ThreatDetectionState = ThreatDetectionStateType.Enabled;
-            model.UseServerDefault = UseServerDefaultOptions.Disabled;
 
             if (NotificationRecipientsEmails != null)
             {

src/ResourceManager/Sql/Commands.Sql/ThreatDetection/Cmdlet/UseAzureSqlServerThreatDetection.cs

@@ -12,12 +12,8 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.Azure.Commands.Sql.Common;
-
 namespace Microsoft.Azure.Commands.Sql.ThreatDetection.Model
 {
-
-
     /// <summary>
     /// A class representing a database threat detection policy
     /// </summary>
@@ -27,10 +23,5 @@ public class DatabaseThreatDetectionPolicyModel : BaseThreatDetectionPolicyModel
         /// Gets or sets the database name
         /// </summary>
         public string DatabaseName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the use server default property
-        /// </summary>
-        public SecurityConstants.UseServerDefaultOptions UseServerDefault { get; set; }
     }
 }

src/ResourceManager/Sql/Commands.Sql/ThreatDetection/Model/DatabaseThreatDetectionPolicyModel .cs

@@ -117,7 +117,6 @@ public ServerThreatDetectionPolicyModel GetServerThreatDetectionPolicy(string re
         private static BaseThreatDetectionPolicyModel ModelizeThreatDetectionPolicy(BaseSecurityAlertPolicyProperties threatDetectionProperties, BaseThreatDetectionPolicyModel model)
         {  
             model.ThreatDetectionState = ModelizeThreatDetectionState(threatDetectionProperties.State);
-            model.UseServerDefault = properties.UseServerDefault == SecurityConstants.AuditingEndpoint.Enabled ? SecurityConstants.UseServerDefaultOptions.Enabled : SecurityConstants.UseServerDefaultOptions.Disabled;
             model.NotificationRecipientsEmails = threatDetectionProperties.EmailAddresses;
             model.EmailAdmins = ModelizeThreatDetectionEmailAdmins(threatDetectionProperties.EmailAccountAdmins);
             ModelizeStorageAccount(model, threatDetectionProperties.StorageEndpoint);