Merge pull request Azure#11204 from Azure/DenyPublicAccess

Add PublicNetworkAccess to New-AzSqlServer and Set-AzSqlServer

Author: wyunchi-ms

src/Network/Network/Network.csproj

@@ -14,7 +14,7 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="6.2.2" />
     <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.18.0-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.Sql" Version="1.37.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Sql" Version="1.38.0-preview" />
   </ItemGroup>
 
   <ItemGroup>

src/Sql/Sql.Test/ScenarioTests/AdvancedDataSecurityTests.cs

@@ -32,6 +32,9 @@ protected override void SetupManagementClients(RestTestFramework.MockContext con
 
         public AdvancedDataSecurityTests(ITestOutputHelper output) : base(output)
         {
+            base.resourceTypesToIgnoreApiVersion = new string[] {
+                "Microsoft.Sql/servers"
+            };
         }
 
         [Fact]

src/Sql/Sql.Test/ScenarioTests/AdvisorTests.cs

@@ -23,6 +23,9 @@ public class AdvisorTests : SqlTestsBase
     {
         public AdvisorTests(ITestOutputHelper output) : base(output)
         {
+            base.resourceTypesToIgnoreApiVersion = new string[] {
+                "Microsoft.Sql/servers"
+            };
         }
 
         #region Server Advisor Tests

src/Sql/Sql.Test/ScenarioTests/AuditTests.cs

@@ -38,6 +38,9 @@ protected override void SetupManagementClients(RestTestFramework.MockContext con
 
         public AuditTests(ITestOutputHelper output) : base(output)
         {
+            base.resourceTypesToIgnoreApiVersion = new string[] {
+                "Microsoft.Sql/servers"
+            };
         }
 
         [Fact]

src/Sql/Sql.Test/ScenarioTests/DataClassificationTests.cs

@@ -24,7 +24,8 @@ public class DataClassificationTests : SqlTestsBase
         public DataClassificationTests(ITestOutputHelper output) : base(output)
         {
             base.resourceTypesToIgnoreApiVersion = new string[] {
-                "Microsoft.Sql/managedInstances"
+                "Microsoft.Sql/managedInstances",
+                "Microsoft.Sql/servers"
             };
         }
 

src/Sql/Sql.Test/ScenarioTests/DataMaskingTests.cs

@@ -31,6 +31,9 @@ protected override void SetupManagementClients(RestTestFramework.MockContext con
 
         public DataMaskingTests(ITestOutputHelper output) : base(output)
         {
+            base.resourceTypesToIgnoreApiVersion = new string[] {
+                "Microsoft.Sql/servers"
+            };
         }
 
         [Fact]

src/Sql/Sql.Test/ScenarioTests/DataSyncTests.cs

@@ -25,6 +25,10 @@ public class DataSyncTests : SqlTestsBase
         public DataSyncTests(ITestOutputHelper output) : base(output)
         {
             XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
+
+            base.resourceTypesToIgnoreApiVersion = new string[] {
+                "Microsoft.Sql/servers"
+            };
         }
 
         [Fact]

src/Sql/Sql.Test/ScenarioTests/DatabaseActivationTests.cs

@@ -23,6 +23,9 @@ public class DatabaseActivationTests : SqlTestsBase
     {
         public DatabaseActivationTests(ITestOutputHelper output) : base(output)
         {
+            base.resourceTypesToIgnoreApiVersion = new string[] {
+                "Microsoft.Sql/servers"
+            };
         }
 
         [Fact]

src/Sql/Sql.Test/ScenarioTests/DatabaseBackupStretchTests.cs

@@ -24,6 +24,9 @@ public class DatabaseBackupStretchTests : SqlTestsBase
     {
         public DatabaseBackupStretchTests(ITestOutputHelper output) : base(output)
         {
+            base.resourceTypesToIgnoreApiVersion = new string[] {
+                "Microsoft.Sql/servers"
+            };
         }
 
         [Fact]

src/Sql/Sql.Test/ScenarioTests/DatabaseBackupTests.cs

@@ -24,6 +24,9 @@ public class DatabaseBackupTests : SqlTestsBase
     {
         public DatabaseBackupTests(ITestOutputHelper output) : base(output)
         {
+            base.resourceTypesToIgnoreApiVersion = new string[] {
+                "Microsoft.Sql/servers"
+            };
         }
 
         [Fact]

src/Sql/Sql.Test/ScenarioTests/DatabaseCrudStretchTests.cs

@@ -24,6 +24,9 @@ public class DatabaseCrudStretchTests : SqlTestsBase
     {
         public DatabaseCrudStretchTests(ITestOutputHelper output) : base(output)
         {
+            base.resourceTypesToIgnoreApiVersion = new string[] {
+                "Microsoft.Sql/servers"
+            };
         }
 
         [Fact]

src/Sql/Sql.Test/ScenarioTests/DatabaseCrudTests.cs

@@ -23,6 +23,9 @@ public class DatabaseCrudTests : SqlTestsBase
     {
         public DatabaseCrudTests(ITestOutputHelper output) : base(output)
         {
+            base.resourceTypesToIgnoreApiVersion = new string[] {
+                "Microsoft.Sql/servers"
+            };
         }
 
         protected override void SetupManagementClients(Rest.ClientRuntime.Azure.TestFramework.MockContext context)

src/Sql/Sql.Test/ScenarioTests/DatabaseReplicationTests.cs

@@ -23,6 +23,9 @@ public class DatabaseReplicationTests : SqlTestsBase
     {
         public DatabaseReplicationTests(ITestOutputHelper output) : base(output)
         {
+            base.resourceTypesToIgnoreApiVersion = new string[] {
+                "Microsoft.Sql/servers"
+            };
         }
 
         [Fact]

src/Sql/Sql.Test/ScenarioTests/ElasticJobAgentCrudTests.cs

@@ -23,6 +23,9 @@ public class ElasticJobAgentCrudTests : SqlTestsBase
     {
         public ElasticJobAgentCrudTests(ITestOutputHelper output) : base(output)
         {
+            base.resourceTypesToIgnoreApiVersion = new string[] {
+                "Microsoft.Sql/servers"
+            };
         }
 
         #region Create Tests

src/Sql/Sql.Test/ScenarioTests/ElasticJobCredentialCrudTests.cs

@@ -23,6 +23,9 @@ public class ElasticJobCredentialCrudTests : SqlTestsBase
     {
         public ElasticJobCredentialCrudTests(ITestOutputHelper output) : base(output)
         {
+            base.resourceTypesToIgnoreApiVersion = new string[] {
+                "Microsoft.Sql/servers"
+            };
         }
 
         #region Create Tests

src/Sql/Sql.Test/ScenarioTests/ElasticJobCrudTests.cs

@@ -23,6 +23,9 @@ public class ElasticJobCrudTests : SqlTestsBase
     {
         public ElasticJobCrudTests(ITestOutputHelper output) : base(output)
         {
+            base.resourceTypesToIgnoreApiVersion = new string[] {
+                "Microsoft.Sql/servers"
+            };
         }
 
         #region Create Tests

src/Sql/Sql.Test/ScenarioTests/ElasticJobExecutionCrudTests.cs

@@ -23,6 +23,9 @@ public class ElasticJobExecutionCrudTests : SqlTestsBase
     {
         public ElasticJobExecutionCrudTests(ITestOutputHelper output) : base(output)
         {
+            base.resourceTypesToIgnoreApiVersion = new string[] {
+                "Microsoft.Sql/servers"
+            };
         }
 
         #region Start Job Tests

src/Sql/Sql.Test/ScenarioTests/ElasticJobStepCrudTests.cs

@@ -23,6 +23,9 @@ public class ElasticJobStepCrudTests : SqlTestsBase
     {
         public ElasticJobStepCrudTests(ITestOutputHelper output) : base(output)
         {
+            base.resourceTypesToIgnoreApiVersion = new string[] {
+                "Microsoft.Sql/servers"
+            };
         }
 
         #region Create Tests

src/Sql/Sql.Test/ScenarioTests/ElasticJobTargetCrudTests.cs

@@ -23,6 +23,9 @@ public class ElasticJobTargetCrudTests : SqlTestsBase
     {
         public ElasticJobTargetCrudTests(ITestOutputHelper output) : base(output)
         {
+            base.resourceTypesToIgnoreApiVersion = new string[] {
+                "Microsoft.Sql/servers"
+            };
         }
 
         [Fact]

src/Sql/Sql.Test/ScenarioTests/ElasticJobTargetGroupCrudTests.cs

@@ -23,6 +23,9 @@ public class ElasticJobTargetGroupCrudTests : SqlTestsBase
     {
         public ElasticJobTargetGroupCrudTests(ITestOutputHelper output) : base(output)
         {
+            base.resourceTypesToIgnoreApiVersion = new string[] {
+                "Microsoft.Sql/servers"
+            };
         }
 
         #region Create Tests

src/Sql/Sql.Test/ScenarioTests/ElasticPoolCrudTests.cs

@@ -24,6 +24,9 @@ public class ElasticPoolCrudTests : SqlTestsBase
     {
         public ElasticPoolCrudTests(ITestOutputHelper output) : base(output)
         {
+            base.resourceTypesToIgnoreApiVersion = new string[] {
+                "Microsoft.Sql/servers"
+            };
         }
 
         // Currently the test runs too long to be marked as a check-in test.

src/Sql/Sql.Test/ScenarioTests/FailoverGroupTests.cs

@@ -23,6 +23,9 @@ public class FailoverGroupTests : SqlTestsBase
     {
         public FailoverGroupTests(ITestOutputHelper output) : base(output)
         {
+            base.resourceTypesToIgnoreApiVersion = new string[] {
+                "Microsoft.Sql/servers"
+            };
         }
 
         [Fact]

src/Sql/Sql.Test/ScenarioTests/FailoverTests.cs

@@ -24,6 +24,9 @@ public class FailoverTests : SqlTestsBase
     {
         public FailoverTests(ITestOutputHelper output) : base(output)
         {
+            base.resourceTypesToIgnoreApiVersion = new string[] {
+                "Microsoft.Sql/servers"
+            };
         }
 
         [Fact]

src/Sql/Sql.Test/ScenarioTests/ImportExportTests.cs

@@ -23,6 +23,9 @@ public class ImportExportTests : SqlTestsBase
     {
         public ImportExportTests(ITestOutputHelper output) : base(output)
         {
+            base.resourceTypesToIgnoreApiVersion = new string[] {
+                "Microsoft.Sql/servers"
+            };
         }
 
 

src/Sql/Sql.Test/ScenarioTests/ReadScaleCrudTests.cs

@@ -23,6 +23,9 @@ public class ReadScaleCrudTests : SqlTestsBase
     {
         public ReadScaleCrudTests(ITestOutputHelper output) : base(output)
         {
+            base.resourceTypesToIgnoreApiVersion = new string[] {
+                "Microsoft.Sql/servers"
+            };
         }
 
         [Fact]

src/Sql/Sql.Test/ScenarioTests/ServerCommunicationLinkCrudTests.cs

@@ -23,6 +23,9 @@ public class ServerCommunicationLinkCrudTests : SqlTestsBase
     {
         public ServerCommunicationLinkCrudTests(ITestOutputHelper output) : base(output)
         {
+            base.resourceTypesToIgnoreApiVersion = new string[] {
+                "Microsoft.Sql/servers"
+            };
         }
 
         [Fact]

src/Sql/Sql.Test/ScenarioTests/ServerCrudTests.cs

@@ -16,6 +16,7 @@
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
 using Xunit;
 using Xunit.Abstractions;
+using RestTestFramework = Microsoft.Rest.ClientRuntime.Azure.TestFramework;
 
 namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
 {
@@ -73,5 +74,19 @@ public void TestServerUpdateWithoutIdentity()
         {
             RunPowerShellTest("Test-UpdateServerWithoutIdentity");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestServerCreateAndGetWithPublicNetworkAccess()
+        {
+            RunPowerShellTest("Test-CreateAndGetServerWithPublicNetworkAccess");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestServerUpdateWithPublicNetworkAccess()
+        {
+            RunPowerShellTest("Test-UpdateServerWithPublicNetworkAccess");
+        }
     }
 }

src/Sql/Sql.Test/ScenarioTests/ServerCrudTests.ps1

@@ -253,4 +253,97 @@ function Test-UpdateServerWithoutIdentity
 	{
 		Remove-ResourceGroupForTest $rg
 	}
+}
+
+<#
+	.SYNOPSIS
+	Tests create server with Enabled/Disabled/null PublicNetworkAccess.  Also check get server returns correct PublicNetworkAccess.
+#>
+function Test-CreateAndGetServerWithPublicNetworkAccess
+{
+	# Setup
+	$location = "westeurope"
+	$rg = Create-ResourceGroupForTest $location
+	 	
+	$serverName1 = Get-ServerName
+	$serverName2 = Get-ServerName
+	$serverName3 = Get-ServerName
+	$serverLogin = "testusername"
+	$serverPassword = "t357ingP@s5w0rd!"
+	$credentials = new-object System.Management.Automation.PSCredential($serverLogin, ($serverPassword | ConvertTo-SecureString -asPlainText -Force)) 
+	$enabled = "Enabled"
+	$disabled = "Disabled"
+
+	try
+	{
+		# Create a server with PublicNetworkAccess Disabled
+		$server1 = New-AzSqlServer -ResourceGroupName $rg.ResourceGroupName -ServerName $serverName1 -Location $location -SqlAdministratorCredentials $credentials -PublicNetworkAccess "Enabled"
+		Assert-AreEqual $server1.ServerName $serverName1
+		Assert-AreEqual $server1.PublicNetworkAccess $enabled
+
+		$retrievedServer1 = Get-AzSqlServer -ResourceGroupName $rg.ResourceGroupName -ServerName $server1.ServerName
+		Assert-AreEqual $retrievedServer1.ServerName $server1.ServerName
+		Assert-AreEqual $retrievedServer1.PublicNetworkAccess $enabled
+
+		# Create a server with PublicNetworkAccess Disabled
+		$server2 = New-AzSqlServer -ResourceGroupName $rg.ResourceGroupName -ServerName $serverName2 -Location $location -SqlAdministratorCredentials $credentials -PublicNetworkAccess "Disabled"
+		Assert-AreEqual $server2.ServerName $serverName2
+		Assert-AreEqual $server2.PublicNetworkAccess $disabled
+
+		# Create a server with PublicNetworkAccess null (should default to Enabled)
+		$server3 = New-AzSqlServer -ResourceGroupName $rg.ResourceGroupName -ServerName $serverName3 -Location $location -SqlAdministratorCredentials $credentials
+		Assert-AreEqual $server3.ServerName $serverName3
+		Assert-AreEqual $server3.PublicNetworkAccess $enabled
+	}
+	finally
+	{
+		Remove-ResourceGroupForTest $rg
+	}
+}
+
+<#
+	.SYNOPSIS
+	Tests update PublicNetworkAccess to Enabled/Disabled/null on server
+#>
+function Test-UpdateServerWithPublicNetworkAccess
+{
+	# Setup
+	$location = "westeurope"
+	$rg = Create-ResourceGroupForTest $location
+	 	
+	$serverName = Get-ServerName
+	$serverLogin = "testusername"
+	$serverPassword = "t357ingP@s5w0rd!"
+	$secureString = ConvertTo-SecureString $serverPassword -AsPlainText -Force
+	$credentials = new-object System.Management.Automation.PSCredential($serverLogin, ($serverPassword | ConvertTo-SecureString -asPlainText -Force)) 
+	$enabled = "Enabled"
+	$disabled = "Disabled"
+
+	try
+	{
+		# Create a server with PublicNetworkAccess Disabled
+		$server = New-AzSqlServer -ResourceGroupName $rg.ResourceGroupName -ServerName $serverName -Location $location -SqlAdministratorCredentials $credentials
+		Assert-AreEqual $server.ServerName $serverName
+		Assert-AreEqual $server.PublicNetworkAccess $enabled
+
+		# Update server with PublicNetworkAccess Disabled
+		$server = Set-AzSqlServer -ResourceGroupName $rg.ResourceGroupName -ServerName $serverName -SqlAdministratorPassword $secureString -PublicNetworkAccess "Disabled"
+		Assert-AreEqual $server.ServerName $serverName
+		Assert-AreEqual $server.PublicNetworkAccess $disabled
+
+		# Update server with PublicNetworkAccess null (should still be Disabled)
+		$server = Set-AzSqlServer -ResourceGroupName $rg.ResourceGroupName -ServerName $serverName -SqlAdministratorPassword $secureString -AssignIdentity
+		Assert-AreEqual $server.ServerName $serverName
+		Assert-AreEqual $server.Identity.Type SystemAssigned
+		Assert-AreEqual $server.PublicNetworkAccess $disabled
+
+		# Update server with PublicNetworkAccess Enabled
+		$server = Set-AzSqlServer -ResourceGroupName $rg.ResourceGroupName -ServerName $serverName -SqlAdministratorPassword $secureString -PublicNetworkAccess "Enabled"
+		Assert-AreEqual $server.ServerName $serverName
+		Assert-AreEqual $server.PublicNetworkAccess $enabled
+	}
+	finally
+	{
+		Remove-ResourceGroupForTest $rg
+	}
 }

src/Sql/Sql.Test/ScenarioTests/ServerDnsAliasTests.cs

@@ -23,6 +23,9 @@ public class ServerDnsAliasTests : SqlTestsBase
 	{
 		public ServerDnsAliasTests(ITestOutputHelper output) : base(output)
 		{
+			base.resourceTypesToIgnoreApiVersion = new string[] {
+				"Microsoft.Sql/servers"
+			};
 		}
 
 		[Fact]