moving from Advanced Threat Protection to Advanced Data Security

Author: talhers

src/Sql/Sql.Test/ScenarioTests/AdvancedThreatProtectionManagedInstanceTests.cs renamed to src/Sql/Sql.Test/ScenarioTests/AdvancedDataSecurityManagedInstanceTests.cs

@@ -20,7 +20,7 @@
 
 namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
 {
-    public class AdvancedThreatProtectionManagedInstanceTests : SqlTestsBase
+    public class AdvancedDataSecurityManagedInstanceTests : SqlTestsBase
     {
         protected override void SetupManagementClients(RestTestFramework.MockContext context)
         {
@@ -30,15 +30,15 @@ protected override void SetupManagementClients(RestTestFramework.MockContext con
             Helper.SetupSomeOfManagementClients(sqlClient, networkClient, resourcesClient);
         }
 
-        public AdvancedThreatProtectionManagedInstanceTests(ITestOutputHelper output) : base(output)
+        public AdvancedDataSecurityManagedInstanceTests(ITestOutputHelper output) : base(output)
         {
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
-        public void AdvancedThreatProtectionPolicyTest()
+        public void AdvancedDataSecurityPolicyTest()
         {
-            RunPowerShellTest("Test-AdvancedThreatProtectionPolicyManagedInstanceTest");
+            RunPowerShellTest("Test-AdvancedDataSecurityPolicyManagedInstanceTest");
         }
     }
 }

src/Sql/Sql.Test/ScenarioTests/AdvancedThreatProtectionManagedInstanceTests.ps1 renamed to src/Sql/Sql.Test/ScenarioTests/AdvancedDataSecurityManagedInstanceTests.ps1

@@ -16,7 +16,7 @@
 .SYNOPSIS
 Tests the Advanced Threat Protection Policy cmdlets
 #>
-function Test-AdvancedThreatProtectionPolicyManagedInstanceTest
+function Test-AdvancedDataSecurityPolicyManagedInstanceTest
 {
 	# Setup
 	$testSuffix = getAssetName
@@ -26,25 +26,25 @@ function Test-AdvancedThreatProtectionPolicyManagedInstanceTest
 	try
 	{
 		# Get Advanced Threat Protection Policy
-		$policy = Get-AzSqlInstanceAdvancedThreatProtectionPolicy -ResourceGroupName $params.rgname -InstanceName $params.serverName 
+		$policy = Get-AzSqlInstanceAdvancedDataSecurityPolicy -ResourceGroupName $params.rgname -InstanceName $params.serverName 
 
 		# Validate the policy
 		Assert-AreEqual $params.rgname $policy.ResourceGroupName
 		Assert-AreEqual $params.serverName $policy.ManagedInstanceName
 		Assert-False { $policy.IsEnabled }
 
 		# Enabled Advanced Threat Protection Policy
-		Enable-AzSqlInstanceAdvancedThreatProtection -ResourceGroupName $params.rgname -InstanceName $params.serverName 
-		$policy = Get-AzSqlInstanceAdvancedThreatProtectionPolicy -ResourceGroupName $params.rgname -InstanceName $params.serverName 
+		Enable-AzSqlInstanceAdvancedDataSecurity -ResourceGroupName $params.rgname -InstanceName $params.serverName 
+		$policy = Get-AzSqlInstanceAdvancedDataSecurityPolicy -ResourceGroupName $params.rgname -InstanceName $params.serverName 
 
 		# Validate the policy
 		Assert-AreEqual $params.rgname $policy.ResourceGroupName
 		Assert-AreEqual $params.serverName $policy.ManagedInstanceName
 		Assert-True { $policy.IsEnabled }
 
 		# Disable Advanced Threat Protection Policy
-		Disable-AzSqlInstanceAdvancedThreatProtection -ResourceGroupName $params.rgname -InstanceName $params.serverName 
-		$policy = Get-AzSqlInstanceAdvancedThreatProtectionPolicy -ResourceGroupName $params.rgname -InstanceName $params.serverName 
+		Disable-AzSqlInstanceAdvancedDataSecurity -ResourceGroupName $params.rgname -InstanceName $params.serverName 
+		$policy = Get-AzSqlInstanceAdvancedDataSecurityPolicy -ResourceGroupName $params.rgname -InstanceName $params.serverName 
 
 		# Validate the policy
 		Assert-AreEqual $params.rgname $policy.ResourceGroupName

src/Sql/Sql.Test/ScenarioTests/VulnerabilityAssessmentMiTests.ps1

@@ -25,7 +25,7 @@ function Test-VulnerabilityAssessmentManagedInstanceWithAtpOffTest
 
 	try
 	{
-		$atpOffErrorMessage = "Managed Instance Advanced Threat Protection is not defined. Please run Enable-AzSqlInstanceAdvancedThreatProtection first."
+		$atpOffErrorMessage = "Managed Instance Advanced Threat Protection is not defined. Please run Enable-AzSqlInstanceAdvancedDataSecurity first."
 		$ruleId = "VA2031"
 		$scanId = "myCustomScanId"
 		$baselineResults = @(@("userA", "SELECT"),@("userB", "SELECT"))
@@ -89,7 +89,7 @@ function Test-VulnerabilityAssessmentManagedInstanceWithSettingsNotDefinedTest
 		$baselineResults = @(@("userA", "SELECT"),@("userB", "SELECT"))
 
 		# Turn on ATP
-		Enable-AzSqlInstanceAdvancedThreatProtection -ResourceGroupName $params.rgname -InstanceName $params.serverName
+		Enable-AzSqlInstanceAdvancedDataSecurity -ResourceGroupName $params.rgname -InstanceName $params.serverName
 
 		# Baseline related cmdlets
 		Assert-ThrowsContains -script { Set-AzSqlInstanceDatabaseVulnerabilityAssessmentRuleBaseline -ResourceGroupName $params.rgname -InstanceName $params.serverName `
@@ -135,7 +135,7 @@ function Test-VulnerabilityAssessmentManagedInstanceSettingsTest
 	try
 	{
 		# Turn on ATP
-		Enable-AzSqlInstanceAdvancedThreatProtection -ResourceGroupName $params.rgname -InstanceName $params.serverName
+		Enable-AzSqlInstanceAdvancedDataSecurity -ResourceGroupName $params.rgname -InstanceName $params.serverName
 
 		# Set Vulnerability Assessment settings (SetSettingsWithStorageAccountNameParameterSet parameter set) with a client errors
 		Assert-ThrowsContains -script { Update-AzSqlInstanceDatabaseVulnerabilityAssessmentSettings -ResourceGroupName $params.rgname -InstanceName $params.serverName -DatabaseName $params.databaseName `
@@ -296,7 +296,7 @@ function Test-VulnerabilityAssessmentManagedInstanceBaselineTest
 	try
 	{
 		# Turn on ATP
-		Enable-AzSqlInstanceAdvancedThreatProtection -ResourceGroupName $params.rgname -InstanceName $params.serverName
+		Enable-AzSqlInstanceAdvancedDataSecurity -ResourceGroupName $params.rgname -InstanceName $params.serverName
 
 		Update-AzSqlInstanceDatabaseVulnerabilityAssessmentSettings -ResourceGroupName $params.rgname -InstanceName $params.serverName -DatabaseName $params.databaseName `
 			 -StorageAccountName $params.storageAccount
@@ -445,7 +445,7 @@ function Test-VulnerabilityAssessmentManagedInstanceScanRecordGetListTest
 	try
 	{
 		# Turn on ATP
-		Enable-AzSqlInstanceAdvancedThreatProtection -ResourceGroupName $params.rgname -InstanceName $params.serverName
+		Enable-AzSqlInstanceAdvancedDataSecurity -ResourceGroupName $params.rgname -InstanceName $params.serverName
 
 		Update-AzSqlInstanceDatabaseVulnerabilityAssessmentSettings -ResourceGroupName $params.rgname -InstanceName $params.serverName -DatabaseName $params.databaseName `
 			 -StorageAccountName $params.storageAccount
@@ -581,7 +581,7 @@ function Test-VulnerabilityAssessmentManagedInstanceScanConvertTest
 	try
 	{
 		# Turn on ATP
-		Enable-AzSqlInstanceAdvancedThreatProtection -ResourceGroupName $params.rgname -InstanceName $params.serverName
+		Enable-AzSqlInstanceAdvancedDataSecurity -ResourceGroupName $params.rgname -InstanceName $params.serverName
 
 		Update-AzSqlInstanceDatabaseVulnerabilityAssessmentSettings -ResourceGroupName $params.rgname -InstanceName $params.serverName -DatabaseName $params.databaseName `
 			 -StorageAccountName $params.storageAccount

src/Sql/Sql.Test/SessionRecords/Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AdvancedThreatProtectionManagedInstanceTests/AdvancedThreatProtectionPolicyTest.json renamed to src/Sql/Sql.Test/SessionRecords/Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AdvancedDataSecurityManagedInstanceTests/AdvancedDataSecurityPolicyTest.json

@@ -26448,7 +26448,7 @@
     }
   ],
   "Names": {
-    "Test-AdvancedThreatProtectionPolicyManagedInstanceTest": [
+    "Test-AdvancedDataSecurityPolicyManagedInstanceTest": [
       "ps8718"
     ]
   },

src/Sql/Sql/AdvancedThreatProtection/Cmdlet/DisableAzureSqlManagedInstanceAdvancedThreatProtection.cs renamed to src/Sql/Sql/AdvancedThreatProtection/Cmdlet/DisableAzureSqlManagedInstanceAdvancedDataSecurity.cs

@@ -18,17 +18,17 @@
 namespace Microsoft.Azure.Commands.Sql.AdvancedThreatProtection.Cmdlet
 {
     /// <summary>
-    /// Disables the Advanced Threat Protection of a specific server.
+    /// Disables the Advanced Data Security of a specific server.
     /// </summary>
-    [Cmdlet("Disable", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "SqlInstanceAdvancedThreatProtection", SupportsShouldProcess = true), OutputType(typeof(ManagedInstanceAdvancedThreatProtectionPolicyModel))]
-    public class DisableAzureSqlManagedInstanceAdvancedThreatProtection : SqlManagedInstanceAdvancedThreatProtectionCmdletBase
+    [Cmdlet("Disable", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "SqlInstanceAdvancedDataSecurity", SupportsShouldProcess = true), OutputType(typeof(ManagedInstanceAdvancedDataSecurityPolicyModel))]
+    public class DisableAzureSqlManagedInstanceAdvancedDataSecurity : SqlManagedInstanceAdvancedDataSecurityCmdletBase
     {
         /// <summary>
         /// This method is responsible to call the right API in the communication layer that will eventually send the information in the 
         /// object to the REST endpoint
         /// </summary>
         /// <param name="model">The model object with the data to be sent to the REST endpoints</param>
-        protected override ManagedInstanceAdvancedThreatProtectionPolicyModel PersistChanges(ManagedInstanceAdvancedThreatProtectionPolicyModel model)
+        protected override ManagedInstanceAdvancedDataSecurityPolicyModel PersistChanges(ManagedInstanceAdvancedDataSecurityPolicyModel model)
         {
             model.IsEnabled = false;
             ModelAdapter.SetManagedInstanceAdvancedThreatProtection(model);

src/Sql/Sql/AdvancedThreatProtection/Cmdlet/EnableAzureSqlManagedInstanceAdvancedThreatProtection.cs renamed to src/Sql/Sql/AdvancedThreatProtection/Cmdlet/EnableAzureSqlManagedInstanceAdvancedDataSecurity.cs

@@ -18,17 +18,17 @@
 namespace Microsoft.Azure.Commands.Sql.AdvancedThreatProtection.Cmdlet
 {
     /// <summary>
-    /// Enables the Advanced Threat Protection of a specific server.
+    /// Enables the Advanced Data Security of a specific server.
     /// </summary>
-    [Cmdlet("Enable", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "SqlInstanceAdvancedThreatProtection", SupportsShouldProcess = true), OutputType(typeof(ManagedInstanceAdvancedThreatProtectionPolicyModel))]
-    public class EnableAzureSqlManagedInstanceAdvancedThreatProtection : SqlManagedInstanceAdvancedThreatProtectionCmdletBase
+    [Cmdlet("Enable", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "SqlInstanceAdvancedDataSecurity", SupportsShouldProcess = true), OutputType(typeof(ManagedInstanceAdvancedDataSecurityPolicyModel))]
+    public class EnableAzureSqlManagedInstanceAdvancedDataSecurity : SqlManagedInstanceAdvancedDataSecurityCmdletBase
     {
         /// <summary>
         /// This method is responsible to call the right API in the communication layer that will eventually send the information in the 
         /// object to the REST endpoint
         /// </summary>
         /// <param name="model">The model object with the data to be sent to the REST endpoints</param>
-        protected override ManagedInstanceAdvancedThreatProtectionPolicyModel PersistChanges(ManagedInstanceAdvancedThreatProtectionPolicyModel model)
+        protected override ManagedInstanceAdvancedDataSecurityPolicyModel PersistChanges(ManagedInstanceAdvancedDataSecurityPolicyModel model)
         {
             model.IsEnabled = true;
             ModelAdapter.SetManagedInstanceAdvancedThreatProtection(model);

src/Sql/Sql/AdvancedThreatProtection/Cmdlet/GetAzureSqlManagedInstanceAdvancedThreatProtectionPolicy.cs renamed to src/Sql/Sql/AdvancedThreatProtection/Cmdlet/GetAzureSqlManagedInstanceAdvancedDataSecurityPolicy.cs

@@ -18,26 +18,26 @@
 namespace Microsoft.Azure.Commands.Sql.AdvancedThreatProtection.Cmdlet
 {
     /// <summary>
-    /// Returns the Advanced Threat Protection policy of a specific server.
+    /// Returns the Advanced Data Security policy of a specific server.
     /// </summary>
-    [Cmdlet("Get", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "SqlInstanceAdvancedThreatProtectionPolicy"), OutputType(typeof(ManagedInstanceAdvancedThreatProtectionPolicyModel))]
-    public class GetAzureSqlManagedInstanceAdvancedThreatProtectionPolicy : SqlManagedInstanceAdvancedThreatProtectionCmdletBase
+    [Cmdlet("Get", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "SqlInstanceAdvancedDataSecurityPolicy"), OutputType(typeof(ManagedInstanceAdvancedDataSecurityPolicyModel))]
+    public class GetAzureSqlManagedInstanceAdvancedDataSecurityPolicy : SqlManagedInstanceAdvancedDataSecurityCmdletBase
     {
         /// <summary>
         /// Provides the model element that this cmdlet operates on
         /// </summary>
         /// <returns>A model object</returns>
-        protected override ManagedInstanceAdvancedThreatProtectionPolicyModel GetEntity()
+        protected override ManagedInstanceAdvancedDataSecurityPolicyModel GetEntity()
         {
-            ManagedInstanceAdvancedThreatProtectionPolicyModel model = base.GetEntity();
+            ManagedInstanceAdvancedDataSecurityPolicyModel model = base.GetEntity();
             return ModelAdapter.GetManagedInstanceAdvancedThreatProtectionPolicy(model.ResourceGroupName, model.ManagedInstanceName);
         }
 
         /// <summary>
         /// No sending is needed as this is a Get cmdlet
         /// </summary>
         /// <param name="model">The model object with the data to be sent to the REST endpoints</param>
-        protected override ManagedInstanceAdvancedThreatProtectionPolicyModel PersistChanges(ManagedInstanceAdvancedThreatProtectionPolicyModel model)
+        protected override ManagedInstanceAdvancedDataSecurityPolicyModel PersistChanges(ManagedInstanceAdvancedDataSecurityPolicyModel model)
         {
             return model;
         }

src/Sql/Sql/AdvancedThreatProtection/Cmdlet/SqlManagedInstanceAdvancedThreatProtectionCmdletBase.cs renamed to src/Sql/Sql/AdvancedThreatProtection/Cmdlet/SqlManagedInstanceAdvancedDataSecurityCmdletBase.cs

@@ -23,7 +23,7 @@
 
 namespace Microsoft.Azure.Commands.Sql.AdvancedThreatProtection.Cmdlet
 {
-    public class SqlManagedInstanceAdvancedThreatProtectionCmdletBase : AzureSqlCmdletBase<ManagedInstanceAdvancedThreatProtectionPolicyModel, SqlAdvancedThreatProtectionAdapter>
+    public class SqlManagedInstanceAdvancedDataSecurityCmdletBase : AzureSqlCmdletBase<ManagedInstanceAdvancedDataSecurityPolicyModel, SqlAdvancedThreatProtectionAdapter>
     {
         protected const string UseParentResourceParameterSet = "UseParentResourceParameterSet";
 
@@ -33,7 +33,7 @@ public class SqlManagedInstanceAdvancedThreatProtectionCmdletBase : AzureSqlCmdl
         [Parameter(ParameterSetName = UseParentResourceParameterSet,
             Mandatory = false,
             ValueFromPipeline = true,
-            HelpMessage = "The managed instance object to use with Advanced Threat Protection policy operation ")]
+            HelpMessage = "The managed instance object to use with Advanced Data Security policy operation ")]
         [ValidateNotNullOrEmpty]
         public AzureSqlManagedInstanceModel InputObject { get; set; }
 
@@ -51,7 +51,7 @@ public class SqlManagedInstanceAdvancedThreatProtectionCmdletBase : AzureSqlCmdl
         /// Provides the model element that this cmdlet operates on
         /// </summary>
         /// <returns>A model object</returns>
-        protected override ManagedInstanceAdvancedThreatProtectionPolicyModel GetEntity()
+        protected override ManagedInstanceAdvancedDataSecurityPolicyModel GetEntity()
         {
             string resourceGroupName = ResourceGroupName;
             string managedInstanceName = InstanceName;
@@ -62,7 +62,7 @@ protected override ManagedInstanceAdvancedThreatProtectionPolicyModel GetEntity(
                 managedInstanceName = InputObject.ManagedInstanceName;
             }
 
-            return new ManagedInstanceAdvancedThreatProtectionPolicyModel()
+            return new ManagedInstanceAdvancedDataSecurityPolicyModel()
             {
                 ResourceGroupName = resourceGroupName,
                 ManagedInstanceName = managedInstanceName

src/Sql/Sql/AdvancedThreatProtection/Model/ManagedInstanceAdvancedThreatProtectionPolicyModel.cs renamed to src/Sql/Sql/AdvancedThreatProtection/Model/ManagedInstanceAdvancedDataSecurityPolicyModel.cs

@@ -16,7 +16,7 @@
 
 namespace Microsoft.Azure.Commands.Sql.AdvancedThreatProtection.Model
 {
-    public class ManagedInstanceAdvancedThreatProtectionPolicyModel
+    public class ManagedInstanceAdvancedDataSecurityPolicyModel
     {
         /// <summary>
         /// Gets or sets the resource group
@@ -29,7 +29,7 @@ public class ManagedInstanceAdvancedThreatProtectionPolicyModel
         public string ManagedInstanceName { get; set; }
 
         /// <summary>
-        /// Gets or sets a value to indicate whether Advanced Threat Protection is enabled
+        /// Gets or sets a value to indicate whether Advanced Data Security is enabled
         /// </summary>
         [Ps1Xml(Label = "Enabled", Target = ViewControl.Table)]
         public bool IsEnabled { get; set; }

src/Sql/Sql/AdvancedThreatProtection/Services/SqlAdvancedThreatProtectionAdapter.cs

@@ -72,11 +72,11 @@ public ServerAdvancedThreatProtectionPolicyModel GetServerAdvancedThreatProtecti
         /// <summary>
         /// Provides a managed instance Advanced Threat Protection policy model for the given managed instance
         /// </summary>
-        public ManagedInstanceAdvancedThreatProtectionPolicyModel GetManagedInstanceAdvancedThreatProtectionPolicy(string resourceGroup, string managedInstanceName)
+        public ManagedInstanceAdvancedDataSecurityPolicyModel GetManagedInstanceAdvancedThreatProtectionPolicy(string resourceGroup, string managedInstanceName)
         {
             // Currently Advanced Threat Protection policy is a TD policy until the backend will support Advanced Threat Protection APIs
             var threatDetectionPolicy = SqlThreatDetectionAdapter.GetManagedInstanceThreatDetectionPolicy(resourceGroup, managedInstanceName);
-            var managedInstanceAdvancedThreatProtectionPolicyModel = new ManagedInstanceAdvancedThreatProtectionPolicyModel()
+            var managedInstanceAdvancedThreatProtectionPolicyModel = new ManagedInstanceAdvancedDataSecurityPolicyModel()
             {
                 ResourceGroupName = resourceGroup,
                 ManagedInstanceName = managedInstanceName,
@@ -104,7 +104,7 @@ public ServerAdvancedThreatProtectionPolicyModel SetServerAdvancedThreatProtecti
         /// <summary>
         /// Sets a managed instance Advanced Threat Protection policy model for the given managed instance
         /// </summary>
-        public ManagedInstanceAdvancedThreatProtectionPolicyModel SetManagedInstanceAdvancedThreatProtection(ManagedInstanceAdvancedThreatProtectionPolicyModel model)
+        public ManagedInstanceAdvancedDataSecurityPolicyModel SetManagedInstanceAdvancedThreatProtection(ManagedInstanceAdvancedDataSecurityPolicyModel model)
         {
             // Currently Advanced Threat Protection policy is a TD policy until the backend will support Advanced Threat Protection APIs
             var threatDetectionPolicy = SqlThreatDetectionAdapter.GetManagedInstanceThreatDetectionPolicy(model.ResourceGroupName, model.ManagedInstanceName);

src/Sql/Sql/Az.Sql.psd1

@@ -194,9 +194,9 @@ CmdletsToExport = 'Get-AzSqlDatabaseTransparentDataEncryption',
                'Convert-AzSqlInstanceDatabaseVulnerabilityAssessmentScan', 
                'Get-AzSqlInstanceDatabaseVulnerabilityAssessmentScanRecord', 
                'Start-AzSqlInstanceDatabaseVulnerabilityAssessmentScan',
-			   'Enable-AzSqlInstanceAdvancedThreatProtection', 
-               'Disable-AzSqlInstanceAdvancedThreatProtection', 
-               'Get-AzSqlInstanceAdvancedThreatProtectionPolicy'
+			   'Enable-AzSqlInstanceAdvancedDataSecurity', 
+               'Disable-AzSqlInstanceAdvancedDataSecurity', 
+               'Get-AzSqlInstanceAdvancedDataSecurityPolicy'
 
 # Variables to export from this module
 # VariablesToExport = @()

src/Sql/Sql/Properties/Resources.Designer.cs

@@ -442,7 +442,7 @@
     <value>Vulnerability assessment settings are not defined. Please run Update-AzSqlInstanceDatabaseVulnerabilityAssessmentSettings first.</value>
   </data>
   <data name="ManagedInstanceAdvancedThreatProtectionIsNotDefined" xml:space="preserve">
-    <value>Managed Instance Advanced Threat Protection is not defined. Please run Enable-AzSqlInstanceAdvancedThreatProtection first.</value>
+    <value>Managed Instance Advanced Threat Protection is not defined. Please run Enable-AzSqlInstanceAdvancedDataSecurityPolicy first.</value>
   </data>
   <data name="ScanIdManagedDatabaseParameterIsRequired" xml:space="preserve">
     <value>ScanId is a required parameter for this cmdlet. Please explicitly provide it or pass the Get-AzSqlInstanceDatabaseVulnerabilityAssessmentScanRecord output via pipe.</value>