Skip to content

Commit b363bf6

Browse files
committed
Added missed generated files
1 parent 4a14bfd commit b363bf6

File tree

4 files changed

+12
-91
lines changed

4 files changed

+12
-91
lines changed

src/Sql/Sql.Management.Sdk/Generated/ISqlManagementClient.cs

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,16 @@ public partial interface ISqlManagementClient : System.IDisposable
489489
/// </summary>
490490
IInstanceFailoverGroupsOperations InstanceFailoverGroups { get; }
491491

492+
/// <summary>
493+
/// Gets the IServersOperations
494+
/// </summary>
495+
IServersOperations Servers { get; }
496+
497+
/// <summary>
498+
/// Gets the IDeletedServersOperations
499+
/// </summary>
500+
IDeletedServersOperations DeletedServers { get; }
501+
492502
/// <summary>
493503
/// Gets the IServerConfigurationOptionsOperations
494504
/// </summary>
@@ -529,10 +539,5 @@ public partial interface ISqlManagementClient : System.IDisposable
529539
/// </summary>
530540
IDatabaseSchemasOperations DatabaseSchemas { get; }
531541

532-
/// <summary>
533-
/// Gets the IServersOperations
534-
/// </summary>
535-
IServersOperations Servers { get; }
536-
537542
}
538543
}

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

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -157,19 +157,5 @@ public void TestServerRestoreDeletedServer()
157157
{
158158
TestRunner.RunTestScript("Test-RestoreDeletedServer");
159159
}
160-
161-
[Fact]
162-
[Trait(Category.AcceptanceType, Category.CheckIn)]
163-
public void TestServerDisableSoftDelete()
164-
{
165-
TestRunner.RunTestScript("Test-ServerDisableSoftDelete");
166-
}
167-
168-
[Fact]
169-
[Trait(Category.AcceptanceType, Category.CheckIn)]
170-
public void TestCreateServerWithSoftDeleteDisabled()
171-
{
172-
TestRunner.RunTestScript("Test-CreateServerWithSoftDeleteDisabled");
173-
}
174160
}
175-
}
161+
}

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

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -801,74 +801,4 @@ function Test-RestoreDeletedServer
801801
Set-AzSqlServer -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -SoftDeleteRetentionDays 0
802802
Remove-ResourceGroupForTest $rg
803803
}
804-
}
805-
806-
<#
807-
.SYNOPSIS
808-
Tests disabling soft delete
809-
#>
810-
function Test-ServerDisableSoftDelete
811-
{
812-
# Setup
813-
$rg = Create-ResourceGroupForTest "eastasia"
814-
$server = Create-ServerForTest $rg $rg.Location
815-
816-
try
817-
{
818-
# Test with parameters
819-
$server1 = Set-AzSqlServer -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -EnableSoftDelete $true
820-
821-
Assert-AreEqual $server1.ServerName $server.ServerName
822-
Assert-AreEqual $server1.ServerVersion $server.ServerVersion
823-
Assert-StartsWith ($server1.ServerName + ".") $server1.FullyQualifiedDomainName
824-
Assert-AreEqual $server1.SoftDeleteRetentionDays 7
825-
826-
$server2 = Set-AzSqlServer -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -SoftDeleteRetentionDays 0
827-
828-
Assert-AreEqual $server2.ServerName $server.ServerName
829-
Assert-AreEqual $server2.ServerVersion $server.ServerVersion
830-
Assert-StartsWith ($server2.ServerName + ".") $server2.FullyQualifiedDomainName
831-
Assert-AreEqual $server2.SoftDeleteRetentionDays 0
832-
833-
}
834-
finally
835-
{
836-
Remove-ResourceGroupForTest $rg
837-
}
838-
}
839-
840-
<#
841-
.SYNOPSIS
842-
Tests create server with softdelete disabled
843-
#>
844-
function Test-CreateServerWithSoftDeleteDisabled
845-
{
846-
# Setup
847-
$rg = Create-ResourceGroupForTest "eastasia"
848-
849-
$serverName = Get-ServerName
850-
$version = "12.0"
851-
$serverLogin = "testusername"
852-
$serverPassword = "t357ingP@s5w0rd!"
853-
$credentials = new-object System.Management.Automation.PSCredential($serverLogin, ($serverPassword | ConvertTo-SecureString -asPlainText -Force))
854-
$customRetentionDays = 0
855-
856-
try
857-
{
858-
# With all parameters
859-
$job = New-AzSqlServer -ResourceGroupName $rg.ResourceGroupName -ServerName $serverName `
860-
-Location $rg.Location -ServerVersion $version -SqlAdministratorCredentials $credentials -SoftDeleteRetentionDays $customRetentionDays -AsJob
861-
$job | Wait-Job
862-
$server1 = $job.Output
863-
864-
Assert-AreEqual $server1.ServerName $serverName
865-
Assert-AreEqual $server1.ServerVersion $version
866-
Assert-AreEqual $server1.SqlAdministratorLogin $serverLogin
867-
Assert-StartsWith ($server1.ServerName + ".") $server1.FullyQualifiedDomainName
868-
Assert-AreEqual $server1.SoftDeleteRetentionDays $customRetentionDays
869-
}
870-
finally
871-
{
872-
Remove-ResourceGroupForTest $rg
873-
}
874804
}

src/Sql/Sql/Server/Cmdlet/SetAzureSqlServer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public class SetAzureSqlServer : AzureSqlServerCmdletBase
137137
/// Value for soft-delete retention days for the server.
138138
/// </summary>
139139
[Parameter(Mandatory = false,
140-
HelpMessage = "Specifies the number of days to retain a deleted server for possible restoration. Valid values are 0-35. A value of 0 disables soft-delete retention. If EnableSoftDeleteRetention is set without an explicit value, the default retention is 7 days.")]
140+
HelpMessage = "Specifies the number of days to retain a deleted server for possible restoration. Valid values are 0-35. A value of 0 disables soft-delete retention. If EnableSoftDelete is set without an explicit value, the default retention is 7 days.")]
141141
[ValidateRange(0, 35)]
142142
public int? SoftDeleteRetentionDays { get; set; }
143143

0 commit comments

Comments
 (0)