Skip to content

Commit b3f003c

Browse files
authored
[SQL} Adding None as Valid option for minimal tls version (#21903)
* Powershell changes for making None Valid * Unrelated generated files * Cmdlet changes' * unrelated generated files * Change log update * Record test for minimalTlsVersion * Help doc update
1 parent 480b1a3 commit b3f003c

File tree

10 files changed

+1131
-436
lines changed

10 files changed

+1131
-436
lines changed

src/Sql/Sql.Sdk/Generated/Models/Server.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public Server()
5454
/// <param name="privateEndpointConnections">List of private endpoint
5555
/// connections on a server</param>
5656
/// <param name="minimalTlsVersion">Minimal TLS version. Allowed
57-
/// values: '1.0', '1.1', '1.2'</param>
57+
/// values: 'None', '1.0', '1.1', '1.2'</param>
5858
/// <param name="publicNetworkAccess">Whether or not public endpoint
5959
/// access is allowed for this server. Value is optional but if passed
6060
/// in, must be 'Enabled' or 'Disabled' or 'SecuredByPerimeter'.
@@ -160,8 +160,8 @@ public Server()
160160
public IList<ServerPrivateEndpointConnection> PrivateEndpointConnections { get; private set; }
161161

162162
/// <summary>
163-
/// Gets or sets minimal TLS version. Allowed values: '1.0', '1.1',
164-
/// '1.2'
163+
/// Gets or sets minimal TLS version. Allowed values: 'None', '1.0',
164+
/// '1.1', '1.2'
165165
/// </summary>
166166
[JsonProperty(PropertyName = "properties.minimalTlsVersion")]
167167
public string MinimalTlsVersion { get; set; }

src/Sql/Sql.Sdk/Generated/Models/ServerUpdate.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public ServerUpdate()
4646
/// <param name="privateEndpointConnections">List of private endpoint
4747
/// connections on a server</param>
4848
/// <param name="minimalTlsVersion">Minimal TLS version. Allowed
49-
/// values: '1.0', '1.1', '1.2'</param>
49+
/// values: 'None', '1.0', '1.1', '1.2'</param>
5050
/// <param name="publicNetworkAccess">Whether or not public endpoint
5151
/// access is allowed for this server. Value is optional but if passed
5252
/// in, must be 'Enabled' or 'Disabled' or 'SecuredByPerimeter'.
@@ -145,8 +145,8 @@ public ServerUpdate()
145145
public IList<ServerPrivateEndpointConnection> PrivateEndpointConnections { get; private set; }
146146

147147
/// <summary>
148-
/// Gets or sets minimal TLS version. Allowed values: '1.0', '1.1',
149-
/// '1.2'
148+
/// Gets or sets minimal TLS version. Allowed values: 'None', '1.0',
149+
/// '1.1', '1.2'
150150
/// </summary>
151151
[JsonProperty(PropertyName = "properties.minimalTlsVersion")]
152152
public string MinimalTlsVersion { get; set; }

src/Sql/Sql.Sdk/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ input-file:
108108
- https://github.com/Azure/azure-rest-api-specs/blob/62bb0d101c8aee92e4d77ad14b20e4cf14bb181c/specification/sql/resource-manager/Microsoft.Sql/preview/2022-08-01-preview/RecoverableDatabases.json
109109
- https://github.com/Azure/azure-rest-api-specs/blob/62bb0d101c8aee92e4d77ad14b20e4cf14bb181c/specification/sql/resource-manager/Microsoft.Sql/preview/2022-08-01-preview/RestorableDroppedDatabases.json
110110
- https://github.com/Azure/azure-rest-api-specs/blob/549bc277952e66577d69ce137eea810c9815ef22/specification/sql/resource-manager/Microsoft.Sql/preview/2022-05-01-preview/InstanceFailoverGroups.json
111-
- https://github.com/Azure/azure-rest-api-specs/blob/62bb0d101c8aee92e4d77ad14b20e4cf14bb181c/specification/sql/resource-manager/Microsoft.Sql/preview/2022-08-01-preview/Servers.json
111+
- https://github.com/Azure/azure-rest-api-specs/blob/9a20afc353d601769460d42fd13475eecbe61e7d/specification/sql/resource-manager/Microsoft.Sql/preview/2022-08-01-preview/Servers.json
112112
- https://github.com/Azure/azure-rest-api-specs/blob/8e7fbe5d8c0e33f99ad365951485107a0ad8a181/specification/sql/resource-manager/Microsoft.Sql/preview/2022-08-01-preview/ServerConfigurationOptions.json
113113
- https://github.com/Azure/azure-rest-api-specs/blob/aeb7bf01df887ea6095e1c3d545c2445c9d8dde7/specification/sql/resource-manager/Microsoft.Sql/preview/2022-08-01-preview/ManagedLedgerDigestUploads.json
114114
- https://github.com/Azure/azure-rest-api-specs/blob/aeb7bf01df887ea6095e1c3d545c2445c9d8dde7/specification/sql/resource-manager/Microsoft.Sql/preview/2022-08-01-preview/ManagedDatabases.json

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,7 @@ function Test-CreateandUpdateServerWithMinimalTlsVersion
340340
$credentials = new-object System.Management.Automation.PSCredential($serverLogin, ($serverPassword | ConvertTo-SecureString -asPlainText -Force))
341341
$tls1_1 = "1.1"
342342
$tls1_2 = "1.2"
343+
$tlsNone = "None"
343344

344345
# With all parameters
345346
$job = New-AzSqlServer -ResourceGroupName $rg.ResourceGroupName -ServerName $serverName `
@@ -351,6 +352,9 @@ function Test-CreateandUpdateServerWithMinimalTlsVersion
351352

352353
$server2 = Set-AzSqlServer -ResourceGroupName $rg.ResourceGroupName -ServerName $serverName -MinimalTlsVersion $tls1_1
353354
Assert-AreEqual $server2.MinimalTlsVersion $tls1_1
355+
356+
$server3 = Set-AzSqlServer -ResourceGroupName $rg.ResourceGroupName -ServerName $serverName -MinimalTlsVersion $tlsNone
357+
Assert-AreEqual $server3.MinimalTlsVersion $tlsNone
354358
}
355359
finally
356360
{

0 commit comments

Comments
 (0)